Merge https://github.com/gentoo/gentoo.git
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
index 160813a..c84e5b5 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
@@ -13,7 +13,7 @@
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
COMMON_DEPEND="
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild
index 0dda5cb..91c20e4 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2+"
SLOT="2"
IUSE="+X +introspection"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
# x11-libs/libSM is needed until upstream #719808 is solved either
# making the dep unneeded or fixing their configure
diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml
index 395bfb3..e8e32d5 100644
--- a/app-accessibility/brltty/metadata.xml
+++ b/app-accessibility/brltty/metadata.xml
@@ -18,9 +18,9 @@
functionality. Some speech capability has also been incorporated.
</longdescription>
<longdescription lang="ja">
-BRLTTYã¯ãç²äººç¨ãã©ã¤ã¦ç¹åãã£ã¹ãã¬ã¤ã®ããã®Linux/Unixã³ã³ã½ã¼ã«ãå¶å¾¡ããã
-ãã¯ã°ã©ã¦ã³ãã»ããã»ã¹(ãã¼ã¢ã³)ã§ãããã©ã¤ã¦ç¹åãã£ã¹ãã¬ã¤ãåããããã®å¤
-æ©è½ãªå®å
¨ãªã¹ã¯ãªã¼ã³ã»ã¬ãã¥ã¼ãæä¾ãã¾ããå¹¾ã¤ãã®å°è©èªã¿ä¸ãæ©è½ãçµ±åãã
-ã¦ãã¾ãã
+BRLTTYは、盲人用ブライユ点字ディスプレイのためのLinux/Unixコンソールを制御するバ
+ックグラウンド・プロセス(デーモン)です。ブライユ点字ディスプレイを動かし、その多
+機能な完全なスクリーン・レビューを提供します。幾つかの台詞読み上げ機能も統合され
+ています。
</longdescription>
</pkgmetadata>
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 1e055df..ad66383 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,3 +1,2 @@
-DIST orca-3.14.3.tar.xz 1998804 SHA256 8258dc3174572a4bf1a266ad36df46cf5f2c5a8dc5df1a071f49f812bec2a315 SHA512 579eb592ab99a98598ce7405e180b9e8657c5b418d792f1209684bca7b309bb8e0857fd2766a39fb53835ae44f12e3447dda08402b21113e16c92bb7f60e661d WHIRLPOOL 624fc3c89ad20e734ab61160839a4d469243c587ed8c72b413ee011275e27eff73ac8ffa82f03dfa69902450c0db970b402d4b371e647298ee4b193218851e64
-DIST orca-3.14.4.tar.xz 2016596 SHA256 94a522e0a29143858be0d092346d9996e62b55fefdf4651b5edf79bcb9f4a1ef SHA512 1270c18c83817f02c0804db711915d112ff8e3b336c2dd39eb3ff5e2110393ce0afb030f82bdefb1a56acf6471107d2f237100aa22b85ac88ab04c7325cebfc8 WHIRLPOOL 298004708658a62d8fde7bb0f2ec53a7d4b64188ed663cfc5edd7d788bcc8de7f07bff5ce58ad625572692233652a251e2666640f1309d23a7ab67574cd20125
DIST orca-3.16.2.tar.xz 2078728 SHA256 cd14b28878cc04166ec43c7d9a8e6b0056c66cbfb1e4f934f12f74568937789a SHA512 768628c4630d84929a8a2b12b73771de7b104b1754e9462b1fe63c2bbadca192e56416a1e2a43ad5f5594c91a4fe94941d2deb1e44cccaf253d4f03704f31ee1 WHIRLPOOL eea3f9a1a0b1aebb4ca3a6da1a5cf016b1ea6d042c4e8e1b7275325cd08e77c6a7c6519048651ace34ef10d69c22663e9009dab20502ff3fca7d6c6c9a888c9a
+DIST orca-3.16.3.tar.xz 2124800 SHA256 540deeaa1a973cc7ccc8a463f8fcf51db51f7ccfb130bc2019ac53bf67943dc7 SHA512 c579437d956bee014db61aeb7494a295345e28a147a938a71a8062c30de67fcff3767c5ea8767067ce5f2f5ff84c0aaf2fc250730e4a7036ae100078fd6f058f WHIRLPOOL 839b3c7170f2fd44fa5b97cfd9ed6989dd94721d379d21428a166b8321fb5162a56f758327df0ea632bf320711362b0e03916358d023fba8dffec2a36f62b970
diff --git a/app-accessibility/orca/orca-3.14.3.ebuild b/app-accessibility/orca/orca-3.14.3.ebuild
deleted file mode 100644
index 5ba9662..0000000
--- a/app-accessibility/orca/orca-3.14.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{3,4} )
-PYTHON_REQ_USE="threads"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# liblouis is not in portage yet
-# it is used to provide contracted braille support
-# XXX: Check deps for correctness
-COMMON_DEPEND="
- >=app-accessibility/at-spi2-atk-2.10:2
- >=app-accessibility/at-spi2-core-2.10:2[introspection]
- >=dev-libs/atk-2.10
- >=dev-libs/glib-2.28:2
- >=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
- >=x11-libs/gtk+-3.6.2:3[introspection]
- braille? (
- >=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
- dev-libs/liblouis[python,${PYTHON_USEDEP}] )
- ${PYTHON_DEPS}
-"
-RDEPEND="${COMMON_DEPEND}
- >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
- dev-libs/atk[introspection]
- dev-python/pyatspi[${PYTHON_USEDEP}]
- dev-python/setproctitle[${PYTHON_USEDEP}]
- x11-libs/libwnck:3[introspection]
- x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.50
- virtual/pkgconfig
-"
-# app-text/yelp-tools
-
-src_prepare() {
- gnome2_src_prepare
-
- python_copy_sources
-}
-
-src_configure() {
- python_foreach_impl run_in_build_dir gnome2_src_configure \
- ITSTOOL="$(type -P true)" \
- $(use_with braille liblouis)
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
- installing() {
- gnome2_src_install
- # Massage shebang to make python_doscript happy
- sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
- -i src/orca/orca || die
- python_doscript src/orca/orca
- }
- python_foreach_impl run_in_build_dir installing
-}
diff --git a/app-accessibility/orca/orca-3.14.4.ebuild b/app-accessibility/orca/orca-3.14.4.ebuild
deleted file mode 100644
index 792a5dd..0000000
--- a/app-accessibility/orca/orca-3.14.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{3,4} )
-PYTHON_REQ_USE="threads"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# liblouis is not in portage yet
-# it is used to provide contracted braille support
-# XXX: Check deps for correctness
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-accessibility/at-spi2-atk-2.10:2
- >=app-accessibility/at-spi2-core-2.10:2[introspection]
- >=dev-libs/atk-2.10
- >=dev-libs/glib-2.28:2
- >=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
- >=x11-libs/gtk+-3.6.2:3[introspection]
- braille? (
- >=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
- dev-libs/liblouis[python,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
- >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
- dev-libs/atk[introspection]
- dev-python/pyatspi[${PYTHON_USEDEP}]
- dev-python/setproctitle[${PYTHON_USEDEP}]
- x11-libs/libwnck:3[introspection]
- x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.50
- virtual/pkgconfig
-"
-# app-text/yelp-tools
-
-src_prepare() {
- gnome2_src_prepare
-
- python_copy_sources
-}
-
-src_configure() {
- python_foreach_impl run_in_build_dir gnome2_src_configure \
- ITSTOOL="$(type -P true)" \
- $(use_with braille liblouis)
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
- installing() {
- gnome2_src_install
- # Massage shebang to make python_doscript happy
- sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
- -i src/orca/orca || die
- python_doscript src/orca/orca
- }
- python_foreach_impl run_in_build_dir installing
-}
diff --git a/app-accessibility/orca/orca-3.16.3.ebuild b/app-accessibility/orca/orca-3.16.3.ebuild
new file mode 100644
index 0000000..00c8093
--- /dev/null
+++ b/app-accessibility/orca/orca-3.16.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{3,4} )
+PYTHON_REQ_USE="threads"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Extensible screen reader that provides access to the desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="+braille"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# liblouis is not in portage yet
+# it is used to provide contracted braille support
+# XXX: Check deps for correctness
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-accessibility/at-spi2-atk-2.10:2
+ >=app-accessibility/at-spi2-core-2.10:2[introspection]
+ >=dev-libs/atk-2.10
+ >=dev-libs/glib-2.28:2
+ >=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
+ >=x11-libs/gtk+-3.6.2:3[introspection]
+ braille? (
+ >=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
+ dev-libs/liblouis[python,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
+ dev-libs/atk[introspection]
+ dev-python/pyatspi[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ x11-libs/libwnck:3[introspection]
+ x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ dev-util/itstool
+ virtual/pkgconfig
+"
+# app-text/yelp-tools
+
+src_prepare() {
+ gnome2_src_prepare
+ python_copy_sources
+}
+
+src_configure() {
+ python_foreach_impl run_in_build_dir gnome2_src_configure \
+ $(use_with braille liblouis)
+}
+
+src_compile() {
+ python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+ DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+ installing() {
+ gnome2_src_install
+ # Massage shebang to make python_doscript happy
+ sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
+ -i src/orca/orca || die
+ python_doscript src/orca/orca
+ }
+ python_foreach_impl run_in_build_dir installing
+}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 416c4cc..d4b79fe 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,2 +1,3 @@
DIST ansible-1.9.2.tar.gz 927525 SHA256 c25ef4738b08fdfb3094247c012f3fd1b29972acbd37f988070b2a85f5fbee00 SHA512 6c0b3eaac11e11bf90f5b63c54da86df0cb33b0ee98c987c48a68fa643b39e9f0817884767f2bd9c0f6e8852d37fd1b197d5299abc574fccc181fbb22985d4ad WHIRLPOOL 19d50845b9920d85c5ce0380303144e7a4237e673dd4beb5ff020042d7bac59dc0706cff88f08155029ce1a3aa9decc3c54261f9f16524b6e5e3b42e599d3a6b
DIST ansible-1.9.3.tar.gz 936633 SHA256 2594f642fd800056a427c1026410dc6ed8dfa7c0033f5c3d187abdb2b0d4eeed SHA512 280d7506417affc11fe8c8715f82ffb011991e48e96db73aca915e1393d51073564c78a98b018c380b7fb8e697ce0fac6208822da44f2bac545f142707325d43 WHIRLPOOL 5738bcd263ca32279bbca30e3f1b5c53e5bd72a18025fdb82393a8d85e5a826b3be4ce78cbbc648133768d212fa49d1c3320af4b34f948c1b1cee40d73147f8a
+DIST ansible-1.9.4.tar.gz 937120 SHA256 972c2face49f1577bd0ff7989440bfe2820e66fb10d7579915cc536bccfa6fe3 SHA512 53ef5b3390be620cedc92687c7c9853c42f38547494f9b77056d5ea48ccd8f43d193648a7f4569fcba5afad343a9202b123296ab47c8cd02eecfe455d83b9586 WHIRLPOOL 0b88a27f690ff940eae1969ff163d8f8c26df038d2e9aa76694bdba1448ac9cbe8123795d0787e528c6d22cf66cc01d6b89add8e3e97bbb107a3f1a96860fd8e
diff --git a/app-admin/ansible/ansible-1.9.3.ebuild b/app-admin/ansible/ansible-1.9.3.ebuild
index 273d25a..7c8406c 100644
--- a/app-admin/ansible/ansible-1.9.3.ebuild
+++ b/app-admin/ansible/ansible-1.9.3.ebuild
@@ -14,7 +14,7 @@
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~x86 ~x64-macos"
IUSE="test"
RDEPEND="
diff --git a/app-admin/ansible/ansible-1.9.4.ebuild b/app-admin/ansible/ansible-1.9.4.ebuild
new file mode 100644
index 0000000..273d25a
--- /dev/null
+++ b/app-admin/ansible/ansible-1.9.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils readme.gentoo
+
+DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/keyczar[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ EXAMPLES=( examples )
+ distutils-r1_python_install_all
+
+ doman docs/man/man1/*.1
+
+ newenvd "${FILESDIR}"/${PN}.env 95ansible
+}
+
+src_install() {
+ distutils-r1_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ optfeature "Alternative ssh transport" dev-python/paramiko
+}
diff --git a/app-admin/collectd/files/collectd.initd b/app-admin/collectd/files/collectd.initd
index 4f48a11..10d2952 100644
--- a/app-admin/collectd/files/collectd.initd
+++ b/app-admin/collectd/files/collectd.initd
@@ -47,6 +47,7 @@
ebegin "Starting collectd"
start-stop-daemon --start --user "${COLLECTD_USER}:collectd" \
+ --env LC_NUMERIC=C \
--nicelevel "${COLLECTD_NICELVL}" --exec /usr/sbin/collectd -- \
-P "${COLLECTD_PIDFILE}" -C "${COLLECTD_CFGFILE}"
eend $? "Failed to start collectd"
@@ -55,6 +56,7 @@
stop() {
ebegin "Stopping collectd"
start-stop-daemon --stop \
+ --env LC_NUMERIC=C \
--pidfile "${COLLECTD_PIDFILE}"
eend $? "Failed to stop collectd"
}
diff --git a/app-admin/conky/conky-1.10.0.ebuild b/app-admin/conky/conky-1.10.0.ebuild
index d6660ea..5994fb8 100644
--- a/app-admin/conky/conky-1.10.0.ebuild
+++ b/app-admin/conky/conky-1.10.0.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-3 BSD LGPL-2.1 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="apcupsd audacious cmus curl debug eve hddtemp ical iconv imlib iostats
ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar
@@ -64,6 +64,7 @@
"
DEPEND="
${DEPEND_COMMON}
+ app-text/docbook2X
"
CONFIG_CHECK=IPV6
diff --git a/app-admin/gkrellm/gkrellm-2.3.6_rc1-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.6_rc1-r1.ebuild
new file mode 100644
index 0000000..fa3ef34
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.6_rc1-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib user systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+
+RDEPEND="
+ dev-libs/glib:2
+ hddtemp? ( app-admin/hddtemp )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? (
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ )
+ lm_sensors? ( sys-apps/lm_sensors )
+ nls? ( virtual/libintl )
+ ntlm? ( net-libs/libntlm )
+ X? (
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/pango
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.5-cifs.patch
+ "${FILESDIR}"/${PN}-2.3.5-config.patch
+ "${FILESDIR}"/${PN}-2.3.5-width.patch
+ "${FILESDIR}"/${PN}-2.3.5-sansfont.patch
+ "${FILESDIR}"/${P}-fix_gtk_deprecation_warning.patch
+ "${FILESDIR}"/${P}-fix_copypaste_error.patch
+ "${FILESDIR}"/${P}-avoid_possible_busy_loop.patch
+ "${FILESDIR}"/${P}-update_german_translation.patch.xz
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ enewgroup gkrellmd
+ enewuser gkrellmd -1 -1 -1 gkrellmd
+ TARGET=
+ use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+ sed -e 's:-O2 ::' \
+ -e 's:override CC:CFLAGS:' \
+ -e 's:-L/usr/X11R6/lib::' \
+ -i */Makefile || die "sed Makefile(s) failed"
+
+ sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+ -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+ -i src/${PN}.h || die "sed ${PN}.h failed"
+
+ epatch ${PATCHES[@]}
+}
+
+src_compile() {
+ if use X ; then
+ local sslopt=""
+ if use gnutls; then
+ sslopt="without-ssl=yes"
+ elif use ssl; then
+ sslopt="without-gnutls=yes"
+ else
+ sslopt="without-ssl=yes without-gnutls=yes"
+ fi
+
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ STRIP="" \
+ INSTALLROOT="${EPREFIX}/usr" \
+ INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+ LOCALEDIR="${EPREFIX}/usr/share/locale" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm_sensors "" "without-libsensors=yes") \
+ $(usex ntlm "" "without-ntlm=yes") \
+ ${sslopt}
+ else
+ cd server || die
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ LINK_FLAGS="$LDFLAGS -Wl,-E" \
+ STRIP="" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm_sensors "" "without-libsensors=yes")
+ fi
+}
+
+src_install() {
+ if use X ; then
+ emake \
+ install${TARGET:+_}${TARGET} \
+ $(usex nls "" "enable_nls=0") \
+ STRIP="" \
+ INSTALLDIR="${ED}/usr/bin" \
+ INCLUDEDIR="${ED}/usr/include" \
+ LOCALEDIR="${ED}/usr/share/locale" \
+ PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+ MANDIR="${ED}/usr/share/man/man1"
+
+ dohtml *.html
+
+ newicon src/icon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} GKrellM ${PN}
+ else
+ dobin server/gkrellmd
+
+ insinto /usr/include/gkrellm2
+ doins server/gkrellmd.h
+ doins shared/log.h
+ fi
+
+ newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
+ newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+ systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+ insinto /etc
+ doins server/gkrellmd.conf
+
+ dodoc Changelog CREDITS README
+}
diff --git a/app-admin/glance/files/CVE-2015-3289_2015.1.0.patch b/app-admin/glance/files/CVE-2015-3289_2015.1.0.patch
deleted file mode 100644
index 5b69774..0000000
--- a/app-admin/glance/files/CVE-2015-3289_2015.1.0.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 88f92eb11d556bf43e2800a05973ad2da0db0195 Mon Sep 17 00:00:00 2001
-From: Flavio Percoco <flaper87@gmail.com>
-Date: Fri, 8 May 2015 11:44:14 +0200
-Subject: [PATCH] Save image data after setting the data
-
-The image's locations are missing when image's are imported using tasks
-because the ImportToStore task is not saving the image metadata after
-the import. This patch fixes that.
-
-Change-Id: I43dec450d5fc4bee2131d78dbe3c2b2373c3f739
-Closes-bug: #1453068
-(cherry picked from commit 4efb56aae9288952bdb0d368a7c307e8524b80d8)
----
- glance/async/flows/base_import.py | 4 ++++
- glance/tests/unit/async/flows/test_import.py | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/glance/async/flows/base_import.py b/glance/async/flows/base_import.py
-index 487247c..7656bde 100644
---- a/glance/async/flows/base_import.py
-+++ b/glance/async/flows/base_import.py
-@@ -283,6 +283,10 @@ class _ImportToStore(task.Task):
-
- image_import.set_image_data(image, file_path or self.uri, None)
-
-+ # NOTE(flaper87): We need to save the image again after the locations
-+ # have been set in the image.
-+ self.image_repo.save(image)
-+
-
- class _SaveImage(task.Task):
-
-diff --git a/glance/tests/unit/async/flows/test_import.py b/glance/tests/unit/async/flows/test_import.py
-index 0f355bc..7acd599 100644
---- a/glance/tests/unit/async/flows/test_import.py
-+++ b/glance/tests/unit/async/flows/test_import.py
-@@ -112,6 +112,10 @@ class TestImportTask(test_utils.BaseTestCase):
- "%s.tasks_import" % image_path)
- self.assertFalse(os.path.exists(tmp_image_path))
- self.assertTrue(os.path.exists(image_path))
-+ self.assertEqual(1, len(list(self.image.locations)))
-+ self.assertEqual("file://%s/%s" % (self.test_dir,
-+ self.image.image_id),
-+ self.image.locations[0]['url'])
-
- def test_import_flow_missing_work_dir(self):
- self.config(engine_mode='serial', group='taskflow_executor')
---
-2.3.6
-
diff --git a/app-admin/glance/files/CVE-2015-5286_2015.1.1.patch b/app-admin/glance/files/CVE-2015-5286_2015.1.1.patch
new file mode 100644
index 0000000..0478135
--- /dev/null
+++ b/app-admin/glance/files/CVE-2015-5286_2015.1.1.patch
@@ -0,0 +1,137 @@
+From 5bebd513fa71edcdb84f7dec7b16f3523c0c1092 Mon Sep 17 00:00:00 2001
+From: Mike Fedosin <mfedosin@mirantis.com>
+Date: Sun, 20 Sep 2015 17:01:22 +0300
+Subject: Cleanup chunks for deleted image if token expired
+
+In patch I47229b366c25367ec1bd48aec684e0880f3dfe60 it was
+introduced the logic that if image was deleted during file
+upload when we want to update image status from 'saving'
+to 'active' it's expected to get Duplicate error and delete
+stale chunks after that. But if user's token is expired
+there will be Unathorized exception and chunks will stay
+in store and clog it.
+And when, the upload operation for such an image is
+completed the operator configured quota can be exceeded.
+
+This patch fixes the issue of left over chunks for an image
+which was deleted from saving status, by correctly handle
+auth exceptions from registry server.
+
+Partial-bug: #1498163
+
+Conflicts:
+ glance/api/v1/upload_utils.py
+ (Kilo catches NotFound instead of ImagenotFound)
+
+Change-Id: I17a66eca55bfb83107046910e69c4da01415deec
+(cherry picked from commit 98a8832777a0639a4031e52c69f0d565b3f500c5)
+
+diff --git a/glance/api/v1/upload_utils.py b/glance/api/v1/upload_utils.py
+index 7adb2dc..ad4f724 100644
+--- a/glance/api/v1/upload_utils.py
++++ b/glance/api/v1/upload_utils.py
+@@ -171,6 +171,14 @@ def upload_data_to_store(req, image_meta, image_data, store, notifier):
+ raise exception.NotFound()
+ else:
+ raise
++
++ except exception.NotAuthenticated as e:
++ # Delete image data due to possible token expiration.
++ LOG.debug("Authentication error - the token may have "
++ "expired during file upload. Deleting image data for "
++ " %s " % image_id)
++ initiate_deletion(req, location_data, image_id)
++ raise webob.exc.HTTPUnauthorized(explanation=e.msg, request=req)
+ except exception.NotFound:
+ msg = _LI("Image %s could not be found after upload. The image may"
+ " have been deleted during the upload.") % image_id
+diff --git a/glance/api/v2/image_data.py b/glance/api/v2/image_data.py
+index 4025eeb..9967662 100644
+--- a/glance/api/v2/image_data.py
++++ b/glance/api/v2/image_data.py
+@@ -88,7 +88,19 @@ class ImageDataController(object):
+ raise webob.exc.HTTPGone(explanation=msg,
+ request=req,
+ content_type='text/plain')
+-
++ except exception.NotAuthenticated:
++ msg = (_("Authentication error - the token may have "
++ "expired during file upload. Deleting image data for "
++ "%s.") % image_id)
++ LOG.debug(msg)
++ try:
++ image.delete()
++ except exception.NotAuthenticated:
++ # NOTE: Ignore this exception
++ pass
++ raise webob.exc.HTTPUnauthorized(explanation=msg,
++ request=req,
++ content_type='text/plain')
+ except ValueError as e:
+ LOG.debug("Cannot save data for image %(id)s: %(e)s",
+ {'id': image_id, 'e': utils.exception_to_str(e)})
+diff --git a/glance/tests/unit/v1/test_upload_utils.py b/glance/tests/unit/v1/test_upload_utils.py
+index 1afaf00..8d05515 100644
+--- a/glance/tests/unit/v1/test_upload_utils.py
++++ b/glance/tests/unit/v1/test_upload_utils.py
+@@ -323,3 +323,29 @@ class TestUploadUtils(base.StoreClearingUnitTest):
+ 'metadata': {}}, image_meta['id'])
+ mock_safe_kill.assert_called_once_with(
+ req, image_meta['id'], 'saving')
++
++ @mock.patch.object(registry, 'update_image_metadata',
++ side_effect=exception.NotAuthenticated)
++ @mock.patch.object(upload_utils, 'initiate_deletion')
++ def test_activate_image_with_expired_token(
++ self, mocked_delete, mocked_update):
++ """Test token expiration during image upload.
++
++ If users token expired before image was uploaded then if auth error
++ was caught from registry during changing image status from 'saving'
++ to 'active' then it's required to delete all image data.
++ """
++ context = mock.Mock()
++ req = mock.Mock()
++ req.context = context
++ with self._get_store_and_notifier() as (location, checksum, image_meta,
++ image_data, store, notifier,
++ update_data):
++ self.assertRaises(webob.exc.HTTPUnauthorized,
++ upload_utils.upload_data_to_store,
++ req, image_meta, image_data, store, notifier)
++ self.assertEqual(2, mocked_update.call_count)
++ mocked_delete.assert_called_once_with(
++ req,
++ {'url': 'file://foo/bar', 'status': 'active', 'metadata': {}},
++ 'c80a1a6c-bd1f-41c5-90ee-81afedb1d58d')
+diff --git a/glance/tests/unit/v2/test_image_data_resource.py b/glance/tests/unit/v2/test_image_data_resource.py
+index bc8891e..7458eda 100644
+--- a/glance/tests/unit/v2/test_image_data_resource.py
++++ b/glance/tests/unit/v2/test_image_data_resource.py
+@@ -192,6 +192,23 @@ class TestImagesController(base.StoreClearingUnitTest):
+ self.assertRaises(webob.exc.HTTPBadRequest, self.controller.upload,
+ request, unit_test_utils.UUID1, 'YYYY', 4)
+
++ def test_upload_with_expired_token(self):
++ def side_effect(image, from_state=None):
++ if from_state == 'saving':
++ raise exception.NotAuthenticated()
++
++ mocked_save = mock.Mock(side_effect=side_effect)
++ mocked_delete = mock.Mock()
++ request = unit_test_utils.get_fake_request()
++ image = FakeImage('abcd')
++ image.delete = mocked_delete
++ self.image_repo.result = image
++ self.image_repo.save = mocked_save
++ self.assertRaises(webob.exc.HTTPUnauthorized, self.controller.upload,
++ request, unit_test_utils.UUID1, 'YYYY', 4)
++ self.assertEqual(3, mocked_save.call_count)
++ mocked_delete.assert_called_once_with()
++
+ def test_upload_non_existent_image_during_save_initiates_deletion(self):
+ def fake_save_not_found(self):
+ raise exception.NotFound()
+--
+cgit v0.10.2
+
diff --git a/app-admin/glance/glance-2015.1.1-r2.ebuild b/app-admin/glance/glance-2015.1.1-r2.ebuild
deleted file mode 100644
index 78e711b..0000000
--- a/app-admin/glance/glance-2015.1.1-r2.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 user
-
-DESCRIPTION="Provides services for discovering, registering, and retrieving
-virtual machine images"
-HOMEPAGE="https://launchpad.net/glance"
-SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc mysql postgres +sqlite +swift test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
- <dev-python/pbr-1.0[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
- <dev-python/hacking-0.11[${PYTHON_USEDEP}]
- >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
- <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0[${PYTHON_USEDEP}]
- <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
- !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
- !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
- <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
- <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
- dev-python/mysql-python[${PYTHON_USEDEP}]
- dev-python/psycopg[${PYTHON_USEDEP}]
- ~dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
- dev-python/qpid-python[${PYTHON_USEDEP}]
- >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
- <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
- >=dev-python/elasticsearch-py-1.3.0[${PYTHON_USEDEP}]
- )"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
- >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
- sqlite? (
- >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
- <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
- )
- mysql? (
- dev-python/mysql-python
- >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
- <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
- )
- postgres? (
- dev-python/psycopg:2
- >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
- <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
- )
- >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
- >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
- !~dev-python/routes-2.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
- >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
- >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
- >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
- dev-python/ordereddict[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
- <dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
- <dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
- <dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
- <dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
- <dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
- <dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
- >=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
- <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/WSME-0.6[${PYTHON_USEDEP}]
- <dev-python/WSME-0.7[${PYTHON_USEDEP}]
- dev-python/posix_ipc[${PYTHON_USEDEP}]
- swift? (
- >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
- <dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
- )
- >=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
- <dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
- dev-python/paste[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
- <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
- <dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
- <dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
- <dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
- <dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
- <dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
- <dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
- <dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
- !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
- >=dev-python/glance_store-0.3.0[${PYTHON_USEDEP}]
- <dev-python/glance_store-0.5.0[${PYTHON_USEDEP}]
- >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
- "${FILESDIR}/cve-2015-5163-stable-kilo.patch"
- "${FILESDIR}/cve-2015-5251-stable-kilo.patch"
-)
-
-pkg_setup() {
- enewgroup glance
- enewuser glance -1 -1 /var/lib/glance glance
-}
-
-python_prepare_all() {
- sed -i '/xattr/d' test-requirements.txt || die
- sed -i '/pysendfile/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
- # https://bugs.launchpad.net/glance/+bug/1251105
- # https://bugs.launchpad.net/glance/+bug/1242501
- testr init
- testr run --parallel || die "failed testsuite under python2.7"
-}
-
-python_install() {
- distutils-r1_python_install
-
- for svc in api registry scrubber; do
- newinitd "${FILESDIR}/glance.initd" glance-${svc}
- done
-
- diropts -m 0750 -o glance -g glance
- dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
- keepdir /etc/glance
- keepdir /var/log/glance
- keepdir /var/lib/glance/images
- keepdir /var/lib/glance/scrubber
-
- insinto /etc/glance
- insopts -m 0640 -o glance -g glance
- doins etc/*.ini
- doins etc/*.conf
- doins etc/*.sample
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/app-admin/glance/glance-2015.1.1-r3.ebuild b/app-admin/glance/glance-2015.1.1-r3.ebuild
new file mode 100644
index 0000000..88ae901
--- /dev/null
+++ b/app-admin/glance/glance-2015.1.1-r3.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Provides services for discovering, registering, and retrieving
+virtual machine images"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc mysql postgres +sqlite +swift test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+ <dev-python/pbr-1.0[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+ <dev-python/hacking-0.11[${PYTHON_USEDEP}]
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+ <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0[${PYTHON_USEDEP}]
+ <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+ !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+ <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+ <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+ dev-python/mysql-python[${PYTHON_USEDEP}]
+ dev-python/psycopg[${PYTHON_USEDEP}]
+ ~dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
+ dev-python/qpid-python[${PYTHON_USEDEP}]
+ >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+ >=dev-python/elasticsearch-py-1.3.0[${PYTHON_USEDEP}]
+ )"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+ >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+ sqlite? (
+ >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ dev-python/mysql-python
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ dev-python/psycopg:2
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+ >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+ >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+ dev-python/ordereddict[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+ <dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+ <dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
+ <dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+ <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/WSME-0.6[${PYTHON_USEDEP}]
+ <dev-python/WSME-0.7[${PYTHON_USEDEP}]
+ dev-python/posix_ipc[${PYTHON_USEDEP}]
+ swift? (
+ >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+ <dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
+ )
+ >=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+ <dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
+ dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
+ <dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/glance_store-0.3.0[${PYTHON_USEDEP}]
+ <dev-python/glance_store-0.5.0[${PYTHON_USEDEP}]
+ >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+ "${FILESDIR}/cve-2015-5163-stable-kilo.patch"
+ "${FILESDIR}/cve-2015-5251-stable-kilo.patch"
+ "${FILESDIR}/CVE-2015-5286_2015.1.1.patch"
+)
+
+pkg_setup() {
+ enewgroup glance
+ enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+ sed -i '/xattr/d' test-requirements.txt || die
+ sed -i '/pysendfile/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+ # https://bugs.launchpad.net/glance/+bug/1251105
+ # https://bugs.launchpad.net/glance/+bug/1242501
+ testr init
+ testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ for svc in api registry scrubber; do
+ newinitd "${FILESDIR}/glance.initd" glance-${svc}
+ done
+
+ diropts -m 0750 -o glance -g glance
+ dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+ keepdir /etc/glance
+ keepdir /var/log/glance
+ keepdir /var/lib/glance/images
+ keepdir /var/lib/glance/scrubber
+
+ insinto /etc/glance
+ insopts -m 0640 -o glance -g glance
+ doins etc/*.ini
+ doins etc/*.conf
+ doins etc/*.sample
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-admin/keepass/files/keepass-2.30-mono-4-support.patch b/app-admin/keepass/files/keepass-2.30-mono-4-support.patch
new file mode 100644
index 0000000..5794ba0
--- /dev/null
+++ b/app-admin/keepass/files/keepass-2.30-mono-4-support.patch
@@ -0,0 +1,92 @@
+File keepass-2.30-original/.ipc_in is a fifo while file keepass-2.30/.ipc_in is a fifo
+File keepass-2.30-original/.ipc_out is a fifo while file keepass-2.30/.ipc_out is a fifo
+diff -ur keepass-2.30-original/work/Ext/KeePassMsi/KeePassMsi.sln keepass-2.30/work/Ext/KeePassMsi/KeePassMsi.sln
+--- keepass-2.30-original/work/Ext/KeePassMsi/KeePassMsi.sln 2008-09-11 18:19:14.000000000 +0200
++++ keepass-2.30/work/Ext/KeePassMsi/KeePassMsi.sln 2015-09-28 17:21:23.640007000 +0200
+@@ -1,5 +1,5 @@
+
+-Microsoft Visual Studio Solution File, Format Version 10.00
++Microsoft Visual Studio Solution File, Format Version 11.00
+ # Visual Studio 2008
+ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "KeePassMsi", "KeePassMsi.vdproj", "{C4135368-4A84-4924-B5CE-82B18FAADFD4}"
+ EndProject
+diff -ur keepass-2.30-original/work/KeePass/KeePass.csproj keepass-2.30/work/KeePass/KeePass.csproj
+--- keepass-2.30-original/work/KeePass/KeePass.csproj 2015-09-28 17:20:19.828006799 +0200
++++ keepass-2.30/work/KeePass/KeePass.csproj 2015-09-28 17:21:26.160007008 +0200
+@@ -1,5 +1,5 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+- <PropertyGroup>
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
++ <PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+@@ -1315,6 +1315,6 @@
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+- <PropertyGroup>
++ <PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ </PropertyGroup>
+ </Project>
+diff -ur keepass-2.30-original/work/KeePassLib/KeePassLib.csproj keepass-2.30/work/KeePassLib/KeePassLib.csproj
+--- keepass-2.30-original/work/KeePassLib/KeePassLib.csproj 2015-09-28 17:20:19.836006799 +0200
++++ keepass-2.30/work/KeePassLib/KeePassLib.csproj 2015-09-28 17:21:26.148007008 +0200
+@@ -1,5 +1,5 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+- <PropertyGroup>
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
++ <PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+diff -ur keepass-2.30-original/work/KeePassLibSD/KeePassLibSD.csproj keepass-2.30/work/KeePassLibSD/KeePassLibSD.csproj
+--- keepass-2.30-original/work/KeePassLibSD/KeePassLibSD.csproj 2014-05-08 15:00:06.000000000 +0200
++++ keepass-2.30/work/KeePassLibSD/KeePassLibSD.csproj 2015-09-28 17:21:26.148007008 +0200
+@@ -1,5 +1,5 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+- <PropertyGroup>
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
++ <PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+@@ -14,7 +14,7 @@
+ <PlatformID>3C41C503-53EF-4c2a-8DD4-A8217CAD115E</PlatformID>
+ <OSVersion>4.20</OSVersion>
+ <DeployDirSuffix>KeePassLibSD</DeployDirSuffix>
+- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
++
+ <FormFactorID>
+ </FormFactorID>
+ <SignAssembly>true</SignAssembly>
+diff -ur keepass-2.30-original/work/KeePass.sln keepass-2.30/work/KeePass.sln
+--- keepass-2.30-original/work/KeePass.sln 2015-09-28 17:20:19.848006799 +0200
++++ keepass-2.30/work/KeePass.sln 2015-09-28 17:21:23.632007000 +0200
+@@ -1,4 +1,4 @@
+-Microsoft Visual Studio Solution File, Format Version 10.00
++Microsoft Visual Studio Solution File, Format Version 11.00
+ # Visual Studio 2008
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}"
+ EndProject
+diff -ur keepass-2.30-original/work/ShInstUtil/ShInstUtil.sln keepass-2.30/work/ShInstUtil/ShInstUtil.sln
+--- keepass-2.30-original/work/ShInstUtil/ShInstUtil.sln 2011-09-10 13:21:28.000000000 +0200
++++ keepass-2.30/work/ShInstUtil/ShInstUtil.sln 2015-09-28 17:21:23.636007000 +0200
+@@ -1,5 +1,5 @@
+
+-Microsoft Visual Studio Solution File, Format Version 10.00
++Microsoft Visual Studio Solution File, Format Version 11.00
+ # Visual Studio 2008
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShInstUtil", "ShInstUtil.vcproj", "{C9FBA6FD-04AC-4B2F-8277-B852B8013DAE}"
+ EndProject
+diff -ur keepass-2.30-original/work/Translation/TrlUtil/TrlUtil.csproj keepass-2.30/work/Translation/TrlUtil/TrlUtil.csproj
+--- keepass-2.30-original/work/Translation/TrlUtil/TrlUtil.csproj 2013-07-21 10:06:38.000000000 +0200
++++ keepass-2.30/work/Translation/TrlUtil/TrlUtil.csproj 2015-09-28 17:21:26.140007008 +0200
+@@ -1,5 +1,5 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+- <PropertyGroup>
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
++ <PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
diff --git a/app-admin/keepass/keepass-2.30.ebuild b/app-admin/keepass/keepass-2.30.ebuild
index 55cdd13..d98b4e7 100644
--- a/app-admin/keepass/keepass-2.30.ebuild
+++ b/app-admin/keepass/keepass-2.30.ebuild
@@ -33,6 +33,9 @@
# KeePass looks for some XSL files in the same folder as the executable,
# we prefer to have it in /usr/share/KeePass
epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
+ # bug # 558094
+ has_version ">=dev-lang/mono-4" && epatch \
+ "${FILESDIR}/${P}-mono-4-support.patch"
}
src_compile() {
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index d427552..25d4efc 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,3 +1,2 @@
-DIST logrotate-3.8.8.tar.gz 72014 SHA256 46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f SHA512 2b7b5fe587b3a5cbe98b8035a541b5e272e6e4c40669f65ff6c43d1524b686eca9abc0b93bc00c8eb6da4d189f14a9b79905fcc0fadb914276d884ad7493bb4b WHIRLPOOL b145d51cdcf0214e4f4b6a97aed7b9e1375c2848efecbc16181eaa6e1105ac8892c57248c89b92eb080d6cd6b23958085f39a894df7f5dce0bea6516e2d583c4
DIST logrotate-3.8.9.tar.gz 77408 SHA256 700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7 SHA512 342533f321a1d77c0ca389fd0a393377ba73f10654aae163cbd35f8d5df25673f1aa6e44d0af42be5419d152a7dae11024d9005076bce0a3b3dad1f0e12b9c0d WHIRLPOOL 005621b5dc7f6954e505876eece76e3adf03b9b89b724e5c28b845c8af3ebb8e978d20e3a82c8a503c32bfd8758517625207e23518d6d08068e237c22fe7212d
DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17
diff --git a/app-admin/logrotate/files/logrotate-3.8.8-Werror.patch b/app-admin/logrotate/files/logrotate-3.8.8-Werror.patch
deleted file mode 100644
index db96529..0000000
--- a/app-admin/logrotate/files/logrotate-3.8.8-Werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- MAN = logrotate.8
- MAN5 = logrotate.conf.5
-
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- sbin_PROGRAMS = logrotate
- logrotate_SOURCES = logrotate.c log.c config.c basenames.c
-
diff --git a/app-admin/logrotate/files/logrotate-3.8.8-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.8.8-atomic-create.patch
deleted file mode 100644
index 2816125..0000000
--- a/app-admin/logrotate/files/logrotate-3.8.8-atomic-create.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c 2014-10-16 13:12:35.000000000 +0200
-+++ b/logrotate.c 2014-11-04 20:26:46.080067315 +0100
-@@ -359,15 +359,20 @@
- int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type acl, int force_mode)
- {
- int fd;
-- struct stat sb_create;
-- int acl_set = 0;
--
-- fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW),
-- (S_IRUSR | S_IWUSR) & sb->st_mode);
-+ int acl_set = 0;
-+ struct stat sb_create;
-+ char template[PATH_MAX + 1];
-+ char *fname;
-+ mode_t umask_value;
-+ snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName));
-+ umask_value = umask(0000);
-+ fname = mktemp(template);
-+ fd = open(fname, (flags | O_EXCL | O_NOFOLLOW), (S_IRUSR | S_IWUSR) & sb->st_mode);
-+ umask(umask_value);
-
- if (fd < 0) {
-- message(MESS_ERROR, "error creating output file %s: %s\n",
-- fileName, strerror(errno));
-+ message(MESS_ERROR, "error creating unique temp file: %s\n",
-+ strerror(errno));
- return -1;
- }
- if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) {
-@@ -418,6 +423,13 @@
- }
- }
-
-+ if (rename(template, fileName)) {
-+ message(MESS_ERROR, "error renaming temp file to %s: %s\n",
-+ fileName, strerror(errno));
-+ close(fd);
-+ return -1;
-+ }
-+
- return fd;
- }
-
diff --git a/app-admin/logrotate/files/logrotate-3.8.8-fbsd.patch b/app-admin/logrotate/files/logrotate-3.8.8-fbsd.patch
deleted file mode 100644
index ff10211..0000000
--- a/app-admin/logrotate/files/logrotate-3.8.8-fbsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c 2014-10-16 13:12:35.000000000 +0200
-+++ b/config.c 2014-11-04 19:22:31.750055957 +0100
-@@ -1,6 +1,6 @@
- #include <sys/queue.h>
- /* Alloca is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -24,6 +24,10 @@
- #include <fnmatch.h>
- #include <sys/mman.h>
-
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c 2014-10-16 13:12:35.000000000 +0200
-+++ b/logrotate.c 2014-11-04 19:25:35.440056498 +0100
-@@ -1,6 +1,6 @@
- #include <sys/queue.h>
- /* alloca() is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -25,6 +25,10 @@
- #include <limits.h>
- #endif
-
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/Makefile b/Makefile
---- a/Makefile 2014-10-16 13:12:35.000000000 +0200
-+++ b/Makefile 2014-11-04 19:26:07.850056594 +0100
-@@ -22,7 +22,9 @@
-
- ifeq ($(WITH_ACL),yes)
- CFLAGS += -DWITH_ACL
-+ifneq ($(OS_NAME),FreeBSD)
- LOADLIBES += -lacl
-+endif
- # See pretest
- TEST_ACL=1
- else
diff --git a/app-admin/logrotate/files/logrotate-3.8.8-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.8.8-ignore-hidden.patch
deleted file mode 100644
index bdd0fbd..0000000
--- a/app-admin/logrotate/files/logrotate-3.8.8-ignore-hidden.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c 2014-10-16 13:12:35.000000000 +0200
-+++ b/config.c 2014-11-04 19:19:55.200055496 +0100
-@@ -255,7 +255,9 @@
- char *pattern;
-
- /* Check if fname is '.' or '..'; if so, return false */
-- if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
-+ /* Don't include 'hidden' files either; this breaks Gentoo
-+ portage config file management http://bugs.gentoo.org/87683 */
-+ if (fname[0] == '.')
- return 0;
-
- /* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/files/logrotate-3.8.8-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.8.8-noasprintf.patch
deleted file mode 100644
index 31ad707..0000000
--- a/app-admin/logrotate/files/logrotate-3.8.8-noasprintf.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c 2014-10-16 13:12:35.000000000 +0200
-+++ b/config.c 2014-11-04 19:28:58.110057096 +0100
-@@ -45,39 +45,6 @@
- #include "asprintf.c"
- #endif
-
--#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
--#include <stdarg.h>
--
--int asprintf(char **string_ptr, const char *format, ...)
--{
-- va_list arg;
-- char *str;
-- int size;
-- int rv;
--
-- va_start(arg, format);
-- size = vsnprintf(NULL, 0, format, arg);
-- size++;
-- va_start(arg, format);
-- str = malloc(size);
-- if (str == NULL) {
-- va_end(arg);
-- /*
-- * Strictly speaking, GNU asprintf doesn't do this,
-- * but the caller isn't checking the return value.
-- */
-- fprintf(stderr, "failed to allocate memory\\n");
-- exit(1);
-- }
-- rv = vsnprintf(str, size, format, arg);
-- va_end(arg);
--
-- *string_ptr = str;
-- return (rv);
--}
--
--#endif
--
- #if !defined(strndup)
- char *strndup(const char *s, size_t n)
- {
-diff -Nuar a/logrotate.h b/logrotate.h
---- a/logrotate.h 2014-10-16 13:12:35.000000000 +0200
-+++ b/logrotate.h 2014-11-04 19:29:15.610057147 +0100
-@@ -75,8 +75,5 @@
- extern int debug;
-
- int readAllConfigPaths(const char **paths);
--#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
--int asprintf(char **string_ptr, const char *format, ...);
--#endif
-
- #endif
diff --git a/app-admin/logrotate/logrotate-3.8.8.ebuild b/app-admin/logrotate/logrotate-3.8.8.ebuild
deleted file mode 100644
index 1085ce9..0000000
--- a/app-admin/logrotate/logrotate-3.8.8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://fedorahosted.org/logrotate/"
-SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl selinux"
-
-CDEPEND="
- >=dev-libs/popt-1.5
- selinux? (
- sys-libs/libselinux
- )
- acl? ( virtual/acl )"
-
-DEPEND="${CDEPEND}
- >=sys-apps/sed-4
-"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-logrotate )
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-ignore-hidden.patch \
- "${FILESDIR}"/${P}-fbsd.patch \
- "${FILESDIR}"/${P}-noasprintf.patch \
- "${FILESDIR}"/${P}-atomic-create.patch \
- "${FILESDIR}"/${P}-Werror.patch
- eautoreconf
-}
-
-src_compile() {
- local myconf
- myconf="CC=$(tc-getCC)"
- use selinux && myconf="${myconf} WITH_SELINUX=yes"
- use acl && myconf="${myconf} WITH_ACL=yes"
- emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
- insinto /usr
- dosbin logrotate
- doman logrotate.8
- dodoc CHANGES examples/logrotate*
-
- exeinto /etc/cron.daily
- newexe "${S}"/examples/logrotate.cron "${PN}"
-
- insinto /etc
- doins "${FILESDIR}"/logrotate.conf
-
- keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "If you wish to have logrotate e-mail you updates, please"
- elog "emerge virtual/mailx and configure logrotate in"
- elog "/etc/logrotate.conf appropriately"
- elog
- elog "Additionally, /etc/logrotate.conf may need to be modified"
- elog "for your particular needs. See man logrotate for details."
- fi
-}
diff --git a/app-admin/paxtest/Manifest b/app-admin/paxtest/Manifest
index 7db4620..1f0c111 100644
--- a/app-admin/paxtest/Manifest
+++ b/app-admin/paxtest/Manifest
@@ -1 +1 @@
-DIST paxtest-0.9.13.tar.gz 34451 SHA256 b1f9122e45927a05ea65ec9c3b8dad92377245e546c0eff08b0f8ad9ba6e4c75 SHA512 dc375f7b0c9dd3efcf22adae6cbf0724ae505c6b3a1c55de223665c454650f86014098a45226b3fc8e4b89d528152aaf458aa3b7d1c9ffc86b3be52f2af69d60 WHIRLPOOL 6d5066f759d01e7efd6b4e872bb9d9e1a7341f82f379e77dc8ae77139fa533abe004bdda9f8a35d90a1d2f4c8917d8ba4b1c56e65401522ccc1e99f99a158070
+DIST paxtest-0.9.14.tar.gz 34286 SHA256 7dead81fcdc8db2f88e3da1027e6d7c93596f2e6e4dac25ec9b54c41fa808048 SHA512 6e2d642e1dfe7e3381ed520956d2f5b19ad8c8e569c4ddcf43a2772a76ed67701bb18fe55d7fe2b82ff50644f92470622243ac974083d87448f560f6d48d8727 WHIRLPOOL bef2998611b0487590364648b8f5d4ddc470b212c2a8b0282f4220b1da8033f23299298b51dc932c35f37099f7076a99220726b30d91472ca266042f16c4ed02
diff --git a/app-admin/paxtest/paxtest-0.9.13.ebuild b/app-admin/paxtest/paxtest-0.9.13.ebuild
deleted file mode 100644
index 117f41f..0000000
--- a/app-admin/paxtest/paxtest-0.9.13.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="PaX regression test suite"
-HOMEPAGE="http://pax.grsecurity.net"
-SRC_URI="http://grsecurity.net/~spender/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- sys-apps/paxctl"
-
-# EI_PAX flags are not strip safe.
-RESTRICT="strip"
-
-QA_EXECSTACK="usr/bin/${PN}
- usr/$(get_libdir)/${PN}/getamap
- usr/$(get_libdir)/${PN}/shlibtest2.so
- usr/$(get_libdir)/${PN}/execheap
- usr/$(get_libdir)/${PN}/mprotstack
- usr/$(get_libdir)/${PN}/mprotdata
- usr/$(get_libdir)/${PN}/mprotheap
- usr/$(get_libdir)/${PN}/randshlib
- usr/$(get_libdir)/${PN}/randmain1
- usr/$(get_libdir)/${PN}/getshlib
- usr/$(get_libdir)/${PN}/randheap2
- usr/$(get_libdir)/${PN}/rettofunc2x
- usr/$(get_libdir)/${PN}/shlibdata
- usr/$(get_libdir)/${PN}/shlibbss
- usr/$(get_libdir)/${PN}/getmain1
- usr/$(get_libdir)/${PN}/execdata
- usr/$(get_libdir)/${PN}/execstack
- usr/$(get_libdir)/${PN}/rettofunc2
- usr/$(get_libdir)/${PN}/mprotshdata
- usr/$(get_libdir)/${PN}/getstack1
- usr/$(get_libdir)/${PN}/randamap
- usr/$(get_libdir)/${PN}/rettofunc1x
- usr/$(get_libdir)/${PN}/getheap2
- usr/$(get_libdir)/${PN}/getheap1
- usr/$(get_libdir)/${PN}/randheap1
- usr/$(get_libdir)/${PN}/getstack2
- usr/$(get_libdir)/${PN}/getmain2
- usr/$(get_libdir)/${PN}/rettofunc1
- usr/$(get_libdir)/${PN}/randstack2
- usr/$(get_libdir)/${PN}/mprotshbss
- usr/$(get_libdir)/${PN}/randstack1
- usr/$(get_libdir)/${PN}/mprotanon
- usr/$(get_libdir)/${PN}/randmain2
- usr/$(get_libdir)/${PN}/writetext
- usr/$(get_libdir)/${PN}/mprotbss
- usr/$(get_libdir)/${PN}/anonmap
- usr/$(get_libdir)/${PN}/execbss
- usr/$(get_libdir)/${PN}/shlibtest.so"
-
-src_prepare() {
- mv Makefile.psm Makefile
- epatch "${FILESDIR}/${P}-Makefile.patch"
- sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
- sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
-}
-
-src_compile() {
- emake RUNDIR=/usr/$(get_libdir)/paxtest || die
-}
-
-src_install() {
- emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install || die
-
- newman debian/manpage.1.ex paxtest.1 || die
- dodoc ChangeLog README || die
-}
diff --git a/app-admin/paxtest/paxtest-0.9.14.ebuild b/app-admin/paxtest/paxtest-0.9.14.ebuild
new file mode 100644
index 0000000..10fbe28
--- /dev/null
+++ b/app-admin/paxtest/paxtest-0.9.14.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="PaX regression test suite"
+HOMEPAGE="http://pax.grsecurity.net"
+SRC_URI="http://grsecurity.net/~spender/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ sys-apps/paxctl"
+
+# EI_PAX flags are not strip safe.
+RESTRICT="strip"
+
+QA_EXECSTACK="usr/bin/${PN}
+ usr/$(get_libdir)/${PN}/getamap
+ usr/$(get_libdir)/${PN}/shlibtest2.so
+ usr/$(get_libdir)/${PN}/execheap
+ usr/$(get_libdir)/${PN}/mprotstack
+ usr/$(get_libdir)/${PN}/mprotdata
+ usr/$(get_libdir)/${PN}/mprotheap
+ usr/$(get_libdir)/${PN}/randshlib
+ usr/$(get_libdir)/${PN}/randmain1
+ usr/$(get_libdir)/${PN}/getshlib
+ usr/$(get_libdir)/${PN}/randheap2
+ usr/$(get_libdir)/${PN}/rettofunc2x
+ usr/$(get_libdir)/${PN}/shlibdata
+ usr/$(get_libdir)/${PN}/shlibbss
+ usr/$(get_libdir)/${PN}/getmain1
+ usr/$(get_libdir)/${PN}/execdata
+ usr/$(get_libdir)/${PN}/execstack
+ usr/$(get_libdir)/${PN}/rettofunc2
+ usr/$(get_libdir)/${PN}/mprotshdata
+ usr/$(get_libdir)/${PN}/getstack1
+ usr/$(get_libdir)/${PN}/randamap
+ usr/$(get_libdir)/${PN}/rettofunc1x
+ usr/$(get_libdir)/${PN}/getheap2
+ usr/$(get_libdir)/${PN}/getheap1
+ usr/$(get_libdir)/${PN}/randheap1
+ usr/$(get_libdir)/${PN}/getstack2
+ usr/$(get_libdir)/${PN}/getmain2
+ usr/$(get_libdir)/${PN}/rettofunc1
+ usr/$(get_libdir)/${PN}/randstack2
+ usr/$(get_libdir)/${PN}/mprotshbss
+ usr/$(get_libdir)/${PN}/randstack1
+ usr/$(get_libdir)/${PN}/mprotanon
+ usr/$(get_libdir)/${PN}/randmain2
+ usr/$(get_libdir)/${PN}/writetext
+ usr/$(get_libdir)/${PN}/mprotbss
+ usr/$(get_libdir)/${PN}/anonmap
+ usr/$(get_libdir)/${PN}/execbss
+ usr/$(get_libdir)/${PN}/shlibtest.so"
+
+src_prepare() {
+ mv Makefile.psm Makefile
+ epatch "${FILESDIR}/${PN}-0.9.13-Makefile.patch"
+ sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
+ sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
+}
+
+src_compile() {
+ emake RUNDIR=/usr/$(get_libdir)/paxtest || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install || die
+
+ newman debian/manpage.1.ex paxtest.1 || die
+ dodoc ChangeLog README || die
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 429ae4d..ebf38f7 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -2,3 +2,5 @@
DIST puppet-agent_1.2.2-1wheezy_i386.deb 14816930 SHA256 092b8bfe1e1156322d0ab68d411487c80146bd778916409b1c907791f41a49c8 SHA512 50879ce4eebcd451dafb33cb7a12c36ee9bcaedfc29ffa0d60552efa5aa4cd66d0007061d28a80d31615c67442f8526863185e6753418772d8275e58454d6886 WHIRLPOOL 7abb0b6f52f5dd07a5ccb56b1c795c05f8c4efd18665d2ca209400e51419e4ae335e630a845c031a47df09d96ce20fbc92d7cafa082deb3872306daf74838612
DIST puppet-agent_1.2.4-1wheezy_amd64.deb 15187770 SHA256 a711255c7b5aab5f1a653fcbe461db0934645b1da876f24595d531c7ad8c81d4 SHA512 dc7656a7f79f1f2e5144bf625b87548ed1b78290ae03c969abb850f0b1c346536c37c2b204ac0e6add830c1fd692ca4f946ea01bba50bb9794c094069f237d73 WHIRLPOOL 3809a0f9c5db1c73c6edcc344e6fdc7fb5acf340e36225611c72088175fe64ea26c3770ba126a61ed91fa275cf898828d9d192872a216a52b8345f25de1df7e6
DIST puppet-agent_1.2.4-1wheezy_i386.deb 15122670 SHA256 33e9b16ea215089e7a89288faebd4767163e05d7c4a9d5c51ca71b041496c204 SHA512 944f6388d317fab9a2714a6cdc57e713a973d3c1df259b3358be3a0d737878df9f1d66186af8aea0cc768e55650f1dd1d3ef8682b942728fba45e7c0bca20867 WHIRLPOOL bd5710845a9c8f27fb566ead63e45649fb3854200df0259c76b9478d93792b453a9d5cf4fdc20112991d4d091c82143b7504b51be65815b2dcb67796f275303d
+DIST puppet-agent_1.2.5-1wheezy_amd64.deb 15187830 SHA256 4d557e45571df033a9e1babf406f9b8a4c387fe6dec7d3645f5e7ad5d7625f0d SHA512 25557aa4d5fa3d2ba0aa226c835d6779d075f0ef7c054cfda9826b1fedd08c90f5143630206b1bd51550f193aecdf4eef6395437f24e5fdfe10d3ed10fb4b75f WHIRLPOOL d6ef920932a708d1a143245f84380384b3a22320c0bb21e60be9807e29af1d3da6dbfef2f498fcb90fe4584618ae338546103c71eb305b743d326e9c20704f1f
+DIST puppet-agent_1.2.5-1wheezy_i386.deb 15122650 SHA256 f34a6e9c70b5276806dacf64fb2b41fd927e6875071d044f9901c5a8d9dacd1d SHA512 0989501ca3f011601bb301126ad58084571ee67eb961fbf1f5cf002eb9155bf4f8e838452ac62b45472f00c0a7538cb5c72c3e43c651675a7940d8ab9a1a309c WHIRLPOOL f9698e3154254d9931fdbccd9a75edccae8ab799f8add0e32995453d62a0d070001ad858449c5b816c1b1a448beb8b99b180558feea3b36fc84c0e730e2d5b7e
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.5.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.5.ebuild
new file mode 100644
index 0000000..d0c66a5
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.2.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd unpacker
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
+SRC_URI="
+ amd64? ( ${SRC_BASE}_amd64.deb )
+ x86? ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+ !app-admin/mcollective
+ !app-admin/puppet
+ !dev-ruby/hiera
+ !dev-ruby/facter
+ !app-emulation/virt-what"
+
+DEPEND="
+ ${CDEPEND}"
+RDEPEND="${CDEPEND}
+ sys-apps/dmidecode
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
+
+S=${WORKDIR}
+
+src_install() {
+ # conf.d
+ doconfd etc/default/puppet
+ doconfd etc/default/mcollective
+ # logrotate.d
+ insinto /etc/logrotate.d
+ doins etc/logrotate.d/mcollective
+ # puppet itself
+ insinto /etc/puppetlabs
+ doins -r etc/puppetlabs/*
+ # logdir for systemd
+ dodir var/log/puppetlabs/puppet/
+ fperms 0750 var/log/puppetlabs/puppet/
+ # the rest
+ insinto /opt
+ dodir opt/puppetlabs/puppet/cache
+ doins -r opt/*
+ fperms 0750 /opt/puppetlabs/puppet/cache
+ # init
+ newinitd "${FILESDIR}/puppet.initd" puppet
+ newinitd "${FILESDIR}/mcollective.initd" mcollective
+ systemd_dounit "${FILESDIR}/puppet.service"
+ systemd_dounit "${FILESDIR}/mcollective.service"
+ systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+ # symlinks
+ chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+ chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+ dosym /opt/puppetlabs/bin/facter /usr/bin/facter
+ dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
+ dosym /opt/puppetlabs/bin/mco /usr/bin/mco
+ dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
+ dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+ dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+ dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+ dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+ dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index d8ba9f1..fcdb484 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,6 +1,6 @@
DIST rsyslog-8.12.0.tar.gz 2091620 SHA256 466bfeac8296e89de1eb9029880998ba7b5fc25694143197bb47167df6cb7e20 SHA512 7735f15f8a843ee41530d180d00ab3a6854ef28e9036db7ecfe0525549b3ab2b184149c2edc4553240dd4e3003ee12ebcdf47719669daa3cc6915d5a30888c72 WHIRLPOOL b96faab541fd8b53558738b7bd71d3b6acc7d66da4fb0552d781f0e214c00a11b4a74464f7b9c9a1d62bc359658f93d380a490ee78afc11d1702975a6edc6823
+DIST rsyslog-8.13.0.tar.gz 2077267 SHA256 b182bd0a7686bef093be570bfb850417191292522fb58e0ad32f2c824f754a33 SHA512 a3245e5b10ae96e6df981291f55a43fa9a8258db213e33a36d7b5a620ea7daaac04a1f93a56304105c4fd10e546f92789831f5b2188b418b4b3b248a4e7795c9 WHIRLPOOL 8473e2c272182d84c629175aafd185cfa6fcafad8a028fd212de118f2e9abf458e062c6065dc5ebb1df27e81546a37387944ad1b3f0d16a38ee25a409b51b1c7
DIST rsyslog-8.7.0.tar.gz 2003365 SHA256 c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c SHA512 53feac42c14134d76f5592ee491bb56fb2c4c33822a7a5609a5267b6911a5c5c4e73c5d66a913a666967d8826ee3077b91d8d2a1d1b60bcb3d425b35ec4677b0 WHIRLPOOL c74c401de68bb59310e307a0d9859d2f58bcbf8126d637d23d4f3979a0d6c69bce8ca850c2942b43f311ea83f47c9554f34e5dc10623d32324da1b18023d357d
-DIST rsyslog-8.9.0.tar.gz 2022294 SHA256 eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc SHA512 942cccc2cbe147572cc2d346ac330d80c86915757b2b7a380829f0b40294d7e4afd4887d5066821af1e059cd78cdb38520fc9d28b55daa7afcd0e5b2e6bd9a5d WHIRLPOOL cc072a64364f38d98187e7102e5be0277011071ce90a510a641aea6a5b3573a436e6539c5688b24d12a9654786892070c1518093e0176e5a40bea57f7dded133
DIST rsyslog-doc-8.12.0.tar.gz 4212441 SHA256 f88517c1e5ae3a8ba129d531b5b4bb79e80f70898a8a5b72a0abd7a8a0feb8f0 SHA512 a1b3907e1a474076dd11e76b267eff35dadbd5abaf3ab802a187ce045eecc6028c854ed8e661650e10c74c79408c6ded341d16af94a05f10c529faaa8f606afb WHIRLPOOL aa21ea93536bab4c9761bdbe2e6c67f650bf181f64cb7c4a78c646d319a5472895be2a118c90d7c42548575b76f62e5dc6b0c4103cf373ab9e3704a6999c6c1b
+DIST rsyslog-doc-8.13.0.tar.gz 4147364 SHA256 3da9a1446686d1cfa82c123a610f2c30f4dc1cbfa608f44ded2baf168e86b67b SHA512 6676533b1e4884f18e583be19c5a50b8f12017ecc2c6860d54dcc72d64e7eafe20a2af3a22817226df123a7a193c7090097502f287455488dd8806b7aac0a5cd WHIRLPOOL 1231580f2bf8af42a7dd34f0a88315ff56324eb64d1259a281a5266fdbe7a472f596d66a5b6d1f5cbf19fdb6f76a2083753e0de224a07653454178128de4fead
DIST rsyslog-doc-8.7.0.tar.gz 4105507 SHA256 f131bfb963eed4fe74d7336ee5261876b436004b78994d47523a82c0f7d666a8 SHA512 9b5b6f28a55b58c956ca614301fc9667243d02c321f8b4071264e4040dd8fe79ba7eb5a08912e2a229bdcf12f68eec24f1c65ba7b82ccd60c8e70d34267b8405 WHIRLPOOL 386ad5164768a5a4919ba5acda29f3ef670b78cc9d6845e3c8ee252b43d6622c19c7f8ec1edd7d0f1d111bf2c06d29fb5dbf9af6b46c426932ae6caa0e63c30c
-DIST rsyslog-doc-8.9.0.tar.gz 4100654 SHA256 d3c6747439fabbfa976922ca26ffa695778668e757261e00103f2444cf153afa SHA512 dbc6dfc43f3a75ba671969d2fd59080d96e411a62a2ac91444d076acba548b2c87000f9822fa0af82f22b4f5c098273d407c1e665ce4b24a52dbddfdc9ab981f WHIRLPOOL 550d499ec556a75344d25331aa1df1855f6f70e2e702c086a8ecbf1817eb1f4bc3b94224b77491f3bc1f6c758a22475c248f8afdfc25816132dfedd81c6dfee0
diff --git a/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS.patch b/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS.patch
deleted file mode 100644
index c74279b..0000000
--- a/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old 2014-10-02 15:41:45.692471540 +0200
-+++ configure.ac 2014-10-02 15:42:11.122743182 +0200
-@@ -835,7 +835,7 @@
- AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
- RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)"
- if test "$GCC" = "yes"
--then RSRT_CFLAGS="$RSRT_CFLAGS -W -std=c99 -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -g"
-+then RSRT_CFLAGS="$RSRT_CFLAGS -W -std=c99 -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute"
- fi
- RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"
- AC_SUBST(RSRT_CFLAGS1)
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.12.0-fix-re_extract.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.12.0-fix-re_extract.patch
new file mode 100644
index 0000000..f049d53
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.12.0-fix-re_extract.patch
@@ -0,0 +1,130 @@
+From a88d67df6e55e0a5f484f6aff8aa6e9813c5c31a Mon Sep 17 00:00:00 2001
+From: Janmejay Singh <singh.janmejay@gmail.com>
+Date: Mon, 28 Sep 2015 20:38:05 +0530
+Subject: [PATCH] fixed re_extract bug, which fails the regex-compile for
+ extract as fn-init fails when fn does not have exactly 2 args
+
+
+Fixes: https://github.com/rsyslog/rsyslog/issues/499
+
+---
+ grammar/rainerscript.c | 2 +-
+ tests/Makefile.am | 6 ++++++
+ tests/rscript_re_extract.sh | 14 ++++++++++++++
+ tests/rscript_re_match.sh | 14 ++++++++++++++
+ tests/testsuites/rscript_re_extract.conf | 9 +++++++++
+ tests/testsuites/rscript_re_match.conf | 10 ++++++++++
+ 6 files changed, 54 insertions(+), 1 deletion(-)
+ create mode 100755 tests/rscript_re_extract.sh
+ create mode 100755 tests/rscript_re_match.sh
+ create mode 100644 tests/testsuites/rscript_re_extract.conf
+ create mode 100644 tests/testsuites/rscript_re_match.conf
+
+diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
+index f02e1fe..17f785e 100644
+--- a/grammar/rainerscript.c
++++ b/grammar/rainerscript.c
+@@ -3747,7 +3747,7 @@ initFunc_re_match(struct cnffunc *func)
+ regex_t *re;
+ DEFiRet;
+
+- if(func->nParams != 2) {
++ if(func->nParams < 2) {
+ parser_errmsg("rsyslog logic error in line %d of file %s\n",
+ __LINE__, __FILE__);
+ FINALIZE;
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 914d947..d77728a 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -120,6 +120,8 @@ TESTS += \
+ rscript_replace_complex.sh \
+ rscript_wrap2.sh \
+ rscript_wrap3.sh \
++ rscript_re_extract.sh \
++ rscript_re_match.sh \
+ rs_optimizer_pri.sh \
+ cee_simple.sh \
+ cee_diskqueue.sh \
+@@ -854,6 +856,10 @@ EXTRA_DIST= \
+ testsuites/stop_when_array_has_element.conf \
+ key_dereference_on_uninitialized_variable_space.sh \
+ testsuites/key_dereference_on_uninitialized_variable_space.conf \
++ rscript_re_extract.sh \
++ testsuites/rscript_re_extract.conf \
++ rscript_re_match.sh \
++ testsuites/rscript_re_match.conf \
+ cfg.sh
+
+ # TODO: re-enable
+diff --git a/tests/rscript_re_extract.sh b/tests/rscript_re_extract.sh
+new file mode 100755
+index 0000000..930448c
+--- /dev/null
++++ b/tests/rscript_re_extract.sh
+@@ -0,0 +1,14 @@
++#!/bin/bash
++# added 2015-09-29 by singh.janmejay
++# This file is part of the rsyslog project, released under ASL 2.0
++echo ===============================================================================
++echo \[rscript_re_extract.sh\]: test re_extract rscript-fn
++. $srcdir/diag.sh init
++. $srcdir/diag.sh startup rscript_re_extract.conf
++. $srcdir/diag.sh tcpflood -m 1 -I $srcdir/testsuites/date_time_msg
++echo doing shutdown
++. $srcdir/diag.sh shutdown-when-empty
++echo wait on shutdown
++. $srcdir/diag.sh wait-shutdown
++. $srcdir/diag.sh content-check "*Number is 19597*"
++. $srcdir/diag.sh exit
+diff --git a/tests/rscript_re_match.sh b/tests/rscript_re_match.sh
+new file mode 100755
+index 0000000..d2e212d
+--- /dev/null
++++ b/tests/rscript_re_match.sh
+@@ -0,0 +1,14 @@
++#!/bin/bash
++# added 2015-09-29 by singh.janmejay
++# This file is part of the rsyslog project, released under ASL 2.0
++echo ===============================================================================
++echo \[rscript_re_match.sh\]: test re_match rscript-fn
++. $srcdir/diag.sh init
++. $srcdir/diag.sh startup rscript_re_match.conf
++. $srcdir/diag.sh tcpflood -m 1 -I $srcdir/testsuites/date_time_msg
++echo doing shutdown
++. $srcdir/diag.sh shutdown-when-empty
++echo wait on shutdown
++. $srcdir/diag.sh wait-shutdown
++. $srcdir/diag.sh content-check "*Matched*"
++. $srcdir/diag.sh exit
+diff --git a/tests/testsuites/rscript_re_extract.conf b/tests/testsuites/rscript_re_extract.conf
+new file mode 100644
+index 0000000..6c71e53
+--- /dev/null
++++ b/tests/testsuites/rscript_re_extract.conf
+@@ -0,0 +1,9 @@
++$IncludeConfig diag-common.conf
++template(name="outfmt" type="string" string="*Number is %$.number%*\n")
++
++module(load="../plugins/imtcp/.libs/imtcp")
++input(type="imtcp" port="13514")
++
++set $.number = re_extract($msg, '.* ([0-9]+)$', 0, 1, 'none');
++
++action(type="omfile" file="./rsyslog.out.log" template="outfmt")
+diff --git a/tests/testsuites/rscript_re_match.conf b/tests/testsuites/rscript_re_match.conf
+new file mode 100644
+index 0000000..3e0f36f
+--- /dev/null
++++ b/tests/testsuites/rscript_re_match.conf
+@@ -0,0 +1,10 @@
++$IncludeConfig diag-common.conf
++template(name="outfmt" type="string" string="*Matched*\n")
++
++module(load="../plugins/imtcp/.libs/imtcp")
++input(type="imtcp" port="13514")
++
++if (re_match($msg, '.* ([0-9]+)$')) then {
++ action(type="omfile" file="./rsyslog.out.log" template="outfmt")
++}
++
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.13.0-lookup-table-reload-bugfix.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.13.0-lookup-table-reload-bugfix.patch
new file mode 100644
index 0000000..b426180
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.13.0-lookup-table-reload-bugfix.patch
@@ -0,0 +1,141 @@
+From 3a10a78edeef9725f69a24d633bb394e365145f0 Mon Sep 17 00:00:00 2001
+From: Janmejay Singh <singh.janmejay@gmail.com>
+Date: Wed, 30 Sep 2015 17:24:38 +0530
+Subject: [PATCH] Fixed lookup-table reload bug, which ignored table-length of
+ reloaded table, resulting in additional entries being invisible while
+ looking-up (binary-search would work with old-table-length). This would be a
+ security-issue or may cause a crash if reloaded table is actually smaller
+ (memory access beyond table).
+
+---
+ runtime/lookup.c | 1 +
+ tests/Makefile.am | 5 +++++
+ tests/diag.sh | 4 ++++
+ tests/lookup_table.sh | 24 ++++++++++++++++++++++++
+ tests/testsuites/lookup_table.conf | 9 +++++++++
+ tests/testsuites/xlate.lkp_tbl | 5 +++++
+ tests/testsuites/xlate_more.lkp_tbl | 6 ++++++
+ 7 files changed, 55 insertions(+)
+ create mode 100755 tests/lookup_table.sh
+ create mode 100644 tests/testsuites/lookup_table.conf
+ create mode 100644 tests/testsuites/xlate.lkp_tbl
+ create mode 100644 tests/testsuites/xlate_more.lkp_tbl
+
+diff --git a/runtime/lookup.c b/runtime/lookup.c
+index 096bf09..5aa00b9 100644
+--- a/runtime/lookup.c
++++ b/runtime/lookup.c
+@@ -203,6 +203,7 @@ lookupReload(lookup_t *pThis)
+ }
+ free(pThis->d.strtab);
+ pThis->d.strtab = newlu.d.strtab; /* hand table AND ALL STRINGS over! */
++ pThis->nmemb = newlu.nmemb;
+ pthread_rwlock_unlock(&pThis->rwlock);
+ errmsg.LogError(0, RS_RET_OK, "lookup table '%s' reloaded from file '%s'",
+ pThis->name, pThis->filename);
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index d77728a..49cb641 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -130,6 +130,7 @@ TESTS += \
+ incltest_dir_wildcard.sh \
+ incltest_dir_empty_wildcard.sh \
+ linkedlistqueue.sh \
++ lookup_table.sh \
+ key_dereference_on_uninitialized_variable_space.sh
+
+
+@@ -860,6 +861,10 @@ EXTRA_DIST= \
+ testsuites/rscript_re_extract.conf \
+ rscript_re_match.sh \
+ testsuites/rscript_re_match.conf \
++ lookup_table.sh \
++ testsuites/lookup_table.conf \
++ testsuites/xlate.lkp_tbl \
++ testsuites/xlate_more.lkp_tbl \
+ cfg.sh
+
+ # TODO: re-enable
+diff --git a/tests/diag.sh b/tests/diag.sh
+index 95d6adb..c489fff 100755
+--- a/tests/diag.sh
++++ b/tests/diag.sh
+@@ -195,6 +195,10 @@ case $1 in
+ echo WaitMainQueueEmpty | ./diagtalker || . $srcdir/diag.sh error-exit $?
+ fi
+ ;;
++ 'issue-HUP') # shut rsyslogd down when main queue is empty. $2 is the instance.
++ kill -HUP `cat rsyslog$2.pid`
++ ./msleep 1000
++ ;;
+ 'shutdown-when-empty') # shut rsyslogd down when main queue is empty. $2 is the instance.
+ if [ "$2" == "2" ]
+ then
+diff --git a/tests/lookup_table.sh b/tests/lookup_table.sh
+new file mode 100755
+index 0000000..fae2fab
+--- /dev/null
++++ b/tests/lookup_table.sh
+@@ -0,0 +1,24 @@
++#!/bin/bash
++# added 2015-09-30 by singh.janmejay
++# This file is part of the rsyslog project, released under ASL 2.0
++echo ===============================================================================
++echo \[lookup_table_reload.sh\]: test for lookup-table and HUP based reloading of it
++. $srcdir/diag.sh init
++cp $srcdir/testsuites/xlate.lkp_tbl $srcdir/xlate.lkp_tbl
++. $srcdir/diag.sh startup lookup_table.conf
++. $srcdir/diag.sh injectmsg 0 3
++. $srcdir/diag.sh wait-queueempty
++. $srcdir/diag.sh content-check "msgnum:00000000: foo_old"
++. $srcdir/diag.sh content-check "msgnum:00000001: bar_old"
++. $srcdir/diag.sh assert-content-missing "baz"
++cp $srcdir/testsuites/xlate_more.lkp_tbl $srcdir/xlate.lkp_tbl
++. $srcdir/diag.sh issue-HUP
++. $srcdir/diag.sh injectmsg 0 3
++echo doing shutdown
++. $srcdir/diag.sh shutdown-when-empty
++echo wait on shutdown
++. $srcdir/diag.sh wait-shutdown
++. $srcdir/diag.sh content-check "msgnum:00000000: foo_new"
++. $srcdir/diag.sh content-check "msgnum:00000001: bar_new"
++. $srcdir/diag.sh content-check "msgnum:00000002: baz"
++. $srcdir/diag.sh exit
+diff --git a/tests/testsuites/lookup_table.conf b/tests/testsuites/lookup_table.conf
+new file mode 100644
+index 0000000..29bd805
+--- /dev/null
++++ b/tests/testsuites/lookup_table.conf
+@@ -0,0 +1,9 @@
++$IncludeConfig diag-common.conf
++
++lookup_table(name="xlate" file="xlate.lkp_tbl")
++
++template(name="outfmt" type="string" string="- %msg% %$.lkp%\n")
++
++set $.lkp = lookup("xlate", $msg);
++
++action(type="omfile" file="./rsyslog.out.log" template="outfmt")
+diff --git a/tests/testsuites/xlate.lkp_tbl b/tests/testsuites/xlate.lkp_tbl
+new file mode 100644
+index 0000000..30e2796
+--- /dev/null
++++ b/tests/testsuites/xlate.lkp_tbl
+@@ -0,0 +1,5 @@
++{
++ "table":[
++ {"index":" msgnum:00000000:", "value":"foo_old" },
++ {"index":" msgnum:00000001:", "value":"bar_old" }]
++}
+diff --git a/tests/testsuites/xlate_more.lkp_tbl b/tests/testsuites/xlate_more.lkp_tbl
+new file mode 100644
+index 0000000..2d3f452
+--- /dev/null
++++ b/tests/testsuites/xlate_more.lkp_tbl
+@@ -0,0 +1,6 @@
++{
++ "table":[
++ {"index":" msgnum:00000000:", "value":"foo_new" },
++ {"index":" msgnum:00000001:", "value":"bar_new" },
++ {"index":" msgnum:00000002:", "value":"baz" }]
++}
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1 b/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1
new file mode 100644
index 0000000..da48c01
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1
@@ -0,0 +1,30 @@
+# /etc/conf.d/rsyslog
+
+# Configuration file
+#RSYSLOG_CONFIGFILE="/etc/rsyslog.conf"
+
+# PID file
+# If you should ever change this, remember to update
+# "/etc/logrotate.d/rsyslog", too.
+#RSYSLOG_PIDFILE="/run/rsyslogd.pid"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+#RSYSLOG_SSDARGS="--wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (60 + 5 seconds
+# per default) when you are stopping the service.
+# You need to increase the value when you are working with a large queue.
+# See http://www.rsyslog.com/doc/queues.html for further information.
+#RSYSLOG_TERMTIMEOUT="TERM/60/KILL/5"
+
+
+# Options to rsyslogd
+# See rsyslogd(8) for more details
+# Notes:
+# * Do not specify another PIDFILE but use the variable above to change the location
+# * Do not specify another CONFIGFILE but use the variable above to change the location
+#RSYSLOG_OPTS=""
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1 b/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
new file mode 100644
index 0000000..078740d
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
@@ -0,0 +1,73 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
+RSYSLOG_PIDFILE=${RSYSLOG_PIDFILE:-"/run/rsyslogd.pid"}
+RSYSLOG_SSDARGS=${RSYSLOG_SSDARGS:-"--wait 1000"}
+RSYSLOG_TERMTIMEOUT=${RSYSLOG_TERMTIMEOUT:-"TERM/60/KILL/5"}
+RSYSLOG_OPTS=${RSYSLOG_OPTS:-""}
+
+command="/usr/sbin/rsyslogd"
+command_args="${RSYSLOG_OPTS} -f \"${RSYSLOG_CONFIGFILE}\" -i \"${RSYSLOG_PIDFILE}\""
+start_stop_daemon_args="${RSYSLOG_SSDARGS}"
+pidfile="${RSYSLOG_PIDFILE}"
+retry="${RSYSLOG_TERMTIMEOUT}"
+
+required_files="${RSYSLOG_CONFIGFILE}"
+
+description="RSYSLOG is the rocket-fast system for log processing (syslog replacement)."
+
+extra_commands="configtest"
+extra_started_commands="rotate"
+
+description_configtest="Run rsyslogd's internal config check."
+
+description_rotate="Sends rsyslogd a signal to re-open its log files."
+
+depend() {
+ need clock hostname localmount
+ provide logger
+}
+
+start_pre() {
+ if [ "${RC_CMD}" != "restart" ]; then
+ configtest || return 1
+ fi
+}
+
+stop_pre() {
+ if [ "${RC_CMD}" = "restart" ]; then
+ configtest || return 1
+ fi
+}
+
+stop_post() {
+ if [ -f "${RSYSLOG_PIDFILE}" ]; then
+ vebegin "Removing stale PID file"
+ rm --force "${RSYSLOG_PIDFILE}"
+ veend $?
+ fi
+}
+
+configtest() {
+ local _command_args="-N 999 -f \"${RSYSLOG_CONFIGFILE}\""
+ local _retval=0
+
+ ebegin "Checking rsyslogd's configuration"
+ eval ${command} ${_command_args} >/dev/null 2>&1
+ _retval=$?
+
+ if [ ${_retval} -ne 0 ]; then
+ eval ${command} ${_command_args}
+ fi
+
+ eend ${_retval} "failed, please correct errors above"
+}
+
+rotate() {
+ ebegin "Re-opening rsyslogd logs"
+ start-stop-daemon --signal SIGHUP --pidfile "${RSYSLOG_PIDFILE}"
+ eend $?
+}
diff --git a/app-admin/rsyslog/rsyslog-8.12.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.12.0-r1.ebuild
index a7fac74..ff39a40 100644
--- a/app-admin/rsyslog/rsyslog-8.12.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.12.0-r1.ebuild
@@ -55,7 +55,10 @@
mysql? ( virtual/mysql )
normalize? (
>=dev-libs/libee-0.4.0
- >=dev-libs/liblognorm-1.1.0:=
+ ( || (
+ >=dev-libs/liblognorm-1.1.0:=
+ <dev-libs/liblognorm-1.1.2:=
+ ) )
)
omudpspoof? ( >=net-libs/libnet-1.1.6 )
postgres? ( >=dev-db/postgresql-8.4.20:= )
diff --git a/app-admin/rsyslog/rsyslog-8.12.0.ebuild b/app-admin/rsyslog/rsyslog-8.12.0.ebuild
deleted file mode 100644
index 81f79c4..0000000
--- a/app-admin/rsyslog/rsyslog-8.12.0.ebuild
+++ /dev/null
@@ -1,414 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-
-BRANCH="8-stable"
-
-PATCHES=()
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="
- git://github.com/rsyslog/${PN}.git
- https://github.com/rsyslog/${PN}.git
- "
-
- DOC_REPO_URI="
- git://github.com/rsyslog/${PN}-doc.git
- https://github.com/rsyslog/${PN}-doc.git
- "
-
- inherit git-r3
-else
- SRC_URI="
- http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
- doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
- "
- KEYWORDS="~amd64 ~arm ~hppa ~x86"
-
- PATCHES+=( "${FILESDIR}"/8-stable/40-rsyslog-fix-parallel-build-issue-479.patch )
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof
-postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
-
-RDEPEND="
- >=dev-libs/json-c-0.11:=
- >=dev-libs/libestr-0.1.9
- >=dev-libs/liblogging-1.0.1:=[stdlog]
- >=sys-libs/zlib-1.2.5
- dbi? ( >=dev-db/libdbi-0.8.3 )
- elasticsearch? ( >=net-misc/curl-7.35.0 )
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
- jemalloc? ( >=dev-libs/jemalloc-3.3.1 )
- kerberos? ( virtual/krb5 )
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
- mysql? ( virtual/mysql )
- normalize? (
- >=dev-libs/libee-0.4.0
- >=dev-libs/liblognorm-1.1.0:=
- )
- omudpspoof? ( >=net-libs/libnet-1.1.6 )
- postgres? ( >=dev-db/postgresql-8.4.20:= )
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 )
- redis? ( >=dev-libs/hiredis-0.11.0 )
- relp? ( >=dev-libs/librelp-1.2.5 )
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
- rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:= )
- snmp? ( >=net-analyzer/net-snmp-5.7.2 )
- ssl? ( >=net-libs/gnutls-2.12.23 )
- systemd? ( >=sys-apps/systemd-208 )
- zeromq? ( >=net-libs/czmq-1.2.0 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-if [[ ${PV} == "9999" ]]; then
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
- DEPEND+=" >=sys-devel/flex-2.5.39-r1"
- DEPEND+=" >=sys-devel/bison-2.4.3"
- DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
-
-DOCS=(
- AUTHORS
- ChangeLog
- "${FILESDIR}"/${BRANCH}/README.gentoo
-)
-
-src_unpack() {
- if [[ ${PV} == "9999" ]]; then
- git-r3_fetch
- git-r3_checkout
- else
- unpack ${P}.tar.gz
- fi
-
- if use doc; then
- if [[ ${PV} == "9999" ]]; then
- local _EGIT_BRANCH=
- if [ -n "${EGIT_BRANCH}" ]; then
- # Cannot use rsyslog commits/branches for documentation repository
- _EGIT_BRANCH=${EGIT_BRANCH}
- unset EGIT_BRANCH
- fi
-
- git-r3_fetch "${DOC_REPO_URI}"
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
- if [ -n "${_EGIT_BRANCH}" ]; then
- # Restore previous EGIT_BRANCH information
- EGIT_BRANCH=${_EGIT_BRANCH}
- fi
- else
- local doc_tarball="${PN}-doc-${PV}.tar.gz"
-
- cd "${S}" || die "Cannot change dir into '$S'"
- mkdir docs || die "Failed to create docs directory"
- cd docs || die "Failed to change dir into '${S}/docs'"
- unpack ${doc_tarball}
- fi
- fi
-}
-
-src_configure() {
- # Maintainer notes:
- # * Guardtime support is missing because libgt isn't yet available
- # in portage.
- # * Hadoop's HDFS file system output module is currently not
- # supported in Gentoo because nobody is able to test it
- # (JAVA dependency).
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
- # upstream PR 129 and 136) so we need to export HIREDIS_*
- # variables because rsyslog's build system depends on pkg-config.
-
- if use redis; then
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
- fi
-
- local myeconfargs=(
- --disable-debug-symbols
- --disable-generate-man-pages
- --without-valgrind-testbench
- $(use_enable test testbench)
- # Input Plugins without depedencies
- --enable-imdiag
- --enable-imfile
- --enable-impstats
- --enable-imptcp
- # Message Modificiation Plugins without depedencies
- --enable-mmanon
- --enable-mmaudit
- --enable-mmfields
- --enable-mmjsonparse
- --enable-mmpstrucdata
- --enable-mmsequence
- --enable-mmutf8fix
- # Output Modification Plugins without dependencies
- --enable-mail
- --enable-omprog
- --enable-omruleset
- --enable-omstdout
- --enable-omuxsock
- # Misc
- --enable-pmaixforwardedfrom
- --enable-pmciscoios
- --enable-pmcisconames
- --enable-pmlastmsg
- --enable-pmsnare
- # DB
- $(use_enable dbi libdbi)
- $(use_enable mongodb ommongodb)
- $(use_enable mysql)
- $(use_enable postgres pgsql)
- $(use_enable redis omhiredis)
- # Debug
- $(use_enable debug)
- $(use_enable debug diagtools)
- $(use_enable debug memcheck)
- $(use_enable debug rtinst)
- $(use_enable debug valgrind)
- # Misc
- $(use_enable elasticsearch)
- $(use_enable gcrypt libgcrypt)
- $(use_enable jemalloc)
- $(use_enable kerberos gssapi-krb5)
- $(use_enable normalize mmnormalize)
- $(use_enable omudpspoof)
- $(use_enable rabbitmq omrabbitmq)
- $(use_enable relp)
- $(use_enable rfc3195)
- $(use_enable rfc5424hmac mmrfc5424addhmac)
- $(use_enable snmp)
- $(use_enable snmp mmsnmptrapd)
- $(use_enable ssl gnutls)
- $(use_enable systemd imjournal)
- $(use_enable systemd omjournal)
- $(use_enable usertools)
- $(use_enable zeromq imzmq3)
- $(use_enable zeromq omzmq3)
- "$(systemd_with_unitdir)"
- )
-
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use doc && [[ "${PV}" == "9999" ]]; then
- einfo "Building documentation ..."
- local doc_dir="${S}/docs"
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
- sphinx-build -b html source build || die "Building documentation failed!"
- fi
-}
-
-src_test() {
- local _has_increased_ulimit=
-
- if ulimit -n 3072; then
- _has_increased_ulimit="true"
- fi
-
- if ! emake --jobs 1 check; then
- eerror "Test suite failed! :("
-
- if [ -z "${_has_increased_ulimit}" ]; then
- eerror "Probably because open file limit couldn't be set to 3072."
- fi
-
- if has userpriv $FEATURES; then
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
- "before you submit a bug report."
- fi
-
- fi
-}
-
-src_install() {
- use doc && HTML_DOCS=( "${S}/docs/build/" )
- autotools-utils_src_install
-
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
-
- keepdir /var/empty/dev
- keepdir /var/spool/${PN}
- keepdir /etc/ssl/${PN}
- keepdir /etc/${PN}.d
-
- insinto /etc
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
- insinto /etc/rsyslog.d/
- doins "${FILESDIR}/${BRANCH}/50-default.conf"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-
- if use mysql; then
- insinto /usr/share/doc/${PF}/scripts/mysql
- doins plugins/ommysql/createDB.sql
- fi
-
- if use postgres; then
- insinto /usr/share/doc/${PF}/scripts/pgsql
- doins plugins/ompgsql/createDB.sql
- fi
-}
-
-pkg_postinst() {
- local advertise_readme=0
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
-
- advertise_readme=1
-
- if use mysql || use postgres; then
- echo
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
- elog " /usr/share/doc/${PF}/scripts"
- fi
-
- if use ssl; then
- echo
- elog "To create a default CA and certificates for your server and clients, run:"
- elog " emerge --config =${PF}"
- elog "on your logging server. You can run it several times,"
- elog "once for each logging client. The client certificates will be signed"
- elog "using the CA certificate generated during the first run."
- fi
- fi
-
- if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0 ]]; then
- # Show this message until rsyslog-8.x
- echo
- elog "Since ${PN}-7.6.3 we no longer use the catch-all log target"
- elog "\"/var/log/syslog\" due to its redundancy to the other log targets."
-
- advertise_readme=1
- fi
-
- if [[ ${advertise_readme} -gt 0 ]]; then
- # We need to show the README file location
-
- echo ""
- elog "Please read"
- elog ""
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
- elog ""
- elog "for more details."
- fi
-}
-
-pkg_config() {
- if ! use ssl ; then
- einfo "There is nothing to configure for rsyslog unless you"
- einfo "used USE=ssl to build it."
- return 0
- fi
-
- # Make sure the certificates directory exists
- CERTDIR="${EROOT}/etc/ssl/${PN}"
- if [ ! -d "${CERTDIR}" ]; then
- mkdir "${CERTDIR}" || die
- fi
- einfo "Your certificates will be stored in ${CERTDIR}"
-
- # Create a default CA if needed
- if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = Portage automated CA
- ca
- cert_signing_key
- expiration_days = 3650
- _EOF
-
- certtool --generate-self-signed \
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- # Create the server certificate
- echo
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for server ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = ${CN}
- tls_www_server
- dns_name = ${CN}
- expiration_days = 3650
- _EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- else
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
- fi
-
- # Create a client certificate
- echo
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for client ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = ${CN}
- tls_www_client
- dns_name = ${CN}
- expiration_days = 3650
- _EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- rm -f "${T}/${PF}.$$"
-
- echo
- einfo "Here is the documentation on how to encrypt your log traffic:"
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.13.0.ebuild b/app-admin/rsyslog/rsyslog-8.13.0.ebuild
new file mode 100644
index 0000000..34085ef
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.13.0.ebuild
@@ -0,0 +1,423 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="http://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+PATCHES=()
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="
+ git://github.com/rsyslog/${PN}.git
+ https://github.com/rsyslog/${PN}.git
+ "
+
+ DOC_REPO_URI="
+ git://github.com/rsyslog/${PN}-doc.git
+ https://github.com/rsyslog/${PN}-doc.git
+ "
+
+ inherit git-r3
+else
+ SRC_URI="
+ http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+ doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+ "
+ KEYWORDS="~amd64 ~arm ~hppa ~x86"
+
+ PATCHES+=( "${FILESDIR}"/${BRANCH}/50-${PN}-8.12.0-fix-re_extract.patch )
+ PATCHES+=( "${FILESDIR}"/${BRANCH}/50-${PN}-8.13.0-lookup-table-reload-bugfix.patch )
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos libressl mongodb mysql normalize omudpspoof"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
+
+RDEPEND="
+ >=dev-libs/json-c-0.11:=
+ >=dev-libs/libestr-0.1.9
+ >=dev-libs/liblogging-1.0.1:=[stdlog]
+ >=sys-libs/zlib-1.2.5
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ elasticsearch? ( >=net-misc/curl-7.35.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+ jemalloc? ( >=dev-libs/jemalloc-3.3.1 )
+ kerberos? ( virtual/krb5 )
+ mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
+ mysql? ( virtual/mysql )
+ normalize? (
+ >=dev-libs/libee-0.4.0
+ >=dev-libs/liblognorm-1.1.2:=
+ )
+ omudpspoof? ( >=net-libs/libnet-1.1.6 )
+ postgres? ( >=dev-db/postgresql-8.4.20:= )
+ rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 )
+ redis? ( >=dev-libs/hiredis-0.11.0 )
+ relp? ( >=dev-libs/librelp-1.2.5 )
+ rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+ rfc5424hmac? (
+ !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+ ssl? ( >=net-libs/gnutls-2.12.23 )
+ systemd? ( >=sys-apps/systemd-208 )
+ zeromq? ( >=net-libs/czmq-1.2.0 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+ DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+ DEPEND+=" >=sys-devel/bison-2.4.3"
+ DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+# Maitainer note : open a bug to upstream
+# showing that building in a separate dir fails
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
+
+DOCS=(
+ AUTHORS
+ ChangeLog
+ "${FILESDIR}"/${BRANCH}/README.gentoo
+)
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_fetch
+ git-r3_checkout
+ else
+ unpack ${P}.tar.gz
+ fi
+
+ if use doc; then
+ if [[ ${PV} == "9999" ]]; then
+ local _EGIT_BRANCH=
+ if [ -n "${EGIT_BRANCH}" ]; then
+ # Cannot use rsyslog commits/branches for documentation repository
+ _EGIT_BRANCH=${EGIT_BRANCH}
+ unset EGIT_BRANCH
+ fi
+
+ git-r3_fetch "${DOC_REPO_URI}"
+ git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+ if [ -n "${_EGIT_BRANCH}" ]; then
+ # Restore previous EGIT_BRANCH information
+ EGIT_BRANCH=${_EGIT_BRANCH}
+ fi
+ else
+ local doc_tarball="${PN}-doc-${PV}.tar.gz"
+
+ cd "${S}" || die "Cannot change dir into '$S'"
+ mkdir docs || die "Failed to create docs directory"
+ cd docs || die "Failed to change dir into '${S}/docs'"
+ unpack ${doc_tarball}
+ fi
+ fi
+}
+
+src_configure() {
+ # Maintainer notes:
+ # * Guardtime support is missing because libgt isn't yet available
+ # in portage.
+ # * Hadoop's HDFS file system output module is currently not
+ # supported in Gentoo because nobody is able to test it
+ # (JAVA dependency).
+ # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+ # upstream PR 129 and 136) so we need to export HIREDIS_*
+ # variables because rsyslog's build system depends on pkg-config.
+
+ if use redis; then
+ export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+ export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+ fi
+
+ local myeconfargs=(
+ --disable-debug-symbols
+ --disable-generate-man-pages
+ --without-valgrind-testbench
+ $(use_enable test testbench)
+ # Input Plugins without depedencies
+ --enable-imdiag
+ --enable-imfile
+ --enable-impstats
+ --enable-imptcp
+ # Message Modificiation Plugins without depedencies
+ --enable-mmanon
+ --enable-mmaudit
+ --enable-mmfields
+ --enable-mmjsonparse
+ --enable-mmpstrucdata
+ --enable-mmsequence
+ --enable-mmutf8fix
+ # Output Modification Plugins without dependencies
+ --enable-mail
+ --enable-omprog
+ --enable-omruleset
+ --enable-omstdout
+ --enable-omuxsock
+ # Misc
+ --enable-pmaixforwardedfrom
+ --enable-pmciscoios
+ --enable-pmcisconames
+ --enable-pmlastmsg
+ --enable-pmsnare
+ # DB
+ $(use_enable dbi libdbi)
+ $(use_enable mongodb ommongodb)
+ $(use_enable mysql)
+ $(use_enable postgres pgsql)
+ $(use_enable redis omhiredis)
+ # Debug
+ $(use_enable debug)
+ $(use_enable debug diagtools)
+ $(use_enable debug memcheck)
+ $(use_enable debug rtinst)
+ $(use_enable debug valgrind)
+ # Misc
+ $(use_enable elasticsearch)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable jemalloc)
+ $(use_enable kerberos gssapi-krb5)
+ $(use_enable normalize mmnormalize)
+ $(use_enable omudpspoof)
+ $(use_enable rabbitmq omrabbitmq)
+ $(use_enable relp)
+ $(use_enable rfc3195)
+ $(use_enable rfc5424hmac mmrfc5424addhmac)
+ $(use_enable snmp)
+ $(use_enable snmp mmsnmptrapd)
+ $(use_enable ssl gnutls)
+ $(use_enable systemd imjournal)
+ $(use_enable systemd omjournal)
+ $(use_enable usertools)
+ $(use_enable zeromq imzmq3)
+ $(use_enable zeromq omzmq3)
+ "$(systemd_with_unitdir)"
+ )
+
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+
+ if use doc && [[ "${PV}" == "9999" ]]; then
+ einfo "Building documentation ..."
+ local doc_dir="${S}/docs"
+ cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+ sphinx-build -b html source build || die "Building documentation failed!"
+ fi
+}
+
+src_test() {
+ local _has_increased_ulimit=
+
+ # When adding new tests via patches we have to make them executable
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ if ulimit -n 3072; then
+ _has_increased_ulimit="true"
+ fi
+
+ if ! emake --jobs 1 check; then
+ eerror "Test suite failed! :("
+
+ if [ -z "${_has_increased_ulimit}" ]; then
+ eerror "Probably because open file limit couldn't be set to 3072."
+ fi
+
+ if has userpriv $FEATURES; then
+ eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+ "before you submit a bug report."
+ fi
+
+ fi
+}
+
+src_install() {
+ use doc && HTML_DOCS=( "${S}/docs/build/" )
+ autotools-utils_src_install
+
+ newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+ newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+ keepdir /var/empty/dev
+ keepdir /var/spool/${PN}
+ keepdir /etc/ssl/${PN}
+ keepdir /etc/${PN}.d
+
+ insinto /etc
+ newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+ insinto /etc/rsyslog.d/
+ doins "${FILESDIR}/${BRANCH}/50-default.conf"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+ if use mysql; then
+ insinto /usr/share/doc/${PF}/scripts/mysql
+ doins plugins/ommysql/createDB.sql
+ fi
+
+ if use postgres; then
+ insinto /usr/share/doc/${PF}/scripts/pgsql
+ doins plugins/ompgsql/createDB.sql
+ fi
+}
+
+pkg_postinst() {
+ local advertise_readme=0
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+
+ advertise_readme=1
+
+ if use mysql || use postgres; then
+ echo
+ elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+ elog " /usr/share/doc/${PF}/scripts"
+ fi
+
+ if use ssl; then
+ echo
+ elog "To create a default CA and certificates for your server and clients, run:"
+ elog " emerge --config =${PF}"
+ elog "on your logging server. You can run it several times,"
+ elog "once for each logging client. The client certificates will be signed"
+ elog "using the CA certificate generated during the first run."
+ fi
+ fi
+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0 ]]; then
+ # Show this message until rsyslog-8.x
+ echo
+ elog "Since ${PN}-7.6.3 we no longer use the catch-all log target"
+ elog "\"/var/log/syslog\" due to its redundancy to the other log targets."
+
+ advertise_readme=1
+ fi
+
+ if [[ ${advertise_readme} -gt 0 ]]; then
+ # We need to show the README file location
+
+ echo ""
+ elog "Please read"
+ elog ""
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ elog ""
+ elog "for more details."
+ fi
+}
+
+pkg_config() {
+ if ! use ssl ; then
+ einfo "There is nothing to configure for rsyslog unless you"
+ einfo "used USE=ssl to build it."
+ return 0
+ fi
+
+ # Make sure the certificates directory exists
+ CERTDIR="${EROOT}/etc/ssl/${PN}"
+ if [ ! -d "${CERTDIR}" ]; then
+ mkdir "${CERTDIR}" || die
+ fi
+ einfo "Your certificates will be stored in ${CERTDIR}"
+
+ # Create a default CA if needed
+ if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
+ einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = Portage automated CA
+ ca
+ cert_signing_key
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-self-signed \
+ --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ # Create the server certificate
+ echo
+ einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for server ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_server
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ else
+ einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+ fi
+
+ # Create a client certificate
+ echo
+ einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for client ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_client
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ rm -f "${T}/${PF}.$$"
+
+ echo
+ einfo "Here is the documentation on how to encrypt your log traffic:"
+ einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.9.0.ebuild b/app-admin/rsyslog/rsyslog-8.9.0.ebuild
deleted file mode 100644
index eca7028..0000000
--- a/app-admin/rsyslog/rsyslog-8.9.0.ebuild
+++ /dev/null
@@ -1,409 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-
-BRANCH="8-stable"
-
-PATCHES=(
- "${FILESDIR}"/${BRANCH}/10-respect_CFLAGS-r1.patch
-)
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="
- git://github.com/rsyslog/${PN}.git
- https://github.com/rsyslog/${PN}.git
- "
-
- DOC_REPO_URI="
- git://github.com/rsyslog/${PN}-doc.git
- https://github.com/rsyslog/${PN}-doc.git
- "
-
- inherit git-r3
-else
- SRC_URI="
- http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
- doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
- "
- KEYWORDS="~amd64 ~arm ~hppa ~x86"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
-
-RDEPEND="
- >=dev-libs/json-c-0.11:=
- >=dev-libs/libestr-0.1.9
- >=dev-libs/liblogging-1.0.1:=[stdlog]
- >=sys-libs/zlib-1.2.5
- dbi? ( >=dev-db/libdbi-0.8.3 )
- elasticsearch? ( >=net-misc/curl-7.35.0 )
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
- jemalloc? ( >=dev-libs/jemalloc-3.3.1 )
- kerberos? ( virtual/krb5 )
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
- mysql? ( virtual/mysql )
- normalize? (
- >=dev-libs/libee-0.4.0
- >=dev-libs/liblognorm-1.1.0:=
- )
- omudpspoof? ( >=net-libs/libnet-1.1.6 )
- postgres? ( >=dev-db/postgresql-8.4.20:= )
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 )
- redis? ( >=dev-libs/hiredis-0.11.0 )
- relp? ( >=dev-libs/librelp-1.2.5 )
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
- rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:= )
- snmp? ( >=net-analyzer/net-snmp-5.7.2 )
- ssl? ( >=net-libs/gnutls-2.12.23 )
- systemd? ( >=sys-apps/systemd-208 )
- zeromq? ( >=net-libs/czmq-1.2.0 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-if [[ ${PV} == "9999" ]]; then
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-fi
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
-
-DOCS=(
- AUTHORS
- ChangeLog
- "${FILESDIR}"/${BRANCH}/README.gentoo
-)
-
-src_unpack() {
- if [[ ${PV} == "9999" ]]; then
- git-r3_fetch
- git-r3_checkout
- else
- unpack ${P}.tar.gz
- fi
-
- if use doc; then
- if [[ ${PV} == "9999" ]]; then
- local _EGIT_BRANCH=
- if [ -n "${EGIT_BRANCH}" ]; then
- # Cannot use rsyslog commits/branches for documentation repository
- _EGIT_BRANCH=${EGIT_BRANCH}
- unset EGIT_BRANCH
- fi
-
- git-r3_fetch "${DOC_REPO_URI}"
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
- if [ -n "${_EGIT_BRANCH}" ]; then
- # Restore previous EGIT_BRANCH information
- EGIT_BRANCH=${_EGIT_BRANCH}
- fi
- else
- local doc_tarball="${PN}-doc-${PV}.tar.gz"
-
- cd "${S}" || die "Cannot change dir into '$S'"
- mkdir docs || die "Failed to create docs directory"
- cd docs || die "Failed to change dir into '${S}/docs'"
- unpack ${doc_tarball}
- fi
- fi
-}
-
-src_configure() {
- # Maintainer notes:
- # * Guardtime support is missing because libgt isn't yet available
- # in portage.
- # * Hadoop's HDFS file system output module is currently not
- # supported in Gentoo because nobody is able to test it
- # (JAVA dependency).
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
- # upstream PR 129 and 136) so we need to export HIREDIS_*
- # variables because rsyslog's build system depends on pkg-config.
-
- if use redis; then
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
- fi
-
- local myeconfargs=(
- --disable-generate-man-pages
- --without-valgrind-testbench
- $(use_enable test testbench)
- # Input Plugins without depedencies
- --enable-imdiag
- --enable-imfile
- --enable-impstats
- --enable-imptcp
- # Message Modificiation Plugins without depedencies
- --enable-mmanon
- --enable-mmaudit
- --enable-mmfields
- --enable-mmjsonparse
- --enable-mmpstrucdata
- --enable-mmsequence
- --enable-mmutf8fix
- # Output Modification Plugins without dependencies
- --enable-mail
- --enable-omprog
- --enable-omruleset
- --enable-omstdout
- --enable-omuxsock
- # Misc
- --enable-pmaixforwardedfrom
- --enable-pmciscoios
- --enable-pmcisconames
- --enable-pmlastmsg
- --enable-pmsnare
- # DB
- $(use_enable dbi libdbi)
- $(use_enable mongodb ommongodb)
- $(use_enable mysql)
- $(use_enable postgres pgsql)
- $(use_enable redis omhiredis)
- # Debug
- $(use_enable debug)
- $(use_enable debug diagtools)
- $(use_enable debug memcheck)
- $(use_enable debug rtinst)
- $(use_enable debug valgrind)
- # Misc
- $(use_enable elasticsearch)
- $(use_enable gcrypt libgcrypt)
- $(use_enable jemalloc)
- $(use_enable kerberos gssapi-krb5)
- $(use_enable normalize mmnormalize)
- $(use_enable omudpspoof)
- $(use_enable rabbitmq omrabbitmq)
- $(use_enable relp)
- $(use_enable rfc3195)
- $(use_enable rfc5424hmac mmrfc5424addhmac)
- $(use_enable snmp)
- $(use_enable snmp mmsnmptrapd)
- $(use_enable ssl gnutls)
- $(use_enable systemd imjournal)
- $(use_enable systemd omjournal)
- $(use_enable usertools)
- $(use_enable zeromq imzmq3)
- $(use_enable zeromq omzmq3)
- "$(systemd_with_unitdir)"
- )
-
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use doc && [[ "${PV}" == "9999" ]]; then
- einfo "Building documentation ..."
- local doc_dir="${S}/docs"
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
- sphinx-build -b html source build || die "Building documentation failed!"
- fi
-}
-
-src_test() {
- local _has_increased_ulimit=
-
- if ulimit -n 3072; then
- _has_increased_ulimit="true"
- fi
-
- if ! emake --jobs 1 check; then
- eerror "Test suite failed! :("
-
- if [ -z "${_has_increased_ulimit}" ]; then
- eerror "Probably because open file limit couldn't be set to 3072."
- fi
-
- if has userpriv $FEATURES; then
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
- "before you submit a bug report."
- fi
-
- fi
-}
-
-src_install() {
- use doc && HTML_DOCS=( "${S}/docs/build/" )
- autotools-utils_src_install
-
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
-
- keepdir /var/empty/dev
- keepdir /var/spool/${PN}
- keepdir /etc/ssl/${PN}
- keepdir /etc/${PN}.d
-
- insinto /etc
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
- insinto /etc/rsyslog.d/
- doins "${FILESDIR}/${BRANCH}/50-default.conf"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-
- if use mysql; then
- insinto /usr/share/doc/${PF}/scripts/mysql
- doins plugins/ommysql/createDB.sql
- fi
-
- if use postgres; then
- insinto /usr/share/doc/${PF}/scripts/pgsql
- doins plugins/ompgsql/createDB.sql
- fi
-}
-
-pkg_postinst() {
- local advertise_readme=0
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
-
- advertise_readme=1
-
- if use mysql || use postgres; then
- echo
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
- elog " /usr/share/doc/${PF}/scripts"
- fi
-
- if use ssl; then
- echo
- elog "To create a default CA and certificates for your server and clients, run:"
- elog " emerge --config =${PF}"
- elog "on your logging server. You can run it several times,"
- elog "once for each logging client. The client certificates will be signed"
- elog "using the CA certificate generated during the first run."
- fi
- fi
-
- if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0 ]]; then
- # Show this message until rsyslog-8.x
- echo
- elog "Since ${PN}-7.6.3 we no longer use the catch-all log target"
- elog "\"/var/log/syslog\" due to its redundancy to the other log targets."
-
- advertise_readme=1
- fi
-
- if [[ ${advertise_readme} -gt 0 ]]; then
- # We need to show the README file location
-
- echo ""
- elog "Please read"
- elog ""
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
- elog ""
- elog "for more details."
- fi
-}
-
-pkg_config() {
- if ! use ssl ; then
- einfo "There is nothing to configure for rsyslog unless you"
- einfo "used USE=ssl to build it."
- return 0
- fi
-
- # Make sure the certificates directory exists
- CERTDIR="${EROOT}/etc/ssl/${PN}"
- if [ ! -d "${CERTDIR}" ]; then
- mkdir "${CERTDIR}" || die
- fi
- einfo "Your certificates will be stored in ${CERTDIR}"
-
- # Create a default CA if needed
- if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = Portage automated CA
- ca
- cert_signing_key
- expiration_days = 3650
- _EOF
-
- certtool --generate-self-signed \
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- # Create the server certificate
- echo
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for server ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = ${CN}
- tls_www_server
- dns_name = ${CN}
- expiration_days = 3650
- _EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- else
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
- fi
-
- # Create a client certificate
- echo
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for client ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = ${CN}
- tls_www_client
- dns_name = ${CN}
- expiration_days = 3650
- _EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- rm -f "${T}/${PF}.$$"
-
- echo
- einfo "Here is the documentation on how to encrypt your log traffic:"
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
index 03f6fdf..0d80c99 100644
--- a/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
@@ -30,7 +30,7 @@
systemd? ( sys-apps/systemd )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
dev-libs/libpcre
- dev-libs/openssl:=
+ dev-libs/openssl:0=
>=dev-libs/eventlog-0.2.12
>=dev-libs/glib-2.10.1:2"
DEPEND="${RDEPEND}
diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild
index 67a609a..b3e5802 100644
--- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild
@@ -9,7 +9,7 @@
inherit distutils-r1
SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
DESCRIPTION="Gentoo's installer for web-based applications"
HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
diff --git a/app-antivirus/clamav/clamav-0.98.7-r1.ebuild b/app-antivirus/clamav/clamav-0.98.7-r1.ebuild
new file mode 100644
index 0000000..565b0c5
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.98.7-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic user systemd
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="http://www.clamav.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc"
+
+CDEPEND="bzip2? ( app-arch/bzip2 )
+ clamdtop? ( sys-libs/ncurses:0 )
+ iconv? ( virtual/libiconv )
+ metadata-analysis-api? ( dev-libs/json-c )
+ milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+ dev-libs/libtommath
+ >=sys-libs/zlib-1.2.2
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ sys-devel/libtool"
+# openssl is now *required* see this link as to why
+# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-clamav )"
+
+DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
+
+pkg_setup() {
+ enewgroup clamav
+ enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+ use ppc64 && append-flags -mminimal-toc
+ use uclibc && export ac_cv_type_error_t=yes
+}
+
+src_configure() {
+ econf \
+ --disable-experimental \
+ --disable-fanotify \
+ --enable-id-check \
+ --with-dbdir="${EPREFIX}"/var/lib/clamav \
+ --with-system-tommath \
+ --with-zlib="${EPREFIX}"/usr \
+ $(use_enable bzip2) \
+ $(use_enable clamdtop) \
+ $(use_enable ipv6) \
+ $(use_enable milter) \
+ $(use_enable static-libs static) \
+ $(use_with iconv) \
+ $(use_with metadata-analysis-api libjson /usr)
+}
+
+src_install() {
+ default
+
+ rm -rf "${ED}"/var/lib/clamav
+ newinitd "${FILESDIR}"/clamd.initd-r6 clamd
+ newconfd "${FILESDIR}"/clamd.conf-r1 clamd
+
+ systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
+ systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
+ systemd_dounit "${FILESDIR}/clamd.service"
+ systemd_dounit "${FILESDIR}/freshclamd.service"
+
+ keepdir /var/lib/clamav
+ fowners clamav:clamav /var/lib/clamav
+ keepdir /var/log/clamav
+ fowners clamav:clamav /var/log/clamav
+
+ dodir /etc/logrotate.d
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/clamav.logrotate clamav
+
+ # Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+ sed -i -e "s:^\(Example\):\# \1:" \
+ -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
+ -e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
+ -e "s:.*\(User\) .*:\1 clamav:" \
+ -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+ -e "s:^\#\(LogTime\).*:\1 yes:" \
+ -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+ "${ED}"/etc/clamd.conf.sample || die
+ sed -i -e "s:^\(Example\):\# \1:" \
+ -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
+ -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+ -e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+ -e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
+ -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+ -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+ "${ED}"/etc/freshclam.conf.sample || die
+
+ if use milter ; then
+ # MilterSocket one to include ' /' because there is a 2nd line for
+ # inet: which we want to leave
+ dodoc "${FILESDIR}"/clamav-milter.README.gentoo
+ sed -i -e "s:^\(Example\):\# \1:" \
+ -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
+ -e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
+ -e "s:.*\(User\) .*:\1 clamav:" \
+ -e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
+ -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+ -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+ "${ED}"/etc/clamav-milter.conf.sample || die
+ cat >> "${ED}"/etc/conf.d/clamd <<-EOF
+ MILTER_NICELEVEL=19
+ START_MILTER=no
+ EOF
+
+ systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
+ fi
+
+ for i in clamd freshclam clamav-milter
+ do
+ [[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
+ done
+
+ prune_libtool_files --all
+}
+
+pkg_postinst() {
+ if use milter ; then
+ elog "For simple instructions how to setup the clamav-milter read the"
+ elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+ fi
+ if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
+ ewarn "You must run freshclam manually to populate the virus database files"
+ ewarn "before starting clamav for the first time.\n"
+ fi
+}
diff --git a/app-antivirus/clamav/clamav-0.98.7.ebuild b/app-antivirus/clamav/clamav-0.98.7.ebuild
index 24cf61c..59e614e 100644
--- a/app-antivirus/clamav/clamav-0.98.7.ebuild
+++ b/app-antivirus/clamav/clamav-0.98.7.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="bzip2 clamdtop iconv ipv6 milter metadata-analysis-api selinux static-libs uclibc"
CDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/gcab/gcab-0.6.ebuild b/app-arch/gcab/gcab-0.6.ebuild
index e7c076b..f697907 100644
--- a/app-arch/gcab/gcab-0.6.ebuild
+++ b/app-arch/gcab/gcab-0.6.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ppc ppc64 ~sparc x86"
IUSE="+introspection vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/lzip/lzip-1.18_pre1.ebuild b/app-arch/lzip/lzip-1.18_pre1.ebuild
index e51ceeb..a0f348f 100644
--- a/app-arch/lzip/lzip-1.18_pre1.ebuild
+++ b/app-arch/lzip/lzip-1.18_pre1.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}/${P/_/-}"
diff --git a/app-arch/pbzip2/pbzip2-1.1.12.ebuild b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
index 62dcbde..ec2d4db 100644
--- a/app-arch/pbzip2/pbzip2-1.1.12.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
@@ -12,7 +12,7 @@
LICENSE="BZIP2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="static symlink"
LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
diff --git a/app-arch/snappy/metadata.xml b/app-arch/snappy/metadata.xml
index 6dd995a..6418fc0 100644
--- a/app-arch/snappy/metadata.xml
+++ b/app-arch/snappy/metadata.xml
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>proxy-maintainers</herd>
<maintainer>
- <email>maintainer-needed@gentoo.org</email>
+ <email>brendan@horan.hk</email>
+ <name>Brendan Horan</name>
</maintainer>
<longdescription lang="en">Snappy is a compression/decompression library. It does not aim for
maximum compression, or compatibility with any other compression
library; instead, it aims for very high speeds and reasonable
compression.</longdescription>
<upstream>
- <remote-id type="google-code">snappy</remote-id>
<remote-id type="github">google/snappy</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-arch/snappy/snappy-1.1.3.ebuild b/app-arch/snappy/snappy-1.1.3.ebuild
index f1b28ce..89fab9f 100644
--- a/app-arch/snappy/snappy-1.1.3.ebuild
+++ b/app-arch/snappy/snappy-1.1.3.ebuild
@@ -12,7 +12,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
IUSE="static-libs"
src_prepare() {
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 17e5795..86315bf 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,4 +1,4 @@
DIST unrarsrc-5.1.6.tar.gz 215185 SHA256 3c38eaabc655527244fd0c3ba3beff567ea24aad37d448488643242fd4cf41a5 SHA512 a7a7800ac94850320ce3e2dd24c5005694dd59360b7f3fc7886ef241153e471459b0b9397d1dacbc3adcd19044cdcb8a8a847e16d7b224af149a1455f46fcaa0 WHIRLPOOL bcb9d1b60f42357cb236cbb5e86eb19dd4ed623244036fc1e8fc3759eef3d4002e6ffc90d3cf5b5200e81fe018a2215c0238ee2aac7148e51f130e43ad3e5ea0
DIST unrarsrc-5.2.7.tar.gz 218880 SHA256 ef14757e943787b439fedf2c564c1f38d0db315528a928e0de170860717e2fac SHA512 95e06451e2bec46a12e5b9b1423c3ea31ce86859f8086812d9c442aaa69627f72635a6a8c197b30dbc7e99bbf7c7caaa25d703caecbe03c697cc0e5b7644d638 WHIRLPOOL 49f5492a7441192d96616f892012ca2dac8a94063e806ece3c62bf13d29beb9d2d0368a186c0f0bff8814c9e6af542ba6b447a61683295f560f120ff75507379
-DIST unrarsrc-5.3.2.tar.gz 221786 SHA256 2d8712eed32367b1a404633f230f94f545c1f2ce0552f851266b00c261a786ea SHA512 ea3ee5dd3c15a52f577896bca0d5136c9a6e76a5552d6f56be519eb59c2cc137aba0dafe53dfb50c768e8e7f2e1c1c067a3e4d0c67383da3ae1da58ed68fe99b WHIRLPOOL 07454ef4e00ad8982cd4658aa35a120d8318b3bc7979360abdb7973855e1d6e78cd28473cf4127aa7673b26c27c7e379e483017f0f29b49b6c65d08271326d05
DIST unrarsrc-5.3.3.tar.gz 221930 SHA256 099c67a2fdb76e55386e4496d28cf6fd1ffd9ac394b95c46b73926c5f69bd107 SHA512 5dffa77043992b72dab10752c547c30d2ff884a18c8b19ddbbcd711e4a9f7f82020edfeb560bd10122c18296aaf08d27c7c1db4f6b62e3ec2a4cd0c449ec7d52 WHIRLPOOL 8be0c41a1ac81d9e9a16ce6b7cbc3479929ec65df8040a58a91c0c89d9b02a8ccde584e829e6ceea6ffa645939d68998f46627ba7df54942f76595cea8f26aaf
+DIST unrarsrc-5.3.6.tar.gz 223184 SHA256 b917f2c5258ff2012008f9aa46984ad22dce21702eb264623b256bb8c2577c1b SHA512 b596f69a7d1b5f6a1e3dc0f060018589dc415463c2a9f403a365e10f8e362c09de4d295df04939f2a33c8daf88de7fbe32395043b978636ea7eaa1c1d2ad80fc WHIRLPOOL 6016b9ead3c2ef573e28ff05809c56e8037c23c01ee05fca0ef46eccbcc7e673b5fa57a0a6839ac2670cce928234c290e82a21a83471818e9a56eeff7984fb3e
diff --git a/app-arch/unrar/unrar-5.3.2.ebuild b/app-arch/unrar/unrar-5.3.2.ebuild
deleted file mode 100644
index ba3f09c..0000000
--- a/app-arch/unrar/unrar-5.3.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="unRAR"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
- epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218
- local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
- else
- sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
- fi
- sed -i "${sed_args[@]}" makefile
-}
-
-src_configure() {
- mkdir -p build-{lib,bin}
- printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
- cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
- unrar_make() {
- emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
- }
-
- unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
- ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname)
- ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV})
-
- unrar_make -C build-bin
-}
-
-src_install() {
- dobin build-bin/unrar
- dodoc readme.txt
-
- dolib.so build-lib/libunrar*
-
- insinto /usr/include/libunrar${PV%.*.*}
- doins *.hpp
- dosym libunrar${PV%.*.*} /usr/include/libunrar
-}
diff --git a/app-arch/unrar/unrar-5.3.6.ebuild b/app-arch/unrar/unrar-5.3.6.ebuild
new file mode 100644
index 0000000..71373bb
--- /dev/null
+++ b/app-arch/unrar/unrar-5.3.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="http://www.rarlab.com/rar_add.htm"
+SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="unRAR"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
+ epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218
+ local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+ else
+ sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+ fi
+ sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+ mkdir -p build-{lib,bin}
+ printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+ cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+ unrar_make() {
+ emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+ }
+
+ unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+ ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+ ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+ unrar_make -C build-bin
+}
+
+src_install() {
+ dobin build-bin/unrar
+ dodoc readme.txt
+
+ dolib.so build-lib/libunrar*
+
+ insinto /usr/include/libunrar${PV%.*.*}
+ doins *.hpp
+ dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
diff --git a/app-backup/rsnapshot/Manifest b/app-backup/rsnapshot/Manifest
index a4fd0d2..ee003b7 100644
--- a/app-backup/rsnapshot/Manifest
+++ b/app-backup/rsnapshot/Manifest
@@ -1 +1,2 @@
DIST rsnapshot-1.3.1.tar.gz 215806 SHA256 94b6c77e40628935f42a191bdc28ad93b1f132fde456ee76ee87763f1eddc75e SHA512 a74ad0a21d213dd2e05cb577a47c491af90d8994df8f5a154195515345da438ac9c0d72b563aa02314883a0b3bb86e3c23f8b530a7078c2b55a9547a2d666c10 WHIRLPOOL 1d62658e11cbd2612b223336b5e3dbb44d1ec0b40a434bf8f65c09ff7b45c831f585046f8ef4e2ff79f034de8731435ccd2554e0d5ff4e2d1693a01b66113b00
+DIST rsnapshot-1.4.1.tar.gz 489481 SHA256 fb4a1129a7d3805c41749fd0494debfe2ca2341eba0f8b50e4f54985efe448e8 SHA512 a99e639bd706aafac82d2a4a40fc6c7fa026321c527ad5826a4fc7917cadea5962c4c7988c98efbe06833ef70db081605aa47a6d77c04dcf6077cc232c078cbf WHIRLPOOL 999979b7d438c336203298a4bce2d49fb7e6166428356d0d3ee93369244856970faa496528a673df44ab21c5ce6fa694d83df9fe45075d62436c24fb97f7a435
diff --git a/app-backup/rsnapshot/metadata.xml b/app-backup/rsnapshot/metadata.xml
index b856273..feced77 100644
--- a/app-backup/rsnapshot/metadata.xml
+++ b/app-backup/rsnapshot/metadata.xml
@@ -3,12 +3,8 @@
<pkgmetadata>
<herd>proxy-maintainers</herd>
<maintainer>
- <email>flameeyes@gentoo.org</email>
- <name>Diego Elio Pettenò</name>
- </maintainer>
- <maintainer>
- <email>erik_hahn@gmx.de</email>
- <name>Erik Hahn</name>
+ <email>Sergiy.Borodych@gmail.com</email>
+ <name> Sergiy Borodych</name>
<description>proxied maintainer</description>
</maintainer>
</pkgmetadata>
diff --git a/app-backup/rsnapshot/rsnapshot-1.3.1-r1.ebuild b/app-backup/rsnapshot/rsnapshot-1.3.1-r1.ebuild
deleted file mode 100644
index 06f52b1..0000000
--- a/app-backup/rsnapshot/rsnapshot-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A filesystem backup utility based on rsync"
-HOMEPAGE="http://www.rsnapshot.org"
-SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.2
- >=sys-apps/util-linux-2.12-r4
- >=sys-apps/coreutils-5.0.91-r4
- >=net-misc/openssh-3.7.1_p2-r1
- >=net-misc/rsync-2.6.0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-cp_al.patch
-}
-
-src_install() {
- # Change sysconfdir to install the template file as documentation
- # rather than in /etc.
- emake install DESTDIR="${D}" \
- sysconfdir="/usr/share/doc/${PF}" \
- || die
-
- dodoc README AUTHORS TODO ChangeLog \
- docs/Upgrading_from_1.1 \
- docs/HOWTOs/rsnapshot-{Mac,windows}-howto
-
- docinto utils
- dodoc utils/{README,rsnaptar,*.sh,*.pl}
-
- docinto utils/rsnapshotdb
- dodoc utils/rsnapshotdb/*
-}
-
-pkg_postinst() {
- elog "The template configuration file has been installed as"
- elog "/usr/share/doc/${PF}/rsnapshot.conf.default"
- elog "Copy and edit the the above file as /etc/rsnapshot.conf"
-}
diff --git a/app-backup/rsnapshot/rsnapshot-1.3.1.ebuild b/app-backup/rsnapshot/rsnapshot-1.3.1.ebuild
deleted file mode 100644
index 423661e..0000000
--- a/app-backup/rsnapshot/rsnapshot-1.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION="A filesystem backup utility based on rsync"
-HOMEPAGE="http://www.rsnapshot.org"
-SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.2
- >=sys-apps/util-linux-2.12-r4
- >=sys-apps/coreutils-5.0.91-r4
- >=net-misc/openssh-3.7.1_p2-r1
- >=net-misc/rsync-2.6.0"
-
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}"/${P}-cp_al.patch
-}
-
-src_compile() {
- econf --prefix=/usr --sysconfdir=/etc || die
- emake || die "emake failed"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die "make install failed"
-
- dodoc INSTALL README AUTHORS TODO ChangeLog docs/*
- insinto /usr/share/doc/${PF}/HOWTOs
- doins docs/HOWTOs/*
- docinto utils
- dodoc utils/{README,rsnaptar,*.sh}
- docinto utils/rsnapshotdb
- dodoc utils/rsnapshotdb/*
-}
-
-pkg_postinst() {
- elog
- elog "The configuration file: /etc/rsnapshot.conf.default "
- elog " has been installed. "
- elog "This is a template. "
- elog "Copy, or move, the above file to: /etc/rsnapshot.conf "
- elog "Note that upgrading will update the template, not real config. "
- elog
-}
diff --git a/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild b/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild
new file mode 100644
index 0000000..009a331
--- /dev/null
+++ b/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A filesystem backup utility based on rsync"
+HOMEPAGE="http://www.rsnapshot.org"
+SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-lang/perl-5.8.2
+ dev-perl/Lchown
+ >=sys-apps/util-linux-2.12-r4
+ >=sys-apps/coreutils-5.0.91-r4
+ >=net-misc/openssh-3.7.1_p2-r1
+ >=net-misc/rsync-2.6.0"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ # Change sysconfdir to install the template file as documentation
+ # rather than in /etc.
+ emake install DESTDIR="${D}" \
+ sysconfdir="${EPREFIX}/usr/share/doc/${PF}"
+
+ dodoc README.md AUTHORS ChangeLog \
+ docs/Upgrading_from_1.1
+
+ docinto utils
+ dodoc utils/{README,rsnaptar,*.sh,*.pl}
+
+ docinto utils/rsnapshotdb
+ dodoc utils/rsnapshotdb/*
+}
+
+pkg_postinst() {
+ elog "The template configuration file has been installed as"
+ elog "/usr/share/doc/${PF}/rsnapshot.conf.default"
+ elog "Copy and edit the the above file as /etc/rsnapshot.conf"
+}
diff --git a/app-cdr/bashburn/bashburn-3.1.0.ebuild b/app-cdr/bashburn/bashburn-3.1.0.ebuild
index 4e9c800..8903968 100644
--- a/app-cdr/bashburn/bashburn-3.1.0.ebuild
+++ b/app-cdr/bashburn/bashburn-3.1.0.ebuild
@@ -32,7 +32,7 @@
src_prepare() {
# Fix for "warning: jobserver unavailable: using -j1."
- sed -i -e 's:make -C:$(MAKE) -C:' Makefile || die
+ sed -i -e 's:make -C:$(MAKE) -C:' Makefile || die
}
src_install() {
diff --git a/app-crypt/gcr/gcr-3.16.0.ebuild b/app-crypt/gcr/gcr-3.16.0.ebuild
index 17aeeb9..f1f3b4a 100644
--- a/app-crypt/gcr/gcr-3.16.0.ebuild
+++ b/app-crypt/gcr/gcr-3.16.0.ebuild
@@ -16,7 +16,7 @@
SLOT="0/1" # subslot = suffix of libgcr-3
IUSE="debug gtk +introspection vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
COMMON_DEPEND="
>=app-crypt/gnupg-2
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 672fa82..cc2ac11 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -3,6 +3,5 @@
DIST gnupg-2.0.27.tar.bz2 4424679 SHA256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041c493a5ebc4b8f2978dbe930f2 SHA512 b05e75f5ef9881df9472818743c175cfe3254088086f36dc0fcf3d34e61f648f1775d90d404f6c622561df5066d972aadbf99ea8ec1290e5d7f7310f4ef2989e WHIRLPOOL abb353b20655002a0957e38d2b889fb5e6a47ba7b7546e1c70fc1f97cf42deeca8f2b061678983f3a160210f4eaf7529441246df1f9f1d875f5cc090456fdfb7
DIST gnupg-2.0.28.tar.bz2 4435779 SHA256 ce092ee4ab58fd19b9fb34a460c07b06c348f4360dd5dd4886d041eb521a534c SHA512 7e786fe0648d5ea453f9c7524fec4bd7d5eec26d28f723acf3cb2f7ec9c400c339f0926a179411876c3f8e08b06942dcec643dc930caf58239bbd4932f4bd3c1 WHIRLPOOL ccf7427e54a545914e89677618055a114b4c9dc4db48669a2fc726fced98475df4ed27c93bd180f1250d147111ee663c736cdf4e1d8afdc40ed967cdffd0eb66
DIST gnupg-2.0.29.tar.bz2 4416251 SHA256 68ed6b386ba78425b05a60e8ee22785ff0fef190bdc6f1c612f19a58819d4ac9 SHA512 23b452c740ab5c1e1e37337ae0583dd3b15df58a5bb5639c0c2aef1fb603e0a7d90a257ac99b0d9dfb68b81fa061c0c64e0bfd256c00d64e2f432192f5052f37 WHIRLPOOL f3d59a9453b4a65c726788c35b065ffc9cde0b746705080cd3491c73439786d791da29cf8f5bf1e5594a0e39cfaec214e346fe18ec3acf0b425dc396aa189f33
-DIST gnupg-2.1.6.tar.bz2 4917722 SHA256 5e599ad542199f3bd733eed2b88a539d1b4c3beda2dbab0ff69f1896f52e92fd SHA512 ae8aafe770336c83badf5610fe37f4ddc488786e3604780627893b636161d8407f3fd782538799e2b2a02e31c97468464372017fa52b5d9ed1bd31c85d9b3763 WHIRLPOOL 2136c526242a4e741c0cbc9aec102ba634234efd679d62db9aae3b2ab8fe9f8ad9b8fdb7d1f2d43982e6a072d5f5072d0744d8bb434d61f49ff24e868c902f80
-DIST gnupg-2.1.7.tar.bz2 4918583 SHA256 c18a3776d47fec98892d51d28b6574ef16bf0a25eabb0956231058aaf2e7846e SHA512 7c3efb9bd5d1509a9b2a6264293542b3d5db979bf443754f96d77322a96e18cba2ac6142665459d161eb7222fae44ce5b89eff88dca1c7abf47449fcafd3eb00 WHIRLPOOL da7ef3a02b186736c8d105ca627d2c889781465ecfdb4c4861f8af748a7d68a7c05a106c73bdfe44e7037807deb822c231d615cc1e1fcdd9b01e7632945ac094
DIST gnupg-2.1.8.tar.bz2 4900705 SHA256 a3b8d01e4690715d42e8f289493c85413766f3fa935e4fe7e5ff5b0f6e2781a3 SHA512 80176fda032c921d3716fba3d3a264f9951464fd578a9d8d60673585efef17e20eec4d026921ab7ab2d7bd4dbf0a2b94a33a58c07acb747eebcb758e42bafd57 WHIRLPOOL 32e2e959363529cfd9ca857f823970b6cdd6497a72515aa9e75c2a680c83acea55a38d8de19b16c7327f92c0ab326e76a37952014b317afe2689c211c0d1965b
+DIST gnupg-2.1.9.tar.bz2 4925167 SHA256 1cb7633a57190beb66f9249cb7446603229b273d4d89331b75c652fa4a29f7b6 SHA512 c19b8cac42b7060caada230b77f36a0b0ed0a05efd519818c5b4057ef0fcb16602f2f3ade2409de2ef353a9e2acc3e5fa106a4449c6929a36a599a82194c0ee0 WHIRLPOOL 105b83e82330a00084a0e9f3d96c8788ac2c9e7831beea0ea42786df4e378dc9e8f2c1a31f12af9c53d363aa71810cd231afdf8f20eab424fea5f59b103033a9
diff --git a/app-crypt/gnupg/gnupg-2.0.28.ebuild b/app-crypt/gnupg/gnupg-2.0.28.ebuild
index 54433c7..fe1e949 100644
--- a/app-crypt/gnupg/gnupg-2.0.28.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.28.ebuild
@@ -13,7 +13,7 @@
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
COMMON_DEPEND_LIBS="
diff --git a/app-crypt/gnupg/gnupg-2.1.6.ebuild b/app-crypt/gnupg/gnupg-2.1.6.ebuild
deleted file mode 100644
index 2f40259..0000000
--- a/app-crypt/gnupg/gnupg-2.1.6.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-MY_P="${P/_/-}"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
-
-COMMON_DEPEND_LIBS="
- dev-libs/npth
- >=dev-libs/libassuan-2
- >=dev-libs/libgcrypt-1.6.2
- >=dev-libs/libgpg-error-1.17
- >=dev-libs/libksba-1.0.7
- >=net-misc/curl-7.10
- gnutls? ( >=net-libs/gnutls-3.0 )
- sys-libs/zlib
- ldap? ( net-nds/openldap )
- bzip2? ( app-arch/bzip2 )
- readline? ( sys-libs/readline:= )
- smartcard? ( usb? ( virtual/libusb:0 ) )
- "
-COMMON_DEPEND_BINS="app-crypt/pinentry
- !app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
- ${COMMON_DEPEND_BINS}
- static? (
- >=dev-libs/libassuan-2[static-libs]
- >=dev-libs/libgcrypt-1.6.2[static-libs]
- >=dev-libs/libgpg-error-1.17[static-libs]
- >=dev-libs/libksba-1.0.7[static-libs]
- dev-libs/npth[static-libs]
- >=net-misc/curl-7.10[static-libs]
- sys-libs/zlib[static-libs]
- bzip2? ( app-arch/bzip2[static-libs] )
- )
- nls? ( sys-devel/gettext )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
- ${COMMON_DEPEND_BINS}
- selinux? ( sec-policy/selinux-gpg )
- nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # 'USE=static' support was requested:
- # gnupg1: bug #29299
- # gnupg2: bug #159623
- use static && append-ldflags -static
-
- if use smartcard; then
- myconf+=(
- --enable-scdaemon
- $(use_enable usb ccid-driver)
- )
- else
- myconf+=( --disable-scdaemon )
- fi
-
- if use elibc_SunOS || use elibc_AIX; then
- myconf+=( --disable-symcryptrun )
- else
- myconf+=( --enable-symcryptrun )
- fi
-
- # glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --enable-gpg \
- --enable-gpgsm \
- --enable-large-secmem \
- --without-adns \
- "${myconf[@]}" \
- $(use_enable bzip2) \
- $(use_enable gnutls) \
- $(use_with ldap) \
- $(use_enable nls) \
- $(use_with readline) \
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
- default
-
- if use doc; then
- cd doc
- emake html
- fi
-}
-
-src_install() {
- default
-
- use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
-
- emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
- rm "${ED}"/usr/share/gnupg/help* || die
-
- dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
- doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
- dosym gpg2 /usr/bin/gpg
- dosym gpgv2 /usr/bin/gpgv
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
- if use doc; then
- dohtml doc/gnupg.html/* doc/*.png
- fi
-}
-
-pkg_postinst() {
- elog "If you wish to view images emerge:"
- elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
- elog "Remember to use photo-viewer option in configuration file to activate"
- elog "the right viewer."
- elog
-
- if use smartcard; then
- elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
- use usb && elog " - a CCID-compatible reader, used directly through libusb;"
- elog " - sys-apps/pcsc-lite and a compatible reader device;"
- elog " - dev-libs/openct and a compatible reader device;"
- elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
- elog ""
- elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
- elog "app-crypt/ccid first."
- fi
-
- ewarn "Please remember to restart gpg-agent if a different version"
- ewarn "of the agent is currently used. If you are unsure of the gpg"
- ewarn "agent you are using please run 'killall gpg-agent',"
- ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- elog "If upgrading from a version prior than 2.1 you might have to re-import"
- elog "secret keys after restarting the gpg-agent as the new version is using"
- elog "a new storage mechanism."
- elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
- fi
-}
diff --git a/app-crypt/gnupg/gnupg-2.1.7-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.7-r1.ebuild
deleted file mode 100644
index a296661..0000000
--- a/app-crypt/gnupg/gnupg-2.1.7-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-MY_P="${P/_/-}"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
-
-COMMON_DEPEND_LIBS="
- dev-libs/npth
- >=dev-libs/libassuan-2
- >=dev-libs/libgcrypt-1.6.2[threads]
- >=dev-libs/libgpg-error-1.17
- >=dev-libs/libksba-1.0.7
- >=net-misc/curl-7.10
- gnutls? ( >=net-libs/gnutls-3.0 )
- sys-libs/zlib
- ldap? ( net-nds/openldap )
- bzip2? ( app-arch/bzip2 )
- readline? ( sys-libs/readline:= )
- smartcard? ( usb? ( virtual/libusb:0 ) )
- "
-COMMON_DEPEND_BINS="app-crypt/pinentry
- !app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
- ${COMMON_DEPEND_BINS}
- static? (
- >=dev-libs/libassuan-2[static-libs]
- >=dev-libs/libgcrypt-1.6.2[static-libs]
- >=dev-libs/libgpg-error-1.17[static-libs]
- >=dev-libs/libksba-1.0.7[static-libs]
- dev-libs/npth[static-libs]
- >=net-misc/curl-7.10[static-libs]
- sys-libs/zlib[static-libs]
- bzip2? ( app-arch/bzip2[static-libs] )
- )
- nls? ( sys-devel/gettext )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
- ${COMMON_DEPEND_BINS}
- selinux? ( sec-policy/selinux-gpg )
- nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # 'USE=static' support was requested:
- # gnupg1: bug #29299
- # gnupg2: bug #159623
- use static && append-ldflags -static
-
- if use smartcard; then
- myconf+=(
- --enable-scdaemon
- $(use_enable usb ccid-driver)
- )
- else
- myconf+=( --disable-scdaemon )
- fi
-
- if use elibc_SunOS || use elibc_AIX; then
- myconf+=( --disable-symcryptrun )
- else
- myconf+=( --enable-symcryptrun )
- fi
-
- # glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --enable-gpg \
- --enable-gpgsm \
- --enable-large-secmem \
- --without-adns \
- "${myconf[@]}" \
- $(use_enable bzip2) \
- $(use_enable gnutls) \
- $(use_with ldap) \
- $(use_enable nls) \
- $(use_with readline) \
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
- default
-
- if use doc; then
- cd doc
- emake html
- fi
-}
-
-src_install() {
- default
-
- use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
-
- emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
- rm "${ED}"/usr/share/gnupg/help* || die
-
- dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
- doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
- dosym gpg2 /usr/bin/gpg
- dosym gpgv2 /usr/bin/gpgv
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
- if use doc; then
- dohtml doc/gnupg.html/* doc/*.png
- fi
-}
-
-pkg_postinst() {
- elog "If you wish to view images emerge:"
- elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
- elog "Remember to use photo-viewer option in configuration file to activate"
- elog "the right viewer."
- elog
-
- if use smartcard; then
- elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
- use usb && elog " - a CCID-compatible reader, used directly through libusb;"
- elog " - sys-apps/pcsc-lite and a compatible reader device;"
- elog " - dev-libs/openct and a compatible reader device;"
- elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
- elog ""
- elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
- elog "app-crypt/ccid first."
- fi
-
- ewarn "Please remember to restart gpg-agent if a different version"
- ewarn "of the agent is currently used. If you are unsure of the gpg"
- ewarn "agent you are using please run 'killall gpg-agent',"
- ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- elog "If upgrading from a version prior than 2.1 you might have to re-import"
- elog "secret keys after restarting the gpg-agent as the new version is using"
- elog "a new storage mechanism."
- elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
- fi
-}
diff --git a/app-crypt/gnupg/gnupg-2.1.7.ebuild b/app-crypt/gnupg/gnupg-2.1.7.ebuild
deleted file mode 100644
index 3cb5b58..0000000
--- a/app-crypt/gnupg/gnupg-2.1.7.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-MY_P="${P/_/-}"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
-
-COMMON_DEPEND_LIBS="
- dev-libs/npth
- >=dev-libs/libassuan-2
- >=dev-libs/libgcrypt-1.6.2
- >=dev-libs/libgpg-error-1.17
- >=dev-libs/libksba-1.0.7
- >=net-misc/curl-7.10
- gnutls? ( >=net-libs/gnutls-3.0 )
- sys-libs/zlib
- ldap? ( net-nds/openldap )
- bzip2? ( app-arch/bzip2 )
- readline? ( sys-libs/readline:= )
- smartcard? ( usb? ( virtual/libusb:0 ) )
- "
-COMMON_DEPEND_BINS="app-crypt/pinentry
- !app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
- ${COMMON_DEPEND_BINS}
- static? (
- >=dev-libs/libassuan-2[static-libs]
- >=dev-libs/libgcrypt-1.6.2[static-libs]
- >=dev-libs/libgpg-error-1.17[static-libs]
- >=dev-libs/libksba-1.0.7[static-libs]
- dev-libs/npth[static-libs]
- >=net-misc/curl-7.10[static-libs]
- sys-libs/zlib[static-libs]
- bzip2? ( app-arch/bzip2[static-libs] )
- )
- nls? ( sys-devel/gettext )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
- ${COMMON_DEPEND_BINS}
- selinux? ( sec-policy/selinux-gpg )
- nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # 'USE=static' support was requested:
- # gnupg1: bug #29299
- # gnupg2: bug #159623
- use static && append-ldflags -static
-
- if use smartcard; then
- myconf+=(
- --enable-scdaemon
- $(use_enable usb ccid-driver)
- )
- else
- myconf+=( --disable-scdaemon )
- fi
-
- if use elibc_SunOS || use elibc_AIX; then
- myconf+=( --disable-symcryptrun )
- else
- myconf+=( --enable-symcryptrun )
- fi
-
- # glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --enable-gpg \
- --enable-gpgsm \
- --enable-large-secmem \
- --without-adns \
- "${myconf[@]}" \
- $(use_enable bzip2) \
- $(use_enable gnutls) \
- $(use_with ldap) \
- $(use_enable nls) \
- $(use_with readline) \
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
- default
-
- if use doc; then
- cd doc
- emake html
- fi
-}
-
-src_install() {
- default
-
- use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
-
- emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
- rm "${ED}"/usr/share/gnupg/help* || die
-
- dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
- doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
- dosym gpg2 /usr/bin/gpg
- dosym gpgv2 /usr/bin/gpgv
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
- if use doc; then
- dohtml doc/gnupg.html/* doc/*.png
- fi
-}
-
-pkg_postinst() {
- elog "If you wish to view images emerge:"
- elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
- elog "Remember to use photo-viewer option in configuration file to activate"
- elog "the right viewer."
- elog
-
- if use smartcard; then
- elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
- use usb && elog " - a CCID-compatible reader, used directly through libusb;"
- elog " - sys-apps/pcsc-lite and a compatible reader device;"
- elog " - dev-libs/openct and a compatible reader device;"
- elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
- elog ""
- elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
- elog "app-crypt/ccid first."
- fi
-
- ewarn "Please remember to restart gpg-agent if a different version"
- ewarn "of the agent is currently used. If you are unsure of the gpg"
- ewarn "agent you are using please run 'killall gpg-agent',"
- ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- elog "If upgrading from a version prior than 2.1 you might have to re-import"
- elog "secret keys after restarting the gpg-agent as the new version is using"
- elog "a new storage mechanism."
- elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
- fi
-}
diff --git a/app-crypt/gnupg/gnupg-2.1.8.ebuild b/app-crypt/gnupg/gnupg-2.1.8.ebuild
index a296661..4e192a1 100644
--- a/app-crypt/gnupg/gnupg-2.1.8.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.8.ebuild
@@ -13,7 +13,7 @@
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
COMMON_DEPEND_LIBS="
diff --git a/app-crypt/gnupg/gnupg-2.1.9.ebuild b/app-crypt/gnupg/gnupg-2.1.9.ebuild
new file mode 100644
index 0000000..4e192a1
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.1.9.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+MY_P="${P/_/-}"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
+
+COMMON_DEPEND_LIBS="
+ dev-libs/npth
+ >=dev-libs/libassuan-2
+ >=dev-libs/libgcrypt-1.6.2[threads]
+ >=dev-libs/libgpg-error-1.17
+ >=dev-libs/libksba-1.0.7
+ >=net-misc/curl-7.10
+ gnutls? ( >=net-libs/gnutls-3.0 )
+ sys-libs/zlib
+ ldap? ( net-nds/openldap )
+ bzip2? ( app-arch/bzip2 )
+ readline? ( sys-libs/readline:= )
+ smartcard? ( usb? ( virtual/libusb:0 ) )
+ "
+COMMON_DEPEND_BINS="app-crypt/pinentry
+ !app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+ ${COMMON_DEPEND_BINS}
+ static? (
+ >=dev-libs/libassuan-2[static-libs]
+ >=dev-libs/libgcrypt-1.6.2[static-libs]
+ >=dev-libs/libgpg-error-1.17[static-libs]
+ >=dev-libs/libksba-1.0.7[static-libs]
+ dev-libs/npth[static-libs]
+ >=net-misc/curl-7.10[static-libs]
+ sys-libs/zlib[static-libs]
+ bzip2? ( app-arch/bzip2[static-libs] )
+ )
+ nls? ( sys-devel/gettext )
+ doc? ( sys-apps/texinfo )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+ ${COMMON_DEPEND_BINS}
+ selinux? ( sec-policy/selinux-gpg )
+ nls? ( virtual/libintl )"
+
+REQUIRED_USE="smartcard? ( !static )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch_user
+}
+
+src_configure() {
+ local myconf=()
+
+ # 'USE=static' support was requested:
+ # gnupg1: bug #29299
+ # gnupg2: bug #159623
+ use static && append-ldflags -static
+
+ if use smartcard; then
+ myconf+=(
+ --enable-scdaemon
+ $(use_enable usb ccid-driver)
+ )
+ else
+ myconf+=( --disable-scdaemon )
+ fi
+
+ if use elibc_SunOS || use elibc_AIX; then
+ myconf+=( --disable-symcryptrun )
+ else
+ myconf+=( --enable-symcryptrun )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-gpg \
+ --enable-gpgsm \
+ --enable-large-secmem \
+ --without-adns \
+ "${myconf[@]}" \
+ $(use_enable bzip2) \
+ $(use_enable gnutls) \
+ $(use_with ldap) \
+ $(use_enable nls) \
+ $(use_with readline) \
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ cd doc
+ emake html
+ fi
+}
+
+src_install() {
+ default
+
+ use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
+ tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
+
+ emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
+ rm "${ED}"/usr/share/gnupg/help* || die
+
+ dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+ doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
+
+ dosym gpg2 /usr/bin/gpg
+ dosym gpgv2 /usr/bin/gpgv
+ echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+ echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+ if use doc; then
+ dohtml doc/gnupg.html/* doc/*.png
+ fi
+}
+
+pkg_postinst() {
+ elog "If you wish to view images emerge:"
+ elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+ elog "Remember to use photo-viewer option in configuration file to activate"
+ elog "the right viewer."
+ elog
+
+ if use smartcard; then
+ elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
+ use usb && elog " - a CCID-compatible reader, used directly through libusb;"
+ elog " - sys-apps/pcsc-lite and a compatible reader device;"
+ elog " - dev-libs/openct and a compatible reader device;"
+ elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
+ elog ""
+ elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
+ elog "app-crypt/ccid first."
+ fi
+
+ ewarn "Please remember to restart gpg-agent if a different version"
+ ewarn "of the agent is currently used. If you are unsure of the gpg"
+ ewarn "agent you are using please run 'killall gpg-agent',"
+ ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ elog "If upgrading from a version prior than 2.1 you might have to re-import"
+ elog "secret keys after restarting the gpg-agent as the new version is using"
+ elog "a new storage mechanism."
+ elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
+ fi
+}
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 905946d..8c6b127 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -1,5 +1,3 @@
-DIST keybase-0.8.10.tar.gz 7055453 SHA256 ce9a22427d40341059071737ace2dacbe0a81e29e783ec2c8324e2704c1f558f SHA512 4701a0c8d88ffc90fa68f24ef4695f7c7b63ec91a41ccc1bf9d25efb182befc0750e1f9f5ec185161d65bdcbaeb3a73ab8f54f7047ab9d1efdca55b5f56957f0 WHIRLPOOL dd6d53154164ac235b89947530f7af4ed9fdc1421c26b2cef92e1721e2dcdf63e43fff054718c58c6a519f24f1766969a0e740f97d9eb17472d1ef8174e1851f
-DIST keybase-0.8.12.tar.gz 7057638 SHA256 fa6a8eb6f857d98d4d0f5c97862ba99480b0dd2c85fccd631180c0ab8f3ca97f SHA512 e8c568e0154308d3f0172a5e9b22de31c8a9b07d3a4f324a4afec57972602a3bd957220a96427eefa5df563ce0152495f5c33668536e03f3d6af9344c2061397 WHIRLPOOL e4a2431c05add26645f4ec3f2062a81d38c39ad9f9d6357f62009292f60fe072d67547d6c0a39470c130165bb9491fc7cb17cfe91a3fc1be75ad7a6377da9dad
DIST keybase-0.8.13.tar.gz 7057750 SHA256 a485257b7302d848be41e9c0a79f7b1c0da4c8ceaee70c0cc011838cbd723fd8 SHA512 8a082ff9d61f960a0c4862fba04adf323005b3c70e6d208a38a001716bcc374e10cde315eced6730d90316466244e58a9de0f78a66ab2f9bd91326979f0ef28b WHIRLPOOL b651a48be0ced301991edd03d40182c0b900ea28e2b97630a3ad741b34266dbd95c3d370db636ca8088ce5e781a2cf609255a6b52a5b6bdbfa540b879cdcd778
DIST keybase-0.8.18.tar.gz 7062931 SHA256 c1ef27f959401164e72fbcd5c4054d13258a3f09dcdebb0ac3c447519780d59e SHA512 2d2c019cdf0e1fef496d709f7bf17c0d30d614e017a88b54d2a2198aafcd9ad436a636e1f1de27ac98df9e3ca90432b3cc3ff0b83fbb59d7e3a9acdef589d940 WHIRLPOOL 0d80b47fa8da500ee4886f95c9bfa55f392e4988db887fa8f2fd332c185a6e1be082ed7b2fce01f98ea4fd064f27b3159cf04e19d1ee2ec985d222606f48059a
-DIST keybase-0.8.9.tar.gz 7055307 SHA256 2feb54d26afc639f4d4998fbc35aafa2100a9926a6ec4f84343ca56d0284a3dd SHA512 431b3314cf939605a56f163b67226c9027a83159aae7f6b9226a4b5ccf63ecd3f79a873cbb9ab2756d83df2191823b70f884327f160187c00f6a6954b8ca144a WHIRLPOOL 4de64969a1e8898b19903cce391ca599af09b4f3dee6bf2b6bf10fcb39d8b6f939d5aa0320a5efe4b3aaf78217c6b6d7c16f09321af3ed115b6985194a0f0c0e
+DIST keybase-0.8.22.tar.gz 7101414 SHA256 4290251ddf7d1f124211731aa8d0dd47f43ba9e1eb9b0b0f326d7986a3f87cb7 SHA512 ed75fc7fa5f97701c6a9e5880a113bdf392f21b1bdfaa63b7070231e10608d755304300b6b5208b2bc363869ffb631e2261df89747ba9b654bc98a420a0511cb WHIRLPOOL e13a4451bdf5962122b54c95d8d35d4570e0475f6012bb5126ff5ec2f48767048600da4f89f9d0ec6b70523b54262c52f5e29d7b766a83c38723ee25ce5acaab
diff --git a/app-crypt/keybase/keybase-0.8.10.ebuild b/app-crypt/keybase/keybase-0.8.10.ebuild
deleted file mode 100644
index 644ff73..0000000
--- a/app-crypt/keybase/keybase-0.8.10.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- net-libs/nodejs
- app-crypt/gnupg"
-
-src_unpack() {
- unpack "${P}.tar.gz"
- mv "node-client-${PV}" "${P}"
-}
-
-src_install() {
- dodoc CHANGELOG.md README.md SIGNED.md
- insinto "/opt/${PN}"
- doins -r package.json bin certs json lib node_modules sql
- dosym "${D}/opt/${PN}/bin/main.js" "${ROOT}/usr/bin/keybase"
- chmod 0755 "${D}/opt/${PN}/bin/main.js" || die
-}
diff --git a/app-crypt/keybase/keybase-0.8.12.ebuild b/app-crypt/keybase/keybase-0.8.22.ebuild
similarity index 100%
rename from app-crypt/keybase/keybase-0.8.12.ebuild
rename to app-crypt/keybase/keybase-0.8.22.ebuild
diff --git a/app-crypt/keybase/keybase-0.8.9.ebuild b/app-crypt/keybase/keybase-0.8.9.ebuild
deleted file mode 100644
index 644ff73..0000000
--- a/app-crypt/keybase/keybase-0.8.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- net-libs/nodejs
- app-crypt/gnupg"
-
-src_unpack() {
- unpack "${P}.tar.gz"
- mv "node-client-${PV}" "${P}"
-}
-
-src_install() {
- dodoc CHANGELOG.md README.md SIGNED.md
- insinto "/opt/${PN}"
- doins -r package.json bin certs json lib node_modules sql
- dosym "${D}/opt/${PN}/bin/main.js" "${ROOT}/usr/bin/keybase"
- chmod 0755 "${D}/opt/${PN}/bin/main.js" || die
-}
diff --git a/app-crypt/libsecret/libsecret-0.18.3.ebuild b/app-crypt/libsecret/libsecret-0.18.3.ebuild
index 9090414..7ed7be3 100644
--- a/app-crypt/libsecret/libsecret-0.18.3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.3.ebuild
@@ -16,7 +16,7 @@
SLOT="0"
IUSE="+crypt debug +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
RDEPEND="
>=dev-libs/glib-2.38:2
diff --git a/app-crypt/libykneomgr/Manifest b/app-crypt/libykneomgr/Manifest
index 847dd4f..329d29d 100644
--- a/app-crypt/libykneomgr/Manifest
+++ b/app-crypt/libykneomgr/Manifest
@@ -1,2 +1,3 @@
DIST libykneomgr-0.1.6.tar.gz 633881 SHA256 7c0ddf2b5397e2d335da5d727c55d0be6a9ab43263c60edcac1ffe45b526ca95 SHA512 deb8deafa3c748bb888309d9d2d62f3657cd6d9d103ceee738abbc47a8e4466535e9641f104f5628657ec8924306b8d9d0a90cd2485dd5ad46dd2d8ee932fab4 WHIRLPOOL 3c9f1c53e411633b74b56eb991155a3ffbe2453a336b10b00a3e69a55f4c30b4df4ddfb50a7252ea058a76211d0683d029428bb24c839586b0277bde7297c582
DIST libykneomgr-0.1.7.tar.gz 625509 SHA256 dcce20274976e29b63380633928e1e75e05544430fca37082465c9075ea29f5a SHA512 b97d0de0050a4dea55963403a8710fe94dbef05041ec4fc42c4f2e7fc7ebd64b94aeb8d8c0231ad7828840efff28e6bd5b392b25d6bcafbeaab469a6e52e5163 WHIRLPOOL 6af69069963859580fa03fd41e794d01895aaaefae3b87ae8a60575dfb82648eea5efb5970ac95608112969a174dbd75a7a2c8dade4c8ebffbed866ca6506fb6
+DIST libykneomgr-0.1.8.tar.gz 626257 SHA256 2749ef299a1772818e63c0ff5276f18f1694f9de2137176a087902403e5df889 SHA512 536db3a81b74d24e727cc09c5bb898723b602e6c55e249745ced59d5f9416673fdbecd80bb7ebc7031be349092c8fb4f5623c8f6972ab870ec1f50ac1bc2f795 WHIRLPOOL 8b3b6304910e0a50fe54c658fe6fa00e86e4add41a966cc0a5941410e5fa6bfba2219f86f102c1cfa170165880c9b80dd599591f45e06d61607505f8cc5b752c
diff --git a/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild b/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild
new file mode 100644
index 0000000..e6ffd1d
--- /dev/null
+++ b/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils udev
+
+DESCRIPTION="YubiKey NEO CCID Manager C Library"
+HOMEPAGE="https://developers.yubico.com/libykneomgr/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="kernel_linux"
+
+RDEPEND="sys-apps/pcsc-lite
+ dev-libs/libzip"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ >=app-crypt/ccid-1.4.18[usb]"
+
+src_configure() {
+ local myeconfargs=(
+ --with-backend=pcsc
+ --disable-static
+ )
+
+ autotools-utils_src_configure
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.13.2-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.13.2-r1.ebuild
new file mode 100644
index 0000000..3b425e7
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.13.2-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc +keyutils libressl openldap +pkinit selinux +threads test xinetd"
+
+CDEPEND="
+ !!app-crypt/heimdal
+ >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+ || (
+ >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+ >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+ >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+ )
+ keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
+ openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+ pkinit? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
+ xinetd? ( sys-apps/xinetd )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+DEPEND="${CDEPEND}
+ ${PYTHON_DEPS}
+ virtual/yacc
+ doc? ( virtual/latex-base )
+ test? (
+ ${PYTHON_DEPS}
+ dev-lang/tcl:0
+ dev-util/dejagnu
+ )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/krb5-config
+)
+
+src_unpack() {
+ unpack ${A}
+ unpack ./"${MY_P}".tar.gz
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+ epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags "-I${EPREFIX}/usr/include/et"
+ # QA
+ append-flags -fno-strict-aliasing
+ append-flags -fno-strict-overflow
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ use keyutils || export ac_cv_header_keyutils_h=no
+ ECONF_SOURCE=${S} \
+ WARN_CFLAGS="set" \
+ econf \
+ $(use_with openldap ldap) \
+ "$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+ $(use_enable pkinit) \
+ $(use_enable threads thread-support) \
+ --without-hesiod \
+ --enable-shared \
+ --with-system-et \
+ --with-system-ss \
+ --enable-dns-for-realm \
+ --enable-kdc-lookaside-cache \
+ --with-system-verto \
+ --disable-rpath
+}
+
+multilib_src_compile() {
+ emake -j1
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+ emake \
+ DESTDIR="${D}" \
+ EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+ install
+}
+
+multilib_src_install_all() {
+ # default database dir
+ keepdir /var/lib/krb5kdc
+
+ cd ..
+ dodoc README
+
+ if use doc; then
+ dohtml -r doc/html/*
+ docinto pdf
+ dodoc doc/pdf/*.pdf
+ fi
+
+ newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r1 mit-krb5kadmind
+ newinitd "${FILESDIR}"/mit-krb5kdc.initd-r1 mit-krb5kdc
+ newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r1 mit-krb5kpropd
+
+ insinto /etc
+ newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+ insinto /var/lib/krb5kdc
+ newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+ if use openldap ; then
+ insinto /etc/openldap/schema
+ doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}/kpropd.xinetd" kpropd
+ fi
+}
+
+pkg_preinst() {
+ if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
+ elog "MIT split the Kerberos applications from the base Kerberos"
+ elog "distribution. Kerberized versions of telnet, rlogin, rsh, rcp,"
+ elog "ftp clients and telnet, ftp deamons now live in"
+ elog "\"app-crypt/mit-krb5-appl\" package."
+ fi
+}
diff --git a/app-crypt/pinentry/pinentry-0.9.5.ebuild b/app-crypt/pinentry/pinentry-0.9.5.ebuild
index 9027df6..2dff58e 100644
--- a/app-crypt/pinentry/pinentry-0.9.5.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.5.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="clipboard emacs gtk ncurses qt4 caps gnome-keyring static"
RDEPEND="
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 627c06d..e2549c9 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1,3 @@
DIST qca-2.0.3.tar.bz2 4530731 SHA256 8da20c89f390954fdcfcd3c4deef379213ddb5ae9d6b5e0c917d23f5e474895f SHA512 c1120ffb373e294fbcc76e21dc2f503ebd3398b26d0ffa7ab7ee3a3e1a4228159358b59c2673ac4a1c2363771e61da54a5080b201c65d586ceda2e3b2facc1bb WHIRLPOOL 2efba46098490ab5a75dcdf95eeb7d81a5509a962403a44602caa126927ebe9e69cb043586dbaebf0b111b79e614b607ae851242d12af9fa17d2dd191e559b0e
+DIST qca-2.1.1.tar.xz 688460 SHA256 95de3e7910b5f9ec7084169989c9d98bfb527e6a4865fe17269c3b24308be983 SHA512 f077b5a4cc6539e0880f4d0a615bebcf851f634e99c6c355522598204f625e5195e0cbc8a1976593669018e57eff95796c8fef69b1301b42cb18736bc8aa1abf WHIRLPOOL 454751a76f5e59aa09d6cc979bc26a490b23a2e5308f663400f45f38a95e6ad7a34428cffb1a2a82ec6958aa0b4418e0054503a58b43e0c172201cbaa7c669f8
DIST qca-qt5-2.1.0.3.tar.xz 685652 SHA256 ab0170696a8ff87588d38a72d36d0b4b42db9080c991d1a40ceb3f8311d289f9 SHA512 2f50c92d3ff927c83353b65ae56ff49a5c1ea439fcef94cea0092b718f04abcc18f455abd91337ac786fddedae980ff55c9d090b5743a96890174dc7eee4f3f1 WHIRLPOOL 9db2770b031dbf5c9c117d4150e0b395c94d8a0af1bda9fac5e1ee862a8a40f1c03fb0c4901e3aaba0b12e8c0b4e71cb55a872bbc54eea8331aff3fbe1fd853c
diff --git a/app-crypt/qca/qca-2.1.0.3-r2.ebuild b/app-crypt/qca/qca-2.1.0.3-r2.ebuild
new file mode 100644
index 0000000..df34a8e
--- /dev/null
+++ b/app-crypt/qca/qca-2.1.0.3-r2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multibuild qmake-utils
+
+MY_PN="${PN}-qt5"
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="http://delta.affinix.com/qca/"
+SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+IUSE="botan debug doc examples gcrypt gpg libressl logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+ !app-crypt/qca-cyrus-sasl
+ !app-crypt/qca-gnupg
+ !app-crypt/qca-logger
+ !app-crypt/qca-ossl
+ !app-crypt/qca-pkcs11
+ botan? ( dev-libs/botan )
+ gcrypt? ( dev-libs/libgcrypt:= )
+ gpg? ( app-crypt/gnupg )
+ nss? ( dev-libs/nss )
+ openssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ pkcs11? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ dev-libs/pkcs11-helper
+ )
+ qt4? ( dev-qt/qtcore:4 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtnetwork:5
+ )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ qt4? ( dev-qt/qttest:4 )
+ qt5? ( dev-qt/qttest:5 )
+ )
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+DOCS=( README TODO )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-disable-pgp-test.patch"
+ "${FILESDIR}/${P}-qt55.patch"
+ "${FILESDIR}/${P}-fix-signals-slots.patch"
+)
+
+qca_plugin_use() {
+ echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=(
+ -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features"
+ -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_plugindir)"
+ $(qca_plugin_use botan)
+ $(qca_plugin_use gcrypt)
+ $(qca_plugin_use gpg gnupg)
+ $(qca_plugin_use logger)
+ $(qca_plugin_use nss)
+ $(qca_plugin_use openssl ossl)
+ $(qca_plugin_use pkcs11)
+ $(qca_plugin_use sasl cyrus-sasl)
+ $(qca_plugin_use softstore)
+ $(cmake-utils_use_build test TESTS)
+ )
+
+ if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
+ mycmakeargs+=(-DQT4_BUILD=ON)
+ fi
+
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ mytest() {
+ local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+ cmake-utils_src_test
+ }
+
+ multibuild_foreach_variant mytest
+}
+
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
+
+ if use doc; then
+ pushd "${BUILD_DIR}" >/dev/null || die
+ doxygen Doxyfile.in || die
+ dodoc -r apidocs/html
+ popd >/dev/null || die
+ fi
+
+ if use examples; then
+ dodoc -r "${S}"/examples
+ fi
+}
diff --git a/app-crypt/qca/qca-2.1.1.ebuild b/app-crypt/qca/qca-2.1.1.ebuild
new file mode 100644
index 0000000..a4f34f1
--- /dev/null
+++ b/app-crypt/qca/qca-2.1.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multibuild qmake-utils
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="http://delta.affinix.com/qca/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+IUSE="botan debug doc examples gcrypt gpg libressl logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+ !app-crypt/qca-cyrus-sasl
+ !app-crypt/qca-gnupg
+ !app-crypt/qca-logger
+ !app-crypt/qca-ossl
+ !app-crypt/qca-pkcs11
+ botan? ( dev-libs/botan )
+ gcrypt? ( dev-libs/libgcrypt:= )
+ gpg? ( app-crypt/gnupg )
+ nss? ( dev-libs/nss )
+ openssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ pkcs11? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ dev-libs/pkcs11-helper
+ )
+ qt4? ( dev-qt/qtcore:4 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtnetwork:5
+ )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ qt4? ( dev-qt/qttest:4 )
+ qt5? ( dev-qt/qttest:5 )
+ )
+"
+
+DOCS=( README TODO )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-disable-pgp-test.patch"
+)
+
+qca_plugin_use() {
+ echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=(
+ -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features"
+ -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_plugindir)"
+ $(qca_plugin_use botan)
+ $(qca_plugin_use gcrypt)
+ $(qca_plugin_use gpg gnupg)
+ $(qca_plugin_use logger)
+ $(qca_plugin_use nss)
+ $(qca_plugin_use openssl ossl)
+ $(qca_plugin_use pkcs11)
+ $(qca_plugin_use sasl cyrus-sasl)
+ $(qca_plugin_use softstore)
+ $(cmake-utils_use_build test TESTS)
+ )
+
+ if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
+ mycmakeargs+=(-DQT4_BUILD=ON)
+ fi
+
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ mytest() {
+ local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+ cmake-utils_src_test
+ }
+
+ multibuild_foreach_variant mytest
+}
+
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
+
+ if use doc; then
+ pushd "${BUILD_DIR}" >/dev/null || die
+ doxygen Doxyfile.in || die
+ dodoc -r apidocs/html
+ popd >/dev/null || die
+ fi
+
+ if use examples; then
+ dodoc -r "${S}"/examples
+ fi
+}
diff --git a/app-crypt/sign/metadata.xml b/app-crypt/sign/metadata.xml
index 22b9e39..d27c6c5 100644
--- a/app-crypt/sign/metadata.xml
+++ b/app-crypt/sign/metadata.xml
@@ -6,11 +6,6 @@
<name>Alice Ferrazzi</name>
<description>Assign bugs to me.</description>
</maintainer>
-<maintainer>
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
- <description>CC him on bugs.</description>
-</maintainer>
<longdescription>
sign is a file signing and signature verification utility. It's main purpose is
to be a simple and convenient extension to a tar/gz/bzip2 line of tools to check
diff --git a/app-crypt/trousers/trousers-0.3.13-r1.ebuild b/app-crypt/trousers/trousers-0.3.13-r1.ebuild
new file mode 100644
index 0000000..e1055d2
--- /dev/null
+++ b/app-crypt/trousers/trousers-0.3.13-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils linux-info readme.gentoo systemd user udev
+
+#MY_P="${PN}-${PV%.*}-${PV##*.}"
+
+DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
+HOMEPAGE="http://trousers.sf.net"
+SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
+
+LICENSE="CPL-1.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE="doc libressl selinux" # gtk
+
+# gtk support presently does NOT compile.
+# gtk? ( >=x11-libs/gtk+-2 )
+
+CDEPEND=">=dev-libs/glib-2
+ !libressl? ( >=dev-libs/openssl-0.9.7:0 )
+ libressl? ( dev-libs/libressl )
+"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-tcsd )"
+# S="${WORKDIR}/${P}git"
+
+DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
+
+DOC_CONTENTS="
+ If you have problems starting tcsd, please check permissions and
+ ownership on /dev/tpm* and ~tss/system.data
+"
+
+pkg_setup() {
+ # Check for driver (not sure it can be an rdep, because ot depends on the
+ # version of virtual/linux-sources... Is that supported by portage?)
+ linux-info_pkg_setup
+ local tpm_kernel_version tpm_kernel_present tpm_module
+ kernel_is ge 2 6 12 && tpm_kernel_version="yes"
+ if linux_config_exists; then
+ linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
+ else
+ ewarn "No kernel configuration could be found."
+ fi
+ has_version app-crypt/tpm-emulator && tpm_module="yes"
+ if [[ -n "${tpm_kernel_present}" ]]; then
+ einfo "Good, you seem to have in-kernel TPM support."
+ elif [[ -n "${tpm_module}" ]]; then
+ einfo "Good, you seem to have TPM support with the external module."
+ if [[ -n "${tpm_kernel_version}" ]]; then
+ elog
+ elog "Note that since you have a >=2.6.12 kernel, you could use"
+ elog "the in-kernel driver instead of (CONFIG_TCG_TPM)."
+ fi
+ elif [[ -n "${tpm_kernel_version}" ]]; then
+ eerror
+ eerror "To use this package, you will have to activate TPM support"
+ eerror "in your kernel configuration. That's at least CONFIG_TCG_TPM,"
+ eerror "plus probably a chip specific driver (like CONFIG_TCG_ATMEL)."
+ eerror
+ else
+ eerror
+ eerror "To use this package, you should install a TPM driver."
+ eerror "You can have the following options:"
+ eerror " - install app-crypt/tpm-emulator"
+ eerror " - switch to a >=2.6.12 kernel and compile the kernel module"
+ eerror
+ fi
+
+ # New user/group for the daemon
+ enewgroup tss
+ enewuser tss -1 -1 /var/lib/tpm tss
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-nouseradd.patch
+ epatch "${FILESDIR}"/${P}-build.patch
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ # econf --with-gui=$(usex gtk gtk openssl)
+ econf --with-gui=openssl
+}
+
+src_install() {
+ keepdir /var/lib/tpm
+ default
+ use doc && dodoc doc/*
+ newinitd "${FILESDIR}"/tcsd.initd tcsd
+ newconfd "${FILESDIR}"/tcsd.confd tcsd
+ systemd_dounit "${FILESDIR}"/tcsd.service
+ udev_dorules "${FILESDIR}"/61-trousers.rules
+ fowners tss:tss /var/lib/tpm
+ prune_libtool_files
+ readme.gentoo_create_doc
+}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 855de8a..a692692 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,2 +1,4 @@
DIST xca-1.1.0.tar.gz 854925 SHA256 997b62b523f6581f0d96a5f5ba2fa31dcdd2b3cf1ffe924f5c69a931b0dd44df SHA512 c22a594c61f63c71e8bc7c38ccdfabe05903a33bf5116630ca4c5072b725e551a128b10f624d01a464695d739fb9d77a510b3ced99fedc5d5378cb5fd563d954 WHIRLPOOL 1b58ec3dce44e0eb101265f7b1e68695ea2121c795f7d5f6a5349c812469c50f618ce34a5985991432b49a910b2c34fd3eb8e88ac735078a6e063801f1731be0
DIST xca-1.3.0.tar.gz 883772 SHA256 ef5b6e4ed93abb02eb53925edd222bfeb5c26a3b0698af90a416d8e92869414c SHA512 af537154a26fbb8749034b8aa79d0379e5e2567ea2b4c82c8a2f77b0fec7017d01aa0974d013f0d84eb52f2dc18994b29890d9ab63939c91aa9e316f6ef93685 WHIRLPOOL 19ce637f6794b00f7fbc363263768a8b651a21d9dd564ec7ba05fc9c729240ae8edc9d323b899b3641f9bf757b325a77c11a84848606dfe5dec839678a2c0314
+DIST xca-1.3.1.tar.gz 883797 SHA256 c2dd8d79b37440126d9fe7281e8c6802b95537c50ad464f6f7799ffa81aa3d83 SHA512 186056638177a01ca2ed1ad6e6e9e142de7d9e4a057c9a6ec691a488cfa094c97b90f1cae6e083c0a92f5492c67afb285946acbab7ec59d21b791e46cf54bc79 WHIRLPOOL c61c67311d3d64d772219a2bd544a720143a6636c8136174a748cd7f8037caa702d2fab6448b717def18de0e9353758bddffbee049fd427724828014a71dcb92
+DIST xca-1.3.2.tar.gz 897947 SHA256 04f11f2148c8369c1a1b4e109956ed8cc807ec266d0d936410624ba8ee4b5ce4 SHA512 f0a9c4d47f0c20632f44364cc55293a7d2152772a746a72bc4a46622da4e48ae612bafe918c098a71c29cdfca8e6c03c27cf85a862ca0f356eddf061414c89b2 WHIRLPOOL 11a19800447fe939d1684524c4c0da90dc8dde4dfce4ff8f606d384f976b0d6f067e8455e3a90facfbf99a1cc651affdffa9397a9a8191f1fc8d302944ea730a
diff --git a/app-crypt/xca/files/xca-1.3.1-build.patch b/app-crypt/xca/files/xca-1.3.1-build.patch
new file mode 100644
index 0000000..f7b07b9
--- /dev/null
+++ b/app-crypt/xca/files/xca-1.3.1-build.patch
@@ -0,0 +1,15 @@
+diff --git a/m4/xca_compile_test.m4 b/m4/xca_compile_test.m4
+index 5d2f8ca..fd10f5d 100644
+--- a/m4/xca_compile_test.m4
++++ b/m4/xca_compile_test.m4
+@@ -2,8 +2,8 @@ AC_DEFUN([XCA_COMPILE_TEST], [
+
+ # Try to compile a little application
+ #####################################
+-CXXFLAGS="${CXXFLAGS} ${OPENSSL_CFLAGS}${QT_CFLAGS}"
+-LIBS="${LIBS} ${OPENSSL_LIBS}${QT_LIBS}"
++CXXFLAGS="${CXXFLAGS} ${OPENSSL_CFLAGS} ${QT_CFLAGS}"
++LIBS="${LIBS} ${OPENSSL_LIBS} ${QT_LIBS}"
+
+ AC_TRY_RUN([
+ #include <stdio.h>
diff --git a/app-crypt/xca/xca-1.3.1.ebuild b/app-crypt/xca/xca-1.3.1.ebuild
new file mode 100644
index 0000000..1e7a29b
--- /dev/null
+++ b/app-crypt/xca/xca-1.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests and revokation lists"
+HOMEPAGE="http://xca.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="bindist"
+
+RDEPEND=">=dev-libs/openssl-0.9.8:*[bindist=]
+ dev-qt/qtgui:4"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.0.0-desktop.patch
+ epatch "${FILESDIR}"/${P}-build.patch
+ AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ STRIP=true
+}
+
+src_compile() {
+ # enforce all to avoid the automatic silent rules
+ emake all
+}
+
+src_install() {
+ # non standard destdir
+ emake install destdir="${ED}"
+
+ insinto /etc/xca
+ doins misc/*.txt
+}
diff --git a/app-crypt/xca/xca-1.3.2.ebuild b/app-crypt/xca/xca-1.3.2.ebuild
new file mode 100644
index 0000000..8803f74
--- /dev/null
+++ b/app-crypt/xca/xca-1.3.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests and revokation lists"
+HOMEPAGE="http://xca.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="bindist"
+
+RDEPEND=">=dev-libs/openssl-0.9.8:*[bindist=]
+ dev-qt/qtgui:4"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.0.0-desktop.patch
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ STRIP=true
+}
+
+src_compile() {
+ # enforce all to avoid the automatic silent rules
+ emake all
+}
+
+src_install() {
+ # non standard destdir
+ emake install destdir="${ED}"
+
+ insinto /etc/xca
+ doins misc/*.txt
+}
diff --git a/app-dicts/hunspell-kk/Manifest b/app-dicts/hunspell-kk/Manifest
new file mode 100644
index 0000000..75d8402
--- /dev/null
+++ b/app-dicts/hunspell-kk/Manifest
@@ -0,0 +1 @@
+DIST hunspell-kk-1.1.2.tar.gz 310304 SHA256 a51dfd059eb660d34cf421fb6c46811d3d2609cda94d5d1bf1e30dc02d4177f0 SHA512 ed04d2d0e341b138c7a1646807d18df1044329ade16f18165dc1e70359988302314949102d6bee7a3038e1f12974966598606f0c9dfb28cdeb025460601fa91a WHIRLPOOL 06507c4abf9e2bfa89d0c118c1efbd1185ad1f9c5aff2fa2dead582289d85bbdfd5563d858dad3ad1bf88a22a9fe5496a9a2d50f0a40930b3bfb8e83cd976111
diff --git a/app-dicts/hunspell-kk/hunspell-kk-1.1.2.ebuild b/app-dicts/hunspell-kk/hunspell-kk-1.1.2.ebuild
new file mode 100644
index 0000000..0eda532
--- /dev/null
+++ b/app-dicts/hunspell-kk/hunspell-kk-1.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils git-r3 vcs-snapshot
+
+MY_P=${PN}-${PV}
+
+DESCRIPTION="Kazakh dictionaries for myspell/hunspell"
+SRC_URI="https://github.com/kergalym/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://hunspell.sourceforge.net/"
+
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="ncurses nls readline static-libs"
+KEYWORDS="~x86 ~amd64"
+
+RDEPEND="
+ ncurses? ( sys-libs/ncurses:= )
+ readline? ( sys-libs/readline:= )"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ app-text/hunspell
+ app-dicts/myspell-en
+ app-dicts/myspell-ru"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+ dodir "/usr/share/myspell"
+ insinto "/usr/share/myspell"
+ doins "${S}/kk_KZ.aff"
+ doins "${S}/kk_noun_adj.aff"
+ doins "${S}/kk_test.aff"
+ doins "${S}/kk_noun_adj.dic"
+ doins "${S}/kk_test.dic"
+ doins "${S}/kk_KZ.dic"
+ dodoc README_kk_KZ.txt
+}
diff --git a/app-dicts/hunspell-kk/metadata.xml b/app-dicts/hunspell-kk/metadata.xml
new file mode 100644
index 0000000..86a2f54
--- /dev/null
+++ b/app-dicts/hunspell-kk/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>idella4@gentoo.org</email>
+ <name>Ian Delaney</name>
+ </maintainer>
+ <maintainer>
+ <email>kegalym2@mail.ru</email>
+ <name>Galym Kerimbekov</name>
+ <description>Proxy maintainer, assign bugs to him</description>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-doc/doxygen/doxygen-1.8.9.1.ebuild b/app-doc/doxygen/doxygen-1.8.9.1.ebuild
index 37cf363..30e709c 100644
--- a/app-doc/doxygen/doxygen-1.8.9.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.9.1.ebuild
@@ -14,7 +14,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~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 ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 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 ~x86-solaris"
IUSE="clang debug doc dot doxysearch qt4 latex sqlite"
#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index eb028eb..9091eb5 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -2,3 +2,4 @@
DIST ReText-5.0.2.tar.gz 140853 SHA256 7ef898abc8aed70502fd4d69ed7e8ab43cc978fcbe6864da5771379c1e315bdd SHA512 b28dd24aa5253106880bd6a5a3a16f96670c3145a2cb46da520407d6705f055ee52aaef9c0a8e27c2900b5fdde6a67c599cb8945f7daa6e3ef4456e1fd7c9b0f WHIRLPOOL 0ee1a7497ca3d6fef8356777d93e369d06de542b20974055ddf66cc8e12d33c7716d3b4b5f0360b40037c90d146fddbff4c3b48c96929efafd8f43e278240c0f
DIST ReText-5.1.0.tar.gz 151833 SHA256 09b12892a0520bb8b0692f5aec7aa88911d07a5048a3402a9e9d4ac57322b5ca SHA512 3dbfe4992195119513c571291c344338dccf55c52d000cc69da63d0e51e5f2d9c5a0a2fba6570e525c96f1f9243a7465391a59b840a1fb7dd4513a0b4909ca5c WHIRLPOOL 76826184a3e8ac3ea3f5c10c31a3630ad8bc37a1bce0d771fc250f1f53acb9dd2f888aa67adf946368a5baebcdab0306100ea0e632dcd36edd81cdcd1a247838
DIST ReText-5.2.0.tar.gz 156953 SHA256 463b524435d7b068d90304ae719f96a9c8b957323206549ae5a02ffe5fa82b17 SHA512 9a40fb0e39145ee9bc29945af488e74ea8aa5a78b220f28d1c3de5060daf6f3a6864b4e852165847bb4b5905ca4f0684d56b24864baa05f96468f5d4d0172c6b WHIRLPOOL be4b10f7158de253ac1a104e5053d80afcf5ecc6928ba8a009c8bbdac9166a735cb60d56c268c6f1651f3d7c6c4d9daac46caa4696795e68c1dbf870dc759afd
+DIST ReText-5.2.1.tar.gz 157119 SHA256 02164ae2bba6f47a2ec5e11aa06aefbcd96bea1b84a96c5673dbe18d8ccb2a69 SHA512 1d11f6824b64a082425ac2e8b67da15d4df5352539b66a8297dba0cd4f4236b7328966e97104c3fd7a641067a84023f65ba856f932d8489ff4e80722471835d8 WHIRLPOOL 24e7c756f61c210320b0ab9a67c99f43ccf5739310a01d9ee98d779e8b45b27dbc828b0c573973b2e4d2b8e07f2edd56660de685930a7a2ed8ceb50ab6fb6f91
diff --git a/app-editors/retext/metadata.xml b/app-editors/retext/metadata.xml
index ded9cf7..bfcec72 100644
--- a/app-editors/retext/metadata.xml
+++ b/app-editors/retext/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
diff --git a/app-editors/retext/retext-5.2.1.ebuild b/app-editors/retext/retext-5.2.1.ebuild
new file mode 100644
index 0000000..f147eaa
--- /dev/null
+++ b/app-editors/retext/retext-5.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4} )
+
+PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW"
+
+inherit distutils-r1 l10n
+
+MY_PN="ReText"
+MY_P="${MY_PN}-${PV/_/~}"
+
+DESCRIPTION="Simple editor for Markdown and reStructuredText"
+HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+spell"
+
+RDEPEND="
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ dev-python/markups[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/PyQt5[gui,network,printsupport,webkit,widgets,${PYTHON_USEDEP}]
+ spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${MY_P}
+
+remove_locale() {
+ find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newicon {icons/,}${PN}.png
+ newicon {icons/,}${PN}.svg
+
+ l10n_for_each_disabled_locale_do remove_locale
+
+ make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
+}
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
new file mode 100644
index 0000000..025a390
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
@@ -0,0 +1,35 @@
+diff --git a/src/lisp.h b/src/lisp.h
+--- a/src/lisp.h
++++ b/src/lisp.h
+@@ -1154,6 +1154,8 @@
+
+ /* ------------------------ alignment definitions ------------------- */
+
++#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \
++ (!defined (__cplusplus) || __cplusplus < 201103L)
+ /* No type has a greater alignment requirement than max_align_t.
+ (except perhaps for types we don't use, like long double) */
+ typedef union
+@@ -1163,6 +1165,7 @@
+ struct { void (*f)(void); } f;
+ struct { double d; } d;
+ } max_align_t;
++#endif
+
+ /* ALIGNOF returns the required alignment of a type -- i.e. a value such
+ that data of this type must begin at a memory address which is a
+@@ -1170,7 +1173,11 @@
+ as the type itself. */
+
+ #ifndef ALIGNOF
+-# if defined (__GNUC__) && (__GNUC__ >= 2)
++# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
++# define ALIGNOF(type) _Alignof(type)
++# elif defined (__cplusplus) && __cplusplus >= 201103L
++# define ALIGNOF(type) alignof(type)
++# elif defined (__GNUC__) && (__GNUC__ >= 2)
+ /* gcc has an extension that gives us exactly what we want. */
+ # define ALIGNOF(type) __alignof__ (type)
+ # elif ! defined (__cplusplus)
+
+
diff --git a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild b/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
index e8f4a79..b4d84d6 100644
--- a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
@@ -45,7 +45,7 @@
jpeg? ( virtual/jpeg:0 )
canna? ( app-i18n/canna )
!amd64? ( freewnn? ( app-i18n/freewnn ) )
- >=sys-libs/ncurses-5.2
+ >=sys-libs/ncurses-5.2:=
>=app-eselect/eselect-emacs-1.15"
DEPEND="${RDEPEND}"
diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 31b88c5..24fd39c 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -18,7 +18,7 @@
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
@@ -45,7 +45,7 @@
jpeg? ( virtual/jpeg:0 )
canna? ( app-i18n/canna )
!amd64? ( freewnn? ( app-i18n/freewnn ) )
- >=sys-libs/ncurses-5.2
+ >=sys-libs/ncurses-5.2:=
>=app-eselect/eselect-emacs-1.15"
DEPEND="${RDEPEND}
diff --git a/app-editors/xemacs/xemacs-21.5.34-r3.ebuild b/app-editors/xemacs/xemacs-21.5.34-r3.ebuild
new file mode 100644
index 0000000..c5dfa22
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r3.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Note: xemacs currently does not work with a hardened profile. If you
+# want to use xemacs on a hardened profile then compile with the
+# -nopie flag in CFLAGS or help fix bug #75028.
+
+EAPI=4
+
+WANT_AUTOCONF="2.5"
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
+ http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+ berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 )
+ gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
+ >=sys-libs/zlib-1.1.4
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ >=media-libs/audiofile-0.2.3
+ gpm? ( >=sys-libs/gpm-1.19.6 )
+ postgres? ( dev-db/postgresql )
+ ldap? ( net-nds/openldap )
+ alsa? ( media-libs/alsa-lib )
+ nas? ( media-libs/nas )
+ X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+ dnd? ( x11-libs/dnd )
+ motif? ( >=x11-libs/motif-2.3:0[xft=] )
+ athena? ( x11-libs/libXaw )
+ Xaw3d? ( x11-libs/libXaw3d )
+ xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
+ neXt? ( x11-libs/neXtaw )
+ xface? ( media-libs/compface )
+ tiff? ( media-libs/tiff:0 )
+ png? ( >=media-libs/libpng-1.2:0 )
+ jpeg? ( virtual/jpeg:0 )
+ canna? ( app-i18n/canna )
+ freewnn? ( app-i18n/freewnn )
+ >=sys-libs/ncurses-5.2
+ >=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+ mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+ default_src_unpack
+
+ use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+ use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+ find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+ epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
+
+ # Some binaries and man pages are installed under suffixed names
+ # to avoid collions with their GNU Emacs counterparts (see below).
+ # Fix internal filename references.
+ sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+ sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+ sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
+}
+
+src_configure() {
+ local myconf=""
+
+ if use X; then
+
+ myconf="${myconf} --with-widgets=athena"
+ myconf="${myconf} --with-dialogs=athena"
+ myconf="${myconf} --with-menubars=lucid"
+ myconf="${myconf} --with-scrollbars=lucid"
+ if use motif ; then
+ myconf="--with-widgets=motif"
+ myconf="${myconf} --with-dialogs=motif"
+ myconf="${myconf} --with-scrollbars=motif"
+ myconf="${myconf} --with-menubars=lucid"
+ fi
+ if use athena or use Xaw3d ; then
+ myconf="--with-scrollbars=athena"
+ fi
+
+ if use Xaw3d; then
+ myconf="${myconf} --with-athena=3d"
+ elif use neXt; then
+ myconf="${myconf} --with-athena=next"
+ else
+ myconf="${myconf} --with-athena=xaw"
+ fi
+
+ use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+
+ myconf="${myconf} $(use_with tiff )"
+ myconf="${myconf} $(use_with png )"
+ myconf="${myconf} $(use_with jpeg )"
+ myconf="${myconf} $(use_with xface )"
+
+ use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
+ myconf="${myconf} --with-xft=no"
+
+ else
+ myconf="${myconf}
+ --without-x
+ --without-xpm
+ --without-dragndrop
+ --with-xft=no
+ --with-gif=no"
+ fi
+
+ if use mule ; then
+ myconf="${myconf} --with-mule"
+
+ if use xim ; then
+ if use motif ; then
+ myconf="${myconf} --with-xim=motif"
+ else
+ myconf="${myconf} --with-xim=xlib"
+ fi
+ else
+ myconf="${myconf} --with-xim=no"
+ fi
+
+ myconf="${myconf} $(use_with canna )"
+ myconf="${myconf} $(use_with freewnn wnn )"
+ fi
+
+ # This determines the type of sounds we are playing
+ local soundconf="native"
+
+ # This determines how these sounds should be played
+ use nas && soundconf="${soundconf},nas"
+ use alsa && soundconf="${soundconf},alsa"
+
+ myconf="${myconf} --with-sound=${soundconf}"
+
+ if use gdbm || use berkdb ; then
+ use gdbm && mydb="gdbm"
+ use berkdb && mydb="${mydb},berkdb"
+
+ myconf="${myconf} --with-database=${mydb}"
+ else
+ myconf="${myconf} --without-database"
+ fi
+
+ use debug && myconf="${myconf} --with-debug" ||
+ myconf="${myconf} --with-optimization"
+
+ econf ${myconf} \
+ $(use_with gif ) \
+ $(use_with gpm ) \
+ $(use_with postgres postgresql ) \
+ $(use_with ldap ) \
+ $(use_with eolconv file-coding ) \
+ $(use_with pop ) \
+ --prefix=/usr \
+ --with-ncurses \
+ --with-msw=no \
+ --with-mail-locking=flock \
+ --with-site-lisp=yes \
+ --with-site-modules=yes \
+ --with-newgc \
+ --enable-option-checking=no \
+ --with-last-packages=/usr/lib/xemacs \
+ || die "configuration failed"
+}
+
+src_compile() {
+ emake EMACSLOADPATH="${S}"/lisp
+}
+
+src_install() {
+ emake prefix="${D}"/usr \
+ mandir="${D}"/usr/share/man/man1 \
+ infodir="${D}"/usr/share/info \
+ libdir="${D}"/usr/$(get_libdir) \
+ datadir="${D}"/usr/share \
+ install || die
+
+ # Rename some applications installed in bin so that it is clear
+ # which application installed them and so that conflicting
+ # packages (emacs) can't clobber the actual applications.
+ # Addresses bug #62991.
+ for i in b2m ctags etags gnuclient gnudoit gnuattach; do
+ mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
+ done
+
+ # rename man pages
+ for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
+ mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
+ done
+
+ # install base packages directories
+ dodir /usr/lib/xemacs/xemacs-packages/
+ dodir /usr/lib/xemacs/site-packages/
+ dodir /usr/lib/xemacs/site-modules/
+ dodir /usr/lib/xemacs/site-lisp/
+
+ if use mule;
+ then
+ dodir /usr/lib/xemacs/mule-packages
+ fi
+
+ # remove extraneous info files
+ cd "${D}"/usr/share/info
+ rm -f dir info.info texinfo* termcap* standards*
+
+ cd "${S}"
+ dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
+
+ newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+ domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+ eselect emacs update ifunset
+ eselect gnuclient update ifunset
+
+ einfo "*************************************************"
+ einfo "If you are upgrading from XEmacs 21.4 you should note the following"
+ einfo "incompatibilities:"
+ einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
+ einfo "- The X resource class has changed from Emacs to XEmacs,"
+ einfo " settings in your .Xdefaults file should be updated accordingly."
+
+ if use xft;
+ then
+ einfo "You have enabled Xft font support. Xft requires font names to be provided"
+ einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
+ fi
+}
+
+pkg_postrm() {
+ eselect emacs update ifunset
+ eselect gnuclient update ifunset
+}
diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
new file mode 100644
index 0000000..4756c65
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Note: xemacs currently does not work with a hardened profile. If you
+# want to use xemacs on a hardened profile then compile with the
+# -nopie flag in CFLAGS or help fix bug #75028.
+
+EAPI=4
+
+WANT_AUTOCONF="2.5"
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
+ http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+ berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 )
+ gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
+ >=sys-libs/zlib-1.1.4
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ >=media-libs/audiofile-0.2.3
+ gpm? ( >=sys-libs/gpm-1.19.6 )
+ postgres? ( dev-db/postgresql )
+ ldap? ( net-nds/openldap )
+ alsa? ( media-libs/alsa-lib )
+ nas? ( media-libs/nas )
+ X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+ dnd? ( x11-libs/dnd )
+ motif? ( >=x11-libs/motif-2.3:0[xft=] )
+ athena? ( x11-libs/libXaw )
+ Xaw3d? ( x11-libs/libXaw3d )
+ xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
+ neXt? ( x11-libs/neXtaw )
+ xface? ( media-libs/compface )
+ tiff? ( media-libs/tiff:0 )
+ png? ( >=media-libs/libpng-1.2:0 )
+ jpeg? ( virtual/jpeg:0 )
+ canna? ( app-i18n/canna )
+ freewnn? ( app-i18n/freewnn )
+ >=sys-libs/ncurses-5.2
+ >=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+ mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+ default_src_unpack
+
+ use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+ use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+ find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+ epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
+ epatch "${FILESDIR}/${P}-gcc5.patch"
+
+ # Some binaries and man pages are installed under suffixed names
+ # to avoid collions with their GNU Emacs counterparts (see below).
+ # Fix internal filename references.
+ sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+ sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+ sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
+}
+
+src_configure() {
+ local myconf=""
+
+ if use X; then
+
+ myconf="${myconf} --with-widgets=athena"
+ myconf="${myconf} --with-dialogs=athena"
+ myconf="${myconf} --with-menubars=lucid"
+ myconf="${myconf} --with-scrollbars=lucid"
+ if use motif ; then
+ myconf="--with-widgets=motif"
+ myconf="${myconf} --with-dialogs=motif"
+ myconf="${myconf} --with-scrollbars=motif"
+ myconf="${myconf} --with-menubars=lucid"
+ fi
+ if use athena or use Xaw3d ; then
+ myconf="--with-scrollbars=athena"
+ fi
+
+ if use Xaw3d; then
+ myconf="${myconf} --with-athena=3d"
+ elif use neXt; then
+ myconf="${myconf} --with-athena=next"
+ else
+ myconf="${myconf} --with-athena=xaw"
+ fi
+
+ use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+
+ myconf="${myconf} $(use_with tiff )"
+ myconf="${myconf} $(use_with png )"
+ myconf="${myconf} $(use_with jpeg )"
+ myconf="${myconf} $(use_with xface )"
+
+ use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
+ myconf="${myconf} --with-xft=no"
+
+ else
+ myconf="${myconf}
+ --without-x
+ --without-xpm
+ --without-dragndrop
+ --with-xft=no
+ --with-gif=no"
+ fi
+
+ if use mule ; then
+ myconf="${myconf} --with-mule"
+
+ if use xim ; then
+ if use motif ; then
+ myconf="${myconf} --with-xim=motif"
+ else
+ myconf="${myconf} --with-xim=xlib"
+ fi
+ else
+ myconf="${myconf} --with-xim=no"
+ fi
+
+ myconf="${myconf} $(use_with canna )"
+ myconf="${myconf} $(use_with freewnn wnn )"
+ fi
+
+ # This determines the type of sounds we are playing
+ local soundconf="native"
+
+ # This determines how these sounds should be played
+ use nas && soundconf="${soundconf},nas"
+ use alsa && soundconf="${soundconf},alsa"
+
+ myconf="${myconf} --with-sound=${soundconf}"
+
+ if use gdbm || use berkdb ; then
+ use gdbm && mydb="gdbm"
+ use berkdb && mydb="${mydb},berkdb"
+
+ myconf="${myconf} --with-database=${mydb}"
+ else
+ myconf="${myconf} --without-database"
+ fi
+
+ use debug && myconf="${myconf} --with-debug" ||
+ myconf="${myconf} --with-optimization"
+
+ econf ${myconf} \
+ $(use_with gif ) \
+ $(use_with gpm ) \
+ $(use_with postgres postgresql ) \
+ $(use_with ldap ) \
+ $(use_with eolconv file-coding ) \
+ $(use_with pop ) \
+ --prefix=/usr \
+ --with-ncurses \
+ --with-msw=no \
+ --with-mail-locking=flock \
+ --with-site-lisp=yes \
+ --with-site-modules=yes \
+ --with-newgc \
+ --enable-option-checking=no \
+ --with-last-packages=/usr/lib/xemacs \
+ || die "configuration failed"
+}
+
+src_compile() {
+ emake EMACSLOADPATH="${S}"/lisp
+}
+
+src_install() {
+ emake prefix="${D}"/usr \
+ mandir="${D}"/usr/share/man/man1 \
+ infodir="${D}"/usr/share/info \
+ libdir="${D}"/usr/$(get_libdir) \
+ datadir="${D}"/usr/share \
+ install || die
+
+ # Rename some applications installed in bin so that it is clear
+ # which application installed them and so that conflicting
+ # packages (emacs) can't clobber the actual applications.
+ # Addresses bug #62991.
+ for i in b2m ctags etags gnuclient gnudoit gnuattach; do
+ mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
+ done
+
+ # rename man pages
+ for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
+ mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
+ done
+
+ # install base packages directories
+ dodir /usr/lib/xemacs/xemacs-packages/
+ dodir /usr/lib/xemacs/site-packages/
+ dodir /usr/lib/xemacs/site-modules/
+ dodir /usr/lib/xemacs/site-lisp/
+
+ if use mule;
+ then
+ dodir /usr/lib/xemacs/mule-packages
+ fi
+
+ # remove extraneous info files
+ cd "${D}"/usr/share/info
+ rm -f dir info.info texinfo* termcap* standards*
+
+ cd "${S}"
+ dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
+
+ newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+ domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+ eselect emacs update ifunset
+ eselect gnuclient update ifunset
+
+ einfo "*************************************************"
+ einfo "If you are upgrading from XEmacs 21.4 you should note the following"
+ einfo "incompatibilities:"
+ einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
+ einfo "- The X resource class has changed from Emacs to XEmacs,"
+ einfo " settings in your .Xdefaults file should be updated accordingly."
+
+ if use xft;
+ then
+ einfo "You have enabled Xft font support. Xft requires font names to be provided"
+ einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
+ fi
+}
+
+pkg_postrm() {
+ eselect emacs update ifunset
+ eselect gnuclient update ifunset
+}
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index f35ea15..ee6ddc8 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1,3 +1,3 @@
-DIST ess-13.09.tgz 3356969 SHA256 d0625f8ac38831a05d419435d3a6ccf852878c8aea018c3f4a9c9d6bd61e71d2 SHA512 96a91a41c9b390c27646e4b95d7a41e6b22d592c82bf775f2e1b70905c7bc684c3d6645496275d245c9f882030da1b3bd5cd3ba5711acbec3a07cdb2d065a5dd WHIRLPOOL 3560d95bcb43a65ca86787274fa96106611a98041cf63905a4066223247d8557405b7557da2c468d836d4570d4e791aa36e84e76585fc9668729926ef0759598
DIST ess-14.09.tgz 3350987 SHA256 b6f1badd065e2e42f1d9d75a4e7a04290849d6f7a2bdb8413f73e0eae4014571 SHA512 91e275810f7a8c856f3392194ad3fb3d5f5b966e887568b22c133a362164e71ff5306d1d1a70e97f9d10261fe82eecb5f14e99a0dad4a4e239f5b810d7bba8ac WHIRLPOOL 5eabe6d65d7b5d420a7c6989b82d9901ac20d7b6376223f5aee39da7212ea395d15a98ce86c49fb2782706ba524532ceb38fd23dafaae5891a55958d1c676221
DIST ess-15.03-1.tgz 3177102 SHA256 ad2f1b48dd4671848709d226aab72427129ac2fd5f85c0c0b39b96be24eee66f SHA512 5260d8afa10e1382cac3c70a4b6f753dd77e9f24bb2f68247732605b0f5fbb1b06e090dbcb45d747a484333f0779959c9213a4792103839b11c9e239bf35534d WHIRLPOOL eb1e6917a05b7444f4c37949a51554b6b33a0841bad5dae6aa93f575a7914fb36299c7c63ec27ec24944104a39b5844ada12b1c74a64daa04a682d5e97001834
+DIST ess-15.09.tgz 3239642 SHA256 3438683af3232280d9281938ad101a1e0bb92aa7c97f330c07d8ef7d10489465 SHA512 95350c1d558ba2bc8582978441569f40ba4c59609c21cd473908cc152c8cc6e4e38b9236cc47dd73469dcf14c8a359652e54de5632a21700835350764f401d4f WHIRLPOOL 426659087f7ace498cf99bcc67502c0d83c140ae8e5576d80747ba9fe22db641e2ef48dbbb0771231d880dddfc9fcf3ca8c482578e77c15c2d1b6a114509da46
diff --git a/app-emacs/ess/ess-13.09.ebuild b/app-emacs/ess/ess-13.09.ebuild
deleted file mode 100644
index e80e2e1..0000000
--- a/app-emacs/ess/ess-13.09.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Emacs Speaks Statistics"
-HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
-
-LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-DEPEND="app-text/texi2html
- virtual/latex-base"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
- default
-}
-
-src_install() {
- emake PREFIX="${ED}/usr" \
- INFODIR="${ED}/usr/share/info" \
- LISPDIR="${ED}${SITELISP}/ess" \
- DOCDIR="${ED}/usr/share/doc/${PF}" \
- install
-
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
- # Most documentation is installed by the package's build system.
- rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
- dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
- newdoc lisp/ChangeLog ChangeLog-lisp
-}
-
-pkg_postinst() {
- elisp-site-regen
- elog "Please see /usr/share/doc/${PF} for the complete documentation."
- elog "Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
-}
diff --git a/app-emacs/ess/ess-15.09.ebuild b/app-emacs/ess/ess-15.09.ebuild
new file mode 100644
index 0000000..6953117
--- /dev/null
+++ b/app-emacs/ess/ess-15.09.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="Emacs Speaks Statistics"
+HOMEPAGE="http://ess.r-project.org/"
+SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
+
+LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND="app-text/texi2html
+ virtual/latex-base"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake PREFIX="${ED}/usr" \
+ INFODIR="${ED}/usr/share/info" \
+ LISPDIR="${ED}${SITELISP}/ess" \
+ DOCDIR="${ED}/usr/share/doc/${PF}" \
+ install
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ # Most documentation is installed by the package's build system.
+ rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
+ dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
+ newdoc doc/ChangeLog ChangeLog-doc
+ newdoc lisp/ChangeLog ChangeLog-lisp
+
+ DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
+ documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
+ readme.gentoo_create_doc
+}
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
index 589eafa..c6f28fb 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
@@ -25,7 +25,6 @@
DEPEND=""
RDEPEND="app-arch/dump
>=app-emulation/ganeti-2.0.3
- || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )
app-emulation/qemu
sys-apps/util-linux
sys-fs/multipath-tools
diff --git a/app-emulation/libspectrum/metadata.xml b/app-emulation/libspectrum/metadata.xml
index 1995e49..c54cad0 100644
--- a/app-emulation/libspectrum/metadata.xml
+++ b/app-emulation/libspectrum/metadata.xml
@@ -10,7 +10,7 @@
<maintainer>
<email>jmfo1982@yahoo.es</email>
<description>Proxied Maintainer. Please CC on bugs.</description>
- <name>José Manuel Ferrer Ortiz</name>
+ <name>José Manuel Ferrer Ortiz</name>
</maintainer>
<longdescription>
libspectrum is a library designed to make the input and output of some ZX
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index b88b419..375998b 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,4 +1,3 @@
-DIST libvirt-1.2.15.tar.gz 29094868 SHA256 5f88041b8c212f8f687c672fe583108833240d6175b512ce4de92ab6660194c6 SHA512 c5dd3af86e89e3804d6c3b527c6dbd98c79d87d2591725a13af33530e0e9a9a2e9aeb9491844469d44ec4f4d17adb036c76391f964158ada23ec042a75556fbc WHIRLPOOL a43aad4caeff707c8d7a6872ff3c46911c96fd90ece02a7f6ceabb4ccd00e467b5341ab9d922912cc2968a2bb8826e970b253b257c5a8981b37364550f9b3616
-DIST libvirt-1.2.17.tar.gz 29320317 SHA256 e07eaf20b0590fae05ba3b53ad4dac3e5fbd771437563cc78b692f23ddd02fad SHA512 133ee2da30352d5eeb81c3e24f6eaf21c40b5afeb05abece9298956fa9c52c62ebc3468433311853cf2d65894e38e98f5c6744269d2d64fa3b3cf6f4b9b0cc46 WHIRLPOOL 4fdd6554989ea7d32600cc978d2c95582433ac223e933b55d838ba4ddffba2d6444a0d556348681ad36766e73ba2bf9788b37180c980636324b5b6fa093a2347
DIST libvirt-1.2.18.tar.gz 29412554 SHA256 d5a5ff18af4cced21fed986d28fa0a21b782d256920326bf0ff1c7731eeb6ade SHA512 e89d494066ebec4de4c9a53089f015635b7b5ccf4a10ab9749883cc81f6f9607b18ca91a1bd01a9cdacb3a46de86223f0432fae3954106cb92dd275e5b4138c5 WHIRLPOOL dbbbd627ccb9be154bc680407898cd32dfdbc218a67f54560e6b0f0200cbc157a9aa05834de5d9d23e3b6da0625fd5943b4c8e38f8bb9a6ff920bc5820287bfc
DIST libvirt-1.2.19.tar.gz 29644247 SHA256 282c141f03331d640020c15f81464b27400e0ee307ef4c5190393b021caedd6e SHA512 2f3f26b90120a39861683f1b5af93ac661ab561e23514c71c2ebfb1ab88da99d25acee9a5d11bec35478e38b9105f3779bffb4d4649f16a91aeccdcaa61e4aa4 WHIRLPOOL 4262beb2248495746d32bc7b16c3eec69d9cba7d4fb3870fcd560bd4d222827cf90eb9cc3df647f3fe10467d1562e72138cbf871adc5f63d4788069e1b9740ac
+DIST libvirt-1.2.20.tar.gz 29725368 SHA256 df0b5d8a150863a86b98cf809a586c91b2d49af25b74a354049ea416b0b27d30 SHA512 2c7f7995d38d15453de99cc34e63db9c39c653fc24a4fd949207e62c0241f2a5ff3ab5505909ffae77f7a91d321396372188aa29124b8271f876d93546c44d07 WHIRLPOOL 553517c8eec3f601987d9a9205668a81ffcaf9081ee0d79de847ce1d2c9bcd9115471adf2022095143d440a07f7d48059cfd88094b7dda7046a784c93c449817
diff --git a/app-emulation/libvirt/files/README.gentoo-r1 b/app-emulation/libvirt/files/README.gentoo-r1
new file mode 100644
index 0000000..74d1e77
--- /dev/null
+++ b/app-emulation/libvirt/files/README.gentoo-r1
@@ -0,0 +1,53 @@
+Important: The openrc libvirtd init script is now broken up into two
+separate services: libvirtd, that solely handles the daemon, and
+libvirt-guests, that takes care of clients during shutdown/restart of the
+host. In order to reenable client handling, edit /etc/conf.d/libvirt-guests
+and enable the service and start it:
+
+ $ rc-update add libvirt-guests
+ $ service libvirt-guests start
+
+
+For the basic networking support (bridged and routed networks) you don't
+need any extra software. For more complex network modes including but not
+limited to NATed network, you can enable the 'virt-network' USE flag. It
+will pull in required runtime dependencies
+
+
+If you are using dnsmasq on your system, you will have to configure
+/etc/dnsmasq.conf to enable the following settings:
+
+ bind-interfaces
+ interface or except-interface
+
+Otherwise you might have issues with your existing DNS server.
+
+
+For openrc users:
+
+ Please use /etc/conf.d/libvirtd to control the '--listen' parameter for
+ libvirtd.
+
+ Use /etc/init.d/libvirt-guests to manage clients on restart/shutdown of
+ the host. The default configuration will suspend and resume running kvm
+ guests with 'managedsave'. This behavior can be changed under
+ /etc/conf.d/libvirt-guests
+
+
+For systemd users:
+
+ Please use /etc/systemd/system/libvirtd.service.d/00gentoo.conf
+ to control the '--listen' parameter for libvirtd.
+
+ The configuration for the 'libvirt-guests.service' is found under
+ /etc/libvirt/libvirt-guests.conf"
+
+
+If you have built libvirt without policykit support (USE=-policykit), you
+must change the unix sock group and/or perms in /etc/libvirt/libvirtd.conf
+in order to allow normal users to connect to libvirtd.
+
+
+If libvirtd is built with USE=caps, libvirt will now start qemu/kvm VMs
+with non-root privileges. Ensure any resources your VMs use are accessible
+by qemu:qemu.
diff --git a/app-emulation/libvirt/files/libvirt-guests.init b/app-emulation/libvirt/files/libvirt-guests.init
deleted file mode 100644
index c38a0f0..0000000
--- a/app-emulation/libvirt/files/libvirt-guests.init
+++ /dev/null
@@ -1,239 +0,0 @@
-#!/sbin/runscript
-
-description="Virtual Machine Management (libvirt) Guests"
-
-depend() {
- need libvirtd
-}
-
-# set the default to QEMU
-[ -z "${LIBVIRT_URIS}" ] && LIBVIRT_URIS="qemu:///system"
-
-# default to suspending the VM via managedsave
-case "${LIBVIRT_SHUTDOWN}" in
- managedsave|shutdown|destroy) ;;
- *) LIBVIRT_SHUTDOWN="managedsave" ;;
-esac
-
-# default to 500 seconds
-[ -z ${LIBVIRT_MAXWAIT} ] && LIBVIRT_MAXWAIT=500
-
-gueststatefile="/var/lib/libvirt/libvirt-guests.state"
-netstatefile="/var/lib/libvirt/libvirt-net.state"
-
-do_virsh() {
- local hvuri=$1
- shift
-
- # if unset, default to qemu
- [ -z ${hvuri} ] && hvuri="qemu:///system"
- # if only qemu was supplied then correct the value
- [ "xqemu" = x${hvuri} ] && hvuri="qemu:///system"
-
- # Silence errors because virsh always throws an error about
- # not finding the hypervisor version when connecting to libvirtd
- # lastly strip the blank line at the end
- LC_ALL=C virsh -c ${hvuri} "$@" 2>/dev/null | head -n -1
-}
-
-libvirtd_dom_list() {
- # Only work with domains by their UUIDs
- local hvuri=$1
- shift
-
- do_virsh "${hvuri}" list --uuid $@
-}
-
-libvirtd_dom_count() {
- local hvuri=$1
- shift
-
- libvirtd_dom_list "${hvuri}" $@ | wc -l
-}
-
-libvirtd_net_list() {
- # Only work with networks by their UUIDs
- local hvuri=$1
- shift
-
- do_virsh "${hvuri}" net-list --uuid $@
-}
-
-libvirtd_net_count() {
- local hvuri=$1
- shift
-
- libvirtd_net_list "${hvuri}" $@ | wc -l
-}
-
-libvirtd_dom_stop() {
- # stops all persistent or transient domains for a given URI
- # $1 - uri
- # $2 - persisent/transient
-
- local uri=$1
- local persist=$2
- local shutdown_type=${LIBVIRT_SHUTDOWN}
- local counter=${LIBVIRT_MAXWAIT}
- local dom_name=
- local dom_as=
- local dom_ids=
- local uuid=
- local dom_count=
-
- [ "${persist}" = "--transient" ] && shutdown_type="shutdown"
- [ -n "${counter}" ] || counter=500
-
- einfo " Shutting down domain(s) ..."
-
- # grab all persistent or transient domains running
- dom_ids=$(libvirtd_dom_list ${uri} ${persist})
-
- for uuid in ${dom_ids}; do
- # Get the name
- dom_name=$(do_virsh ${uri} domname ${uuid})
- einfo " ${dom_name}"
- # Get autostart state
- dom_as=$(do_virsh ${uri} dominfo ${uuid} | \
- awk '$1 == "Autostart:" { print $2 }')
-
- if [ "${persist}" = "--persistent" ]; then
- # Save our running state only if LIBVIRT_IGNORE_AUTOSTART != yes
- if [ "x${LIBVIRT_IGNORE_AUTOSTART}" = "xyes" ] && \
- [ ${dom_as} = "enabled" ]; then
- :
- else
- echo "${uri} ${uuid}" >> ${gueststatefile}
- fi
-
- fi
-
- # Now let's stop it
- do_virsh "${uri}" ${shutdown_type} ${uuid} > /dev/null
-
- done
-
- dom_count="$(libvirtd_dom_count ${uri} ${persist})"
- while [ ${dom_count} -gt 0 ] && [ ${counter} -gt 0 ] ; do
- dom_count="$(libvirtd_dom_count ${uri} ${persist})"
- sleep 1
- if [ "${shutdown_type}" = "shutdown" ]; then
- counter=$((${counter} - 1))
- fi
- echo -n "."
- done
-
- if [ "${shutdown_type}" = "shutdown" ]; then
- # grab all domains still running
- dom_ids=$(libvirtd_dom_list ${uri} ${persist})
- for uuid in ${dom_ids}; do
- dom_name=$(do_virsh ${uri} domname ${uuid})
- eerror " ${dom_name} forcibly stopped"
- do_virsh "${uri}" destroy ${uuid} > /dev/null
- done
- fi
-}
-
-libvirtd_net_stop() {
- # stops all persistent or transient domains for a given URI
- # $1 - uri
- # $2 - persisent/transient
-
- local uri=$1
- local persist=$2
- local uuid=
- local net_name=
-
- if [ "${LIBVIRT_NET_SHUTDOWN}" != "no" ]; then
-
- einfo " Shutting down network(s):"
- for uuid in $(libvirtd_net_list ${uri} ${persist}); do
- net_name=$(do_virsh ${uri} net-name ${uuid})
- einfo " ${net_name}"
-
- if [ "${persist}" = "--persistent" ]; then
- # Save our running state
- echo "${uri} ${uuid}" >> ${netstatefile}
-
- fi
-
- # Actually stop the network
- do_virsh qemu net-destroy ${uuid} > /dev/null
- done
-
- fi
-}
-
-start() {
- local uri=
- local uuid=
- local name=
-
- for uri in ${LIBVIRT_URIS}; do
- do_virsh "${uri}" connect
- if [ $? -ne 0 ]; then
- eerror "Failed to connect to '${uri}'. Domains may not start."
- fi
- done
-
- [ ! -e "${netstatefile}" ] && touch "${netstatefile}"
- [ ! -e "${gueststatefile}" ] && touch "${gueststatefile}"
-
- # if the user didn't want to start any guests up then respect their wish
- [ "x${LIBVIRT_START}" = "xno" ] && return 0
-
- # start networks
- ebegin "Starting libvirt networks"
- while read -r line
- do
- # tokenize the data
- read -r uri uuid <<<"${line}"
- # ignore trash
- [ -z "${uri}" ] || [ -z "${uuid}" ] && continue
-
- name=$(do_virsh "${uri}" net-name ${uuid})
- einfo " ${name}"
- do_virsh "${uri}" net-start ${uuid} > /dev/null
- done <"${netstatefile}"
- eend 0
-
- # start domains
- ebegin "Starting libvirt domains"
- while read -r line
- do
- # tokenize the data
- read -r uri uuid <<<"${line}"
- # ignore trash
- [ -z "${uri}" ] || [ -z "${uuid}" ] && continue
-
- name=$(do_virsh "${uri}" domname ${uuid})
- einfo " ${name}"
- do_virsh "${uri}" start ${uuid} > /dev/null
- done <"${gueststatefile}"
- eend 0
-}
-
-stop() {
- local counter=
- local dom_name=
- local net_name=
- local dom_ids=
- local uuid=
- local dom_count=
-
- rm -f "${gueststatefile}"
- [ $? -ne 0 ] && eerror "Unable to save domain state"
- rm -f "${netstatefile}"
- [ $? -ne 0 ] && eerror "Unable to save net state"
-
- for uri in ${LIBVIRT_URIS}; do
- einfo "Stopping libvirt domains and networks for ${uri}"
-
- libvirtd_dom_stop "${uri}" "--persistent"
- libvirtd_dom_stop "${uri}" "--transient"
- libvirtd_net_stop "${uri}" "--persistent"
- libvirtd_net_stop "${uri}" "--transient"
-
- einfo "Done stopping domains and networks for ${uri}"
- done
-}
diff --git a/app-emulation/libvirt/files/libvirt-guests.init-r1 b/app-emulation/libvirt/files/libvirt-guests.init-r1
new file mode 100644
index 0000000..a8d65f8
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-guests.init-r1
@@ -0,0 +1,235 @@
+#!/sbin/runscript
+
+description="Virtual Machine Management (libvirt) Guests"
+
+depend() {
+ need libvirtd
+}
+
+# set the default to QEMU
+[ -z "${LIBVIRT_URIS}" ] && LIBVIRT_URIS="qemu:///system"
+
+# default to suspending the VM via managedsave
+case "${LIBVIRT_SHUTDOWN}" in
+ managedsave|shutdown|destroy) ;;
+ *) LIBVIRT_SHUTDOWN="managedsave" ;;
+esac
+
+# default to 500 seconds
+[ -z ${LIBVIRT_MAXWAIT} ] && LIBVIRT_MAXWAIT=500
+
+gueststatefile="/var/lib/libvirt/libvirt-guests.state"
+netstatefile="/var/lib/libvirt/libvirt-net.state"
+
+do_virsh() {
+ local hvuri=$1
+ shift
+
+ # if unset, default to qemu
+ [ -z ${hvuri} ] && hvuri="qemu:///system"
+ # if only qemu was supplied then correct the value
+ [ "xqemu" = x${hvuri} ] && hvuri="qemu:///system"
+
+ # Silence errors because virsh always throws an error about
+ # not finding the hypervisor version when connecting to libvirtd
+ # lastly strip the blank line at the end
+ LC_ALL=C virsh -c ${hvuri} "$@" 2>/dev/null | head -n -1
+}
+
+libvirtd_dom_list() {
+ # Only work with domains by their UUIDs
+ local hvuri=$1
+ shift
+
+ do_virsh "${hvuri}" list --uuid $@
+}
+
+libvirtd_dom_count() {
+ local hvuri=$1
+ shift
+
+ libvirtd_dom_list "${hvuri}" $@ | wc -l
+}
+
+libvirtd_net_list() {
+ # Only work with networks by their UUIDs
+ local hvuri=$1
+ shift
+
+ do_virsh "${hvuri}" net-list --uuid $@
+}
+
+libvirtd_net_count() {
+ local hvuri=$1
+ shift
+
+ libvirtd_net_list "${hvuri}" $@ | wc -l
+}
+
+libvirtd_dom_stop() {
+ # stops all persistent or transient domains for a given URI
+ # $1 - uri
+ # $2 - persisent/transient
+
+ local uri=$1
+ local persist=$2
+ local shutdown_type=${LIBVIRT_SHUTDOWN}
+ local counter=${LIBVIRT_MAXWAIT}
+ local dom_name=
+ local dom_as=
+ local dom_ids=
+ local uuid=
+ local dom_count=
+
+ [ "${persist}" = "--transient" ] && shutdown_type="shutdown"
+ [ -n "${counter}" ] || counter=500
+
+ einfo " Shutting down domain(s) ..."
+
+ # grab all persistent or transient domains running
+ dom_ids=$(libvirtd_dom_list ${uri} ${persist})
+
+ for uuid in ${dom_ids}; do
+ # Get the name
+ dom_name=$(do_virsh ${uri} domname ${uuid})
+ einfo " ${dom_name}"
+ # Get autostart state
+ dom_as=$(do_virsh ${uri} dominfo ${uuid} | \
+ awk '$1 == "Autostart:" { print $2 }')
+
+ if [ "${persist}" = "--persistent" ]; then
+ # Save our running state only if LIBVIRT_IGNORE_AUTOSTART != yes
+ if [ "x${LIBVIRT_IGNORE_AUTOSTART}" = "xyes" ] && \
+ [ ${dom_as} = "enabled" ]; then
+ :
+ else
+ echo "${uri} ${uuid}" >> ${gueststatefile}
+ fi
+
+ fi
+
+ # Now let's stop it
+ do_virsh "${uri}" ${shutdown_type} ${uuid} > /dev/null
+
+ done
+
+ dom_count="$(libvirtd_dom_count ${uri} ${persist})"
+ while [ ${dom_count} -gt 0 ] && [ ${counter} -gt 0 ] ; do
+ dom_count="$(libvirtd_dom_count ${uri} ${persist})"
+ sleep 1
+ if [ "${shutdown_type}" = "shutdown" ]; then
+ counter=$((${counter} - 1))
+ fi
+ echo -n "."
+ done
+
+ if [ "${shutdown_type}" = "shutdown" ]; then
+ # grab all domains still running
+ dom_ids=$(libvirtd_dom_list ${uri} ${persist})
+ for uuid in ${dom_ids}; do
+ dom_name=$(do_virsh ${uri} domname ${uuid})
+ eerror " ${dom_name} forcibly stopped"
+ do_virsh "${uri}" destroy ${uuid} > /dev/null
+ done
+ fi
+}
+
+libvirtd_net_stop() {
+ # stops all persistent or transient domains for a given URI
+ # $1 - uri
+ # $2 - persisent/transient
+
+ local uri=$1
+ local persist=$2
+ local uuid=
+ local net_name=
+
+ if [ "${LIBVIRT_NET_SHUTDOWN}" != "no" ]; then
+
+ einfo " Shutting down network(s):"
+ for uuid in $(libvirtd_net_list ${uri} ${persist}); do
+ net_name=$(do_virsh ${uri} net-name ${uuid})
+ einfo " ${net_name}"
+
+ if [ "${persist}" = "--persistent" ]; then
+ # Save our running state
+ echo "${uri} ${uuid}" >> ${netstatefile}
+
+ fi
+
+ # Actually stop the network
+ do_virsh qemu net-destroy ${uuid} > /dev/null
+ done
+
+ fi
+}
+
+start() {
+ local uri=
+ local uuid=
+ local name=
+
+ for uri in ${LIBVIRT_URIS}; do
+ do_virsh "${uri}" connect
+ if [ $? -ne 0 ]; then
+ eerror "Failed to connect to '${uri}'. Domains may not start."
+ fi
+ done
+
+ [ ! -e "${netstatefile}" ] && touch "${netstatefile}"
+ [ ! -e "${gueststatefile}" ] && touch "${gueststatefile}"
+
+ # if the user didn't want to start any guests up then respect their wish
+ [ "x${LIBVIRT_START}" = "xno" ] && return 0
+
+ # start networks
+ ebegin "Starting libvirt networks"
+ while read -r uri uuid
+ do
+ # ignore trash
+ [ -z "${uri}" ] || [ -z "${uuid}" ] && continue
+
+ name=$(do_virsh "${uri}" net-name ${uuid})
+ einfo " ${name}"
+ do_virsh "${uri}" net-start ${uuid} > /dev/null
+ done <"${netstatefile}"
+ eend 0
+
+ # start domains
+ ebegin "Starting libvirt domains"
+ while read -r uri uuid
+ do
+ # ignore trash
+ [ -z "${uri}" ] || [ -z "${uuid}" ] && continue
+
+ name=$(do_virsh "${uri}" domname ${uuid})
+ einfo " ${name}"
+ do_virsh "${uri}" start ${uuid} > /dev/null
+ done <"${gueststatefile}"
+ eend 0
+}
+
+stop() {
+ local counter=
+ local dom_name=
+ local net_name=
+ local dom_ids=
+ local uuid=
+ local dom_count=
+
+ rm -f "${gueststatefile}"
+ [ $? -ne 0 ] && eerror "Unable to save domain state"
+ rm -f "${netstatefile}"
+ [ $? -ne 0 ] && eerror "Unable to save net state"
+
+ for uri in ${LIBVIRT_URIS}; do
+ einfo "Stopping libvirt domains and networks for ${uri}"
+
+ libvirtd_dom_stop "${uri}" "--persistent"
+ libvirtd_dom_stop "${uri}" "--transient"
+ libvirtd_net_stop "${uri}" "--persistent"
+ libvirtd_net_stop "${uri}" "--transient"
+
+ einfo "Done stopping domains and networks for ${uri}"
+ done
+}
diff --git a/app-emulation/libvirt/libvirt-1.2.15-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.15-r1.ebuild
deleted file mode 100644
index f8c4dec..0000000
--- a/app-emulation/libvirt/libvirt-1.2.15-r1.ebuild
+++ /dev/null
@@ -1,464 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-inherit eutils user autotools linux-info systemd readme.gentoo
-
-BACKPORTS=""
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://libvirt.org/libvirt.git"
- SRC_URI=""
- KEYWORDS=""
- SLOT="0"
-else
- # Versions with 4 numbers are stable updates:
- if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
- SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz"
- else
- SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
- fi
- SRC_URI+=" ${BACKPORTS:+
- https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
- https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
- KEYWORDS="amd64 x86"
- SLOT="0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-# TODO: Reenable IUSE wireshark-plugins
-IUSE="audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc \
- +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
- selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \
- elibc_glibc systemd"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
- lxc? ( caps libvirtd )
- openvz? ( libvirtd )
- qemu? ( libvirtd )
- uml? ( libvirtd )
- vepa? ( macvtap )
- virtualbox? ( libvirtd )
- xen? ( libvirtd )
- virt-network? ( libvirtd )
- firewalld? ( virt-network )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="sys-libs/readline:=
- sys-libs/ncurses:0=
- >=net-misc/curl-7.18.0
- dev-libs/libgcrypt:0
- >=dev-libs/libxml2-2.7.6
- dev-libs/libnl:3
- >=net-libs/gnutls-1.0.25
- net-libs/libssh2
- sys-apps/dmidecode
- >=sys-apps/util-linux-2.17
- sys-devel/gettext
- >=net-analyzer/netcat6-1.0-r2
- app-misc/scrub
- audit? ( sys-process/audit )
- avahi? ( >=net-dns/avahi-0.6[dbus] )
- caps? ( sys-libs/libcap-ng )
- fuse? ( >=sys-fs/fuse-2.8.6 )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
- iscsi? ( sys-block/open-iscsi )
- lxc? ( !systemd? ( sys-power/pm-utils ) )
- lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
- nfs? ( net-fs/nfs-utils )
- numa? (
- >sys-process/numactl-2.0.2
- sys-process/numad
- )
- openvz? ( sys-kernel/openvz-sources:* )
- parted? (
- >=sys-block/parted-1.8[device-mapper]
- sys-fs/lvm2
- )
- pcap? ( >=net-libs/libpcap-1.0.0 )
- policykit? ( >=sys-auth/polkit-0.9 )
- qemu? (
- >=app-emulation/qemu-0.13.0
- dev-libs/yajl
- !systemd? ( sys-power/pm-utils )
- )
- rbd? ( sys-cluster/ceph )
- sasl? ( dev-libs/cyrus-sasl )
- selinux? ( >=sys-libs/libselinux-2.0.85 )
- systemd? ( sys-apps/systemd )
- virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
- wireshark-plugins? ( net-analyzer/wireshark:= )
- xen? ( app-emulation/xen-tools app-emulation/xen )
- udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
- virt-network? ( net-dns/dnsmasq[script]
- >=net-firewall/iptables-1.4.10[ipv6]
- net-misc/radvd
- net-firewall/ebtables
- sys-apps/iproute2[-minimal]
- firewalld? ( net-firewall/firewalld )
- )
- elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- app-text/xhtml1
- dev-lang/perl
- dev-perl/XML-XPath
- dev-libs/libxslt"
-
-DOC_CONTENTS="For the basic networking support (bridged and routed networks)
-you don't need any extra software. For more complex network modes
-including but not limited to NATed network, you can enable the
-'virt-network' USE flag.\n\n
-If you are using dnsmasq on your system, you will have
-to configure /etc/dnsmasq.conf to enable the following settings:\n\n
- bind-interfaces\n
- interface or except-interface\n\n
-Otherwise you might have issues with your existing DNS server."
-
-LXC_CONFIG_CHECK="
- ~CGROUPS
- ~CGROUP_FREEZER
- ~CGROUP_DEVICE
- ~CGROUP_CPUACCT
- ~CGROUP_SCHED
- ~CGROUP_PERF
- ~BLK_CGROUP
- ~NET_CLS_CGROUP
- ~CGROUP_NET_PRIO
- ~CPUSETS
- ~NAMESPACES
- ~UTS_NS
- ~IPC_NS
- ~PID_NS
- ~NET_NS
- ~USER_NS
- ~DEVPTS_MULTIPLE_INSTANCES
- ~VETH
- ~MACVLAN
- ~POSIX_MQUEUE
- ~SECURITYFS
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
- ~BRIDGE_NF_EBTABLES
- ~BRIDGE_EBT_MARK_T
- ~NETFILTER_ADVANCED
- ~NETFILTER_XT_TARGET_CHECKSUM
- ~NETFILTER_XT_CONNMARK
- ~NETFILTER_XT_MARK
-"
-
-BWLMT_CONFIG_CHECK="
- ~BRIDGE_EBT_T_NAT
- ~NET_SCH_HTB
- ~NET_SCH_SFQ
- ~NET_SCH_INGRESS
- ~NET_CLS_FW
- ~NET_CLS_U32
- ~NET_ACT_POLICE
-"
-
-MACVTAP_CONFIG_CHECK=" ~MACVTAP"
-
-LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
-
-ERROR_USER_NS="Optional depending on LXC configuration."
-
-pkg_setup() {
- enewgroup qemu 77
- enewuser qemu 77 -1 -1 qemu kvm
-
- # Some people used the masked ebuild which was not adding the qemu
- # user to the kvm group originally. This results in VMs failing to
- # start for some users. bug #430808
- egetent group kvm | grep -q qemu
- if [[ $? -ne 0 ]]; then
- gpasswd -a qemu kvm
- fi
-
- # Handle specific kernel versions for different features
- kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- kernel_is ge 3 6 && LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
- CONFIG_CHECK=""
- use fuse && CONFIG_CHECK+=" ~FUSE_FS"
- use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
- use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
- use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
- use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
- # Bandwidth Limiting Support
- use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
- if [[ -n ${CONFIG_CHECK} ]]; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- touch "${S}/.mailmap"
-
- if [[ ${PV} = *9999* ]]; then
- # git checkouts require bootstrapping to create the configure script.
- # Additionally the submodules must be cloned to the right locations
- # bug #377279
- ./bootstrap || die "bootstrap failed"
- (
- git submodule status | sed 's/^[ +-]//;s/ .*//'
- git hash-object bootstrap.conf
- ) >.git-module-status
- fi
-
- epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch
-
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
- EPATCH_SOURCE="${WORKDIR}/patches" epatch
-
- epatch_user
-
- [[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-
- # Tweak the init script
- local avahi_init=
- local iscsi_init=
- local rbd_init=
- local firewalld_init=
- cp "${FILESDIR}/libvirtd.init-r14" "${S}/libvirtd.init"
- use avahi && avahi_init='avahi-daemon'
- use iscsi && iscsi_init='iscsid'
- use rbd && rbd_init='ceph'
- use firewalld && firewalld_init='need firewalld'
-
- sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
-}
-
-src_configure() {
- local myconf=""
-
- ## enable/disable daemon, otherwise client only utils
- myconf+=" $(use_with libvirtd)"
-
- ## enable/disable the daemon using avahi to find VMs
- myconf+=" $(use_with avahi)"
-
- ## hypervisors on the local host
- myconf+=" $(use_with xen) $(use_with xen xen-inotify)"
- myconf+=" --without-xenapi"
- if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
- myconf+=" --with-libxl"
- else
- myconf+=" --without-libxl"
- fi
- myconf+=" $(use_with openvz)"
- myconf+=" $(use_with lxc)"
- if use virtualbox && has_version app-emulation/virtualbox-ose; then
- myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
- else
- myconf+=" $(use_with virtualbox vbox)"
- fi
- myconf+=" $(use_with uml)"
- myconf+=" $(use_with qemu)"
- myconf+=" $(use_with qemu yajl)" # Use QMP over HMP
- myconf+=" $(use_with phyp)"
- myconf+=" --with-esx"
- myconf+=" --with-vmware"
-
- ## additional host drivers
- myconf+=" $(use_with virt-network network)"
- myconf+=" --with-storage-fs"
- myconf+=" $(use_with lvm storage-lvm)"
- myconf+=" $(use_with iscsi storage-iscsi)"
- myconf+=" $(use_with parted storage-disk)"
- mycond+=" $(use_with glusterfs)"
- mycond+=" $(use_with glusterfs storage-gluster)"
- myconf+=" $(use_with lvm storage-mpath)"
- myconf+=" $(use_with rbd storage-rbd)"
- myconf+=" $(use_with numa numactl)"
- myconf+=" $(use_with numa numad)"
- myconf+=" $(use_with selinux)"
- myconf+=" $(use_with fuse)"
-
- # udev for device support details
- myconf+=" $(use_with udev)"
- myconf+=" --without-hal"
-
- # linux capability support so we don't need privileged accounts
- myconf+=" $(use_with caps capng)"
-
- ## auth stuff
- myconf+=" $(use_with policykit polkit)"
- myconf+=" $(use_with sasl)"
-
- # network bits
- myconf+=" $(use_with macvtap)"
- myconf+=" $(use_with pcap libpcap)"
- myconf+=" $(use_with vepa virtualport)"
- myconf+=" $(use_with firewalld)"
-
- ## other
- myconf+=" $(use_enable nls)"
-
- # user privilege bits fir qemu/kvm
- if use caps; then
- myconf+=" --with-qemu-user=qemu"
- myconf+=" --with-qemu-group=qemu"
- else
- myconf+=" --with-qemu-user=root"
- myconf+=" --with-qemu-group=root"
- fi
-
- # audit support
- myconf+=" $(use_with audit)"
-
- # wireshark dissector
- myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
-
- ## stuff we don't yet support
- myconf+=" --without-netcf"
-
- # locking support
- myconf+=" --without-sanlock"
-
- # systemd unit files
- myconf+=" $(use_with systemd systemd-daemon)"
- use systemd && myconf+=" --with-init-script=systemd"
-
- # this is a nasty trick to work around the problem in bug
- # #275073. The reason why we don't solve this properly is that
- # it'll require us to rebuild autotools (and we don't really want
- # to do that right now). The proper solution has been sent
- # upstream and should hopefully land in 0.7.7, in the mean time,
- # mime the same functionality with this.
- case ${CHOST} in
- *cygwin* | *mingw* )
- ;;
- *)
- ac_cv_prog_WINDRES=no
- ;;
- esac
-
- econf \
- ${myconf} \
- --disable-static \
- --disable-werror \
- --with-remote \
- --docdir=/usr/share/doc/${PF} \
- --localstatedir=/var
-
- if [[ ${PV} = *9999* ]]; then
- # Restore gnulib's config.sub and config.guess
- # bug #377279
- (cd .gnulib && git reset --hard > /dev/null)
- fi
-}
-
-src_test() {
- # Explicitly allow parallel build of tests
- export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
- emake install \
- DESTDIR="${D}" \
- HTML_DIR=/usr/share/doc/${PF}/html \
- DOCS_DIR=/usr/share/doc/${PF} \
- EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
- SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
- || die "emake install failed"
-
- find "${D}" -name '*.la' -delete || die
-
- # Remove bogus, empty directories. They are either not used, or
- # libvirtd is able to create them on demand
- rm -rf "${D}"/etc/sysconf
- rm -rf "${D}"/var/cache
- rm -rf "${D}"/var/run
- rm -rf "${D}"/var/log
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- use systemd && systemd_install_serviced \
- "${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
- systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
- newinitd "${S}/libvirtd.init" libvirtd || die
- newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # we only ever want to generate this once
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
- fi
-
- # We really don't want to use or support old PolicyKit cause it
- # screws with the new polkit integration
- if has_version sys-auth/policykit; then
- rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
- fi
-
- # Only sysctl files ending in .conf work
- dodir /etc/sysctl.d
- mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
- fi
-
- if ! use policykit; then
- elog "To allow normal users to connect to libvirtd you must change the"
- elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
- fi
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- readme.gentoo_print_elog
-
- if use caps && use qemu; then
- elog "libvirt will now start qemu/kvm VMs with non-root privileges."
- elog "Ensure any resources your VMs use are accessible by qemu:qemu"
- fi
-
- if [[ -n "${REPLACING_VERSIONS}" ]]; then
- elog ""
- elog "The systemd service-file configuration under /etc/sysconfig has"
- elog "been removed. Please use"
- elog " /etc/systemd/system/libvirtd.service.d/00gentoo.conf"
- elog "to control the '--listen' parameter for libvirtd. The configuration"
- elog "for the libvirt-guests.service is now found under"
- elog " /etc/libvirt/libvirt-guests.conf"
- elog "The openrc configuration has not been changed. Thus no action is"
- elog "required for the openrc service manager."
- elog ""
- fi
-}
diff --git a/app-emulation/libvirt/libvirt-1.2.17-r5.ebuild b/app-emulation/libvirt/libvirt-1.2.17-r5.ebuild
deleted file mode 100644
index f60a610..0000000
--- a/app-emulation/libvirt/libvirt-1.2.17-r5.ebuild
+++ /dev/null
@@ -1,480 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-inherit eutils user autotools linux-info systemd readme.gentoo
-
-BACKPORTS=""
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://libvirt.org/libvirt.git"
- SRC_URI=""
- KEYWORDS=""
- SLOT="0"
-else
- # Versions with 4 numbers are stable updates:
- if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
- SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz"
- else
- SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
- fi
- SRC_URI+=" ${BACKPORTS:+
- https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
- https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
- KEYWORDS="~amd64 ~x86"
- SLOT="0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-# TODO: Reenable IUSE wireshark-plugins
-IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
- lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
- selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \
- elibc_glibc systemd"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
- lxc? ( caps libvirtd )
- openvz? ( libvirtd )
- qemu? ( libvirtd )
- uml? ( libvirtd )
- vepa? ( macvtap )
- virtualbox? ( libvirtd )
- xen? ( libvirtd )
- virt-network? ( libvirtd )
- firewalld? ( virt-network )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="sys-libs/readline:=
- sys-libs/ncurses:0=
- >=net-misc/curl-7.18.0
- net-firewall/ebtables
- >=net-firewall/iptables-1.4.10[ipv6]
- dev-libs/libgcrypt:0
- >=dev-libs/libxml2-2.7.6
- dev-libs/libnl:3
- >=net-libs/gnutls-1.0.25
- net-libs/libssh2
- sys-apps/dmidecode
- >=sys-apps/util-linux-2.17
- sys-devel/gettext
- >=net-analyzer/netcat6-1.0-r2
- app-misc/scrub
- apparmor? ( sys-libs/libapparmor )
- audit? ( sys-process/audit )
- avahi? ( >=net-dns/avahi-0.6[dbus] )
- caps? ( sys-libs/libcap-ng )
- fuse? ( >=sys-fs/fuse-2.8.6 )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
- iscsi? ( sys-block/open-iscsi )
- lxc? ( !systemd? ( sys-power/pm-utils ) )
- lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
- nfs? ( net-fs/nfs-utils )
- numa? (
- >sys-process/numactl-2.0.2
- sys-process/numad
- )
- openvz? ( sys-kernel/openvz-sources:* )
- parted? (
- >=sys-block/parted-1.8[device-mapper]
- sys-fs/lvm2
- )
- pcap? ( >=net-libs/libpcap-1.0.0 )
- policykit? ( >=sys-auth/polkit-0.9 )
- qemu? (
- >=app-emulation/qemu-0.13.0
- dev-libs/yajl
- !systemd? ( sys-power/pm-utils )
- )
- rbd? ( sys-cluster/ceph )
- sasl? ( dev-libs/cyrus-sasl )
- selinux? ( >=sys-libs/libselinux-2.0.85 )
- systemd? ( sys-apps/systemd )
- virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
- wireshark-plugins? ( net-analyzer/wireshark:= )
- xen? ( app-emulation/xen-tools app-emulation/xen )
- udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
- virt-network? ( net-dns/dnsmasq[script]
- net-misc/radvd
- sys-apps/iproute2[-minimal]
- firewalld? ( net-firewall/firewalld )
- )
- elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- app-text/xhtml1
- dev-lang/perl
- dev-perl/XML-XPath
- dev-libs/libxslt"
-
-# gentoo.readme stuff:
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="For the basic networking support (bridged and routed networks) you don't
-need any extra software. For more complex network modes including but not
-limited to NATed network, you can enable the 'virt-network' USE flag.
-
-If you are using dnsmasq on your system, you will have to configure
-/etc/dnsmasq.conf to enable the following settings:
- bind-interfaces
- interface or except-interface
-Otherwise you might have issues with your existing DNS server.
-
-For openrc users:
-
- Please use /etc/conf.d/libvirtd to control the '--listen' parameter for
- libvirtd.
-
- The default configuration will suspend and resume running kvm guests
- with 'managedsave'. This behavior can be changed under
- /etc/conf.d/libvirtd
-
-For systemd users:
-
- Please use /etc/systemd/system/libvirtd.service.d/00gentoo.conf
- to control the '--listen' parameter for libvirtd.
-
- The configuration for the 'libvirt-guests.service' is found under
- /etc/libvirt/libvirt-guests.conf"
-
-! use policykit && DOC_CONTENTS+="
-
-To allow normal users to connect to libvirtd you must change the unix sock
-group and/or perms in /etc/libvirt/libvirtd.conf"
-
-use caps && use qemu && DOC_CONTENTS+="
-
-libvirt will now start qemu/kvm VMs with non-root privileges. Ensure any
-resources your VMs use are accessible by qemu:qemu"
-
-LXC_CONFIG_CHECK="
- ~CGROUPS
- ~CGROUP_FREEZER
- ~CGROUP_DEVICE
- ~CGROUP_CPUACCT
- ~CGROUP_SCHED
- ~CGROUP_PERF
- ~BLK_CGROUP
- ~NET_CLS_CGROUP
- ~CGROUP_NET_PRIO
- ~CPUSETS
- ~NAMESPACES
- ~UTS_NS
- ~IPC_NS
- ~PID_NS
- ~NET_NS
- ~USER_NS
- ~DEVPTS_MULTIPLE_INSTANCES
- ~VETH
- ~MACVLAN
- ~POSIX_MQUEUE
- ~SECURITYFS
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
- ~BRIDGE_NF_EBTABLES
- ~BRIDGE_EBT_MARK_T
- ~NETFILTER_ADVANCED
- ~NETFILTER_XT_TARGET_CHECKSUM
- ~NETFILTER_XT_CONNMARK
- ~NETFILTER_XT_MARK
-"
-
-BWLMT_CONFIG_CHECK="
- ~BRIDGE_EBT_T_NAT
- ~NET_SCH_HTB
- ~NET_SCH_SFQ
- ~NET_SCH_INGRESS
- ~NET_CLS_FW
- ~NET_CLS_U32
- ~NET_ACT_POLICE
-"
-
-MACVTAP_CONFIG_CHECK=" ~MACVTAP"
-
-LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
-
-ERROR_USER_NS="Optional depending on LXC configuration."
-
-pkg_setup() {
- enewgroup qemu 77
- enewuser qemu 77 -1 -1 qemu kvm
-
- # Some people used the masked ebuild which was not adding the qemu
- # user to the kvm group originally. This results in VMs failing to
- # start for some users. bug #430808
- egetent group kvm | grep -q qemu
- if [[ $? -ne 0 ]]; then
- gpasswd -a qemu kvm
- fi
-
- # Handle specific kernel versions for different features
- kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- kernel_is ge 3 6 && LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
- CONFIG_CHECK=""
- use fuse && CONFIG_CHECK+=" ~FUSE_FS"
- use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
- use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
- use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
- use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
- # Bandwidth Limiting Support
- use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
- if [[ -n ${CONFIG_CHECK} ]]; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- touch "${S}/.mailmap"
-
- if [[ ${PV} = *9999* ]]; then
- # git checkouts require bootstrapping to create the configure script.
- # Additionally the submodules must be cloned to the right locations
- # bug #377279
- ./bootstrap || die "bootstrap failed"
- (
- git submodule status | sed 's/^[ +-]//;s/ .*//'
- git hash-object bootstrap.conf
- ) >.git-module-status
- fi
-
- epatch \
- "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
- "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
- "${FILESDIR}"/${P}-fix_paths_for_apparmor.patch
-
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
- EPATCH_SOURCE="${WORKDIR}/patches" epatch
-
- epatch_user
-
- [[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-
- # Tweak the init script
- local avahi_init=
- local iscsi_init=
- local rbd_init=
- local firewalld_init=
- cp "${FILESDIR}/libvirtd.init-r14" "${S}/libvirtd.init"
- use avahi && avahi_init='avahi-daemon'
- use iscsi && iscsi_init='iscsid'
- use rbd && rbd_init='ceph'
- use firewalld && firewalld_init='need firewalld'
-
- sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
-}
-
-src_configure() {
- local myconf=""
-
- ## enable/disable daemon, otherwise client only utils
- myconf+=" $(use_with libvirtd)"
-
- ## enable/disable the daemon using avahi to find VMs
- myconf+=" $(use_with avahi)"
-
- ## hypervisors on the local host
- myconf+=" $(use_with xen) $(use_with xen xen-inotify)"
- myconf+=" --without-xenapi"
- if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
- myconf+=" --with-libxl"
- else
- myconf+=" --without-libxl"
- fi
- myconf+=" $(use_with openvz)"
- myconf+=" $(use_with lxc)"
- if use virtualbox && has_version app-emulation/virtualbox-ose; then
- myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
- else
- myconf+=" $(use_with virtualbox vbox)"
- fi
- myconf+=" $(use_with uml)"
- myconf+=" $(use_with qemu)"
- myconf+=" $(use_with qemu yajl)" # Use QMP over HMP
- myconf+=" $(use_with phyp)"
- myconf+=" --with-esx"
- myconf+=" --with-vmware"
-
- ## additional host drivers
- myconf+=" $(use_with apparmor)"
- myconf+=" $(use_with apparmor apparmor-profiles)"
- myconf+=" $(use_with virt-network network)"
- myconf+=" --with-storage-fs"
- myconf+=" $(use_with lvm storage-lvm)"
- myconf+=" $(use_with iscsi storage-iscsi)"
- myconf+=" $(use_with parted storage-disk)"
- mycond+=" $(use_with glusterfs)"
- mycond+=" $(use_with glusterfs storage-gluster)"
- myconf+=" $(use_with lvm storage-mpath)"
- myconf+=" $(use_with rbd storage-rbd)"
- myconf+=" $(use_with numa numactl)"
- myconf+=" $(use_with numa numad)"
- myconf+=" $(use_with selinux)"
- myconf+=" $(use_with fuse)"
-
- # udev for device support details
- myconf+=" $(use_with udev)"
- myconf+=" --without-hal"
-
- # linux capability support so we don't need privileged accounts
- myconf+=" $(use_with caps capng)"
-
- ## auth stuff
- myconf+=" $(use_with policykit polkit)"
- myconf+=" $(use_with sasl)"
-
- # network bits
- myconf+=" $(use_with macvtap)"
- myconf+=" $(use_with pcap libpcap)"
- myconf+=" $(use_with vepa virtualport)"
- myconf+=" $(use_with firewalld)"
-
- ## other
- myconf+=" $(use_enable nls)"
-
- # user privilege bits fir qemu/kvm
- if use caps; then
- myconf+=" --with-qemu-user=qemu"
- myconf+=" --with-qemu-group=qemu"
- else
- myconf+=" --with-qemu-user=root"
- myconf+=" --with-qemu-group=root"
- fi
-
- # audit support
- myconf+=" $(use_with audit)"
-
- # wireshark dissector
- myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
-
- ## stuff we don't yet support
- myconf+=" --without-netcf"
-
- # locking support
- myconf+=" --without-sanlock"
-
- # systemd unit files
- myconf+=" $(use_with systemd systemd-daemon)"
- use systemd && myconf+=" --with-init-script=systemd"
-
- # this is a nasty trick to work around the problem in bug
- # #275073. The reason why we don't solve this properly is that
- # it'll require us to rebuild autotools (and we don't really want
- # to do that right now). The proper solution has been sent
- # upstream and should hopefully land in 0.7.7, in the mean time,
- # mime the same functionality with this.
- case ${CHOST} in
- *cygwin* | *mingw* )
- ;;
- *)
- ac_cv_prog_WINDRES=no
- ;;
- esac
-
- econf \
- ${myconf} \
- --disable-static \
- --disable-werror \
- --with-remote \
- --docdir=/usr/share/doc/${PF} \
- --localstatedir=/var
-
- if [[ ${PV} = *9999* ]]; then
- # Restore gnulib's config.sub and config.guess
- # bug #377279
- (cd .gnulib && git reset --hard > /dev/null)
- fi
-}
-
-src_test() {
- # Explicitly allow parallel build of tests
- export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
- emake install \
- DESTDIR="${D}" \
- HTML_DIR=/usr/share/doc/${PF}/html \
- DOCS_DIR=/usr/share/doc/${PF} \
- EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
- SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
- || die "emake install failed"
-
- find "${D}" -name '*.la' -delete || die
-
- # Remove bogus, empty directories. They are either not used, or
- # libvirtd is able to create them on demand
- rm -rf "${D}"/etc/sysconfig
- rm -rf "${D}"/var/cache
- rm -rf "${D}"/var/run
- rm -rf "${D}"/var/log
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- use systemd && systemd_install_serviced \
- "${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
- systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
- newinitd "${S}/libvirtd.init" libvirtd || die
- newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # we only ever want to generate this once
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
- fi
-
- # We really don't want to use or support old PolicyKit cause it
- # screws with the new polkit integration
- if has_version sys-auth/policykit; then
- rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
- fi
-
- # Only sysctl files ending in .conf work
- dodir /etc/sysctl.d
- mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
- fi
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.17-r2 ${REPLACING_VERSIONS} ]]; then
- FORCE_PRINT_ELOG=true
- fi
-
- readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild
index 565007a..9ffa581 100644
--- a/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild
@@ -325,8 +325,8 @@
myconf+=" $(use_with lvm storage-lvm)"
myconf+=" $(use_with iscsi storage-iscsi)"
myconf+=" $(use_with parted storage-disk)"
- mycond+=" $(use_with glusterfs)"
- mycond+=" $(use_with glusterfs storage-gluster)"
+ myconf+=" $(use_with glusterfs)"
+ myconf+=" $(use_with glusterfs storage-gluster)"
myconf+=" $(use_with lvm storage-mpath)"
myconf+=" $(use_with rbd storage-rbd)"
myconf+=" $(use_with numa numactl)"
diff --git a/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild
new file mode 100644
index 0000000..cb757f0
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild
@@ -0,0 +1,381 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user autotools-utils linux-info systemd readme.gentoo
+
+BACKPORTS=""
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+ SRC_URI=""
+ KEYWORDS=""
+ SLOT="0"
+else
+ # Versions with 4 numbers are stable updates:
+ if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+ SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
+ else
+ SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
+ fi
+ SRC_URI+=" ${BACKPORTS:+
+ https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
+ https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
+ KEYWORDS="~amd64 ~x86"
+ SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
+ lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
+ selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
+ xen elibc_glibc"
+
+REQUIRED_USE="
+ firewalld? ( virt-network )
+ libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+ lxc? ( caps libvirtd )
+ openvz? ( libvirtd )
+ qemu? ( libvirtd )
+ uml? ( libvirtd )
+ vepa? ( macvtap )
+ virt-network? ( libvirtd )
+ virtualbox? ( libvirtd )
+ xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+ app-misc/scrub
+ dev-libs/libgcrypt:0
+ dev-libs/libnl:3
+ >=dev-libs/libxml2-2.7.6
+ >=net-analyzer/netcat6-1.0-r2
+ >=net-libs/gnutls-1.0.25
+ net-libs/libssh2
+ >=net-misc/curl-7.18.0
+ sys-apps/dmidecode
+ >=sys-apps/util-linux-2.17
+ sys-devel/gettext
+ sys-libs/ncurses:0=
+ sys-libs/readline:=
+ apparmor? ( sys-libs/libapparmor )
+ audit? ( sys-process/audit )
+ avahi? ( >=net-dns/avahi-0.6[dbus] )
+ caps? ( sys-libs/libcap-ng )
+ firewalld? ( net-firewall/firewalld )
+ fuse? ( >=sys-fs/fuse-2.8.6 )
+ glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+ iscsi? ( sys-block/open-iscsi )
+ lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+ lxc? ( !systemd? ( sys-power/pm-utils ) )
+ nfs? ( net-fs/nfs-utils )
+ numa? (
+ >sys-process/numactl-2.0.2
+ sys-process/numad
+ )
+ openvz? ( sys-kernel/openvz-sources:* )
+ parted? (
+ >=sys-block/parted-1.8[device-mapper]
+ sys-fs/lvm2
+ )
+ pcap? ( >=net-libs/libpcap-1.0.0 )
+ policykit? ( >=sys-auth/polkit-0.9 )
+ qemu? (
+ >=app-emulation/qemu-0.13.0
+ dev-libs/yajl
+ !systemd? ( sys-power/pm-utils )
+ )
+ rbd? ( sys-cluster/ceph )
+ sasl? ( dev-libs/cyrus-sasl )
+ selinux? ( >=sys-libs/libselinux-2.0.85 )
+ systemd? ( sys-apps/systemd )
+ virt-network? (
+ net-dns/dnsmasq[script]
+ net-firewall/ebtables
+ >=net-firewall/iptables-1.4.10[ipv6]
+ net-misc/radvd
+ sys-apps/iproute2[-minimal]
+ )
+ virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+ wireshark-plugins? ( net-analyzer/wireshark:= )
+ xen? (
+ app-emulation/xen
+ app-emulation/xen-tools
+ )
+ udev? (
+ virtual/udev
+ >=x11-libs/libpciaccess-0.10.9
+ )
+ elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
+
+DEPEND="${RDEPEND}
+ app-text/xhtml1
+ dev-lang/perl
+ dev-libs/libxslt
+ dev-perl/XML-XPath
+ virtual/pkgconfig"
+
+pkg_setup() {
+ enewgroup qemu 77
+ enewuser qemu 77 -1 -1 qemu kvm
+
+ # Some people used the masked ebuild which was not adding the qemu
+ # user to the kvm group originally. This results in VMs failing to
+ # start for some users. bug #430808
+ egetent group kvm | grep -q qemu
+ if [[ $? -ne 0 ]]; then
+ gpasswd -a qemu kvm
+ fi
+
+ # Check kernel configuration:
+ CONFIG_CHECK=""
+ use fuse && CONFIG_CHECK+="
+ ~FUSE_FS"
+
+ use lvm && CONFIG_CHECK+="
+ ~BLK_DEV_DM
+ ~DM_MULTIPATH
+ ~DM_SNAPSHOT"
+
+ use lxc && CONFIG_CHECK+="
+ ~BLK_CGROUP
+ ~CGROUP_CPUACCT
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~CGROUP_NET_PRIO
+ ~CGROUP_PERF
+ ~CGROUPS
+ ~CGROUP_SCHED
+ ~CPUSETS
+ ~DEVPTS_MULTIPLE_INSTANCES
+ ~IPC_NS
+ ~MACVLAN
+ ~NAMESPACES
+ ~NET_CLS_CGROUP
+ ~NET_NS
+ ~PID_NS
+ ~POSIX_MQUEUE
+ ~SECURITYFS
+ ~USER_NS
+ ~UTS_NS
+ ~VETH
+ ~!GRKERNSEC_CHROOT_MOUNT
+ ~!GRKERNSEC_CHROOT_DOUBLE
+ ~!GRKERNSEC_CHROOT_PIVOT
+ ~!GRKERNSEC_CHROOT_CHMOD
+ ~!GRKERNSEC_CHROOT_CAPS"
+ # Handle specific kernel versions for different features
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+ kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+ use macvtap && CONFIG_CHECK+="
+ ~MACVTAP"
+
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_MARK_T
+ ~BRIDGE_NF_EBTABLES
+ ~NETFILTER_ADVANCED
+ ~NETFILTER_XT_CONNMARK
+ ~NETFILTER_XT_MARK
+ ~NETFILTER_XT_TARGET_CHECKSUM"
+ # Bandwidth Limiting Support
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_T_NAT
+ ~NET_ACT_POLICE
+ ~NET_CLS_FW
+ ~NET_CLS_U32
+ ~NET_SCH_HTB
+ ~NET_SCH_INGRESS
+ ~NET_SCH_SFQ"
+
+ ERROR_USER_NS="Optional depending on LXC configuration."
+
+ if [[ -n ${CONFIG_CHECK} ]]; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ touch "${S}/.mailmap"
+
+ if [[ ${PV} = *9999* ]]; then
+ # git checkouts require bootstrapping to create the configure script.
+ # Additionally the submodules must be cloned to the right locations
+ # bug #377279
+ ./bootstrap || die "bootstrap failed"
+ (
+ git submodule status | sed 's/^[ +-]//;s/ .*//'
+ git hash-object bootstrap.conf
+ ) >.git-module-status
+ fi
+
+ epatch \
+ "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
+ "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
+ "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
+
+ [[ -n ${BACKPORTS} ]] &&
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
+ EPATCH_SOURCE="${WORKDIR}/patches" epatch
+
+ epatch_user
+
+ # Tweak the init script:
+ cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die
+ sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+ -e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \
+ -e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \
+ -e "s/USE_FLAG_RBD/$(usex rbd ceph '')/" \
+ -i "${S}/libvirtd.init" || die "sed failed"
+
+ AUTOTOOLS_AUTORECONF=true
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with apparmor)
+ $(use_with apparmor apparmor-profiles)
+ $(use_with audit)
+ $(use_with avahi)
+ $(use_with caps capng)
+ $(use_with firewalld)
+ $(use_with fuse)
+ $(use_with glusterfs)
+ $(use_with glusterfs storage-gluster)
+ $(use_with iscsi storage-iscsi)
+ $(use_with libvirtd)
+ $(use_with lvm storage-lvm)
+ $(use_with lvm storage-mpath)
+ $(use_with lxc)
+ $(use_with macvtap)
+ $(use_enable nls)
+ $(use_with numa numactl)
+ $(use_with numa numad)
+ $(use_with openvz)
+ $(use_with parted storage-disk)
+ $(use_with pcap libpcap)
+ $(use_with phyp)
+ $(use_with policykit polkit)
+ $(use_with qemu)
+ $(use_with qemu yajl)
+ $(use_with rbd storage-rbd)
+ $(use_with sasl)
+ $(use_with selinux)
+ $(use_with systemd systemd-daemon)
+ $(usex systemd --with-init-script=systemd '')
+ $(use_with udev)
+ $(use_with uml)
+ $(use_with vepa virtualport)
+ $(use_with virt-network network)
+ $(use_with wireshark-plugins wireshark-dissector)
+ $(use_with xen)
+ $(use_with xen xen-inotify)
+ $(usex xen --with-libxl '')
+
+ --without-hal
+ --without-netcf
+ --without-sanlock
+ --without-xenapi
+ --with-esx
+ --with-qemu-group=$(usex caps qemu root)
+ --with-qemu-user=$(usex caps qemu root)
+ --with-remote
+ --with-storage-fs
+ --with-vmware
+
+ --disable-static
+ --disable-werror
+
+ --docdir=/usr/share/doc/${PF}
+ --htmldir=/usr/share/doc/${PF}/html
+ --localstatedir=/var
+ )
+
+ if use virtualbox && has_version app-emulation/virtualbox-ose; then
+ myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+ else
+ myeconfargs+=( $(use_with virtualbox vbox) )
+ fi
+
+ autotools-utils_src_configure
+
+ if [[ ${PV} = *9999* ]]; then
+ # Restore gnulib's config.sub and config.guess
+ # bug #377279
+ (cd .gnulib && git reset --hard > /dev/null)
+ fi
+}
+
+src_test() {
+ # Explicitly allow parallel build of tests
+ export VIR_TEST_DEBUG=1
+ HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+ autotools-utils_src_compile install \
+ DESTDIR="${D}" \
+ SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
+
+ find "${D}" -name '*.la' -delete || die
+
+ # Remove bogus, empty directories. They are either not used, or
+ # libvirtd is able to create them on demand
+ rm -rf "${D}"/etc/sysconfig
+ rm -rf "${D}"/var/cache
+ rm -rf "${D}"/var/run
+ rm -rf "${D}"/var/log
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ use systemd && systemd_install_serviced \
+ "${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+ newinitd "${S}/libvirtd.init" libvirtd || die
+ newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ # we only ever want to generate this once
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+ fi
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+ fi
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then
+ FORCE_PRINT_ELOG=true
+ fi
+
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-1.2.19.ebuild b/app-emulation/libvirt/libvirt-1.2.19.ebuild
deleted file mode 100644
index 55fb80d..0000000
--- a/app-emulation/libvirt/libvirt-1.2.19.ebuild
+++ /dev/null
@@ -1,492 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-inherit eutils user autotools linux-info systemd readme.gentoo
-
-BACKPORTS=""
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://libvirt.org/libvirt.git"
- SRC_URI=""
- KEYWORDS=""
- SLOT="0"
-else
- # Versions with 4 numbers are stable updates:
- if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
- SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz"
- else
- SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
- fi
- SRC_URI+=" ${BACKPORTS:+
- https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
- https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
- KEYWORDS="~amd64 ~x86"
- SLOT="0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-# TODO: Reenable IUSE wireshark-plugins
-IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
- lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
- selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \
- elibc_glibc systemd"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
- lxc? ( caps libvirtd )
- openvz? ( libvirtd )
- qemu? ( libvirtd )
- uml? ( libvirtd )
- vepa? ( macvtap )
- virtualbox? ( libvirtd )
- xen? ( libvirtd )
- virt-network? ( libvirtd )
- firewalld? ( virt-network )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="sys-libs/readline:=
- sys-libs/ncurses:0=
- >=net-misc/curl-7.18.0
- net-firewall/ebtables
- >=net-firewall/iptables-1.4.10[ipv6]
- dev-libs/libgcrypt:0
- >=dev-libs/libxml2-2.7.6
- dev-libs/libnl:3
- >=net-libs/gnutls-1.0.25
- net-libs/libssh2
- sys-apps/dmidecode
- >=sys-apps/util-linux-2.17
- sys-devel/gettext
- >=net-analyzer/netcat6-1.0-r2
- app-misc/scrub
- apparmor? ( sys-libs/libapparmor )
- audit? ( sys-process/audit )
- avahi? ( >=net-dns/avahi-0.6[dbus] )
- caps? ( sys-libs/libcap-ng )
- fuse? ( >=sys-fs/fuse-2.8.6 )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
- iscsi? ( sys-block/open-iscsi )
- lxc? ( !systemd? ( sys-power/pm-utils ) )
- lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
- nfs? ( net-fs/nfs-utils )
- numa? (
- >sys-process/numactl-2.0.2
- sys-process/numad
- )
- openvz? ( sys-kernel/openvz-sources:* )
- parted? (
- >=sys-block/parted-1.8[device-mapper]
- sys-fs/lvm2
- )
- pcap? ( >=net-libs/libpcap-1.0.0 )
- policykit? ( >=sys-auth/polkit-0.9 )
- qemu? (
- >=app-emulation/qemu-0.13.0
- dev-libs/yajl
- !systemd? ( sys-power/pm-utils )
- )
- rbd? ( sys-cluster/ceph )
- sasl? ( dev-libs/cyrus-sasl )
- selinux? ( >=sys-libs/libselinux-2.0.85 )
- systemd? ( sys-apps/systemd )
- virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
- wireshark-plugins? ( net-analyzer/wireshark:= )
- xen? ( app-emulation/xen-tools app-emulation/xen )
- udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
- virt-network? ( net-dns/dnsmasq[script]
- net-misc/radvd
- sys-apps/iproute2[-minimal]
- firewalld? ( net-firewall/firewalld )
- )
- elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- app-text/xhtml1
- dev-lang/perl
- dev-perl/XML-XPath
- dev-libs/libxslt"
-
-# gentoo.readme stuff:
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="Important: The openrc libvirtd init script is now broken up into two
-separate services: libvirtd, that solely handles the daemon, and
-libvirt-guests, that takes care of clients during shutdown/restart of the
-host. In order to reenable client handling, edit /etc/conf.d/libvirt-guests
-and enable the service and start it:
- $ rc-update add libvirt-guests
- $ service libvirt-guests start
-
-For the basic networking support (bridged and routed networks) you don't
-need any extra software. For more complex network modes including but not
-limited to NATed network, you can enable the 'virt-network' USE flag.
-
-If you are using dnsmasq on your system, you will have to configure
-/etc/dnsmasq.conf to enable the following settings:
- bind-interfaces
- interface or except-interface
-Otherwise you might have issues with your existing DNS server.
-
-For openrc users:
-
- Please use /etc/conf.d/libvirtd to control the '--listen' parameter for
- libvirtd.
-
- Use /etc/init.d/libvirt-guests to manage clients on restart/shutdown of
- the host. The default configuration will suspend and resume running kvm
- guests with 'managedsave'. This behavior can be changed under
- /etc/conf.d/libvirt-guests
-
-For systemd users:
-
- Please use /etc/systemd/system/libvirtd.service.d/00gentoo.conf
- to control the '--listen' parameter for libvirtd.
-
- The configuration for the 'libvirt-guests.service' is found under
- /etc/libvirt/libvirt-guests.conf"
-
-! use policykit && DOC_CONTENTS+="
-
-To allow normal users to connect to libvirtd you must change the unix sock
-group and/or perms in /etc/libvirt/libvirtd.conf"
-
-use caps && use qemu && DOC_CONTENTS+="
-
-libvirt will now start qemu/kvm VMs with non-root privileges. Ensure any
-resources your VMs use are accessible by qemu:qemu"
-
-LXC_CONFIG_CHECK="
- ~CGROUPS
- ~CGROUP_FREEZER
- ~CGROUP_DEVICE
- ~CGROUP_CPUACCT
- ~CGROUP_SCHED
- ~CGROUP_PERF
- ~BLK_CGROUP
- ~NET_CLS_CGROUP
- ~CGROUP_NET_PRIO
- ~CPUSETS
- ~NAMESPACES
- ~UTS_NS
- ~IPC_NS
- ~PID_NS
- ~NET_NS
- ~USER_NS
- ~DEVPTS_MULTIPLE_INSTANCES
- ~VETH
- ~MACVLAN
- ~POSIX_MQUEUE
- ~SECURITYFS
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
- ~BRIDGE_NF_EBTABLES
- ~BRIDGE_EBT_MARK_T
- ~NETFILTER_ADVANCED
- ~NETFILTER_XT_TARGET_CHECKSUM
- ~NETFILTER_XT_CONNMARK
- ~NETFILTER_XT_MARK
-"
-
-BWLMT_CONFIG_CHECK="
- ~BRIDGE_EBT_T_NAT
- ~NET_SCH_HTB
- ~NET_SCH_SFQ
- ~NET_SCH_INGRESS
- ~NET_CLS_FW
- ~NET_CLS_U32
- ~NET_ACT_POLICE
-"
-
-MACVTAP_CONFIG_CHECK=" ~MACVTAP"
-
-LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
-
-ERROR_USER_NS="Optional depending on LXC configuration."
-
-pkg_setup() {
- enewgroup qemu 77
- enewuser qemu 77 -1 -1 qemu kvm
-
- # Some people used the masked ebuild which was not adding the qemu
- # user to the kvm group originally. This results in VMs failing to
- # start for some users. bug #430808
- egetent group kvm | grep -q qemu
- if [[ $? -ne 0 ]]; then
- gpasswd -a qemu kvm
- fi
-
- # Handle specific kernel versions for different features
- kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- kernel_is ge 3 6 && LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
- CONFIG_CHECK=""
- use fuse && CONFIG_CHECK+=" ~FUSE_FS"
- use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
- use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
- use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
- use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
- # Bandwidth Limiting Support
- use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
- if [[ -n ${CONFIG_CHECK} ]]; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- touch "${S}/.mailmap"
-
- if [[ ${PV} = *9999* ]]; then
- # git checkouts require bootstrapping to create the configure script.
- # Additionally the submodules must be cloned to the right locations
- # bug #377279
- ./bootstrap || die "bootstrap failed"
- (
- git submodule status | sed 's/^[ +-]//;s/ .*//'
- git hash-object bootstrap.conf
- ) >.git-module-status
- fi
-
- epatch \
- "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
- "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
- "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
-
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
- EPATCH_SOURCE="${WORKDIR}/patches" epatch
-
- epatch_user
-
- [[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-
- # Tweak the init script
- local avahi_init=
- local iscsi_init=
- local rbd_init=
- local firewalld_init=
- cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init"
- use avahi && avahi_init='avahi-daemon'
- use iscsi && iscsi_init='iscsid'
- use rbd && rbd_init='ceph'
- use firewalld && firewalld_init='need firewalld'
-
- sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
-}
-
-src_configure() {
- local myconf=""
-
- ## enable/disable daemon, otherwise client only utils
- myconf+=" $(use_with libvirtd)"
-
- ## enable/disable the daemon using avahi to find VMs
- myconf+=" $(use_with avahi)"
-
- ## hypervisors on the local host
- myconf+=" $(use_with xen) $(use_with xen xen-inotify)"
- myconf+=" --without-xenapi"
- if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
- myconf+=" --with-libxl"
- else
- myconf+=" --without-libxl"
- fi
- myconf+=" $(use_with openvz)"
- myconf+=" $(use_with lxc)"
- if use virtualbox && has_version app-emulation/virtualbox-ose; then
- myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
- else
- myconf+=" $(use_with virtualbox vbox)"
- fi
- myconf+=" $(use_with uml)"
- myconf+=" $(use_with qemu)"
- myconf+=" $(use_with qemu yajl)" # Use QMP over HMP
- myconf+=" $(use_with phyp)"
- myconf+=" --with-esx"
- myconf+=" --with-vmware"
-
- ## additional host drivers
- myconf+=" $(use_with apparmor)"
- myconf+=" $(use_with apparmor apparmor-profiles)"
- myconf+=" $(use_with virt-network network)"
- myconf+=" --with-storage-fs"
- myconf+=" $(use_with lvm storage-lvm)"
- myconf+=" $(use_with iscsi storage-iscsi)"
- myconf+=" $(use_with parted storage-disk)"
- mycond+=" $(use_with glusterfs)"
- mycond+=" $(use_with glusterfs storage-gluster)"
- myconf+=" $(use_with lvm storage-mpath)"
- myconf+=" $(use_with rbd storage-rbd)"
- myconf+=" $(use_with numa numactl)"
- myconf+=" $(use_with numa numad)"
- myconf+=" $(use_with selinux)"
- myconf+=" $(use_with fuse)"
-
- # udev for device support details
- myconf+=" $(use_with udev)"
- myconf+=" --without-hal"
-
- # linux capability support so we don't need privileged accounts
- myconf+=" $(use_with caps capng)"
-
- ## auth stuff
- myconf+=" $(use_with policykit polkit)"
- myconf+=" $(use_with sasl)"
-
- # network bits
- myconf+=" $(use_with macvtap)"
- myconf+=" $(use_with pcap libpcap)"
- myconf+=" $(use_with vepa virtualport)"
- myconf+=" $(use_with firewalld)"
-
- ## other
- myconf+=" $(use_enable nls)"
-
- # user privilege bits fir qemu/kvm
- if use caps; then
- myconf+=" --with-qemu-user=qemu"
- myconf+=" --with-qemu-group=qemu"
- else
- myconf+=" --with-qemu-user=root"
- myconf+=" --with-qemu-group=root"
- fi
-
- # audit support
- myconf+=" $(use_with audit)"
-
- # wireshark dissector
- myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
-
- ## stuff we don't yet support
- myconf+=" --without-netcf"
-
- # locking support
- myconf+=" --without-sanlock"
-
- # systemd unit files
- myconf+=" $(use_with systemd systemd-daemon)"
- use systemd && myconf+=" --with-init-script=systemd"
-
- # this is a nasty trick to work around the problem in bug
- # #275073. The reason why we don't solve this properly is that
- # it'll require us to rebuild autotools (and we don't really want
- # to do that right now). The proper solution has been sent
- # upstream and should hopefully land in 0.7.7, in the mean time,
- # mime the same functionality with this.
- case ${CHOST} in
- *cygwin* | *mingw* )
- ;;
- *)
- ac_cv_prog_WINDRES=no
- ;;
- esac
-
- econf \
- ${myconf} \
- --disable-static \
- --disable-werror \
- --with-remote \
- --docdir=/usr/share/doc/${PF} \
- --localstatedir=/var
-
- if [[ ${PV} = *9999* ]]; then
- # Restore gnulib's config.sub and config.guess
- # bug #377279
- (cd .gnulib && git reset --hard > /dev/null)
- fi
-}
-
-src_test() {
- # Explicitly allow parallel build of tests
- export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
- emake install \
- DESTDIR="${D}" \
- HTML_DIR=/usr/share/doc/${PF}/html \
- DOCS_DIR=/usr/share/doc/${PF} \
- EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
- SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
- || die "emake install failed"
-
- find "${D}" -name '*.la' -delete || die
-
- # Remove bogus, empty directories. They are either not used, or
- # libvirtd is able to create them on demand
- rm -rf "${D}"/etc/sysconfig
- rm -rf "${D}"/var/cache
- rm -rf "${D}"/var/run
- rm -rf "${D}"/var/log
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- use systemd && systemd_install_serviced \
- "${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
- systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # we only ever want to generate this once
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
- fi
-
- # We really don't want to use or support old PolicyKit cause it
- # screws with the new polkit integration
- if has_version sys-auth/policykit; then
- rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
- fi
-
- # Only sysctl files ending in .conf work
- dodir /etc/sysctl.d
- mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
- fi
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then
- FORCE_PRINT_ELOG=true
- fi
-
- readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-1.2.20.ebuild b/app-emulation/libvirt/libvirt-1.2.20.ebuild
new file mode 100644
index 0000000..cb757f0
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.2.20.ebuild
@@ -0,0 +1,381 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user autotools-utils linux-info systemd readme.gentoo
+
+BACKPORTS=""
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+ SRC_URI=""
+ KEYWORDS=""
+ SLOT="0"
+else
+ # Versions with 4 numbers are stable updates:
+ if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+ SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
+ else
+ SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
+ fi
+ SRC_URI+=" ${BACKPORTS:+
+ https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
+ https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
+ KEYWORDS="~amd64 ~x86"
+ SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
+ lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
+ selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
+ xen elibc_glibc"
+
+REQUIRED_USE="
+ firewalld? ( virt-network )
+ libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+ lxc? ( caps libvirtd )
+ openvz? ( libvirtd )
+ qemu? ( libvirtd )
+ uml? ( libvirtd )
+ vepa? ( macvtap )
+ virt-network? ( libvirtd )
+ virtualbox? ( libvirtd )
+ xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+ app-misc/scrub
+ dev-libs/libgcrypt:0
+ dev-libs/libnl:3
+ >=dev-libs/libxml2-2.7.6
+ >=net-analyzer/netcat6-1.0-r2
+ >=net-libs/gnutls-1.0.25
+ net-libs/libssh2
+ >=net-misc/curl-7.18.0
+ sys-apps/dmidecode
+ >=sys-apps/util-linux-2.17
+ sys-devel/gettext
+ sys-libs/ncurses:0=
+ sys-libs/readline:=
+ apparmor? ( sys-libs/libapparmor )
+ audit? ( sys-process/audit )
+ avahi? ( >=net-dns/avahi-0.6[dbus] )
+ caps? ( sys-libs/libcap-ng )
+ firewalld? ( net-firewall/firewalld )
+ fuse? ( >=sys-fs/fuse-2.8.6 )
+ glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+ iscsi? ( sys-block/open-iscsi )
+ lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+ lxc? ( !systemd? ( sys-power/pm-utils ) )
+ nfs? ( net-fs/nfs-utils )
+ numa? (
+ >sys-process/numactl-2.0.2
+ sys-process/numad
+ )
+ openvz? ( sys-kernel/openvz-sources:* )
+ parted? (
+ >=sys-block/parted-1.8[device-mapper]
+ sys-fs/lvm2
+ )
+ pcap? ( >=net-libs/libpcap-1.0.0 )
+ policykit? ( >=sys-auth/polkit-0.9 )
+ qemu? (
+ >=app-emulation/qemu-0.13.0
+ dev-libs/yajl
+ !systemd? ( sys-power/pm-utils )
+ )
+ rbd? ( sys-cluster/ceph )
+ sasl? ( dev-libs/cyrus-sasl )
+ selinux? ( >=sys-libs/libselinux-2.0.85 )
+ systemd? ( sys-apps/systemd )
+ virt-network? (
+ net-dns/dnsmasq[script]
+ net-firewall/ebtables
+ >=net-firewall/iptables-1.4.10[ipv6]
+ net-misc/radvd
+ sys-apps/iproute2[-minimal]
+ )
+ virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+ wireshark-plugins? ( net-analyzer/wireshark:= )
+ xen? (
+ app-emulation/xen
+ app-emulation/xen-tools
+ )
+ udev? (
+ virtual/udev
+ >=x11-libs/libpciaccess-0.10.9
+ )
+ elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
+
+DEPEND="${RDEPEND}
+ app-text/xhtml1
+ dev-lang/perl
+ dev-libs/libxslt
+ dev-perl/XML-XPath
+ virtual/pkgconfig"
+
+pkg_setup() {
+ enewgroup qemu 77
+ enewuser qemu 77 -1 -1 qemu kvm
+
+ # Some people used the masked ebuild which was not adding the qemu
+ # user to the kvm group originally. This results in VMs failing to
+ # start for some users. bug #430808
+ egetent group kvm | grep -q qemu
+ if [[ $? -ne 0 ]]; then
+ gpasswd -a qemu kvm
+ fi
+
+ # Check kernel configuration:
+ CONFIG_CHECK=""
+ use fuse && CONFIG_CHECK+="
+ ~FUSE_FS"
+
+ use lvm && CONFIG_CHECK+="
+ ~BLK_DEV_DM
+ ~DM_MULTIPATH
+ ~DM_SNAPSHOT"
+
+ use lxc && CONFIG_CHECK+="
+ ~BLK_CGROUP
+ ~CGROUP_CPUACCT
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~CGROUP_NET_PRIO
+ ~CGROUP_PERF
+ ~CGROUPS
+ ~CGROUP_SCHED
+ ~CPUSETS
+ ~DEVPTS_MULTIPLE_INSTANCES
+ ~IPC_NS
+ ~MACVLAN
+ ~NAMESPACES
+ ~NET_CLS_CGROUP
+ ~NET_NS
+ ~PID_NS
+ ~POSIX_MQUEUE
+ ~SECURITYFS
+ ~USER_NS
+ ~UTS_NS
+ ~VETH
+ ~!GRKERNSEC_CHROOT_MOUNT
+ ~!GRKERNSEC_CHROOT_DOUBLE
+ ~!GRKERNSEC_CHROOT_PIVOT
+ ~!GRKERNSEC_CHROOT_CHMOD
+ ~!GRKERNSEC_CHROOT_CAPS"
+ # Handle specific kernel versions for different features
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+ kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+ use macvtap && CONFIG_CHECK+="
+ ~MACVTAP"
+
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_MARK_T
+ ~BRIDGE_NF_EBTABLES
+ ~NETFILTER_ADVANCED
+ ~NETFILTER_XT_CONNMARK
+ ~NETFILTER_XT_MARK
+ ~NETFILTER_XT_TARGET_CHECKSUM"
+ # Bandwidth Limiting Support
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_T_NAT
+ ~NET_ACT_POLICE
+ ~NET_CLS_FW
+ ~NET_CLS_U32
+ ~NET_SCH_HTB
+ ~NET_SCH_INGRESS
+ ~NET_SCH_SFQ"
+
+ ERROR_USER_NS="Optional depending on LXC configuration."
+
+ if [[ -n ${CONFIG_CHECK} ]]; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ touch "${S}/.mailmap"
+
+ if [[ ${PV} = *9999* ]]; then
+ # git checkouts require bootstrapping to create the configure script.
+ # Additionally the submodules must be cloned to the right locations
+ # bug #377279
+ ./bootstrap || die "bootstrap failed"
+ (
+ git submodule status | sed 's/^[ +-]//;s/ .*//'
+ git hash-object bootstrap.conf
+ ) >.git-module-status
+ fi
+
+ epatch \
+ "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
+ "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
+ "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
+
+ [[ -n ${BACKPORTS} ]] &&
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
+ EPATCH_SOURCE="${WORKDIR}/patches" epatch
+
+ epatch_user
+
+ # Tweak the init script:
+ cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die
+ sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+ -e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \
+ -e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \
+ -e "s/USE_FLAG_RBD/$(usex rbd ceph '')/" \
+ -i "${S}/libvirtd.init" || die "sed failed"
+
+ AUTOTOOLS_AUTORECONF=true
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with apparmor)
+ $(use_with apparmor apparmor-profiles)
+ $(use_with audit)
+ $(use_with avahi)
+ $(use_with caps capng)
+ $(use_with firewalld)
+ $(use_with fuse)
+ $(use_with glusterfs)
+ $(use_with glusterfs storage-gluster)
+ $(use_with iscsi storage-iscsi)
+ $(use_with libvirtd)
+ $(use_with lvm storage-lvm)
+ $(use_with lvm storage-mpath)
+ $(use_with lxc)
+ $(use_with macvtap)
+ $(use_enable nls)
+ $(use_with numa numactl)
+ $(use_with numa numad)
+ $(use_with openvz)
+ $(use_with parted storage-disk)
+ $(use_with pcap libpcap)
+ $(use_with phyp)
+ $(use_with policykit polkit)
+ $(use_with qemu)
+ $(use_with qemu yajl)
+ $(use_with rbd storage-rbd)
+ $(use_with sasl)
+ $(use_with selinux)
+ $(use_with systemd systemd-daemon)
+ $(usex systemd --with-init-script=systemd '')
+ $(use_with udev)
+ $(use_with uml)
+ $(use_with vepa virtualport)
+ $(use_with virt-network network)
+ $(use_with wireshark-plugins wireshark-dissector)
+ $(use_with xen)
+ $(use_with xen xen-inotify)
+ $(usex xen --with-libxl '')
+
+ --without-hal
+ --without-netcf
+ --without-sanlock
+ --without-xenapi
+ --with-esx
+ --with-qemu-group=$(usex caps qemu root)
+ --with-qemu-user=$(usex caps qemu root)
+ --with-remote
+ --with-storage-fs
+ --with-vmware
+
+ --disable-static
+ --disable-werror
+
+ --docdir=/usr/share/doc/${PF}
+ --htmldir=/usr/share/doc/${PF}/html
+ --localstatedir=/var
+ )
+
+ if use virtualbox && has_version app-emulation/virtualbox-ose; then
+ myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+ else
+ myeconfargs+=( $(use_with virtualbox vbox) )
+ fi
+
+ autotools-utils_src_configure
+
+ if [[ ${PV} = *9999* ]]; then
+ # Restore gnulib's config.sub and config.guess
+ # bug #377279
+ (cd .gnulib && git reset --hard > /dev/null)
+ fi
+}
+
+src_test() {
+ # Explicitly allow parallel build of tests
+ export VIR_TEST_DEBUG=1
+ HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+ autotools-utils_src_compile install \
+ DESTDIR="${D}" \
+ SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
+
+ find "${D}" -name '*.la' -delete || die
+
+ # Remove bogus, empty directories. They are either not used, or
+ # libvirtd is able to create them on demand
+ rm -rf "${D}"/etc/sysconfig
+ rm -rf "${D}"/var/cache
+ rm -rf "${D}"/var/run
+ rm -rf "${D}"/var/log
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ use systemd && systemd_install_serviced \
+ "${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+ newinitd "${S}/libvirtd.init" libvirtd || die
+ newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ # we only ever want to generate this once
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+ fi
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+ fi
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then
+ FORCE_PRINT_ELOG=true
+ fi
+
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 051c953..cb757f0 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -4,11 +4,7 @@
EAPI=5
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-inherit eutils user autotools linux-info systemd readme.gentoo
+inherit eutils user autotools-utils linux-info systemd readme.gentoo
BACKPORTS=""
@@ -21,9 +17,9 @@
else
# Versions with 4 numbers are stable updates:
if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
- SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz"
+ SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
else
- SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
+ SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
fi
SRC_URI+=" ${BACKPORTS:+
https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
@@ -31,56 +27,56 @@
KEYWORDS="~amd64 ~x86"
SLOT="0/${PV}"
fi
-S="${WORKDIR}/${P%_rc*}"
DESCRIPTION="C toolkit to manipulate virtual machines"
HOMEPAGE="http://www.libvirt.org/"
LICENSE="LGPL-2.1"
-# TODO: Reenable IUSE wireshark-plugins
IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
- selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \
- elibc_glibc systemd"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+ selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
+ xen elibc_glibc"
+
+REQUIRED_USE="
+ firewalld? ( virt-network )
+ libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
lxc? ( caps libvirtd )
openvz? ( libvirtd )
qemu? ( libvirtd )
uml? ( libvirtd )
vepa? ( macvtap )
- virtualbox? ( libvirtd )
- xen? ( libvirtd )
virt-network? ( libvirtd )
- firewalld? ( virt-network )"
+ virtualbox? ( libvirtd )
+ xen? ( libvirtd )"
# gettext.sh command is used by the libvirt command wrappers, and it's
# non-optional, so put it into RDEPEND.
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
# package will use 3 by default. Since we don't have slot pinning in an API,
# we must go with the most recent
-RDEPEND="sys-libs/readline:=
- sys-libs/ncurses:0=
- >=net-misc/curl-7.18.0
- net-firewall/ebtables
- >=net-firewall/iptables-1.4.10[ipv6]
+RDEPEND="
+ app-misc/scrub
dev-libs/libgcrypt:0
- >=dev-libs/libxml2-2.7.6
dev-libs/libnl:3
+ >=dev-libs/libxml2-2.7.6
+ >=net-analyzer/netcat6-1.0-r2
>=net-libs/gnutls-1.0.25
net-libs/libssh2
+ >=net-misc/curl-7.18.0
sys-apps/dmidecode
>=sys-apps/util-linux-2.17
sys-devel/gettext
- >=net-analyzer/netcat6-1.0-r2
- app-misc/scrub
+ sys-libs/ncurses:0=
+ sys-libs/readline:=
apparmor? ( sys-libs/libapparmor )
audit? ( sys-process/audit )
avahi? ( >=net-dns/avahi-0.6[dbus] )
caps? ( sys-libs/libcap-ng )
+ firewalld? ( net-firewall/firewalld )
fuse? ( >=sys-fs/fuse-2.8.6 )
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
iscsi? ( sys-block/open-iscsi )
- lxc? ( !systemd? ( sys-power/pm-utils ) )
lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+ lxc? ( !systemd? ( sys-power/pm-utils ) )
nfs? ( net-fs/nfs-utils )
numa? (
>sys-process/numactl-2.0.2
@@ -102,124 +98,31 @@
sasl? ( dev-libs/cyrus-sasl )
selinux? ( >=sys-libs/libselinux-2.0.85 )
systemd? ( sys-apps/systemd )
- virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
- wireshark-plugins? ( net-analyzer/wireshark:= )
- xen? ( app-emulation/xen-tools app-emulation/xen )
- udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
- virt-network? ( net-dns/dnsmasq[script]
+ virt-network? (
+ net-dns/dnsmasq[script]
+ net-firewall/ebtables
+ >=net-firewall/iptables-1.4.10[ipv6]
net-misc/radvd
sys-apps/iproute2[-minimal]
- firewalld? ( net-firewall/firewalld )
+ )
+ virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+ wireshark-plugins? ( net-analyzer/wireshark:= )
+ xen? (
+ app-emulation/xen
+ app-emulation/xen-tools
+ )
+ udev? (
+ virtual/udev
+ >=x11-libs/libpciaccess-0.10.9
)
elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
DEPEND="${RDEPEND}
- virtual/pkgconfig
app-text/xhtml1
dev-lang/perl
+ dev-libs/libxslt
dev-perl/XML-XPath
- dev-libs/libxslt"
-
-# gentoo.readme stuff:
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="Important: The openrc libvirtd init script is now broken up into two
-separate services: libvirtd, that solely handles the daemon, and
-libvirt-guests, that takes care of clients during shutdown/restart of the
-host. In order to reenable client handling, edit /etc/conf.d/libvirt-guests
-and enable the service:
- $ rc-update add libvirt-guests
-
-For the basic networking support (bridged and routed networks) you don't
-need any extra software. For more complex network modes including but not
-limited to NATed network, you can enable the 'virt-network' USE flag.
-
-If you are using dnsmasq on your system, you will have to configure
-/etc/dnsmasq.conf to enable the following settings:
- bind-interfaces
- interface or except-interface
-Otherwise you might have issues with your existing DNS server.
-
-For openrc users:
-
- Please use /etc/conf.d/libvirtd to control the '--listen' parameter for
- libvirtd.
-
- Use /etc/init.d/libvirt-guests to manage clients on restart/shutdown of
- the host. The default configuration will suspend and resume running kvm
- guests with 'managedsave'. This behavior can be changed under
- /etc/conf.d/libvirt-guests
-
-For systemd users:
-
- Please use /etc/systemd/system/libvirtd.service.d/00gentoo.conf
- to control the '--listen' parameter for libvirtd.
-
- The configuration for the 'libvirt-guests.service' is found under
- /etc/libvirt/libvirt-guests.conf"
-
-! use policykit && DOC_CONTENTS+="
-
-To allow normal users to connect to libvirtd you must change the unix sock
-group and/or perms in /etc/libvirt/libvirtd.conf"
-
-use caps && use qemu && DOC_CONTENTS+="
-
-libvirt will now start qemu/kvm VMs with non-root privileges. Ensure any
-resources your VMs use are accessible by qemu:qemu"
-
-LXC_CONFIG_CHECK="
- ~CGROUPS
- ~CGROUP_FREEZER
- ~CGROUP_DEVICE
- ~CGROUP_CPUACCT
- ~CGROUP_SCHED
- ~CGROUP_PERF
- ~BLK_CGROUP
- ~NET_CLS_CGROUP
- ~CGROUP_NET_PRIO
- ~CPUSETS
- ~NAMESPACES
- ~UTS_NS
- ~IPC_NS
- ~PID_NS
- ~NET_NS
- ~USER_NS
- ~DEVPTS_MULTIPLE_INSTANCES
- ~VETH
- ~MACVLAN
- ~POSIX_MQUEUE
- ~SECURITYFS
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
- ~BRIDGE_NF_EBTABLES
- ~BRIDGE_EBT_MARK_T
- ~NETFILTER_ADVANCED
- ~NETFILTER_XT_TARGET_CHECKSUM
- ~NETFILTER_XT_CONNMARK
- ~NETFILTER_XT_MARK
-"
-
-BWLMT_CONFIG_CHECK="
- ~BRIDGE_EBT_T_NAT
- ~NET_SCH_HTB
- ~NET_SCH_SFQ
- ~NET_SCH_INGRESS
- ~NET_CLS_FW
- ~NET_CLS_U32
- ~NET_ACT_POLICE
-"
-
-MACVTAP_CONFIG_CHECK=" ~MACVTAP"
-
-LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
-
-ERROR_USER_NS="Optional depending on LXC configuration."
+ virtual/pkgconfig"
pkg_setup() {
enewgroup qemu 77
@@ -233,18 +136,69 @@
gpasswd -a qemu kvm
fi
- # Handle specific kernel versions for different features
- kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- kernel_is ge 3 6 && LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
+ # Check kernel configuration:
CONFIG_CHECK=""
- use fuse && CONFIG_CHECK+=" ~FUSE_FS"
- use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
- use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
- use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
- use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
+ use fuse && CONFIG_CHECK+="
+ ~FUSE_FS"
+
+ use lvm && CONFIG_CHECK+="
+ ~BLK_DEV_DM
+ ~DM_MULTIPATH
+ ~DM_SNAPSHOT"
+
+ use lxc && CONFIG_CHECK+="
+ ~BLK_CGROUP
+ ~CGROUP_CPUACCT
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~CGROUP_NET_PRIO
+ ~CGROUP_PERF
+ ~CGROUPS
+ ~CGROUP_SCHED
+ ~CPUSETS
+ ~DEVPTS_MULTIPLE_INSTANCES
+ ~IPC_NS
+ ~MACVLAN
+ ~NAMESPACES
+ ~NET_CLS_CGROUP
+ ~NET_NS
+ ~PID_NS
+ ~POSIX_MQUEUE
+ ~SECURITYFS
+ ~USER_NS
+ ~UTS_NS
+ ~VETH
+ ~!GRKERNSEC_CHROOT_MOUNT
+ ~!GRKERNSEC_CHROOT_DOUBLE
+ ~!GRKERNSEC_CHROOT_PIVOT
+ ~!GRKERNSEC_CHROOT_CHMOD
+ ~!GRKERNSEC_CHROOT_CAPS"
+ # Handle specific kernel versions for different features
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+ kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+ use macvtap && CONFIG_CHECK+="
+ ~MACVTAP"
+
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_MARK_T
+ ~BRIDGE_NF_EBTABLES
+ ~NETFILTER_ADVANCED
+ ~NETFILTER_XT_CONNMARK
+ ~NETFILTER_XT_MARK
+ ~NETFILTER_XT_TARGET_CHECKSUM"
# Bandwidth Limiting Support
- use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_T_NAT
+ ~NET_ACT_POLICE
+ ~NET_CLS_FW
+ ~NET_CLS_U32
+ ~NET_SCH_HTB
+ ~NET_SCH_INGRESS
+ ~NET_SCH_SFQ"
+
+ ERROR_USER_NS="Optional depending on LXC configuration."
+
if [[ -n ${CONFIG_CHECK} ]]; then
linux-info_pkg_setup
fi
@@ -269,145 +223,91 @@
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
"${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
- [[ -n ${BACKPORTS} ]] && \
+ [[ -n ${BACKPORTS} ]] &&
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
EPATCH_SOURCE="${WORKDIR}/patches" epatch
epatch_user
- [[ -n ${AUTOTOOLIZE} ]] && eautoreconf
+ # Tweak the init script:
+ cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die
+ sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+ -e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \
+ -e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \
+ -e "s/USE_FLAG_RBD/$(usex rbd ceph '')/" \
+ -i "${S}/libvirtd.init" || die "sed failed"
- # Tweak the init script
- local avahi_init=
- local iscsi_init=
- local rbd_init=
- local firewalld_init=
- cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init"
- use avahi && avahi_init='avahi-daemon'
- use iscsi && iscsi_init='iscsid'
- use rbd && rbd_init='ceph'
- use firewalld && firewalld_init='need firewalld'
-
- sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
+ AUTOTOOLS_AUTORECONF=true
+ autotools-utils_src_prepare
}
src_configure() {
- local myconf=""
+ local myeconfargs=(
+ $(use_with apparmor)
+ $(use_with apparmor apparmor-profiles)
+ $(use_with audit)
+ $(use_with avahi)
+ $(use_with caps capng)
+ $(use_with firewalld)
+ $(use_with fuse)
+ $(use_with glusterfs)
+ $(use_with glusterfs storage-gluster)
+ $(use_with iscsi storage-iscsi)
+ $(use_with libvirtd)
+ $(use_with lvm storage-lvm)
+ $(use_with lvm storage-mpath)
+ $(use_with lxc)
+ $(use_with macvtap)
+ $(use_enable nls)
+ $(use_with numa numactl)
+ $(use_with numa numad)
+ $(use_with openvz)
+ $(use_with parted storage-disk)
+ $(use_with pcap libpcap)
+ $(use_with phyp)
+ $(use_with policykit polkit)
+ $(use_with qemu)
+ $(use_with qemu yajl)
+ $(use_with rbd storage-rbd)
+ $(use_with sasl)
+ $(use_with selinux)
+ $(use_with systemd systemd-daemon)
+ $(usex systemd --with-init-script=systemd '')
+ $(use_with udev)
+ $(use_with uml)
+ $(use_with vepa virtualport)
+ $(use_with virt-network network)
+ $(use_with wireshark-plugins wireshark-dissector)
+ $(use_with xen)
+ $(use_with xen xen-inotify)
+ $(usex xen --with-libxl '')
- ## enable/disable daemon, otherwise client only utils
- myconf+=" $(use_with libvirtd)"
+ --without-hal
+ --without-netcf
+ --without-sanlock
+ --without-xenapi
+ --with-esx
+ --with-qemu-group=$(usex caps qemu root)
+ --with-qemu-user=$(usex caps qemu root)
+ --with-remote
+ --with-storage-fs
+ --with-vmware
- ## enable/disable the daemon using avahi to find VMs
- myconf+=" $(use_with avahi)"
+ --disable-static
+ --disable-werror
- ## hypervisors on the local host
- myconf+=" $(use_with xen) $(use_with xen xen-inotify)"
- myconf+=" --without-xenapi"
- if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
- myconf+=" --with-libxl"
- else
- myconf+=" --without-libxl"
- fi
- myconf+=" $(use_with openvz)"
- myconf+=" $(use_with lxc)"
- if use virtualbox && has_version app-emulation/virtualbox-ose; then
- myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
- else
- myconf+=" $(use_with virtualbox vbox)"
- fi
- myconf+=" $(use_with uml)"
- myconf+=" $(use_with qemu)"
- myconf+=" $(use_with qemu yajl)" # Use QMP over HMP
- myconf+=" $(use_with phyp)"
- myconf+=" --with-esx"
- myconf+=" --with-vmware"
-
- ## additional host drivers
- myconf+=" $(use_with apparmor)"
- myconf+=" $(use_with apparmor apparmor-profiles)"
- myconf+=" $(use_with virt-network network)"
- myconf+=" --with-storage-fs"
- myconf+=" $(use_with lvm storage-lvm)"
- myconf+=" $(use_with iscsi storage-iscsi)"
- myconf+=" $(use_with parted storage-disk)"
- mycond+=" $(use_with glusterfs)"
- mycond+=" $(use_with glusterfs storage-gluster)"
- myconf+=" $(use_with lvm storage-mpath)"
- myconf+=" $(use_with rbd storage-rbd)"
- myconf+=" $(use_with numa numactl)"
- myconf+=" $(use_with numa numad)"
- myconf+=" $(use_with selinux)"
- myconf+=" $(use_with fuse)"
-
- # udev for device support details
- myconf+=" $(use_with udev)"
- myconf+=" --without-hal"
-
- # linux capability support so we don't need privileged accounts
- myconf+=" $(use_with caps capng)"
-
- ## auth stuff
- myconf+=" $(use_with policykit polkit)"
- myconf+=" $(use_with sasl)"
-
- # network bits
- myconf+=" $(use_with macvtap)"
- myconf+=" $(use_with pcap libpcap)"
- myconf+=" $(use_with vepa virtualport)"
- myconf+=" $(use_with firewalld)"
-
- ## other
- myconf+=" $(use_enable nls)"
-
- # user privilege bits fir qemu/kvm
- if use caps; then
- myconf+=" --with-qemu-user=qemu"
- myconf+=" --with-qemu-group=qemu"
- else
- myconf+=" --with-qemu-user=root"
- myconf+=" --with-qemu-group=root"
- fi
-
- # audit support
- myconf+=" $(use_with audit)"
-
- # wireshark dissector
- myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
-
- ## stuff we don't yet support
- myconf+=" --without-netcf"
-
- # locking support
- myconf+=" --without-sanlock"
-
- # systemd unit files
- myconf+=" $(use_with systemd systemd-daemon)"
- use systemd && myconf+=" --with-init-script=systemd"
-
- # this is a nasty trick to work around the problem in bug
- # #275073. The reason why we don't solve this properly is that
- # it'll require us to rebuild autotools (and we don't really want
- # to do that right now). The proper solution has been sent
- # upstream and should hopefully land in 0.7.7, in the mean time,
- # mime the same functionality with this.
- case ${CHOST} in
- *cygwin* | *mingw* )
- ;;
- *)
- ac_cv_prog_WINDRES=no
- ;;
- esac
-
- econf \
- ${myconf} \
- --disable-static \
- --disable-werror \
- --with-remote \
- --docdir=/usr/share/doc/${PF} \
+ --docdir=/usr/share/doc/${PF}
+ --htmldir=/usr/share/doc/${PF}/html
--localstatedir=/var
+ )
+
+ if use virtualbox && has_version app-emulation/virtualbox-ose; then
+ myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+ else
+ myeconfargs+=( $(use_with virtualbox vbox) )
+ fi
+
+ autotools-utils_src_configure
if [[ ${PV} = *9999* ]]; then
# Restore gnulib's config.sub and config.guess
@@ -423,13 +323,9 @@
}
src_install() {
- emake install \
+ autotools-utils_src_compile install \
DESTDIR="${D}" \
- HTML_DIR=/usr/share/doc/${PF}/html \
- DOCS_DIR=/usr/share/doc/${PF} \
- EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
- SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
- || die "emake install failed"
+ SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
find "${D}" -name '*.la' -delete || die
@@ -449,12 +345,14 @@
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init" libvirt-guests || die
+ newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die
newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+ DISABLE_AUTOFORMATTING=true
readme.gentoo_create_doc
}
@@ -463,16 +361,6 @@
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
fi
-
- # We really don't want to use or support old PolicyKit cause it
- # screws with the new polkit integration
- if has_version sys-auth/policykit; then
- rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
- fi
-
- # Only sysctl files ending in .conf work
- dodir /etc/sysctl.d
- mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
}
pkg_postinst() {
@@ -487,5 +375,7 @@
FORCE_PRINT_ELOG=true
fi
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+ DISABLE_AUTOFORMATTING=true
readme.gentoo_print_elog
}
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index 34d90a3..7a316de 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -55,7 +55,6 @@
</flag>
<!-- Miscellaneous flags -->
<flag name="apparmor">Enable AppArmor support</flag>
- <flag name="audit">support <pkg>sys-process/audit</pkg></flag>
<flag name="fuse">Allow LXC to use <pkg>sys-fs/fuse</pkg> for mount
points</flag>
<flag name="numa">
diff --git a/app-emulation/lxc/lxc-1.0.6-r1.ebuild b/app-emulation/lxc/lxc-1.0.6-r1.ebuild
index a9b43e5..5fcb857 100644
--- a/app-emulation/lxc/lxc-1.0.6-r1.ebuild
+++ b/app-emulation/lxc/lxc-1.0.6-r1.ebuild
@@ -56,6 +56,7 @@
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS
+ ~!GRKERNSEC_PROC
"
ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
@@ -77,6 +78,7 @@
ERROR_GRKERNSEC_CHROOT_PIVOT=":CONFIG_GRKERNSEC_CHROOT_PIVOT some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CHMOD=":CONFIG_GRKERNSEC_CHROOT_CHMOD some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CAPS=":CONFIG_GRKERNSEC_CHROOT_CAPS some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC=":CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
diff --git a/app-emulation/lxc/lxc-1.0.7.ebuild b/app-emulation/lxc/lxc-1.0.7.ebuild
index b671442..bec1ea9 100644
--- a/app-emulation/lxc/lxc-1.0.7.ebuild
+++ b/app-emulation/lxc/lxc-1.0.7.ebuild
@@ -56,6 +56,7 @@
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS
+ ~!GRKERNSEC_PROC
"
ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
@@ -77,6 +78,7 @@
ERROR_GRKERNSEC_CHROOT_PIVOT=":CONFIG_GRKERNSEC_CHROOT_PIVOT some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CHMOD=":CONFIG_GRKERNSEC_CHROOT_CHMOD some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CAPS=":CONFIG_GRKERNSEC_CHROOT_CAPS some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC=":CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
diff --git a/app-emulation/lxc/lxc-1.1.0-r6.ebuild b/app-emulation/lxc/lxc-1.1.0-r6.ebuild
index 5551bc9..3976c1f 100644
--- a/app-emulation/lxc/lxc-1.1.0-r6.ebuild
+++ b/app-emulation/lxc/lxc-1.1.0-r6.ebuild
@@ -61,6 +61,8 @@
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS
+ ~!GRKERNSEC_PROC
+ ~!GRKERNSEC_SYSFS_RESTRICT
"
ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
@@ -89,6 +91,8 @@
ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers"
DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
diff --git a/app-emulation/lxc/lxc-1.1.1-r1.ebuild b/app-emulation/lxc/lxc-1.1.1-r1.ebuild
index fbdb089..a4f137c 100644
--- a/app-emulation/lxc/lxc-1.1.1-r1.ebuild
+++ b/app-emulation/lxc/lxc-1.1.1-r1.ebuild
@@ -61,6 +61,8 @@
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS
+ ~!GRKERNSEC_PROC
+ ~!GRKERNSEC_SYSFS_RESTRICT
"
ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
@@ -89,6 +91,8 @@
ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers"
DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
diff --git a/app-emulation/lxc/lxc-1.1.2-r1.ebuild b/app-emulation/lxc/lxc-1.1.2-r1.ebuild
index 8dd8dd2..6e09da1 100644
--- a/app-emulation/lxc/lxc-1.1.2-r1.ebuild
+++ b/app-emulation/lxc/lxc-1.1.2-r1.ebuild
@@ -61,6 +61,8 @@
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS
+ ~!GRKERNSEC_PROC
+ ~!GRKERNSEC_SYSFS_RESTRICT
"
ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
@@ -89,6 +91,8 @@
ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers"
DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
diff --git a/app-emulation/lxc/lxc-1.1.2-r2.ebuild b/app-emulation/lxc/lxc-1.1.2-r2.ebuild
index 8dd8dd2..6e09da1 100644
--- a/app-emulation/lxc/lxc-1.1.2-r2.ebuild
+++ b/app-emulation/lxc/lxc-1.1.2-r2.ebuild
@@ -61,6 +61,8 @@
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS
+ ~!GRKERNSEC_PROC
+ ~!GRKERNSEC_SYSFS_RESTRICT
"
ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
@@ -89,6 +91,8 @@
ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers"
DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
diff --git a/app-emulation/lxc/lxc-1.1.2.ebuild b/app-emulation/lxc/lxc-1.1.2.ebuild
index 660348e..542aca0 100644
--- a/app-emulation/lxc/lxc-1.1.2.ebuild
+++ b/app-emulation/lxc/lxc-1.1.2.ebuild
@@ -61,6 +61,8 @@
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS
+ ~!GRKERNSEC_PROC
+ ~!GRKERNSEC_SYSFS_RESTRICT
"
ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
@@ -89,6 +91,8 @@
ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers"
DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 6254714..88f5361 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,4 @@
DIST lxd-0.13.tar.bz2 3336161 SHA256 4228979ea9a856647f75f0230f58cc577c111a287f148787af766ab36c55f756 SHA512 12cd865ef63702674342df23ebb298b6ba39f0d44e9bfe91c643820be06ff30910145388a4daa2d63fbcb53c236e3cd4eb84e3e0bc617c85247322b0024c4920 WHIRLPOOL 82e788e9b35429df308d498955bd0cab06eb7d1a09c0a20bddad78490900b2cb78a44da9970db149ebfda546250a1d5aa2204e5f6f98b81a228310bfee3003a7
DIST lxd-0.14.tar.bz2 2526939 SHA256 c0c51ac5b3d30c7906323eba965011073b412a3c354ce095e46f14df4298c46c SHA512 d3f9eb38cdf71add270c895c1583dab85b0e0dba0d956900628b519881b41582113d6c25d37b9522493de069ad6a43b197ae895aefeb83391337273a4b60953e WHIRLPOOL 2b9c6931b81df7e60b13e35bfcd5272a46fb29377e11f6326616f55bf6c583db7be82d41273369518e9b9e434bee3b30f989b6816cd8dbdd40cc2cc1effac7b4
DIST lxd-0.16.tar.bz2 2660683 SHA256 bbe2b7542af34c93c7509e9638016a420bfc1daf1f1f45a33fa3d379ae10f14f SHA512 856e5ea1920ec3025cbd308a8e2ef656393a149111a38188f749e7d42a41032d762009d85316815c3f18ac0907fa9380758ca48666b13e900c9bbdf809d57f1c WHIRLPOOL f4bbea69073f2cc0dce65e39d88cdf1a0fadd4629b5b42bdee7ab385df459f78a2e36619c40ace687be124fb8d59c0da043cb1a8195630b2d0a051ab53297b89
+DIST lxd-0.18.tar.bz2 2674919 SHA256 cb9c4823fb19ccef4827ee4dc3a105b60d3549b5023f4517d1471487469ea395 SHA512 5bbaae6eef27a0b14f8fee41d113afeea61de5414e5f7ed5011819eb6823a11dff647ac3f9781357304f7c5b04c618d05e4a04197cae6c6e4845cad5476d22ff WHIRLPOOL ca73e587f19491d79b03af2d205ab9f234b5acb1ff1f2d68a05be053cbd1ec89f6b9bc0fc64113980d7f2d6e3c7ece01d7d0c431c08a87b2b0ec555c6ff97914
diff --git a/app-emulation/lxd/files/lxd-0.18-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.18-dont-go-get.patch
new file mode 100644
index 0000000..1b229ea
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.18-dont-go-get.patch
@@ -0,0 +1,18 @@
+--- Makefile.orig 2015-09-17 20:37:16.481867339 -0500
++++ Makefile 2015-09-17 20:53:27.715800926 -0500
+@@ -12,15 +12,11 @@
+
+ .PHONY: default
+ default:
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./...
+ @echo "LXD built succesfuly"
+
+ .PHONY: client
+ client:
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./lxc
+ @echo "LXD client built succesfuly"
+
diff --git a/app-emulation/lxd/files/lxd-0.18-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.18-nc-binary-name.patch
new file mode 100644
index 0000000..b88b7f7
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.18-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig 2015-09-17 21:00:29.290772099 -0500
++++ lxd/rsync.go 2015-09-17 21:00:54.737770359 -0500
+@@ -73,7 +73,7 @@
+ * command (i.e. the command to run on --server). However, we're
+ * hardcoding that at the other end, so we can just ignore it.
+ */
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command("rsync", "-arvP", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
+ if err := cmd.Start(); err != nil {
+ return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.18.confd b/app-emulation/lxd/files/lxd-0.18.confd
new file mode 100644
index 0000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.18.confd
@@ -0,0 +1,27 @@
+# Group which owns the shared socket
+LXD_OPTIONS+=" --group lxd"
+
+
+
+# Enable cpu profiling into the specified file
+#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
+
+# Enable memory profiling into the specified file
+#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-0.18.initd b/app-emulation/lxd/files/lxd-0.18.initd
new file mode 100644
index 0000000..2b75e51
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.18.initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+depend() {
+ need cgmanager
+ need net
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxd server"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-0.18.ebuild b/app-emulation/lxd/lxd-0.18.ebuild
new file mode 100644
index 0000000..fd53d98
--- /dev/null
+++ b/app-emulation/lxd/lxd-0.18.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="btrfs +criu +daemon lvm nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+ dev-go/go-crypto
+ >=dev-lang/go-1.4.2:=
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-analyzer/openbsd-netcat
+ net-misc/bridge-utils
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ virtual/acl
+ btrfs? (
+ sys-fs/btrfs-progs
+ )
+ criu? (
+ sys-process/criu
+ )
+ lvm? (
+ sys-fs/lvm2
+ )
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+# - Add apparmor USE. There are some exec calls to apparmor_parser
+# - Test build with Go 1.4 & 1.5
+# - integrate "lxd shutdown" into initscript as custom action (default "stop"
+# action should _not_ stop containers amirite?)
+# "Perform a clean shutdown of LXD and all running containers"
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ # Upstream requires the openbsd flavor of netcat (with -U), but
+ # Gentoo installs that with a renamed binary
+ epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}"
+
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:$(get_golibdir_gopath)" emake
+ else
+ # build client tool
+ GOPATH="${S}:$(get_golibdir_gopath)" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ if use daemon; then
+ dobin bin/fuidshift
+
+ dosbin bin/lxd
+ fi
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxc.in lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md
+
+ docinto specs
+ dodoc specs/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "including a Quick Start."
+
+ # The messaging below only applies to daemon installs
+ use daemon || return 0
+
+ # The control socket will be owned by (and writeable by) this group.
+ enewgroup lxd
+
+ # Ubuntu also defines an lxd user but it appears unused (the daemon
+ # must run as root)
+
+ if test -n "${REPLACING_VERSIONS}"; then
+ einfo
+ einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
+ einfo "is no longer available in /etc/conf.d/lxd. Instead, configure the"
+ einfo "listen address/port by setting the core.https_address server option."
+ fi
+}
diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index c49dbec..46d6c90 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -19,6 +19,10 @@
<remote-id type="github">lxc/lxd</remote-id>
</upstream>
<use>
+ <flag name="btrfs">
+ Add support for managing instance/snapshot
+ disk using btrfs subvolumes
+ </flag>
<flag name="criu">
Add support for live-migrateable containers
</flag>
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index dd9b756..fe4fd4c 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,3 +1,4 @@
DIST qemu-2.3.0.tar.bz2 24683085 SHA256 b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588 SHA512 7a40d213c5696b27784abd2a3119e49d42c38c923be431826c73a8f14c19074435d7f1a652686c53baf08e81f5a3005b2ddc92d67c32f6a2b19659ab627e9eaa WHIRLPOOL 9dad6e342027c3be512b4e0b40e810e0a6f1dc84a16847aa5aac74d97f7a347e60d42e770335a090f83e90a1614294f86552a84edc1faafc7093d3e32602f5de
DIST qemu-2.3.1.tar.bz2 24692020 SHA256 661d029809421cae06b4b1bc74ac0e560cb4ed47c9523c676ff277fa26dca15f SHA512 309e6df7dcc0a064d1a17c7dac2f60398700dfa8c6b60b66e4202966248097cbc49af75aa97725bc34773151be6fd75836810e9f0741ba65cdc208414fa78f6b WHIRLPOOL 26750ee00513daa99cdcd585c4b8407b8258a9c3559ae6335266d7754cb6679e7c10c56f8d12ae0ef2b5cd5d6a9a6a536213f8e86e81ced37e46205c796a773e
+DIST qemu-2.4.0.1.tar.bz2 25068555 SHA256 ecfe8b88037e41e817d72c460c56c6a0b573d540d6ba38b162d0de4fd22d1bdb SHA512 08eabe92fa9096386ef00f8e9d99eeec1508d15e5a98431e043a729cbaca2d96d6e3afc612e7c4a0fe5a6bba80006276185f1066b4c73105b2ea24b7e9133b84 WHIRLPOOL 1daaec23d6ada6af8bf4902e590fb96375e7149d2f53ff6bf6d8fb39722c182a2d2efcc0d40bee673a8316f621983c512daa54202bb4e632b3a4b09f0268cd09
DIST qemu-2.4.0.tar.bz2 25070979 SHA256 72b0b991bbcc540663a019e1e8c4f714053b691dda32c9b9ee80b25f367e6620 SHA512 8740e0fb2c654ed897dff4649f1f83d14d57cfa9cbde723899f115982f93253ce9a2bddd60aab379d241027d2044137770efe4c0b3c83d5b20f3a2a06f05a5dc WHIRLPOOL 8c6cfae096624e01f0d5daeb86aa2dccbeaa86d2aeab626cf55cf20b7edace82d0b0f3a1d85eeb2dc1fd53abaaa9dccf8f0d7ddc657a1f5ffd72fd68301648f1
diff --git a/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-6855.patch b/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-6855.patch
new file mode 100644
index 0000000..69dd66a
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-6855.patch
@@ -0,0 +1,146 @@
+https://bugs.gentoo.org/560422
+
+From d9033e1d3aa666c5071580617a57bd853c5d794a Mon Sep 17 00:00:00 2001
+From: John Snow <jsnow@redhat.com>
+Date: Thu, 17 Sep 2015 14:17:05 -0400
+Subject: [PATCH] ide: fix ATAPI command permissions
+
+We're a little too lenient with what we'll let an ATAPI drive handle.
+Clamp down on the IDE command execution table to remove CD_OK permissions
+from commands that are not and have never been ATAPI commands.
+
+For ATAPI command validity, please see:
+- ATA4 Section 6.5 ("PACKET Command feature set")
+- ATA8/ACS Section 4.3 ("The PACKET feature set")
+- ACS3 Section 4.3 ("The PACKET feature set")
+
+ACS3 has a historical command validity table in Table B.4
+("Historical Command Assignments") that can be referenced to find when
+a command was introduced, deprecated, obsoleted, etc.
+
+The only reference for ATAPI command validity is by checking that
+version's PACKET feature set section.
+
+ATAPI was introduced by T13 into ATA4, all commands retired prior to ATA4
+therefore are assumed to have never been ATAPI commands.
+
+Mandatory commands, as listed in ATA8-ACS3, are:
+
+- DEVICE RESET
+- EXECUTE DEVICE DIAGNOSTIC
+- IDENTIFY DEVICE
+- IDENTIFY PACKET DEVICE
+- NOP
+- PACKET
+- READ SECTOR(S)
+- SET FEATURES
+
+Optional commands as listed in ATA8-ACS3, are:
+
+- FLUSH CACHE
+- READ LOG DMA EXT
+- READ LOG EXT
+- WRITE LOG DMA EXT
+- WRITE LOG EXT
+
+All other commands are illegal to send to an ATAPI device and should
+be rejected by the device.
+
+CD_OK removal justifications:
+
+0x06 WIN_DSM Defined in ACS2. Not valid for ATAPI.
+0x21 WIN_READ_ONCE Retired in ATA5. Not ATAPI in ATA4.
+0x94 WIN_STANDBYNOW2 Retired in ATA4. Did not coexist with ATAPI.
+0x95 WIN_IDLEIMMEDIATE2 Retired in ATA4. Did not coexist with ATAPI.
+0x96 WIN_STANDBY2 Retired in ATA4. Did not coexist with ATAPI.
+0x97 WIN_SETIDLE2 Retired in ATA4. Did not coexist with ATAPI.
+0x98 WIN_CHECKPOWERMODE2 Retired in ATA4. Did not coexist with ATAPI.
+0x99 WIN_SLEEPNOW2 Retired in ATA4. Did not coexist with ATAPI.
+0xE0 WIN_STANDBYNOW1 Not part of ATAPI in ATA4, ACS or ACS3.
+0xE1 WIN_IDLEIMMDIATE Not part of ATAPI in ATA4, ACS or ACS3.
+0xE2 WIN_STANDBY Not part of ATAPI in ATA4, ACS or ACS3.
+0xE3 WIN_SETIDLE1 Not part of ATAPI in ATA4, ACS or ACS3.
+0xE4 WIN_CHECKPOWERMODE1 Not part of ATAPI in ATA4, ACS or ACS3.
+0xE5 WIN_SLEEPNOW1 Not part of ATAPI in ATA4, ACS or ACS3.
+0xF8 WIN_READ_NATIVE_MAX Obsoleted in ACS3. Not ATAPI in ATA4 or ACS.
+
+This patch fixes a divide by zero fault that can be caused by sending
+the WIN_READ_NATIVE_MAX command to an ATAPI drive, which causes it to
+attempt to use zeroed CHS values to perform sector arithmetic.
+
+Reported-by: Qinghao Tang <luodalongde@gmail.com>
+Signed-off-by: John Snow <jsnow@redhat.com>
+Reviewed-by: Markus Armbruster <armbru@redhat.com>
+Message-id: 1441816082-21031-1-git-send-email-jsnow@redhat.com
+CC: qemu-stable@nongnu.org
+---
+ hw/ide/core.c | 30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/hw/ide/core.c b/hw/ide/core.c
+index 8ba04df..1cc6945 100644
+--- a/hw/ide/core.c
++++ b/hw/ide/core.c
+@@ -1746,11 +1746,11 @@ static const struct {
+ } ide_cmd_table[0x100] = {
+ /* NOP not implemented, mandatory for CD */
+ [CFA_REQ_EXT_ERROR_CODE] = { cmd_cfa_req_ext_error_code, CFA_OK },
+- [WIN_DSM] = { cmd_data_set_management, ALL_OK },
++ [WIN_DSM] = { cmd_data_set_management, HD_CFA_OK },
+ [WIN_DEVICE_RESET] = { cmd_device_reset, CD_OK },
+ [WIN_RECAL] = { cmd_nop, HD_CFA_OK | SET_DSC},
+ [WIN_READ] = { cmd_read_pio, ALL_OK },
+- [WIN_READ_ONCE] = { cmd_read_pio, ALL_OK },
++ [WIN_READ_ONCE] = { cmd_read_pio, HD_CFA_OK },
+ [WIN_READ_EXT] = { cmd_read_pio, HD_CFA_OK },
+ [WIN_READDMA_EXT] = { cmd_read_dma, HD_CFA_OK },
+ [WIN_READ_NATIVE_MAX_EXT] = { cmd_read_native_max, HD_CFA_OK | SET_DSC },
+@@ -1769,12 +1769,12 @@ static const struct {
+ [CFA_TRANSLATE_SECTOR] = { cmd_cfa_translate_sector, CFA_OK },
+ [WIN_DIAGNOSE] = { cmd_exec_dev_diagnostic, ALL_OK },
+ [WIN_SPECIFY] = { cmd_nop, HD_CFA_OK | SET_DSC },
+- [WIN_STANDBYNOW2] = { cmd_nop, ALL_OK },
+- [WIN_IDLEIMMEDIATE2] = { cmd_nop, ALL_OK },
+- [WIN_STANDBY2] = { cmd_nop, ALL_OK },
+- [WIN_SETIDLE2] = { cmd_nop, ALL_OK },
+- [WIN_CHECKPOWERMODE2] = { cmd_check_power_mode, ALL_OK | SET_DSC },
+- [WIN_SLEEPNOW2] = { cmd_nop, ALL_OK },
++ [WIN_STANDBYNOW2] = { cmd_nop, HD_CFA_OK },
++ [WIN_IDLEIMMEDIATE2] = { cmd_nop, HD_CFA_OK },
++ [WIN_STANDBY2] = { cmd_nop, HD_CFA_OK },
++ [WIN_SETIDLE2] = { cmd_nop, HD_CFA_OK },
++ [WIN_CHECKPOWERMODE2] = { cmd_check_power_mode, HD_CFA_OK | SET_DSC },
++ [WIN_SLEEPNOW2] = { cmd_nop, HD_CFA_OK },
+ [WIN_PACKETCMD] = { cmd_packet, CD_OK },
+ [WIN_PIDENTIFY] = { cmd_identify_packet, CD_OK },
+ [WIN_SMART] = { cmd_smart, HD_CFA_OK | SET_DSC },
+@@ -1788,19 +1788,19 @@ static const struct {
+ [WIN_WRITEDMA] = { cmd_write_dma, HD_CFA_OK },
+ [WIN_WRITEDMA_ONCE] = { cmd_write_dma, HD_CFA_OK },
+ [CFA_WRITE_MULTI_WO_ERASE] = { cmd_write_multiple, CFA_OK },
+- [WIN_STANDBYNOW1] = { cmd_nop, ALL_OK },
+- [WIN_IDLEIMMEDIATE] = { cmd_nop, ALL_OK },
+- [WIN_STANDBY] = { cmd_nop, ALL_OK },
+- [WIN_SETIDLE1] = { cmd_nop, ALL_OK },
+- [WIN_CHECKPOWERMODE1] = { cmd_check_power_mode, ALL_OK | SET_DSC },
+- [WIN_SLEEPNOW1] = { cmd_nop, ALL_OK },
++ [WIN_STANDBYNOW1] = { cmd_nop, HD_CFA_OK },
++ [WIN_IDLEIMMEDIATE] = { cmd_nop, HD_CFA_OK },
++ [WIN_STANDBY] = { cmd_nop, HD_CFA_OK },
++ [WIN_SETIDLE1] = { cmd_nop, HD_CFA_OK },
++ [WIN_CHECKPOWERMODE1] = { cmd_check_power_mode, HD_CFA_OK | SET_DSC },
++ [WIN_SLEEPNOW1] = { cmd_nop, HD_CFA_OK },
+ [WIN_FLUSH_CACHE] = { cmd_flush_cache, ALL_OK },
+ [WIN_FLUSH_CACHE_EXT] = { cmd_flush_cache, HD_CFA_OK },
+ [WIN_IDENTIFY] = { cmd_identify, ALL_OK },
+ [WIN_SETFEATURES] = { cmd_set_features, ALL_OK | SET_DSC },
+ [IBM_SENSE_CONDITION] = { cmd_ibm_sense_condition, CFA_OK | SET_DSC },
+ [CFA_WEAR_LEVEL] = { cmd_cfa_erase_sectors, HD_CFA_OK | SET_DSC },
+- [WIN_READ_NATIVE_MAX] = { cmd_read_native_max, ALL_OK | SET_DSC },
++ [WIN_READ_NATIVE_MAX] = { cmd_read_native_max, HD_CFA_OK | SET_DSC },
+ };
+
+ static bool ide_cmd_permitted(IDEState *s, uint32_t cmd)
+--
+2.6.0.rc2.230.g3dd15c0
+
diff --git a/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-7295-1.patch b/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-7295-1.patch
new file mode 100644
index 0000000..4ee46e1
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-7295-1.patch
@@ -0,0 +1,58 @@
+https://bugs.gentoo.org/560760
+
+From ce317461573bac12b10d67699b4ddf1f97cf066c Mon Sep 17 00:00:00 2001
+From: Jason Wang <jasowang@redhat.com>
+Date: Fri, 25 Sep 2015 13:21:28 +0800
+Subject: [PATCH 1/3] virtio: introduce virtqueue_unmap_sg()
+
+Factor out sg unmapping logic. This will be reused by the patch that
+can discard descriptor.
+
+Cc: Michael S. Tsirkin <mst@redhat.com>
+Cc: Andrew James <andrew.james@hpe.com>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+---
+ hw/virtio/virtio.c | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
+index 7504f8b..6f2b96c 100644
+--- a/hw/virtio/virtio.c
++++ b/hw/virtio/virtio.c
+@@ -244,14 +244,12 @@ int virtio_queue_empty(VirtQueue *vq)
+ return vring_avail_idx(vq) == vq->last_avail_idx;
+ }
+
+-void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
+- unsigned int len, unsigned int idx)
++static void virtqueue_unmap_sg(VirtQueue *vq, const VirtQueueElement *elem,
++ unsigned int len)
+ {
+ unsigned int offset;
+ int i;
+
+- trace_virtqueue_fill(vq, elem, len, idx);
+-
+ offset = 0;
+ for (i = 0; i < elem->in_num; i++) {
+ size_t size = MIN(len - offset, elem->in_sg[i].iov_len);
+@@ -267,6 +265,14 @@ void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
+ cpu_physical_memory_unmap(elem->out_sg[i].iov_base,
+ elem->out_sg[i].iov_len,
+ 0, elem->out_sg[i].iov_len);
++}
++
++void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
++ unsigned int len, unsigned int idx)
++{
++ trace_virtqueue_fill(vq, elem, len, idx);
++
++ virtqueue_unmap_sg(vq, elem, len);
+
+ idx = (idx + vring_used_idx(vq)) % vq->vring.num;
+
+--
+2.6.0.rc2.230.g3dd15c0
+
diff --git a/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-7295-2.patch b/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-7295-2.patch
new file mode 100644
index 0000000..8c73fcb
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-7295-2.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/560760
+
+From 29b9f5efd78ae0f9cc02dd169b6e80d2c404bade Mon Sep 17 00:00:00 2001
+From: Jason Wang <jasowang@redhat.com>
+Date: Fri, 25 Sep 2015 13:21:29 +0800
+Subject: [PATCH 2/3] virtio: introduce virtqueue_discard()
+
+This patch introduces virtqueue_discard() to discard a descriptor and
+unmap the sgs. This will be used by the patch that will discard
+descriptor when packet is truncated.
+
+Cc: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+---
+ hw/virtio/virtio.c | 7 +++++++
+ include/hw/virtio/virtio.h | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
+index 6f2b96c..d0bc72e 100644
+--- a/hw/virtio/virtio.c
++++ b/hw/virtio/virtio.c
+@@ -267,6 +267,13 @@ static void virtqueue_unmap_sg(VirtQueue *vq, const VirtQueueElement *elem,
+ 0, elem->out_sg[i].iov_len);
+ }
+
++void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem,
++ unsigned int len)
++{
++ vq->last_avail_idx--;
++ virtqueue_unmap_sg(vq, elem, len);
++}
++
+ void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
+ unsigned int len, unsigned int idx)
+ {
+diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
+index 6201ee8..9d09115 100644
+--- a/include/hw/virtio/virtio.h
++++ b/include/hw/virtio/virtio.h
+@@ -146,6 +146,8 @@ void virtio_del_queue(VirtIODevice *vdev, int n);
+ void virtqueue_push(VirtQueue *vq, const VirtQueueElement *elem,
+ unsigned int len);
+ void virtqueue_flush(VirtQueue *vq, unsigned int count);
++void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem,
++ unsigned int len);
+ void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
+ unsigned int len, unsigned int idx);
+
+--
+2.6.0.rc2.230.g3dd15c0
+
diff --git a/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-7295-3.patch b/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-7295-3.patch
new file mode 100644
index 0000000..96981e9
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-7295-3.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/560760
+
+From 0cf33fb6b49a19de32859e2cdc6021334f448fb3 Mon Sep 17 00:00:00 2001
+From: Jason Wang <jasowang@redhat.com>
+Date: Fri, 25 Sep 2015 13:21:30 +0800
+Subject: [PATCH 3/3] virtio-net: correctly drop truncated packets
+
+When packet is truncated during receiving, we drop the packets but
+neither discard the descriptor nor add and signal used
+descriptor. This will lead several issues:
+
+- sg mappings are leaked
+- rx will be stalled if a lots of packets were truncated
+
+In order to be consistent with vhost, fix by discarding the descriptor
+in this case.
+
+Cc: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+---
+ hw/net/virtio-net.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
+index d388c55..a877614 100644
+--- a/hw/net/virtio-net.c
++++ b/hw/net/virtio-net.c
+@@ -1094,13 +1094,7 @@ static ssize_t virtio_net_receive(NetClientState *nc, const uint8_t *buf, size_t
+ * must have consumed the complete packet.
+ * Otherwise, drop it. */
+ if (!n->mergeable_rx_bufs && offset < size) {
+-#if 0
+- error_report("virtio-net truncated non-mergeable packet: "
+- "i %zd mergeable %d offset %zd, size %zd, "
+- "guest hdr len %zd, host hdr len %zd",
+- i, n->mergeable_rx_bufs,
+- offset, size, n->guest_hdr_len, n->host_hdr_len);
+-#endif
++ virtqueue_discard(q->rx_vq, &elem, total);
+ return size;
+ }
+
+--
+2.6.0.rc2.230.g3dd15c0
+
diff --git a/app-emulation/qemu/qemu-2.4.0.1.ebuild b/app-emulation/qemu/qemu-2.4.0.1.ebuild
new file mode 100644
index 0000000..306d772
--- /dev/null
+++ b/app-emulation/qemu/qemu-2.4.0.1.ebuild
@@ -0,0 +1,643 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses,readline"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+ user udev fcaps readme.gentoo pax-utils
+
+BACKPORTS=
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+ inherit git-2
+ SRC_URI=""
+else
+ SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
+ ${BACKPORTS:+
+ https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
+gtk gtk2 infiniband iscsi +jpeg \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
++png pulseaudio python \
+rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu
+static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
+virtfs +vnc vte xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
+mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
+x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ gtk2? ( gtk )
+ qemu_softmmu_targets_arm? ( fdt )
+ qemu_softmmu_targets_microblaze? ( fdt )
+ qemu_softmmu_targets_ppc? ( fdt )
+ qemu_softmmu_targets_ppc64? ( fdt )
+ sdl2? ( sdl )
+ static? ( static-softmmu static-user )
+ static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 )
+ virtfs? ( xattr )
+ vte? ( gtk )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected). This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ xattr? ( sys-apps/attr[static-libs(+)] )"
+SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ accessibility? ( app-accessibility/brltty[static-libs(+)] )
+ aio? ( dev-libs/libaio[static-libs(+)] )
+ alsa? ( >=media-libs/alsa-lib-1.0.13 )
+ bluetooth? ( net-wireless/bluez )
+ caps? ( sys-libs/libcap-ng[static-libs(+)] )
+ curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+ fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
+ glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+ gtk? (
+ gtk2? (
+ x11-libs/gtk+:2
+ vte? ( x11-libs/vte:0 )
+ )
+ !gtk2? (
+ x11-libs/gtk+:3
+ vte? ( x11-libs/vte:2.90 )
+ )
+ )
+ infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
+ iscsi? ( net-libs/libiscsi )
+ jpeg? ( virtual/jpeg:=[static-libs(+)] )
+ lzo? ( dev-libs/lzo:2[static-libs(+)] )
+ ncurses? ( sys-libs/ncurses:0=[static-libs(+)] )
+ nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+ numa? ( sys-process/numactl[static-libs(+)] )
+ opengl? (
+ virtual/opengl
+ media-libs/libepoxy[static-libs(+)]
+ media-libs/mesa[static-libs(+)]
+ media-libs/mesa[egl,gles2]
+ )
+ png? ( media-libs/libpng:0=[static-libs(+)] )
+ pulseaudio? ( media-sound/pulseaudio )
+ rbd? ( sys-cluster/ceph[static-libs(+)] )
+ sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+ sdl? (
+ !sdl2? (
+ media-libs/libsdl[X]
+ >=media-libs/libsdl-1.2.11[static-libs(+)]
+ )
+ sdl2? (
+ media-libs/libsdl2[X]
+ media-libs/libsdl2[static-libs(+)]
+ )
+ )
+ seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+ smartcard? ( dev-libs/nss !app-emulation/libcacard )
+ snappy? ( app-arch/snappy[static-libs(+)] )
+ spice? (
+ >=app-emulation/spice-protocol-0.12.3
+ >=app-emulation/spice-0.12.0[static-libs(+)]
+ )
+ ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+ tls? ( net-libs/gnutls[static-libs(+)] )
+ usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+ usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+ uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+ vde? ( net-misc/vde[static-libs(+)] )
+ virtfs? ( sys-libs/libcap )
+ xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
+X86_FIRMWARE_DEPEND="
+ >=sys-firmware/ipxe-1.0.0_p20130624
+ pin-upstream-blobs? (
+ ~sys-firmware/seabios-1.8.2
+ ~sys-firmware/sgabios-0.1_pre8
+ ~sys-firmware/vgabios-0.7a
+ )
+ !pin-upstream-blobs? (
+ sys-firmware/seabios
+ sys-firmware/sgabios
+ sys-firmware/vgabios
+ )"
+CDEPEND="
+ !static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
+ !static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
+ qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+ qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+ python? ( ${PYTHON_DEPS} )
+ systemtap? ( dev-util/systemtap )
+ xen? ( app-emulation/xen-tools )"
+DEPEND="${CDEPEND}
+ dev-lang/perl
+ =dev-lang/python-2*
+ sys-apps/texinfo
+ virtual/pkgconfig
+ kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+ gtk? ( nls? ( sys-devel/gettext ) )
+ static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
+ static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
+ test? (
+ dev-libs/glib[utils]
+ sys-devel/bc
+ )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-qemu )
+"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+ usr/share/qemu/openbios-ppc
+ usr/share/qemu/openbios-sparc64
+ usr/share/qemu/openbios-sparc32
+ usr/share/qemu/palcode-clipper
+ usr/share/qemu/s390-ccw.img
+ usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+ usr/bin/qemu-x86_64
+ usr/bin/qemu-alpha
+ usr/bin/qemu-arm
+ usr/bin/qemu-cris
+ usr/bin/qemu-m68k
+ usr/bin/qemu-microblaze
+ usr/bin/qemu-microblazeel
+ usr/bin/qemu-mips
+ usr/bin/qemu-mipsel
+ usr/bin/qemu-or32
+ usr/bin/qemu-ppc
+ usr/bin/qemu-ppc64
+ usr/bin/qemu-ppc64abi32
+ usr/bin/qemu-sh4
+ usr/bin/qemu-sh4eb
+ usr/bin/qemu-sparc
+ usr/bin/qemu-sparc64
+ usr/bin/qemu-armeb
+ usr/bin/qemu-sparc32plus
+ usr/bin/qemu-s390x
+ usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
+you have the kernel module loaded before running kvm. The easiest way to
+ensure that the kernel module is loaded is to load it on boot.\n
+For AMD CPUs the module is called 'kvm-amd'\n
+For Intel CPUs the module is called 'kvm-intel'\n
+Please review /etc/conf.d/modules for how to load these\n\n
+Make sure your user is in the 'kvm' group\n
+Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+
+qemu_support_kvm() {
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+ use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+ use qemu_softmmu_targets_s390x; then
+ return 0
+ fi
+
+ return 1
+}
+
+pkg_pretend() {
+ if use kernel_linux && kernel_is lt 2 6 25; then
+ eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+ elif use kernel_linux; then
+ if ! linux_config_exists; then
+ eerror "Unable to check your kernel for KVM support"
+ else
+ CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+ ERROR_KVM="You must enable KVM in your kernel to continue"
+ ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+ ERROR_KVM_AMD+=" your kernel configuration."
+ ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+ ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+ ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+ ERROR_TUN+=" into your kernel or loaded as a module to use the"
+ ERROR_TUN+=" virtual network device if using -net tap."
+ ERROR_BRIDGE="You will also need support for 802.1d"
+ ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+ use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+ ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+ ERROR_VHOST_NET+=" support"
+
+ if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+ CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+ fi
+
+ use python && CONFIG_CHECK+=" ~DEBUG_FS"
+ ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+ # Now do the actual checks setup above
+ check_extra_config
+ fi
+ fi
+
+ if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+ eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+ eerror "instances are still pointing to it. Please update your"
+ eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+ eerror "and the right system binary (e.g. qemu-system-x86_64)."
+ die "update your virt configs to not use qemu-kvm"
+ fi
+}
+
+pkg_setup() {
+ enewgroup kvm 78
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+ local var=$1 mak=$2
+ local detected sorted
+
+ pushd "${S}"/default-configs >/dev/null || die
+
+ detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u))
+ sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "${var}: ${sorted}"
+ eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+ die "sync ${var} to the list of targets"
+ fi
+
+ popd >/dev/null
+}
+
+src_prepare() {
+ check_targets IUSE_SOFTMMU_TARGETS softmmu
+ check_targets IUSE_USER_TARGETS linux-user
+
+ # Alter target makefiles to accept CFLAGS set via flag-o
+ sed -i -r \
+ -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+ Makefile Makefile.target || die
+
+ # Cheap hack to disable gettext .mo generation.
+ use nls || rm -f po/*.po
+
+ epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
+ epatch "${FILESDIR}"/${PN}-2.4.0-block-mirror-crash.patch #558396
+ epatch "${FILESDIR}"/${PN}-2.4.0-CVE-2015-7295-{1,2,3}.patch #560760
+ epatch "${FILESDIR}"/${PN}-2.4.0-CVE-2015-6855.patch #560422
+ [[ -n ${BACKPORTS} ]] && \
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+ epatch
+
+ # Fix ld and objcopy being called directly
+ tc-export AR LD OBJCOPY
+
+ # Verbose builds
+ MAKEOPTS+=" V=1"
+
+ epatch_user
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ local buildtype=$1
+ local builddir="${S}/${buildtype}-build"
+ local static_flag="static-${buildtype}"
+
+ mkdir "${builddir}"
+
+ local conf_opts=(
+ --prefix=/usr
+ --sysconfdir=/etc
+ --libdir=/usr/$(get_libdir)
+ --docdir=/usr/share/doc/${PF}/html
+ --disable-bsd-user
+ --disable-guest-agent
+ --disable-strip
+ --disable-werror
+ --python="${PYTHON}"
+ --cc="$(tc-getCC)"
+ --cxx="$(tc-getCXX)"
+ --host-cc="$(tc-getBUILD_CC)"
+ $(use_enable debug debug-info)
+ $(use_enable debug debug-tcg)
+ --enable-docs
+ $(use_enable tci tcg-interpreter)
+ $(use_enable xattr attr)
+ )
+
+ # Disable options not used by user targets as the default configure
+ # options will autoprobe and try to link in a bunch of unused junk.
+ conf_softmmu() {
+ if [[ ${buildtype} == "user" ]] ; then
+ echo "--disable-${2:-$1}"
+ else
+ use_enable "$@"
+ fi
+ }
+ conf_opts+=(
+ $(conf_softmmu accessibility brlapi)
+ $(conf_softmmu aio linux-aio)
+ $(conf_softmmu bluetooth bluez)
+ $(conf_softmmu caps cap-ng)
+ $(conf_softmmu curl)
+ $(conf_softmmu fdt)
+ $(conf_softmmu glusterfs)
+ $(conf_softmmu gtk)
+ $(conf_softmmu infiniband rdma)
+ $(conf_softmmu iscsi libiscsi)
+ $(conf_softmmu jpeg vnc-jpeg)
+ $(conf_softmmu kernel_linux kvm)
+ $(conf_softmmu lzo)
+ $(conf_softmmu ncurses curses)
+ $(conf_softmmu nfs libnfs)
+ $(conf_softmmu numa)
+ $(conf_softmmu opengl)
+ $(conf_softmmu png vnc-png)
+ $(conf_softmmu rbd)
+ $(conf_softmmu sasl vnc-sasl)
+ $(conf_softmmu sdl)
+ $(conf_softmmu seccomp)
+ $(conf_softmmu smartcard smartcard-nss)
+ $(conf_softmmu snappy)
+ $(conf_softmmu spice)
+ $(conf_softmmu ssh libssh2)
+ $(conf_softmmu tls vnc-tls)
+ $(conf_softmmu usb libusb)
+ $(conf_softmmu usbredir usb-redir)
+ $(conf_softmmu uuid)
+ $(conf_softmmu vde)
+ $(conf_softmmu vhost-net)
+ $(conf_softmmu virtfs)
+ $(conf_softmmu vnc)
+ $(conf_softmmu vte)
+ $(conf_softmmu xen)
+ $(conf_softmmu xen xen-pci-passthrough)
+ $(conf_softmmu xfs xfsctl)
+ )
+
+ case ${buildtype} in
+ user)
+ conf_opts+=(
+ --enable-linux-user
+ --disable-system
+ --disable-blobs
+ --disable-tools
+ )
+ ;;
+ softmmu)
+ # audio options
+ local audio_opts="oss"
+ use alsa && audio_opts="alsa,${audio_opts}"
+ use sdl && audio_opts="sdl,${audio_opts}"
+ use pulseaudio && audio_opts="pa,${audio_opts}"
+
+ conf_opts+=(
+ --disable-linux-user
+ --enable-system
+ --with-system-pixman
+ --audio-drv-list="${audio_opts}"
+ )
+ use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
+ use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
+ ;;
+ tools)
+ conf_opts+=(
+ --disable-linux-user
+ --disable-system
+ --disable-blobs
+ )
+ static_flag="static"
+ ;;
+ esac
+
+ local targets="${buildtype}_targets"
+ [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+ # Add support for SystemTAP
+ use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+ # We always want to attempt to build with PIE support as it results
+ # in a more secure binary. But it doesn't work with static or if
+ # the current GCC doesn't have PIE support.
+ if use ${static_flag}; then
+ conf_opts+=( --static --disable-pie )
+ else
+ gcc-specs-pie && conf_opts+=( --enable-pie )
+ fi
+
+ echo "../configure ${conf_opts[*]}"
+ cd "${builddir}"
+ ../configure "${conf_opts[@]}" || die "configure failed"
+
+ # FreeBSD's kernel does not support QEMU assigning/grabbing
+ # host USB devices yet
+ use kernel_FreeBSD && \
+ sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+ local target
+
+ python_setup
+
+ softmmu_targets= softmmu_bins=()
+ user_targets= user_bins=()
+
+ for target in ${IUSE_SOFTMMU_TARGETS} ; do
+ if use "qemu_softmmu_targets_${target}"; then
+ softmmu_targets+=",${target}-softmmu"
+ softmmu_bins+=( "qemu-system-${target}" )
+ fi
+ done
+
+ for target in ${IUSE_USER_TARGETS} ; do
+ if use "qemu_user_targets_${target}"; then
+ user_targets+=",${target}-linux-user"
+ user_bins+=( "qemu-${target}" )
+ fi
+ done
+
+ softmmu_targets=${softmmu_targets#,}
+ user_targets=${user_targets#,}
+
+ [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+ [[ -n ${user_targets} ]] && qemu_src_configure "user"
+ [[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools"
+}
+
+src_compile() {
+ if [[ -n ${user_targets} ]]; then
+ cd "${S}/user-build"
+ default
+ fi
+
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ default
+ fi
+
+ if [[ -z ${softmmu_targets}${user_targets} ]]; then
+ cd "${S}/tools-build"
+ default
+ fi
+}
+
+src_test() {
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ pax-mark m */qemu-system-* #515550
+ emake -j1 check
+ emake -j1 check-report.html
+ fi
+}
+
+qemu_python_install() {
+ python_domodule "${S}/scripts/qmp/qmp.py"
+
+ python_doscript "${S}/scripts/kvm/kvm_stat"
+ python_doscript "${S}/scripts/kvm/vmxcap"
+ python_doscript "${S}/scripts/qmp/qmp-shell"
+ python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+src_install() {
+ if [[ -n ${user_targets} ]]; then
+ cd "${S}/user-build"
+ emake DESTDIR="${ED}" install
+
+ # Install binfmt handler init script for user targets
+ newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
+ fi
+
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ emake DESTDIR="${ED}" install
+
+ # This might not exist if the test failed. #512010
+ [[ -e check-report.html ]] && dohtml check-report.html
+
+ if use kernel_linux; then
+ udev_dorules "${FILESDIR}"/65-kvm.rules
+ fi
+
+ if use python; then
+ python_foreach_impl qemu_python_install
+ fi
+ fi
+
+ if [[ -z ${softmmu_targets}${user_targets} ]]; then
+ cd "${S}/tools-build"
+ emake DESTDIR="${ED}" install
+ fi
+
+ # Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+ pushd "${ED}"/usr/bin >/dev/null
+ pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+ popd >/dev/null
+
+ # Install config file example for qemu-bridge-helper
+ insinto "/etc/qemu"
+ doins "${FILESDIR}/bridge.conf"
+
+ # Remove the docdir placed qmp-commands.txt
+ mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
+
+ cd "${S}"
+ dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+ newdoc pc-bios/README README.pc-bios
+ dodoc docs/qmp/*.txt
+
+ if [[ -n ${softmmu_targets} ]]; then
+ # Remove SeaBIOS since we're using the SeaBIOS packaged one
+ rm "${ED}/usr/share/qemu/bios.bin"
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+ fi
+
+ # Remove vgabios since we're using the vgabios packaged one
+ rm "${ED}/usr/share/qemu/vgabios.bin"
+ rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+ rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+ rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+ rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+ dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+ dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+ dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+ dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+ fi
+
+ # Remove sgabios since we're using the sgabios packaged one
+ rm "${ED}/usr/share/qemu/sgabios.bin"
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+ fi
+
+ # Remove iPXE since we're using the iPXE packaged one
+ rm "${ED}"/usr/share/qemu/pxe-*.rom
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+ dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+ dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+ dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+ dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+ dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+ fi
+ fi
+
+ qemu_support_kvm && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ if qemu_support_kvm; then
+ readme.gentoo_print_elog
+ fi
+
+ if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+ udev_reload
+ fi
+
+ fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+ if use virtfs && [ -n "${softmmu_targets}" ]; then
+ local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
+ fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+ fi
+}
+
+pkg_info() {
+ echo "Using:"
+ echo " $(best_version app-emulation/spice-protocol)"
+ echo " $(best_version sys-firmware/ipxe)"
+ echo " $(best_version sys-firmware/seabios)"
+ if has_version 'sys-firmware/seabios[binary]'; then
+ echo " USE=binary"
+ else
+ echo " USE=''"
+ fi
+ echo " $(best_version sys-firmware/vgabios)"
+}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index e7fac29..c002fb8 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,4 +1,4 @@
DIST VBoxGuestAdditions_4.3.28.iso 58241024 SHA256 9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733 SHA512 78055f389dc1a7bd62577f1fa670b8f8899ab3a58a87953d30fcaea1cd0c77f8662e15fea932c434309747971a2a61b61854b6f087654d9d2fb2de07fb6f1b5c WHIRLPOOL 64275e44c01f4f260899a7c16aaeb494ebe81277e7cbdec87e487736833cc239338f3c32c00759244b3be55c5754788593b81d06dab7d9ab26991369fa9d65fd
DIST VBoxGuestAdditions_4.3.30.iso 58257408 SHA256 432c2da1d9a939de7ba1d2cfb10595031374af9ce66417a43979d1794beedbb1 SHA512 a782e47381b708aee8a8f2c1d6608d51d09a2fb0d55ea3b543530a31cbf489043f05d4c334a9e269b922318339cb78a897603b8bce2749fe02088a6e9a4fd177 WHIRLPOOL c70b9e630820f7be38e38fd7ce20073c3766758950f60367a3a6e666644f10baadbfb5a9dc67c7c8364770e7ae28d27d632c53699fd6d1102bf672672419f1f2
-DIST VBoxGuestAdditions_5.0.2.iso 58716160 SHA256 974063ca9c7bde796dd77ba55d35583dc5d8bc27d53a6bfd81ae206978b133e2 SHA512 598709d64d78687e6905f3a17bd1442aae588a3024fbb6732a3fcbc43e9299e23a5d377bb4f810f4747b62db5c7cf6bd9f21270d5e76fd365743f845256ae736 WHIRLPOOL 86d3f40b67e6bbd6e1ff503e44558fc213f8c42d8496fcbd148ff82f418012ea58854470090ddaa9754a35e53b2dd335d4a116bd8502c1e00f4b4b1b729b3998
DIST VBoxGuestAdditions_5.0.4.iso 58793984 SHA256 de4abc28832d4e96b826efef3e7e69e69d6b941babfdc6317185f1fd6e22ffcf SHA512 c35561b5e332a7cf815c672111fe937ebe9ed5297853b3577fb347437e3b11a9ef3f19eb00318f277560644f49c858e1e12657b5d4c3a02cd91c8d2339e08545 WHIRLPOOL f3520bbcb939d1503c00954a59e0c31b502303450cc0c6f8c067e67501bf4015938d0fccd453e29650dc9b587ab9c4b3a190321d42803fac73d3435da91d38f2
+DIST VBoxGuestAdditions_5.0.6.iso 58966016 SHA256 59ed9911c2bb22357345448c3df6104938b45fa780311d20c330e39c6e309991 SHA512 8d9252b4961da760e71a94acd0292f23373b6ef2f9cfee48053efffbc9ec8f396a71f87e48eedf36f73c884774f1898567e2eeb454f4d343f85973d3b548b85f WHIRLPOOL 73164707e2e5aed992080ea80479d885383be47918e11ba387fb8f9ba7d1db585e3fcaf14ec904cc02af7b05cc00cf0a540ef9ae14adeb877a4f5f7d196e8aa8
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.2.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.6.ebuild
similarity index 100%
rename from app-emulation/virtualbox-additions/virtualbox-additions-5.0.2.ebuild
rename to app-emulation/virtualbox-additions/virtualbox-additions-5.0.6.ebuild
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 733523c..dd3a7c9 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,16 +1,16 @@
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1 SHA512 57ad44a99a7abcad195e6ceccc1fe7b494979da65601a52e0be8336bb819812d5cef48a8bc0fe9f74f3a05238e6fd29562ac678d4ef7e0c78587fe81c287a65e WHIRLPOOL fb08189c53841664119bffb4de6a76d6f72fb035f887ed5e948f38faa5be2891e35de0806da02d299e818370285bcddba06eb84bea7db4d3cfa09d92f8042db7
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.30-101610.tar.gz 15983777 SHA256 770d49247976f2a0d14a66196dddf864c6b9d185671e2a29cab459fc28f105db SHA512 f5d8275fe3e1ea60e8d15af3b0c7382faab172df39369c8904ff734a5105daed87a48215880b2e286c6735ead341c237d2260e6ee923f513818f85cf0b452def WHIRLPOOL 3b1e29a44413ebc65dc250b2366b1fe75d6ea48fd94b722c8ec9eb7e97e6981470e9201c9840d566953c9c9bdd4a7893f9d525b3fac7150ca24391f696bba9c4
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.2-102096.tar.gz 16868753 SHA256 0c49864ea7ab2be8b95c4495e5825b0e48b8611e1761c1b22b86a3f4bf9201bf SHA512 d072e3460366cf6ae40e4b4e9944463db43b6a0a3ed3c872495c6454fb177181ab376917b59550edb000737dc49347025977754b2e20bbe43cdb5b389dff7165 WHIRLPOOL ead3d7f55245a18f418f58d31005912bef3b4b9a4bed6ef9f4ef42e04d98514be50f2bf18e5f161236dbbdbd2833873cca2ed552214520749595adec57f74c0c
DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.4-102546.tar.gz 16874455 SHA256 e4618e7847eff7c31426f4639bcd83c37bd817147081d3218f21c8e7b6bc7cfa SHA512 1b645422966a2e90b2d2af9187e756d90cb5307db70718cb6e6679426da2d43ec5e398e6ab082195b7a4ad302bb626ad2101c3237759481177db2104bf8b6a23 WHIRLPOOL 6cdb3a63ea0a8d2ce3952d3613fcea3af1e104b1e09d8167bf2c78cb52e3a1c49db669cbeebdc54c9140c36b77c20970b666aa0f6f3d9af43b2b543251288f46
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.6-103037.tar.gz 16874845 SHA256 4eed4f3d253bffe4ce61ee9431d79cbe1f897b3583efc2ff3746f453450787b5 SHA512 fb3fb06e88cc5bded6246375727df2deebb6c0dbb889b8516e0bab0af0c05ef3e1baa8c1eb94d34af2e63600bc36814eab8d8f25abb0fd1ad982ea242f456468 WHIRLPOOL 51ddd27d61e214cb41c5d8c50b0d5d01f885f4ae9facabd3cece500fd41b2a72d42b6ad766aa52e9c315c6fca2dca0f07a1a6b1fa0dc2b87f2cd3c4bf1e54aaa
DIST VirtualBox-4.3.28-100309-Linux_amd64.run 85677523 SHA256 8c862533f876dc32fbfae993597b1123e2feac81a302c60e73b7ee891e17a77f SHA512 75dc2cd257b187b0a497b87c2f1e576a57ceece290327a98804c903810522444b0a64a704bc51a25945dbaa5c0caf30898ba258829577e2f17f7c736fcf59bb0 WHIRLPOOL c8d5d885807ad633bf1c4c6f98cac8dddf4002dc2e21ed2d2fb2f0a859f447b7ce06d1c49c4daff4147b25ca4992da14b6b75b39f47075c861732e6ef00091d1
DIST VirtualBox-4.3.28-100309-Linux_x86.run 85083598 SHA256 aeb224d7136314865db8175db665408a3dc08f50ed68fbd4bf1568b32b7ea2f6 SHA512 110e20a45657c7677fcab0158d31052c909893b8f618adad2a2c95ad119d47d7c35d4aedf3692dd650fda62ba0747acf202364c14034e5c10d17cd45a9918707 WHIRLPOOL 35c97248985d11c77194ac03448357331e08b7ef64a77ba416564b6051eaf74ffb5a0acdf835bfcf71657c5fdd58066947b0ba1c42e91d34dbf026434f662f67
DIST VirtualBox-4.3.30-101610-Linux_amd64.run 81069522 SHA256 5745bc9b1edd1d7d28f81ba7fed7fff3ed0bbe7084c39a77bd305018ad0a420d SHA512 928dc5b6b9031892f9391ded3aa10b090a9312c16e5b8bd4d0457d3af3d5f5495323e48a5cc781411c14318aab5d3856de5369bbf1ac3b75068797ef4c5445a7 WHIRLPOOL bf5175a228ddef4319f6972dadefa035dc0902b290691ba14478f10fe89947fbc3f9545b65d4c09f397c06309fb01a7fab6187b5f9f9d2cb39b9f808b0bb5bb5
DIST VirtualBox-4.3.30-101610-Linux_x86.run 80537038 SHA256 c8e42d247ecfa1ff3e3da6c7988a58e2d64fbb54598e9b08211308226d61c42a SHA512 629907432887606b1e31328a751c5ec3c764e90b3eae4a984c5d9e6b5f77b626e8eafa235bb55a0e1725fe95324dcb3cc1c8e2f441d716a8408d1e1ddf0e5dde WHIRLPOOL c10976693284b7b1c178aa036eb5d28ce76366362ac00eb0f686e8f99ddb93df508654d8acab0912714d3f9215d8f217a91999c25877fb2b973171b9be8b7d09
-DIST VirtualBox-5.0.2-102096-Linux_amd64.run 84540870 SHA256 2d976eb4929ee8fe4b3ec9a1d5f7a070ffb3053d8a3e15d223a4689a7dd93adb SHA512 ab03a2f456376fbcb6dc501a1be4a2f949f5cc56f883749104be3bf004ce8c8f3920c8bdd573c4093a5cc84a8dfaf0793cc55276e8d88ec135751ac3f4051651 WHIRLPOOL cc98cd331d60de2ff57867630c01330fe85c474b96b1898e1f5c5d1485d88444a46ab9df17a6c5a61a3f174d59b4061ae80654de7c3ed0061c731ef5558a4b1a
-DIST VirtualBox-5.0.2-102096-Linux_x86.run 83639745 SHA256 cc71706026fd9d3d57527e7bf7861da0fb5317ed28952d65c81d16baca24f2e9 SHA512 01cbcf6aa8a1caa3e4a2f2fe65680827f28adb6a229bbf924673850901ec9c7331996c4f158e66fe427dc318f2bbfe12041a436ec861c56561378781d985212f WHIRLPOOL 57b77de0a100e3b75ae0f5a37edffe7f1e73a63bef1fb27f85f284ef54fa35f7ee5a77bef114f75ef3dfa07fbbaed111eaa1fc56f7dceeb90f5494aad36b0f89
DIST VirtualBox-5.0.4-102546-Linux_amd64.run 84254161 SHA256 d9c4a166aa350ca26a9063163b18b8e37eee9b7a4cb592f55c5e4aaf406daa3b SHA512 3ad21812a96f94e613985ae2fbe75ac9bb982d46d7b01bf0da7d2e7512f120666720d1145d4725d36d7bb7d611abb1d4cbe045d025742a4de928f21d308eaa98 WHIRLPOOL 71279d6133d1ea2c63349d01dea12a225d1eb89205d657708e8f9e34fb6affeadd223203d6e551c03766e619b3b83b022009f16dc5eb4bd5016ad7eec56252c5
DIST VirtualBox-5.0.4-102546-Linux_x86.run 83373516 SHA256 cbb5f4e464645fd98c21b15013a97ab2f333496f374ddba03e9df469f7382fe4 SHA512 65ac5ea3fe2a1dbb957bcd02cd5e23130659e1eae599218d85cf8b5d2eea3afa08dd6b69d4a58e399f92f149503a3dcadb9b7e2b10fa1c70c3921baed5370fe8 WHIRLPOOL 14f8d8fd8f8c113ce930254bd2c677a8cdbf8eab3afad8a12902083d01c554336a804e8ba8c47905d4a0be3c9acd2cfe4307343f8d3a8c814611028c12b6cb2f
+DIST VirtualBox-5.0.6-103037-Linux_amd64.run 84407761 SHA256 938b7b247e3260cc148f17a34f47c3363d377fd9e47add1635570908bedaf4a4 SHA512 87b4e1eb5896a87fc5004c09281d7f963dc3f07cf7405be48082a6f24225f3052577ec9c21f157cafe6f0188371142643723714d7f586a814f9e549cace480b1 WHIRLPOOL ec066521a2f73e02578e0528fabbab691bd1d196cf7bd764cdf3fa6f4f0429683320a45a1e7fc23f9f6a6ddfb8024367945f2ae75d2c7c20e609788b8e5a5a2b
+DIST VirtualBox-5.0.6-103037-Linux_x86.run 83527117 SHA256 557992579e2abca01e6a3b22d779174192fa3f7b037230fd1d47bfd70d52cbc5 SHA512 8611733e6ddd5903b29221172f530887c659f96b1a317c0dcff40a2184f299c26b53e77fd61e5bb0e6475082453c7d30191f6e195942ed31f43fa6b72353edee WHIRLPOOL 4bba29189ccaecfc88347a1015abb3dd888222d65b2a6e45a453871af7c7d5fe86702e1cd7ec655793d79139828cfb35ee4424a16a940f41215708f6ed0907ed
DIST VirtualBoxSDK-4.3.28-100309.zip 11698378 SHA256 fe0cc316cecb3dfe9bbb925e6c023620d4cfd8e137b2a9b9f40f22f527af16fa SHA512 6af7d2107cff080281a356cbf522961b2e9d1917e861e410b169ce5ca3cefe05cc87e4e01f78ae171f8716f7006c031f14fc01d8d282a872a4f619638049b11a WHIRLPOOL 23a77dbc410a28b2799264da88d79b2c4335c07da67dd8bf4be26cac271e3ed38a9bf4fb2966ec0a3c06fb869bb252f5fa6a34a9a9c62cbb9a2fb0ad76442f66
DIST VirtualBoxSDK-4.3.30-101610.zip 11436700 SHA256 6d8f1a006d56dfa1bbec10a35369c80c75845fdc6127c4d806b5c69cec03ab7e SHA512 2b2b3220d9ce908813699f8fc4cee80de5b29cb134ec968c2ccbb78c40b8d0d8aeb666996627f0f13cd036ef0376582c48f6c12b45acb7593d8b0eefd6eba960 WHIRLPOOL fe82cacecfedc05b6d92feac5285bc41100a9538f6cb37027c85ee08e051580243e2635af9d873c67970ecab5e8ee8eee0cee89e50be59895b44862264aa3fdf
-DIST VirtualBoxSDK-5.0.2-102096.zip 9636596 SHA256 6df7b53e877d8899ec98fa5e60eeca293a8e03f343e03b82936fdee35b3c0ae1 SHA512 fb3037ea0c767bb87bf9f945916f164a2b8901b4b9e24ff72eaf0f10f7fcb29d32f719d581ec0fbcd897cf2decaaf31789d64ff63a209182b5cbd71c4752b685 WHIRLPOOL 2726216d786ed3b0fe874b1d403fd691ebb60916b83579817a4dd9a1c2e47b6f0379ac1a9bd8d9ba2492b0ffe9ec4113210be8856d27ee4b7e0d027ceb8f81f3
DIST VirtualBoxSDK-5.0.4-102546.zip 9634312 SHA256 f09c428a56a10b204bba8f1cb27c3c8bd6539efd9f88e375a5894fae747d9c81 SHA512 bb06c6cb10786029b542e855bcf87f91083b3de080a367ac2a16c5c1416b10352f7bc76b416349038545499db7c17c7904747420b221d0a21ae6615c79b2cbb9 WHIRLPOOL 9afe856f0d954ea7f1faeca4748de264084897e1e85f18eedfbd585a43d115a04b22c8e8d5e998322f1936c169c83a9761f908adb839ebd070da56a390ca0327
+DIST VirtualBoxSDK-5.0.6-103037.zip 9634988 SHA256 e4df6402b1ddb067f54923d211bd32bc2d6117b91295707be707bb2c8e7e408e SHA512 aee6e59a22c2ec7c99fe22054d7bdd0a5f2ed627c76b530c17fcdbd430343b20ebbbda11bce3c905ff4641d050b75f989f84ed49507ad4dca4c47364b8eda0f7 WHIRLPOOL c4e5f8aac4c0d885f78dfea562375a16157553148480bf441378f15569287fbd28f5a44b2d18ad6e393a1ede9cb907ad750c003ba61346d88279484ad944688a
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.2.102096.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.6.103037.ebuild
similarity index 100%
rename from app-emulation/virtualbox-bin/virtualbox-bin-5.0.2.102096.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-5.0.6.103037.ebuild
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 5f0bb4a..59c54e2 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,4 +1,4 @@
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1 SHA512 57ad44a99a7abcad195e6ceccc1fe7b494979da65601a52e0be8336bb819812d5cef48a8bc0fe9f74f3a05238e6fd29562ac678d4ef7e0c78587fe81c287a65e WHIRLPOOL fb08189c53841664119bffb4de6a76d6f72fb035f887ed5e948f38faa5be2891e35de0806da02d299e818370285bcddba06eb84bea7db4d3cfa09d92f8042db7
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.30-101610.tar.gz 15983777 SHA256 770d49247976f2a0d14a66196dddf864c6b9d185671e2a29cab459fc28f105db SHA512 f5d8275fe3e1ea60e8d15af3b0c7382faab172df39369c8904ff734a5105daed87a48215880b2e286c6735ead341c237d2260e6ee923f513818f85cf0b452def WHIRLPOOL 3b1e29a44413ebc65dc250b2366b1fe75d6ea48fd94b722c8ec9eb7e97e6981470e9201c9840d566953c9c9bdd4a7893f9d525b3fac7150ca24391f696bba9c4
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.2-102096.tar.gz 16868753 SHA256 0c49864ea7ab2be8b95c4495e5825b0e48b8611e1761c1b22b86a3f4bf9201bf SHA512 d072e3460366cf6ae40e4b4e9944463db43b6a0a3ed3c872495c6454fb177181ab376917b59550edb000737dc49347025977754b2e20bbe43cdb5b389dff7165 WHIRLPOOL ead3d7f55245a18f418f58d31005912bef3b4b9a4bed6ef9f4ef42e04d98514be50f2bf18e5f161236dbbdbd2833873cca2ed552214520749595adec57f74c0c
DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.4-102546.tar.gz 16874455 SHA256 e4618e7847eff7c31426f4639bcd83c37bd817147081d3218f21c8e7b6bc7cfa SHA512 1b645422966a2e90b2d2af9187e756d90cb5307db70718cb6e6679426da2d43ec5e398e6ab082195b7a4ad302bb626ad2101c3237759481177db2104bf8b6a23 WHIRLPOOL 6cdb3a63ea0a8d2ce3952d3613fcea3af1e104b1e09d8167bf2c78cb52e3a1c49db669cbeebdc54c9140c36b77c20970b666aa0f6f3d9af43b2b543251288f46
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.6-103037.tar.gz 16874845 SHA256 4eed4f3d253bffe4ce61ee9431d79cbe1f897b3583efc2ff3746f453450787b5 SHA512 fb3fb06e88cc5bded6246375727df2deebb6c0dbb889b8516e0bab0af0c05ef3e1baa8c1eb94d34af2e63600bc36814eab8d8f25abb0fd1ad982ea242f456468 WHIRLPOOL 51ddd27d61e214cb41c5d8c50b0d5d01f885f4ae9facabd3cece500fd41b2a72d42b6ad766aa52e9c315c6fca2dca0f07a1a6b1fa0dc2b87f2cd3c4bf1e54aaa
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.2.102096.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.6.103037.ebuild
similarity index 100%
rename from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.2.102096.ebuild
rename to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.6.103037.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index a5b92fd..8d76d9a 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,4 +1,4 @@
DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
DIST VirtualBox-4.3.30.tar.bz2 97428942 SHA256 ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 SHA512 d0817335cf4bd196da93b91ede6bc9e48ca0d471166ab2790dbf508a4574e4ace54a86053932abf3b4e804c583e80a713d2ab2e556dc15bee6ef3a62f88b95fc WHIRLPOOL 47cbd702e83cc737e04b5862cc6c52e32be244dc1dc0145f582f57b2f19bb898f0f4b200576a28f10a3290691f1ffd43c256e8c8eb5545a9723be8eefca88a38
-DIST VirtualBox-5.0.2.tar.bz2 109872963 SHA256 f290c220d62af2a7fdabb1934c1a0b924b68968a236bb2509bcb507d2c19485e SHA512 fc89cfe475aa02182b04e19a62d52d02b4ff5d2afb082ed3cf11b36288b19f7be15b0e76ae2fd8b9b2c3d5456b316453f112c3b711d242915688adf24623e0c1 WHIRLPOOL 23de881fa6233ce97a1ceeca900657019466df08dc0890355b9d415cd8f4fe8d6877f06218b2455a75be69cfa13d3b2a35855fb641832b300788273af1d26b32
DIST VirtualBox-5.0.4.tar.bz2 109865904 SHA256 b19e23fc8e71f38aef7c059f44e59fcbff3bb2ce85baa8de81f1629b85f68fcf SHA512 4349792390f0a236faef0bdb06806dde604373dcccf83351f805508a2fdcae9f729a5e793ac53c4d134c50e48c0624b340328a7bb21ddcf15ed69a08365eb2b5 WHIRLPOOL cacf3193231a8500a3b475ede2d0f0458a656d87d3d97b78ccb743c1606f7f6ec58f6d56cb1bc0a40e9eb279d4cbeeab3318d1e71be3dead07fe4ccff6bdfbcf
+DIST VirtualBox-5.0.6.tar.bz2 109863328 SHA256 22d63f28c43165a31dcccdec1c65f376f46d7e09555c47611cfaafb5576a5843 SHA512 3e51c9476c29a3ba79adda2d3b0c0b516459f58c8aa5e7b795be1aa2468b8e61241bbe5615787d7302a5f95230a446377bd8698f801c2114b26a471ae8bbbc11 WHIRLPOOL 11603c9aa14acac87032b5d8fc1f8d0a567632ca591230e0cc5c1d9a1ae9b39ebccb1a3bb85e1845abc01b04da550a2ef889e1bf91da0bb82df1fafa384f88b4
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.6.ebuild
similarity index 100%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.2.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.6.ebuild
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 2906cd4..a7e25b6 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,4 +1,4 @@
DIST vbox-kernel-module-src-4.3.28.tar.xz 539876 SHA256 fb052997ec4992b0ee102475051b5d7bd8485e17405c6b3dcc94e1fa4a53b761 SHA512 637149f8595cb023e75116f83237bb4cef1b05627f58d475fa952ac86a85aa3cbab5f0cec723d730979f831999c920f35248e5f8db8f6987fb4c15c4a29bd517 WHIRLPOOL ab1ed07ee148a1ef352c0fda3f09865405be4146b987a5dffcb753d7512a00aa88c2ba1f7184b56d694c88320b350c6ececd3bec5636dd1586fc14a6be8a874d
DIST vbox-kernel-module-src-4.3.30.tar.xz 540712 SHA256 28d89c06a4db190ec690980d68552745fb87ee2e23a3fe53edb29edda889f9d8 SHA512 8536d4bd105edf0fc112488232f7c85d8606b28b6cbeb28ee56bc135f693d1059328e75023299a67033bc1d486aea6a81c0fb23d51af500968119aa2f05156dc WHIRLPOOL 17452456aa127ca4ba53b2883f43970980f26094b80feaaa49b4773c386834d59f67afe21649539edc6dabde8725fd49c968002df9f2eb0e1ea8e888a2f8089b
-DIST vbox-kernel-module-src-5.0.2.tar.xz 592648 SHA256 0060ed14de81f86f1acae11e124a81573b19a1abeebf92f1a15ea7aa8a987bdd SHA512 965059d533536f77eacb69bf19e3b348c02a9125dc18fc06cf0e05226f75ab0c34cf634f0754ee309905b31e53adbaf23830c9ecfc689ca2735e7de0a33c29e7 WHIRLPOOL 79c4e6a1dc7073f09a5e711fa05277acf6c407e4f2813ca9523110cdc01c9f229fda3f96c6e07bdbbc45d375079c145b1aee6a53ada7b9d9469561cfac21ca55
DIST vbox-kernel-module-src-5.0.4.tar.xz 592716 SHA256 dad5657c9b1280050d2469a94e3e3d5b5cc8279f9a175abf068f3940ea700889 SHA512 0a71a3e857b8bd8b90a06db6950c6c40950f0f87b14d5e79c14dd82a674de1f171556d849006e49932f06bc794dfe2066e37d31fef352e9128dfaeab11caaadd WHIRLPOOL 78a0f704cce92ed3546710d8cbca263f1bb9784f99291fa29d58e177e1c65800e4a80cba4e59fd2577f00895829a04c8605ff0b849a23f35f797a1565a0ec6d0
+DIST vbox-kernel-module-src-5.0.6.tar.xz 593640 SHA256 57b6ea7e772dbe032d8a024e48ad572c76dc4165ce2fb99cd45317c97466912f SHA512 88f1c61a6e749ba7076a3727baadf8ff7e0c3a70c279c6261757c7b8f0b3debd70a8cca21aea9e8b3a67feb0044c4e29439a075ccca3aaec0c0220f5a9264ac9 WHIRLPOOL c01fc142d650ef402601f457d83aeb3911200f3b7d5fbc4004c1da80832a911be01903f65ea92de592ff7e1f10688f77106a100d5fec8887767c8e8a7eb92a0d
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.6.ebuild
similarity index 100%
rename from app-emulation/virtualbox-modules/virtualbox-modules-5.0.2.ebuild
rename to app-emulation/virtualbox-modules/virtualbox-modules-5.0.6.ebuild
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index dbecf07..b81288b 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,6 +1,6 @@
DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
DIST VirtualBox-4.3.30.tar.bz2 97428942 SHA256 ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 SHA512 d0817335cf4bd196da93b91ede6bc9e48ca0d471166ab2790dbf508a4574e4ace54a86053932abf3b4e804c583e80a713d2ab2e556dc15bee6ef3a62f88b95fc WHIRLPOOL 47cbd702e83cc737e04b5862cc6c52e32be244dc1dc0145f582f57b2f19bb898f0f4b200576a28f10a3290691f1ffd43c256e8c8eb5545a9723be8eefca88a38
-DIST VirtualBox-5.0.2.tar.bz2 109872963 SHA256 f290c220d62af2a7fdabb1934c1a0b924b68968a236bb2509bcb507d2c19485e SHA512 fc89cfe475aa02182b04e19a62d52d02b4ff5d2afb082ed3cf11b36288b19f7be15b0e76ae2fd8b9b2c3d5456b316453f112c3b711d242915688adf24623e0c1 WHIRLPOOL 23de881fa6233ce97a1ceeca900657019466df08dc0890355b9d415cd8f4fe8d6877f06218b2455a75be69cfa13d3b2a35855fb641832b300788273af1d26b32
DIST VirtualBox-5.0.4.tar.bz2 109865904 SHA256 b19e23fc8e71f38aef7c059f44e59fcbff3bb2ce85baa8de81f1629b85f68fcf SHA512 4349792390f0a236faef0bdb06806dde604373dcccf83351f805508a2fdcae9f729a5e793ac53c4d134c50e48c0624b340328a7bb21ddcf15ed69a08365eb2b5 WHIRLPOOL cacf3193231a8500a3b475ede2d0f0458a656d87d3d97b78ccb743c1606f7f6ec58f6d56cb1bc0a40e9eb279d4cbeeab3318d1e71be3dead07fe4ccff6bdfbcf
+DIST VirtualBox-5.0.6.tar.bz2 109863328 SHA256 22d63f28c43165a31dcccdec1c65f376f46d7e09555c47611cfaafb5576a5843 SHA512 3e51c9476c29a3ba79adda2d3b0c0b516459f58c8aa5e7b795be1aa2468b8e61241bbe5615787d7302a5f95230a446377bd8698f801c2114b26a471ae8bbbc11 WHIRLPOOL 11603c9aa14acac87032b5d8fc1f8d0a567632ca591230e0cc5c1d9a1ae9b39ebccb1a3bb85e1845abc01b04da550a2ef889e1bf91da0bb82df1fafa384f88b4
DIST virtualbox-4.3.16-patches-01.tar.xz 4288 SHA256 270c4f01b2c13c4133987b3acc073dfbf78840212cf09f083dbf8fc80407ce6f SHA512 595f88c4b388b4807347c15c1750ec73aceba1c82ad993e9a05c7b78dfece7b679aff0338b3a48e2ccee7911fb5ed0dba803052332a270230078551f747052bc WHIRLPOOL 2157ee3fb9beed906cff28647c869e37d62551ad8c93801c0f0ec6893675f11786aa6d92acf11c348d30aa58b6e03a3faa879c664dddac6e5b8525035986c9ca
DIST virtualbox-5.0.2-patches-01.tar.xz 4556 SHA256 8fcfa7972b0942f3e65bda73a35a6feb234aad770016fb4caafba105757d7ada SHA512 14ce8f0b17e593b2de676e0beaab688f29606aaea330151038fbb9259d3f5e4c22f254d1fa6cc45f968d81cf9f7d71deb9a7a32f565d07c1d9fa615431472ca9 WHIRLPOOL be73fd5576732f70f6ebb33a9d604d46a8fabdbdb0e187af3435f75412e21f62c0774130a9a6315e6b87ecf96d02398ffce828b3ab8f584716ed9a12e06d7cde
diff --git a/app-emulation/virtualbox/virtualbox-5.0.2.ebuild b/app-emulation/virtualbox/virtualbox-5.0.2.ebuild
deleted file mode 100644
index ffd4b84..0000000
--- a/app-emulation/virtualbox/virtualbox-5.0.2.ebuild
+++ /dev/null
@@ -1,431 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
- https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.2-patches-01.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa doc headless java pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
- ~app-emulation/virtualbox-modules-${PV}
- dev-libs/libIDL
- >=dev-libs/libxslt-1.1.19
- net-misc/curl
- dev-libs/openssl:0=
- dev-libs/libxml2
- media-libs/libpng:0=
- media-libs/libvpx
- sys-libs/zlib
- !headless? (
- qt4? (
- dev-qt/qtgui:4
- dev-qt/qtcore:4
- opengl? ( dev-qt/qtopengl:4 )
- x11-libs/libXinerama
- )
- opengl? ( virtual/opengl media-libs/freeglut )
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- media-libs/libsdl:0[X,video]
- )
-
- java? ( >=virtual/jre-1.6:= )
- udev? ( >=virtual/udev-171 )
- vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
- >=dev-util/kbuild-0.1.9998_pre20131130
- >=dev-lang/yasm-0.6.2
- sys-devel/bin86
- sys-power/iasl
- pam? ( sys-libs/pam )
- sys-libs/libcap
- doc? (
- dev-texlive/texlive-basic
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexrecommended
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-fontsextra
- )
- java? ( >=virtual/jre-1.6:= )
- virtual/pkgconfig
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- !headless? ( x11-libs/libXinerama )
- pulseaudio? ( media-sound/pulseaudio )
- vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
- ${PYTHON_DEPS}"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
- usr/lib/virtualbox/VBoxSDL.so
- usr/lib/virtualbox/VBoxSharedFolders.so
- usr/lib/virtualbox/VBoxDD2.so
- usr/lib/virtualbox/VBoxOGLrenderspu.so
- usr/lib/virtualbox/VBoxPython.so
- usr/lib/virtualbox/VBoxDD.so
- usr/lib/virtualbox/VBoxDDU.so
- usr/lib/virtualbox/VBoxREM64.so
- usr/lib/virtualbox/VBoxSharedClipboard.so
- usr/lib/virtualbox/VBoxHeadless.so
- usr/lib/virtualbox/VBoxRT.so
- usr/lib/virtualbox/VBoxREM.so
- usr/lib/virtualbox/VBoxSettings.so
- usr/lib/virtualbox/VBoxKeyboard.so
- usr/lib/virtualbox/VBoxSharedCrOpenGL.so
- usr/lib/virtualbox/VBoxVMM.so
- usr/lib/virtualbox/VirtualBox.so
- usr/lib/virtualbox/VBoxOGLhosterrorspu.so
- usr/lib/virtualbox/components/VBoxC.so
- usr/lib/virtualbox/components/VBoxSVCM.so
- usr/lib/virtualbox/components/VBoxDDU.so
- usr/lib/virtualbox/components/VBoxRT.so
- usr/lib/virtualbox/components/VBoxREM.so
- usr/lib/virtualbox/components/VBoxVMM.so
- usr/lib/virtualbox/VBoxREM32.so
- usr/lib/virtualbox/VBoxPython2_4.so
- usr/lib/virtualbox/VBoxPython2_5.so
- usr/lib/virtualbox/VBoxPython2_6.so
- usr/lib/virtualbox/VBoxPython2_7.so
- usr/lib/virtualbox/VBoxXPCOMC.so
- usr/lib/virtualbox/VBoxOGLhostcrutil.so
- usr/lib/virtualbox/VBoxNetDHCP.so
- usr/lib/virtualbox/VBoxNetNAT.so"
-
-REQUIRED_USE="
- java? ( sdk )
- python? (
- ( sdk )
- )
- vboxwebsrv? ( java )
- ${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
- if ! use headless && ! use qt4 ; then
- einfo "No USE=\"qt4\" selected, this build will not include"
- einfo "any Qt frontend."
- elif use headless && use qt4 ; then
- einfo "You selected USE=\"headless qt4\", defaulting to"
- einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
- fi
-
- if ! use opengl ; then
- einfo "No USE=\"opengl\" selected, this build will lack"
- einfo "the OpenGL feature."
- fi
- if ! use python ; then
- einfo "You have disabled the \"python\" USE flag. This will only"
- einfo "disable the python bindings being installed."
- fi
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Remove shipped binaries (kBuild,yasm), see bug #232775
- rm -rf kBuild/bin tools
-
- # Disable things unused or split into separate ebuilds
- sed -e "s@MY_LIBDIR@$(get_libdir)@" \
- "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
- # Respect LDFLAGS
- sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
- -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
- # Use PAM only when pam USE flag is enbaled (bug #376531)
- if ! use pam ; then
- elog "Disabling PAM removes the possibility to use the VRDP features."
- sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
- sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
- src/VBox/HostServices/Makefile.kmk || die
- fi
-
- # add correct java path
- if use java ; then
- sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
- -i "${S}"/Config.kmk || die
- java-pkg-opt-2_src_prepare
- fi
-
- if ! gcc-specs-pie ; then
- EPATCH_EXCLUDE="050_${PN}-5.0.2-nopie.patch"
- fi
-
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/patches"
-
- epatch_user
-}
-
-src_configure() {
- local myconf
- use alsa || myconf+=" --disable-alsa"
- use doc || myconf+=" --disable-docs"
- use java || myconf+=" --disable-java"
- use opengl || myconf+=" --disable-opengl"
- use pulseaudio || myconf+=" --disable-pulse"
- use python || myconf+=" --disable-python"
- use vboxwebsrv && myconf+=" --enable-webservice"
- use vnc && myconf+=" --enable-vnc"
- if ! use headless ; then
- use qt4 || myconf+=" --disable-qt4"
- else
- myconf+=" --build-headless --disable-opengl"
- fi
- if use amd64 && ! has_multilib_profile ; then
- myconf+=" --disable-vmmraw"
- fi
- # not an autoconf script
- ./configure \
- --with-gcc="$(tc-getCC)" \
- --with-g++="$(tc-getCXX)" \
- --disable-kmods \
- --disable-dbus \
- --disable-devmapper \
- ${myconf} \
- || die "configure failed"
-}
-
-src_compile() {
- source ./env.sh
-
- # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
- # and strip all flags
- # strip-flags
-
- MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
- MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
- MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
- MAKE="kmk" emake \
- VBOX_BUILD_PUBLISHER=_Gentoo \
- TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
- TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
- TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
- TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
- VBOX_GCC_OPT="${CXXFLAGS}" \
- TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
- all
-}
-
-src_install() {
- cd "${S}"/out/linux.${ARCH}/release/bin || die
-
- # Create configuration files
- insinto /etc/vbox
- newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
- # Set the right libdir
- sed -i \
- -e "s@MY_LIBDIR@$(get_libdir)@" \
- "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
- # Symlink binaries to the shipped wrapper
- exeinto /usr/$(get_libdir)/${PN}
- newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
- fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
- dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
- dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
- dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
- dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
- # Install binaries and libraries
- insinto /usr/$(get_libdir)/${PN}
- doins -r components
-
- if use sdk ; then
- doins -r sdk
- fi
-
- if use vboxwebsrv ; then
- doins vboxwebsrv
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
- fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
- dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
- newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
- newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
- fi
-
- #local gcfiles="*gc"
- #if use amd64 && ! has_multilib_profile ; then
- # gcfiles=""
- #fi
-
- for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 *.rc ; do
- doins ${each}
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
- fperms 0750 /usr/$(get_libdir)/${PN}/${each}
- done
-
- # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
- for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
- doins ${each}
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
- fperms 4750 /usr/$(get_libdir)/${PN}/${each}
- done
-
- # VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
- # VBoxXPCOMIPCD (bug #524202)
- for each in VBox{Manage,SVC,XPCOMIPCD} ; do
- if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} ; then
- ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/${each}"
- fi
- done
-
- if ! use headless ; then
- doins VBoxSDL
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL
- fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL
- if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL ; then
- ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxSDL"
- fi
-
- if use opengl && use qt4 ; then
- doins VBoxTestOGL
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
- fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
- if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL ; then
- ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxTestOGL"
- fi
- fi
-
- dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
- if use qt4 ; then
- doins VirtualBox
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
- fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
- if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox ; then
- ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VirtualBox"
- fi
-
- dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-
- newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
- fi
-
- pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
- for size in 16 32 48 64 128 ; do
- newicon -s ${size} ${PN}-${size}px.png ${PN}.png
- done
- newicon ${PN}-48px.png ${PN}.png
- doicon -s scalable ${PN}.svg
- popd &>/dev/null || die
- fi
-
- doins VBoxHeadless
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
- fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
- if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless ; then
- ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxHeadless"
- fi
-
- insinto /usr/$(get_libdir)/${PN}
- # Install EFI Firmware files (bug #320757)
- pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
- for fwfile in VBoxEFI{32,64}.fd ; do
- doins ${fwfile}
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
- done
- popd &>/dev/null || die
-
- if use udev ; then
- # New way of handling USB device nodes for VBox (bug #356215)
- local udevdir="$(get_udevdir)"
- insinto ${udevdir}
- doins VBoxCreateUSBNode.sh
- fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
- fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
- insinto ${udevdir}/rules.d
- doins "${FILESDIR}"/10-virtualbox.rules
- sed "s@%UDEVDIR%@${udevdir}@" \
- -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
- fi
-
- insinto /usr/share/${PN}
- if ! use headless && use qt4 ; then
- doins -r nls
- fi
-
- # VRDPAuth only works with this (bug #351949)
- dosym VBoxAuth.so /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
- # set an env-variable for 3rd party tools
- echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
- doenvd "${T}/90virtualbox"
-
- if use java ; then
- java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
- java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
- fi
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- if use udev ; then
- udevadm control --reload-rules \
- && udevadm trigger --subsystem-match=usb
- fi
-
- if ! use headless && use qt4 ; then
- elog "To launch VirtualBox just type: \"VirtualBox\"."
- fi
- elog "You must be in the vboxusers group to use VirtualBox."
- elog ""
- elog "The latest user manual is available for download at:"
- elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
- elog ""
- elog "For advanced networking setups you should emerge:"
- elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
- elog ""
- elog "IMPORTANT!"
- elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
- elog "\"env-update\" as root and logout and relogin as the user you wish"
- elog "to run ${PN} as."
- elog ""
- elog "Starting with version 4.0.0, ${PN} has USB-1 support."
- elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
- elog " app-emulation/virtualbox-extpack-oracle"
- elog "package."
- elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
- elog "the \"extension\" USE flag. For installation of the guest additions ISO"
- elog "image, please emerge"
- elog " app-emulation/virtualbox-additions"
- elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
- elog " app-emulation/virtualbox-extpack-oracle"
- if ! use udev ; then
- elog ""
- elog "WARNING!"
- elog "Without USE=udev, USB devices will likely not work in ${PN}."
- elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
- elog ""
- elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
- elog "or else USB in ${PN} won't work."
- fi
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.0.6-r1.ebuild b/app-emulation/virtualbox/virtualbox-5.0.6-r1.ebuild
new file mode 100644
index 0000000..7619b88
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-5.0.6-r1.ebuild
@@ -0,0 +1,432 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.2-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc headless java libressl pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+ ~app-emulation/virtualbox-modules-${PV}
+ dev-libs/libIDL
+ >=dev-libs/libxslt-1.1.19
+ net-misc/curl
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ dev-libs/libxml2
+ media-libs/libpng:0=
+ media-libs/libvpx
+ sys-libs/zlib
+ !headless? (
+ qt4? (
+ dev-qt/qtgui:4
+ dev-qt/qtcore:4
+ opengl? ( dev-qt/qtopengl:4 )
+ x11-libs/libXinerama
+ )
+ opengl? ( virtual/opengl media-libs/freeglut )
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXt
+ media-libs/libsdl:0[X,video]
+ )
+
+ java? ( >=virtual/jre-1.6:= )
+ udev? ( >=virtual/udev-171 )
+ vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+ >=dev-util/kbuild-0.1.9998_pre20131130
+ >=dev-lang/yasm-0.6.2
+ sys-devel/bin86
+ sys-power/iasl
+ pam? ( sys-libs/pam )
+ sys-libs/libcap
+ doc? (
+ dev-texlive/texlive-basic
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexrecommended
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-fontsrecommended
+ dev-texlive/texlive-fontsextra
+ )
+ java? ( >=virtual/jre-1.6:= )
+ virtual/pkgconfig
+ alsa? ( >=media-libs/alsa-lib-1.0.13 )
+ !headless? ( x11-libs/libXinerama )
+ pulseaudio? ( media-sound/pulseaudio )
+ vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+ ${PYTHON_DEPS}"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+ usr/lib/virtualbox/VBoxSDL.so
+ usr/lib/virtualbox/VBoxSharedFolders.so
+ usr/lib/virtualbox/VBoxDD2.so
+ usr/lib/virtualbox/VBoxOGLrenderspu.so
+ usr/lib/virtualbox/VBoxPython.so
+ usr/lib/virtualbox/VBoxDD.so
+ usr/lib/virtualbox/VBoxDDU.so
+ usr/lib/virtualbox/VBoxREM64.so
+ usr/lib/virtualbox/VBoxSharedClipboard.so
+ usr/lib/virtualbox/VBoxHeadless.so
+ usr/lib/virtualbox/VBoxRT.so
+ usr/lib/virtualbox/VBoxREM.so
+ usr/lib/virtualbox/VBoxSettings.so
+ usr/lib/virtualbox/VBoxKeyboard.so
+ usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+ usr/lib/virtualbox/VBoxVMM.so
+ usr/lib/virtualbox/VirtualBox.so
+ usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+ usr/lib/virtualbox/components/VBoxC.so
+ usr/lib/virtualbox/components/VBoxSVCM.so
+ usr/lib/virtualbox/components/VBoxDDU.so
+ usr/lib/virtualbox/components/VBoxRT.so
+ usr/lib/virtualbox/components/VBoxREM.so
+ usr/lib/virtualbox/components/VBoxVMM.so
+ usr/lib/virtualbox/VBoxREM32.so
+ usr/lib/virtualbox/VBoxPython2_4.so
+ usr/lib/virtualbox/VBoxPython2_5.so
+ usr/lib/virtualbox/VBoxPython2_6.so
+ usr/lib/virtualbox/VBoxPython2_7.so
+ usr/lib/virtualbox/VBoxXPCOMC.so
+ usr/lib/virtualbox/VBoxOGLhostcrutil.so
+ usr/lib/virtualbox/VBoxNetDHCP.so
+ usr/lib/virtualbox/VBoxNetNAT.so"
+
+REQUIRED_USE="
+ java? ( sdk )
+ python? (
+ ( sdk )
+ )
+ vboxwebsrv? ( java )
+ ${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+ if ! use headless && ! use qt4 ; then
+ einfo "No USE=\"qt4\" selected, this build will not include"
+ einfo "any Qt frontend."
+ elif use headless && use qt4 ; then
+ einfo "You selected USE=\"headless qt4\", defaulting to"
+ einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+ fi
+
+ if ! use opengl ; then
+ einfo "No USE=\"opengl\" selected, this build will lack"
+ einfo "the OpenGL feature."
+ fi
+ if ! use python ; then
+ einfo "You have disabled the \"python\" USE flag. This will only"
+ einfo "disable the python bindings being installed."
+ fi
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Remove shipped binaries (kBuild,yasm), see bug #232775
+ rm -rf kBuild/bin tools
+
+ # Disable things unused or split into separate ebuilds
+ sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+ "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+ # Respect LDFLAGS
+ sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+ -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+ # Use PAM only when pam USE flag is enbaled (bug #376531)
+ if ! use pam ; then
+ elog "Disabling PAM removes the possibility to use the VRDP features."
+ sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+ sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+ src/VBox/HostServices/Makefile.kmk || die
+ fi
+
+ # add correct java path
+ if use java ; then
+ sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+ -i "${S}"/Config.kmk || die
+ java-pkg-opt-2_src_prepare
+ fi
+
+ if ! gcc-specs-pie ; then
+ EPATCH_EXCLUDE="050_${PN}-5.0.2-nopie.patch"
+ fi
+
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}/patches"
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf
+ use alsa || myconf+=" --disable-alsa"
+ use doc || myconf+=" --disable-docs"
+ use java || myconf+=" --disable-java"
+ use opengl || myconf+=" --disable-opengl"
+ use pulseaudio || myconf+=" --disable-pulse"
+ use python || myconf+=" --disable-python"
+ use vboxwebsrv && myconf+=" --enable-webservice"
+ use vnc && myconf+=" --enable-vnc"
+ if ! use headless ; then
+ use qt4 || myconf+=" --disable-qt4"
+ else
+ myconf+=" --build-headless --disable-opengl"
+ fi
+ if use amd64 && ! has_multilib_profile ; then
+ myconf+=" --disable-vmmraw"
+ fi
+ # not an autoconf script
+ ./configure \
+ --with-gcc="$(tc-getCC)" \
+ --with-g++="$(tc-getCXX)" \
+ --disable-kmods \
+ --disable-dbus \
+ --disable-devmapper \
+ ${myconf} \
+ || die "configure failed"
+}
+
+src_compile() {
+ source ./env.sh
+
+ # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+ # and strip all flags
+ # strip-flags
+
+ MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+ MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
+ MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+ MAKE="kmk" emake \
+ VBOX_BUILD_PUBLISHER=_Gentoo \
+ TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+ TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+ TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+ TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+ VBOX_GCC_OPT="${CXXFLAGS}" \
+ TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+ all
+}
+
+src_install() {
+ cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+ # Create configuration files
+ insinto /etc/vbox
+ newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+ # Set the right libdir
+ sed -i \
+ -e "s@MY_LIBDIR@$(get_libdir)@" \
+ "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+ # Symlink binaries to the shipped wrapper
+ exeinto /usr/$(get_libdir)/${PN}
+ newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+ fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+ dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+ # Install binaries and libraries
+ insinto /usr/$(get_libdir)/${PN}
+ doins -r components
+
+ if use sdk ; then
+ doins -r sdk
+ fi
+
+ if use vboxwebsrv ; then
+ doins vboxwebsrv
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+ fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+ newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+ newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+ fi
+
+ local rcfiles="*.rc"
+ if use amd64 && ! has_multilib_profile ; then
+ rcfiles=""
+ fi
+
+ for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 ${rcfiles} ; do
+ doins ${each}
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+ fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+ done
+
+ # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+ for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
+ doins ${each}
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+ fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+ done
+
+ # VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+ # VBoxXPCOMIPCD (bug #524202)
+ for each in VBox{Manage,SVC,XPCOMIPCD} ; do
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} ; then
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/${each}"
+ fi
+ done
+
+ if ! use headless ; then
+ doins VBoxSDL
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL
+ fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL ; then
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxSDL"
+ fi
+
+ if use opengl && use qt4 ; then
+ doins VBoxTestOGL
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+ fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL ; then
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxTestOGL"
+ fi
+ fi
+
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+ if use qt4 ; then
+ doins VirtualBox
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+ fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox ; then
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VirtualBox"
+ fi
+
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+
+ newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+ fi
+
+ pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+ for size in 16 32 48 64 128 ; do
+ newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+ done
+ newicon ${PN}-48px.png ${PN}.png
+ doicon -s scalable ${PN}.svg
+ popd &>/dev/null || die
+ fi
+
+ doins VBoxHeadless
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+ fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless ; then
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxHeadless"
+ fi
+
+ insinto /usr/$(get_libdir)/${PN}
+ # Install EFI Firmware files (bug #320757)
+ pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+ for fwfile in VBoxEFI{32,64}.fd ; do
+ doins ${fwfile}
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
+ done
+ popd &>/dev/null || die
+
+ if use udev ; then
+ # New way of handling USB device nodes for VBox (bug #356215)
+ local udevdir="$(get_udevdir)"
+ insinto ${udevdir}
+ doins VBoxCreateUSBNode.sh
+ fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+ fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+ insinto ${udevdir}/rules.d
+ doins "${FILESDIR}"/10-virtualbox.rules
+ sed "s@%UDEVDIR%@${udevdir}@" \
+ -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+ fi
+
+ insinto /usr/share/${PN}
+ if ! use headless && use qt4 ; then
+ doins -r nls
+ fi
+
+ # VRDPAuth only works with this (bug #351949)
+ dosym VBoxAuth.so /usr/$(get_libdir)/${PN}/VRDPAuth.so
+
+ # set an env-variable for 3rd party tools
+ echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+ doenvd "${T}/90virtualbox"
+
+ if use java ; then
+ java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+ java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
+ fi
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+
+ if use udev ; then
+ udevadm control --reload-rules \
+ && udevadm trigger --subsystem-match=usb
+ fi
+
+ if ! use headless && use qt4 ; then
+ elog "To launch VirtualBox just type: \"VirtualBox\"."
+ fi
+ elog "You must be in the vboxusers group to use VirtualBox."
+ elog ""
+ elog "The latest user manual is available for download at:"
+ elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+ elog ""
+ elog "For advanced networking setups you should emerge:"
+ elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+ elog ""
+ elog "IMPORTANT!"
+ elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+ elog "\"env-update\" as root and logout and relogin as the user you wish"
+ elog "to run ${PN} as."
+ elog ""
+ elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+ elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+ elog " app-emulation/virtualbox-extpack-oracle"
+ elog "package."
+ elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+ elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+ elog "image, please emerge"
+ elog " app-emulation/virtualbox-additions"
+ elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+ elog " app-emulation/virtualbox-extpack-oracle"
+ if ! use udev ; then
+ elog ""
+ elog "WARNING!"
+ elog "Without USE=udev, USB devices will likely not work in ${PN}."
+ elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+ elog ""
+ elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+ elog "or else USB in ${PN} won't work."
+ fi
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/virtualbox/virtualbox-5.0.6.ebuild b/app-emulation/virtualbox/virtualbox-5.0.6.ebuild
new file mode 100644
index 0000000..b10c461
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-5.0.6.ebuild
@@ -0,0 +1,431 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.2-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc headless java pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+ ~app-emulation/virtualbox-modules-${PV}
+ dev-libs/libIDL
+ >=dev-libs/libxslt-1.1.19
+ net-misc/curl
+ dev-libs/openssl:0=
+ dev-libs/libxml2
+ media-libs/libpng:0=
+ media-libs/libvpx
+ sys-libs/zlib
+ !headless? (
+ qt4? (
+ dev-qt/qtgui:4
+ dev-qt/qtcore:4
+ opengl? ( dev-qt/qtopengl:4 )
+ x11-libs/libXinerama
+ )
+ opengl? ( virtual/opengl media-libs/freeglut )
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXt
+ media-libs/libsdl:0[X,video]
+ )
+
+ java? ( >=virtual/jre-1.6:= )
+ udev? ( >=virtual/udev-171 )
+ vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+ >=dev-util/kbuild-0.1.9998_pre20131130
+ >=dev-lang/yasm-0.6.2
+ sys-devel/bin86
+ sys-power/iasl
+ pam? ( sys-libs/pam )
+ sys-libs/libcap
+ doc? (
+ dev-texlive/texlive-basic
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexrecommended
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-fontsrecommended
+ dev-texlive/texlive-fontsextra
+ )
+ java? ( >=virtual/jre-1.6:= )
+ virtual/pkgconfig
+ alsa? ( >=media-libs/alsa-lib-1.0.13 )
+ !headless? ( x11-libs/libXinerama )
+ pulseaudio? ( media-sound/pulseaudio )
+ vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+ ${PYTHON_DEPS}"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+ usr/lib/virtualbox/VBoxSDL.so
+ usr/lib/virtualbox/VBoxSharedFolders.so
+ usr/lib/virtualbox/VBoxDD2.so
+ usr/lib/virtualbox/VBoxOGLrenderspu.so
+ usr/lib/virtualbox/VBoxPython.so
+ usr/lib/virtualbox/VBoxDD.so
+ usr/lib/virtualbox/VBoxDDU.so
+ usr/lib/virtualbox/VBoxREM64.so
+ usr/lib/virtualbox/VBoxSharedClipboard.so
+ usr/lib/virtualbox/VBoxHeadless.so
+ usr/lib/virtualbox/VBoxRT.so
+ usr/lib/virtualbox/VBoxREM.so
+ usr/lib/virtualbox/VBoxSettings.so
+ usr/lib/virtualbox/VBoxKeyboard.so
+ usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+ usr/lib/virtualbox/VBoxVMM.so
+ usr/lib/virtualbox/VirtualBox.so
+ usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+ usr/lib/virtualbox/components/VBoxC.so
+ usr/lib/virtualbox/components/VBoxSVCM.so
+ usr/lib/virtualbox/components/VBoxDDU.so
+ usr/lib/virtualbox/components/VBoxRT.so
+ usr/lib/virtualbox/components/VBoxREM.so
+ usr/lib/virtualbox/components/VBoxVMM.so
+ usr/lib/virtualbox/VBoxREM32.so
+ usr/lib/virtualbox/VBoxPython2_4.so
+ usr/lib/virtualbox/VBoxPython2_5.so
+ usr/lib/virtualbox/VBoxPython2_6.so
+ usr/lib/virtualbox/VBoxPython2_7.so
+ usr/lib/virtualbox/VBoxXPCOMC.so
+ usr/lib/virtualbox/VBoxOGLhostcrutil.so
+ usr/lib/virtualbox/VBoxNetDHCP.so
+ usr/lib/virtualbox/VBoxNetNAT.so"
+
+REQUIRED_USE="
+ java? ( sdk )
+ python? (
+ ( sdk )
+ )
+ vboxwebsrv? ( java )
+ ${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+ if ! use headless && ! use qt4 ; then
+ einfo "No USE=\"qt4\" selected, this build will not include"
+ einfo "any Qt frontend."
+ elif use headless && use qt4 ; then
+ einfo "You selected USE=\"headless qt4\", defaulting to"
+ einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+ fi
+
+ if ! use opengl ; then
+ einfo "No USE=\"opengl\" selected, this build will lack"
+ einfo "the OpenGL feature."
+ fi
+ if ! use python ; then
+ einfo "You have disabled the \"python\" USE flag. This will only"
+ einfo "disable the python bindings being installed."
+ fi
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Remove shipped binaries (kBuild,yasm), see bug #232775
+ rm -rf kBuild/bin tools
+
+ # Disable things unused or split into separate ebuilds
+ sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+ "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+ # Respect LDFLAGS
+ sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+ -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+ # Use PAM only when pam USE flag is enbaled (bug #376531)
+ if ! use pam ; then
+ elog "Disabling PAM removes the possibility to use the VRDP features."
+ sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+ sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+ src/VBox/HostServices/Makefile.kmk || die
+ fi
+
+ # add correct java path
+ if use java ; then
+ sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+ -i "${S}"/Config.kmk || die
+ java-pkg-opt-2_src_prepare
+ fi
+
+ if ! gcc-specs-pie ; then
+ EPATCH_EXCLUDE="050_${PN}-5.0.2-nopie.patch"
+ fi
+
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}/patches"
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf
+ use alsa || myconf+=" --disable-alsa"
+ use doc || myconf+=" --disable-docs"
+ use java || myconf+=" --disable-java"
+ use opengl || myconf+=" --disable-opengl"
+ use pulseaudio || myconf+=" --disable-pulse"
+ use python || myconf+=" --disable-python"
+ use vboxwebsrv && myconf+=" --enable-webservice"
+ use vnc && myconf+=" --enable-vnc"
+ if ! use headless ; then
+ use qt4 || myconf+=" --disable-qt4"
+ else
+ myconf+=" --build-headless --disable-opengl"
+ fi
+ if use amd64 && ! has_multilib_profile ; then
+ myconf+=" --disable-vmmraw"
+ fi
+ # not an autoconf script
+ ./configure \
+ --with-gcc="$(tc-getCC)" \
+ --with-g++="$(tc-getCXX)" \
+ --disable-kmods \
+ --disable-dbus \
+ --disable-devmapper \
+ ${myconf} \
+ || die "configure failed"
+}
+
+src_compile() {
+ source ./env.sh
+
+ # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+ # and strip all flags
+ # strip-flags
+
+ MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+ MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
+ MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+ MAKE="kmk" emake \
+ VBOX_BUILD_PUBLISHER=_Gentoo \
+ TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+ TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+ TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+ TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+ VBOX_GCC_OPT="${CXXFLAGS}" \
+ TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+ all
+}
+
+src_install() {
+ cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+ # Create configuration files
+ insinto /etc/vbox
+ newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+ # Set the right libdir
+ sed -i \
+ -e "s@MY_LIBDIR@$(get_libdir)@" \
+ "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+ # Symlink binaries to the shipped wrapper
+ exeinto /usr/$(get_libdir)/${PN}
+ newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+ fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+ dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+ # Install binaries and libraries
+ insinto /usr/$(get_libdir)/${PN}
+ doins -r components
+
+ if use sdk ; then
+ doins -r sdk
+ fi
+
+ if use vboxwebsrv ; then
+ doins vboxwebsrv
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+ fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+ newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+ newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+ fi
+
+ local rcfiles="*.rc"
+ if use amd64 && ! has_multilib_profile ; then
+ rcfiles=""
+ fi
+
+ for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 ${rcfiles} ; do
+ doins ${each}
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+ fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+ done
+
+ # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+ for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
+ doins ${each}
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+ fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+ done
+
+ # VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+ # VBoxXPCOMIPCD (bug #524202)
+ for each in VBox{Manage,SVC,XPCOMIPCD} ; do
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} ; then
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/${each}"
+ fi
+ done
+
+ if ! use headless ; then
+ doins VBoxSDL
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL
+ fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL ; then
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxSDL"
+ fi
+
+ if use opengl && use qt4 ; then
+ doins VBoxTestOGL
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+ fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL ; then
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxTestOGL"
+ fi
+ fi
+
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+ if use qt4 ; then
+ doins VirtualBox
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+ fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox ; then
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VirtualBox"
+ fi
+
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+
+ newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+ fi
+
+ pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+ for size in 16 32 48 64 128 ; do
+ newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+ done
+ newicon ${PN}-48px.png ${PN}.png
+ doicon -s scalable ${PN}.svg
+ popd &>/dev/null || die
+ fi
+
+ doins VBoxHeadless
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+ fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless ; then
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxHeadless"
+ fi
+
+ insinto /usr/$(get_libdir)/${PN}
+ # Install EFI Firmware files (bug #320757)
+ pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+ for fwfile in VBoxEFI{32,64}.fd ; do
+ doins ${fwfile}
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
+ done
+ popd &>/dev/null || die
+
+ if use udev ; then
+ # New way of handling USB device nodes for VBox (bug #356215)
+ local udevdir="$(get_udevdir)"
+ insinto ${udevdir}
+ doins VBoxCreateUSBNode.sh
+ fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+ fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+ insinto ${udevdir}/rules.d
+ doins "${FILESDIR}"/10-virtualbox.rules
+ sed "s@%UDEVDIR%@${udevdir}@" \
+ -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+ fi
+
+ insinto /usr/share/${PN}
+ if ! use headless && use qt4 ; then
+ doins -r nls
+ fi
+
+ # VRDPAuth only works with this (bug #351949)
+ dosym VBoxAuth.so /usr/$(get_libdir)/${PN}/VRDPAuth.so
+
+ # set an env-variable for 3rd party tools
+ echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+ doenvd "${T}/90virtualbox"
+
+ if use java ; then
+ java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+ java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
+ fi
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+
+ if use udev ; then
+ udevadm control --reload-rules \
+ && udevadm trigger --subsystem-match=usb
+ fi
+
+ if ! use headless && use qt4 ; then
+ elog "To launch VirtualBox just type: \"VirtualBox\"."
+ fi
+ elog "You must be in the vboxusers group to use VirtualBox."
+ elog ""
+ elog "The latest user manual is available for download at:"
+ elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+ elog ""
+ elog "For advanced networking setups you should emerge:"
+ elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+ elog ""
+ elog "IMPORTANT!"
+ elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+ elog "\"env-update\" as root and logout and relogin as the user you wish"
+ elog "to run ${PN} as."
+ elog ""
+ elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+ elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+ elog " app-emulation/virtualbox-extpack-oracle"
+ elog "package."
+ elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+ elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+ elog "image, please emerge"
+ elog " app-emulation/virtualbox-additions"
+ elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+ elog " app-emulation/virtualbox-extpack-oracle"
+ if ! use udev ; then
+ elog ""
+ elog "WARNING!"
+ elog "Without USE=udev, USB devices will likely not work in ${PN}."
+ elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+ elog ""
+ elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+ elog "or else USB in ${PN} won't work."
+ fi
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine/files/pr66838.c b/app-emulation/wine/files/pr66838.c
new file mode 100644
index 0000000..cd61685
--- /dev/null
+++ b/app-emulation/wine/files/pr66838.c
@@ -0,0 +1,36 @@
+/* From gcc svn, /branches/gcc-5-branch/gcc/testsuite/gcc.target/i386/pr66838.c */
+/* Copyrighted and distributed under the same terms as gcc */
+
+void abort (void);
+
+char global;
+
+__attribute__((sysv_abi, noinline, noclone))
+void sysv_abi_func(char const *desc, void *local)
+{
+ register int esi asm ("esi");
+ register int edi asm ("edi");
+
+ if (local != &global)
+ abort ();
+
+ /* Clobber some of the extra SYSV ABI registers. */
+ asm volatile ("movl\t%2, %0\n\tmovl\t%2, %1"
+ : "=r" (esi), "=r" (edi)
+ : "i" (0xdeadbeef));
+}
+
+__attribute__((ms_abi, noinline, noclone))
+void ms_abi_func ()
+{
+ sysv_abi_func ("1st call", &global);
+ sysv_abi_func ("2nd call", &global);
+ sysv_abi_func ("3rd call", &global);
+}
+
+int
+main(void)
+{
+ ms_abi_func();
+ return 0;
+}
diff --git a/app-emulation/wine/wine-1.6.2-r1.ebuild b/app-emulation/wine/wine-1.6.2-r1.ebuild
index cd806c0..7890da7 100644
--- a/app-emulation/wine/wine-1.6.2-r1.ebuild
+++ b/app-emulation/wine/wine-1.6.2-r1.ebuild
@@ -145,12 +145,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.6.2.ebuild b/app-emulation/wine/wine-1.6.2.ebuild
index 3b620b1..e990228 100644
--- a/app-emulation/wine/wine-1.6.2.ebuild
+++ b/app-emulation/wine/wine-1.6.2.ebuild
@@ -174,12 +174,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.10-r1.ebuild b/app-emulation/wine/wine-1.7.10-r1.ebuild
index 8dd4996..9cd19bd 100644
--- a/app-emulation/wine/wine-1.7.10-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.10-r1.ebuild
@@ -146,12 +146,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.11-r1.ebuild b/app-emulation/wine/wine-1.7.11-r1.ebuild
index 8dd4996..9cd19bd 100644
--- a/app-emulation/wine/wine-1.7.11-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.11-r1.ebuild
@@ -146,12 +146,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.12-r1.ebuild b/app-emulation/wine/wine-1.7.12-r1.ebuild
index a672bc8..16697c5 100644
--- a/app-emulation/wine/wine-1.7.12-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.12-r1.ebuild
@@ -146,12 +146,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.13-r1.ebuild b/app-emulation/wine/wine-1.7.13-r1.ebuild
index a672bc8..16697c5 100644
--- a/app-emulation/wine/wine-1.7.13-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.13-r1.ebuild
@@ -146,12 +146,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.14-r1.ebuild b/app-emulation/wine/wine-1.7.14-r1.ebuild
index a672bc8..16697c5 100644
--- a/app-emulation/wine/wine-1.7.14-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.14-r1.ebuild
@@ -146,12 +146,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.15-r1.ebuild b/app-emulation/wine/wine-1.7.15-r1.ebuild
index a672bc8..16697c5 100644
--- a/app-emulation/wine/wine-1.7.15-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.15-r1.ebuild
@@ -146,12 +146,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.16-r1.ebuild b/app-emulation/wine/wine-1.7.16-r1.ebuild
index a672bc8..16697c5 100644
--- a/app-emulation/wine/wine-1.7.16-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.16-r1.ebuild
@@ -146,12 +146,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.17-r1.ebuild b/app-emulation/wine/wine-1.7.17-r1.ebuild
index a672bc8..16697c5 100644
--- a/app-emulation/wine/wine-1.7.17-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.17-r1.ebuild
@@ -146,12 +146,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.18-r1.ebuild b/app-emulation/wine/wine-1.7.18-r1.ebuild
index a672bc8..16697c5 100644
--- a/app-emulation/wine/wine-1.7.18-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.18-r1.ebuild
@@ -146,12 +146,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.19-r2.ebuild b/app-emulation/wine/wine-1.7.19-r2.ebuild
index 0569dd9..90fb710 100644
--- a/app-emulation/wine/wine-1.7.19-r2.ebuild
+++ b/app-emulation/wine/wine-1.7.19-r2.ebuild
@@ -159,12 +159,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.20-r1.ebuild b/app-emulation/wine/wine-1.7.20-r1.ebuild
index baa882c..39a57ab 100644
--- a/app-emulation/wine/wine-1.7.20-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.20-r1.ebuild
@@ -161,12 +161,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.21-r1.ebuild b/app-emulation/wine/wine-1.7.21-r1.ebuild
index 7343640..3e88454 100644
--- a/app-emulation/wine/wine-1.7.21-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.21-r1.ebuild
@@ -161,12 +161,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.22-r1.ebuild b/app-emulation/wine/wine-1.7.22-r1.ebuild
index 7343640..3e88454 100644
--- a/app-emulation/wine/wine-1.7.22-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.22-r1.ebuild
@@ -161,12 +161,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.28-r1.ebuild b/app-emulation/wine/wine-1.7.28-r1.ebuild
index 54d6481..9963e5b 100644
--- a/app-emulation/wine/wine-1.7.28-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.28-r1.ebuild
@@ -161,12 +161,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.29-r1.ebuild b/app-emulation/wine/wine-1.7.29-r1.ebuild
index 54d6481..9963e5b 100644
--- a/app-emulation/wine/wine-1.7.29-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.29-r1.ebuild
@@ -161,12 +161,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.3-r1.ebuild b/app-emulation/wine/wine-1.7.3-r1.ebuild
index 8ac9a7d..aecbaf3 100644
--- a/app-emulation/wine/wine-1.7.3-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.3-r1.ebuild
@@ -145,12 +145,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.33-r1.ebuild b/app-emulation/wine/wine-1.7.33-r1.ebuild
index f6af727..f38cb49 100644
--- a/app-emulation/wine/wine-1.7.33-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.33-r1.ebuild
@@ -163,12 +163,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.34.ebuild b/app-emulation/wine/wine-1.7.34.ebuild
index 91fbdfa..0968495 100644
--- a/app-emulation/wine/wine-1.7.34.ebuild
+++ b/app-emulation/wine/wine-1.7.34.ebuild
@@ -163,12 +163,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.35.ebuild b/app-emulation/wine/wine-1.7.35.ebuild
index 137912e..8f493b0 100644
--- a/app-emulation/wine/wine-1.7.35.ebuild
+++ b/app-emulation/wine/wine-1.7.35.ebuild
@@ -163,12 +163,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.36.ebuild b/app-emulation/wine/wine-1.7.36.ebuild
index 9c7bba6..3d79ebd 100644
--- a/app-emulation/wine/wine-1.7.36.ebuild
+++ b/app-emulation/wine/wine-1.7.36.ebuild
@@ -162,12 +162,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.37.ebuild b/app-emulation/wine/wine-1.7.37.ebuild
index 2e2c0d0..a537166 100644
--- a/app-emulation/wine/wine-1.7.37.ebuild
+++ b/app-emulation/wine/wine-1.7.37.ebuild
@@ -165,12 +165,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.38-r1.ebuild b/app-emulation/wine/wine-1.7.38-r1.ebuild
index 1ba468d..e8bff65 100644
--- a/app-emulation/wine/wine-1.7.38-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.38-r1.ebuild
@@ -165,12 +165,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.39-r1.ebuild b/app-emulation/wine/wine-1.7.39-r1.ebuild
index 6fd525b..cba7501 100644
--- a/app-emulation/wine/wine-1.7.39-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.39-r1.ebuild
@@ -165,12 +165,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.4-r1.ebuild b/app-emulation/wine/wine-1.7.4-r1.ebuild
index 5ca4da7..e157195 100644
--- a/app-emulation/wine/wine-1.7.4-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.4-r1.ebuild
@@ -145,12 +145,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.40-r1.ebuild b/app-emulation/wine/wine-1.7.40-r1.ebuild
index 6fd525b..cba7501 100644
--- a/app-emulation/wine/wine-1.7.40-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.40-r1.ebuild
@@ -165,12 +165,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.41.ebuild b/app-emulation/wine/wine-1.7.41.ebuild
index 6fd525b..cba7501 100644
--- a/app-emulation/wine/wine-1.7.41.ebuild
+++ b/app-emulation/wine/wine-1.7.41.ebuild
@@ -165,12 +165,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.42.ebuild b/app-emulation/wine/wine-1.7.42.ebuild
index 6fd525b..cba7501 100644
--- a/app-emulation/wine/wine-1.7.42.ebuild
+++ b/app-emulation/wine/wine-1.7.42.ebuild
@@ -165,12 +165,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.43.ebuild b/app-emulation/wine/wine-1.7.43.ebuild
index 6fd525b..cba7501 100644
--- a/app-emulation/wine/wine-1.7.43.ebuild
+++ b/app-emulation/wine/wine-1.7.43.ebuild
@@ -165,12 +165,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.44.ebuild b/app-emulation/wine/wine-1.7.44.ebuild
index 6fd525b..cba7501 100644
--- a/app-emulation/wine/wine-1.7.44.ebuild
+++ b/app-emulation/wine/wine-1.7.44.ebuild
@@ -165,12 +165,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.45.ebuild b/app-emulation/wine/wine-1.7.45.ebuild
index 8930da9..555a7d1 100644
--- a/app-emulation/wine/wine-1.7.45.ebuild
+++ b/app-emulation/wine/wine-1.7.45.ebuild
@@ -165,12 +165,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.46.ebuild b/app-emulation/wine/wine-1.7.46.ebuild
index 6fd525b..cba7501 100644
--- a/app-emulation/wine/wine-1.7.46.ebuild
+++ b/app-emulation/wine/wine-1.7.46.ebuild
@@ -165,12 +165,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.47.ebuild b/app-emulation/wine/wine-1.7.47.ebuild
index 6b89273..4f5cc8e 100644
--- a/app-emulation/wine/wine-1.7.47.ebuild
+++ b/app-emulation/wine/wine-1.7.47.ebuild
@@ -165,12 +165,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.50.ebuild b/app-emulation/wine/wine-1.7.50.ebuild
index d78c249..8a8d5c1 100644
--- a/app-emulation/wine/wine-1.7.50.ebuild
+++ b/app-emulation/wine/wine-1.7.50.ebuild
@@ -166,12 +166,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.51.ebuild b/app-emulation/wine/wine-1.7.51.ebuild
index d78c249..8a8d5c1 100644
--- a/app-emulation/wine/wine-1.7.51.ebuild
+++ b/app-emulation/wine/wine-1.7.51.ebuild
@@ -166,12 +166,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.8-r1.ebuild b/app-emulation/wine/wine-1.7.8-r1.ebuild
index 5015137..090fb1c 100644
--- a/app-emulation/wine/wine-1.7.8-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.8-r1.ebuild
@@ -146,12 +146,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-1.7.9-r1.ebuild b/app-emulation/wine/wine-1.7.9-r1.ebuild
index 5015137..090fb1c 100644
--- a/app-emulation/wine/wine-1.7.9-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.9-r1.ebuild
@@ -146,12 +146,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index d78c249..8a8d5c1 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -166,12 +166,18 @@
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
- eerror "you may use gcc-config to select an older compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 2830959..21ecd8a 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -5,4 +5,5 @@
DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383
DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
DIST xen-4.5.1.tar.gz 18410400 SHA256 668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371 SHA512 9436243e26bc64bc836a179abdc3a6b1b6fa9d3f2170453092c18be71fa62e18cd4465a9154c0f28a7ac8d69d08361ba1defef240a51197f058c012c3855ba04 WHIRLPOOL 71d8559f86683dd9fb3eb09d3f602de227f281fbd3c8cc258bfdb67c425d9e7c4d21cb0284c123e4263262c1b821fea6d28109861ce60d627f6426d352808d99
+DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild
new file mode 100644
index 0000000..a47af58
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+SRC_URI="
+ http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+ $GRUB_URL/grub-0.97.tar.gz
+ $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+ $LIBPCI_URL/pciutils-2.2.9.tar.bz2
+ $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+ $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+ $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+ sys-devel/bin86
+ sys-apps/texinfo"
+
+RDEPEND=">=app-emulation/xen-4.2.1"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+retar-externals() {
+ # Purely to unclutter src_prepare
+ local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+ # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+ sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+ -i "${WORKDIR}"/zlib-1.2.3/configure
+ sed -e 's:^AR=ar rc:AR=ar:' \
+ -e s':$(AR) $@:$(AR) rc $@:' \
+ -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+ einfo "zlib Makefile edited"
+
+ cd "${WORKDIR}"
+ tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+ tar czp grub-0.97 -f grub-0.97.tar.gz
+ tar czp lwip -f lwip-1.3.0.tar.gz
+ tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+ tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+ mv $set "${S}"/stubdom/
+ einfo "tarballs moved to source"
+}
+
+src_prepare() {
+ # if the user *really* wants to use their own custom-cflags, let them
+ if use custom-cflags; then
+ einfo "User wants their own CFLAGS - removing defaults"
+ # try and remove all the default custom-cflags
+ find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+ -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+ -i {} \;
+ fi
+
+ # Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+ cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+ # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+ epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
+
+ # fix jobserver in Makefile
+ epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
+
+ #Substitute for internal downloading. pciutils copied only due to the only .bz2
+ cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+ retar-externals || die "re-tar procedure failed"
+}
+
+src_configure() {
+ local myconf="--prefix=${PREFIX}/usr \
+ --libdir=${PREFIX}/usr/$(get_libdir) \
+ --libexecdir=${PREFIX}/usr/libexec \
+ --disable-werror \
+ --disable-xen"
+
+ econf ${myconf}
+}
+
+src_compile() {
+ use custom-cflags || unset CFLAGS
+ if test-flag-CC -fno-strict-overflow; then
+ append-flags -fno-strict-overflow
+ fi
+
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+
+ if use x86; then
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+ XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+ elif use amd64; then
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+ XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+ if has_multilib_profile; then
+ multilib_toolchain_setup x86
+ emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+ XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+ fi
+ fi
+}
+
+src_install() {
+ if use x86; then
+ emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+ fi
+ if use amd64; then
+ emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+ if has_multilib_profile; then
+ emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+ fi
+ fi
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide and the offical wiki page:"
+ elog "https://wiki.gentoo.org/wiki/Xen"
+ elog "http://wiki.xen.org/wiki/Main_Page"
+}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index e42d51c..2970466 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -5,6 +5,7 @@
DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
DIST xen-4.5.1-upstream-patches-0.tar.xz 18236 SHA256 95910023cb99f11b4df6d57d82000bbd67714d4ed0700e152619c5b82c1bc6e5 SHA512 531e5bbe6b9920a58361f11bb1bb6df65ebaf01e3af13f9aca018e8512727d950009257dfc9b3d0b0f847968da499cf9423716de8a04869cec6f92f5274462e2 WHIRLPOOL 3e6dda862d1bbe736b85422117148c3db91a308a58eb1476e27bbb7355ea7793269cdfc489697c9e5eea5f0ac5319df5c88f2707b10c9a96b8142927a4169819
DIST xen-4.5.1.tar.gz 18410400 SHA256 668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371 SHA512 9436243e26bc64bc836a179abdc3a6b1b6fa9d3f2170453092c18be71fa62e18cd4465a9154c0f28a7ac8d69d08361ba1defef240a51197f058c012c3855ba04 WHIRLPOOL 71d8559f86683dd9fb3eb09d3f602de227f281fbd3c8cc258bfdb67c425d9e7c4d21cb0284c123e4263262c1b821fea6d28109861ce60d627f6426d352808d99
+DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
DIST xen-gentoo-patches-1.tar.xz 23044 SHA256 dcff35bbc4b6946473c9b55ad595a5fea88e8dac1bd977cbe18a644b2cced2e0 SHA512 a4c66382d44112e7be09711e3ecf0f8ebd9a30b29e04d8aca536430172bdd111ab8bab7700433e0dc35165f876eb7e9cd2e554d74ce2a166fb2dfd4de482cb7a WHIRLPOOL d0443e1501ac813ac3226df32a6b050c03302c3d74e3b3bd1293ab4ad929b5c314cc0eac13505ce8a826ee357117e8eeaf0713fd8b9c55f40296966fda082c2e
DIST xen-gentoo-patches-4.tar.xz 23632 SHA256 5cdb0f93ee32d0a5fc4fc7282270ace73acfdc4df694f7b29c1135180d902049 SHA512 3006ce4cd67e80a9f79d9ba3814a64704b0d762159a439a140b1ec0a2699473cd5537950f0913b55f8f7e3d0fd2e9861f3199793120d8d2502aa3f8ef7816c8f WHIRLPOOL 4a921103df2825ccd8b0481708e7cd692fa45d5aadae286c1522c144a1576920e7d3567648565bb9af85bb6bb597ea9d0ec04ea6abd2115db4caf7e739717b1a
DIST xen-ovmf-patches-1.tar.xz 4724 SHA256 d14e98e62c78c9f4b8a7e7b4a04de6dabf300f393eff44154d06f93aa43d7703 SHA512 a17467762f6d92018ff9bce783ce148039f23159405e801ec2aef4c3db72c3976c6f1e41d8c2a2cb704a9654556a2050302f284cfe8e32f28f393b8e2c6d2f1c WHIRLPOOL de53ad07f20aa14fe76d974db92d5b6808f0a2dd26a627b818914990add7adad8e6135d42641819dc22947031981c5815bae5aeeed0f28785c90beda0a6ff6c8
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 696ff18..e21b516 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -87,45 +87,6 @@
${_gx016} ${_gx017} ${_gx018} ${_gx019}
"
-# xen-tools-4.4.1 patches set
-_gpv_xen_tools_441_2="
-${_gx007} ${_gx008} ${_gx009}
-${_gx024} ${_gx021} ${_gx014}
-${_gx022} ${_gx017} ${_gx025}
-${_gx026} ${_gx027} ${_gx019}
-${_gx028} ${_gx029}
-"
-
-# xen-tools-4.4.2 patches set
-_gpv_xen_tools_442_0="
-${_gx007} ${_gx008} ${_gx009}
-${_gx024} ${_gx021} ${_gx014}
-${_gx022} ${_gx017} ${_gx025}
-${_gx026} ${_gx027} ${_gx019}
-${_gx028} ${_gx029}
-"
-_gpv_xen_tools_442_1="
-${_gx007} ${_gx008} ${_gx009}
-${_gx024} ${_gx021} ${_gx014}
-${_gx022} ${_gx017} ${_gx025}
-${_gx026} ${_gx027} ${_gx019}
-${_gx028} ${_gx029} ${_gx033}
-"
-
-# xen-tools-4.5.0 patches set
-_gpv_xen_tools_450_0="
-${_gx008} ${_gx024} ${_gx021}
-${_gx022} ${_gx017} ${_gx031}
-${_gx027} ${_gx032}
-${_gx028} ${_gx029}
-"
-_gpv_xen_tools_450_1="
-${_gx008} ${_gx024} ${_gx021}
-${_gx022} ${_gx017} ${_gx031}
-${_gx027} ${_gx032}
-${_gx028} ${_gx029} ${_gx034}
-"
-
# xen-tools-4.5.1 patches set
_gpv_xen_tools_451_0="
${_gx008} ${_gx024} ${_gx021}
@@ -133,3 +94,11 @@
${_gx027} ${_gx032}
${_gx028} ${_gx029} ${_gx034}
"
+
+# xen-tools-4.6.0 patches set
+_gpv_xen_tools_460_0="
+${_gx008} ${_gx021}
+${_gx022} ${_gx017} ${_gx031}
+${_gx027} ${_gx032}
+${_gx028} ${_gx029}
+"
diff --git a/app-emulation/xen-tools/xen-tools-4.6.0.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0.ebuild
new file mode 100644
index 0000000..f4f221e
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.6.0.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV=${PV/_/-}
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+ KEYWORDS=""
+ REPO="xen-unstable.hg"
+ EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+ S="${WORKDIR}/${REPO}"
+ live_eclass="mercurial"
+else
+ KEYWORDS="~amd64 ~arm ~arm64 -x86"
+ UPSTREAM_VER=
+ SECURITY_VER=
+ # xen-tools's gentoo patches tarball
+ GENTOO_VER=4
+ # xen-tools's gentoo patches version which apply to this specific ebuild
+ GENTOO_GPV=0
+ # xen-tools ovmf's patches
+ OVMF_VER=1
+
+ SEABIOS_VER=1.7.5
+ OVMF_PV=20150629
+
+ [[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+ [[ -n ${SECURITY_VER} ]] && \
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+ [[ -n ${GENTOO_VER} ]] && \
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+ [[ -n ${OVMF_VER} ]] && \
+ OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+ SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+ http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+ https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+ ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+ ${OVMF_PATCHSET_URI} )
+ ${UPSTREAM_PATCHSET_URI}
+ ${SECURITY_PATCHSET_URI}
+ ${GENTOO_PATCHSET_URI}"
+ S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+ ${PYTHON_REQUIRED_USE}
+ pygrub? ( python )
+ ovmf? ( hvm )
+ qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+ dev-libs/lzo:2
+ dev-libs/glib:2
+ dev-libs/yajl
+ dev-libs/libaio
+ dev-libs/libgcrypt:0
+ sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+ dev-python/lxml[${PYTHON_USEDEP}]
+ pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+ hvm? ( media-libs/libsdl )
+ ${PYTHON_DEPS}
+ api? ( dev-libs/libxml2
+ net-misc/curl )
+ pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+ ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} )
+ !amd64? ( >=sys-apps/dtc-1.4.0 )
+ amd64? ( sys-devel/bin86
+ system-seabios? ( sys-firmware/seabios )
+ sys-firmware/ipxe
+ sys-devel/dev86
+ sys-power/iasl )
+ dev-lang/perl
+ app-misc/pax-utils
+ dev-python/markdown[${PYTHON_USEDEP}]
+ doc? (
+ app-doc/doxygen
+ dev-tex/latex2html[png,gif]
+ media-gfx/graphviz
+ dev-tex/xcolor
+ media-gfx/transfig
+ dev-texlive/texlive-latexextra
+ virtual/latex-base
+ dev-tex/latexmk
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-pictures
+ dev-texlive/texlive-latexrecommended
+ )
+ hvm? ( x11-proto/xproto
+ !net-libs/libiscsi )
+ qemu? ( x11-libs/pixman )
+ system-qemu? ( app-emulation/qemu[xen] )
+ ocaml? ( dev-ml/findlib
+ >=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/iproute2
+ net-misc/bridge-utils
+ screen? (
+ app-misc/screen
+ app-admin/logrotate
+ )
+ virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+ usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ export "CONFIG_LOMOUNT=y"
+
+ #bug 522642, disable compile tools/tests
+ export "CONFIG_TESTS=n"
+
+ if has_version dev-libs/libgcrypt:0; then
+ export "CONFIG_GCRYPT=y"
+ fi
+
+ if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+ if use x86 && use amd64; then
+ die "Confusion! Both x86 and amd64 are set in your use flags!"
+ elif use x86; then
+ export XEN_TARGET_ARCH="x86_32"
+ elif use amd64 ; then
+ export XEN_TARGET_ARCH="x86_64"
+ elif use arm; then
+ export XEN_TARGET_ARCH="arm32"
+ elif use arm64; then
+ export XEN_TARGET_ARCH="arm64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
+}
+
+src_prepare() {
+ # Upstream's patchset
+ if [[ -n ${UPSTREAM_VER} ]]; then
+ einfo "Try to apply Xen Upstream patcheset"
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ EPATCH_OPTS="-p1" \
+ epatch "${WORKDIR}"/patches-upstream
+ fi
+
+ # Security patchset
+ if [[ -n ${SECURITY_VER} ]]; then
+ einfo "Try to apply Xen Security patcheset"
+ source "${WORKDIR}"/patches-security/${PV}.conf
+ # apply main xen patches
+ for i in ${XEN_SECURITY_MAIN}; do
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}"/patches-security/xen/$i
+ done
+
+ # apply qemu-traditional patches
+ pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+ for i in ${XEN_SECURITY_QEMUT}; do
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}"/patches-security/qemut/$i
+ done
+ popd > /dev/null
+
+ # apply qemu-xen/upstream patches
+ pushd "${S}"/tools/qemu-xen/ > /dev/null
+ for i in ${XEN_SECURITY_QEMUU}; do
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}"/patches-security/qemuu/$i
+ done
+ popd > /dev/null
+ fi
+
+ # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+ mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+ pushd tools/firmware/ > /dev/null
+ ln -s seabios-dir-remote seabios-dir || die
+ popd > /dev/null
+
+ # Gentoo's patchset
+ if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+ einfo "Try to apply Gentoo specific patcheset"
+ source "${FILESDIR}"/gentoo-patches.conf
+ _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+ for i in ${!_gpv}; do
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}"/patches-gentoo/$i
+ done
+ fi
+
+ # Ovmf's patchset
+ if [[ -n ${OVMF_VER} ]] && use ovmf; then
+ einfo "Try to apply Ovmf patcheset"
+ pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ EPATCH_OPTS="-p1" \
+ epatch "${WORKDIR}"/patches-ovmf
+ popd > /dev/null
+ mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+ fi
+
+ mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+ # Fix texi2html build error with new texi2html, qemu.doc.html
+ sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+ use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+ sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+ -i tools/firmware/Makefile || die
+
+ # Drop .config, fixes to gcc-4.6
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+ # if the user *really* wants to use their own custom-cflags, let them
+ if use custom-cflags; then
+ einfo "User wants their own CFLAGS - removing defaults"
+
+ # try and remove all the default cflags
+ find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+ -exec sed \
+ -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+ -i {} + || die "failed to re-set custom-cflags"
+ fi
+
+ if ! use pygrub; then
+ sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+ fi
+
+ if ! use python; then
+ sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+ fi
+
+ if ! use hvm; then
+ sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+ # Bug 351648
+ elif ! use x86 && ! has x86 $(get_all_abis); then
+ mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+ touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+ export CPATH="${WORKDIR}"/extra-headers
+ fi
+
+ # Don't bother with qemu, only needed for fully virtualised guests
+ if ! use qemu; then
+ sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+ fi
+
+ # Reset bash completion dir; Bug 472438
+ sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+ -i Config.mk || die
+ sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+ # xencommons, Bug #492332, sed lighter weight than patching
+ sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+ -i tools/hotplug/Linux/init.d/xencommons.in || die
+
+ # respect multilib, usr/lib/libcacard.so.0.0.0
+ sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+ -i tools/qemu-xen/configure || die
+
+ #bug 518136, don't build 32bit exactuable for nomultilib profile
+ if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+ sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+ fi
+
+ # use /var instead of /var/lib, consistat with previous ebuild
+ sed -i -e "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+ m4/paths.m4 configure tools/configure || die
+ # use /run instead of /var/run
+ sed -i -e "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+ m4/paths.m4 configure tools/configure || die
+
+ # uncomment lines in xl.conf
+ sed -e 's:^#autoballoon=:autoballoon=:' \
+ -e 's:^#lockfile=:lockfile=:' \
+ -e 's:^#vif.default.script=:vif.default.script=:' \
+ -i tools/examples/xl.conf || die
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf="--prefix=${PREFIX}/usr \
+ --libdir=${PREFIX}/usr/$(get_libdir) \
+ --libexecdir=${PREFIX}/usr/libexec \
+ --disable-werror \
+ --disable-xen \
+ --enable-tools \
+ --enable-docs \
+ $(use_with system-qemu) \
+ $(use_enable pam) \
+ $(use_enable api xenapi) \
+ $(use_enable ovmf) \
+ $(use_enable ocaml ocamltools) \
+ "
+ use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+ use qemu || myconf+=" --with-system-qemu"
+ use amd64 && myconf+=" --enable-qemu-traditional"
+ econf ${myconf}
+}
+
+src_compile() {
+ export VARTEXFONTS="${T}/fonts"
+ local myopt
+ use debug && myopt="${myopt} debug=y"
+
+ use custom-cflags || unset CFLAGS
+ if test-flag-CC -fno-strict-overflow; then
+ append-flags -fno-strict-overflow
+ fi
+
+ unset LDFLAGS
+ unset CFLAGS
+ emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+ use doc && emake -C docs txt html
+ emake -C docs man-pages
+}
+
+src_install() {
+ # Override auto-detection in the build system, bug #382573
+ export INITD_DIR=/tmp/init.d
+ export CONFIG_LEAF_DIR=../tmp/default
+
+ # Let the build system compile installed Python modules.
+ local PYTHONDONTWRITEBYTECODE
+ export PYTHONDONTWRITEBYTECODE
+
+ emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+ XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+ # Fix the remaining Python shebangs.
+ python_fix_shebang "${D}"
+
+ # Remove RedHat-specific stuff
+ rm -rf "${D}"tmp || die
+
+ if use doc; then
+ emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+ dohtml -r docs/
+ docinto pdf
+ dodoc ${DOCS[@]}
+ [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+ fi
+
+ rm -rf "${D}"/usr/share/doc/xen/
+ doman docs/man?/*
+
+ newconfd "${FILESDIR}"/xendomains.confd xendomains
+ newconfd "${FILESDIR}"/xenstored.confd xenstored
+ newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+ newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+ newinitd "${FILESDIR}"/xenstored.initd xenstored
+ newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+ newinitd "${FILESDIR}"/xencommons.initd xencommons
+ newconfd "${FILESDIR}"/xencommons.confd xencommons
+ newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+ newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+ if use screen; then
+ cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+ cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+ keepdir /var/log/xen-consoles
+ fi
+
+ # For -static-libs wrt Bug 384355
+ if ! use static-libs; then
+ rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+ fi
+
+ # for xendomains
+ keepdir /etc/xen/auto
+
+ # Temp QA workaround
+ dodir "$(get_udevdir)"
+ mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
+ rm -rf "${D}"/etc/udev
+
+ # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+ find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+ -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide and the offical wiki page:"
+ elog "https://wiki.gentoo.org/wiki/Xen"
+ elog "http://wiki.xen.org/wiki/Main_Page"
+ elog ""
+ elog "Recommended to utilise the xencommons script to config sytem At boot"
+ elog "Add by use of rc-update on completion of the install"
+
+ # TODO: we need to have the current Python slot here.
+ if ! has_version "dev-lang/python[ncurses]"; then
+ echo
+ ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+ ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+ fi
+
+ if has_version "sys-apps/iproute2[minimal]"; then
+ echo
+ ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+ ewarn "will not work until you rebuild iproute2 without USE=minimal."
+ fi
+
+ if ! use hvm; then
+ echo
+ elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+ elog "support enable the hvm use flag."
+ elog "An x86 or amd64 system is required to build HVM support."
+ fi
+
+ if use qemu; then
+ elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+ elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
+ elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
+ elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+ fi
+
+ if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+ echo
+ elog "xensv is broken upstream (Gentoo bug #142011)."
+ elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+ fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 0f7dc98..62bc2ca 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,4 +1,5 @@
DIST xen-4.2.5-upstream-patches-9.tar.xz 23208 SHA256 2206e9a8aeeed207abbae995c5d2baa14d5f0da4120ae44f2de733ecf7ea5af1 SHA512 8a2edaba48002449a521edf2ae078ffe1b3db4f491a85b063886a147a0be3ec7fdb819ce84c90cdae80ed34c10ab2d637506700be10052a67be6ef128fa40fb1 WHIRLPOOL 037820e0fad60d1f7ed054efa797585c992d08f1ffd533705c515ad289f8cdddc72b97f2a3d75ebd683c6bb6988d7285452b4f3cebbe9a879f701156e387ff3b
DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
DIST xen-4.5.1.tar.gz 18410400 SHA256 668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371 SHA512 9436243e26bc64bc836a179abdc3a6b1b6fa9d3f2170453092c18be71fa62e18cd4465a9154c0f28a7ac8d69d08361ba1defef240a51197f058c012c3855ba04 WHIRLPOOL 71d8559f86683dd9fb3eb09d3f602de227f281fbd3c8cc258bfdb67c425d9e7c4d21cb0284c123e4263262c1b821fea6d28109861ce60d627f6426d352808d99
+DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
DIST xen-security-patches-3.tar.xz 17028 SHA256 fb6301beb9a5c2d1e5d4de8783d8670e382b1bef48ec61e73d2d9be6901d289f SHA512 787fee8f7822577c6de91c4cf4d56d0e73ce46bac5524537ff66a718b6d7eae9d362265515743e8577b2c75f2841baed9837f71467b3b7b91a3111220da5f236 WHIRLPOOL 5c136289e654776bf918fe125fbecba7dac0929b236f7ae8158026a6bd6be12bc786a5ec96cb4022c18a5e7ffde82155deb57eb9639600e4c42c9c209f4a2ed6
diff --git a/app-emulation/xen/files/xen-4.3-fix_dotconfig-gcc.patch b/app-emulation/xen/files/xen-4.3-fix_dotconfig-gcc.patch
deleted file mode 100644
index 588be74..0000000
--- a/app-emulation/xen/files/xen-4.3-fix_dotconfig-gcc.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-# Fix gcc-4.6
-diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk
---- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800
-+++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800
-@@ -6,7 +6,7 @@
-
- # Define some default flags.
- # NB. '-Wcast-qual' is nasty, so I omitted it.
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
-diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile
---- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800
-+++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800
-@@ -85,7 +85,7 @@
-
- -include $(XEN_TARGET_ARCH)/Makefile
-
--CFLAGS += -Werror -Wmissing-prototypes
-+CFLAGS += -Wmissing-prototypes
- CFLAGS += -I. $(CFLAGS_xeninclude)
-
- # Needed for posix_fadvise64() in xc_linux.c
-# Drop .config
-diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk
---- Config.mk 2012-09-17 18:23:12.000000000 +0800
-+++ Config.mk 2012-12-05 14:01:10.641260261 +0800
-@@ -7,7 +7,6 @@ Drop .config
- # fallback for older make
- realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
-
---include $(XEN_ROOT)/.config
-
- # A debug build of Xen and tools?
- debug ?= n
-@@ -24,7 +24,7 @@
-
- # Tools to run on system hosting the build
- HOSTCC = gcc
--HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS = -Wstrict-prototypes -O2 -fomit-frame-pointer
- HOSTCFLAGS += -fno-strict-aliasing
-
- DISTDIR ?= $(XEN_ROOT)/dist
-@@ -156,7 +156,7 @@
-
- CFLAGS += -std=gnu99
-
--CFLAGS += -Wall -Wstrict-prototypes
-+CFLAGS += -Wstrict-prototypes
-
- # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...'
- # and is over-zealous with the printf format lint
-diff -ur xen-4.2.1.orig/tools/blktap2/drivers/Makefile xen-4.2.1/tools/blktap2/drivers/Makefile
---- tools/blktap2/drivers/Makefile 2012-12-17 23:00:11.000000000 +0800
-+++ tools/blktap2/drivers/Makefile 2013-01-30 12:31:43.539941099 +0800
-@@ -9,7 +9,7 @@
- LOCK_UTIL = lock-util
- INST_DIR = $(SBINDIR)
-
--CFLAGS += -Werror -g
-+CFLAGS += -g
- CFLAGS += -Wno-unused
- CFLAGS += -fno-strict-aliasing
- CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers
-diff -ur xen-4.2.1.orig/tools/debugger/gdbsx/Rules.mk xen-4.2.1/tools/debugger/gdbsx/Rules.mk
---- tools/debugger/gdbsx/Rules.mk 2012-12-17 23:00:22.000000000 +0800
-+++ tools/debugger/gdbsx/Rules.mk 2013-01-30 12:31:43.516941098 +0800
-@@ -1,4 +1,4 @@
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror -Wmissing-prototypes
-+CFLAGS += -Wmissing-prototypes
- # (gcc 4.3x and later) -Wconversion -Wno-sign-conversion
-diff -ur xen-4.2.1.orig/tools/libaio/harness/Makefile xen-4.2.1/tools/libaio/harness/Makefile
---- tools/libaio/harness/Makefile 2012-12-17 23:00:35.000000000 +0800
-+++ tools/libaio/harness/Makefile 2013-01-30 12:31:43.541941099 +0800
-@@ -4,7 +4,7 @@
- HARNESS_SRCS:=main.c
- # io_queue.c
-
--CFLAGS=-Wall -Werror -g -O -laio
-+CFLAGS=-Wall -g -O -laio
- #-lpthread -lrt
-
- all: $(PROGS)
-diff -ur xen-4.2.1.orig/tools/libfsimage/Rules.mk xen-4.2.1/tools/libfsimage/Rules.mk
---- tools/libfsimage/Rules.mk 2012-12-17 23:00:36.000000000 +0800
-+++ tools/libfsimage/Rules.mk 2013-01-30 12:31:43.515941097 +0800
-@@ -1,7 +1,7 @@
- include $(XEN_ROOT)/tools/Rules.mk
-
- CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\"
--CFLAGS += -Werror -D_GNU_SOURCE
-+CFLAGS += -D_GNU_SOURCE
- LDFLAGS += -L../common/
-
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
-diff -ur xen-4.2.1.orig/tools/libxl/Makefile xen-4.2.1/tools/libxl/Makefile
---- tools/libxl/Makefile 2012-12-17 23:01:08.000000000 +0800
-+++ tools/libxl/Makefile 2013-01-30 12:31:43.541941099 +0800
-@@ -11,7 +11,7 @@
- XLUMAJOR = 1.0
- XLUMINOR = 1
-
--CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
-+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \
- -Wno-declaration-after-statement -Wformat-nonliteral
- CFLAGS += -I. -fPIC
-
-diff -ur xen-4.2.1.orig/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.2.1/tools/qemu-xen/pc-bios/optionrom/Makefile
---- tools/qemu-xen/pc-bios/optionrom/Makefile 2012-09-11 02:10:52.000000000 +0800
-+++ tools/qemu-xen/pc-bios/optionrom/Makefile 2013-01-30 12:31:43.528941098 +0800
-@@ -9,7 +9,7 @@
-
- .PHONY : all clean build-all
-
--CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
-+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin
- CFLAGS += -I$(SRC_PATH)
- CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector)
- QEMU_CFLAGS = $(CFLAGS)
-diff -ur xen-4.2.1.orig/tools/xenstat/xentop/Makefile xen-4.2.1/tools/xenstat/xentop/Makefile
---- tools/xenstat/xentop/Makefile 2012-12-17 23:01:35.000000000 +0800
-+++ tools/xenstat/xentop/Makefile 2013-01-30 12:31:43.535941098 +0800
-@@ -18,7 +18,7 @@
- all install xentop:
- else
-
--CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat)
-+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat)
- LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS)
- CFLAGS += -DHOST_$(XEN_OS)
-
-diff -ur xen-4.2.1.orig/xen/arch/arm/Rules.mk xen-4.2.1/xen/arch/arm/Rules.mk
---- xen/arch/arm/Rules.mk 2012-12-17 23:01:37.000000000 +0800
-+++ xen/arch/arm/Rules.mk 2013-01-30 12:31:43.498941097 +0800
-@@ -9,7 +9,7 @@
- HAS_DEVICE_TREE := y
-
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
- CFLAGS += -I$(BASEDIR)/include
-
- # Prevent floating-point variables from creeping into Xen.
-diff -ur xen-4.2.1.orig/xen/arch/x86/Rules.mk xen-4.2.1/xen/arch/x86/Rules.mk
---- xen/arch/x86/Rules.mk 2012-12-17 23:01:37.000000000 +0800
-+++ xen/arch/x86/Rules.mk 2013-01-30 12:31:43.490941096 +0800
-@@ -24,7 +24,7 @@
- endif
-
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
- CFLAGS += -I$(BASEDIR)/include
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
-diff -ur xen-4.2.1.orig/xen/include/Makefile xen-4.2.1/xen/include/Makefile
---- xen/include/Makefile 2012-12-17 23:01:55.000000000 +0800
-+++ xen/include/Makefile 2013-01-30 12:31:43.502941097 +0800
-@@ -78,7 +78,7 @@
- all: headers.chk
-
- headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile
-- for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new
-+ for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new
- mv $@.new $@
-
- endif
-diff -ur xen-4.2.1.orig/tools/tests/mce-test/tools/Makefile xen-4.2.1/tools/tests/mce-test/tools/Makefile
---- tools/tests/mce-test/tools/Makefile 2012-12-17 23:01:35.000000000 +0800
-+++ tools/tests/mce-test/tools/Makefile 2013-01-30 13:01:44.890020152 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=$(CURDIR)/../../../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_libxenguest)
- CFLAGS += $(CFLAGS_libxenstore)
-diff -ur xen-4.2.1.orig/tools/tests/mem-sharing/Makefile xen-4.2.1/tools/tests/mem-sharing/Makefile
---- tools/tests/mem-sharing/Makefile 2012-12-17 23:01:35.000000000 +0800
-+++ tools/tests/mem-sharing/Makefile 2013-01-30 13:01:44.890020152 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=$(CURDIR)/../../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
-
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_xeninclude)
-diff -ur xen-4.2.1.orig/tools/tests/xen-access/Makefile xen-4.2.1/tools/tests/xen-access/Makefile
---- tools/tests/xen-access/Makefile 2012-12-17 23:01:35.000000000 +0800
-+++ tools/tests/xen-access/Makefile 2013-01-30 13:01:44.891020152 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=$(CURDIR)/../../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
-
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_libxenguest)
-diff -ur xen-4.3.0.orig/tools/firmware/Rules.mk xen-4.3.0/tools/firmware/Rules.mk
---- tools/firmware/Rules.mk 2013-07-09 18:46:56.000000000 +0800
-+++ ttools/firmware/Rules.mk 2013-07-20 20:28:57.811836505 +0800
-@@ -11,8 +11,6 @@
- CFLAGS += -DNDEBUG
- endif
-
--CFLAGS += -Werror
--
- $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
-
- # Extra CFLAGS suitable for an embedded type of environment.
diff --git a/app-emulation/xen/files/xen-4.4-efi.patch b/app-emulation/xen/files/xen-4.4-efi.patch
deleted file mode 100644
index c584d14..0000000
--- a/app-emulation/xen/files/xen-4.4-efi.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/xen/Makefile b/xen/Makefile
-index 39839a3..d2603f0 100644
---- a/xen/Makefile
-+++ b/xen/Makefile
-@@ -38,9 +38,15 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
- _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
- [ -d $(D)/boot ] || $(INSTALL_DIR) $(D)/boot
- $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)-$(XEN_FULLVERSION)$(Z)
-- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
-- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)-$(XEN_VERSION)$(Z)
-- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)$(Z)
-+ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \
-+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
-+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)-$(XEN_VERSION)$(Z);\
-+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)$(Z); \
-+ else \
-+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
-+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)-$(XEN_VERSION)$(Z);\
-+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)$(Z); \
-+ fi; \
- $(INSTALL_DATA) $(TARGET)-syms $(D)/boot/$(T)-syms-$(XEN_FULLVERSION)
- if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
- [ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \
-diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
-index d502bdf..a2121b0 100644
---- a/xen/arch/x86/Makefile
-+++ b/xen/arch/x86/Makefile
-@@ -112,7 +112,7 @@ $(TARGET)-syms: prelink.o xen.lds $(BASEDIR)/common/symbols-dummy.o
- $(@D)/.$(@F).1.o -o $@
- rm -f $(@D)/.$(@F).[0-9]*
-
--EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
-+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
- EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
- EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
- EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)
diff --git a/app-emulation/xen/files/xen-4.6-efi.patch b/app-emulation/xen/files/xen-4.6-efi.patch
new file mode 100644
index 0000000..bf888de
--- /dev/null
+++ b/app-emulation/xen/files/xen-4.6-efi.patch
@@ -0,0 +1,36 @@
+diff --git a/xen/Makefile b/xen/Makefile
+index 4c54e9b..a5cdccd 100644
+--- a/xen/Makefile
++++ b/xen/Makefile
+@@ -41,9 +41,15 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
+ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
+ [ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR)
+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
+- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
+- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
+- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z)
++ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \
++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
++ else \
++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
++ fi;
+ [ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR)
+ $(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION)
+ if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
+diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
+index 5f24951..4ec0ee2 100644
+--- a/xen/arch/x86/Makefile
++++ b/xen/arch/x86/Makefile
+@@ -116,7 +116,7 @@ $(TARGET)-syms: prelink.o xen.lds $(BASEDIR)/common/symbols-dummy.o
+ $(@D)/.$(@F).1.o -o $@
+ rm -f $(@D)/.$(@F).[0-9]*
+
+-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
+ EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
+ EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
+ EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)
diff --git a/app-emulation/xen/xen-4.6.0.ebuild b/app-emulation/xen/xen-4.6.0.ebuild
new file mode 100644
index 0000000..4deb661
--- /dev/null
+++ b/app-emulation/xen/xen-4.6.0.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+ KEYWORDS=""
+ EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
+ live_eclass="git-2"
+else
+ KEYWORDS="~amd64 ~arm ~arm64 -x86"
+ UPSTREAM_VER=
+ SECURITY_VER=
+ GENTOO_VER=
+
+ [[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+ [[ -n ${SECURITY_VER} ]] && \
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+ [[ -n ${GENTOO_VER} ]] && \
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+ SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+ ${UPSTREAM_PATCHSET_URI}
+ ${SECURITY_PATCHSET_URI}
+ ${GENTOO_PATCHSET_URI}"
+
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask xsm"
+
+DEPEND="${PYTHON_DEPS}
+ efi? ( >=sys-devel/binutils-2.22[multitarget] )
+ !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="flask? ( xsm )
+ arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ if [[ -z ${XEN_TARGET_ARCH} ]]; then
+ if use x86 && use amd64; then
+ die "Confusion! Both x86 and amd64 are set in your use flags!"
+ elif use x86; then
+ export XEN_TARGET_ARCH="x86_32"
+ elif use amd64; then
+ export XEN_TARGET_ARCH="x86_64"
+ elif use arm; then
+ export XEN_TARGET_ARCH="arm32"
+ elif use arm64; then
+ export XEN_TARGET_ARCH="arm64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
+
+ if use flask ; then
+ export "XSM_ENABLE=y"
+ export "FLASK_ENABLE=y"
+ elif use xsm ; then
+ export "XSM_ENABLE=y"
+ fi
+}
+
+src_prepare() {
+ # Upstream's patchset
+ if [[ -n ${UPSTREAM_VER} ]]; then
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ EPATCH_OPTS="-p1" \
+ epatch "${WORKDIR}"/patches-upstream
+ fi
+
+ # Security patchset
+ if [[ -n ${SECURITY_VER} ]]; then
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ EPATCH_OPTS="-p1" \
+ epatch "${WORKDIR}/patches-security/${PV}"
+ fi
+
+ # Gentoo's patchset
+ if [[ -n ${GENTOO_VER} ]]; then
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}"/patches-gentoo
+ fi
+
+ epatch "${FILESDIR}"/${PN}-4.6-efi.patch
+
+ # Drop .config
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+ if use efi; then
+ export EFI_VENDOR="gentoo"
+ export EFI_MOUNTPOINT="boot"
+ fi
+
+ # if the user *really* wants to use their own custom-cflags, let them
+ if use custom-cflags; then
+ einfo "User wants their own CFLAGS - removing defaults"
+ # try and remove all the default custom-cflags
+ find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+ -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+ -i {} \; || die "failed to re-set custom-cflags"
+ fi
+
+ # remove -Werror for gcc-4.6's sake
+ find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+ xargs sed -i 's/ *-Werror */ /'
+ # not strictly necessary to fix this
+ sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+ epatch_user
+}
+
+src_configure() {
+ use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+ use debug && myopt="${myopt} debug=y"
+
+ if use custom-cflags; then
+ filter-flags -fPIE -fstack-protector
+ replace-flags -O3 -O2
+ else
+ unset CFLAGS
+ fi
+}
+
+src_compile() {
+ # Send raw LDFLAGS so that --as-needed works
+ emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+ local myopt
+ use debug && myopt="${myopt} debug=y"
+
+ # The 'make install' doesn't 'mkdir -p' the subdirs
+ if use efi; then
+ mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+ fi
+
+ emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide and the unoffical wiki page:"
+ elog " https://wiki.gentoo.org/wiki/Xen"
+ elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+ use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
index 851d93e..c996a1f 100644
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
@@ -10,7 +10,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
diff --git a/app-forensics/aide/metadata.xml b/app-forensics/aide/metadata.xml
index 5771cd3..8acc034 100644
--- a/app-forensics/aide/metadata.xml
+++ b/app-forensics/aide/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>forensics</herd>
<use>
- <flag name="audit">Enable support for <pkg>sys-process/audit</pkg></flag>
<flag name="prelink">Enable support for <pkg>sys-devel/prelink</pkg></flag>
</use>
<upstream>
diff --git a/app-laptop/samsung-tools/metadata.xml b/app-laptop/samsung-tools/metadata.xml
index f80fe72..6ca6fbc 100644
--- a/app-laptop/samsung-tools/metadata.xml
+++ b/app-laptop/samsung-tools/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>proxy-maintainers</herd>
<maintainer>
- <email>maintainer-needed@gentoo.org</email>
+ <email>brendan@horan.hk</email>
+ <name>Brendan Horan</name>
+ <description>Proxy maintainer for assignee of bugs</description>
</maintainer>
<upstream>
<remote-id type="launchpad">samsung-tools</remote-id>
diff --git a/app-misc/mc/mc-4.8.14.ebuild b/app-misc/mc/mc-4.8.14.ebuild
index eee73d2..5b989ad 100644
--- a/app-misc/mc/mc-4.8.14.ebuild
+++ b/app-misc/mc/mc-4.8.14.ebuild
@@ -14,7 +14,7 @@
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index fa65084..9153fdb 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,3 +1 @@
-DIST screen-4.0.3.tar.gz 840602 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77 SHA512 24c1f598972f3dc9ed49cd2c05852190a0190d22fa01401eee8484627c8dd2815f0a422d9b2697faa8aaa0b3efc6730a94e2d5aa787dbe5e9ec719143176c338 WHIRLPOOL 6774786126eb05749d432593bc2c1febdc57896959220a609feb138bdc16b8da278aea63af1ccfd5c7d38ccaa9e7d28980e9e14d0009d36a54cdbd9e4cb0fca7
-DIST screen-4.2.1.tar.gz 1062485 SHA256 5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080 SHA512 30826b2a2fc436483276b90cc4c6679470f7ccb7098c9bb8457d0e534998cd12da02882cf80678465f6540cade170c3fdc6bdfa31b07359ff0d3ffe2d6063710 WHIRLPOOL 7d4209651a016a9ab91aec385532c6ebd7a6d96a60342721f3a53752924c3fb72aa3d648ad665b67fab0a78d6019396abe13e04f556c7e5e9f71bf3238e64cc5
DIST screen-4.3.1.tar.gz 845958 SHA256 fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63 SHA512 8e8a25b23330a7d8e00fc9e6cc430f0eb3937ccf4183efbd6fd24e4dc04cc09b3acae45bfc24892faee433b18fa79b1cfe0211fd75c0d74ecf908f916bf774aa WHIRLPOOL b47f7538351028cc3a2ec7f69a9373e152fa7655c6ae9feb75ba46db3cdc9b7d58ce78043993b7f134da3a04754c5e52d1a77da4c30a8decda21c79cf5c50f51
diff --git a/app-misc/screen/files/4.0.2-64bit-time.patch b/app-misc/screen/files/4.0.2-64bit-time.patch
deleted file mode 100644
index 645b37f..0000000
--- a/app-misc/screen/files/4.0.2-64bit-time.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- utmp.c.orig 2004-11-14 23:15:28.000000000 +0100
-+++ utmp.c 2004-11-14 23:15:39.000000000 +0100
-@@ -618,7 +618,7 @@
- #endif /* sgi */
- strncpy(u->ut_line, line, sizeof(u->ut_line));
- u->ut_pid = pid;
-- (void)time((time_t *)&u->ut_time);
-+ u->ut_time = time(NULL);
- }
-
- static slot_t
diff --git a/app-misc/screen/files/4.0.2-no-libelf.patch b/app-misc/screen/files/4.0.2-no-libelf.patch
deleted file mode 100644
index df06383..0000000
--- a/app-misc/screen/files/4.0.2-no-libelf.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- screen-4.0.2/configure.in 2005-05-22 19:55:06.559874997 +0000
-+++ screen-4.0.2-no-libelf/configure.in 2005-05-22 19:56:05.895801017 +0000
-@@ -195,15 +195,6 @@
- #endif
- ], LIBS="$LIBS -lsocket -linet";seqptx=1)
-
--oldlibs="$LIBS"
--LIBS="$LIBS -lelf"
--AC_CHECKING(SVR4)
--AC_TRY_LINK([#include <utmpx.h>
--],,
--[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN),
--[AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])]
--,LIBS="$oldlibs")
--
- AC_CHECKING(for Solaris 2.x)
- AC_EGREP_CPP(yes,
- [#if defined(SVR4) && defined(sun)
diff --git a/app-misc/screen/files/4.0.2-no-pty.patch b/app-misc/screen/files/4.0.2-no-pty.patch
deleted file mode 100644
index 7b7b798..0000000
--- a/app-misc/screen/files/4.0.2-no-pty.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- screen-4.0.2/pty.c.orig 2004-07-29 23:53:45.313533536 -0400
-+++ screen-4.0.2/pty.c 2004-07-29 23:53:59.011451136 -0400
-@@ -33,11 +33,6 @@
- # include <sys/ioctl.h>
- #endif
-
--/* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_SVR4_PTYS
--# include <sys/stropts.h>
--#endif
--
- #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
- # include <sys/ttold.h>
- #endif
diff --git a/app-misc/screen/files/4.0.2-no-utempter.patch b/app-misc/screen/files/4.0.2-no-utempter.patch
deleted file mode 100644
index 2a06119..0000000
--- a/app-misc/screen/files/4.0.2-no-utempter.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- screen-4.0.2/configure.in.orig 2004-12-17 19:55:45.314670411 +0100
-+++ screen-4.0.2/configure.in 2004-12-17 19:55:50.575941541 +0100
-@@ -855,11 +855,6 @@
- #include <utmp.h>
- #endif
- ],[struct utmp u; u.ut_host[0] = 0;], AC_DEFINE(UTHOST))
--AC_CHECK_HEADER(utempter.h, have_utempter=yes, have_utempter=no)
--if test "$have_utempter" = yes; then
-- AC_DEFINE(HAVE_UTEMPTER)
-- LIBS="$LIBS -lutempter"
--fi
-
- dnl
- dnl **** loadav ****
diff --git a/app-misc/screen/files/4.0.2-nonblock.patch b/app-misc/screen/files/4.0.2-nonblock.patch
deleted file mode 100644
index f27c903..0000000
--- a/app-misc/screen/files/4.0.2-nonblock.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- screen.c.orig 2006-04-02 17:05:28.000000000 +0200
-+++ screen.c 2006-04-02 17:05:39.000000000 +0200
-@@ -1197,7 +1197,7 @@ char **av;
- if (!detached)
- {
- /* reopen tty. must do this, because fd 0 may be RDONLY */
-- if ((n = secopen(attach_tty, O_RDWR, 0)) < 0)
-+ if ((n = secopen(attach_tty, O_RDWR | O_NONBLOCK, 0)) < 0)
- Panic(0, "Cannot reopen '%s' - please check.", attach_tty);
- }
- else
diff --git a/app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch b/app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch
deleted file mode 100644
index 09848e9..0000000
--- a/app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur screen-4.0.2.orig/process.c screen-4.0.2/process.c
---- screen-4.0.2.orig/process.c 2003-09-18 14:53:54.000000000 +0200
-+++ screen-4.0.2/process.c 2005-07-06 19:55:08.370772955 +0200
-@@ -4841,7 +4841,7 @@
- s = buf;
- for (display = displays; display; display = display->d_next)
- {
-- if (D_user == olddisplay->d_user)
-+ if (olddisplay && D_user == olddisplay->d_user)
- continue;
- for (cv = D_cvlist; cv; cv = cv->c_next)
- if (Layer2Window(cv->c_layer) == p)
diff --git a/app-misc/screen/files/4.0.3-extend-d_termname-ng2.patch b/app-misc/screen/files/4.0.3-extend-d_termname-ng2.patch
deleted file mode 100644
index 21b1108..0000000
--- a/app-misc/screen/files/4.0.3-extend-d_termname-ng2.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-diff --git a/acls.c b/acls.c
-index 0f98df2..5f26d70 100644
---- a/acls.c
-+++ b/acls.c
-@@ -178,7 +178,7 @@ struct acluser **up;
- #endif
- (*up)->u_Esc = DefaultEsc;
- (*up)->u_MetaEsc = DefaultMetaEsc;
-- strncpy((*up)->u_name, name, 20);
-+ strncpy((*up)->u_name, name, MAXSTR);
- (*up)->u_password = NULL;
- if (pass)
- (*up)->u_password = SaveStr(pass);
-@@ -314,8 +314,8 @@ struct acluser **up;
- return UserAdd(name, pass, up);
- if (!strcmp(name, "nobody")) /* he remains without password */
- return -1;
-- strncpy((*up)->u_password, pass ? pass : "", 20);
-- (*up)->u_password[20] = '\0';
-+ strncpy((*up)->u_password, pass ? pass : "", MAXSTR);
-+ (*up)->u_password[MAXSTR] = '\0';
- return 0;
- }
- #endif
-diff --git a/acls.h b/acls.h
-index c41b714..7f20f55 100644
---- a/acls.h
-+++ b/acls.h
-@@ -36,6 +36,16 @@
- #define ACLBYTE(data, w) ((data)[(w) >> 3])
- #define ACLBIT(w) (0x80 >> ((w) & 7))
-
-+#include <limits.h>
-+
-+#ifndef NAME_MAX
-+# ifndef MAXNAMELEN
-+# define NAME_MAX 255
-+# else
-+# define NAME_MAX MAXNAMELEN
-+# endif
-+#endif
-+
- typedef unsigned char * AclBits;
-
- /*
-@@ -73,7 +83,7 @@ struct plop
- typedef struct acluser
- {
- struct acluser *u_next; /* continue the main user list */
-- char u_name[20+1]; /* login name how he showed up */
-+ char u_name[NAME_MAX+1]; /* login name how he showed up */
- char *u_password; /* his password (may be NullStr). */
- int u_checkpassword; /* nonzero if this u_password is valid */
- int u_detachwin; /* the window where he last detached */
-diff --git a/display.h b/display.h
-index ef99954..563fcd0 100644
---- a/display.h
-+++ b/display.h
-@@ -22,6 +22,16 @@
- * $Id: display.h,v 1.9 1994/05/31 12:31:54 mlschroe Exp $ FAU
- */
-
-+#include <limits.h>
-+
-+#ifndef NAME_MAX
-+# ifndef MAXNAMELEN
-+# define NAME_MAX 255
-+# else
-+# define NAME_MAX MAXNAMELEN
-+# endif
-+#endif
-+
- #ifdef MAPKEYS
-
- #define KMAP_KEYS (T_OCAPS-T_CAPS)
-@@ -85,7 +95,7 @@ struct display
- struct win *d_other; /* pointer to other window */
- int d_nonblock; /* -1 don't block if obufmax reached */
- /* >0: block after nonblock secs */
-- char d_termname[20 + 1]; /* $TERM */
-+ char d_termname[NAME_MAX + 1]; /* $TERM */
- char *d_tentry; /* buffer for tgetstr */
- char d_tcinited; /* termcap inited flag */
- int d_width, d_height; /* width/height of the screen */
-diff --git a/screen.c b/screen.c
-index 70741df..6f45b60 100644
---- a/screen.c
-+++ b/screen.c
-@@ -106,6 +106,16 @@ FILE *dfp;
- #endif
-
-
-+#include <limits.h>
-+
-+#ifndef NAME_MAX
-+# ifndef MAXNAMELEN
-+# define NAME_MAX 255
-+# else
-+# define NAME_MAX MAXNAMELEN
-+# endif
-+#endif
-+
- extern char Term[], screenterm[], **environ, Termcap[];
- int force_vt = 1;
- int VBellWait, MsgWait, MsgMinWait, SilenceWait;
-@@ -877,13 +887,13 @@ char **av;
-
- if (home == 0 || *home == '\0')
- home = ppp->pw_dir;
-- if (strlen(LoginName) > 20)
-+ if (strlen(LoginName) > NAME_MAX)
- Panic(0, "LoginName too long - sorry.");
- #ifdef MULTIUSER
-- if (multi && strlen(multi) > 20)
-+ if (multi && strlen(multi) > NAME_MAX)
- Panic(0, "Screen owner name too long - sorry.");
- #endif
-- if (strlen(home) > MAXPATHLEN - 25)
-+ if (strlen(home) > MAXPATHLEN - NAME_MAX)
- Panic(0, "$HOME too long - sorry.");
-
- attach_tty = "";
-diff --git a/screen.h b/screen.h
-index 4f9f354..bcaaaf6 100644
---- a/screen.h
-+++ b/screen.h
-@@ -43,6 +43,15 @@
- #include "comm.h"
- #include "layer.h"
- #include "term.h"
-+#include <limits.h>
-+
-+#ifndef NAME_MAX
-+# ifndef MAXNAMELEN
-+# define NAME_MAX 255
-+# else
-+# define NAME_MAX MAXNAMELEN
-+# endif
-+#endif
-
-
- #ifdef DEBUG
-@@ -195,26 +204,26 @@ struct msg
- create;
- struct
- {
-- char auser[20 + 1]; /* username */
-+ char auser[NAME_MAX + 1]; /* username */
- int apid; /* pid of frontend */
- int adaptflag; /* adapt window size? */
- int lines, columns; /* display size */
- char preselect[20];
- int esc; /* his new escape character unless -1 */
- int meta_esc; /* his new meta esc character unless -1 */
-- char envterm[20 + 1]; /* terminal type */
-+ char envterm[NAME_MAX + 1]; /* terminal type */
- int encoding; /* encoding of display */
- }
- attach;
- struct
- {
-- char duser[20 + 1]; /* username */
-+ char duser[NAME_MAX + 1]; /* username */
- int dpid; /* pid of frontend */
- }
- detach;
- struct
- {
-- char auser[20 + 1]; /* username */
-+ char auser[NAME_MAX + 1]; /* username */
- int nargs;
- char cmd[MAXPATHLEN]; /* command */
- int apid; /* pid of frontend */
-diff --git a/socket.c b/socket.c
-index 62a73af..1cc9c27 100644
---- a/socket.c
-+++ b/socket.c
-@@ -45,6 +45,16 @@
-
- #include "extern.h"
-
-+#include <limits.h>
-+
-+#ifndef NAME_MAX
-+# ifndef MAXNAMELEN
-+# define NAME_MAX 255
-+# else
-+# define NAME_MAX MAXNAMELEN
-+# endif
-+#endif
-+
- static int CheckPid __P((int));
- static void ExecCreate __P((struct msg *));
- static void DoCommandMsg __P((struct msg *));
-@@ -1248,7 +1258,7 @@ static void PasswordProcessInput __P((char *, int));
-
- struct pwdata {
- int l;
-- char buf[20 + 1];
-+ char buf[NAME_MAX + 1];
- struct msg m;
- };
-
diff --git a/app-misc/screen/files/screen-4.0.1-int-overflow-fix.patch b/app-misc/screen/files/screen-4.0.1-int-overflow-fix.patch
deleted file mode 100644
index 4a40c8d..0000000
--- a/app-misc/screen/files/screen-4.0.1-int-overflow-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ansi.c.orig 2003-09-08 10:24:44.000000000 -0400
-+++ ansi.c 2003-11-29 10:41:15.000000000 -0500
-@@ -559,7 +559,7 @@
- {
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
-- if (curr->w_NumArgs < MAXARGS)
-+ if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS)
- {
- if (curr->w_args[curr->w_NumArgs] < 100000000)
- curr->w_args[curr->w_NumArgs] =
---- resize.c.orig 2003-09-08 10:26:31.000000000 -0400
-+++ resize.c 2003-11-29 10:41:50.000000000 -0500
-@@ -682,6 +682,17 @@
- if (wi == 0)
- he = hi = 0;
-
-+ if (wi > 1000)
-+ {
-+ Msg(0, "Window width too large, truncated");
-+ wi = 1000;
-+ }
-+ if (he > 1000)
-+ {
-+ Msg(0, "Window height too large, truncated");
-+ he = 1000;
-+ }
-+
- if (p->w_width == wi && p->w_height == he && p->w_histheight == hi)
- {
- debug("ChangeWindowSize: No change.\n");
diff --git a/app-misc/screen/files/screen-4.0.1-vsprintf.patch b/app-misc/screen/files/screen-4.0.1-vsprintf.patch
deleted file mode 100644
index b2f7a20..0000000
--- a/app-misc/screen/files/screen-4.0.1-vsprintf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- screen-4.0.1/configure.in 2003-06-03 07:58:24.000000000 -0400
-+++ screen-4.0.1/configure.in.agriffis 2004-01-13 12:07:37.000000000 -0500
-@@ -1206,7 +1206,9 @@
- rm -f /tmp/conftest*
-
- AC_MSG_CHECKING(for vsprintf)
--AC_TRY_LINK(,[vsprintf(0,0,0);], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no))
-+AC_TRY_LINK([#include <stdarg.h>],[va_list valist; vsprintf(0,0,valist);],
-+ [AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS)],
-+ [AC_MSG_RESULT(no)])
-
- AC_HEADER_DIRENT
-
diff --git a/app-misc/screen/files/screen-4.0.3-config.h-autoconf-2.62.patch b/app-misc/screen/files/screen-4.0.3-config.h-autoconf-2.62.patch
deleted file mode 100644
index 5605fda..0000000
--- a/app-misc/screen/files/screen-4.0.3-config.h-autoconf-2.62.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-compability for sys-devel/autoconf-2.62
-
-https://bugs.gentoo.org/show_bug.cgi?id=217311
-
---- screen/config.h.in
-+++ screen/config.h.in
-@@ -563,7 +563,6 @@
- * If you are on a SYS V machine that restricts filename length to 14
- * characters, you may need to enforce that by setting NAME_MAX to 14
- */
--#undef NAME_MAX /* KEEP_UNDEF_HERE override system value */
- #undef NAME_MAX
-
- /*
diff --git a/app-misc/screen/files/screen-4.0.3-cppflags.patch b/app-misc/screen/files/screen-4.0.3-cppflags.patch
deleted file mode 100644
index ee3455f..0000000
--- a/app-misc/screen/files/screen-4.0.3-cppflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- screen-4.0.3/Makefile.in
-+++ screen-4.0.3/Makefile.in
-@@ -68,7 +68,7 @@
- $(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
-
- .c.o:
-- $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
-+ $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CPPFLAGS) $(CFLAGS) $<
-
- install_bin: .version screen
- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
-@@ -122,7 +122,7 @@
- sh $(srcdir)/tty.sh tty.c
-
- comm.h: comm.c comm.sh config.h
-- AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
-+ AWK=$(AWK) CC="$(CC) $(CFLAGS) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
-
- osdef.h: osdef.sh config.h osdef.h.in
- CPP="$(CPP) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh
diff --git a/app-misc/screen/files/screen-4.0.3-crosscompile.patch b/app-misc/screen/files/screen-4.0.3-crosscompile.patch
deleted file mode 100644
index 6e6bb94..0000000
--- a/app-misc/screen/files/screen-4.0.3-crosscompile.patch
+++ /dev/null
@@ -1,598 +0,0 @@
---- configure.in~ 2008-11-23 17:43:48.000000000 +0000
-+++ configure.in 2008-11-23 17:43:48.000000000 +0000
-@@ -46,6 +46,7 @@
- AC_PROG_GCC_TRADITIONAL
- AC_ISC_POSIX
-
-+AC_MSG_CHECKING([for compiler sanity])
- AC_TRY_RUN(main(){exit(0);},,[
- if test $CC != cc ; then
- AC_NOTE(Your $CC failed - restarting with CC=cc)
-@@ -54,22 +55,17 @@
- export CC
- exec $0 $configure_args
- fi
--])
--
--AC_TRY_RUN(main(){exit(0);},,
--exec 5>&2
--eval $ac_link
--AC_NOTE(CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;)
--AC_NOTE($ac_compile)
--AC_MSG_ERROR(Can't run the compiler - sorry))
-+],AC_MSG_WARN([skipping test due to crosscompilation]))
-
-+AC_MSG_CHECKING([if compiler sets exit status])
- AC_TRY_RUN([
- main()
- {
- int __something_strange_();
- __something_strange_(0);
- }
--],AC_MSG_ERROR(Your compiler does not set the exit status - sorry))
-+],AC_MSG_ERROR(Your compiler does not set the exit status - sorry),,
-+AC_MSG_WARN(skipping test due to crosscompilation))
-
- AC_PROG_AWK
-
-@@ -103,6 +99,7 @@
- dnl
- dnl **** special unix variants ****
- dnl
-+AH_TEMPLATE(ISC,[])
- if test -n "$ISC"; then
- AC_DEFINE(ISC) LIBS="$LIBS -linet"
- fi
-@@ -114,11 +111,13 @@
- dnl fi
- dnl fi
-
-+AH_TEMPLATE([sysV68],[])
- if test -f /sysV68 ; then
- AC_DEFINE(sysV68)
- fi
-
- AC_CHECKING(for MIPS)
-+AH_TEMPLATE([MIPS],[])
- if test -f /lib/libmld.a || test -f /usr/lib/libmld.a || test -f /usr/lib/cmplrs/cc/libmld.a; then
- oldlibs="$LIBS"
- test -f /bin/mx || LIBS="$LIBS -lmld" # for nlist. But not on alpha.
-@@ -132,6 +131,8 @@
- AC_CHECKING(wait3)
- AC_TRY_LINK(,[wait3();], ,
- AC_CHECKING(wait2)
-+AH_TEMPLATE([USE_WAIT2],[On RISCOS we prefer wait2() over wait3(). rouilj@sni-usa.com])
-+dnl TODO(Hannes) shipped config.h.in wraps the define in #ifdef BSDWAIT
- AC_TRY_LINK(,[wait2();],
- dnl John Rouillard (rouilj@sni-usa.com):
- dnl need -I/usr/include/bsd in RISCOS otherwise sockets are broken, no
-@@ -154,9 +155,11 @@
- oldlibs="$LIBS"
- LIBS="$LIBS -lpyr"
- AC_CHECKING(Pyramid OSX)
-+AH_TEMPLATE([OSX], [Pyramid OSX])
- AC_TRY_LINK(,[open_controlling_pty("")], AC_DEFINE(OSX), LIBS="$oldlibs")
- fi
-
-+AH_TEMPLATE([POSIX],[Define POSIX if your system supports IEEE Std 1003.1-1988 (POSIX).])
- dnl ghazi@caip.rutgers.edu (Kaveh R. Ghazi):
- dnl BBN butterfly is not POSIX, but a MACH BSD system.
- dnl Do not define POSIX and TERMIO.
-@@ -183,6 +186,7 @@
- fi
-
- AC_CHECKING(for System V)
-+AH_TEMPLATE([SYSV], [Define SYSV if your machine is SYSV complient (Sys V, HPUX, A/UX)])
- AC_TRY_COMPILE(
- [#include <sys/types.h>
- #include <signal.h>
-@@ -226,6 +230,9 @@
- dnl
-
- AC_CHECKING(BSD job jontrol)
-+AH_TEMPLATE([BSDJOBS],
-+[Define BSDJOBS if you have BSD-style job control (both process
-+ groups and a tty that deals correctly with them)])
- AC_TRY_LINK(
- [#include <sys/types.h>
- #include <sys/ioctl.h>
-@@ -246,6 +253,10 @@
- dnl **** setreuid(), seteuid() ****
- dnl
- AC_CHECKING(setreuid)
-+AH_TEMPLATE([HAVE_SETREUID],
-+[If your system has the calls setreuid() and setregid(),
-+ define HAVE_SETREUID. Otherwise screen will use a forked process to
-+ safely create output files without retaining any special privileges.])
- AC_TRY_LINK(,[
- #ifdef __hpux
- setresuid(0, 0, 0);
-@@ -260,6 +271,9 @@
- dnl Solaris seteuid doesn't change the saved uid, bad for
- dnl multiuser screen sessions
- AC_CHECKING(seteuid)
-+AH_TEMPLATE([HAVE_SETEUID],
-+[If your system supports BSD4.4's seteuid() and setegid(), define
-+ HAVE_SETEUID.])
- AC_TRY_LINK(,[
- #if defined(linux) || defined(NeXT) || defined(_AUX_SOURCE) || defined(AUX) || defined(ultrix) || (defined(sun) && defined(SVR4)) || defined(ISC) || defined(sony_news)
- seteuid_is_broken(0);
-@@ -284,6 +298,8 @@
- dnl
-
- AC_CHECKING(fifos)
-+AC_CACHE_CHECK([usable fifos],
-+ [screen_cv_sys_fifo_usable],
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -348,12 +364,15 @@
- exit(1);
- exit(0);
- }
--], AC_NOTE(- your fifos are usable) fifo=1,
--AC_NOTE(- your fifos are not usable))
-+], screen_cv_sys_fifo_usable=yes, screen_cv_sys_fifo_usable=no))
- rm -f /tmp/conftest*
-
--if test -n "$fifo"; then
--AC_CHECKING(for broken fifo implementation)
-+if test X"$screen_cv_sys_fifo_usable" = Xyes; then
-+AH_TEMPLATE([BROKEN_PIPE],
-+[Define this if your system exits select() immediatly if a pipe is
-+ opened read-only and no writer has opened it.])
-+AC_CACHE_CHECK([broken fifo implementation],
-+ [screen_cv_sys_fifo_broken_impl],
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <fcntl.h>
-@@ -398,9 +416,12 @@
- exit(1);
- exit(0);
- }
--], AC_NOTE(- your implementation is ok),
--AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1)
-+], screen_cv_sys_fifo_broken_impl=no,
-+screen_cv_sys_fifo_broken_impl=yes))
-+if test X"$screen_cv_sys_fifo_broken_impl" = Xyes; then
-+ AC_DEFINE(BROKEN_PIPE)
-+fi
- rm -f /tmp/conftest*
- fi
-
- dnl
-@@ -410,6 +430,8 @@
- dnl
-
- AC_CHECKING(sockets)
-+AC_CACHE_CHECK([sockets are usable],
-+ [screen_cv_sys_sockets_usable],
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -460,12 +482,16 @@
- exit(1);
- exit(0);
- }
--], AC_NOTE(- your sockets are usable) sock=1,
--AC_NOTE(- your sockets are not usable))
--rm -f /tmp/conftest*
-+], screen_cv_sys_sockets_usable=yes,
-+screen_cv_sys_sockets_usable=no))
-
--if test -n "$sock"; then
-+if test X"$screen_cv_sys_sockets_usable" = Xyes; then
- AC_CHECKING(socket implementation)
-+AH_TEMPLATE([SOCK_NOT_IN_FS],
-+[Define this if the unix-domain socket implementation doesn't
-+ create a socket in the filesystem.])
-+AC_CACHE_CHECK([if sockets are not stored in the filesystem],
-+ [screen_cv_sys_sockets_nofs],
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -491,22 +517,25 @@
- close(s);
- exit(0);
- }
--],AC_NOTE(- you are normal),
--AC_NOTE(- unix domain sockets are not kept in the filesystem)
--AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1)
--rm -f /tmp/conftest*
-+], screen_cv_sys_sockets_nofs=no,
-+screen_cv_sys_sockets_nofs=yes))
-+
-+if test X"$screen_cv_sys_sockets_nofs" = Xyes; then
-+ AC_DEFINE(SOCK_NOT_IN_FS)
-+fi
- fi
-
-
- dnl
- dnl **** choose sockets or fifos ****
- dnl
--if test -n "$fifo"; then
-- if test -n "$sock"; then
-- if test -n "$nore"; then
-+AH_TEMPLATE([NAMEDPIPE], [Define this if your system supports named pipes.])
-+if test X"$screen_cv_sys_fifo_usable" = Xyes; then
-+ if test X"$screen_cv_sys_sockets_usable" = Xyes; then
-+ if test X"$screen_cv_sys_sockets_nofs" = Xyes; then
- AC_NOTE(- hmmm... better take the fifos)
- AC_DEFINE(NAMEDPIPE)
-- elif test -n "$fifobr"; then
-+ elif test X"$screen_cv_sys_fifo_broken_impl" = Xyes; then
- AC_NOTE(- as your fifos are broken lets use the sockets.)
- else
- AC_NOTE(- both sockets and fifos usable. let's take fifos.)
-@@ -516,7 +545,7 @@
- AC_NOTE(- using named pipes, of course)
- AC_DEFINE(NAMEDPIPE)
- fi
--elif test -n "$sock"; then
-+elif test X"$screen_cv_sys_sockets_usable" = Xyes; then
- AC_NOTE(- using unix-domain sockets, of course)
- else
- AC_MSG_ERROR(you have neither usable sockets nor usable pipes -> no screen)
-@@ -526,7 +555,11 @@
- dnl **** check the select implementation ****
- dnl
-
--AC_CHECKING(select return value)
-+AH_TEMPLATE([SELECT_BROKEN],
-+[If the select return value doesn't treat a descriptor that is
-+ usable for reading and writing as two hits, define SELECT_BROKEN.])
-+AC_CACHE_CHECK([for broken select return value],
-+ [screen_cv_sys_select_broken_retval],
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -625,17 +658,26 @@
- exit(1);
- exit(0);
- }
--],AC_NOTE(- select is ok),
--AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN))
-+], screen_cv_sys_select_broken_retval=no,
-+screen_cv_sys_select_broken_retval=yes))
-+if test X"$screen_cv_sys_select_broken_retval" = Xyes; then
-+ AC_DEFINE(SELECT_BROKEN)
-+fi
-
- dnl
- dnl **** termcap or terminfo ****
- dnl
-+AH_TEMPLATE([TERMINFO],
-+[Define TERMINFO if your machine emulates the termcap routines
-+ with the terminfo database.
-+ Thus the .screenrc file is parsed for
-+ the command 'terminfo' and not 'termcap'])
-+
- AC_CHECKING(for tgetent)
- AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
- olibs="$LIBS"
--LIBS="-lcurses $olibs"
- AC_CHECKING(libcurses)
-+AC_CHECK_LIB(ncursesw,tgetent)
- AC_TRY_LINK(,[
- #ifdef __hpux
- __sorry_hpux_libcurses_is_totally_broken_in_10_10();
-@@ -654,24 +696,39 @@
- AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
- AC_MSG_ERROR(!!! no tgetent - no screen))))))
-
--AC_TRY_RUN([
-+AC_CACHE_CHECK([using terminfo database],[screen_cv_sys_terminfo_used],
-+ AC_TRY_RUN([
- main()
- {
- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
--}], AC_NOTE(- you use the termcap database),
--AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO))
-+}
-+ ], screen_cv_sys_terminfo_used=no,
-+ screen_cv_sys_terminfo_used=yes)
-+)
-+
-+if test X"$screen_cv_sys_terminfo_used" = Xyes; then
-+ AC_DEFINE(TERMINFO)
-+fi
-+
- AC_CHECKING(ospeed)
-+AH_TEMPLATE([NEED_OSPEED],[If your library does not define ospeed, define this.])
- AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
-
- dnl
- dnl **** PTY specific things ****
- dnl
-+AH_TEMPLATE([HAVE_DEV_PTC],
-+[define HAVE_DEV_PTC if you have a /dev/ptc character special
-+ device.])
- AC_CHECKING(for /dev/ptc)
- if test -r /dev/ptc; then
- AC_DEFINE(HAVE_DEV_PTC)
- fi
-
- AC_CHECKING(for SVR4 ptys)
-+AH_TEMPLATE([HAVE_SVR4_PTYS],
-+[define HAVE_SVR4_PTYS if you have a /dev/ptmx character special
-+ device and support the ptsname(), grantpt(), unlockpt() functions.])
- sysvr4ptys=
- if test -c /dev/ptmx ; then
- AC_TRY_LINK([],[ptsname(0);grantpt(0);unlockpt(0);],[AC_DEFINE(HAVE_SVR4_PTYS)
-@@ -687,6 +744,13 @@
- fi
-
- AC_CHECKING(for ptyranges)
-+AH_TEMPLATE([PTYRANGE0],
-+[define PTYRANGE0 and or PTYRANGE1 if you want to adapt screen
-+ to unusual environments. E.g. For SunOs the defaults are "qpr" and
-+ "0123456789abcdef". For SunOs 4.1.2
-+ #define PTYRANGE0 "pqrstuvwxyzPQRST"
-+ is recommended by Dan Jacobson.])
-+AH_TEMPLATE([PTYRANGE1],[])
- if test -d /dev/ptym ; then
- pdir='/dev/ptym'
- else
-@@ -850,20 +914,39 @@
- dnl
- dnl **** loadav ****
- dnl
-+
-+AH_TEMPLATE([LOADAV],
-+[If you want the "time" command to display the current load average
-+ define LOADAV. Maybe you must install screen with the needed
-+ privileges to read /dev/kmem.
-+ Note that NLIST_ stuff is only checked, when getloadavg() is not available.
-+])
-+AH_TEMPLATE([LOADAV_NUM])
-+AH_TEMPLATE([LOADAV_TYPE])
-+AH_TEMPLATE([LOADAV_SCALE])
-+AH_TEMPLATE([LOADAV_GETLOADAVG])
-+AH_TEMPLATE([LOADAV_UNIX])
-+AH_TEMPLATE([LOADAV_AVENRUN])
-+AH_TEMPLATE([LOADAV_USE_NLIST64])
-+
-+AH_TEMPLATE([NLIST_DECLARED])
-+AH_TEMPLATE([NLIST_STRUCT])
-+AH_TEMPLATE([NLIST_NAME_UNION])
-+
- AC_CHECKING(for libutil(s))
--test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils"
--test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil"
-+dnl I have no idea whether "login" is an appropriate symbol to check for here - Hannes
-+AC_CHECK_LIB(utils,login)
-+AC_CHECK_LIB(util,login)
-
- AC_CHECKING(getloadavg)
- AC_TRY_LINK(,[getloadavg((double *)0, 0);],
- AC_DEFINE(LOADAV_GETLOADAVG) load=1,
--if test -f /usr/lib/libkvm.a ; then
- olibs="$LIBS"
--LIBS="$LIBS -lkvm"
-+AC_CHECK_LIB(kvm,kvm_open,
- AC_CHECKING(getloadavg with -lkvm)
- AC_TRY_LINK(,[getloadavg((double *)0, 0);],
- AC_DEFINE(LOADAV_GETLOADAVG) load=1, LIBS="$olibs")
--fi
-+)
- )
-
- if test -z "$load" ; then
-@@ -1005,6 +1088,11 @@
- dnl
- dnl **** signal handling ****
- dnl
-+
-+AH_TEMPLATE([SIGVOID],
-+[Define SIGVOID if your signal handlers return void. On older
-+ systems, signal returns int, but on newer ones, it returns void.])
-+
- if test -n "$posix" ; then
-
- dnl POSIX has reliable signals with void return type.
-@@ -1014,6 +1102,7 @@
- else
-
- AC_CHECKING(return type of signal handlers)
-+AH_TEMPLATE([USESIGSET], [Define USESIGSET if you have sigset for BSD 4.1 reliable signals.])
- AC_TRY_COMPILE(
- [#include <sys/types.h>
- #include <signal.h>
-@@ -1033,6 +1122,9 @@
- #endif
- ], AC_DEFINE(USESIGSET))
- AC_CHECKING(signal implementation)
-+AH_TEMPLATE([SYSVSIGS],
-+[Define SYSVSIGS if signal handlers must be reinstalled after
-+ they have been called.])
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <signal.h>
-@@ -1075,13 +1167,14 @@
- dnl
-
- AC_CHECKING(for crypt and sec libraries)
--test -f /lib/libcrypt_d.a || test -f /usr/lib/libcrypt_d.a && LIBS="$LIBS -lcrypt_d"
-+dnl I have no idea whether "crypt" is an appropriate symbol to check for here - Hannes
-+AC_CHECK_LIB(crypt_d,crypt)
- oldlibs="$LIBS"
--LIBS="$LIBS -lcrypt"
- AC_CHECKING(crypt)
- AC_TRY_LINK(,,,LIBS="$oldlibs")
--test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec"
--test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow"
-+AC_CHECK_LIB(crypt,crypt)
-+AC_CHECK_LIB(sec,crypt)
-+AC_CHECK_LIB(shadow,getspnam)
- oldlibs="$LIBS"
- LIBS="$LIBS -lsun"
- AC_CHECKING(IRIX sun library)
-@@ -1104,6 +1197,13 @@
- dnl **** misc things ****
- dnl
- AC_CHECKING(wait union)
-+AH_TEMPLATE([BSDWAIT],
-+[Define BSDWAIT if your system defines a 'union wait' in <sys/wait.h>
-+
-+ Only allow BSDWAIT i.e. wait3 on nonposix systems, since
-+ posix implies wait(3) and waitpid(3). vdlinden@fwi.uva.nl
-+ TODO(Hannes) shipped config.h.in does that with a #ifdef
-+])
- AC_TRY_COMPILE([#include <sys/types.h>
- #include <sys/wait.h>
- ],[
-@@ -1114,6 +1214,13 @@
- #endif
- ],AC_DEFINE(BSDWAIT))
-
-+AH_TEMPLATE([TERMIO],
-+[Define TERMIO if you have struct termio instead of struct sgttyb.
-+ This is usually the case for SVID systems, where BSD uses sgttyb.
-+ POSIX systems should define this anyway, even though they use
-+ struct termios.])
-+
-+
- if test -z "$butterfly"; then
- AC_CHECKING(for termio or termios)
- AC_TRY_CPP([#include <termio.h>], AC_DEFINE(TERMIO),
-@@ -1123,17 +1230,35 @@
- )
- fi
-
-+AH_TEMPLATE([CYTERMIO], [Define CYTERMIO if you have cyrillic termio modes.])
-+
- dnl AC_CHECK_HEADER(shadow.h, AC_DEFINE(SHADOWPW))
- AC_CHECKING(getspnam)
-+AH_TEMPLATE([SHADOWPW],
-+[If the passwords are stored in a shadow file and you want the
-+ builtin lock to work properly, define SHADOWPW.])
- AC_TRY_LINK([#include <shadow.h>], [getspnam("x");],AC_DEFINE(SHADOWPW))
-
- AC_CHECKING(getttyent)
-+AH_TEMPLATE([GETTTYENT],
-+[If your system has the new format /etc/ttys (like 4.3 BSD) and the
-+ getttyent(3) library functions, define GETTTYENT.])
- AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT))
-
- AC_CHECKING(fdwalk)
-+AH_TEMPLATE([HAVE_FDWALK],
-+[Newer versions of Solaris include fdwalk, which can greatly improve
-+ the startup time of screen; otherwise screen spends a lot of time
-+ closing file descriptors.])
- AC_TRY_LINK([#include <stdlib.h>], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK))
-
--AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments)
-+AH_TEMPLATE([USEBCOPY],
-+[Define USEBCOPY if the bcopy/memcpy from your system's C library
-+ supports the overlapping of source and destination blocks. When
-+ undefined, screen uses its own (probably slower) version of bcopy().])
-+
-+AC_CACHE_CHECK([if bcopy handles overlap],
-+ [screen_cv_sys_bcopy_overlap],
- AC_TRY_RUN([
- main() {
- char buf[10];
-@@ -1146,7 +1271,21 @@
- if (strncmp(buf, "cdedef", 6))
- exit(1);
- exit(0); /* libc version works properly. */
--}], AC_DEFINE(USEBCOPY))
-+}], screen_cv_sys_bcopy_overlap=yes,
-+screen_cv_sys_bcopy_overlap=no))
-+if test X"$screen_cv_sys_bcopy_overlap" = Xyes; then
-+ AC_DEFINE(USEBCOPY)
-+fi
-+
-+AH_TEMPLATE([USEMEMMOVE],
-+[SYSV machines may have a working memcpy() -- Oh, this is
-+ quite unlikely. Tell me if you see one.
-+ "But then, memmove() should work, if at all available" he thought...
-+ Boing, never say "works everywhere" unless you checked SCO UNIX.
-+ Their memove fails the test in the configure script. Sigh. (Juergen)
-+])
-+AC_CACHE_CHECK([if memmove handles overlap],
-+ [screen_cv_sys_memmove_overlap],
-
- AC_TRY_RUN([
- #define bcopy(s,d,l) memmove(d,s,l)
-@@ -1161,9 +1300,15 @@
- if (strncmp(buf, "cdedef", 6))
- exit(1);
- exit(0); /* libc version works properly. */
--}], AC_DEFINE(USEMEMMOVE))
--
-+}], screen_cv_sys_memmove_overlap=yes,
-+screen_cv_sys_memmove_overlap=no))
-+if test X"$screen_cv_sys_memmove_overlap" = Xyes; then
-+ AC_DEFINE(USEMEMMOVE)
-+fi
-
-+AH_TEMPLATE([USEMEMCPY],[])
-+AC_CACHE_CHECK([if memcpy handles overlap],
-+ [screen_cv_sys_memcpy_overlap],
- AC_TRY_RUN([
- #define bcopy(s,d,l) memcpy(d,s,l)
- main() {
-@@ -1177,9 +1322,19 @@
- if (strncmp(buf, "cdedef", 6))
- exit(1);
- exit(0); /* libc version works properly. */
--}], AC_DEFINE(USEMEMCPY))
-+}], screen_cv_sys_memcpy_overlap=yes,
-+screen_cv_sys_memcpy_overlap=no))
-+if test X"$screen_cv_sys_memcpy_overlap" = Xyes; then
-+ AC_DEFINE(USEMEMCPY)
-+fi
-
- AC_MSG_CHECKING(long file names)
-+AH_TEMPLATE([NAME_MAX],
-+[If you are on a SYS V machine that restricts filename length to 14
-+ characters, you may need to enforce that by setting NAME_MAX to 14])
-+dnl TODO(Hannes) shipped config.h.in has
-+dnl #undef NAME_MAX /* KEEP_UNDEF_HERE override system value */
-+dnl ahead of this
- (echo 1 > /tmp/conftest9012345) 2>/dev/null
- (echo 2 > /tmp/conftest9012346) 2>/dev/null
- val=`cat /tmp/conftest9012345 2>/dev/null`
-@@ -1192,6 +1347,10 @@
- rm -f /tmp/conftest*
-
- AC_MSG_CHECKING(for vsprintf)
-+AH_TEMPLATE([USEVARARGS],
-+[If your system has vsprintf() and requires the use of the macros in
-+ "varargs.h" to use functions with variable arguments,
-+ define USEVARARGS.])
- AC_TRY_LINK([#include <stdarg.h>],[va_list valist; vsprintf(0,0,valist);],
- [AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS)],
- [AC_MSG_RESULT(no)])
-@@ -1199,12 +1358,19 @@
- AC_HEADER_DIRENT
-
- AC_MSG_CHECKING(for setenv)
-+AH_TEMPLATE([USESETENV], [If your system has setenv() and unsetenv() define USESETENV])
- AC_TRY_LINK(,[setenv((char *)0,(char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes);AC_DEFINE(USESETENV),
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING(for putenv)
-+AH_TEMPLATE([NEEDPUTENV],
-+[If your system does not come with a setenv()/putenv()/getenv()
-+ functions, you may bring in our own code by defining NEEDPUTENV.])
- AC_TRY_LINK(,[putenv((char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes) , AC_MSG_RESULT(no);AC_DEFINE(NEEDPUTENV)
- ))
- AC_MSG_CHECKING([for nl_langinfo(CODESET)])
-+AH_TEMPLATE([HAVE_NL_LANGINFO],
-+[define HAVE_NL_LANGINFO if your system has the nl_langinfo() call
-+ and <langinfo.h> defines CODESET.])
- AC_TRY_LINK([
- #include <langinfo.h>
- ],[nl_langinfo(CODESET);], AC_MSG_RESULT(yes);AC_DEFINE(HAVE_NL_LANGINFO), AC_MSG_RESULT(no))
-@@ -1254,7 +1420,8 @@
- dnl Ptx bug workaround -- insert -lc after -ltermcap
- test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq"
-
--AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.))
-+AC_MSG_CHECKING(compiler sanity)
-+AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.), AC_MSG_WARN(Skipping test due to crosscompilation))
-
- ETCSCREENRC="\"/usr/local/etc/screenrc\""
- if test -n "$prefix"; then
diff --git a/app-misc/screen/files/screen-4.0.3-setenv_autoconf.patch b/app-misc/screen/files/screen-4.0.3-setenv_autoconf.patch
deleted file mode 100644
index e47a15d..0000000
--- a/app-misc/screen/files/screen-4.0.3-setenv_autoconf.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- configure.in.DIST 2006-10-31 21:39:07.010473000 -0800
-+++ configure.in 2006-10-31 21:43:05.630162000 -0800
-@@ -1211,15 +1211,32 @@
- AC_HEADER_DIRENT
-
- AC_MSG_CHECKING(for setenv)
--AH_TEMPLATE([USESETENV], [If your system has setenv() and unsetenv() define USESETENV])
--AC_TRY_LINK(,[setenv((char *)0,(char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes);AC_DEFINE(USESETENV),
--AC_MSG_RESULT(no)
--AC_MSG_CHECKING(for putenv)
--AH_TEMPLATE([NEEDPUTENV],
--[If your system does not come with a setenv()/putenv()/getenv()
-- functions, you may bring in our own code by defining NEEDPUTENV.])
--AC_TRY_LINK(,[putenv((char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes) , AC_MSG_RESULT(no);AC_DEFINE(NEEDPUTENV)
--))
-+if test -z "$ac_setenv_args"; then
-+ AC_TRY_LINK(
-+ [#include <stdlib.h>],
-+ [
-+ setenv((char *) 0, (char *) 0, 0);
-+ ], ac_setenv_args=3)
-+fi
-+if test -z "$ac_setenv_args"; then
-+ AC_TRY_LINK(
-+ [#include <stdlib.h>],
-+ [
-+ setenv((char *) 0, (char *) 0);
-+ ], ac_setenv_args=2)
-+fi
-+if test -n "$ac_setenv_args"; then
-+ AC_DEFINE(USESETENV)
-+ if test "$ac_setenv_args" = 3; then
-+ AC_DEFINE(HAVE_SETENV_3)
-+ elif test "$ac_setenv_args" = 2; then
-+ AC_DEFINE(HAVE_SETENV_2)
-+ fi
-+else
-+ AC_MSG_RESULT(no)
-+ AC_MSG_CHECKING(for putenv)
-+ AC_TRY_LINK(,[putenv((char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes) , AC_MSG_RESULT(no);AC_DEFINE(NEEDPUTENV))
-+fi
- AC_MSG_CHECKING([for nl_langinfo(CODESET)])
- AH_TEMPLATE([HAVE_NL_LANGINFO],
- [define HAVE_NL_LANGINFO if your system has the nl_langinfo() call
---- config.h.in.DIST 2006-10-31 21:43:23.233714000 -0800
-+++ config.h.in 2006-10-31 21:44:27.346275000 -0800
-@@ -548,6 +548,16 @@
- #undef USESETENV
-
- /*
-+ * If setenv() takes 3 arguments define HAVE_SETENV_3
-+ */
-+#undef HAVE_SETENV_3
-+
-+/*
-+ * If setenv() takes 2 arguments define HAVE_SETENV_2
-+ */
-+#undef HAVE_SETENV_2
-+
-+/*
- * If your system does not come with a setenv()/putenv()/getenv()
- * functions, you may bring in our own code by defining NEEDPUTENV.
- */
---- misc.c.DIST 2006-10-31 20:55:42.481760000 -0800
-+++ misc.c 2006-10-31 21:53:24.143551000 -0800
-@@ -613,11 +613,11 @@
- */
- # endif /* NEEDSETENV */
- #else /* USESETENV */
--# if defined(linux) || defined(__convex__) || (BSD >= 199103)
-+# if HAVE_SETENV_3
- setenv(var, value, 1);
- # else
- setenv(var, value);
--# endif /* linux || convex || BSD >= 199103 */
-+# endif /* HAVE_SETENV_3 */
- #endif /* USESETENV */
- }
-
diff --git a/app-misc/screen/screen-4.0.3-r6.ebuild b/app-misc/screen/screen-4.0.3-r6.ebuild
deleted file mode 100644
index bcea1e7..0000000
--- a/app-misc/screen/screen-4.0.3-r6.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-WANT_AUTOCONF="2.5"
-
-inherit eutils flag-o-matic toolchain-funcs pam autotools user
-
-DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nethack pam selinux multiuser"
-
-DEPEND=">=sys-libs/ncurses-5.2
- pam? ( virtual/pam )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-screen )"
-
-pkg_setup() {
- # Make sure utmp group exists, as it's used later on.
- enewgroup utmp 406
-}
-
-src_prepare() {
- # Bug 34599: integer overflow in 4.0.1
- # (Nov 29 2003 -solar)
- epatch "${FILESDIR}"/screen-4.0.1-int-overflow-fix.patch
-
- # Bug 31070: configure problem which affects alpha
- # (13 Jan 2004 agriffis)
- epatch "${FILESDIR}"/screen-4.0.1-vsprintf.patch
-
- # uclibc doesnt have sys/stropts.h
- if ! (echo '#include <sys/stropts.h>' | $(tc-getCC) -E - &>/dev/null) ; then
- epatch "${FILESDIR}"/4.0.2-no-pty.patch
- fi
-
- # Don't use utempter even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-utempter.patch
-
- # Don't link against libelf even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-libelf.patch
-
- # Patch for time function on 64bit systems
- epatch "${FILESDIR}"/4.0.2-64bit-time.patch
-
- # Patch that makes %u work for windowlist -b formats
- epatch "${FILESDIR}"/4.0.2-windowlist-multiuser-fix.patch
-
- # Open tty in non-blocking mode
- epatch "${FILESDIR}"/4.0.2-nonblock.patch
-
- # compability for sys-devel/autoconf-2.62
- epatch "${FILESDIR}"/screen-4.0.3-config.h-autoconf-2.62.patch
-
- # crosscompile patch
- epatch "${FILESDIR}"/"${P}"-crosscompile.patch
-
- # sched.h is a system header and causes problems with some C libraries
- mv sched.h _sched.h || die
- sed -i '/include/s:sched.h:_sched.h:' screen.h || die
-
- # Allow for more rendition (color/attribute) changes in status bars
- sed -i \
- -e "s:#define MAX_WINMSG_REND 16:#define MAX_WINMSG_REND 64:" \
- screen.c \
- || die "sed screen.c failed"
-
- # Fix manpage.
- sed -i \
- -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/usr/local/screens:${EPREFIX}/var/run/screen:g" \
- -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
- -e "s:/local/screens/S-:${EPREFIX}/var/run/screen/S-:g" \
- doc/screen.1 \
- || die "sed doc/screen.1 failed"
-
- # proper setenv detection for Solaris
- epatch "${FILESDIR}"/${P}-setenv_autoconf.patch
-
- # Allow TERM string large enough to use with rxvt-unicode-256color
- # Allow usernames up to 32 chars
- epatch "${FILESDIR}"/${PV}-extend-d_termname-ng2.patch
-
- # support CPPFLAGS
- epatch "${FILESDIR}"/${P}-cppflags.patch
-
- sed \
- -e 's:termlib:tinfo:g' \
- -i configure.in || die
-
- # reconfigure
- eautoconf
-}
-
-src_configure() {
- append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
- [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
-
- use nethack || append-cppflags "-DNONETHACK"
- use debug && append-cppflags "-DDEBUG"
-
- econf \
- --with-socket-dir="${EPREFIX}/var/run/screen" \
- --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
- --with-pty-mode=0620 \
- --with-pty-group=5 \
- --enable-rxvt_osc \
- --enable-telnet \
- --enable-colors256 \
- $(use_enable pam) \
- $(use multiuser || echo --disable-socket-dir)
-
- # Second try to fix bug 12683, this time without changing term.h
- # The last try seemed to break screen at run-time.
- # (16 Jan 2003 agriffis)
- LC_ALL=POSIX make term.h || die "Failed making term.h"
-}
-
-src_install() {
- dobin screen
-
- if use multiuser || use prefix
- then
- fperms 4755 /usr/bin/screen
- else
- fowners root:utmp /usr/bin/screen
- fperms 2755 /usr/bin/screen
- fi
-
- insinto /usr/share/screen
- doins terminfo/{screencap,screeninfo.src}
- insinto /usr/share/screen/utf8encodings
- doins utf8encodings/??
- insinto /etc
- doins "${FILESDIR}"/screenrc
-
- pamd_mimic_system screen auth
-
- dodoc \
- README ChangeLog INSTALL TODO NEWS* patchlevel.h \
- doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-
- doman doc/screen.1
- doinfo doc/screen.info*
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]
- then
- elog "Some dangerous key bindings have been removed or changed to more safe values."
- elog "We enable some xterm hacks in our default screenrc, which might break some"
- elog "applications. Please check /etc/screenrc for information on these changes."
- fi
-}
diff --git a/app-misc/screen/screen-4.0.3-r7.ebuild b/app-misc/screen/screen-4.0.3-r7.ebuild
deleted file mode 100644
index 63d6ed9..0000000
--- a/app-misc/screen/screen-4.0.3-r7.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-WANT_AUTOCONF="2.5"
-
-inherit eutils flag-o-matic toolchain-funcs pam autotools user
-
-DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nethack pam selinux multiuser"
-
-DEPEND=">=sys-libs/ncurses-5.2
- pam? ( virtual/pam )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-screen )"
-
-pkg_setup() {
- # Make sure utmp group exists, as it's used later on.
- enewgroup utmp 406
-}
-
-src_prepare() {
- # Bug 34599: integer overflow in 4.0.1
- # (Nov 29 2003 -solar)
- epatch "${FILESDIR}"/screen-4.0.1-int-overflow-fix.patch
-
- # Bug 31070: configure problem which affects alpha
- # (13 Jan 2004 agriffis)
- epatch "${FILESDIR}"/screen-4.0.1-vsprintf.patch
-
- # uclibc doesnt have sys/stropts.h
- if ! (echo '#include <sys/stropts.h>' | $(tc-getCC) -E - &>/dev/null) ; then
- epatch "${FILESDIR}"/4.0.2-no-pty.patch
- fi
-
- # Don't use utempter even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-utempter.patch
-
- # Don't link against libelf even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-libelf.patch
-
- # Patch for time function on 64bit systems
- epatch "${FILESDIR}"/4.0.2-64bit-time.patch
-
- # Patch that makes %u work for windowlist -b formats
- epatch "${FILESDIR}"/4.0.2-windowlist-multiuser-fix.patch
-
- # Open tty in non-blocking mode
- epatch "${FILESDIR}"/4.0.2-nonblock.patch
-
- # compability for sys-devel/autoconf-2.62
- epatch "${FILESDIR}"/screen-4.0.3-config.h-autoconf-2.62.patch
-
- # crosscompile patch
- epatch "${FILESDIR}"/"${P}"-crosscompile.patch
-
- # sched.h is a system header and causes problems with some C libraries
- mv sched.h _sched.h || die
- sed -i '/include/s:sched.h:_sched.h:' screen.h || die
-
- # Allow for more rendition (color/attribute) changes in status bars
- sed -i \
- -e "s:#define MAX_WINMSG_REND 16:#define MAX_WINMSG_REND 64:" \
- screen.c \
- || die "sed screen.c failed"
-
- # Fix manpage.
- sed -i \
- -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/usr/local/screens:${EPREFIX}/var/run/screen:g" \
- -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
- -e "s:/local/screens/S-:${EPREFIX}/var/run/screen/S-:g" \
- doc/screen.1 \
- || die "sed doc/screen.1 failed"
-
- # proper setenv detection for Solaris
- epatch "${FILESDIR}"/${P}-setenv_autoconf.patch
-
- # Allow TERM string large enough to use with rxvt-unicode-256color
- # Allow usernames up to 32 chars
- epatch "${FILESDIR}"/${PV}-extend-d_termname-ng2.patch
-
- # support CPPFLAGS
- epatch "${FILESDIR}"/${P}-cppflags.patch
-
- sed \
- -e 's:termlib:tinfo:g' \
- -i configure.in || die
-
- # reconfigure
- eautoconf
-}
-
-src_configure() {
- append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
- [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
-
- use nethack || append-cppflags "-DNONETHACK"
- use debug && append-cppflags "-DDEBUG"
-
- econf \
- --with-socket-dir="${EPREFIX}/var/run/screen" \
- --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
- --with-pty-mode=0620 \
- --with-pty-group=5 \
- --enable-rxvt_osc \
- --enable-telnet \
- --enable-colors256 \
- $(use_enable pam) \
- $(use multiuser || echo --disable-socket-dir)
-
- # Second try to fix bug 12683, this time without changing term.h
- # The last try seemed to break screen at run-time.
- # (16 Jan 2003 agriffis)
- LC_ALL=POSIX make term.h || die "Failed making term.h"
-}
-
-src_install() {
- dobin screen
-
- if use multiuser || use prefix
- then
- fperms 4755 /usr/bin/screen
- else
- fowners root:utmp /usr/bin/screen
- fperms 2755 /usr/bin/screen
- fi
-
- insinto /usr/share/screen
- doins terminfo/{screencap,screeninfo.src}
- insinto /usr/share/screen/utf8encodings
- doins utf8encodings/??
- insinto /etc
- doins "${FILESDIR}"/screenrc
-
- pamd_mimic_system screen auth
-
- dodoc \
- README ChangeLog INSTALL TODO NEWS* patchlevel.h \
- doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-
- doman doc/screen.1
- doinfo doc/screen.info*
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]
- then
- elog "Some dangerous key bindings have been removed or changed to more safe values."
- elog "We enable some xterm hacks in our default screenrc, which might break some"
- elog "applications. Please check /etc/screenrc for information on these changes."
- fi
-}
diff --git a/app-misc/screen/screen-4.0.3-r8.ebuild b/app-misc/screen/screen-4.0.3-r8.ebuild
deleted file mode 100644
index 3e574a1..0000000
--- a/app-misc/screen/screen-4.0.3-r8.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-WANT_AUTOCONF="2.5"
-
-inherit eutils flag-o-matic toolchain-funcs pam autotools user
-
-DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nethack pam selinux multiuser"
-
-DEPEND=">=sys-libs/ncurses-5.2
- pam? ( virtual/pam )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-screen )
- !<sys-apps/openrc-0.11.6"
-
-pkg_setup() {
- # Make sure utmp group exists, as it's used later on.
- enewgroup utmp 406
-}
-
-src_prepare() {
- # Bug 34599: integer overflow in 4.0.1
- # (Nov 29 2003 -solar)
- epatch "${FILESDIR}"/screen-4.0.1-int-overflow-fix.patch
-
- # Bug 31070: configure problem which affects alpha
- # (13 Jan 2004 agriffis)
- epatch "${FILESDIR}"/screen-4.0.1-vsprintf.patch
-
- # uclibc doesnt have sys/stropts.h
- if ! (echo '#include <sys/stropts.h>' | $(tc-getCC) -E - &>/dev/null) ; then
- epatch "${FILESDIR}"/4.0.2-no-pty.patch
- fi
-
- # Don't use utempter even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-utempter.patch
-
- # Don't link against libelf even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-libelf.patch
-
- # Patch for time function on 64bit systems
- epatch "${FILESDIR}"/4.0.2-64bit-time.patch
-
- # Patch that makes %u work for windowlist -b formats
- epatch "${FILESDIR}"/4.0.2-windowlist-multiuser-fix.patch
-
- # Open tty in non-blocking mode
- epatch "${FILESDIR}"/4.0.2-nonblock.patch
-
- # compability for sys-devel/autoconf-2.62
- epatch "${FILESDIR}"/screen-4.0.3-config.h-autoconf-2.62.patch
-
- # crosscompile patch
- epatch "${FILESDIR}"/"${P}"-crosscompile.patch
-
- # sched.h is a system header and causes problems with some C libraries
- mv sched.h _sched.h || die
- sed -i '/include/s:sched.h:_sched.h:' screen.h || die
-
- # Allow for more rendition (color/attribute) changes in status bars
- sed -i \
- -e "s:#define MAX_WINMSG_REND 16:#define MAX_WINMSG_REND 64:" \
- screen.c \
- || die "sed screen.c failed"
-
- # Fix manpage.
- sed -i \
- -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/usr/local/screens:${EPREFIX}/run/screen:g" \
- -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
- -e "s:/local/screens/S-:${EPREFIX}/run/screen/S-:g" \
- doc/screen.1 \
- || die "sed doc/screen.1 failed"
-
- # proper setenv detection for Solaris
- epatch "${FILESDIR}"/${P}-setenv_autoconf.patch
-
- # Allow TERM string large enough to use with rxvt-unicode-256color
- # Allow usernames up to 32 chars
- epatch "${FILESDIR}"/${PV}-extend-d_termname-ng2.patch
-
- # support CPPFLAGS
- epatch "${FILESDIR}"/${P}-cppflags.patch
-
- sed \
- -e 's:termlib:tinfo:g' \
- -i configure.in || die
-
- # reconfigure
- eautoconf
-}
-
-src_configure() {
- append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
- [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
-
- use nethack || append-cppflags "-DNONETHACK"
- use debug && append-cppflags "-DDEBUG"
-
- econf \
- --with-socket-dir="${EPREFIX}/run/screen" \
- --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
- --with-pty-mode=0620 \
- --with-pty-group=5 \
- --enable-rxvt_osc \
- --enable-telnet \
- --enable-colors256 \
- $(use_enable pam)
-
- # Second try to fix bug 12683, this time without changing term.h
- # The last try seemed to break screen at run-time.
- # (16 Jan 2003 agriffis)
- LC_ALL=POSIX make term.h || die "Failed making term.h"
-}
-
-src_install() {
- local tmpfiles_perms tmpfiles_group
-
- dobin screen
-
- if use multiuser ; then
- use prefix || fperms 4755 /usr/bin/screen
- tmpfiles_perms="0755"
- tmpfiles_group="root"
- else
- fowners root:utmp /usr/bin/screen
- fperms 2755 /usr/bin/screen
- tmpfiles_perms="0775"
- tmpfiles_group="utmp"
- fi
-
- dodir /etc/tmpfiles.d
- echo "d /run/screen ${tmpfiles_perms} root ${tmpfiles_group}" >"${ED}"/etc/tmpfiles.d/screen.conf
-
- insinto /usr/share/screen
- doins terminfo/{screencap,screeninfo.src}
- insinto /usr/share/screen/utf8encodings
- doins utf8encodings/??
- insinto /etc
- doins "${FILESDIR}"/screenrc
-
- pamd_mimic_system screen auth
-
- dodoc \
- README ChangeLog INSTALL TODO NEWS* patchlevel.h \
- doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-
- doman doc/screen.1
- doinfo doc/screen.info*
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]
- then
- elog "Some dangerous key bindings have been removed or changed to more safe values."
- elog "We enable some xterm hacks in our default screenrc, which might break some"
- elog "applications. Please check /etc/screenrc for information on these changes."
- fi
-
- ewarn "This revision changes the screen socket location to /run/screen."
-}
diff --git a/app-misc/screen/screen-4.2.1-r2.ebuild b/app-misc/screen/screen-4.2.1-r2.ebuild
deleted file mode 100644
index bb6e77a..0000000
--- a/app-misc/screen/screen-4.2.1-r2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic pam toolchain-funcs user
-
-DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=" ~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
- >=sys-libs/ncurses-5.2:0=
- pam? ( virtual/pam )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
- sys-apps/texinfo"
-
-pkg_setup() {
- # Make sure utmp group exists, as it's used later on.
- enewgroup utmp 406
-}
-
-src_prepare() {
- # Don't use utempter even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-utempter.patch
-
- # sched.h is a system header and causes problems with some C libraries
- mv sched.h _sched.h || die
- sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
- # Fix manpage.
- sed -i \
- -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
- -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
- -e "s:/local/screens/S-:${EPREFIX}/tmp/screen/S-:g" \
- doc/screen.1 \
- || die
-
- # reconfigure
- eautoreconf
-}
-
-src_configure() {
- append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # https://lists.gnu.org/archive/html/screen-devel/2014-04/msg00095.html
- append-cppflags -D_XOPEN_SOURCE \
- -D_XOPEN_SOURCE_EXTENDED=1 \
- -D__EXTENSIONS__
- append-libs -lsocket -lnsl
- fi
-
- use nethack || append-cppflags "-DNONETHACK"
- use debug && append-cppflags "-DDEBUG"
-
- econf \
- --with-socket-dir="${EPREFIX}/tmp/screen" \
- --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
- --with-pty-mode=0620 \
- --with-pty-group=5 \
- --enable-rxvt_osc \
- --enable-telnet \
- --enable-colors256 \
- $(use_enable pam)
-}
-
-src_compile() {
- LC_ALL=POSIX emake comm.h term.h
- emake osdef.h
-
- emake -C doc screen.info
- default
-}
-
-src_install() {
- local tmpfiles_perms tmpfiles_group
-
- dobin screen
-
- if use multiuser || use prefix
- then
- fperms 4755 /usr/bin/screen
- tmpfiles_perms="0755"
- tmpfiles_group="root"
- else
- fowners root:utmp /usr/bin/screen
- fperms 2755 /usr/bin/screen
- tmpfiles_perms="0775"
- tmpfiles_group="utmp"
- fi
-
- dodir /etc/tmpfiles.d
- echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
- > "${ED}"/etc/tmpfiles.d/screen.conf
-
- insinto /usr/share/screen
- doins terminfo/{screencap,screeninfo.src}
- insinto /usr/share/screen/utf8encodings
- doins utf8encodings/??
- insinto /etc
- doins "${FILESDIR}"/screenrc
-
- pamd_mimic_system screen auth
-
- dodoc \
- README ChangeLog INSTALL TODO NEWS* patchlevel.h \
- doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-
- doman doc/screen.1
- doinfo doc/screen.info
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]
- then
- elog "Some dangerous key bindings have been removed or changed to more safe values."
- elog "We enable some xterm hacks in our default screenrc, which might break some"
- elog "applications. Please check /etc/screenrc for information on these changes."
- fi
-
- # Add /tmp/screen in case it doesn't exist yet. This should solve
- # problems like bug #508634 where tmpfiles.d isn't in effect.
- local rundir="${EROOT%/}/tmp/screen"
- if [[ ! -d ${rundir} ]] ; then
- if use multiuser || use prefix ; then
- tmpfiles_group="root"
- else
- tmpfiles_group="utmp"
- fi
- mkdir -m 0775 "${rundir}"
- chgrp ${tmpfiles_group} "${rundir}"
- fi
-
- ewarn "This revision changes the screen socket location to ${rundir}"
-}
diff --git a/app-misc/screen/screen-4.3.1-r1.ebuild b/app-misc/screen/screen-4.3.1-r1.ebuild
index aa614f0..f181909 100644
--- a/app-misc/screen/screen-4.3.1-r1.ebuild
+++ b/app-misc/screen/screen-4.3.1-r1.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug nethack pam selinux multiuser"
CDEPEND="
diff --git a/app-misc/screen/screen-4.3.1.ebuild b/app-misc/screen/screen-4.3.1.ebuild
deleted file mode 100644
index 48a082b..0000000
--- a/app-misc/screen/screen-4.3.1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic pam toolchain-funcs user
-
-DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
- >=sys-libs/ncurses-5.2:0=
- pam? ( virtual/pam )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
- sys-apps/texinfo"
-
-pkg_setup() {
- # Make sure utmp group exists, as it's used later on.
- enewgroup utmp 406
-}
-
-src_prepare() {
- # Don't use utempter even if it is found on the system
- epatch "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-
- # sched.h is a system header and causes problems with some C libraries
- mv sched.h _sched.h || die
- sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
- # Fix manpage.
- sed -i \
- -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
- -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
- -e "s:/local/screens/S-:${EPREFIX}/tmp/screen/S-:g" \
- doc/screen.1 \
- || die
-
- # reconfigure
- eautoreconf
-}
-
-src_configure() {
- append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # https://lists.gnu.org/archive/html/screen-devel/2014-04/msg00095.html
- append-cppflags -D_XOPEN_SOURCE \
- -D_XOPEN_SOURCE_EXTENDED=1 \
- -D__EXTENSIONS__
- append-libs -lsocket -lnsl
- fi
-
- use nethack || append-cppflags "-DNONETHACK"
- use debug && append-cppflags "-DDEBUG"
-
- econf \
- --with-socket-dir="${EPREFIX}/tmp/screen" \
- --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
- --with-pty-mode=0620 \
- --with-pty-group=5 \
- --enable-rxvt_osc \
- --enable-telnet \
- --enable-colors256 \
- $(use_enable pam)
-}
-
-src_compile() {
- LC_ALL=POSIX emake comm.h term.h
- emake osdef.h
-
- emake -C doc screen.info
- default
-}
-
-src_install() {
- local tmpfiles_perms tmpfiles_group
-
- dobin screen
-
- if use multiuser || use prefix
- then
- fperms 4755 /usr/bin/screen
- tmpfiles_perms="0755"
- tmpfiles_group="root"
- else
- fowners root:utmp /usr/bin/screen
- fperms 2755 /usr/bin/screen
- tmpfiles_perms="0775"
- tmpfiles_group="utmp"
- fi
-
- dodir /etc/tmpfiles.d
- echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
- > "${ED}"/etc/tmpfiles.d/screen.conf
-
- insinto /usr/share/screen
- doins terminfo/{screencap,screeninfo.src}
- insinto /usr/share/screen/utf8encodings
- doins utf8encodings/??
- insinto /etc
- doins "${FILESDIR}"/screenrc
-
- pamd_mimic_system screen auth
-
- dodoc \
- README ChangeLog INSTALL TODO NEWS* patchlevel.h \
- doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-
- doman doc/screen.1
- doinfo doc/screen.info
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]
- then
- elog "Some dangerous key bindings have been removed or changed to more safe values."
- elog "We enable some xterm hacks in our default screenrc, which might break some"
- elog "applications. Please check /etc/screenrc for information on these changes."
- fi
-
- # Add /tmp/screen in case it doesn't exist yet. This should solve
- # problems like bug #508634 where tmpfiles.d isn't in effect.
- local rundir="${EROOT%/}/tmp/screen"
- if [[ ! -d ${rundir} ]] ; then
- if use multiuser || use prefix ; then
- tmpfiles_group="root"
- else
- tmpfiles_group="utmp"
- fi
- mkdir -m 0775 "${rundir}"
- chgrp ${tmpfiles_group} "${rundir}"
- fi
-
- ewarn "This revision changes the screen socket location to ${rundir}"
-}
diff --git a/app-misc/tmux/tmux-1.9a-r2.ebuild b/app-misc/tmux/tmux-1.9a-r2.ebuild
new file mode 100644
index 0000000..7fd1b54
--- /dev/null
+++ b/app-misc/tmux/tmux-1.9a-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils bash-completion-r1 flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="http://tmux.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug selinux vim-syntax"
+
+COMMON_DEPEND="
+ =dev-libs/libevent-2.0*
+ sys-libs/ncurses"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+ selinux? ( sec-policy/selinux-screen )
+ vim-syntax? ( || (
+ app-editors/vim
+ app-editors/gvim ) )"
+
+DOCS=( CHANGES FAQ README TODO )
+
+PATCHES=( "${FILESDIR}"/${P}-flags.patch )
+
+pkg_setup() {
+ if has_version "<app-misc/tmux-1.9a"; then
+ echo
+ ewarn "Some configuration options changed in this release."
+ ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+ ewarn
+ ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
+ ewarn "older, running tmux server instances. You'll have to use an existing client to"
+ ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
+ ewarn "to temporarily downgrade to access them."
+ echo
+ fi
+}
+
+src_prepare() {
+ # bug 438558
+ # 1.7 segfaults when entering copy mode if compiled with -Os
+ replace-flags -Os -O2
+
+ # regenerate aclocal.m4 to support earlier automake versions
+ rm aclocal.m4 || die
+
+ # remove generated files
+ rm -r compat/.{dirstamp,deps} || die
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --sysconfdir="${EPREFIX}"/etc
+ $(use_enable debug)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ newbashcomp examples/bash_completion_tmux.sh ${PN}
+
+ docinto examples
+ dodoc examples/*.conf
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins examples/tmux.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}"/tmux.vim
+ fi
+}
diff --git a/app-misc/tmux/tmux-1.9a.ebuild b/app-misc/tmux/tmux-1.9a.ebuild
deleted file mode 100644
index df65494..0000000
--- a/app-misc/tmux/tmux-1.9a.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils bash-completion-r1 flag-o-matic
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug selinux vim-syntax"
-
-COMMON_DEPEND="
- >=dev-libs/libevent-2.0.10
- sys-libs/ncurses"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-screen )
- vim-syntax? ( || (
- app-editors/vim
- app-editors/gvim ) )"
-
-DOCS=( CHANGES FAQ README TODO )
-
-PATCHES=( "${FILESDIR}"/${P}-flags.patch )
-
-pkg_setup() {
- if has_version "<app-misc/tmux-1.9a"; then
- echo
- ewarn "Some configuration options changed in this release."
- ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
- ewarn
- ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
- ewarn "older, running tmux server instances. You'll have to use an existing client to"
- ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
- ewarn "to temporarily downgrade to access them."
- echo
- fi
-}
-
-src_prepare() {
- # bug 438558
- # 1.7 segfaults when entering copy mode if compiled with -Os
- replace-flags -Os -O2
-
- # regenerate aclocal.m4 to support earlier automake versions
- rm aclocal.m4 || die
-
- # remove generated files
- rm -r compat/.{dirstamp,deps} || die
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --sysconfdir="${EPREFIX}"/etc
- $(use_enable debug)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- newbashcomp examples/bash_completion_tmux.sh ${PN}
-
- docinto examples
- dodoc examples/*.conf
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins examples/tmux.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}"/tmux.vim
- fi
-}
diff --git a/app-misc/tmux/tmux-2.0-r1.ebuild b/app-misc/tmux/tmux-2.0-r1.ebuild
deleted file mode 100644
index e85f50a..0000000
--- a/app-misc/tmux/tmux-2.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils bash-completion-r1 flag-o-matic
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug selinux vim-syntax"
-
-CDEPEND="
- >=dev-libs/libevent-2.0.10
- !sys-apps/utempter
- sys-libs/ncurses"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-screen )
- vim-syntax? ( || (
- app-editors/vim
- app-editors/gvim ) )"
-
-DOCS=( CHANGES FAQ README TODO )
-
-PATCHES=( "${FILESDIR}"/${P}-flags.patch )
-
-pkg_setup() {
- if has_version "<app-misc/tmux-1.9a"; then
- echo
- ewarn "Some configuration options changed in this release."
- ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
- ewarn
- ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
- ewarn "older, running tmux server instances. You'll have to use an existing client to"
- ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
- ewarn "to temporarily downgrade to access them."
- echo
- fi
-}
-
-src_prepare() {
- # bug 438558
- # 1.7 segfaults when entering copy mode if compiled with -Os
- replace-flags -Os -O2
-
- # regenerate aclocal.m4 to support earlier automake versions
- rm aclocal.m4 || die
-
- # remove generated files
- rm -r compat/.{dirstamp,deps} || die
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --sysconfdir="${EPREFIX}"/etc
- $(use_enable debug)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- newbashcomp examples/bash_completion_tmux.sh ${PN}
-
- docinto examples
- dodoc examples/*.conf
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins examples/tmux.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}"/tmux.vim
- fi
-}
diff --git a/app-misc/tmux/tmux-2.0-r3.ebuild b/app-misc/tmux/tmux-2.0-r3.ebuild
new file mode 100644
index 0000000..0c74bd5
--- /dev/null
+++ b/app-misc/tmux/tmux-2.0-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils bash-completion-r1 flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="http://tmux.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug selinux vim-syntax"
+
+CDEPEND="
+ =dev-libs/libevent-2.0*
+ !sys-apps/utempter
+ sys-libs/ncurses"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-screen )
+ vim-syntax? ( || (
+ app-editors/vim
+ app-editors/gvim ) )"
+
+DOCS=( CHANGES FAQ README TODO )
+
+PATCHES=( "${FILESDIR}"/${P}-flags.patch )
+
+pkg_setup() {
+ if has_version "<app-misc/tmux-1.9a"; then
+ echo
+ ewarn "Some configuration options changed in this release."
+ ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+ ewarn
+ ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
+ ewarn "older, running tmux server instances. You'll have to use an existing client to"
+ ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
+ ewarn "to temporarily downgrade to access them."
+ echo
+ fi
+}
+
+src_prepare() {
+ # bug 438558
+ # 1.7 segfaults when entering copy mode if compiled with -Os
+ replace-flags -Os -O2
+
+ # regenerate aclocal.m4 to support earlier automake versions
+ rm aclocal.m4 || die
+
+ # remove generated files
+ rm -r compat/.{dirstamp,deps} || die
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --sysconfdir="${EPREFIX}"/etc
+ $(use_enable debug)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ newbashcomp examples/bash_completion_tmux.sh ${PN}
+
+ docinto examples
+ dodoc examples/*.conf
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins examples/tmux.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}"/tmux.vim
+ fi
+}
diff --git a/app-misc/tracker/tracker-1.2.6.ebuild b/app-misc/tracker/tracker-1.2.6.ebuild
index 8fb6dcb..a189b8a 100644
--- a/app-misc/tracker/tracker-1.2.6.ebuild
+++ b/app-misc/tracker/tracker-1.2.6.ebuild
@@ -92,6 +92,7 @@
DEPEND="${RDEPEND}
${PYTHON_DEPS}
$(vala_depend)
+ dev-util/gdbus-codegen
>=dev-util/gtk-doc-am-1.8
>=dev-util/intltool-0.40.0
>=sys-devel/gettext-0.17
diff --git a/app-misc/tracker/tracker-1.4.0.ebuild b/app-misc/tracker/tracker-1.4.0.ebuild
index a378ffe..96c5f0e 100644
--- a/app-misc/tracker/tracker-1.4.0.ebuild
+++ b/app-misc/tracker/tracker-1.4.0.ebuild
@@ -96,6 +96,7 @@
DEPEND="${RDEPEND}
${PYTHON_DEPS}
$(vala_depend)
+ dev-util/gdbus-codegen
>=dev-libs/libxslt-1
>=dev-util/gtk-doc-am-1.8
>=dev-util/intltool-0.40.0
diff --git a/app-misc/tracker/tracker-1.4.1.ebuild b/app-misc/tracker/tracker-1.4.1.ebuild
index 3bbeff9..97abe16 100644
--- a/app-misc/tracker/tracker-1.4.1.ebuild
+++ b/app-misc/tracker/tracker-1.4.1.ebuild
@@ -96,6 +96,7 @@
DEPEND="${RDEPEND}
${PYTHON_DEPS}
$(vala_depend)
+ dev-util/gdbus-codegen
>=dev-libs/libxslt-1
>=dev-util/gtk-doc-am-1.8
>=dev-util/intltool-0.40.0
diff --git a/app-office/impressive/impressive-0.10.5.ebuild b/app-office/impressive/impressive-0.10.5.ebuild
index f72ffa5..56345d1 100644
--- a/app-office/impressive/impressive-0.10.5.ebuild
+++ b/app-office/impressive/impressive-0.10.5.ebuild
@@ -21,6 +21,7 @@
DEPEND=""
RDEPEND="${PYTHON_DEPS}
+ !>=dev-python/pillow-3.0.0
app-text/pdftk
virtual/python-imaging[${PYTHON_USEDEP}]
dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/app-office/impressive/impressive-0.11.0b-r1.ebuild b/app-office/impressive/impressive-0.11.0b-r1.ebuild
new file mode 100644
index 0000000..db4e6db
--- /dev/null
+++ b/app-office/impressive/impressive-0.11.0b-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-r1
+
+MY_PN="Impressive"
+
+DESCRIPTION="Stylish way of giving presentations with Python"
+HOMEPAGE="http://impressive.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV%b}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+ app-text/pdftk
+ dev-python/pygame[${PYTHON_USEDEP}]
+ virtual/python-imaging[${PYTHON_USEDEP}]
+ x11-apps/xrandr
+ || (
+ app-text/mupdf
+ app-text/poppler
+ app-text/ghostscript-gpl
+ )
+ || ( media-fonts/dejavu media-fonts/corefonts )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+ sed \
+ -e 's:tostring:tobytes:g' \
+ -i impressive.py || die
+}
+
+src_install() {
+ python_foreach_impl python_doscript ${PN}.py
+
+ # compatibility symlinks
+ dosym impressive.py /usr/bin/impressive
+ dosym impressive.py /usr/bin/keyjnote
+
+ # docs
+ doman impressive.1
+ dohtml impressive.html
+ dodoc changelog.txt demo.pdf
+}
+
+pkg_postinst() {
+ elog "The experience with ${PN} can be enhanced by folowing packages:"
+ optfeature "Starting web or e-mail hyperlinks from PDF documents" x11-misc/xdg-utils
+ optfeature "Sound and video playback" media-video/mplayer
+ optfeature "Sound and video playback" media-video/mplayer2
+ optfeature "Alternate PDF rendering" app-text/mupdf
+ optfeature "Alternate PDF rendering" app-text/poppler
+ optfeature "Alternate PDF rendering" app-text/ghostscript-gpl
+}
diff --git a/app-office/impressive/impressive-0.11.0b.ebuild b/app-office/impressive/impressive-0.11.0b.ebuild
deleted file mode 100644
index 0f79ef3..0000000
--- a/app-office/impressive/impressive-0.11.0b.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-MY_PN="Impressive"
-
-DESCRIPTION="Stylish way of giving presentations with Python"
-HOMEPAGE="http://impressive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV%b}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
- app-text/pdftk
- dev-python/pygame[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]
- x11-apps/xrandr
- || (
- app-text/mupdf
- app-text/poppler
- app-text/ghostscript-gpl
- )
- || ( media-fonts/dejavu media-fonts/corefonts )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
- python_foreach_impl python_doscript ${PN}.py
-
- # compatibility symlinks
- dosym impressive.py /usr/bin/impressive
- dosym impressive.py /usr/bin/keyjnote
-
- # docs
- doman impressive.1
- dohtml impressive.html
- dodoc changelog.txt demo.pdf
-}
-
-pkg_postinst() {
- elog "The experience with ${PN} can be enhanced by folowing packages:"
- optfeature "Starting web or e-mail hyperlinks from PDF documents" x11-misc/xdg-utils
- optfeature "Sound and video playback" media-video/mplayer
- optfeature "Sound and video playback" media-video/mplayer2
- optfeature "Alternate PDF rendering" app-text/mupdf
- optfeature "Alternate PDF rendering" app-text/poppler
- optfeature "Alternate PDF rendering" app-text/ghostscript-gpl
-}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a9bf772..a7c9aba 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -9,7 +9,9 @@
DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
DIST libreoffice-5.0.1.2.tar.xz 167364360 SHA256 0751b9caebeb54e2c6702a58aae66a29ac59414088ccd4e7d84625d02d0fd21a SHA512 d58d104705fd80425a00ce61771dbd4bef74cda20028fb2afcc1ea44aa304048b8e96bf654ecc2619362a09d05801212bee1e9bc9c80e693c986021a55c0e725 WHIRLPOOL eadd72f705745632c05efcb2e4c85c3440be18f16f16805f241a653c39f204145a10e6e2cbb432d3a4801e652affd677756ee1f6cad1db120c5ffc47843a89f6
DIST libreoffice-5.0.2.2.tar.xz 166869100 SHA256 01f0680709432039762fa608bcb1240786d2b6549099a96095aab92dcebbc176 SHA512 7a72ed01b0f9fc131b7241ea4d1bb70bc813752e33d8e823e91a769d77308d2eec2d32a0fac61bdb41fd605a6f91dbaa3d5478a0b150e64fa9f7e47724f46cce WHIRLPOOL 85a592a0f478b1957d22d932adee758d48084c0c7ee00c0549fa8c956fd30f5eead09f6fc802d22d9613bda8da0c708ec99fb6d10fd82e0922c6da96a326a14c
+DIST libreoffice-5.0.3.1.tar.xz 166989184 SHA256 5502477772d6b986fc0486e7ec4e1fd7d99796f9bf63610d4dec84d77f165585 SHA512 0e157f2f126f530dbcf4849a78ce04e6abb92aed3308aae5d0b644377afea572869660624ef4ceeedcb29eaefb3c9e6defd1241a4e6be931dd39a7286325a288 WHIRLPOOL 3074c618bf98f88de6b21759c6b183e2c836e0f1577ed5b1af4eb2cd1de71b606abc151a29d2f491f4bdfbecd1f6df9eb3f21252c81205c4edcfbd1ae9611619
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
DIST libreoffice-help-5.0.1.2.tar.xz 1884112 SHA256 c71db94564307f4bcea4d556a37d5ea946c87007fbf03fc7801fbe7bc197e947 SHA512 edea7ade0a4a742788b8ceba627e9afe7ed29b4feaf6d091023697fb676421ee0a191e592991c6627d22ba7a41af2d847b188c23e42ef25f1067533b5d2a80c2 WHIRLPOOL fc54629ee68f7c22ab07295b2569313a129f63850e67f1f3bd50bdc20a3d494ad48ca14f14f0a440fef78cceed2117ba31cac0930ac5b0382f285a31acc77b86
DIST libreoffice-help-5.0.2.2.tar.xz 1882964 SHA256 4342a5593ba8a33b1d63549f256a4127a0b51cc1a53faffdc2708f04fef5f094 SHA512 1000423578211dc843dcedb9f864634235ab09d5234f8d8fe2897065207bdf6cd3bca7cdc1b3c012de0c78b585978a25c0df5048779bd0b9a734c9160064e313 WHIRLPOOL 8b92bcd19487c1c286a477ff0dc1b7e6bd9aaf862cfe002fadc25d461add4c4f2f8ee1e45ac0426dc2d27a6322317cacb7f65e9d0a6e6d6dad01075d18476363
+DIST libreoffice-help-5.0.3.1.tar.xz 1882408 SHA256 22187900e65408f03ecb0a6463d7587ca27e32cd341d9ba0e55a99d8cdb3bc45 SHA512 25bcc9343b6df145618e6e6a6427173418243bdc066b447764999704ffae2dcafa1a295828512aa3c8362e9a843267b7634d6b2c268bb57587fdd77c03b37522 WHIRLPOOL cce758b2a8d66218bd94c4c66680a847cb5a0b9583798e8252acbd491bd18cfca56951fddc17ae270f69423346a7023f078d655bd6c07a51abef04887e0c4d51
diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
index 5341429..7f3f170 100644
--- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
@@ -271,7 +271,7 @@
"
CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
diff --git a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
index 47bf9d1..a8bb49b 100644
--- a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
@@ -260,7 +260,7 @@
"
CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
diff --git a/app-office/libreoffice/libreoffice-5.0.2.2.ebuild b/app-office/libreoffice/libreoffice-5.0.2.2.ebuild
index c361e86..beabdc7 100644
--- a/app-office/libreoffice/libreoffice-5.0.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.2.2.ebuild
@@ -260,7 +260,7 @@
"
CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
diff --git a/app-office/libreoffice/libreoffice-5.0.3.1.ebuild b/app-office/libreoffice/libreoffice-5.0.3.1.ebuild
new file mode 100644
index 0000000..912f7c6
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.0.3.1.ebuild
@@ -0,0 +1,609 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+ IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ app-arch/zip
+ app-arch/unzip
+ >=app-text/hunspell-1.3.2-r3
+ app-text/mythes
+ >=app-text/libabw-0.1.0
+ >=app-text/libexttextcat-3.2
+ >=app-text/libebook-0.1.1
+ >=app-text/libetonyek-0.1.2
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.5
+ >=app-text/libodfgen-0.1.0
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ =app-text/libwps-0.4*
+ >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ >=dev-libs/boost-1.55:=
+ dev-libs/expat
+ >=dev-libs/hyphen-2.7.1
+ >=dev-libs/icu-4.8.1.1:=
+ =dev-libs/liborcus-0.7*
+ >=dev-libs/librevenge-0.0.1
+ >=dev-libs/nspr-4.8.8
+ >=dev-libs/nss-3.12.9
+ >=dev-lang/perl-5.0
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ >=media-libs/fontconfig-2.8.0
+ media-libs/freetype:2
+ >=media-libs/glew-1.10
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/lcms:2
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libvisio-0.1.0
+ >=net-misc/curl-7.21.4
+ net-libs/neon
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/jpeg:0
+ >=x11-libs/cairo-1.10.0[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ cups? ( net-print/cups )
+ dbus? ( >=dev-libs/dbus-glib-0.92 )
+ eds? ( gnome-extra/evolution-data-server )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/gconf:2 )
+ gtk? (
+ x11-libs/gdk-pixbuf[X]
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? ( >=x11-libs/gtk+-3.8:3 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ libreoffice_extensions_wiki-publisher? (
+ dev-java/commons-codec:0
+ dev-java/commons-httpclient:3
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ dev-java/tomcat-servlet-api:3.0
+ )
+ mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? (
+ dev-libs/glib:2
+ >=net-libs/telepathy-glib-0.18.0
+ >=x11-libs/gtk+-2.24:2
+ )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !<app-office/openoffice-bin-3.4.0-r1
+ !app-office/openoffice
+ media-fonts/libertine
+ media-fonts/liberation-fonts
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-0.12.0:=
+ media-libs/glm
+ net-misc/npapi-sdk
+ >=sys-apps/findutils-4.4.2
+ sys-devel/bison
+ sys-apps/coreutils
+ sys-devel/flex
+ sys-devel/gettext
+ >=sys-devel/make-3.82
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ >=virtual/jdk-1.6
+ >=dev-java/ant-core-1.7
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ gnome? ( gtk )
+ eds? ( gnome )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+ local pgslot
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
+ ; then
+ eerror "Compilation with gcc older than 4.6 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} < 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+
+ [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+ local mod mod2 dest tmplfile tmplname mypv
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ for mod in ${MODULES}; do
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+ [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+ git-r3_src_unpack
+ if [[ ${mod} != core ]]; then
+ mod2=${mod}
+ # mapping does not match on help
+ [[ ${mod} == help ]] && mod2="helpcontent2"
+ mkdir -p "${S}/${mod2}/" || die
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
+ rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+ fi
+ done
+ unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
+ fi
+}
+
+src_prepare() {
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python 2.7 enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # patchset
+ if [[ -n ${PATCHSET} ]]; then
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+ fi
+
+ base_src_prepare
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ -i pyuno/source/module/uno.py \
+ -i pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e 's#all : build unitcheck#all : build#g' \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
+ -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+ Makefile.in || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local internal_libs
+ local lo_ext
+ local ext_opts
+
+ # sane: just sane.h header that is used for scan in writer, not
+ # linked or anything else, worthless to depend on
+ # vigra: just uses templates from there
+ # it is serious pain in the ass for packaging
+ # should be replaced by boost::gil if someone interested
+ internal_libs+="
+ --without-system-sane
+ --without-system-vigra
+ "
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+ if use libreoffice_extensions_wiki-publisher; then
+ java_opts+="
+ --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+ --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+ --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+ --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+ --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
+ "
+ fi
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --disable-gnome-vfs: old gnome virtual fs support
+ # --disable-kdeab: kde3 adressbook
+ # --disable-kde: kde3 support
+ # --disable-systray: quickstarter does not actually work at all so do not
+ # promote it
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-headers \
+ --with-system-libs \
+ --with-system-jars \
+ --with-system-dicts \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-randr-link \
+ --enable-release-build \
+ --disable-hardlink-deliver \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gnome-vfs \
+ --disable-gstreamer-0-10 \
+ --disable-report-builder \
+ --disable-kdeab \
+ --disable-kde \
+ --disable-online-update \
+ --disable-systray \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gconf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome lockdown) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${internal_libs} \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # Fix bash completion placement
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+ rm -rf "${ED}"/etc/ || die
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files for support to old installs that can't parse mime
+ rm -rf "${ED}"/usr/share/mimelnk/
+
+ # FIXME: Hack add missing file
+ insinto /usr/$(get_libdir)/${PN}/program
+ doins "${S}"/instdir/program/libsaxlo.so
+
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ use java || \
+ ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index c361e86..8ddf6c3 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -9,7 +9,7 @@
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_4 )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
@@ -73,7 +73,7 @@
unset ADDONS_SRC
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
@@ -122,7 +122,8 @@
>=dev-libs/nspr-4.8.8
>=dev-libs/nss-3.12.9
>=dev-lang/perl-5.0
- >=dev-libs/openssl-1.0.0d:0
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
media-gfx/graphite2
>=media-libs/fontconfig-2.8.0
@@ -260,7 +261,7 @@
"
CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f5894cc..e528ce1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -9,7 +9,7 @@
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_4 )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
@@ -73,7 +73,7 @@
unset ADDONS_SRC
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
@@ -108,7 +108,7 @@
>=app-text/libodfgen-0.1.0
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
- =app-text/libwps-0.4*
+ >=app-text/libwps-0.4.2
>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
@@ -122,7 +122,8 @@
>=dev-libs/nspr-4.8.8
>=dev-libs/nss-3.12.9
>=dev-lang/perl-5.0
- >=dev-libs/openssl-1.0.0d:0
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
media-gfx/graphite2
>=media-libs/fontconfig-2.8.0
@@ -264,7 +265,7 @@
"
CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
diff --git a/app-officeext/languagetool/Manifest b/app-officeext/languagetool/Manifest
index e6ec470..8975e0a 100644
--- a/app-officeext/languagetool/Manifest
+++ b/app-officeext/languagetool/Manifest
@@ -1,3 +1,4 @@
DIST LanguageTool-2.5.oxt 46952282 SHA256 0ceb08b67c1d85505f3e97a978316ed54ade4d7bfd6ef848c02b710ee3deee17 SHA512 8813a7d3e4c199d416287ab9af38b8429f7d484bc6e93f775917ba968a302b3a64581588e5464cce9b6b368aabe62576f8cb9d4d8ad27e8d04f1ef622dcd081d WHIRLPOOL 6d2742d11a039953c9c4c728f2188fd3bb5c98f10bfaefb726c38346126359b01a59756c11560e4c0438af9a10dd8cbc80b82787491c90962b770ee614886fa1
DIST LanguageTool-2.7.oxt 52195597 SHA256 18fa219a674f449cb1925a16dfe6b8f94bfcc1cb678506ce100db361dccdd075 SHA512 6ea98063939e32430adaaf3915776939ed5cd0b43d4fcb70ebd1b0780d844253295bd65e3fa5d745e67947d91613785a6425107f326596fa380f93a02b6508bd WHIRLPOOL 7d26d021b4935680bba696add8e89b11146d40967e60521fc8818bb47975fb082ea42d379e35d9cf5d17ea1c5cabd67baa915a3d9920b2dac4fdf38d4efc9773
DIST LanguageTool-2.9.oxt 55628675 SHA256 e8d4c262e33a046b57590199b920ff765e6a865c96714f8aac0339f982456cf0 SHA512 eddd2dda2da966beac1fe3a94eb0564e485bc4b45ada9c52dedaba256e8d8d64cb510df4e35f2805ccbae03b5e9d0fde92ec988b01f3c6a0265a6b3eb83fc810 WHIRLPOOL c9dfe02c48e6767beb4406bb54f9279fd71b98cb427225468f5267191e1a9dcc190abc3cedb51c3111caff194550ddd030aa98ef5f874005d7debc21f163de6e
+DIST LanguageTool-3.1.oxt 56681035 SHA256 cd74a911a7501c9a6263458a51b9e33baacc536b384b8bedb18f2b13706bc937 SHA512 9e41e34d6476bb799259ba4689c63704da24195ce46bb9c8055ce6264fbe706baacc9b84cd5bc870fdbe919f4ccfa2744fe19d40da68b121f8d95fc64e27114e WHIRLPOOL 29eeae88310796704dc0f956e463d28839d4f5e8b20ee802eab630c1e045f5ec6284899aa3f1dea790c1909320b5f2ff82ded8e66c657ecf4fcb2579a5f25797
diff --git a/app-officeext/languagetool/languagetool-3.1.ebuild b/app-officeext/languagetool/languagetool-3.1.ebuild
new file mode 100644
index 0000000..8c3232c
--- /dev/null
+++ b/app-officeext/languagetool/languagetool-3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="LanguageTool-${PV}"
+
+OFFICE_REQ_USE="java"
+
+OFFICE_EXTENSIONS=(
+ "${MY_P}.oxt"
+)
+
+inherit office-ext-r1
+
+DESCRIPTION="Style and Grammar Checker for libreoffice"
+HOMEPAGE="https://www.languagetool.org/"
+SRC_URI="https://www.languagetool.org/download/${MY_P}.oxt"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.7"
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index c3458ec..58f667a 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -1,3 +1,2 @@
-DIST OOoFBTools-2.34.zip 4810850 SHA256 9fea8bb702c484547378f2771bbb16065b09f9b36954b87970de6fa2b54a58b5 SHA512 0d470837a1bdea713b2b711bc73774748513bdb29ecf4bedaadc770b544980ecfcf1f820e41194a77b11c2abc1432d491f111a32b812ecce769a76ac71154fc9 WHIRLPOOL a4fc2e5ebe85c83e8f037914d07145eae586dcff27fab550768f9cdf30c95d28ea8ee670ab897caf3ea294cd9e70590eb0705689484a799eadc0b16a26194799
-DIST OOoFBTools-2.35.zip 4806386 SHA256 fe361f7126d5fcd28ab12eb162443ae87520248d1274bf3d13502b8c5cd542c8 SHA512 36d69a1accf24be5944239fb37161785884034a67d2771b564c6b65a9ec24b79eab33be41868db431964f71e0c824d083c02e4bb5d78aa39ec8984f1597c7d26 WHIRLPOOL f3777ac078c4d7e850e6ba3bdbab3101f1beb40f59e99af20f7076dee04736916a2cc5b5e08eeaf77d6923e50710dba9259120590e1b2f427920911b7523ad56
DIST OOoFBTools-2.36.zip 4806554 SHA256 76971acfb0ce3a618925bc5d38910c631f1267419c283cd4153f355a1ad59aa8 SHA512 16bf990c177a600ca40d27d6c7df71d12078d3850c032ecde131e378da9791b8d0619223cae4ac4f0e3ce717c6cbde0ad5f8d0f558f9e4d64b93b97adc6365ad WHIRLPOOL 2cf50d2c9e3d9f60307f95e9e4d0437308983d6042a07073a196ccc3cdacf0ebc346ffb57581e72dcf469b4a8d0f7f449414a303878f9d7af42cb42fba024bb1
+DIST OOoFBTools-2.38.zip 4833754 SHA256 ee039cf7ae2767916cc79b25d5b852a54089773db458aa695b064e3d803da757 SHA512 2ff6bb251b5913cb7ceb430aba6ee47a5b2e2c7b78be8b291d67410903d3679ef8e01554f504cd86993fb717173d2a9c4080b5059f3e1064be075e67766c07d5 WHIRLPOOL 52fcd3bc82eab952080c6e1b18ed12b1568e4dd7299b55b2433efc8f5420f304ae32bbc3a9fe191c9a614f42aa5e04da976758cf9262e94adc238b887d6ecb9e
diff --git a/app-officeext/ooofbtools/ooofbtools-2.34.ebuild b/app-officeext/ooofbtools/ooofbtools-2.34.ebuild
deleted file mode 100644
index 85b1763..0000000
--- a/app-officeext/ooofbtools/ooofbtools-2.34.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="OOoFBTools"
-
-OFFICE_EXTENSIONS=(
- "${MY_PN}.oxt"
-)
-
-inherit office-ext-r1
-
-DESCRIPTION="Extension for converting and processing eBooks in FictionBook2 format with validator"
-HOMEPAGE="https://sourceforge.net/projects/fbtools/"
-SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/libxml2"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-OFFICE_EXTENSIONS_LOCATION="${S}"
-
-src_prepare() {
- # Remove Windows cruft
- pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null
- rm -r win32 || die
- popd 2>/dev/null
-}
-
-src_install() {
- office-ext-r1_src_install
- dodoc ChangeLog*
-}
diff --git a/app-officeext/ooofbtools/ooofbtools-2.35.ebuild b/app-officeext/ooofbtools/ooofbtools-2.35.ebuild
deleted file mode 100644
index f9b8f6c..0000000
--- a/app-officeext/ooofbtools/ooofbtools-2.35.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="OOoFBTools"
-
-OFFICE_EXTENSIONS=(
- "${MY_PN}.oxt"
-)
-
-inherit office-ext-r1
-
-DESCRIPTION="Extension for converting and processing eBooks in FictionBook2 format with validator"
-HOMEPAGE="https://sourceforge.net/projects/fbtools/"
-SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/libxml2"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-OFFICE_EXTENSIONS_LOCATION="${S}"
-
-src_prepare() {
- # Remove Windows cruft
- pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null
- rm -r win32 || die
- popd 2>/dev/null
-}
-
-src_install() {
- office-ext-r1_src_install
- dodoc ChangeLog*
-}
diff --git a/app-officeext/ooofbtools/ooofbtools-2.38.ebuild b/app-officeext/ooofbtools/ooofbtools-2.38.ebuild
new file mode 100644
index 0000000..c442c93
--- /dev/null
+++ b/app-officeext/ooofbtools/ooofbtools-2.38.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="OOoFBTools"
+
+OFFICE_EXTENSIONS=(
+ "${MY_PN}.oxt"
+)
+
+inherit office-ext-r1
+
+DESCRIPTION="Extension for converting and processing eBooks in FictionBook2 format with validator"
+HOMEPAGE="https://sourceforge.net/projects/fbtools/"
+SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="dev-libs/libxml2"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+OFFICE_EXTENSIONS_LOCATION="${S}"
+
+src_prepare() {
+ # Remove Windows cruft
+ pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null || die
+ rm -r win32 || die
+ popd 2>/dev/null || die
+}
+
+src_install() {
+ office-ext-r1_src_install
+ dodoc ChangeLog*
+}
diff --git a/app-portage/conf-update/conf-update-1.0.3.ebuild b/app-portage/conf-update/conf-update-1.0.3.ebuild
index 46804f4..77f9b8d 100644
--- a/app-portage/conf-update/conf-update-1.0.3.ebuild
+++ b/app-portage/conf-update/conf-update-1.0.3.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="colordiff"
RDEPEND=">=dev-libs/glib-2.6
diff --git a/app-portage/eix/eix-0.30.11.ebuild b/app-portage/eix/eix-0.30.11.ebuild
index 474f281..7254e3d 100644
--- a/app-portage/eix/eix-0.30.11.ebuild
+++ b/app-portage/eix/eix-0.30.11.ebuild
@@ -13,7 +13,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools"
BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
diff --git a/app-portage/g-cpan/g-cpan-0.16.5.ebuild b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
index 317a73d..c7bda0f 100644
--- a/app-portage/g-cpan/g-cpan-0.16.5.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,7 +7,7 @@
inherit perl-module
DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
-HOMEPAGE="https://www.gentoo.org/proj/en/perl/g-cpan.xml"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
SRC_URI="mirror://gentoo/${P}.tar.gz
https://dev.gentoo.org/~chainsaw/distfiles/${P}.tar.gz"
diff --git a/app-portage/g-cpan/g-cpan-0.16.6.ebuild b/app-portage/g-cpan/g-cpan-0.16.6.ebuild
index ccc0384..c3dae23 100644
--- a/app-portage/g-cpan/g-cpan-0.16.6.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@
fi
DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
-HOMEPAGE="https://www.gentoo.org/proj/en/perl/g-cpan.xml"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
diff --git a/app-portage/g-cpan/g-cpan-9999.ebuild b/app-portage/g-cpan/g-cpan-9999.ebuild
index 670e821..204397e 100644
--- a/app-portage/g-cpan/g-cpan-9999.ebuild
+++ b/app-portage/g-cpan/g-cpan-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@
fi
DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
-HOMEPAGE="https://www.gentoo.org/proj/en/perl/g-cpan.xml"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
index 125480d..55e5909 100644
--- a/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
@@ -15,7 +15,7 @@
LICENSE="GPL-2"
SLOT="0"
IUSE="bson git"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
git? ( dev-vcs/git )
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.ebuild
index 7228ddd..5089c73 100644
--- a/app-portage/g-sorcery/g-sorcery-0.2.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2.ebuild
@@ -15,7 +15,7 @@
LICENSE="GPL-2"
SLOT="0"
IUSE="bson"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt
index 2a9de58..115b0e9 100644
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@@ -12,9 +12,9 @@
python3_0 3.0 dead 3.0
python3_1 3.1 dead 3.1
python3_2 3.2 dead 3.2
-python3_3 3.3 current 3.3
-python3_4 supported 3.4
-python3_5 future 3.5
+python3_3 3.3 supported 3.3
+python3_4 current 3.4
+python3_5 supported 3.5
pypy1_8 2.7-pypy-1.8 dead p1.8
pypy1_9 2.7-pypy-1.9 dead p1.9
diff --git a/app-portage/kuroo4/kuroo4-0.90.4.ebuild b/app-portage/kuroo4/kuroo4-0.90.4.ebuild
index dcec937..670bed8 100644
--- a/app-portage/kuroo4/kuroo4-0.90.4.ebuild
+++ b/app-portage/kuroo4/kuroo4-0.90.4.ebuild
@@ -15,7 +15,7 @@
SLOT="4"
IUSE="debug"
-DEPEND="dev-db/sqlite"
+DEPEND="dev-db/sqlite:3"
RDEPEND="${DEPEND}
app-portage/gentoolkit
diff --git a/app-portage/kuroo4/kuroo4-0.90.5.ebuild b/app-portage/kuroo4/kuroo4-0.90.5.ebuild
index dcec937..670bed8 100644
--- a/app-portage/kuroo4/kuroo4-0.90.5.ebuild
+++ b/app-portage/kuroo4/kuroo4-0.90.5.ebuild
@@ -15,7 +15,7 @@
SLOT="4"
IUSE="debug"
-DEPEND="dev-db/sqlite"
+DEPEND="dev-db/sqlite:3"
RDEPEND="${DEPEND}
app-portage/gentoolkit
diff --git a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
index e9beec7..59104ed 100644
--- a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
@@ -37,7 +37,7 @@
# fix dependency on ncurses[tinfo], #459484
sed \
-e "s:\(ncurses\):\1 tinfo:g" \
- -i configure.in || die
+ -i configure.in || die
eautoreconf
diff --git a/app-shells/tcsh/tcsh-6.18.01-r3.ebuild b/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
index f21d605..785e317 100644
--- a/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
@@ -38,7 +38,7 @@
# fix dependency on ncurses[tinfo], #459484
sed \
-e "s:\(ncurses\):\1 tinfo:g" \
- -i configure.in || die
+ -i configure.in || die
eautoreconf
diff --git a/app-shells/tcsh/tcsh-6.18.01-r4.ebuild b/app-shells/tcsh/tcsh-6.18.01-r4.ebuild
index 46d0601..48d21ca 100644
--- a/app-shells/tcsh/tcsh-6.18.01-r4.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01-r4.ebuild
@@ -44,7 +44,7 @@
# fix dependency on ncurses[tinfo], #459484
sed \
-e "s:\(ncurses\):\1 tinfo:g" \
- -i configure.in || die
+ -i configure.in || die
eautoreconf
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index dc0475b..4f73798 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1 +1 @@
-DIST blogc-0.1.tar.xz 243120 SHA256 908819ac078f82e24a255a3afd2267cc43b8a103cd324651470eddccd45984fa SHA512 fe80ae5e4b96b82c4cbdad49b25ce310ed49e208b4aff446c71edbdef100f9221e48ed38be1170e528044b72e9ab0f18a653e2e3d23f94aac2cb0651923afde5 WHIRLPOOL 74a4ce23d834b137ddd363bdd0d81e1ff1fd62efa7dc0d8a03caa452de58c86bdc25db9b3200fa6f29795b1e595fe1091aefb85d654e43ff5c879cc37133f511
+DIST blogc-0.2.1.tar.xz 243148 SHA256 ff59c2fab4c3c645a116fd9e30f4e1a2581cfba6e666c4701bcef4af3762f481 SHA512 1a0b1be8e6e4bbbd67a6c7ee9548217c4734cd918be048252faef37e5cd9a6d901b29ebafac6b4eafa52077de872afb84c75486b7604799dd9e269abfec85726 WHIRLPOOL 20d1b6323ed9c5f7532870a64b9f9533c6175fc358c196bf78b3a03edb24ae1ced6e677e484ea7c98a74063a76e7024b2c5a5340e05d4ee6bb4ecc676ff83f73
diff --git a/app-text/blogc/blogc-0.1.ebuild b/app-text/blogc/blogc-0.2.1.ebuild
similarity index 100%
rename from app-text/blogc/blogc-0.1.ebuild
rename to app-text/blogc/blogc-0.2.1.ebuild
diff --git a/app-text/calibre/calibre-1.48-r1.ebuild b/app-text/calibre/calibre-1.48-r1.ebuild
index dbd132c..099fe1f 100644
--- a/app-text/calibre/calibre-1.48-r1.ebuild
+++ b/app-text/calibre/calibre-1.48-r1.ebuild
@@ -206,7 +206,7 @@
domenu "${HOME}"/.local/share/applications/*.desktop
- find "${ED}"usr/share -type d -empty -delete || die
+ find "${ED}"usr/share -type d -empty -delete || die
cd "${ED}"/usr/share/calibre/fonts/liberation || die
local x
diff --git a/app-text/dos2unix/dos2unix-7.3-r1.ebuild b/app-text/dos2unix/dos2unix-7.3-r1.ebuild
index 41d635e..4862896 100644
--- a/app-text/dos2unix/dos2unix-7.3-r1.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3-r1.ebuild
@@ -14,7 +14,7 @@
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug nls test"
RDEPEND="
diff --git a/app-text/iso-codes/iso-codes-3.61.ebuild b/app-text/iso-codes/iso-codes-3.61.ebuild
index 2ea3c08..68273f5 100644
--- a/app-text/iso-codes/iso-codes-3.61.ebuild
+++ b/app-text/iso-codes/iso-codes-3.61.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/app-text/itex2mml/itex2mml-1.5.2.ebuild b/app-text/itex2mml/itex2mml-1.5.2.ebuild
index d98e675..e94815a 100644
--- a/app-text/itex2mml/itex2mml-1.5.2.ebuild
+++ b/app-text/itex2mml/itex2mml-1.5.2.ebuild
@@ -12,7 +12,7 @@
LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
S="${WORKDIR}/itexToMML/itex-src"
diff --git a/app-text/libgxps/libgxps-0.2.3.2.ebuild b/app-text/libgxps/libgxps-0.2.3.2.ebuild
index f447faa..3060af9 100644
--- a/app-text/libgxps/libgxps-0.2.3.2.ebuild
+++ b/app-text/libgxps/libgxps-0.2.3.2.ebuild
@@ -13,7 +13,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~ia64 ~ppc ppc64 ~sparc x86"
IUSE="+introspection jpeg lcms static-libs tiff"
RDEPEND="
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index f5b1494..2321bf5 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,3 +1,4 @@
DIST libwps-0.2.9.tar.xz 387340 SHA256 cf9a17a6c0452ab32cce342c1410f1620c66f9cb6f9431b82f95da7fe9730177 SHA512 60ddc8db5a90589248a0a8f90950907ca3be3362983f6c4847670e6eaf4d7ad22a2b6795b0a1b0a1920075f25f1ffcfd581757c26bfb74deacd000e94459da34 WHIRLPOOL bc847cb65c72daa01db5d6f17a20cbaff741fab1fc7a63d789993334b7853009f59c1ca370d7d3798a26b294c96c3435664314b07ff5a2324fa7ca7980378fe8
DIST libwps-0.3.1.tar.xz 410376 SHA256 bb2c2a7db5121411ba705ccf3452cdce51d9798384fd9621e9702ba802878e93 SHA512 f628e6532b32331c7df0d97a9b71bf1f97347634657148b47d46ba7c2fd888d7fa9ffe52f31cfc24f86688c9c713bfaff360c7fe9f4a92d646cf8f21e7f5c2b1 WHIRLPOOL ebe35fabf22aedccfe3ca35e46971a26332040852357ea0f2241534261c77d597da38766192661ecd6fa24881e0bf9de4a80bdfea300129420d4635924434110
DIST libwps-0.4.1.tar.xz 476732 SHA256 bf915125d647aec18f63d593eb9385bce1e3cdb48649c1c90782d0e0ff5e976a SHA512 675b1d54436d568a990a305267daf33ebfb064e54b7b220f1ada850db85d1780590e161d27a68aa3b33807fab20a73e862f3dfffb62a8a5ff20192ed6f85063f WHIRLPOOL 56d849615588d2a6e33f1f20367b8ce5685bcc1cac6651fd1f48cda238c851fdaa81658d73557ae5f2e4d4f0ca690517543cbeb0a940bbdca2f3347b938d7d7b
+DIST libwps-0.4.2.tar.xz 543052 SHA256 e4fa907dd2b49b309fb4a860332bc44158570e02cb4ec07d4c8577b374b9f935 SHA512 6e91a4dbb26335b6d4db47daec70d4f50313a8101de1dccce592cec49e00aaf50256580b3ea0c37f24b7ad1cc065a82e0a71deb0cfcd23dabf0a2627d915f48f WHIRLPOOL 137f54be1a0d342205275891008a8de32ae3ee6ba6c2cdafccd61112e4e99e82039a471ef2aa98f0a935a470f48cc59690e8e783e676cde50a78ff1e56558e6c
diff --git a/app-text/libwps/libwps-0.4.2.ebuild b/app-text/libwps/libwps-0.4.2.ebuild
new file mode 100644
index 0000000..a4f3ee0
--- /dev/null
+++ b/app-text/libwps/libwps-0.4.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="http://libwps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
+IUSE="doc debug static-libs"
+
+RDEPEND="
+ app-text/libwpd:0.10
+ dev-libs/boost:=
+ dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+ econf \
+ --disable-werror \
+ $(use_enable static-libs static) \
+ --docdir=/usr/share/doc/${PF} \
+ $(use_with doc docs) \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+ prune_libtool_files --all
+}
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 1d8d55f..72d51ae 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,2 +1 @@
-DIST linuxdoc-tools_0.9.68.tar.gz 619242 SHA256 3b8611683d61480a60cdd2497132f15ca15fb583c9fe5543f6750d187a5dee67 SHA512 a78c662f4bf69b68530af0176fb6b35328c004a80cc73e7ed1151d46da3a7868e4a8a61094f8c4081a686f1ed0c58bd19c2c5ad5a2b6677ddc7c686e67a71df7 WHIRLPOOL 966e47e081bf5eb35de546f7cd0522396aba306d8afbeeba55afb91f360c196b196c3271b84ae8a98d7f9a4d0460558986a8a32a824940b0340236c705490676
DIST linuxdoc-tools_0.9.69.orig.tar.gz 604379 SHA256 7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101 SHA512 5e0ca7614acd5a4c67d4beadd12e9665540d664dc4796c361a25d26ccdc53ef9e0b58cd051d028659e07530e351b0773895f8e6d06e5d2c6ffaad0a1f0c4d41e WHIRLPOOL 0ee3492252f6607169a6404701e04030047f4a4d9237d213606a67c8f6b9ec019315a355e78318a2c57ac8cb2eb08b1ab4d6b81a7f05b77b257127b70cd8ae1d
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-malloc.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-malloc.patch
deleted file mode 100644
index 2f5b3dc..0000000
--- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-malloc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: linuxdoc-tools-0.9.21/rtf-fix/rtf2rtf.l
-===================================================================
---- linuxdoc-tools-0.9.21.orig/rtf-fix/rtf2rtf.l
-+++ linuxdoc-tools-0.9.21/rtf-fix/rtf2rtf.l
-@@ -22,7 +22,7 @@
-
- %{
-
--#include <malloc.h>
-+#include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-compiler.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-compiler.patch
deleted file mode 100644
index 9ba731b..0000000
--- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-compiler.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- rtf-fix/Makefile.orig
-+++ rtf-fix/Makefile
-@@ -1,6 +1,4 @@
--CC=gcc
- LEX=flex
--CFLAGS=-O
-
- all: rtf2rtf
-
---- sgmls-1.1/Makefile.orig 2013-03-20 13:40:43.674880678 +0400
-+++ sgmls-1.1/Makefile 2013-03-20 13:40:58.558881151 +0400
-@@ -15,14 +15,11 @@
- # Permissions mode to use for man pages.
- MANMODE=444
-
--CC=gcc
- PROFILE=
- INCLUDE=
- OPTIMIZE=-O
- DEBUG=
- WARN=
--CFLAGS=$(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
--LDFLAGS=$(DEBUG) $(PROFILE)
- # Additional libraries needed.
- # Ultrix needs -li
- LIBS=
-
---- Makefile.in.orig 2013-03-20 13:43:36.900886178 +0400
-+++ Makefile.in 2013-03-20 13:43:49.783886587 +0400
-@@ -48,8 +48,6 @@
- OPTIMIZE = -O
- DEBUG =
- WARN =
--CFLAGS = $(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
--LDFLAGS = $(DEBUG) $(PROFILE)
-
- all:
- ifeq ($(BUILD_SGMLSASP), true)
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-letter.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-letter.patch
deleted file mode 100644
index 8e5048e..0000000
--- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-letter.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- linuxdoc-tools-0.9.68/perl5lib/LinuxDocTools.pm.letter Mon Nov 26 16:09:37 2001
-+++ linuxdoc-tools-0.9.68/perl5lib/LinuxDocTools.pm Mon Nov 26 16:09:49 2001
-@@ -108,7 +108,7 @@
- { option => "pass", type => "s", short => "P" }
- ];
- $global->{backend} = "linuxdoc";
-- $global->{papersize} = "a4";
-+ $global->{papersize} = "letter";
- $global->{language} = "en";
- $global->{charset} = "ascii";
- $global->{style} = "";
---- linuxdoc-tools-0.9.68/man/linuxdoc.1.letter Mon Nov 26 16:10:04 2001
-+++ linuxdoc-tools-0.9.68/man/linuxdoc.1 Mon Nov 26 16:10:42 2001
-@@ -46,8 +46,8 @@
- format, but just output the usage of this suites.
- Available formats are: html, info, latex, lyx, rtf, tex, check.
- .IP "--papersize=\fIsize\fR, -p
--Set the paper size. Default is ``a4'' (European 297x210mm paper).
--You may also specify ``letter'' size.
-+Set the paper size. Default is ``letter''.
-+You may also specify ``a4'' size (European 297x210mm paper).
- .IP "--language=\fIlang\fR, -l"
- Specify the language of the document (this may change which style
- files are used for formatting by a back end). The default language is
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-lex.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-lex.patch
deleted file mode 100644
index 9ee9743..0000000
--- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-lex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rtf-fix/rtf2rtf.l.orig 2013-03-20 13:14:06.146829954 +0400
-+++ rtf-fix/rtf2rtf.l 2013-03-20 13:14:28.193830654 +0400
-@@ -72,7 +72,7 @@
- int skipnewline = 0;
-
- extern char *yytext;
--extern int yyleng;
-+extern yy_size_t yyleng;
-
- #define CHAPTER 1
- #define SECTION 2
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild
deleted file mode 100644
index 0a5eaa4..0000000
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils sgml-catalog toolchain-funcs
-
-DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
-HOMEPAGE="http://packages.qa.debian.org/l/linuxdoc-tools.html"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="MIT SGMLUG"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
-
-DEPEND="app-text/openjade
- app-text/opensp
- app-text/sgml-common
- dev-texlive/texlive-fontsrecommended
- dev-lang/perl
- sys-apps/gawk
- sys-apps/groff
- virtual/latex-base"
-
-RDEPEND="${DEPEND}"
-
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" \
- "/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${P}-letter.patch" \
- "${FILESDIR}/${PN}-0.9.21-malloc.patch" \
- "${FILESDIR}/${P}-compiler.patch" \
- "${FILESDIR}/${P}-lex.patch"
-
- # Wrong path for the catalog.
- sed -i -e \
- 's,/iso-entities-8879.1986/iso-entities.cat,/sgml-iso-entities-8879.1986/catalog,' \
- perl5lib/LinuxDocTools.pm || die 'sed failed'
-
- # Fix incorrect version string in upstream tarball
- sed -i -e "s/0.9.66/${PV}/" VERSION || die 'sed on VERSION failed'
-
- epatch_user
-}
-
-src_configure() {
- tc-export CC
- econf --with-installed-iso-entities
-}
-
-src_compile() {
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- # Else fails with sandbox violations
- export VARTEXFONTS="${T}/fonts"
-
- # Besides the path being wrong, in changing perl5libdir, it cannot find the
- # catalog.
- export SGML_CATALOG_FILES="/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
-
- eval `perl -V:installvendorarch`
- emake \
- DESTDIR="${D}" \
- perl5libdir="${installvendorarch}" \
- LINUXDOCDOC="/usr/share/doc/${PF}/guide" \
- install
-
- insinto /usr/share/texmf/tex/latex/misc
- doins tex/*.sty
-
- dodoc ChangeLog README
-}
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild
index 7728bbb..ccc6cc8 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild
@@ -13,7 +13,7 @@
LICENSE="MIT SGMLUG"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
IUSE="doc"
DEPEND="
diff --git a/app-text/mupdf/mupdf-1.7a-r1.ebuild b/app-text/mupdf/mupdf-1.7a-r1.ebuild
new file mode 100644
index 0000000..2bb7606
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.7a-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=987969ac033151810aade57d45c3d968dbf83d60;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+MY_SOVER=1.7
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla +curl javascript libressl +openssl static static-libs"
+
+LIB_DEPEND="
+ !libressl? ( dev-libs/openssl:0[static-libs?] )
+ libressl? ( dev-libs/libressl[static-libs?] )
+ media-libs/freetype:2[static-libs?]
+ media-libs/jbig2dec[static-libs?]
+ media-libs/openjpeg:2[static-libs?]
+ net-misc/curl[static-libs?]
+ virtual/jpeg[static-libs?]
+ X? ( x11-libs/libX11[static-libs?]
+ x11-libs/libXext[static-libs?] )
+ javascript? ( dev-lang/mujs )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ static-libs? ( ${LIB_DEPEND} )
+ static? ( ${LIB_DEPEND//?}
+ app-arch/bzip2[static-libs]
+ x11-libs/libXau[static-libs]
+ x11-libs/libXdmcp[static-libs]
+ x11-libs/libxcb[static-libs] )"
+
+src_prepare() {
+ rm -rf thirdparty || die
+
+ epatch \
+ "${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+ "${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
+ "${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+ "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
+ "${FILESDIR}"/${PN}-1.7a-system-mujs.patch
+
+ if has_version ">=media-libs/openjpeg-2.1:2" ; then
+ epatch \
+ "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
+ fi
+
+ sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+ -e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+ -i platform/debian/${PN}.pc || die
+
+ use vanilla || epatch \
+ "${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+ #http://bugs.ghostscript.com/show_bug.cgi?id=693467
+ sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+ -i platform/debian/${PN}.desktop || die
+
+ sed -e "1iOS = Linux" \
+ -e "1iCC = $(tc-getCC)" \
+ -e "1iLD = $(tc-getCC)" \
+ -e "1iAR = $(tc-getAR)" \
+ -e "1iverbose = yes" \
+ -e "1ibuild = debug" \
+ -e "1iprefix = ${ED}usr" \
+ -e "1ilibdir = ${ED}usr/$(get_libdir)" \
+ -e "1idocdir = ${ED}usr/share/doc/${PF}" \
+ -e "1iHAVE_X11 = $(usex X)" \
+ -e "1iWANT_OPENSSL = $(usex openssl)" \
+ -e "1iWANT_CURL = $(usex curl)" \
+ -e "1iHAVE_MUJS = $(usex javascript)" \
+ -e "1iMUJS_LIBS = -lmujs" \
+ -e "1iMUJS_CFLAGS =" \
+ -i Makerules || die
+
+ if use static-libs || use static ; then
+ cp -a "${S}" "${S}"-static || die
+ #add missing Libs.private for xcb and freetype
+ sed -e 's:\(pkg-config --libs\):\1 --static:' \
+ -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+ -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+ -i "${S}"-static/Makerules || die
+ fi
+
+ my_soname=libmupdf.so.${MY_SOVER}
+ my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
+ sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+ -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+ -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
+ -e "\$a\$(MUPDF_JS_NONE_LIB):" \
+ -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+ -e "/install/s: COPYING : :" \
+ -i Makefile || die
+}
+
+src_compile() {
+ emake XCFLAGS="-fpic"
+ use static-libs && \
+ emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+ use static && \
+ emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+ if use X ; then
+ domenu platform/debian/${PN}.desktop
+ doicon platform/debian/${PN}.xpm
+ else
+ rm docs/man/${PN}.1
+ fi
+
+ emake install
+ dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+ use static-libs && \
+ dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+ if use static ; then
+ dobin "${S}"-static/build/debug/mu{tool,draw}
+ use X && dobin "${S}"-static/build/debug/${PN}-x11
+ fi
+ use X && dosym ${PN}-x11 /usr/bin/${PN}
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README docs/*.{txt,c}
+}
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 420f707..d275c29 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -15,9 +15,11 @@
MY_SOVER=1.7
SLOT="0/${MY_SOVER}"
KEYWORDS=""
-IUSE="X vanilla curl openssl static static-libs"
+IUSE="X vanilla curl libressl openssl static static-libs"
-LIB_DEPEND="dev-libs/openssl[static-libs?]
+LIB_DEPEND="
+ !libressl? ( dev-libs/openssl:0[static-libs?] )
+ libressl? ( dev-libs/libressl[static-libs?] )
media-libs/freetype:2[static-libs?]
media-libs/jbig2dec[static-libs?]
media-libs/openjpeg:2[static-libs?]
diff --git a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
index 30b456e..ab97d22 100644
--- a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
+++ b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
@@ -1,13 +1,14 @@
--- paps-0.6.8/src/libpaps.c
+++ paps-0.6.8/src/libpaps.c
-@@ -25,8 +25,8 @@
+@@ -25,8 +25,9 @@
#include <pango/pango.h>
#include <pango/pangoft2.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-+#include <ftglyph.h>
-+#include <ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 9debb23..42ce7a3 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,4 +1,2 @@
-DIST sigil-0.8.5.tar.gz 19394323 SHA256 12540493685988a2a3a3898675b8c92c422fbec43513bdd935b802fc68ca40f4 SHA512 fd4d65afe5afe97522727681963c08483b9ab78070fed2e13c987a45d5f8b9885d7a55c721d25213c097016bd1c375369f1ebedc079329bd995955e6d75d2d06 WHIRLPOOL 0026e04e9f304186a5f6c6d7756cdb30c004e0da4f969d89c19dfa1a475dfe29a85058c82d4066089111778d83c411d520bced0ce19e8fd94b80f0a1a5608ad6
-DIST sigil-0.8.6.tar.gz 19394568 SHA256 5f89b47abbf0a7befa4e776083db5426456f8ef1ef50bd168dc98d621fb2ad26 SHA512 5d45ca43520f6fd13e83c97da24d613a05e9b33dd0e07637f872a0fb6050f345f9228a8f63d1e81ee727f07d6dbdf306d55fdb51d0ac67dde33327465c3c6732 WHIRLPOOL 99388aef513842b930c4f549fdfa23414366a9af390850fa982dd3ef53d59ab4bd443001929bb50d83699ed4f960104f8f96452744a9acb5f08416843dcbe960
DIST sigil-0.8.7.tar.gz 19394061 SHA256 0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652 WHIRLPOOL 2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827
-DIST sigil-0.8.900_pre.tar.gz 17691810 SHA256 8f96b2220abb96c53d72d4d2f704f9fdbd60443ace2f226ebc19c14e43ca0e5a SHA512 4b642c21e9500db04fe31117cdf3a083e4609ddc0e1c6323d1561e771bb033ab57d2edb024a12a74400332d97e5d5ee2d25f4635f87df9c09d940a6b12700518 WHIRLPOOL 14262882ce60bec0fb66a20afd3241390f97aa97cf29b32bf159703ddbf18a0dd7bfa463737573d266522eccb4ed15e89e8bf9ec03357929bfeaf6dcfa61a29e
+DIST sigil-0.8.901_pre.tar.gz 17447097 SHA256 f72b22949679d545e0565c77361f574d4b6149c7b74f4ea855d4ef8f9b85bbb3 SHA512 a776cf5cc2f39a69dd02df8ced07523317f6e6b9259525efd98169410430c7a400275c1e4e1b5676cd96b22a22a0993a29c32c3bf37842cbcc278064b15c1356 WHIRLPOOL 0a410b374eb0490778b209a5579142cf85f43407ea6082ccf8c864f7f350a12d3502ced0b31ecb619a017c89c8e60ffe0fbc3d9d35c1262991822d89f3b9887c
diff --git a/app-text/sigil/sigil-0.8.5.ebuild b/app-text/sigil/sigil-0.8.5.ebuild
deleted file mode 100644
index f830538..0000000
--- a/app-text/sigil/sigil-0.8.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CMAKE_MIN_VERSION="3.0"
-CMAKE_BUILD_TYPE="Release"
-
-# This ebuild could use some python checks, as sigil contains python plugin architecture.
-
-inherit eutils cmake-utils
-
-MY_PN="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="http://sigil-ebook.com/"
-SRC_URI="https://github.com/user-none/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=sys-libs/zlib-1.2.7[minizip]
- >=dev-libs/libpcre-8.31[pcre16]
- >=dev-libs/boost-1.49[threads]
- >=app-text/hunspell-1.3.2
- >=dev-libs/xerces-c-3.1.1[icu]
- >=dev-qt/qtcore-5.4:5
- >=dev-qt/qtwebkit-5.4:5
- >=dev-qt/qtsvg-5.4:5
- >=dev-qt/qtgui-5.4:5
- >=dev-qt/qtwidgets-5.4:5
- >=dev-qt/qtxml-5.4:5
- >=dev-qt/qtxmlpatterns-5.4:5
- >=dev-qt/qtconcurrent-5.4:5
- >=dev-qt/qtprintsupport-5.4:5
- >=dev-qt/qtnetwork-5.4:5
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=dev-qt/linguist-tools-5.4:5
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=( README.md )
-
-src_prepare() {
- # sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
- sed -e '/set( QT_LIBS/d' -i src/Sigil/CMakeLists.txt || die 'sed failed'
-
- cmake-utils_src_prepare
-}
diff --git a/app-text/sigil/sigil-0.8.6-r1.ebuild b/app-text/sigil/sigil-0.8.6-r1.ebuild
deleted file mode 100644
index 45fc347..0000000
--- a/app-text/sigil/sigil-0.8.6-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CMAKE_MIN_VERSION="3.0"
-CMAKE_BUILD_TYPE="Release"
-
-# This ebuild could use some python checks, as sigil contains python plugin architecture.
-
-inherit eutils cmake-utils
-
-MY_PN="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="http://sigil-ebook.com/"
-SRC_URI="https://github.com/user-none/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=app-text/hunspell-1.3.2
- >=dev-libs/boost-1.49[threads]
- >=dev-libs/libpcre-8.31[pcre16]
- >=dev-libs/xerces-c-3.1.1[icu]
- >=dev-qt/qtconcurrent-5.4:5
- >=dev-qt/qtcore-5.4:5
- >=dev-qt/qtgui-5.4:5
- >=dev-qt/qtnetwork-5.4:5
- >=dev-qt/qtprintsupport-5.4:5
- >=dev-qt/qtsvg-5.4:5
- >=dev-qt/qtwebkit-5.4:5
- >=dev-qt/qtwidgets-5.4:5
- >=dev-qt/qtxml-5.4:5
- >=dev-qt/qtxmlpatterns-5.4:5
- >=sys-libs/zlib-1.2.7[minizip]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=dev-qt/linguist-tools-5.4:5
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=( README.md )
-
-src_prepare() {
- # sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
- sed -e '/set( QT_LIBS/d' -i src/Sigil/CMakeLists.txt || die "sed failed"
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- cmake-utils_src_configure
-
- cd "${WORKDIR}/${P}_build" || die "Where is the build dir?"
- for i in CMakeCache.txt src/Sigil/CMakeFiles/sigil.dir/link.txt $(find . -name '*.make')
- do
- sed -e 's/-O3 -DNDEBUG/-DNDEBUG/' -i ${i} || die "sed failed"
- done
-}
diff --git a/app-text/sigil/sigil-0.8.6.ebuild b/app-text/sigil/sigil-0.8.6.ebuild
deleted file mode 100644
index f830538..0000000
--- a/app-text/sigil/sigil-0.8.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CMAKE_MIN_VERSION="3.0"
-CMAKE_BUILD_TYPE="Release"
-
-# This ebuild could use some python checks, as sigil contains python plugin architecture.
-
-inherit eutils cmake-utils
-
-MY_PN="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="http://sigil-ebook.com/"
-SRC_URI="https://github.com/user-none/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=sys-libs/zlib-1.2.7[minizip]
- >=dev-libs/libpcre-8.31[pcre16]
- >=dev-libs/boost-1.49[threads]
- >=app-text/hunspell-1.3.2
- >=dev-libs/xerces-c-3.1.1[icu]
- >=dev-qt/qtcore-5.4:5
- >=dev-qt/qtwebkit-5.4:5
- >=dev-qt/qtsvg-5.4:5
- >=dev-qt/qtgui-5.4:5
- >=dev-qt/qtwidgets-5.4:5
- >=dev-qt/qtxml-5.4:5
- >=dev-qt/qtxmlpatterns-5.4:5
- >=dev-qt/qtconcurrent-5.4:5
- >=dev-qt/qtprintsupport-5.4:5
- >=dev-qt/qtnetwork-5.4:5
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=dev-qt/linguist-tools-5.4:5
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=( README.md )
-
-src_prepare() {
- # sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
- sed -e '/set( QT_LIBS/d' -i src/Sigil/CMakeLists.txt || die 'sed failed'
-
- cmake-utils_src_prepare
-}
diff --git a/app-text/sigil/sigil-0.8.7-r1.ebuild b/app-text/sigil/sigil-0.8.7-r1.ebuild
new file mode 100644
index 0000000..6b75376
--- /dev/null
+++ b/app-text/sigil/sigil-0.8.7-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CMAKE_MIN_VERSION="3.0"
+
+# This ebuild could use some python checks, as sigil contains python plugin architecture.
+
+inherit eutils cmake-utils
+
+MY_PN="Sigil"
+
+DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="http://sigil-ebook.com/"
+SRC_URI="https://github.com/Sigil-Ebook/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=app-text/hunspell-1.3.2
+ >=dev-libs/boost-1.49[threads]
+ >=dev-libs/libpcre-8.31[pcre16]
+ >=dev-libs/xerces-c-3.1.1[icu]
+ >=dev-qt/qtconcurrent-5.4:5
+ >=dev-qt/qtcore-5.4:5
+ >=dev-qt/qtgui-5.4:5
+ >=dev-qt/qtnetwork-5.4:5
+ >=dev-qt/qtprintsupport-5.4:5
+ >=dev-qt/qtsvg-5.4:5
+ >=dev-qt/qtwebkit-5.4:5
+ >=dev-qt/qtwidgets-5.4:5
+ >=dev-qt/qtxml-5.4:5
+ >=dev-qt/qtxmlpatterns-5.4:5
+ >=sys-libs/zlib-1.2.7[minizip]
+"
+DEPEND="${RDEPEND}
+ >=sys-devel/gcc-4.8
+ virtual/pkgconfig
+ >=dev-qt/linguist-tools-5.4:5
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DOCS=( README.md )
+
+src_prepare() {
+ # sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
+ sed -e '/set( QT_LIBS/d' -i src/Sigil/CMakeLists.txt || die "sed failed"
+
+ cmake-utils_src_prepare
+}
diff --git a/app-text/sigil/sigil-0.8.900_pre.ebuild b/app-text/sigil/sigil-0.8.900_pre.ebuild
deleted file mode 100644
index 9ec78bd..0000000
--- a/app-text/sigil/sigil-0.8.900_pre.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CMAKE_MIN_VERSION="3.0"
-CMAKE_BUILD_TYPE="Release"
-
-# This ebuild could use some python checks, as sigil contains python plugin architecture.
-
-inherit eutils cmake-utils
-
-MY_PN="Sigil"
-MY_PV="0.8.900"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="http://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-lang/python:3.4
- >=dev-libs/boost-1.49[threads]
- >=dev-libs/libpcre-8.31[pcre16]
- >=dev-libs/xerces-c-3.1.1[icu]
- >=dev-qt/qtconcurrent-5.4:5
- >=dev-qt/qtcore-5.4:5
- >=dev-qt/qtgui-5.4:5
- >=dev-qt/qtnetwork-5.4:5
- >=dev-qt/qtprintsupport-5.4:5
- >=dev-qt/qtsvg-5.4:5
- >=dev-qt/qtwebkit-5.4:5
- >=dev-qt/qtwidgets-5.4:5
- >=dev-qt/qtxml-5.4:5
- >=dev-qt/qtxmlpatterns-5.4:5
- >=sys-libs/zlib-1.2.7[minizip]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=dev-qt/linguist-tools-5.4:5
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-DOCS=( README.md ChangeLog.txt )
-
-src_prepare() {
- # sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
- sed -e '/set( QT_LIBS/d' -i src/CMakeLists.txt || die "sed failed"
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_SYSTEM_LIBS=1
- -DSYSTEM_LIBS_REQUIRED=1
- )
- cmake-utils_src_configure
-
- cd "${WORKDIR}/${P}_build" || die "Where is the build dir?"
- for i in CMakeCache.txt src/CMakeFiles/sigil.dir/link.txt $(find . -name '*.make')
- do
- sed -e 's/-O3 -DNDEBUG/-DNDEBUG/' -i ${i} || die "sed failed"
- done
-}
diff --git a/app-text/sigil/sigil-0.8.901_pre.ebuild b/app-text/sigil/sigil-0.8.901_pre.ebuild
new file mode 100644
index 0000000..43cb414
--- /dev/null
+++ b/app-text/sigil/sigil-0.8.901_pre.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CMAKE_MIN_VERSION="3.0"
+
+# Sigil supports Python 3.5 already. Include it when we have the deps for it.
+PYTHON_COMPAT=( python3_4 )
+
+inherit eutils cmake-utils python-single-r1
+
+MY_PN="Sigil"
+MY_PV="0.8.901"
+
+DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="http://sigil-ebook.com/"
+SRC_URI="https://github.com/Sigil-Ebook/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost[threads]
+ dev-libs/libpcre[pcre16]
+ dev-libs/xerces-c[icu]
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/cssselect[${PYTHON_USEDEP}]
+ dev-python/cssutils[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=dev-qt/qtconcurrent-5.4:5
+ >=dev-qt/qtcore-5.4:5
+ >=dev-qt/qtgui-5.4:5
+ >=dev-qt/qtnetwork-5.4:5
+ >=dev-qt/qtprintsupport-5.4:5
+ >=dev-qt/qtsvg-5.4:5
+ >=dev-qt/qtwebkit-5.4:5
+ >=dev-qt/qtwidgets-5.4:5
+ >=dev-qt/qtxml-5.4:5
+ >=dev-qt/qtxmlpatterns-5.4:5
+ sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=sys-devel/gcc-4.8
+ virtual/pkgconfig
+ >=dev-qt/linguist-tools-5.4:5
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+DOCS=( ChangeLog.txt README.md )
+
+src_prepare() {
+ # sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
+ sed -e '/set( QT_LIBS/d' -i src/CMakeLists.txt || die "sed failed"
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_SYSTEM_LIBS=1
+ -DSYSTEM_LIBS_REQUIRED=1
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-text/yelp-tools/yelp-tools-3.16.1.ebuild b/app-text/yelp-tools/yelp-tools-3.16.1.ebuild
index b1770b3..0bc22b0 100644
--- a/app-text/yelp-tools/yelp-tools-3.16.1.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.16.1.ebuild
@@ -12,7 +12,7 @@
LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/app-vim/python-mode/Manifest b/app-vim/python-mode/Manifest
index a0ced5e..015780c 100644
--- a/app-vim/python-mode/Manifest
+++ b/app-vim/python-mode/Manifest
@@ -1,2 +1 @@
-DIST python-mode-0.6.10.tar.gz 474266 SHA256 ed97b9c260cafa38e01d1bc988e611df8a4681922e3ba4022e5ccac692b8f583 SHA512 562d91a377e783b2cf2583910f4c6b0e8530be9533b513198f5ac97e7581672f95f69e752d391d2a6ad9ac0621c967bc46c02f79fdc38d25172f14267fe27f7e WHIRLPOOL 404458e298ab3c093c031ac00cf43e66652a8054fecfb4d2c481d73a2efbb6949409545f5269bcb43f519b19a27dd8b68fb75a166dce1e78d49e1899bfe17901
DIST python-mode-0.6.18.tar.gz 386846 SHA256 d46ff14b7ee639b698d1b0ae0e7ca0dcfa95a315ffb25e523ae720461f399c1d SHA512 0e3159a055304443c8b15590c424ac0f4a4303e343882ff91f01f5b959274931dea83969ab1dcd19ce95894c7da5be60699d51b852dc73165a99a271feec4e64 WHIRLPOOL 1a6114999c1b832335268dd7dd3e9ebfd48ce9e35cdc7058e4a1011d3ac0aeb36df85ab52599460e449c0ee645303aca17a8ecb44533a5d137a9b904c426b1da
diff --git a/app-vim/python-mode/python-mode-0.6.10.ebuild b/app-vim/python-mode/python-mode-0.6.10.ebuild
deleted file mode 100644
index 9348671..0000000
--- a/app-vim/python-mode/python-mode-0.6.10.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-VIM_PLUGIN_MESSAGES="filetype"
-VIM_PLUGIN_HELPFILES="PythonModeCommands"
-VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
-
-inherit vim-plugin vcs-snapshot
-
-DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
-SRC_URI="https://github.com/klen/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
- dev-python/astng
- dev-python/autopep8
- dev-python/pyflakes
- dev-python/pylint
- dev-python/rope
- dev-python/ropemode
- "
-
-src_prepare() {
- rm -rf pylibs/{logilab,*pep8.py,pyflakes,pylint,rope,ropemode} .gitignore
- mv pylint.ini "${T}" || die
- sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
- -i plugin/pymode.vim || die # use custom path
- sed -e "s/pylibs.autopep8/autopep8/g" -i pylibs/pymode/auto.py || die
- sed -e "s/pylibs.ropemode/ropemode/g" -i pylibs/ropevim.py || die
-}
-
-src_install() {
- vim-plugin_src_install
- insinto usr/share/${PN}
- doins "${T}"/pylint.ini
-}
-
-pkg_postinst() {
- vim-plugin_pkg_postinst
- einfo "If you use custom pylintrc make sure you append the contents of"
- einfo " ${EPREFIX}/usr/share/${PN}/pylint.ini"
- einfo "to it. Otherwise PyLint command will not work properly."
-}
diff --git a/app-vim/python-mode/python-mode-0.6.18-r2.ebuild b/app-vim/python-mode/python-mode-0.6.18-r2.ebuild
deleted file mode 100644
index 9f493ee..0000000
--- a/app-vim/python-mode/python-mode-0.6.18-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIM_PLUGIN_MESSAGES="filetype"
-VIM_PLUGIN_HELPFILES="PythonModeCommands"
-VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
-
-inherit vim-plugin
-
-DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
-SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-python/astng
- dev-python/autopep8
- dev-python/pyflakes
- dev-python/pylint
- dev-python/rope
- dev-python/ropemode
- "
-
-src_prepare() {
- # debundling fun
- rm -rf pylibs/pylama/{pep8.py,pyflakes} pylibs/{autopep8.py}
- #rm -rf pylibs/{rope,ropemode} #475686
- sed -e 's/from .pep8/from pep8/g' \
- -e 's/from .pyflakes/from pyflakes/g' \
- -i pylibs/pylama/utils.py || die
- # there's still pylint left, I failed to debundle it :/
-
- mv pylint.ini "${T}" || die
- sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
- -i autoload/pymode.vim || die # use custom path
-}
-
-src_install() {
- vim-plugin_src_install
- insinto usr/share/${PN}
- doins "${T}"/pylint.ini
-}
-
-pkg_postinst() {
- vim-plugin_pkg_postinst
- einfo "If you use custom pylintrc make sure you append the contents of"
- einfo " ${EPREFIX}/usr/share/${PN}/pylint.ini"
- einfo "to it. Otherwise PyLint command will not work properly."
-}
diff --git a/app-vim/vimclojure/Manifest b/app-vim/vimclojure/Manifest
new file mode 100644
index 0000000..19d9b16
--- /dev/null
+++ b/app-vim/vimclojure/Manifest
@@ -0,0 +1 @@
+DIST 2.3.6.zip 44737 SHA256 7c1a9197e8ed2540c921a4e448c88d784740de891cfe58c57e19e9c5c499cd5b SHA512 daf4f691500c3b901a57849c6f07b500c49f7086e0733921f589e362a53a0d07b99eab7d6ea42f1828822942b294f51a684eec93ebab1797438da4b81199ca9d WHIRLPOOL b908cf86313cdd3521f15c2090cbb9f4f2a8a7c656ff1a152fa3707f62e1c6a49fbf6dcf2d596107e6cb2ab579f9aa3e5aec60d04fc91a8f08396bb813b43481
diff --git a/app-vim/vimclojure/metadata.xml b/app-vim/vimclojure/metadata.xml
new file mode 100644
index 0000000..b97972b
--- /dev/null
+++ b/app-vim/vimclojure/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>java</herd>
+ <maintainer>
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/vimclojure/vimclojure-2.3.6.ebuild b/app-vim/vimclojure/vimclojure-2.3.6.ebuild
new file mode 100644
index 0000000..52d177f
--- /dev/null
+++ b/app-vim/vimclojure/vimclojure-2.3.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN="VimClojure"
+
+DESCRIPTION="vim plugin: Clojure syntax highlighting, filetype and indent settings"
+HOMEPAGE="https://github.com/vim-scripts/VimClojure"
+SRC_URI="https://github.com/vim-scripts/${MY_PN}/archive/${PV}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+ find "${S}" -type f -name \*.bat -exec rm -v {} \; || die
+}
+
+src_install() {
+ local my_license="doc/LICENSE.txt"
+ dodoc ${my_license}
+ rm -v ${my_license} || die
+ vim-plugin_src_install
+}
diff --git a/dev-cpp/glibmm/glibmm-2.44.0.ebuild b/dev-cpp/glibmm/glibmm-2.44.0.ebuild
index cf6b54b..d538edd 100644
--- a/dev-cpp/glibmm/glibmm-2.44.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.44.0.ebuild
@@ -12,7 +12,7 @@
LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug examples test"
COMMON_DEPEND="
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild
index 49925b0..7a24fc7 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild
@@ -12,7 +12,7 @@
LICENSE="LGPL-2.1+"
SLOT="2.4"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc examples test"
COMMON_DEPEND="
diff --git a/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild
index 4a80ec8..5afe60a 100644
--- a/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild
@@ -12,7 +12,7 @@
LICENSE="LGPL-2.1+"
SLOT="3.0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="aqua doc examples test wayland +X"
REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/mm-common/mm-common-0.9.8.ebuild b/dev-cpp/mm-common/mm-common-0.9.8.ebuild
index 0e7b542..95dbfc5 100644
--- a/dev-cpp/mm-common/mm-common-0.9.8.ebuild
+++ b/dev-cpp/mm-common/mm-common-0.9.8.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86"
IUSE=""
RDEPEND=""
diff --git a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
index e100d6b..506dabe 100644
--- a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
+++ b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
@@ -36,6 +36,7 @@
src_prepare() {
sed -i ./src/couchdb/priv/Makefile.* -e 's|-Werror||g'
epatch "${FILESDIR}/${PV}-erlang-18.patch"
+ eautoreconf
}
src_configure() {
diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild b/dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild
deleted file mode 100644
index 281bae6..0000000
--- a/dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic eutils autotools multilib user readme.gentoo versionator
-
-MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
-
-DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features"
-HOMEPAGE="http://www.firebirdsql.org/"
-SRC_URI="
- mirror://sourceforge/firebird/${MY_P}.tar.bz2
- doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 -ia64 ~x86"
-
-IUSE="doc client superserver xinetd examples debug"
-REQUIRED_USE="
- client? ( !superserver )
- client? ( !xinetd )
- superserver? ( !xinetd )
-"
-
-CDEPEND="
- dev-libs/libedit
- dev-libs/icu:=
-"
-DEPEND="${CDEPEND}
- >=dev-util/btyacc-3.0-r2
- doc? ( app-arch/unzip )
-"
-RDEPEND="${CDEPEND}
- xinetd? ( virtual/inetd )
- !sys-cluster/ganglia
-"
-
-RESTRICT="userpriv"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewgroup firebird 450
- enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
-}
-
-function check_sed() {
- MSG="sed of $3, required $2 lines modified $1"
- einfo "${MSG}"
- [[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-src_unpack() {
- unpack "${MY_P}.tar.bz2"
- if use doc; then
- # Unpack docs
- mkdir "${WORKDIR}/manuals" && cd "${WORKDIR}/manuals" || die
- unpack ib_b60_doc.zip
- fi
-}
-
-src_prepare() {
- # This patch might be portable, and not need to be duplicated per version
- # also might no longer be necessary to patch deps or libs, just flags
- epatch "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
-
- use client && epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-client.patch
- use superserver || epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
-
- # Rename references to isql to fbsql
- # sed vs patch for portability and addtional location changes
- check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
- src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
- check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
- src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
- check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
- -e 's:isql :fbsql :w /dev/stdout' \
- -e 's:ISQL :FBSQL :w /dev/stdout' \
- src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
-
- find "${S}" -name \*.sh -print0 | xargs -0 chmod +x || die
- rm -rf "${S}"/extern/{btyacc,editline,icu} || die
-
- eautoreconf
-}
-
-src_configure() {
- filter-flags -fprefetch-loop-arrays
- filter-mfpmath sse
-
- econf \
- --prefix=/usr/$(get_libdir)/firebird \
- $(use_enable superserver superserver) \
- $(use_enable debug) \
- --with-editline \
- --with-system-editline \
- --with-system-icu \
- --with-fbbin=/usr/bin \
- --with-fbsbin=/usr/sbin \
- --with-fbconf=/etc/${PN} \
- --with-fblib=/usr/$(get_libdir) \
- --with-fbinclude=/usr/include \
- --with-fbdoc=/usr/share/doc/${P} \
- --with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
- --with-fbsample=/usr/share/doc/${P}/examples \
- --with-fbsample-db=/usr/share/doc/${P}/examples/db \
- --with-fbhelp=/usr/$(get_libdir)/${PN}/help \
- --with-fbintl=/usr/$(get_libdir)/${PN}/intl \
- --with-fbmisc=/usr/share/${PN} \
- --with-fbsecure-db=/etc/${PN} \
- --with-fbmsg=/usr/$(get_libdir)/${PN} \
- --with-fblog=/var/log/${PN}/ \
- --with-fbglock=/var/run/${PN} \
- --with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
- --with-gnu-ld \
- ${myconf}
-}
-
-src_compile() {
- MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
- emake
-}
-
-src_install() {
- cd "${S}/gen/${PN}" || die
-
- if use doc; then
- dodoc "${S}"/doc/*.pdf
- find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
- fi
-
- doheader include/*
-
- rm lib/libfbstatic.a
-
- insinto /usr/$(get_libdir)
- dolib.so lib/*.so*
-
- # links for backwards compatibility
- dosym libfbclient.so /usr/$(get_libdir)/libgds.so
- dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
- dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
-
- insinto /usr/$(get_libdir)/${PN}
- doins *.msg
-
- use client && return
-
- einfo "Renaming isql -> fbsql"
- mv bin/isql bin/fbsql
-
- local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
- for bin in ${bins[@]}; do
- dobin bin/${bin}
- done
-
- dosbin bin/fb_lock_print
- # SuperServer
- if use superserver ; then
- dosbin bin/{fbguard,fbserver}
- # ClassicServer
- elif use xinetd ; then
- dosbin bin/fb_inet_server
- # SuperClassic
- else
- dosbin bin/{fbguard,fb_smp_server}
-
- #Temp should not be necessary, need to patch/fix
- dosym "${D}"/usr/$(get_libdir)/libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
- fi
-
- exeinto /usr/bin/${PN}
- exeopts -m0755
- doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-
- insinto /usr/$(get_libdir)/${PN}/help
- doins help/help.fdb
-
- exeinto /usr/$(get_libdir)/firebird/intl
- dolib.so intl/libfbintl.so
- dosym "${D}"/usr/$(get_libdir)/libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
- dosym "${D}"/etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
-
- exeinto /usr/$(get_libdir)/${PN}/plugins
- dolib.so plugins/libfbtrace.so
- dosym "${D}"/usr/$(get_libdir)/libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
-
- exeinto /usr/$(get_libdir)/${PN}/UDF
- doexe UDF/*.so
-
- insinto /usr/share/${PN}/upgrade
- doins "${S}"/src/misc/upgrade/v2/*
-
- insinto /etc/${PN}
- insopts -m0644 -o firebird -g firebird
- doins ../install/misc/*.conf
- insopts -m0660 -o firebird -g firebird
- doins security2.fdb
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}/${PN}.xinetd" ${PN}
- else
- newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN}
- newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN}
- fperms 640 /etc/conf.d/${PN}
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
- fperms 0644 /etc/logrotate.d/${PN}
-
- diropts -m 755 -o firebird -g firebird
- dodir /var/log/${PN}
- dodir /var/run/${PN}
- keepdir /var/log/${PN}
- keepdir /var/run/${PN}
-
- use examples && docinto examples
-}
-
-pkg_postinst() {
- use client && return
-
- # Hack to fix ownership/perms
- chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
- chmod 750 "${ROOT}/etc/${PN}"
-}
-
-pkg_config() {
- use client && return
-
- # if found /etc/security.gdb from previous install, backup, and restore as
- # /etc/security2.fdb
- if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
- # if we have scurity2.fdb already, back it 1st
- if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
- cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
- fi
- gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
- gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
- mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
- rm "${ROOT}/etc/firebird/security.gbk"
-
- # make sure they are readable only to firebird
- chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
- chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
-
- echo
- einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
- einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
- einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
- echo
- fi
-
- # we need to enable local access to the server
- if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
- touch "${ROOT}/etc/hosts.equiv"
- chown root:0 "${ROOT}/etc/hosts.equiv"
- chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
- fi
-
- # add 'localhost.localdomain' to the hosts.equiv file...
- if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
- echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
- einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
- fi
-
- # add 'localhost' to the hosts.equiv file...
- if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
- echo "localhost" >> "${ROOT}/etc/hosts.equiv"
- einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
- fi
-
- HS_NAME=`hostname`
- if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
- echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
- einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
- fi
-
- einfo "If you're using UDFs, please remember to move them"
- einfo "to /usr/lib/firebird/UDF"
-}
diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r3.ebuild b/dev-db/firebird/firebird-2.5.3.26780.0-r3.ebuild
new file mode 100644
index 0000000..6b824a6
--- /dev/null
+++ b/dev-db/firebird/firebird-2.5.3.26780.0-r3.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib readme.gentoo user versionator
+
+MY_P=${PN/f/F}-$(replace_version_separator 4 -)
+#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
+
+DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features"
+HOMEPAGE="http://www.firebirdsql.org/"
+SRC_URI="
+ mirror://sourceforge/firebird/${MY_P}.tar.bz2
+ doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+
+LICENSE="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc client examples superserver xinetd"
+REQUIRED_USE="^^ ( client superserver xinetd )"
+
+CDEPEND="
+ dev-libs/libedit
+ dev-libs/icu:=
+"
+DEPEND="${CDEPEND}
+ >=dev-util/btyacc-3.0-r2
+ doc? ( app-arch/unzip )
+"
+RDEPEND="${CDEPEND}
+ xinetd? ( virtual/inetd )
+ !sys-cluster/ganglia
+"
+
+RESTRICT="userpriv"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ enewgroup firebird 450
+ enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
+}
+
+check_sed() {
+ MSG="sed of $3, required $2 lines modified $1"
+ einfo "${MSG}"
+ [[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+ unpack "${MY_P}.tar.bz2"
+ if use doc; then
+ # Unpack docs
+ mkdir "manuals" || die
+ cd "manuals" || die
+ unpack ib_b60_doc.zip
+ fi
+}
+
+src_prepare() {
+ # This patch might be portable, and not need to be duplicated per version
+ # also might no longer be necessary to patch deps or libs, just flags
+ epatch "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
+
+ use client && epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-client.patch
+ use superserver || epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
+
+ # Rename references to isql to fbsql
+ # sed vs patch for portability and addtional location changes
+ check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+ src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+ check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+ src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
+ check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+ -e 's:isql :fbsql :w /dev/stdout' \
+ -e 's:ISQL :FBSQL :w /dev/stdout' \
+ src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
+
+ find "${S}" -name \*.sh -exec chmod +x {} + || die
+ rm -r "${S}"/extern/{btyacc,editline,icu} || die
+
+ eautoreconf
+}
+
+src_configure() {
+ filter-flags -fprefetch-loop-arrays
+ filter-mfpmath sse
+
+ econf \
+ --prefix=/usr/$(get_libdir)/firebird \
+ $(use_enable superserver) \
+ $(use_enable debug) \
+ --with-editline \
+ --with-system-editline \
+ --with-system-icu \
+ --with-fbbin=/usr/bin \
+ --with-fbsbin=/usr/sbin \
+ --with-fbconf=/etc/${PN} \
+ --with-fblib=/usr/$(get_libdir) \
+ --with-fbinclude=/usr/include \
+ --with-fbdoc=/usr/share/doc/${P} \
+ --with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
+ --with-fbsample=/usr/share/doc/${P}/examples \
+ --with-fbsample-db=/usr/share/doc/${P}/examples/db \
+ --with-fbhelp=/usr/$(get_libdir)/${PN}/help \
+ --with-fbintl=/usr/$(get_libdir)/${PN}/intl \
+ --with-fbmisc=/usr/share/${PN} \
+ --with-fbsecure-db=/etc/${PN} \
+ --with-fbmsg=/usr/$(get_libdir)/${PN} \
+ --with-fblog=/var/log/${PN}/ \
+ --with-fbglock=/var/run/${PN} \
+ --with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
+ --with-gnu-ld \
+ ${myconf}
+}
+
+src_compile() {
+ MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
+ emake
+}
+
+src_install() {
+ cd "gen/${PN}" || die
+
+ if use doc; then
+ dodoc "${S}"/doc/*.pdf
+ find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
+ fi
+
+ doheader include/*
+
+ rm lib/libfbstatic.a || die "failed to remove libfbstatic.a"
+
+ insinto /usr/$(get_libdir)
+ dolib.so lib/*.so*
+
+ # links for backwards compatibility
+ dosym libfbclient.so /usr/$(get_libdir)/libgds.so
+ dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
+ dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
+
+ insinto /usr/$(get_libdir)/${PN}
+ doins *.msg
+
+ use client && return
+
+ einfo "Renaming isql -> fbsql"
+ mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
+
+ local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
+ for bin in ${bins}; do
+ dobin bin/${bin}
+ done
+
+ dosbin bin/fb_lock_print
+ # SuperServer
+ if use superserver ; then
+ dosbin bin/{fbguard,fbserver}
+ # ClassicServer
+ elif use xinetd ; then
+ dosbin bin/fb_inet_server
+ # SuperClassic
+ else
+ dosbin bin/{fbguard,fb_smp_server}
+
+ #Temp should not be necessary, need to patch/fix
+ dosym usr/$(get_libdir)/libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
+ fi
+
+ exeinto /usr/bin/${PN}
+ exeopts -m0755
+ doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
+
+ insinto /usr/$(get_libdir)/${PN}/help
+ doins help/help.fdb
+
+ exeinto /usr/$(get_libdir)/firebird/intl
+ dolib.so intl/libfbintl.so
+ dosym usr/$(get_libdir)/libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
+ dosym etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
+
+ exeinto /usr/$(get_libdir)/${PN}/plugins
+ dolib.so plugins/libfbtrace.so
+ dosym usr/$(get_libdir)/libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
+
+ exeinto /usr/$(get_libdir)/${PN}/UDF
+ doexe UDF/*.so
+
+ insinto /usr/share/${PN}/upgrade
+ doins -r "${S}"/src/misc/upgrade/v2/*
+
+ insinto /etc/${PN}
+ insopts -m0644 -o firebird -g firebird
+ doins ../install/misc/*.conf
+ insopts -m0660 -o firebird -g firebird
+ doins security2.fdb
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}/${PN}.xinetd" ${PN}
+ else
+ newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN}
+ newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN}
+ fperms 640 /etc/conf.d/${PN}
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+ fperms 0644 /etc/logrotate.d/${PN}
+
+ diropts -m 755 -o firebird -g firebird
+ dodir /var/log/${PN}
+ dodir /var/run/${PN}
+ keepdir /var/log/${PN}
+ keepdir /var/run/${PN}
+
+ use examples && docinto examples
+}
+
+pkg_postinst() {
+ use client && return
+
+ # Hack to fix ownership/perms
+ chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
+ chmod 750 "${ROOT}/etc/${PN}"
+}
+
+pkg_config() {
+ use client && return
+
+ # if found /etc/security.gdb from previous install, backup, and restore as
+ # /etc/security2.fdb
+ if [[ -f "${ROOT}/etc/firebird/security.gdb" ]] ; then
+ # if we have scurity2.fdb already, back it 1st
+ if [[ -f "${ROOT}/etc/firebird/security2.fdb" ]] ; then
+ cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old" || die
+ fi
+ gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk" || die
+ gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb" || die
+ mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old" || die
+ rm "${ROOT}/etc/firebird/security.gbk" || die
+
+ # make sure they are readable only to firebird
+ chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}" || die
+ chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}" || die
+
+ echo
+ einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
+ einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
+ einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
+ echo
+ fi
+
+ # we need to enable local access to the server
+ if [[ ! -f "${ROOT}/etc/hosts.equiv" ]] ; then
+ touch "${ROOT}/etc/hosts.equiv" || die
+ chown root:0 "${ROOT}/etc/hosts.equiv" || die
+ chmod u=rw,go=r "${ROOT}/etc/hosts.equiv" || die
+ fi
+
+ # add 'localhost.localdomain' to the hosts.equiv file...
+ if grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" ; then
+ echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv" || die
+ einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
+ fi
+
+ # add 'localhost' to the hosts.equiv file...
+ if grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" ; then
+ echo "localhost" >> "${ROOT}/etc/hosts.equiv" || die
+ einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
+ fi
+
+ HS_NAME=`hostname`
+ if grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" ; then
+ echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv" || die
+ einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
+ fi
+
+ einfo "If you're using UDFs, please remember to move them"
+ einfo "to /usr/lib/firebird/UDF"
+}
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index f9d71d8..5c33668 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,7 @@
DIST mariadb-10.0.21.tar.gz 56216903 SHA256 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 SHA512 75aa4b019f3432a61483bb325a0f088ea92d6fede44d7a300c15659411c8927fa2a0586182226315b6d6796641ca1d8746f7fd49e21fe21505adec1fc38ae32f WHIRLPOOL b086fb34363b2426f5e91c14916b747787feadf37c609f4aea1f08bd235e9e97df17f5bfa0eb9e65e93fbed3df5eb6c021287c4eb987a3362ea87cf96eaf268e
DIST mariadb-10.1.7.tar.gz 53812743 SHA256 5bd3b80cf0f312751271a3446c12579c7081f93406e59a0cdfda8e133423c88f SHA512 4a496ba22ccc839d412dd4858cb66464b499693c4ff89ea773a967bccc7d53a52622f3d494d6f889c5325b079d83ba17b25abae2bc9fc22b76c601fc51542f5a WHIRLPOOL 2366c46a7c6d83dd9fe7cac9affcb00387a574912ad9350c11279d31fd384e5fcc18a5d297765086b2f9208e5b899a7707cfb199d047309b89725d0e9582cd9d
DIST mariadb-5.5.45.tar.gz 45686618 SHA256 4dc3aff6941ef1068412002915d795bcf67db0eaa38a5c6f3af57474c4226fb0 SHA512 57501670605cfcdd231ef57d2db7ac9bf460856e63c0660d050ad11aa0392d3d6ce6730ae119dca5d00847c9170990f375c8499593bf0d02c1995395191236ba WHIRLPOOL e5ef471c097c2b8921596b88f26df6914e031daafdcd878d79a16c20be6ba8c97fb79069e48d7d1b9aa405ced063f66feac1c52503907e06ee4b577def2c57fa
+DIST mariadb-5.5.46.tar.gz 45683962 SHA256 45b66b7adc87cad32e553df1d5211e5b6426b78a3bc318a5ccde088bf93e6e10 SHA512 91e5d3d46da9932fdd80125abf77cea411158e04212ae6dea1aa7a9260626c9dfded967af7173a152f488f38c35ff423fcba4098fa337814956c6fa8719c6080 WHIRLPOOL 7da1dc60dca37605c56291544b6d0dfc09a7a76c139b14d1277980d079251d02389efdbde56d23402d659e9c0830fd7ab7998833e1b5fcd33dcab436ea21b74c
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
diff --git a/dev-db/mariadb/mariadb-5.5.46.ebuild b/dev-db/mariadb/mariadb-5.5.46.ebuild
new file mode 100644
index 0000000..0700185
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.46.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20150509-1847Z"
+
+# Build system
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# 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='embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ 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))"
+ # Enable parallel testing, auto will try to detect number of cores
+ # 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}
+
+ # create symlink for the tests to find the replace util
+ ln -s "${BUILD_DIR}/extra/replace" "${BUILD_DIR}/client/"
+
+ # These are failing in MariaDB 5.5 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:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+ # fails due to bad cleanup of previous tests when run in parallel
+ # The tool is deprecated anyway
+ # Bug 532288
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help \
+ archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+ --testcase-timeout=30
+ 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/mongodb/mongodb-3.0.6-r1.ebuild b/dev-db/mongodb/mongodb-3.0.6-r1.ebuild
new file mode 100644
index 0000000..1e9188c
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.0.6-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+SCONS_MIN_VERSION="2.3.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kerberos libressl mms-agent ssl +tools"
+
+RDEPEND="app-arch/snappy
+ >=dev-cpp/yaml-cpp-0.5.1
+ >=dev-libs/boost-1.57[threads(+)]
+ >=dev-libs/libpcre-8.30[cxx]
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ sys-libs/zlib
+ mms-agent? ( app-admin/mms-agent )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:= )
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/gcc-4.8.2:*
+ sys-libs/ncurses
+ sys-libs/readline
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+ # Maintainer notes
+ #
+ # --use-system-tcmalloc is strongly NOT recommended:
+ # https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
+ #
+ # --c++11 is required by scons instead of auto detection:
+ # https://jira.mongodb.org/browse/SERVER-19661
+
+ scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX) --c++11"
+ scons_opts+=" --disable-warnings-as-errors"
+ scons_opts+=" --use-system-boost"
+ scons_opts+=" --use-system-pcre"
+ scons_opts+=" --use-system-snappy"
+ scons_opts+=" --use-system-stemmer"
+ scons_opts+=" --use-system-yaml"
+
+ if use debug; then
+ scons_opts+=" --dbg=on"
+ fi
+
+ if use prefix; then
+ scons_opts+=" --cpppath=${EPREFIX}/usr/include"
+ scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
+ fi
+
+ if use kerberos; then
+ scons_opts+=" --use-sasl-client"
+ fi
+
+ if use ssl; then
+ scons_opts+=" --ssl"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.0.0-fix-scons.patch"
+}
+
+src_compile() {
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+ escons ${scons_opts} core tools
+}
+
+src_install() {
+ escons ${scons_opts} --nostrip install --prefix="${ED}"/usr
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners mongodb:mongodb "${x}"
+ done
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+ newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
+ newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+ # wrt bug #461466
+ if [[ "$(get_libdir)" == "lib64" ]]; then
+ rmdir "${ED}"/usr/lib/ &>/dev/null
+ fi
+}
+
+src_test() {
+ escons ${scons_opts} dbtest
+ "${S}"/dbtest --dbpath=unittest || die "dbtest failed"
+ escons ${scons_opts} smokeCppUnittests --smokedbprefix="smokecpptest" || die "smokeCppUnittests tests failed"
+}
+
+pkg_postinst() {
+ if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
+ ewarn "!! IMPORTANT !!"
+ ewarn " "
+ ewarn "${PN} configuration files have changed !"
+ ewarn " "
+ ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
+ ewarn " http://docs.mongodb.org/manual/reference/configuration-options/"
+ ewarn " "
+ ewarn "Make sure you also follow the upgrading process :"
+ ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/"
+ ewarn " "
+ ewarn "MongoDB 3.0 introduces the WiredTiger storage engine."
+ ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it."
+ ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf"
+ ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger"
+ fi
+}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
index 7d2d763..2e20b9f 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
@@ -13,7 +13,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 sparc x86"
IUSE="debug examples gcov static-libs"
DEPEND="virtual/libmysqlclient:=
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index b071bdf..059566b 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,5 +1,6 @@
DIST mysql-5.5.44.tar.gz 21789766 SHA256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de SHA512 05707b96c3e0d39ca103d965640aa1a9461a513f788fc7f2acce4b3933ec578b3d66df53955b0dff1b6c9e5acd98441cfe1df5b3154a1058293babc39c26dad5 WHIRLPOOL 870d9728c78f6732fcd6f95e62833a769c937c96298a39bb023b33a9138552e254d2a3f6285d8f4f0b740de9d7397fa1a0987234a0a4dfa13c787fc068053d78
DIST mysql-5.5.45.tar.gz 21832364 SHA256 744efd3c39265b5fdeebd25f58ecb34a6eb06e02d9ec2febd3164942f2c89332 SHA512 1c8ddf294232b106562537d6e9b4a3956dd1a290562f313d311f2bbe09f1cb95c28e7e9a4c92a1fcc91a394514bc1190d185b1134003a9f6183ecc2a06d618e8 WHIRLPOOL 3daed09edfc1ca7a0ae379b876e061c2318755fdd14be9630b7c5311985e91ea46cf0e0b1eab98c758cc2809d5d562fcfd2f22022100051746343e147f3d4ebc
+DIST mysql-5.5.46.tar.gz 21838374 SHA256 93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e SHA512 c2db730318d4c16793d62dbd937c1ff739fffabab6d1689b94252f5501ff36917ddf80a8144583492c05220b3ae33f29ecbcec10f6d8ae0a0b10142be719fc27 WHIRLPOOL 355260ae0e7385c7d00b289e37af09374bc8320f69a55d7ee0469283382f197fd430be32019668b1f29cda69f9d76965d4ee749cb93f1e8263799673e4f0f535
DIST mysql-5.6.26.tar.gz 33278710 SHA256 b44c6ce5f95172c56c73edfa8b710b39242ec7af0ab182c040208c41866e5070 SHA512 455bf66e1c63e3368a3dd53f80a3393e33a20605cde320ee0bb61339d0853c2187d4947812405b85ea93a7da722787e958515fc69807c3fab131878fe9604f62 WHIRLPOOL e5fe46e4f1c8a20d955b5921c6773823cb1c01bd78319485528c478f213a37dc8ce8a1bc5c61904595e8931dec1376d471387a3f85119a0791cb8f6d9303eb6f
DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7
DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
diff --git a/dev-db/mysql/mysql-5.5.46.ebuild b/dev-db/mysql/mysql-5.5.46.ebuild
new file mode 100644
index 0000000..9a964d7
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.46.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_EXTRAS_VER="20150127-1351Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# 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='embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ 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))"
+ # Enable parallel testing, auto will try to detect number of cores
+ # 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}
+
+ # create symlink for the tests to find mysql_tzinfo_to_sql
+ ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+ # These are failing in MySQL 5.5 for now and are believed to be
+ # false positives:
+ #
+ # main.information_schema, binlog.binlog_statement_insert_delayed,
+ # main.mysqld--help-notwin
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+ # fails due to bad cleanup of previous tests when run in parallel
+ # The tool is deprecated anyway
+ # Bug 532288
+
+ for t in main.mysql_client_test \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+ --testcase-timeout=30 --reorder
+ 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/phpmyadmin/phpmyadmin-4.3.13.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.3.13.3.ebuild
index 0e66917..6acdbf4 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.3.13.3.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.3.13.3.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.zip"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild
index 0e66917..6acdbf4 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.zip"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index b345bd1..c4c6389 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,11 +1,11 @@
-DIST postgresql-9.0.21.tar.bz2 15044880 SHA256 6ed313dd4b12650fc5fc667cfef9f3f53c0f7664a6c2ecfba8d45e2b01709cb8 SHA512 86fcf1e59964b842c413e526a92f7d9042416d32d783f7bef63317ce5497ad3326c389267b217f3d3fb247d387f68c452c9083804823bfbbd0d2ea1237f3b83d WHIRLPOOL c031ff71739681a97a0f9df5f2ad1ccb4a6da91153efc0aaac99ef23a98e7093f9c980049e551d9b3f483b5dd32d84ebcc6ee11a1ab6765357c37120dc30c38f
DIST postgresql-9.0.22.tar.bz2 15046629 SHA256 94d4b20d854cd7fa4c9c322c0b602751edbc5ca0d4f29fe92f996e28bb32f8a5 SHA512 19e7888f92c0cc6c948dd78831768fd7184fc4bc25ca1950a76f5175ed1763b8a34949e90eebbb063b072fbcac64c9fdf6072f5a22eaaae0c33e93cf6c49955b WHIRLPOOL 8b785c90a40fc32975cb81a9d8bf22bdd8667fd26710a962cecbf81c25f6348b3c49f30a91066ad8bb1bffce55658bab50181a2a82e217a7e71d7d361f2e5d92
-DIST postgresql-9.1.17.tar.bz2 15817867 SHA256 ddddd0a250c4b415d2edbf90671808276f29d81ee01971806f8ec5f2beae16aa SHA512 75a3382a70ba673a8ef4a48377acb494d508cb567cfb432f2bc1cf964332facb45d45f501b0b1127e952433a5fa9fbcc70d3823de25579e9624554045d4a207a WHIRLPOOL e428e3633f7478b914dd0ad187cdfa89a66796b45529098d2724ff50992ebc95324fc6e668f4fb4fbdf0fb2004dce4005611dc0002c0b25f58bb68b7faffecc5
+DIST postgresql-9.0.23.tar.bz2 15045569 SHA256 3dbcbe19c814139a3f4be8bc6b49db804753cbc49979f345083e835c52b4d7de SHA512 db8fe64a5a5a1caae97e792ee5b8bcc375c6d6e10ef9c35f1003f174745568854dc5a7a58dbaf46794dcd35dee5a13f6eb1ba356f9618134b601b7759c753c9f WHIRLPOOL 5177facff628271a0d57d1f2925cfc04796020492c4102f0b0c6fa34149da9ddd9ccb0a38629e320521fe82163bdd4aa56f74af3a887ff4389cd9f62e921c53a
DIST postgresql-9.1.18.tar.bz2 15822081 SHA256 2726d526666904b454f87fe2ae54357c2ab9eb8aba299a4c904829b7598584a8 SHA512 ba51e431c947b749c6522fd887ecbf50bf50cc08f2323b122a35fb18fccceb46d50f0e632a5b19df9855b5a29c98534d19f241d31e5bc235b0b06e8fb210210e WHIRLPOOL 59b5e6fb5626d630e41a8c0497480948d5bb0751fffbe1602dc62009948bad047c2ddc805caa3510157924c0fc74ead2fb2a71d0569d5c1b56eae753d9dbcd1a
-DIST postgresql-9.2.12.tar.bz2 16396804 SHA256 5f381b15fb63f7aa6b221ee56677b6029db0ae4f84bc78768ff9e753063b6d03 SHA512 6b4ee661fc979d33b373f759f936bd823616b31c45d4a670500e15a1265e05c06a45888033256bc38ea8bda139147461cbb1f2d5b2aff4f7a6b8939fb6286a1e WHIRLPOOL 2883c1744246af0063605117d4699c6c55448520783eec1042ee1b613f0c37ab2dd06451c1a3633f042461036a5dac041414088ccdce499c2e6a0f4b818327e1
+DIST postgresql-9.1.19.tar.bz2 15843978 SHA256 cbd5057451147dd63a1e764176a4e17a7795773be1e4266ea9faa951064c0ec6 SHA512 23dd4108556edcc667f599c5663356a1106bc239a1c5337d153c13a1e1871d52316825b84802bbc1d79612dfa4c9c77f4c4b96d59d23d7338988bdf370e956d4 WHIRLPOOL 6845fd8071032e987ab65a642ca04adbc8b464332bac8c346f01e011411947aa4341ea596fd910342124fcbae4cc25410c25ab695894b0b68d20441df5424722
DIST postgresql-9.2.13.tar.bz2 16401289 SHA256 5dcbd6209a8c0f508504fa433486583a42caaa240c823e1b3576db8a72db6a44 SHA512 0bcf8284aad756a70cd5e6d34a9f2cc17825151740da1c90a459edbf188a9a366831b71999803d301f0de35a5778f524b72779818b89599ffeb41cf1c2140077 WHIRLPOOL 3859e3e5c994441bc931ee92042a08eeb7b1196301b603f311372c2c2c65083b38713f4eac3e06c243703c2446a260b1ae861b7690f1fea03184d0518b10b486
-DIST postgresql-9.3.8.tar.bz2 16960398 SHA256 bc5c3ce755dfc5f6fbc0186a564f97abac3c2914f9a5d5a47f22f4fd354aadfa SHA512 43bb0bac23a8e6908d73739a63562a167c3a043462e40ccbbd7ee478cb7d8e546c8e035a040bba896102c6a3476f3b778571e269d89484ab7b654f230f753e95 WHIRLPOOL ac0d8e0485961d940b4ed6a6f373c580ffb320e9d8b9c938de39935e487448eee48496b3ba0fdd4b8bfea4076ff3d6dc0fa82a0e400b2e4ac088e7b903ca0d40
+DIST postgresql-9.2.14.tar.bz2 16451398 SHA256 54c20b3f320a48c38487f2711e98b2fa3f9ce4305905a294ad0449e8b4fb292e SHA512 268015d9e397ee62eebbbc9abf1ee25d0d4aa6bf5943b404009b3aab31f485b8523353c679beed34cc00304b9d4c7aca9de0ba841d9841dbf885d05d1a5692a1 WHIRLPOOL 4f6d5d6989a67d14082ddb215411b55d0dc0be29772e6a593b4df133489ff4a7e6c265d0830adba64d4c6be47e17a949cbc21d6570dceb9362399649af2be88e
+DIST postgresql-9.3.10.tar.bz2 16995860 SHA256 e5444f0f76aff98a251400b7c28bc361d65e3d72d8d6cb9bb5d8361a69541531 SHA512 6b048fd1d0b38f72bab6ea70e40f10e7b805b94fc4c6fd865e0ec5e86da3c54043f20059dbf716d29eb4ca787dc50da561b1c7b48ab9f3096ebc651300855672 WHIRLPOOL b8ea15a04d18535662832d444b556aedffaa8c954b52dcd42d548f53f93b8a9dbfbe9298f63c26d44c8b757e8c10d76711c303cd83c84d9c86bf23c2837e74ce
DIST postgresql-9.3.9.tar.bz2 16959310 SHA256 f73bd0ec2028511732430beb22414a022d2114231366e8cbe78c149793910549 SHA512 c6a9cae07968c99039910bb98d3e365fc285d2cdef02dd594128bd69ae65926392b18b65b0e13c3f17c366413bffbe226b6e8ce3453774b0439745b18ea129a8 WHIRLPOOL bcbc66a7b846b42c2d17d187e8b2c751afda8e5cdc7fa385ba1145f84e34950fad3b82fc1d04ae7ff9b7de01fd5705d9e507aa841880b97df2edb2ac8749a5fd
-DIST postgresql-9.4.3.tar.bz2 17618524 SHA256 734acfd2ac352dd0cd353d226f3199c2e1a2730200998aea5b38cf685136d755 SHA512 8d860c982f3cf62c9f9ef4aad7c2d637e1cf8285338d57fca833051d66747660ecbf46b351a2a1f81ba3fe150c8700e76dcc5219adbf07e9adccfde9f52ae9f1 WHIRLPOOL cf09a4c7445ad77352bf4fc8fb6cbdaef28b4c592e2a3c963f228d1ece962ed454c6025aec0210e07d7ba07a5e2d070ebe285d9c660c2f08637a4f52f74b9356
DIST postgresql-9.4.4.tar.bz2 17616272 SHA256 538ed99688d6fdbec6fd166d1779cf4588bf2f16c52304e5ef29f904c43b0013 SHA512 e0f0efc2e3a01c93dad98796476808d60be243841104ceb496d2227214a9b4c5a32c5f550f0a456b0c64f2458aae32026960b63f68188269d367d900683a6061 WHIRLPOOL 9041b4b4e1b53bc97345fe587bc874df1185ef76fe105bfb54e9c882f3fd51841448e92deb12e1415ce76158da0683fcff333e08b9e54a8be565562ebfec6175
-DIST postgresql-9.5alpha1.tar.bz2 18103456 SHA256 c97779f6c539e9072fa853fca8273f910f08805ae74456a01ab1fd0841ecfca2 SHA512 b220bf7f3ac97aaa790d09f981c7050ebed0d08517e61749d10e2f837cac0de259ca650aae4c31295147d7791a1a8f1c973057448937e386fb197b1b03cf9ec1 WHIRLPOOL 7bfac23f5942bc557655f2c6f97d6ad1bf6bfd568fb0497ed127c50dec4ef07ae88f89568588e20e00f681c921a512b14e61f3ca6a506508d17e96d8eb4f0817
+DIST postgresql-9.4.5.tar.bz2 17660960 SHA256 b87c50c66b6ea42a9712b5f6284794fabad0616e6ae420cf0f10523be6d94a39 SHA512 01ad4b5a097efa70f74a9e96b764c32953a9df57d6bf81b893a1e552475f6aba0381580dcd1f27b2c443ce89fecc429eeeb0219af60a0b2f84798f76eb1757f5 WHIRLPOOL 8ea0e9a40cefa53568071f2137bac996898f9bd486cfb5cfcf8bb49590816833f37878f10caabffb9d3127e047f00c916b8830594a485ebe16fb9fe6fc834c95
+DIST postgresql-9.5beta1.tar.bz2 18291273 SHA256 b53199e2667982de2039ad7e30467f67c5d7af678e69d6211de8ba1cac75c9f0 SHA512 e8881939bdba346f3770102324d7b011c16e4529603280459e17587e06d933c9f3505b40c5cc82ed3f0410ffd88b5e2f18b2a3272aa4680c3798cf7a0fcc0374 WHIRLPOOL 0cf2c3fd40b2a8d482da5a1597abbc20d239f577c6472a03f8d9795a3e8ef142dfaad7a1eeebf2b2544e34712c243bbd9de63fb4045c4ce15dbde8ec74acb707
diff --git a/dev-db/postgresql/postgresql-9.0.21.ebuild b/dev-db/postgresql/postgresql-9.0.21.ebuild
deleted file mode 100644
index 74e7e8e..0000000
--- a/dev-db/postgresql/postgresql-9.0.21.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with kerberos krb5) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- $(use_with uuid ossp-uuid) \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.0.22-r1.ebuild b/dev-db/postgresql/postgresql-9.0.22-r1.ebuild
new file mode 100644
index 0000000..66d27da
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.0.22-r1.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Testing within Portage's environment is broken, and the patch no
+# longer applies cleanly.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+ use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+ enewgroup postgres 70
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Work around PPC{,64} compilation bug where bool is already defined
+ sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+ # Set proper run directory
+ sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+ -i src/include/pg_config_manual.h || die
+
+ epatch "${FILESDIR}/pg_ctl-exit-status.patch"
+
+ use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+ if use pam ; then
+ sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+ -i src/backend/libpq/auth.c || \
+ die 'PGSQL_PAM_SERVICE rename failed.'
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ case ${CHOST} in
+ *-darwin*|*-solaris*)
+ use nls && append-libs intl
+ ;;
+ esac
+
+ export LDFLAGS_SL="${LDFLAGS}"
+ export LDFLAGS_EX="${LDFLAGS}"
+
+ local PO="${EPREFIX%/}"
+
+ econf \
+ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+ --datadir="${PO}/usr/share/postgresql-${SLOT}" \
+ --docdir="${PO}/usr/share/doc/${PF}" \
+ --includedir="${PO}/usr/include/postgresql-${SLOT}" \
+ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+ --with-system-tzdata="${PO}/usr/share/zoneinfo" \
+ $(use_enable !pg_legacytimestamp integer-datetimes) \
+ $(use_enable threads thread-safety) \
+ $(use_with kerberos gssapi) \
+ $(use_with kerberos krb5) \
+ $(use_with ldap) \
+ $(use_with pam) \
+ $(use_with perl) \
+ $(use_with python) \
+ $(use_with readline) \
+ $(use_with ssl openssl) \
+ $(use_with tcl) \
+ $(use_with uuid ossp-uuid) \
+ $(use_with xml libxml) \
+ $(use_with xml libxslt) \
+ $(use_with zlib) \
+ "$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+ emake
+ emake -C contrib
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install -C contrib
+
+ dodoc README HISTORY doc/{TODO,bug.template}
+
+ # man pages are already built, but if we have the target make them,
+ # they'll be generated from source before being installed so we
+ # manually install man pages.
+ # We use ${SLOT} instead of doman for postgresql.eselect
+ insinto /usr/share/postgresql-${SLOT}/man/
+ doins -r doc/src/sgml/man{1,3,7}
+ if ! use server; then
+ # Remove man pages for non-existent binaries
+ for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+ rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+ done
+ fi
+ docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+ insinto /etc/postgresql-${SLOT}
+ newins src/bin/psql/psqlrc.sample psqlrc
+
+ dodir /etc/eselect/postgresql/slots/${SLOT}
+ echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9.0.22.ebuild b/dev-db/postgresql/postgresql-9.0.22.ebuild
index 74e7e8e..f2c329c 100644
--- a/dev-db/postgresql/postgresql-9.0.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.0.22.ebuild
@@ -78,7 +78,7 @@
use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
enewgroup postgres 70
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
use python && python-single-r1_pkg_setup
}
diff --git a/dev-db/postgresql/postgresql-9.0.23.ebuild b/dev-db/postgresql/postgresql-9.0.23.ebuild
new file mode 100644
index 0000000..174a686
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.0.23.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Testing within Portage's environment is broken, and the patch no
+# longer applies cleanly.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+ use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+ enewgroup postgres 70
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Work around PPC{,64} compilation bug where bool is already defined
+ sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+ # Set proper run directory
+ sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+ -i src/include/pg_config_manual.h || die
+
+ epatch "${FILESDIR}/pg_ctl-exit-status.patch"
+
+ use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+ if use pam ; then
+ sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+ -i src/backend/libpq/auth.c || \
+ die 'PGSQL_PAM_SERVICE rename failed.'
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ case ${CHOST} in
+ *-darwin*|*-solaris*)
+ use nls && append-libs intl
+ ;;
+ esac
+
+ export LDFLAGS_SL="${LDFLAGS}"
+ export LDFLAGS_EX="${LDFLAGS}"
+
+ local PO="${EPREFIX%/}"
+
+ econf \
+ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+ --datadir="${PO}/usr/share/postgresql-${SLOT}" \
+ --docdir="${PO}/usr/share/doc/${PF}" \
+ --includedir="${PO}/usr/include/postgresql-${SLOT}" \
+ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+ --with-system-tzdata="${PO}/usr/share/zoneinfo" \
+ $(use_enable !pg_legacytimestamp integer-datetimes) \
+ $(use_enable threads thread-safety) \
+ $(use_with kerberos gssapi) \
+ $(use_with kerberos krb5) \
+ $(use_with ldap) \
+ $(use_with pam) \
+ $(use_with perl) \
+ $(use_with python) \
+ $(use_with readline) \
+ $(use_with ssl openssl) \
+ $(use_with tcl) \
+ $(use_with uuid ossp-uuid) \
+ $(use_with xml libxml) \
+ $(use_with xml libxslt) \
+ $(use_with zlib) \
+ "$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+ emake
+ emake -C contrib
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install -C contrib
+
+ dodoc README HISTORY doc/{TODO,bug.template}
+
+ # man pages are already built, but if we have the target make them,
+ # they'll be generated from source before being installed so we
+ # manually install man pages.
+ # We use ${SLOT} instead of doman for postgresql.eselect
+ insinto /usr/share/postgresql-${SLOT}/man/
+ doins -r doc/src/sgml/man{1,3,7}
+ if ! use server; then
+ # Remove man pages for non-existent binaries
+ for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+ rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+ done
+ fi
+ docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+ insinto /etc/postgresql-${SLOT}
+ newins src/bin/psql/psqlrc.sample psqlrc
+
+ dodir /etc/eselect/postgresql/slots/${SLOT}
+ echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "It looks like this is your first time installing PostgreSQL. Run the"
+ elog "following command in all active shells to pick up changes to the default"
+ elog "environemnt:"
+ elog " source /etc/profile"
+ fi
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9.1.17.ebuild b/dev-db/postgresql/postgresql-9.1.17.ebuild
deleted file mode 100644
index c32c741..0000000
--- a/dev-db/postgresql/postgresql-9.1.17.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.1-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with kerberos krb5) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- $(use_with uuid ossp-uuid) \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.1.18-r1.ebuild b/dev-db/postgresql/postgresql-9.1.18-r1.ebuild
new file mode 100644
index 0000000..94d6120
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.1.18-r1.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Testing within Portage's environment is broken, and the patch no
+# longer applies cleanly.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+ use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+ enewgroup postgres 70
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Work around PPC{,64} compilation bug where bool is already defined
+ sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+ # Set proper run directory
+ sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+ -i src/include/pg_config_manual.h || die
+
+ epatch "${FILESDIR}/pg_ctl-exit-status.patch"
+
+ use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+ # Fix bug 486556 where the server would crash at start up because of
+ # an infinite loop caused by a self-referencing symlink.
+ epatch "${FILESDIR}/postgresql-9.1-tz-dir-overflow.patch"
+
+ if use pam ; then
+ sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+ -i src/backend/libpq/auth.c || \
+ die 'PGSQL_PAM_SERVICE rename failed.'
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ case ${CHOST} in
+ *-darwin*|*-solaris*)
+ use nls && append-libs intl
+ ;;
+ esac
+
+ export LDFLAGS_SL="${LDFLAGS}"
+ export LDFLAGS_EX="${LDFLAGS}"
+
+ local PO="${EPREFIX%/}"
+
+ econf \
+ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+ --datadir="${PO}/usr/share/postgresql-${SLOT}" \
+ --docdir="${PO}/usr/share/doc/${PF}" \
+ --includedir="${PO}/usr/include/postgresql-${SLOT}" \
+ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+ --with-system-tzdata="${PO}/usr/share/zoneinfo" \
+ $(use_enable !pg_legacytimestamp integer-datetimes) \
+ $(use_enable threads thread-safety) \
+ $(use_with kerberos gssapi) \
+ $(use_with kerberos krb5) \
+ $(use_with ldap) \
+ $(use_with pam) \
+ $(use_with perl) \
+ $(use_with python) \
+ $(use_with readline) \
+ $(use_with ssl openssl) \
+ $(use_with tcl) \
+ $(use_with uuid ossp-uuid) \
+ $(use_with xml libxml) \
+ $(use_with xml libxslt) \
+ $(use_with zlib) \
+ "$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+ emake
+ emake -C contrib
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install -C contrib
+
+ dodoc README HISTORY doc/{TODO,bug.template}
+
+ # man pages are already built, but if we have the target make them,
+ # they'll be generated from source before being installed so we
+ # manually install man pages.
+ # We use ${SLOT} instead of doman for postgresql.eselect
+ insinto /usr/share/postgresql-${SLOT}/man/
+ doins -r doc/src/sgml/man{1,3,7}
+ if ! use server; then
+ # Remove man pages for non-existent binaries
+ for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+ rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+ done
+ fi
+ docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+ insinto /etc/postgresql-${SLOT}
+ newins src/bin/psql/psqlrc.sample psqlrc
+
+ dodir /etc/eselect/postgresql/slots/${SLOT}
+ echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9.1.18.ebuild b/dev-db/postgresql/postgresql-9.1.18.ebuild
index c32c741..e3266b0 100644
--- a/dev-db/postgresql/postgresql-9.1.18.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.18.ebuild
@@ -78,7 +78,7 @@
use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
enewgroup postgres 70
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
use python && python-single-r1_pkg_setup
}
diff --git a/dev-db/postgresql/postgresql-9.1.19.ebuild b/dev-db/postgresql/postgresql-9.1.19.ebuild
new file mode 100644
index 0000000..e2ab37e
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.1.19.ebuild
@@ -0,0 +1,386 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Testing within Portage's environment is broken, and the patch no
+# longer applies cleanly.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+ use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+ enewgroup postgres 70
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Work around PPC{,64} compilation bug where bool is already defined
+ sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+ # Set proper run directory
+ sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+ -i src/include/pg_config_manual.h || die
+
+ epatch "${FILESDIR}/pg_ctl-exit-status.patch"
+
+ use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+ # Fix bug 486556 where the server would crash at start up because of
+ # an infinite loop caused by a self-referencing symlink.
+ epatch "${FILESDIR}/postgresql-9.1-tz-dir-overflow.patch"
+
+ if use pam ; then
+ sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+ -i src/backend/libpq/auth.c || \
+ die 'PGSQL_PAM_SERVICE rename failed.'
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ case ${CHOST} in
+ *-darwin*|*-solaris*)
+ use nls && append-libs intl
+ ;;
+ esac
+
+ export LDFLAGS_SL="${LDFLAGS}"
+ export LDFLAGS_EX="${LDFLAGS}"
+
+ local PO="${EPREFIX%/}"
+
+ econf \
+ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+ --datadir="${PO}/usr/share/postgresql-${SLOT}" \
+ --docdir="${PO}/usr/share/doc/${PF}" \
+ --includedir="${PO}/usr/include/postgresql-${SLOT}" \
+ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+ --with-system-tzdata="${PO}/usr/share/zoneinfo" \
+ $(use_enable !pg_legacytimestamp integer-datetimes) \
+ $(use_enable threads thread-safety) \
+ $(use_with kerberos gssapi) \
+ $(use_with kerberos krb5) \
+ $(use_with ldap) \
+ $(use_with pam) \
+ $(use_with perl) \
+ $(use_with python) \
+ $(use_with readline) \
+ $(use_with ssl openssl) \
+ $(use_with tcl) \
+ $(use_with uuid ossp-uuid) \
+ $(use_with xml libxml) \
+ $(use_with xml libxslt) \
+ $(use_with zlib) \
+ "$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+ emake
+ emake -C contrib
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install -C contrib
+
+ dodoc README HISTORY doc/{TODO,bug.template}
+
+ # man pages are already built, but if we have the target make them,
+ # they'll be generated from source before being installed so we
+ # manually install man pages.
+ # We use ${SLOT} instead of doman for postgresql.eselect
+ insinto /usr/share/postgresql-${SLOT}/man/
+ doins -r doc/src/sgml/man{1,3,7}
+ if ! use server; then
+ # Remove man pages for non-existent binaries
+ for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+ rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+ done
+ fi
+ docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+ insinto /etc/postgresql-${SLOT}
+ newins src/bin/psql/psqlrc.sample psqlrc
+
+ dodir /etc/eselect/postgresql/slots/${SLOT}
+ echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "It looks like this is your first time installing PostgreSQL. Run the"
+ elog "following command in all active shells to pick up changes to the default"
+ elog "environemnt:"
+ elog " source /etc/profile"
+ fi
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9.2.12.ebuild b/dev-db/postgresql/postgresql-9.2.12.ebuild
deleted file mode 100644
index 03805d7..0000000
--- a/dev-db/postgresql/postgresql-9.2.12.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with kerberos krb5) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- $(use_with uuid ossp-uuid) \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
-
-src_test() {
- einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
- if use server && [[ ${UID} -ne 0 ]] ; then
- emake check
-
- einfo "If you think other tests besides the regression tests are necessary, please"
- einfo "submit a bug including a patch for this ebuild to enable them."
- else
- use server || \
- ewarn 'Tests cannot be run without the "server" use flag enabled.'
- [[ ${UID} -eq 0 ]] || \
- ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
- ewarn 'Skipping.'
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.2.13-r1.ebuild b/dev-db/postgresql/postgresql-9.2.13-r1.ebuild
new file mode 100644
index 0000000..af0a7f3
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.2.13-r1.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+ use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+ enewgroup postgres 70
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Work around PPC{,64} compilation bug where bool is already defined
+ sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+ # Set proper run directory
+ sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+ -i src/include/pg_config_manual.h || die
+
+ use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+ # Fix bug 486556 where the server would crash at start up because of
+ # an infinite loop caused by a self-referencing symlink.
+ epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+ if use pam ; then
+ sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+ -i src/backend/libpq/auth.c || \
+ die 'PGSQL_PAM_SERVICE rename failed.'
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ case ${CHOST} in
+ *-darwin*|*-solaris*)
+ use nls && append-libs intl
+ ;;
+ esac
+
+ export LDFLAGS_SL="${LDFLAGS}"
+ export LDFLAGS_EX="${LDFLAGS}"
+
+ local PO="${EPREFIX%/}"
+
+ econf \
+ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+ --datadir="${PO}/usr/share/postgresql-${SLOT}" \
+ --docdir="${PO}/usr/share/doc/${PF}" \
+ --includedir="${PO}/usr/include/postgresql-${SLOT}" \
+ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+ --with-system-tzdata="${PO}/usr/share/zoneinfo" \
+ $(use_enable !pg_legacytimestamp integer-datetimes) \
+ $(use_enable threads thread-safety) \
+ $(use_with kerberos gssapi) \
+ $(use_with kerberos krb5) \
+ $(use_with ldap) \
+ $(use_with pam) \
+ $(use_with perl) \
+ $(use_with python) \
+ $(use_with readline) \
+ $(use_with ssl openssl) \
+ $(use_with tcl) \
+ $(use_with uuid ossp-uuid) \
+ $(use_with xml libxml) \
+ $(use_with xml libxslt) \
+ $(use_with zlib) \
+ "$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+ emake
+ emake -C contrib
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install -C contrib
+
+ dodoc README HISTORY doc/{TODO,bug.template}
+
+ # man pages are already built, but if we have the target make them,
+ # they'll be generated from source before being installed so we
+ # manually install man pages.
+ # We use ${SLOT} instead of doman for postgresql.eselect
+ insinto /usr/share/postgresql-${SLOT}/man/
+ doins -r doc/src/sgml/man{1,3,7}
+ if ! use server; then
+ # Remove man pages for non-existent binaries
+ for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+ rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+ done
+ fi
+ docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+ insinto /etc/postgresql-${SLOT}
+ newins src/bin/psql/psqlrc.sample psqlrc
+
+ dodir /etc/eselect/postgresql/slots/${SLOT}
+ echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
+
+src_test() {
+ einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+ if use server && [[ ${UID} -ne 0 ]] ; then
+ emake check
+
+ einfo "If you think other tests besides the regression tests are necessary, please"
+ einfo "submit a bug including a patch for this ebuild to enable them."
+ else
+ use server || \
+ ewarn 'Tests cannot be run without the "server" use flag enabled.'
+ [[ ${UID} -eq 0 ]] || \
+ ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+ ewarn 'Skipping.'
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9.2.13.ebuild b/dev-db/postgresql/postgresql-9.2.13.ebuild
index 03805d7..429de59 100644
--- a/dev-db/postgresql/postgresql-9.2.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.13.ebuild
@@ -74,7 +74,7 @@
use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
enewgroup postgres 70
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
use python && python-single-r1_pkg_setup
}
diff --git a/dev-db/postgresql/postgresql-9.2.14.ebuild b/dev-db/postgresql/postgresql-9.2.14.ebuild
new file mode 100644
index 0000000..6ec39d3
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.2.14.ebuild
@@ -0,0 +1,398 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+ use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+ enewgroup postgres 70
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Work around PPC{,64} compilation bug where bool is already defined
+ sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+ # Set proper run directory
+ sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+ -i src/include/pg_config_manual.h || die
+
+ use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+ # Fix bug 486556 where the server would crash at start up because of
+ # an infinite loop caused by a self-referencing symlink.
+ epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+ if use pam ; then
+ sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+ -i src/backend/libpq/auth.c || \
+ die 'PGSQL_PAM_SERVICE rename failed.'
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ case ${CHOST} in
+ *-darwin*|*-solaris*)
+ use nls && append-libs intl
+ ;;
+ esac
+
+ export LDFLAGS_SL="${LDFLAGS}"
+ export LDFLAGS_EX="${LDFLAGS}"
+
+ local PO="${EPREFIX%/}"
+
+ econf \
+ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+ --datadir="${PO}/usr/share/postgresql-${SLOT}" \
+ --docdir="${PO}/usr/share/doc/${PF}" \
+ --includedir="${PO}/usr/include/postgresql-${SLOT}" \
+ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+ --with-system-tzdata="${PO}/usr/share/zoneinfo" \
+ $(use_enable !pg_legacytimestamp integer-datetimes) \
+ $(use_enable threads thread-safety) \
+ $(use_with kerberos gssapi) \
+ $(use_with kerberos krb5) \
+ $(use_with ldap) \
+ $(use_with pam) \
+ $(use_with perl) \
+ $(use_with python) \
+ $(use_with readline) \
+ $(use_with ssl openssl) \
+ $(use_with tcl) \
+ $(use_with uuid ossp-uuid) \
+ $(use_with xml libxml) \
+ $(use_with xml libxslt) \
+ $(use_with zlib) \
+ "$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+ emake
+ emake -C contrib
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install -C contrib
+
+ dodoc README HISTORY doc/{TODO,bug.template}
+
+ # man pages are already built, but if we have the target make them,
+ # they'll be generated from source before being installed so we
+ # manually install man pages.
+ # We use ${SLOT} instead of doman for postgresql.eselect
+ insinto /usr/share/postgresql-${SLOT}/man/
+ doins -r doc/src/sgml/man{1,3,7}
+ if ! use server; then
+ # Remove man pages for non-existent binaries
+ for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+ rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+ done
+ fi
+ docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+ insinto /etc/postgresql-${SLOT}
+ newins src/bin/psql/psqlrc.sample psqlrc
+
+ dodir /etc/eselect/postgresql/slots/${SLOT}
+ echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "It looks like this is your first time installing PostgreSQL. Run the"
+ elog "following command in all active shells to pick up changes to the default"
+ elog "environemnt:"
+ elog " source /etc/profile"
+ fi
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
+
+src_test() {
+ einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+ if use server && [[ ${UID} -ne 0 ]] ; then
+ emake check
+
+ einfo "If you think other tests besides the regression tests are necessary, please"
+ einfo "submit a bug including a patch for this ebuild to enable them."
+ else
+ use server || \
+ ewarn 'Tests cannot be run without the "server" use flag enabled.'
+ [[ ${UID} -eq 0 ]] || \
+ ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+ ewarn 'Skipping.'
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9.3.10.ebuild b/dev-db/postgresql/postgresql-9.3.10.ebuild
new file mode 100644
index 0000000..dc084ca
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.3.10.ebuild
@@ -0,0 +1,398 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+ use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+ enewgroup postgres 70
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Work around PPC{,64} compilation bug where bool is already defined
+ sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+ # Set proper run directory
+ sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+ -i src/include/pg_config_manual.h || die
+
+ use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+ # Fix bug 486556 where the server would crash at start up because of
+ # an infinite loop caused by a self-referencing symlink.
+ epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+ if use pam ; then
+ sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+ -i src/backend/libpq/auth.c || \
+ die 'PGSQL_PAM_SERVICE rename failed.'
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ case ${CHOST} in
+ *-darwin*|*-solaris*)
+ use nls && append-libs intl
+ ;;
+ esac
+
+ export LDFLAGS_SL="${LDFLAGS}"
+ export LDFLAGS_EX="${LDFLAGS}"
+
+ local PO="${EPREFIX%/}"
+
+ econf \
+ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+ --datadir="${PO}/usr/share/postgresql-${SLOT}" \
+ --docdir="${PO}/usr/share/doc/${PF}" \
+ --includedir="${PO}/usr/include/postgresql-${SLOT}" \
+ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+ --with-system-tzdata="${PO}/usr/share/zoneinfo" \
+ $(use_enable !pg_legacytimestamp integer-datetimes) \
+ $(use_enable threads thread-safety) \
+ $(use_with kerberos gssapi) \
+ $(use_with kerberos krb5) \
+ $(use_with ldap) \
+ $(use_with pam) \
+ $(use_with perl) \
+ $(use_with python) \
+ $(use_with readline) \
+ $(use_with ssl openssl) \
+ $(use_with tcl) \
+ $(use_with uuid ossp-uuid) \
+ $(use_with xml libxml) \
+ $(use_with xml libxslt) \
+ $(use_with zlib) \
+ "$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+ emake
+ emake -C contrib
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install -C contrib
+
+ dodoc README HISTORY doc/{TODO,bug.template}
+
+ # man pages are already built, but if we have the target make them,
+ # they'll be generated from source before being installed so we
+ # manually install man pages.
+ # We use ${SLOT} instead of doman for postgresql.eselect
+ insinto /usr/share/postgresql-${SLOT}/man/
+ doins -r doc/src/sgml/man{1,3,7}
+ if ! use server; then
+ # Remove man pages for non-existent binaries
+ for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+ rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+ done
+ fi
+ docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+ insinto /etc/postgresql-${SLOT}
+ newins src/bin/psql/psqlrc.sample psqlrc
+
+ dodir /etc/eselect/postgresql/slots/${SLOT}
+ echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "It looks like this is your first time installing PostgreSQL. Run the"
+ elog "following command in all active shells to pick up changes to the default"
+ elog "environemnt:"
+ elog " source /etc/profile"
+ fi
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
+
+src_test() {
+ einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+ if use server && [[ ${UID} -ne 0 ]] ; then
+ emake check
+
+ einfo "If you think other tests besides the regression tests are necessary, please"
+ einfo "submit a bug including a patch for this ebuild to enable them."
+ else
+ use server || \
+ ewarn 'Tests cannot be run without the "server" use flag enabled.'
+ [[ ${UID} -eq 0 ]] || \
+ ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+ ewarn 'Skipping.'
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9.3.8.ebuild b/dev-db/postgresql/postgresql-9.3.8.ebuild
deleted file mode 100644
index df348ff..0000000
--- a/dev-db/postgresql/postgresql-9.3.8.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with kerberos krb5) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- $(use_with uuid ossp-uuid) \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
-
-src_test() {
- einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
- if use server && [[ ${UID} -ne 0 ]] ; then
- emake check
-
- einfo "If you think other tests besides the regression tests are necessary, please"
- einfo "submit a bug including a patch for this ebuild to enable them."
- else
- use server || \
- ewarn 'Tests cannot be run without the "server" use flag enabled.'
- [[ ${UID} -eq 0 ]] || \
- ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
- ewarn 'Skipping.'
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.3.9-r1.ebuild b/dev-db/postgresql/postgresql-9.3.9-r1.ebuild
new file mode 100644
index 0000000..cfd6214
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.3.9-r1.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+ use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+ enewgroup postgres 70
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Work around PPC{,64} compilation bug where bool is already defined
+ sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+ # Set proper run directory
+ sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+ -i src/include/pg_config_manual.h || die
+
+ use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+ # Fix bug 486556 where the server would crash at start up because of
+ # an infinite loop caused by a self-referencing symlink.
+ epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+ if use pam ; then
+ sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+ -i src/backend/libpq/auth.c || \
+ die 'PGSQL_PAM_SERVICE rename failed.'
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ case ${CHOST} in
+ *-darwin*|*-solaris*)
+ use nls && append-libs intl
+ ;;
+ esac
+
+ export LDFLAGS_SL="${LDFLAGS}"
+ export LDFLAGS_EX="${LDFLAGS}"
+
+ local PO="${EPREFIX%/}"
+
+ econf \
+ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+ --datadir="${PO}/usr/share/postgresql-${SLOT}" \
+ --docdir="${PO}/usr/share/doc/${PF}" \
+ --includedir="${PO}/usr/include/postgresql-${SLOT}" \
+ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+ --with-system-tzdata="${PO}/usr/share/zoneinfo" \
+ $(use_enable !pg_legacytimestamp integer-datetimes) \
+ $(use_enable threads thread-safety) \
+ $(use_with kerberos gssapi) \
+ $(use_with kerberos krb5) \
+ $(use_with ldap) \
+ $(use_with pam) \
+ $(use_with perl) \
+ $(use_with python) \
+ $(use_with readline) \
+ $(use_with ssl openssl) \
+ $(use_with tcl) \
+ $(use_with uuid ossp-uuid) \
+ $(use_with xml libxml) \
+ $(use_with xml libxslt) \
+ $(use_with zlib) \
+ "$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+ emake
+ emake -C contrib
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install -C contrib
+
+ dodoc README HISTORY doc/{TODO,bug.template}
+
+ # man pages are already built, but if we have the target make them,
+ # they'll be generated from source before being installed so we
+ # manually install man pages.
+ # We use ${SLOT} instead of doman for postgresql.eselect
+ insinto /usr/share/postgresql-${SLOT}/man/
+ doins -r doc/src/sgml/man{1,3,7}
+ if ! use server; then
+ # Remove man pages for non-existent binaries
+ for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+ rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+ done
+ fi
+ docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+ insinto /etc/postgresql-${SLOT}
+ newins src/bin/psql/psqlrc.sample psqlrc
+
+ dodir /etc/eselect/postgresql/slots/${SLOT}
+ echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
+
+src_test() {
+ einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+ if use server && [[ ${UID} -ne 0 ]] ; then
+ emake check
+
+ einfo "If you think other tests besides the regression tests are necessary, please"
+ einfo "submit a bug including a patch for this ebuild to enable them."
+ else
+ use server || \
+ ewarn 'Tests cannot be run without the "server" use flag enabled.'
+ [[ ${UID} -eq 0 ]] || \
+ ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+ ewarn 'Skipping.'
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9.3.9.ebuild b/dev-db/postgresql/postgresql-9.3.9.ebuild
index 897d247..093d090 100644
--- a/dev-db/postgresql/postgresql-9.3.9.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.9.ebuild
@@ -74,7 +74,7 @@
use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
enewgroup postgres 70
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
use python && python-single-r1_pkg_setup
}
diff --git a/dev-db/postgresql/postgresql-9.4.3.ebuild b/dev-db/postgresql/postgresql-9.4.3.ebuild
deleted file mode 100644
index af58624..0000000
--- a/dev-db/postgresql/postgresql-9.4.3.ebuild
+++ /dev/null
@@ -1,419 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
- local front back
- while [[ ${#} -gt 1 ]]; do
- front+="${1}? ( "
- back+=" )"
- shift
- done
- echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
- ${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
- $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- local i uuid_config=""
- if use uuid; then
- for i in ${UTIL_LINUX_LIBC[@]}; do
- use ${i} && uuid_config="--with-uuid=e2fs"
- done
- for i in ${BSD_LIBC[@]}; do
- use ${i} && uuid_config="--with-uuid=bsd"
- done
- [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
- fi
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- ${uuid_config} \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
-
-src_test() {
- einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
- if use server && [[ ${UID} -ne 0 ]] ; then
- emake check
-
- einfo "If you think other tests besides the regression tests are necessary, please"
- einfo "submit a bug including a patch for this ebuild to enable them."
- else
- use server || \
- ewarn 'Tests cannot be run without the "server" use flag enabled.'
- [[ ${UID} -eq 0 ]] || \
- ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
- ewarn 'Skipping.'
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.4.4-r1.ebuild b/dev-db/postgresql/postgresql-9.4.4-r1.ebuild
index 2d169c9..ffccfd7 100644
--- a/dev-db/postgresql/postgresql-9.4.4-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.4-r1.ebuild
@@ -96,7 +96,7 @@
use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
enewgroup postgres 70
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
use python && python-single-r1_pkg_setup
}
diff --git a/dev-db/postgresql/postgresql-9.4.4-r2.ebuild b/dev-db/postgresql/postgresql-9.4.4-r2.ebuild
new file mode 100644
index 0000000..6d720f0
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.4.4-r2.ebuild
@@ -0,0 +1,425 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+ local front back
+ while [[ ${#} -gt 1 ]]; do
+ front+="${1}? ( "
+ back+=" )"
+ shift
+ done
+ echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+ ${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+ $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+ use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+ enewgroup postgres 70
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Work around PPC{,64} compilation bug where bool is already defined
+ sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+ # Set proper run directory
+ sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+ -i src/include/pg_config_manual.h || die
+
+ # Fix bug 555198: Correct typo in assembly code for alpha architecture
+ epatch "${FILESDIR}/${PN}-${SLOT}-alpha-fix-read-memory-barrier.patch"
+
+ use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+ # Fix bug 486556 where the server would crash at start up because of
+ # an infinite loop caused by a self-referencing symlink.
+ epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+ if use pam ; then
+ sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+ -i src/backend/libpq/auth.c || \
+ die 'PGSQL_PAM_SERVICE rename failed.'
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ case ${CHOST} in
+ *-darwin*|*-solaris*)
+ use nls && append-libs intl
+ ;;
+ esac
+
+ export LDFLAGS_SL="${LDFLAGS}"
+ export LDFLAGS_EX="${LDFLAGS}"
+
+ local PO="${EPREFIX%/}"
+
+ local i uuid_config=""
+ if use uuid; then
+ for i in ${UTIL_LINUX_LIBC[@]}; do
+ use ${i} && uuid_config="--with-uuid=e2fs"
+ done
+ for i in ${BSD_LIBC[@]}; do
+ use ${i} && uuid_config="--with-uuid=bsd"
+ done
+ [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+ fi
+
+ econf \
+ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+ --datadir="${PO}/usr/share/postgresql-${SLOT}" \
+ --docdir="${PO}/usr/share/doc/${PF}" \
+ --includedir="${PO}/usr/include/postgresql-${SLOT}" \
+ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+ --with-system-tzdata="${PO}/usr/share/zoneinfo" \
+ $(use_enable !pg_legacytimestamp integer-datetimes) \
+ $(use_enable threads thread-safety) \
+ $(use_with kerberos gssapi) \
+ $(use_with ldap) \
+ $(use_with pam) \
+ $(use_with perl) \
+ $(use_with python) \
+ $(use_with readline) \
+ $(use_with ssl openssl) \
+ $(use_with tcl) \
+ ${uuid_config} \
+ $(use_with xml libxml) \
+ $(use_with xml libxslt) \
+ $(use_with zlib) \
+ "$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+ emake
+ emake -C contrib
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install -C contrib
+
+ dodoc README HISTORY doc/{TODO,bug.template}
+
+ # man pages are already built, but if we have the target make them,
+ # they'll be generated from source before being installed so we
+ # manually install man pages.
+ # We use ${SLOT} instead of doman for postgresql.eselect
+ insinto /usr/share/postgresql-${SLOT}/man/
+ doins -r doc/src/sgml/man{1,3,7}
+ if ! use server; then
+ # Remove man pages for non-existent binaries
+ for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+ rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+ done
+ fi
+ docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+ insinto /etc/postgresql-${SLOT}
+ newins src/bin/psql/psqlrc.sample psqlrc
+
+ dodir /etc/eselect/postgresql/slots/${SLOT}
+ echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
+
+src_test() {
+ einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+ if use server && [[ ${UID} -ne 0 ]] ; then
+ emake check
+
+ einfo "If you think other tests besides the regression tests are necessary, please"
+ einfo "submit a bug including a patch for this ebuild to enable them."
+ else
+ use server || \
+ ewarn 'Tests cannot be run without the "server" use flag enabled.'
+ [[ ${UID} -eq 0 ]] || \
+ ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+ ewarn 'Skipping.'
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9.4.4.ebuild b/dev-db/postgresql/postgresql-9.4.4.ebuild
index 8c307f1..79d9153 100644
--- a/dev-db/postgresql/postgresql-9.4.4.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.4.ebuild
@@ -96,7 +96,7 @@
use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
enewgroup postgres 70
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
use python && python-single-r1_pkg_setup
}
diff --git a/dev-db/postgresql/postgresql-9.4.5.ebuild b/dev-db/postgresql/postgresql-9.4.5.ebuild
new file mode 100644
index 0000000..a411b38
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.4.5.ebuild
@@ -0,0 +1,430 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+ local front back
+ while [[ ${#} -gt 1 ]]; do
+ front+="${1}? ( "
+ back+=" )"
+ shift
+ done
+ echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+ ${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+ $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+ use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+ enewgroup postgres 70
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Work around PPC{,64} compilation bug where bool is already defined
+ sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+ # Set proper run directory
+ sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+ -i src/include/pg_config_manual.h || die
+
+ use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+ # Fix bug 486556 where the server would crash at start up because of
+ # an infinite loop caused by a self-referencing symlink.
+ epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+ if use pam ; then
+ sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+ -i src/backend/libpq/auth.c || \
+ die 'PGSQL_PAM_SERVICE rename failed.'
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ case ${CHOST} in
+ *-darwin*|*-solaris*)
+ use nls && append-libs intl
+ ;;
+ esac
+
+ export LDFLAGS_SL="${LDFLAGS}"
+ export LDFLAGS_EX="${LDFLAGS}"
+
+ local PO="${EPREFIX%/}"
+
+ local i uuid_config=""
+ if use uuid; then
+ for i in ${UTIL_LINUX_LIBC[@]}; do
+ use ${i} && uuid_config="--with-uuid=e2fs"
+ done
+ for i in ${BSD_LIBC[@]}; do
+ use ${i} && uuid_config="--with-uuid=bsd"
+ done
+ [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+ fi
+
+ econf \
+ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+ --datadir="${PO}/usr/share/postgresql-${SLOT}" \
+ --docdir="${PO}/usr/share/doc/${PF}" \
+ --includedir="${PO}/usr/include/postgresql-${SLOT}" \
+ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+ --with-system-tzdata="${PO}/usr/share/zoneinfo" \
+ $(use_enable !pg_legacytimestamp integer-datetimes) \
+ $(use_enable threads thread-safety) \
+ $(use_with kerberos gssapi) \
+ $(use_with ldap) \
+ $(use_with pam) \
+ $(use_with perl) \
+ $(use_with python) \
+ $(use_with readline) \
+ $(use_with ssl openssl) \
+ $(use_with tcl) \
+ ${uuid_config} \
+ $(use_with xml libxml) \
+ $(use_with xml libxslt) \
+ $(use_with zlib) \
+ "$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+ emake
+ emake -C contrib
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install -C contrib
+
+ dodoc README HISTORY doc/{TODO,bug.template}
+
+ # man pages are already built, but if we have the target make them,
+ # they'll be generated from source before being installed so we
+ # manually install man pages.
+ # We use ${SLOT} instead of doman for postgresql.eselect
+ insinto /usr/share/postgresql-${SLOT}/man/
+ doins -r doc/src/sgml/man{1,3,7}
+ if ! use server; then
+ # Remove man pages for non-existent binaries
+ for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+ rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+ done
+ fi
+ docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+ insinto /etc/postgresql-${SLOT}
+ newins src/bin/psql/psqlrc.sample psqlrc
+
+ dodir /etc/eselect/postgresql/slots/${SLOT}
+ echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "It looks like this is your first time installing PostgreSQL. Run the"
+ elog "following command in all active shells to pick up changes to the default"
+ elog "environemnt:"
+ elog " source /etc/profile"
+ fi
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
+
+src_test() {
+ einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+ if use server && [[ ${UID} -ne 0 ]] ; then
+ emake check
+
+ einfo "If you think other tests besides the regression tests are necessary, please"
+ einfo "submit a bug including a patch for this ebuild to enable them."
+ else
+ use server || \
+ ewarn 'Tests cannot be run without the "server" use flag enabled.'
+ [[ ${UID} -eq 0 ]] || \
+ ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+ ewarn 'Skipping.'
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9.5_alpha1.ebuild b/dev-db/postgresql/postgresql-9.5_alpha1.ebuild
deleted file mode 100644
index 8d78aa0..0000000
--- a/dev-db/postgresql/postgresql-9.5_alpha1.ebuild
+++ /dev/null
@@ -1,425 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-# This is a prerelease version, so no keywords please
-KEYWORDS=""
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-MY_PV=${PV/_/}
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
- local front back
- while [[ ${#} -gt 1 ]]; do
- front+="${1}? ( "
- back+=" )"
- shift
- done
- echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
- ${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
- $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- local i uuid_config=""
- if use uuid; then
- for i in ${UTIL_LINUX_LIBC[@]}; do
- use ${i} && uuid_config="--with-uuid=e2fs"
- done
- for i in ${BSD_LIBC[@]}; do
- use ${i} && uuid_config="--with-uuid=bsd"
- done
- [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
- fi
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- ${uuid_config} \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
-
-src_test() {
- einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
- if use server && [[ ${UID} -ne 0 ]] ; then
- emake check
-
- einfo "If you think other tests besides the regression tests are necessary, please"
- einfo "submit a bug including a patch for this ebuild to enable them."
- else
- use server || \
- ewarn 'Tests cannot be run without the "server" use flag enabled.'
- [[ ${UID} -eq 0 ]] || \
- ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
- ewarn 'Skipping.'
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.5_beta1.ebuild b/dev-db/postgresql/postgresql-9.5_beta1.ebuild
new file mode 100644
index 0000000..50d2cec
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.5_beta1.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+# This is a prerelease version, so no keywords please
+KEYWORDS=""
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+MY_PV=${PV/_/}
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+ local front back
+ while [[ ${#} -gt 1 ]]; do
+ front+="${1}? ( "
+ back+=" )"
+ shift
+ done
+ echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+ ${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+ $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+ use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+ enewgroup postgres 70
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Work around PPC{,64} compilation bug where bool is already defined
+ sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+ # Set proper run directory
+ sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+ -i src/include/pg_config_manual.h || die
+
+ use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+ # Fix bug 486556 where the server would crash at start up because of
+ # an infinite loop caused by a self-referencing symlink.
+ epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+ if use pam ; then
+ sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+ -i src/backend/libpq/auth.c || \
+ die 'PGSQL_PAM_SERVICE rename failed.'
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ case ${CHOST} in
+ *-darwin*|*-solaris*)
+ use nls && append-libs intl
+ ;;
+ esac
+
+ export LDFLAGS_SL="${LDFLAGS}"
+ export LDFLAGS_EX="${LDFLAGS}"
+
+ local PO="${EPREFIX%/}"
+
+ local i uuid_config=""
+ if use uuid; then
+ for i in ${UTIL_LINUX_LIBC[@]}; do
+ use ${i} && uuid_config="--with-uuid=e2fs"
+ done
+ for i in ${BSD_LIBC[@]}; do
+ use ${i} && uuid_config="--with-uuid=bsd"
+ done
+ [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+ fi
+
+ econf \
+ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+ --datadir="${PO}/usr/share/postgresql-${SLOT}" \
+ --docdir="${PO}/usr/share/doc/${PF}" \
+ --includedir="${PO}/usr/include/postgresql-${SLOT}" \
+ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+ --with-system-tzdata="${PO}/usr/share/zoneinfo" \
+ $(use_enable !pg_legacytimestamp integer-datetimes) \
+ $(use_enable threads thread-safety) \
+ $(use_with kerberos gssapi) \
+ $(use_with ldap) \
+ $(use_with pam) \
+ $(use_with perl) \
+ $(use_with python) \
+ $(use_with readline) \
+ $(use_with ssl openssl) \
+ $(use_with tcl) \
+ ${uuid_config} \
+ $(use_with xml libxml) \
+ $(use_with xml libxslt) \
+ $(use_with zlib) \
+ "$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+ emake
+ emake -C contrib
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install -C contrib
+
+ dodoc README HISTORY doc/{TODO,bug.template}
+
+ # man pages are already built, but if we have the target make them,
+ # they'll be generated from source before being installed so we
+ # manually install man pages.
+ # We use ${SLOT} instead of doman for postgresql.eselect
+ insinto /usr/share/postgresql-${SLOT}/man/
+ doins -r doc/src/sgml/man{1,3,7}
+ if ! use server; then
+ # Remove man pages for non-existent binaries
+ for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+ rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+ done
+ fi
+ docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+ insinto /etc/postgresql-${SLOT}
+ newins src/bin/psql/psqlrc.sample psqlrc
+
+ dodir /etc/eselect/postgresql/slots/${SLOT}
+ echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
+
+src_test() {
+ einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+ if use server && [[ ${UID} -ne 0 ]] ; then
+ emake check
+
+ einfo "If you think other tests besides the regression tests are necessary, please"
+ einfo "submit a bug including a patch for this ebuild to enable them."
+ else
+ use server || \
+ ewarn 'Tests cannot be run without the "server" use flag enabled.'
+ [[ ${UID} -eq 0 ]] || \
+ ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+ ewarn 'Skipping.'
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index bba325e..36e35fd 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
+PYTHON_COMPAT=( python{2_7,3_4} )
inherit base eutils flag-o-matic git-2 linux-info multilib pam prefix \
python-single-r1 systemd user versionator
@@ -22,7 +22,7 @@
LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
zh_CN zh_TW"
-IUSE="kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
+IUSE="kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+readline selinux +server ssl static-libs tcl threads uuid xml zlib"
for lingua in ${LINGUAS}; do
@@ -49,7 +49,10 @@
perl? ( >=dev-lang/perl-5.8 )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
tcl? ( >=dev-lang/tcl-8:0= )
uuid? ( dev-libs/ossp-uuid )
xml? ( dev-libs/libxml2 dev-libs/libxslt )
@@ -96,7 +99,7 @@
CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
enewgroup postgres 70
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+ enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
use python && python-single-r1_pkg_setup
}
@@ -201,6 +204,14 @@
elog "If you need a global psqlrc-file, you can place it in:"
elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "It looks like this is your first time installing PostgreSQL. Run the"
+ elog "following command in all active shells to pick up changes to the default"
+ elog "environemnt:"
+ elog " source /etc/profile"
+ fi
+
elog
elog "Gentoo specific documentation:"
elog "https://wiki.gentoo.org/wiki/PostgreSQL"
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index b1dbd9c..f9258d1 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -4,3 +4,4 @@
DIST redis-2.8.19.tar.gz 1254857 SHA256 29bb08abfc3d392b2f0c3e7f48ec46dd09ab1023f9a5575fc2a93546f4ca5145 SHA512 34997b45815cfdec9fbb06cd6664ed6ddf71baf064fd9ac155b7b969fd5945f78927cd5dfde83b043dc8ff1d7e35b172b9403cdf6115b8ca7bdf80c581ee9cdd WHIRLPOOL df3408de1e53a8a13c0b645054ce944453f3a812c264b168b797519a6d8536e0a60095fbd314f591ba21f0532be5b6b37e1ec8b11e928cdd6447ab70dfb8be33
DIST redis-2.8.21.tar.gz 1260030 SHA256 3da371693bb54c22da04d86cab1b871072c8d19bdfbc4f811469b7b53384c563 SHA512 8be68e949e08fc1d143c2fd7bbd123d0c3618d8ac9333bd9ef691384364d307c85f9222b7a607668cf667e5c2193ef40d0c7167fa15b981c6ffcfe5f2e6120d8 WHIRLPOOL d548a7aff0c84c2eb0fbf4c33436a0e46b7f6150f83e768e634441003974715b31c755d658fbc7f2fb5635511232e50c8ad2f7dce10a196bcc7b3da9193c3224
DIST redis-3.0.3.tar.gz 1360959 SHA256 1d08fa665b16d0950274dfbd47fbbcf3485e43e901021338640a0334666e9da5 SHA512 68b2d85341487efed26c92cd7925b4e9d889b5a19f08f4695ffd07087c01ae0c872086575744636513b01720829002c8d5c7bf43b20ee2c561599fa8d1c475f5 WHIRLPOOL 32d543454cda029259d8719f5696f3e16d40c489c0d44a8475bf65a7b26b9f6df74f5cdbfac2b5d44bea97844b68ae49d8656c8668fdf6ce6102cb482c200a29
+DIST redis-3.0.4.tar.gz 1364993 SHA256 a35e90ad581925134aa0fc92e969cc825f5cdee8e13c36a87d4d6995316112cf SHA512 7d8d681222892c759e7c3809203522a96a547457e0ff123cca296bac911395c7d8c1ded06331ae5cb487b87d0adcbaa02aa12c2dd724196a7b86111e236b023a WHIRLPOOL e12f7751e3e25068a25c02990d0e8416cedc152f66b5e9e1e47ae91f10a0d543b96ad456a4eb7fe16cb92ed46a0cc2fee65954207b354b9c211f425191a6c388
diff --git a/dev-db/redis/redis-3.0.4.ebuild b/dev-db/redis/redis-3.0.4.ebuild
new file mode 100644
index 0000000..328adcb
--- /dev/null
+++ b/dev-db/redis/redis-3.0.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic systemd toolchain-funcs user
+
+DESCRIPTION="A persistent caching system, key-value and data structures database"
+HOMEPAGE="http://redis.io/"
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="+jemalloc tcmalloc test"
+SLOT="0"
+
+RDEPEND=">=dev-lang/lua-5.1:*
+ tcmalloc? ( dev-util/google-perftools )
+ jemalloc? ( >=dev-libs/jemalloc-3.2 )"
+DEPEND="virtual/pkgconfig
+ >=sys-devel/autoconf-2.63
+ test? ( dev-lang/tcl:0= )
+ ${RDEPEND}"
+REQUIRED_USE="?? ( tcmalloc jemalloc )"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+pkg_setup() {
+ enewgroup redis 75
+ enewuser redis 75 -1 /var/lib/redis redis
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.8.3-shared.patch
+ epatch "${FILESDIR}"/${PN}-2.8.17-config.patch
+ epatch "${FILESDIR}"/${PN}-3.0.0-sharedlua.patch
+
+ # Copy lua modules into build dir
+ cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+ cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+ # Append cflag for lua_cjson
+ # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+ append-cflags "-DENABLE_CJSON_GLOBAL"
+
+ # now we will rewrite present Makefiles
+ local makefiles=""
+ for MKF in $(find -name 'Makefile' | cut -b 3-); do
+ mv "${MKF}" "${MKF}.in"
+ sed -i -e 's:$(CC):@CC@:g' \
+ -e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+ -e 's: $(DEBUG)::g' \
+ -e 's:$(OBJARCH)::g' \
+ -e 's:ARCH:TARCH:g' \
+ -e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+ "${MKF}.in" \
+ || die "Sed failed for ${MKF}"
+ makefiles+=" ${MKF}"
+ done
+ # autodetection of compiler and settings; generates the modified Makefiles
+ cp "${FILESDIR}"/configure.ac-2.2 configure.ac
+ sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+ configure.ac || die "Sed failed for configure.ac"
+ eautoconf
+}
+
+src_configure() {
+ econf
+
+ # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+ # also, don't define ANSI/c99 for lua twice
+ sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+ tc-export CC AR RANLIB
+
+ local myconf=""
+
+ if use tcmalloc ; then
+ myconf="${myconf} USE_TCMALLOC=yes"
+ elif use jemalloc ; then
+ myconf="${myconf} JEMALLOC_SHARED=yes"
+ else
+ myconf="${myconf} MALLOC=yes"
+ fi
+
+ emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
+}
+
+src_install() {
+ insinto /etc/
+ doins redis.conf sentinel.conf
+ use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
+ fperms 0644 /etc/{redis,sentinel}.conf
+
+ newconfd "${FILESDIR}/redis.confd" redis
+ newinitd "${FILESDIR}/redis.initd-4" redis
+
+ systemd_newunit "${FILESDIR}/redis.service-2" redis.service
+ systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
+
+ dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
+
+ dobin src/redis-cli
+ dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
+ fperms 0750 /usr/sbin/redis-benchmark
+ dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
+
+ if use prefix; then
+ diropts -m0750
+ else
+ diropts -m0750 -o redis -g redis
+ fi
+ keepdir /var/{log,lib}/redis
+}
diff --git a/dev-embedded/sunxi-tools/Manifest b/dev-embedded/sunxi-tools/Manifest
new file mode 100644
index 0000000..e1f9a56
--- /dev/null
+++ b/dev-embedded/sunxi-tools/Manifest
@@ -0,0 +1 @@
+DIST v1.2.tar.gz 35378 SHA256 86c1f2ace861a320b90bf5962a45329120ddc903cf0df678f1d31a44d6ba6b6e SHA512 bf050e4c9a338ad0b128f455a415904107efe54878e831074373b20f727a4cf9700a7b4ad73a5b21c91a1f41b588ec35070b54671c01c8ab81e0c340c299a2b1 WHIRLPOOL 0af6ae1fbc36dc4921878bd661304728ec2b860e5c40d12ba55f3d05dd7bab45d7f712c281d44868fee828fec654fc00a8efbfaa739ef8f2eef7b603dd720f50
diff --git a/dev-embedded/sunxi-tools/metadata.xml b/dev-embedded/sunxi-tools/metadata.xml
new file mode 100644
index 0000000..971a1f4
--- /dev/null
+++ b/dev-embedded/sunxi-tools/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>embedded</herd>
+ <maintainer>
+ <email>chainsaw@gentoo.org</email>
+ <name>Tony Vroon</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-embedded/sunxi-tools/sunxi-tools-1.2.ebuild b/dev-embedded/sunxi-tools/sunxi-tools-1.2.ebuild
new file mode 100644
index 0000000..4668be3
--- /dev/null
+++ b/dev-embedded/sunxi-tools/sunxi-tools-1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+MY_PV="v${PV}"
+SRC_URI="https://github.com/linux-sunxi/sunxi-tools/archive/${MY_PV}.tar.gz"
+
+DESCRIPTION="Tools for Allwinner A10 devices."
+HOMEPAGE="http://linux-sunxi.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64"
+
+DEPEND="virtual/libusb"
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -std=c99 -D_POSIX_C_SOURCE=200112L -Iinclude/" all misc
+}
+
+src_install() {
+ dobin bin2fex bootinfo fel fex2bin fexc nand-part phoenix_info pio
+}
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 0e36e57..e73f32b 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,2 +1,2 @@
-DIST tiled-0.11.0.tar.gz 2324668 SHA256 0d4b028902dfe08f18b542bfd9eaaf08886c1f685b2e176f438c3bf9d72e410d SHA512 c3eb230225a144938069b54bcedfe9927dd42358ca91d8922f56a4e566f0041b4b33aef3d87ef4b3b58634e9e98efd98a7132f419c2dd18d563f28393df066f8 WHIRLPOOL f28764e1d0904acecef826b4c35d7f56513c9b0cee682fbe1abf45989a1c6076d9eaa0285dff3daa64d88b8061dd3aec1fbae52208e1ea3510a2b4f167ed2270
DIST tiled-0.12.3.tar.gz 2372813 SHA256 8078b266cc4902451e14b1efb6c8eba69f610e5056fcb74d1d30b5b236253200 SHA512 a8b5cb2201806e6b5a0e5079a9e12fbffcbb79f2df0a193e3c3e80424df1c8c4c94ae23c1553a82a1813d4bc65d9da54d79faa41a8983233aa67023e2348cc4b WHIRLPOOL 6deb8f40aea684619c5aee3746080f0543c8a7d3dfc37d76afbd447bc34923afdbb4b676553e6e33d187a0702dfa0514ec4b567a02a95dbd4a5e87bc28c7fa92
+DIST tiled-0.14.2.tar.gz 2941171 SHA256 11ab1ae659d63e0fc6b78a319eab72c3a058a57c6c4bbd334a3e9f258ac0a6f5 SHA512 5fd47f56f1f29fa5cb48ec82f3ac2f4fd3c3addcdd35fc5e4fe742b83ebafe72c67d37c21e73bd5ac383070d68ed270dacc86f6c3959abbada915dfea19b5acf WHIRLPOOL 7cefcd1753614e07ff296d63f0b1a661caae8feeab0b8fb4f032b55443fb6512473443c7329ae7969018b6861ab9fc0dcdfddf743b7e63d1b8d6a668d89a68e9
diff --git a/dev-games/tiled/tiled-0.11.0.ebuild b/dev-games/tiled/tiled-0.11.0.ebuild
deleted file mode 100644
index d33d1a1..0000000
--- a/dev-games/tiled/tiled-0.11.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PLOCALES="cs de en es fr he it ja lv nl pt pt_BR ru zh zh_TW"
-PYTHON_COMPAT=( python2_7 )
-inherit multilib l10n python-single-r1 qt4-r2
-
-DESCRIPTION="A general purpose tile map editor"
-HOMEPAGE="http://www.mapeditor.org/"
-SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND=">=dev-qt/qtcore-4.7:4
- >=dev-qt/qtgui-4.7:4
- >=dev-qt/qtopengl-4.7:4
- sys-libs/zlib
- python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS COPYING NEWS README.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- rm -r src/zlib || die
- sed -e "s/^LANGUAGES =.*/LANGUAGES = $(l10n_get_locales)/" \
- -i translations/translations.pro || die
-}
-
-src_configure() {
- eqmake4 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
-}
-
-src_install() {
- qt4-r2_src_install
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- fi
-}
diff --git a/dev-games/tiled/tiled-0.14.2.ebuild b/dev-games/tiled/tiled-0.14.2.ebuild
new file mode 100644
index 0000000..69e780c
--- /dev/null
+++ b/dev-games/tiled/tiled-0.14.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit fdo-mime multilib python-single-r1 qmake-utils
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="http://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ sys-libs/zlib
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ dodoc AUTHORS COPYING NEWS README.md
+
+ if use examples ; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ fi
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+}
diff --git a/dev-haskell/conduit/conduit-1.0.15.1.ebuild b/dev-haskell/conduit/conduit-1.0.15.1.ebuild
index 70cdb99..caf8ea8 100644
--- a/dev-haskell/conduit/conduit-1.0.15.1.ebuild
+++ b/dev-haskell/conduit/conduit-1.0.15.1.ebuild
@@ -15,7 +15,7 @@
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="nohandles"
RDEPEND=">=dev-haskell/lifted-base-0.1:=[profile?]
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
new file mode 100644
index 0000000..1f9732a
--- /dev/null
+++ b/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="HsOpenSSL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Partial OpenSSL binding for Haskell"
+HOMEPAGE="https://github.com/phonohawk/HsOpenSSL"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fast-bignum libressl"
+
+RESTRICT=test # whoops, not good
+
+RDEPEND=">=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.7:=[profile?]
+ >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( >=dev-haskell/hunit-1.0 <dev-haskell/hunit-1.3
+ >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ local fbn_flag=$(cabal_flag fast-bignum fast-bignum)
+
+ # not ported to integer-gmp-1.0:
+ # https://github.com/phonohawk/HsOpenSSL/issues/36
+ [[ $(ghc-version) == 7.10.* ]] && fbn_flag=-f-fast-bignum
+
+ haskell-cabal_src_configure \
+ ${fbn_flag}
+}
diff --git a/dev-java/batik/batik-1.8-r1.ebuild b/dev-java/batik/batik-1.8-r1.ebuild
deleted file mode 100644
index 7294a5a..0000000
--- a/dev-java/batik/batik-1.8-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Java based SVG toolkit"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.8"
-KEYWORDS="amd64 x86 ppc ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc python tcl"
-
-CDEPEND="dev-java/xalan:0
- dev-java/rhino:1.6
- dev-java/xml-commons-external:1.3
- dev-java/xmlgraphics-commons:2
- python? ( dev-java/jython:0 )
- tcl? ( dev-java/jacl:0 )
- dev-java/ant-core:0"
-DEPEND=">=virtual/jdk-1.6
- ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
- xml-commons-external-1.3
- xmlgraphics-commons-2
- xalan
- rhino-1.6
-"
-
-java_prepare() {
- # bug #318323
- for file in build.xml contrib/rasterizertask/build.xml; do
- java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m
- done
-
- # Add some missing imports to avoid a compiling issue.
- # https://bugs.gentoo.org/show_bug.cgi?id=551952
- # https://issues.apache.org/jira/browse/BATIK-1123
- local imports=()
- imports+=(sources/org/apache/batik/script/jpython/JPythonInterpreterFactory.java)
- imports+=(sources/org/apache/batik/script/jacl/JaclInterpreterFactory.java)
- for import in ${imports[@]}; do
- einfo "Fixing missing import in ${import}"
- sed -i '23i import org.apache.batik.script.ImportInfo;' ${import} || die
- eend $?
- done
-
- cd lib || die
- rm -v *.jar build/*.jar || die
- use python && java-pkg_jar-from jython
- use tcl && java-pkg_jar-from jacl
-}
-
-src_compile() {
- # Fails to build on amd64 without this
- if use amd64 ; then
- export ANT_OPTS="-Xmx1g"
- else
- export ANT_OPTS="-Xmx256m"
- fi
-
- eant jars all-jar $(use_doc)
- cd contrib/rasterizertask || die
- eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc)
-
- cd "${S}"/"${P}/lib" || die
-
- # batik-all-1.8.jar is a all-in-one jar that contains all other jars.
- # We don't want to package it.
- rm -v ${PN}-all-${PV}.jar || die
-}
-
-src_install() {
- batik_unversion_jars() {
- for jar in batik-*.jar; do
- newj="${jar%-*}.jar"
- java-pkg_newjar ${jar} ${newj}
- done
- }
-
- # First unversion jars in ${P}/lib
- cd "${S}"/"${P}"/lib || die
- batik_unversion_jars
-
- # Then, only those in ${P}
- cd "${S}"/"${P}" || die
- batik_unversion_jars
-
- # Proceed with documentation installation
- cd "${S}" || die
- dodoc README CHANGES
- use doc && java-pkg_dojavadoc ${P}/docs/javadoc
-
- # pwd fixes bug #116976
- java-pkg_dolauncher batik-${SLOT} --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
- --main org.apache.batik.apps.svgbrowser.Main
-
- # To find these lsjar batik-${SLOT} | grep Main.class
- for launcher in ttf2svg slideshow svgpp rasterizer; do
- java-pkg_dolauncher batik-${launcher}-${SLOT} \
- --main org.apache.batik.apps.${launcher}.Main
- done
-
- # Install and register the ant task.
- java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar
- java-pkg_register-ant-task
-}
diff --git a/dev-java/batik/batik-1.8-r2.ebuild b/dev-java/batik/batik-1.8-r2.ebuild
index 3de7fc0..79bf96d 100644
--- a/dev-java/batik/batik-1.8-r2.ebuild
+++ b/dev-java/batik/batik-1.8-r2.ebuild
@@ -13,7 +13,7 @@
LICENSE="Apache-2.0"
SLOT="1.8"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ppc ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc python tcl"
CDEPEND="dev-java/xalan:0
diff --git a/dev-java/bcmail/bcmail-1.38-r3.ebuild b/dev-java/bcmail/bcmail-1.38-r3.ebuild
deleted file mode 100644
index 1bb25d7..0000000
--- a/dev-java/bcmail/bcmail-1.38-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk14-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.38"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-COMMON_DEPEND="dev-java/bcprov:${SLOT}
- =dev-java/junit-3.8*
- dev-java/sun-jaf
- java-virtuals/javamail"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEPEND}"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- unpack ./src.zip
-}
-
-src_compile() {
- mkdir "${S}/classes"
-
- find org -name "*.java" > "${T}/src.list"
- ejavac -d "${S}/classes" \
- -classpath $(java-pkg_getjars bcprov-${SLOT},junit,sun-jaf,javamail) \
- "@${T}/src.list"
-
- cd "${S}/classes"
- jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
- java-pkg_dojar "${S}/${PN}.jar"
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcmail/bcmail-1.38-r4.ebuild b/dev-java/bcmail/bcmail-1.38-r4.ebuild
index a8bfef4..b55f9d3 100644
--- a/dev-java/bcmail/bcmail-1.38-r4.ebuild
+++ b/dev-java/bcmail/bcmail-1.38-r4.ebuild
@@ -15,7 +15,7 @@
LICENSE="BSD"
SLOT="1.38"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
CDEPEND="
dev-java/bcprov:${SLOT}
diff --git a/dev-java/bcmail/bcmail-1.45-r2.ebuild b/dev-java/bcmail/bcmail-1.45-r2.ebuild
deleted file mode 100644
index 622c2b6..0000000
--- a/dev-java/bcmail/bcmail-1.45-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.45"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-
-COMMON_DEPEND="dev-java/bcprov:1.45
- =dev-java/junit-3.8*
- dev-java/sun-jaf
- java-virtuals/javamail"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./src.zip
-}
-
-src_compile() {
- mkdir "${S}/classes"
-
- find org -name "*.java" > "${T}/src.list"
- ejavac -d "${S}/classes" \
- -classpath $(java-pkg_getjars bcprov-1.45,junit,sun-jaf,javamail) \
- "@${T}/src.list"
-
- cd "${S}/classes"
- jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
- java-pkg_dojar "${S}/${PN}.jar"
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcmail/bcmail-1.45-r3.ebuild b/dev-java/bcmail/bcmail-1.45-r3.ebuild
index adb6f91..547575d 100644
--- a/dev-java/bcmail/bcmail-1.45-r3.ebuild
+++ b/dev-java/bcmail/bcmail-1.45-r3.ebuild
@@ -15,7 +15,7 @@
LICENSE="BSD"
SLOT="1.45"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
CDEPEND="
dev-java/bcprov:${SLOT}
diff --git a/dev-java/bcmail/bcmail-1.50-r1.ebuild b/dev-java/bcmail/bcmail-1.50-r1.ebuild
index a615264..e4fa2be 100644
--- a/dev-java/bcmail/bcmail-1.50-r1.ebuild
+++ b/dev-java/bcmail/bcmail-1.50-r1.ebuild
@@ -16,7 +16,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
CDEPEND="dev-java/bcprov:0[test?]
dev-java/bcpkix:0[test?]
@@ -41,7 +41,7 @@
oracle-javamail
"
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
RESTRICT="test"
src_unpack() {
diff --git a/dev-java/bcmail/bcmail-1.50.ebuild b/dev-java/bcmail/bcmail-1.50.ebuild
deleted file mode 100644
index d8298f4..0000000
--- a/dev-java/bcmail/bcmail-1.50.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-
-COMMON_DEPEND=">=dev-java/bcprov-${PV}:0[test?]
- ~dev-java/bcpkix-${PV}:0[test?]
- dev-java/sun-jaf:0
- java-virtuals/javamail:0"
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- test? ( dev-java/junit:0 )
- ${COMMON_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./src.zip
-}
-
-java_prepare() {
- mkdir "${S}"/classes
-
- if use test ; then
- java-pkg_jar-from --build-only junit
- fi
-}
-
-src_compile() {
- find org -name "*.java" > "${T}"/src.list
-
- local cp="$(java-pkg_getjars bcprov,bcpkix,sun-jaf,javamail)"
- if use test ; then
- cp="${cp}:junit.jar"
- else
- sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
- fi
-
- ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
-
- cd "${S}"/classes
- jar -cf "${S}"/${PN}.jar * || die "failed to create jar"
-}
-
-src_test() {
- local cp="${PN}.jar:bcprov.jar:bcpkix.jar:junit.jar"
-
- java -cp ${cp} org.bouncycastle.mail.smime.test.AllTests | tee mail.tests
-
- grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
- java-pkg_dojar "${S}"/${PN}.jar
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcmail/bcmail-1.52-r1.ebuild b/dev-java/bcmail/bcmail-1.52-r1.ebuild
index a615264..e4fa2be 100644
--- a/dev-java/bcmail/bcmail-1.52-r1.ebuild
+++ b/dev-java/bcmail/bcmail-1.52-r1.ebuild
@@ -16,7 +16,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
CDEPEND="dev-java/bcprov:0[test?]
dev-java/bcpkix:0[test?]
@@ -41,7 +41,7 @@
oracle-javamail
"
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
RESTRICT="test"
src_unpack() {
diff --git a/dev-java/bcmail/bcmail-1.52.ebuild b/dev-java/bcmail/bcmail-1.52.ebuild
deleted file mode 100644
index dcc7f07..0000000
--- a/dev-java/bcmail/bcmail-1.52.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND=">=dev-java/bcprov-${PV}:0[test?]
- ~dev-java/bcpkix-${PV}:0[test?]
- dev-java/sun-jaf:0
- java-virtuals/javamail:0"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- test? (
- dev-java/junit:0
- )
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./src.zip
-}
-
-java_prepare() {
- mkdir "${S}"/classes
-
- if use test; then
- java-pkg_jar-from --build-only junit
- fi
-}
-
-src_compile() {
- find org -name "*.java" > "${T}"/src.list
-
- local cp="$(java-pkg_getjars bcprov,bcpkix,sun-jaf,javamail)"
- if use test ; then
- cp="${cp}:junit.jar"
- else
- sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
- fi
-
- ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
-
- cd "${S}"/classes
- jar -cf "${S}"/${PN}.jar * || die "failed to create jar"
-}
-
-src_test() {
- local cp="${PN}.jar:bcprov.jar:bcpkix.jar:junit.jar"
-
- java -cp ${cp} org.bouncycastle.mail.smime.test.AllTests | tee mail.tests
-
- grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
- java-pkg_dojar "${S}"/${PN}.jar
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcpg/bcpg-1.52-r1.ebuild b/dev-java/bcpg/bcpg-1.52-r1.ebuild
index 05fe7b2..1a6a57a 100644
--- a/dev-java/bcpg/bcpg-1.52-r1.ebuild
+++ b/dev-java/bcpg/bcpg-1.52-r1.ebuild
@@ -16,7 +16,7 @@
LICENSE="BSD"
SLOT="1.52"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
# Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts.
# Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself.
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index e5c853a..32e4da0 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,7 +1,7 @@
-DIST bcprov-jdk14-138.tar.gz 3374082 SHA256 15a8099fca68fde937cdfc87ae486498a7c12c7d1ebaca9f26aa31b7ad11d413 SHA512 a320a49ca775a5d0dfb8aa7c7fd900384e4e789df2e11be2bfd84cd3ce0ba1d755a680f1d09d3030b178c7d7c52a469601f40b023ac402e6523731d8098793e1 WHIRLPOOL d08c4401003b1b217594f4ebe4bb55a0ff03df72dff45c84e05b605341aaf3af3b6f5824e179547df3c6777cade20891cdcdd79d52df8e20cbfdb6186fd871f8
-DIST bcprov-jdk15-140.tar.gz 3494846 SHA256 4284e5b4eef0ae410aa1e65868058230a86c5cc591a47b391c87d4a18e913bbf SHA512 22cbbaa81709c8dcf28ceb0e984ca6181b835fb20f4381a2123291b638d07b987572ddf58d33ae07f7cb7dca9f1a67e3b6a1c0467cb2e0dca7625b622517ddb6 WHIRLPOOL 76c7973f3b4668ac438a0fed38b893b5eee8810aa91c0e43309063f064021e637190a1238d0e8f03c5d8303f91c50cb6beba22fd6dc712985c8b114ba2b75cea
-DIST bcprov-jdk15-145.tar.gz 3427337 SHA256 7751a677d2cf7f8f9494a9b80c884e88de63be3be6fd9fccecee854196c611e2 SHA512 789ae99942e7d565ee58b2411f1ac089a999c4b947d81d640850190ff80d8aa27448d401deff5f44d9ebb4b75f492cf58a6d1d7bcab78198872bea6e98c9f7c3 WHIRLPOOL bb30f3c4192aef793d1193ce4a85f7aa801dca5ae5c0e17807e8c0d549bf883424985025b157266fc5b504a8892e37494295f780c736903d484c5cee70b5bc33
DIST bcprov-jdk15on-148.tar.gz 4070349 SHA256 e3fc3dab563e52939c7fa22f93a051a819729a03dbeabfb6e1998ed41943b56b SHA512 5216f6511c2ab280dc5a06a94017c2045befaa23c4ba71e67f20375f498ac2e1706b772440b5f5615cc18a52ce79fd61f7f95d2663202b50f29196dff33cde46 WHIRLPOOL 9020e24c3f7a63a555760f07ee93ffd0f58350558bf2bf02a5229468867d747e29521b48784ca9f8aeaa832059fe62f02f622ab141c8608d71692ca8c68d9b89
DIST bcprov-jdk15on-149.tar.gz 4329897 SHA256 a22ca93539a34bdbce793a0093dd3f7f8c313e318368772806fa5db3f0603ac6 SHA512 123b2c7063b8a1fe068571d8227269fd77b6d07163aec35dca2219b5a2e0ad970995a74027cc515ecaa6112ccb395fcc4db6fa323f9eadab2c4d6e62991c9143 WHIRLPOOL 9c4057cbf11254a7d99d492840b7921dbe296bc5675a5527b917a1b4496c027fbf5db60a555e4abe05f03d528836c6512d4241d4a1a7425750957c3a43680103
DIST bcprov-jdk15on-150.tar.gz 4629743 SHA256 468259c9166fbcf87ad284ae46fae45408cb7cfc9c406862ea75d5b8696f4f2a SHA512 95400c338a65cbb7d1e80c776de41d3d372b4237aee91526a06774c3d4beb735dcfb4c1ed182a12f2ccac8204b9c546863d79eb99723394d48c415fa32b6ee0e WHIRLPOOL 4f0db66b6e7cc4faf7fbd09a9c4ba7618123657d86e4552157d998e5ae8bb21843fe5ebfa8a9e622b1d9697a0e6e9637a55501fefda238c91a0bbd5be7010c38
DIST bcprov-jdk15on-152.tar.gz 6334971 SHA256 b798e67553ff77aaaf42bfdf06a2560cd1b550aa6270a7cd3155f6f13534c2b6 SHA512 df769d2647c1c0b535b1f6922df3f02ed7e13c941f8d954256fddb2ff31d5682924fedf2f2908bc09ebd20058413f40a4c2d62190b63542aa7840b860aeab07c WHIRLPOOL 29475be8ff0ee5bdf8212526510600eec9d1c1613a629ebcadd90a9ec8de27973336a55c3e2cd5b880d6adac5eab4521f3ad1cc3ca3672c840720be8603af2e6
+DIST bcprov-jdk16-1.38-sources.jar 1197644 SHA256 f2faec59d32f01b76f1c675d286f96721f76a7325e492c11aae03c6ed288fe3a SHA512 e8ab0b6f47b9737f19ee548dfc6cf09087d1b9339bc48b599fac05d0eb3b00d355f203787a84ee3a504eff2dffd707237a0cc5e26c64a672a362b9161077326f WHIRLPOOL ce3f685669fd31689284d7ad0cc0dbafb496808b6c56d1b6f0a9abb8741585000ad54b18577d608ff4f917dfdd4a25c5332f493d60e90e8b4c27cf1f464fb292
+DIST bcprov-jdk16-1.40-sources.jar 1221202 SHA256 583d7e045e7022107453d218240afc3db17461ccbd34ace0ec7f54df1ce153c2 SHA512 ed94e54cd7a53b5219d0eebb1651f93201c177faf26724613a520e045987e74c462e7adde491bda5bd092fd651b9a7abef93bfac2fd6f0765fb7651525c199ce WHIRLPOOL f387cfe7181d189df08ab2c8c932b777c03cfeb57dac7a95995a1c8a915dc113dd79b8291b3ce3f20f590f9b79a853c7b6113d3eff7bd2c16ec1c5c5d1ffbe0e
+DIST bcprov-jdk16-1.45-sources.jar 1286663 SHA256 fe4f8a7b78515e69f48145f172f698f5d6f8433ac8388cf97e3791aae021eb87 SHA512 541b390efafba17c21a25bdf84725fd0f9808555eec9c4db51b0642c348d552417d9ba8d584d54690146f3e72fe3b348ab49f92ca263ea8a7a8f7b27bb7b8e5d WHIRLPOOL 65243c247fd68000368d16446c6bd9079af101faae6d011c4c455c9b1b833ebc7e5484eb899a7b195764e3d00058a33bedb05a8584a217084a583f8f16ef0cc7
diff --git a/dev-java/bcprov/bcprov-1.38-r2.ebuild b/dev-java/bcprov/bcprov-1.38-r2.ebuild
deleted file mode 100644
index 38f288d..0000000
--- a/dev-java/bcprov/bcprov-1.38-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk14-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-# The src_unpack find needs a new find
-# https://bugs.gentoo.org/show_bug.cgi?id=182276
-DEPEND=">=virtual/jdk-1.4
- userland_GNU? ( >=sys-apps/findutils-4.3 )
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-IUSE="userland_GNU"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- unpack ./src.zip
-
- # so that we don't need junit
- echo "Removing testcases' sources:"
- find . -path '*test/*.java' -print -delete \
- || die "Failed to delete testcases."
- find . -name '*Test*.java' -print -delete \
- || die "Failed to delete testcases."
-}
-
-src_compile() {
- mkdir "${S}/classes"
-
- find . -name "*.java" > "${T}/src.list"
- ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list"
-
- cd "${S}/classes"
- jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
- java-pkg_dojar "${S}/${PN}.jar"
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcprov/bcprov-1.38-r3.ebuild b/dev-java/bcprov/bcprov-1.38-r3.ebuild
deleted file mode 100644
index 8872781..0000000
--- a/dev-java/bcprov/bcprov-1.38-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk14-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.38"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-# The src_unpack find needs a new find
-# https://bugs.gentoo.org/show_bug.cgi?id=182276
-DEPEND=">=virtual/jdk-1.4
- userland_GNU? ( >=sys-apps/findutils-4.3 )
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-IUSE="userland_GNU"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- unpack ./src.zip
-
- # so that we don't need junit
- echo "Removing testcases' sources:"
- find . -path '*test/*.java' -print -delete \
- || die "Failed to delete testcases."
- find . -name '*Test*.java' -print -delete \
- || die "Failed to delete testcases."
-}
-
-src_compile() {
- mkdir "${S}/classes"
-
- find . -name "*.java" > "${T}/src.list"
- ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list"
-
- cd "${S}/classes"
- jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
- java-pkg_dojar "${S}/${PN}.jar"
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcprov/bcprov-1.38-r4.ebuild b/dev-java/bcprov/bcprov-1.38-r4.ebuild
new file mode 100644
index 0000000..2f75cba
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.38-r4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-jdk16"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
+LICENSE="BSD"
+SLOT="1.38"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="org"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+java_prepare() {
+ if ! use test; then
+ # There are too many files to delete so we won't be using JAVA_RM_FILES
+ # (it produces a lot of output).
+ local RM_TEST_FILES=()
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Test*.java" -type f -print0)
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Mock*.java" -type f -print0)
+
+ rm -v "${RM_TEST_FILES[@]}" || die
+ fi
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.40-r1.ebuild b/dev-java/bcprov/bcprov-1.40-r1.ebuild
deleted file mode 100644
index ac91387..0000000
--- a/dev-java/bcprov/bcprov-1.40-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.40"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-# The src_unpack find needs a new find
-# https://bugs.gentoo.org/show_bug.cgi?id=182276
-DEPEND=">=virtual/jdk-1.5
- userland_GNU? ( >=sys-apps/findutils-4.3 )
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-IUSE="userland_GNU"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./src.zip
-
- # so that we don't need junit
- echo "Removing testcases' sources:"
- find . -path '*test/*.java' -print -delete \
- || die "Failed to delete testcases."
- find . -name '*Test*.java' -print -delete \
- || die "Failed to delete testcases."
-}
-
-src_compile() {
- mkdir "${S}/classes"
-
- find . -name "*.java" > "${T}/src.list"
- ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list"
-
- cd "${S}/classes"
- jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
- java-pkg_dojar "${S}/${PN}.jar"
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcprov/bcprov-1.40-r2.ebuild b/dev-java/bcprov/bcprov-1.40-r2.ebuild
new file mode 100644
index 0000000..04c02fb
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.40-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-jdk16"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
+LICENSE="BSD"
+SLOT="1.40"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="org"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+java_prepare() {
+ if ! use test; then
+ # There are too many files to delete so we won't be using JAVA_RM_FILES
+ # (it produces a lot of output).
+ local RM_TEST_FILES=()
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Test*.java" -type f -print0)
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Mock*.java" -type f -print0)
+
+ rm -v "${RM_TEST_FILES[@]}" || die
+ fi
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.45-r1.ebuild b/dev-java/bcprov/bcprov-1.45-r1.ebuild
deleted file mode 100644
index 0cea3e9..0000000
--- a/dev-java/bcprov/bcprov-1.45-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.45"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
-
-# The src_unpack find needs a new find
-# https://bugs.gentoo.org/show_bug.cgi?id=182276
-DEPEND=">=virtual/jdk-1.5
- userland_GNU? ( >=sys-apps/findutils-4.3 )
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-IUSE="userland_GNU"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./src.zip
-
- # so that we don't need junit
- echo "Removing testcases' sources:"
- find . -path '*test/*.java' -print -delete \
- || die "Failed to delete testcases."
- find . -name '*Test*.java' -print -delete \
- || die "Failed to delete testcases."
-}
-
-src_compile() {
- mkdir "${S}/classes"
-
- find . -name "*.java" > "${T}/src.list"
- ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list"
-
- cd "${S}/classes"
- jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
- java-pkg_dojar "${S}/${PN}.jar"
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcprov/bcprov-1.45-r2.ebuild b/dev-java/bcprov/bcprov-1.45-r2.ebuild
new file mode 100644
index 0000000..28c5f32
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.45-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-jdk16"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
+LICENSE="BSD"
+SLOT="1.45"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="org"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+java_prepare() {
+ if ! use test; then
+ # There are too many files to delete so we won't be using JAVA_RM_FILES
+ # (it produces a lot of output).
+ local RM_TEST_FILES=()
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Test*.java" -type f -print0)
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Mock*.java" -type f -print0)
+
+ rm -v "${RM_TEST_FILES[@]}" || die
+ fi
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.45.ebuild b/dev-java/bcprov/bcprov-1.45.ebuild
deleted file mode 100644
index 4dd1d5e..0000000
--- a/dev-java/bcprov/bcprov-1.45.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
-
-# The src_unpack find needs a new find
-# https://bugs.gentoo.org/show_bug.cgi?id=182276
-DEPEND=">=virtual/jdk-1.5
- userland_GNU? ( >=sys-apps/findutils-4.3 )
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-IUSE="userland_GNU"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./src.zip
-
- # so that we don't need junit
- echo "Removing testcases' sources:"
- find . -path '*test/*.java' -print -delete \
- || die "Failed to delete testcases."
- find . -name '*Test*.java' -print -delete \
- || die "Failed to delete testcases."
-}
-
-src_compile() {
- mkdir "${S}/classes"
-
- find . -name "*.java" > "${T}/src.list"
- ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list"
-
- cd "${S}/classes"
- jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
- java-pkg_dojar "${S}/${PN}.jar"
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcprov/bcprov-1.48-r1.ebuild b/dev-java/bcprov/bcprov-1.48-r1.ebuild
deleted file mode 100644
index 0948f5b..0000000
--- a/dev-java/bcprov/bcprov-1.48-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15on-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.48"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
-
-# The src_unpack find needs a new find
-# https://bugs.gentoo.org/show_bug.cgi?id=182276
-DEPEND=">=virtual/jdk-1.5
- userland_GNU? ( >=sys-apps/findutils-4.3 )
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-IUSE="userland_GNU"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- default
-
- cd "${S}" || die
- unpack ./src.zip
-}
-
-java_prepare() {
- # This should eventually split the tests
- # and call them separately, it's not clean
- # to just throw the tests away.
- einfo "Removing testcases' sources:"
- find . -path '*test/*.java' -print -delete \
- || die "Failed to delete testcases."
- find . -name '*Test*.java' -print -delete \
- || die "Failed to delete testcases."
-
- mkdir "${S}"/classes || die
-}
-
-src_compile() {
- find . -name "*.java" > "${T}"/src.list
- ejavac -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
-
- cd "${S}"/classes || die
- jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
-}
-
-src_install() {
- java-pkg_dojar "${S}"/${PN}.jar
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcprov/bcprov-1.48-r2.ebuild b/dev-java/bcprov/bcprov-1.48-r2.ebuild
new file mode 100644
index 0000000..795b038
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.48-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.48"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+ default
+ cd "${S}"
+ unpack ./src.zip
+}
+
+java_prepare() {
+ if ! use test; then
+ # There are too many files to delete so we won't be using JAVA_RM_FILES
+ # (it produces a lot of output).
+ local RM_TEST_FILES=()
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Test*.java" -type f -print0)
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Mock*.java" -type f -print0)
+
+ rm -v "${RM_TEST_FILES[@]}" || die
+ fi
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.49-r2.ebuild b/dev-java/bcprov/bcprov-1.49-r2.ebuild
deleted file mode 100644
index fa1a02f..0000000
--- a/dev-java/bcprov/bcprov-1.49-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15on-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Needs further investigation.
-# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256
-RESTRICT="test"
-
-# The src_unpack find needs a new find
-# https://bugs.gentoo.org/show_bug.cgi?id=182276
-DEPEND=">=virtual/jdk-1.5
- userland_GNU? ( >=sys-apps/findutils-4.3 )
- app-arch/unzip
- test? ( dev-java/junit:4 )"
-RDEPEND=">=virtual/jre-1.5"
-
-IUSE="userland_GNU"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- default
-
- cd "${S}" || die
- unpack ./src.zip
-}
-
-java_prepare() {
- mkdir "${S}"/classes || die
-
- if use test ; then
- java-pkg_jar-from --build-only junit-4
- fi
-}
-
-src_compile() {
- find . -name "*.java" > "${T}"/src.list
-
- local cp
- if use test ; then
- cp="-cp junit.jar"
- else
- sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
- fi
-
- ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
-
- cd "${S}"/classes || die
-
- jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
-}
-
-src_test() {
- java -cp ${PN}.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests
- java -cp ${PN}.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests
- java -cp ${PN}.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests
-
- grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcprov/bcprov-1.49-r3.ebuild b/dev-java/bcprov/bcprov-1.49-r3.ebuild
deleted file mode 100644
index 3e23923..0000000
--- a/dev-java/bcprov/bcprov-1.49-r3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15on-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.49"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Needs further investigation.
-# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256
-RESTRICT="test"
-
-# The src_unpack find needs a new find
-# https://bugs.gentoo.org/show_bug.cgi?id=182276
-DEPEND=">=virtual/jdk-1.5
- userland_GNU? ( >=sys-apps/findutils-4.3 )
- app-arch/unzip
- test? ( dev-java/junit:4 )"
-RDEPEND=">=virtual/jre-1.5"
-
-IUSE="userland_GNU"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- default
-
- cd "${S}" || die
- unpack ./src.zip
-}
-
-java_prepare() {
- mkdir "${S}"/classes || die
-
- if use test ; then
- java-pkg_jar-from --build-only junit-4
- fi
-}
-
-src_compile() {
- find . -name "*.java" > "${T}"/src.list
-
- local cp
- if use test ; then
- cp="-cp junit.jar"
- else
- sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
- fi
-
- ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
-
- cd "${S}"/classes || die
-
- jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
-}
-
-src_test() {
- java -cp ${PN}.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests
- java -cp ${PN}.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests
- java -cp ${PN}.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests
-
- grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcprov/bcprov-1.49-r4.ebuild b/dev-java/bcprov/bcprov-1.49-r4.ebuild
new file mode 100644
index 0000000..17d91d2
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.49-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.49"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+ default
+ cd "${S}"
+ unpack ./src.zip
+}
+
+java_prepare() {
+ if ! use test; then
+ # There are too many files to delete so we won't be using JAVA_RM_FILES
+ # (it produces a lot of output).
+ local RM_TEST_FILES=()
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Test*.java" -type f -print0)
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Mock*.java" -type f -print0)
+
+ rm -v "${RM_TEST_FILES[@]}" || die
+ fi
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.50-r1.ebuild b/dev-java/bcprov/bcprov-1.50-r1.ebuild
deleted file mode 100644
index 99e5656..0000000
--- a/dev-java/bcprov/bcprov-1.50-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.50"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND=""
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./src.zip
-}
-
-java_prepare() {
- if ! test; then
- for test_file in $(find . -type f -name '*Test*'.java); do
- JAVA_RM_FILES+=("${test_file}")
- done
- fi
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-}
-
-src_install() {
- java-pkg-simple_src_install
- use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.50-r2.ebuild b/dev-java/bcprov/bcprov-1.50-r2.ebuild
new file mode 100644
index 0000000..b0deca8
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.50-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.50"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+ default
+ cd "${S}"
+ unpack ./src.zip
+}
+
+java_prepare() {
+ if ! use test; then
+ # There are too many files to delete so we won't be using JAVA_RM_FILES
+ # (it produces a lot of output).
+ local RM_TEST_FILES=()
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Test*.java" -type f -print0)
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Mock*.java" -type f -print0)
+
+ rm -v "${RM_TEST_FILES[@]}"
+ fi
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.50-r3.ebuild b/dev-java/bcprov/bcprov-1.50-r3.ebuild
new file mode 100644
index 0000000..b10fce6
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.50-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+ default
+ cd "${S}"
+ unpack ./src.zip
+}
+
+java_prepare() {
+ if ! use test; then
+ # There are too many files to delete so we won't be using JAVA_RM_FILES
+ # (it produces a lot of output).
+ local RM_TEST_FILES=()
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Test*.java" -type f -print0)
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Mock*.java" -type f -print0)
+
+ rm -v "${RM_TEST_FILES[@]}" || die
+ fi
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.50.ebuild b/dev-java/bcprov/bcprov-1.50.ebuild
deleted file mode 100644
index 6a54195..0000000
--- a/dev-java/bcprov/bcprov-1.50.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15on-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Needs further investigation.
-# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256
-RESTRICT="test"
-
-# The src_unpack find needs a new find
-# https://bugs.gentoo.org/show_bug.cgi?id=182276
-DEPEND=">=virtual/jdk-1.5
- userland_GNU? ( >=sys-apps/findutils-4.3 )
- app-arch/unzip
- test? ( dev-java/junit:4 )"
-RDEPEND=">=virtual/jre-1.5"
-
-IUSE="userland_GNU"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- default
-
- cd "${S}" || die
- unpack ./src.zip
-}
-
-java_prepare() {
- mkdir "${S}"/classes || die
-
- if use test ; then
- java-pkg_jar-from --build-only junit-4
- fi
-}
-
-src_compile() {
- find . -name "*.java" > "${T}"/src.list
-
- local cp
- if use test ; then
- cp="-cp junit.jar"
- else
- sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
- fi
-
- ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
-
- cd "${S}"/classes || die
-
- jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
-}
-
-src_test() {
- java -cp ${PN}.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests
- java -cp ${PN}.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests
- java -cp ${PN}.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests
-
- grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcprov/bcprov-1.52-r1.ebuild b/dev-java/bcprov/bcprov-1.52-r1.ebuild
index f6bb54a..add187a 100644
--- a/dev-java/bcprov/bcprov-1.52-r1.ebuild
+++ b/dev-java/bcprov/bcprov-1.52-r1.ebuild
@@ -16,7 +16,7 @@
LICENSE="BSD"
SLOT="1.52"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
CDEPEND=""
@@ -41,7 +41,7 @@
}
java_prepare() {
- if ! test; then
+ if ! use test; then
# There are too many files to delete so we won't be using JAVA_RM_FILES
# (it produces a lot of output).
local RM_TEST_FILES=()
@@ -52,7 +52,7 @@
RM_TEST_FILES+=("${file}")
done < <(find . -name "*Mock*.java" -type f -print0)
- rm -f "${RM_TEST_FILES[@]}"
+ rm -v "${RM_TEST_FILES[@]}"
fi
}
diff --git a/dev-java/bcprov/bcprov-1.52-r2.ebuild b/dev-java/bcprov/bcprov-1.52-r2.ebuild
new file mode 100644
index 0000000..990b7ff
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.52-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=""
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be build with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+ default
+ cd "${S}"
+ unpack ./src.zip
+}
+
+java_prepare() {
+ if ! use test; then
+ # There are too many files to delete so we won't be using JAVA_RM_FILES
+ # (it produces a lot of output).
+ local RM_TEST_FILES=()
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Test*.java" -type f -print0)
+ while read -d $'\0' -r file; do
+ RM_TEST_FILES+=("${file}")
+ done < <(find . -name "*Mock*.java" -type f -print0)
+
+ rm -v "${RM_TEST_FILES[@]}" || die
+ fi
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.52.ebuild b/dev-java/bcprov/bcprov-1.52.ebuild
deleted file mode 100644
index c2e5a3c..0000000
--- a/dev-java/bcprov/bcprov-1.52.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15on-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Needs further investigation.
-# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256
-RESTRICT="test"
-
-# The src_unpack find needs a new find
-# https://bugs.gentoo.org/show_bug.cgi?id=182276
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- userland_GNU? (
- sys-apps/findutils
- )
- test? (
- dev-java/junit:4
- )"
-RDEPEND=">=virtual/jre-1.6"
-
-IUSE="userland_GNU"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- default
- cd "${S}" || die
- unpack ./src.zip
-}
-
-java_prepare() {
- mkdir "${S}"/classes || die
-
- if use test; then
- java-pkg_jar-from --build-only junit-4
- fi
-}
-
-src_compile() {
- find . -name "*.java" > "${T}"/src.list
-
- local cp
- if use test ; then
- cp="-cp junit.jar"
- else
- sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
- fi
-
- ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
-
- cd "${S}"/classes || die
-
- jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
-}
-
-src_test() {
- java -cp ${PN}.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests
- java -cp ${PN}.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests
- java -cp ${PN}.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests
-
- grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
-
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/blowfishj/blowfishj-2.14-r2.ebuild b/dev-java/blowfishj/blowfishj-2.14-r2.ebuild
deleted file mode 100644
index d423e69..0000000
--- a/dev-java/blowfishj/blowfishj-2.14-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Blowfish implementation in Java"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-HOMEPAGE="http://blowfishj.sourceforge.net/index.html"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
- test? ( =dev-java/junit-3* dev-java/ant-junit ) "
-RDEPEND=">=virtual/jre-1.4"
-
-src_unpack() {
- unpack ${A}
- cd "${S}" || die
- java-ant_ignore-system-classes
- mkdir -p target/lib || die
- cd target/lib || die
- use test && java-pkg_jar-from --build-only junit
-}
-
-src_test() {
- ANT_TASKS="ant-junit" eant test -DJunit.present=true
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar
-
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc src/java/net
-}
diff --git a/dev-java/blowfishj/blowfishj-2.14-r3.ebuild b/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
index dfa8b48..110a4af 100644
--- a/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
+++ b/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
@@ -14,7 +14,7 @@
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/cglib/cglib-3.1.ebuild b/dev-java/cglib/cglib-3.1.ebuild
index 7318c56..c2d4fa4 100644
--- a/dev-java/cglib/cglib-3.1.ebuild
+++ b/dev-java/cglib/cglib-3.1.ebuild
@@ -14,7 +14,7 @@
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+KEYWORDS="amd64 x86 ppc ppc64"
IUSE=""
diff --git a/dev-java/colt/colt-1.2.0-r3.ebuild b/dev-java/colt/colt-1.2.0-r3.ebuild
new file mode 100644
index 0000000..d190857
--- /dev/null
+++ b/dev-java/colt/colt-1.2.0-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A set of Open Source Libraries for High Performance Scientific and Technical Computing in Java"
+SRC_URI="http://dsd.lbl.gov/~hoschek/colt-download/releases/${P}.tar.gz"
+HOMEPAGE="http://www-itg.lbl.gov/~hoschek/colt/"
+
+LICENSE="colt"
+IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${PN}"
+
+EANT_BUILD_TARGET="javac jar"
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+# [0]: I don't know but it must be useful.
+# [1]: Monkey patch manually some classes to get rid of the
+# oswego.edu.concurrent.util imports.
+PATCHES=(
+ "${FILESDIR}/${P}-benchmark-no-deprecation.patch"
+ "${FILESDIR}/${P}-remove-concurrent-util-imports.patch"
+)
+
+java_prepare() {
+ epatch "${PATCHES[@]}"
+ java-pkg_clean
+}
+
+src_install() {
+ java-pkg_dojar "lib/${PN}.jar"
+
+ dohtml README.html || die
+ use doc && java-pkg_dojavadoc doc/api
+ use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/colt/files/colt-1.2.0-remove-concurrent-util-imports.patch b/dev-java/colt/files/colt-1.2.0-remove-concurrent-util-imports.patch
new file mode 100644
index 0000000..2cfbef7
--- /dev/null
+++ b/dev-java/colt/files/colt-1.2.0-remove-concurrent-util-imports.patch
@@ -0,0 +1,210 @@
+--- src/cern/colt/matrix/linalg/SmpBlas.java.orig 2015-10-07 22:23:44.969486000 +0000
++++ src/cern/colt/matrix/linalg/SmpBlas.java 2015-10-07 22:29:15.475486000 +0000
+@@ -10,7 +10,8 @@
+
+ import cern.colt.matrix.DoubleMatrix1D;
+ import cern.colt.matrix.DoubleMatrix2D;
+-import EDU.oswego.cs.dl.util.concurrent.FJTask;
++
++import java.util.concurrent.ForkJoinTask;
+ /**
+ Parallel implementation of the Basic Linear Algebra System for symmetric multi processing boxes.
+ Currently only a few algorithms are parallelised; the others are fully functional, but run in sequential mode.
+@@ -198,7 +199,7 @@
+
+ // set up concurrent tasks
+ int span = width/noOfTasks;
+- final FJTask[] subTasks = new FJTask[noOfTasks];
++ final ForkJoinTask[] subTasks = new ForkJoinTask[noOfTasks];
+ for (int i=0; i<noOfTasks; i++) {
+ final int offset = i*span;
+ if (i==noOfTasks-1) span = width - span*i; // last span may be a bit larger
+@@ -217,24 +218,30 @@
+ CC = C.viewPart(offset,0,span,p);
+ }
+
+- subTasks[i] = new FJTask() {
++ subTasks[i] = new ForkJoinTask() {
+ public void run() {
+ seqBlas.dgemm(transposeA,transposeB,alpha,AA,BB,beta,CC);
+ //System.out.println("Hello "+offset);
+ }
++
++ public boolean exec() { return true; }
++ public void setRawResult(Object o) {}
++ public Object getRawResult() {return null;}
+ };
+ }
+
+ // run tasks and wait for completion
+- try {
+- this.smp.taskGroup.invoke(
+- new FJTask() {
+- public void run() {
+- coInvoke(subTasks);
+- }
+- }
+- );
+- } catch (InterruptedException exc) {}
++ this.smp.taskGroup.invoke(
++ new ForkJoinTask() {
++ public void run() {
++ invokeAll(subTasks);
++ }
++
++ public boolean exec() { return true; }
++ public void setRawResult(Object o) {}
++ public Object getRawResult() {return null;}
++ }
++ );
+ }
+ public void dgemv(final boolean transposeA, final double alpha, DoubleMatrix2D A, final DoubleMatrix1D x, final double beta, DoubleMatrix1D y) {
+ /*
+@@ -271,7 +278,7 @@
+
+ // set up concurrent tasks
+ int span = width/noOfTasks;
+- final FJTask[] subTasks = new FJTask[noOfTasks];
++ final ForkJoinTask[] subTasks = new ForkJoinTask[noOfTasks];
+ for (int i=0; i<noOfTasks; i++) {
+ final int offset = i*span;
+ if (i==noOfTasks-1) span = width - span*i; // last span may be a bit larger
+@@ -280,24 +287,30 @@
+ final DoubleMatrix2D AA = A.viewPart(offset,0,span,n);
+ final DoubleMatrix1D yy = y.viewPart(offset,span);
+
+- subTasks[i] = new FJTask() {
++ subTasks[i] = new ForkJoinTask() {
+ public void run() {
+ seqBlas.dgemv(transposeA,alpha,AA,x,beta,yy);
+ //System.out.println("Hello "+offset);
+ }
++
++ public boolean exec() { return true; }
++ public void setRawResult(Object o) {}
++ public Object getRawResult() {return null;}
+ };
+ }
+
+ // run tasks and wait for completion
+- try {
+- this.smp.taskGroup.invoke(
+- new FJTask() {
+- public void run() {
+- coInvoke(subTasks);
+- }
+- }
+- );
+- } catch (InterruptedException exc) {}
++ this.smp.taskGroup.invoke(
++ new ForkJoinTask() {
++ public void run() {
++ invokeAll(subTasks);
++ }
++
++ public boolean exec() { return true; }
++ public void setRawResult(Object o) {}
++ public Object getRawResult() {return null;}
++ }
++ );
+ }
+ public void dger(double alpha, DoubleMatrix1D x, DoubleMatrix1D y, DoubleMatrix2D A) {
+ seqBlas.dger(alpha,x,y,A);
+@@ -369,9 +382,6 @@
+ /**
+ * Prints various snapshot statistics to System.out; Simply delegates to {@link EDU.oswego.cs.dl.util.concurrent.FJTaskRunnerGroup#stats}.
+ */
+-public void stats() {
+- if (this.smp!=null) this.smp.stats();
+-}
+ private double xsum(DoubleMatrix2D A) {
+ double[] sums = run(A,true,
+ new Matrix2DMatrix2DFunction() {
+--- src/cern/colt/matrix/linalg/Smp.java.orig 2015-10-07 21:08:19.443486000 +0000
++++ src/cern/colt/matrix/linalg/Smp.java 2015-10-07 22:28:24.722486000 +0000
+@@ -9,12 +9,13 @@
+ package cern.colt.matrix.linalg;
+
+ import cern.colt.matrix.DoubleMatrix2D;
+-import EDU.oswego.cs.dl.util.concurrent.FJTask;
+-import EDU.oswego.cs.dl.util.concurrent.FJTaskRunnerGroup;
++import java.util.concurrent.ForkJoinTask;
++import java.util.concurrent.ForkJoinPool;
++
+ /*
+ */
+ class Smp {
+- protected FJTaskRunnerGroup taskGroup; // a very efficient and light weight thread pool
++ protected ForkJoinPool taskGroup; // a very efficient and light weight thread pool
+
+ protected int maxThreads;
+ /**
+@@ -24,41 +25,39 @@
+ maxThreads = Math.max(1,maxThreads);
+ this.maxThreads = maxThreads;
+ if (maxThreads>1) {
+- this.taskGroup = new FJTaskRunnerGroup(maxThreads);
++ this.taskGroup = new ForkJoinPool(maxThreads);
+ }
+ else { // avoid parallel overhead
+ this.taskGroup = null;
+ }
+ }
+-/**
+- * Clean up deamon threads, if necessary.
+- */
+-public void finalize() {
+- if (this.taskGroup!=null) this.taskGroup.interruptAll();
+-}
+ protected void run(final DoubleMatrix2D[] blocksA, final DoubleMatrix2D[] blocksB, final double[] results, final Matrix2DMatrix2DFunction function) {
+- final FJTask[] subTasks = new FJTask[blocksA.length];
++ final ForkJoinTask[] subTasks = new ForkJoinTask[blocksA.length];
+ for (int i=0; i<blocksA.length; i++) {
+ final int k = i;
+- subTasks[i] = new FJTask() {
++ subTasks[i] = new ForkJoinTask() {
+ public void run() {
+ double result = function.apply(blocksA[k],blocksB != null ? blocksB[k] : null);
+ if (results!=null) results[k] = result;
+ //System.out.print(".");
+ }
++ public boolean exec() { return true; }
++ public void setRawResult(Object o) {}
++ public Object getRawResult() {return null;}
+ };
+ }
+
+ // run tasks and wait for completion
+- try {
+- this.taskGroup.invoke(
+- new FJTask() {
+- public void run() {
+- coInvoke(subTasks);
+- }
+- }
+- );
+- } catch (InterruptedException exc) {}
++ this.taskGroup.invoke(
++ new ForkJoinTask() {
++ public void run() {
++ invokeAll(subTasks);
++ }
++ public boolean exec() { return true; }
++ public void setRawResult(Object o) {}
++ public Object getRawResult() {return null;}
++ }
++ );
+ }
+ protected DoubleMatrix2D[] splitBlockedNN(DoubleMatrix2D A, int threshold, long flops) {
+ /*
+@@ -186,10 +185,4 @@
+ }
+ return blocks;
+ }
+-/**
+- * Prints various snapshot statistics to System.out; Simply delegates to {@link EDU.oswego.cs.dl.util.concurrent.FJTaskRunnerGroup#stats}.
+- */
+-public void stats() {
+- if (this.taskGroup!=null) this.taskGroup.stats();
+-}
+ }
diff --git a/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild b/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild
index 0860a7b..adc43c0 100644
--- a/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild
+++ b/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,18 +14,18 @@
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
-COMMON_DEP="dev-java/ant-core:0
+CDEPEND="dev-java/ant-core:0
dev-java/gjdoc:0
dev-java/qdox:1.6
dev-java/xjavadoc:0"
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="ant-core,gjdoc,qdox-1.6"
diff --git a/dev-java/commons-chain/commons-chain-1.2.ebuild b/dev-java/commons-chain/commons-chain-1.2.ebuild
index 39cccd0..4e20ef4 100644
--- a/dev-java/commons-chain/commons-chain-1.2.ebuild
+++ b/dev-java/commons-chain/commons-chain-1.2.ebuild
@@ -14,11 +14,11 @@
LICENSE="Apache-2.0"
SLOT="1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
-# Too many missing imports from javax.servlet.* which cause the
+# Too many missing imports from javax.servlet.* which causes the
# "compile-tests" target to fail compiling.
-# I gave up on it after wasting nearly half a day.
+# I gave up on them after wasting nearly half a day.
RESTRICT="test"
IUSE=""
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index 9904526..3e5e508 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,2 +1 @@
-DIST commons-compress-1.4.1-src.tar.gz 3228776 SHA256 b4f34aa03df917b785479e147381eea86c5c17e9067ddf8c27301ff6cd0aa91c SHA512 e1d327f084a79924938698ae16fa6edaaa73072b083109bbd8ccaa636268c05c387e7c2117b5df8f6b91b143495add9cc7da17c1bd3c989f91c910a9d68f6bdb WHIRLPOOL 50565e7342fa363814ed2f347d1daa1ee59dd28cefcd9e494850edcf47899b8684312996dd60b90236a4f2aacce8a920ace37cca5d1d22ad9f63f6696c8e7452
DIST commons-compress-1.8.1-src.tar.gz 8476056 SHA256 aa1221643331d9de5c8155b032c7fde23fc8cf3d962155092de89c44d4978412 SHA512 4e4f9633cc3c470970a8da41344a819ff63430a46e219e93896dbe2374738349f78942cff93ad8d348599cfc2dd7d014ae4ff3b09d76a924bb11ca1c4a2c05ea WHIRLPOOL 2d7f3230f47186a72b4b31efd10c5dfd68488d263e26d97b6e715b2b2eab3e22ae3e5946d232ca014aa2a3d14f3abf87ce97bf2e70c7c06788c4093df4156aef
diff --git a/dev-java/commons-compress/commons-compress-1.4.1.ebuild b/dev-java/commons-compress/commons-compress-1.4.1.ebuild
deleted file mode 100644
index 12176cd..0000000
--- a/dev-java/commons-compress/commons-compress-1.4.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="dev-java/xz-java"
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.5
- ${COMMON_DEPEND}
- test? ( dev-java/junit:4
- dev-java/hamcrest-core
- dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning"
-EANT_GENTOO_CLASSPATH="xz-java"
-EANT_BUILD_TARGET="compile package"
-EANT_TEST_GENTOO_CLASSPATH="junit-4 hamcrest-core xz-java"
-
-java_prepare() {
- cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml"
-
- # osgi stuff mvn ant:ant doesn't handle
- mkdir -p target/osgi || die "Failed to create target dir"
- cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy manifest"
-
- if ! use test; then
- find -name "*.jar" -delete || die "Failed to remove test resources"
- fi
-}
-
-src_test() {
- EANT_TEST_TARGET="compile-tests test"
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar target/${PN}-1.1.jar
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-compress/commons-compress-1.8.1.ebuild b/dev-java/commons-compress/commons-compress-1.8.1.ebuild
deleted file mode 100644
index d52a6db..0000000
--- a/dev-java/commons-compress/commons-compress-1.8.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-java/xz-java"
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.5
- ${COMMON_DEPEND}
- test? ( dev-java/junit:4
- dev-java/hamcrest-core
- dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning"
-EANT_GENTOO_CLASSPATH="xz-java"
-EANT_BUILD_TARGET="compile package"
-EANT_TEST_GENTOO_CLASSPATH="junit-4 hamcrest-core xz-java"
-
-java_prepare() {
- cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml"
-
- # osgi stuff mvn ant:ant doesn't handle
- mkdir -p target/osgi || die "Failed to create target dir"
- cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy manifest"
-
- if ! use test; then
- find -name "*.jar" -delete || die "Failed to remove test resources"
- fi
-}
-
-src_test() {
- EANT_TEST_TARGET="compile-tests test"
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar target/${PN}-1.1.jar
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-dbutils/Manifest b/dev-java/commons-dbutils/Manifest
index 4be4cdd..edbf114 100644
--- a/dev-java/commons-dbutils/Manifest
+++ b/dev-java/commons-dbutils/Manifest
@@ -1 +1 @@
-DIST commons-dbutils-1.1-src.tar.gz 60062 SHA256 645f79936bb90c5ed02fd4d1ddbc15b23e22a468ab0df22771f2b78fe8d49a59 SHA512 03859d0ddc65b1f0254f71e9de371f131a81dc839de6bea938a0547b63759d18a9e957f44ac887b7ae9ea85ee3aeea90ffd8f03069c670ec7b700fe8b6e45fe2 WHIRLPOOL b4b3e670b30101657c0d57fcf33993cdca89838135f147b54c63ac4bbced6fe1ed1218af36e95bec60e856c73a9d47fbfc1eecdbbd55dd7e476f6883fd94f3fd
+DIST commons-dbutils-1.6-src.tar.gz 90708 SHA256 c7cb1bd7e0f9a6d509c98bb60f9941503473d6fe0fbe144736fb1819096c4524 SHA512 05aa5fb448d949ac4d5d34f1219539e57cfb550fa423af0691cb35002984036b0de62b8f618199bd2f562a441867c5b7138e9204afc36bd6d0fa2c4c5e9cd2c6 WHIRLPOOL 012a8cace08c96c136b9e9a05ec34d173d544aecad465908ad823a47ec535cfa91c609e5280e9e05967b3d863b13e999ad2c9a826a100e3faa3333869c26dd97
diff --git a/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild b/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild
deleted file mode 100644
index 3a63ce8..0000000
--- a/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="A small set of classes designed to make working with JDBC easier"
-HOMEPAGE="http://commons.apache.org/dbutils/"
-SRC_URI="mirror://apache/commons/dbutils/source/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
- test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${P}-src"
-
-PATCHES=( "${FILESDIR}/1.1-tests.patch" )
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_install() {
- java-pkg_newjar target/${P}.jar
-
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild b/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild
new file mode 100644
index 0000000..b76f51a
--- /dev/null
+++ b/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A small set of classes designed to make working with JDBC easier"
+HOMEPAGE="http://commons.apache.org/dbutils/"
+SRC_URI="mirror://apache/commons/dbutils/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6
+ test? (
+ dev-java/mockito:0
+ dev-java/ant-junit:0
+ dev-java/hamcrest-core:1.3
+ )"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_TEST_TARGET="test"
+EANT_TEST_GENTOO_CLASSPATH="
+ mockito
+ hamcrest-core-1.3
+"
+
+# Uses a bunch of deprecated methods.
+JAVA_RM_FILES=(
+ src/test/java/org/apache/commons/dbutils/handlers/ArrayHandlerTest.java
+)
+
+java_prepare() {
+ cp "${FILESDIR}"/"${P}-build.xml" build.xml || die
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar target/${P}.jar
+ use doc && java-pkg_dojavadoc target/site/apidocs
+ use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-java/commons-dbutils/files/1.1-tests.patch b/dev-java/commons-dbutils/files/1.1-tests.patch
deleted file mode 100644
index a2036d4..0000000
--- a/dev-java/commons-dbutils/files/1.1-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur commons-dbutils-1.1-src.old/build.xml commons-dbutils-1.1-src/build.xml
---- commons-dbutils-1.1-src.old/build.xml 2008-02-13 22:18:49.000000000 +0200
-+++ commons-dbutils-1.1-src/build.xml 2008-02-13 22:18:59.000000000 +0200
-@@ -62,7 +62,7 @@
- </classpath>
- </javac>
- </target>
-- <target name="jar" description="o Create the jar" depends="compile,test">
-+ <target name="jar" description="o Create the jar" depends="compile">
- <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
- </jar>
- </target>
diff --git a/dev-java/commons-dbutils/files/commons-dbutils-1.6-build.xml b/dev-java/commons-dbutils/files/commons-dbutils-1.6-build.xml
new file mode 100644
index 0000000..725d4ea
--- /dev/null
+++ b/dev-java/commons-dbutils/files/commons-dbutils-1.6-build.xml
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!-- -->
+<!-- Any modifications will be overwritten. -->
+<!-- -->
+<!-- Generated by Maven Ant Plugin on 10/5/15 8:20 PM -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<project name="commons-dbutils-from-maven" default="package" basedir=".">
+
+ <!-- ====================================================================== -->
+ <!-- Build environment properties -->
+ <!-- ====================================================================== -->
+
+ <property file="${user.home}/.m2/maven.properties"/>
+ <property file="maven-build.properties"/>
+
+ <property name="maven.build.finalName" value="commons-dbutils-1.6"/>
+ <property name="maven.build.dir" value="target"/>
+ <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+ <property name="maven.build.srcDir.0" value="src/main/java"/>
+ <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+ <property name="maven.build.resourceDir.1" value="."/>
+ <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+ <property name="maven.build.testDir.0" value="src/test/java"/>
+ <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+ <property name="maven.build.testResourceDir.1" value="."/>
+ <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+ <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+ <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+ <property name="maven.settings.offline" value="false"/>
+ <property name="maven.settings.interactiveMode" value="true"/>
+
+ <!-- ====================================================================== -->
+ <!-- Defining classpaths -->
+ <!-- ====================================================================== -->
+
+ <path id="build.classpath"/>
+ <path id="build.test.classpath">
+ <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
+ <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+ <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar"/>
+ <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+ <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar"/>
+ </path>
+
+ <!-- ====================================================================== -->
+ <!-- Cleaning up target -->
+ <!-- ====================================================================== -->
+
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${maven.build.dir}"/>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Compilation target -->
+ <!-- ====================================================================== -->
+
+ <target name="compile" description="Compile the code">
+ <mkdir dir="${maven.build.outputDir}"/>
+ <javac destdir="${maven.build.outputDir}"
+ encoding="iso-8859-1"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ target="1.6"
+ verbose="false"
+ fork="false"
+ source="1.6">
+ <src>
+ <pathelement location="${maven.build.srcDir.0}"/>
+ </src>
+ <classpath refid="build.classpath"/>
+ </javac>
+ <mkdir dir="${maven.build.outputDir}/META-INF"/>
+ <copy todir="${maven.build.outputDir}/META-INF">
+ <fileset dir="${maven.build.resourceDir.1}">
+ <include name="NOTICE.txt"/>
+ <include name="LICENSE.txt"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Test-compilation target -->
+ <!-- ====================================================================== -->
+
+ <target name="compile-tests"
+ depends="compile"
+ description="Compile the test code"
+ unless="maven.test.skip">
+ <mkdir dir="${maven.build.testOutputDir}"/>
+ <javac destdir="${maven.build.testOutputDir}"
+ encoding="iso-8859-1"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ target="1.6"
+ verbose="false"
+ fork="false"
+ source="1.6">
+ <src>
+ <pathelement location="${maven.build.testDir.0}"/>
+ </src>
+ <classpath>
+ <path refid="build.test.classpath"/>
+ <pathelement location="${maven.build.outputDir}"/>
+ </classpath>
+ </javac>
+ <copy todir="${maven.build.testOutputDir}">
+ <fileset dir="${maven.build.testResourceDir.0}"/>
+ </copy>
+ <mkdir dir="${maven.build.testOutputDir}/META-INF"/>
+ <copy todir="${maven.build.testOutputDir}/META-INF">
+ <fileset dir="${maven.build.testResourceDir.1}">
+ <include name="NOTICE.txt"/>
+ <include name="LICENSE.txt"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Run all tests -->
+ <!-- ====================================================================== -->
+
+ <target name="test"
+ depends="compile-tests, junit-missing"
+ unless="junit.skipped"
+ description="Run the test cases">
+ <mkdir dir="${maven.test.reports}"/>
+ <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+ <sysproperty key="basedir" value="."/>
+ <formatter type="xml"/>
+ <formatter type="plain" usefile="false"/>
+ <classpath>
+ <path refid="build.test.classpath"/>
+ <pathelement location="${maven.build.outputDir}"/>
+ <pathelement location="${maven.build.testOutputDir}"/>
+ </classpath>
+ <batchtest todir="${maven.test.reports}" unless="test">
+ <fileset dir="${maven.build.testDir.0}">
+ <include name="**/Test*.java"/>
+ <include name="**/*Test.java"/>
+ <include name="**/*TestCase.java"/>
+ <exclude name="**/TestBean.java"/>
+ <exclude name="**/BaseTestCase.java"/>
+ </fileset>
+ </batchtest>
+ <batchtest todir="${maven.test.reports}" if="test">
+ <fileset dir="${maven.build.testDir.0}">
+ <include name="**/${test}.java"/>
+ <exclude name="**/BaseTestCase.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="test-junit-present">
+ <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+ </target>
+
+ <target name="test-junit-status"
+ depends="test-junit-present">
+ <condition property="junit.missing">
+ <and>
+ <isfalse value="${junit.present}"/>
+ <isfalse value="${maven.test.skip}"/>
+ </and>
+ </condition>
+ <condition property="junit.skipped">
+ <or>
+ <isfalse value="${junit.present}"/>
+ <istrue value="${maven.test.skip}"/>
+ </or>
+ </condition>
+ </target>
+
+ <target name="junit-missing"
+ depends="test-junit-status"
+ if="junit.missing">
+ <echo>=================================== WARNING ===================================</echo>
+ <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+ <echo>===============================================================================</echo>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Javadoc target -->
+ <!-- ====================================================================== -->
+
+ <target name="javadoc" description="Generates the Javadoc of the application">
+ <javadoc sourcepath="${maven.build.srcDir.0}"
+ packagenames="*"
+ destdir="${maven.reporting.outputDirectory}/apidocs"
+ access="protected"
+ old="false"
+ verbose="false"
+ encoding="iso-8859-1"
+ version="true"
+ use="true"
+ author="true"
+ splitindex="false"
+ nodeprecated="false"
+ nodeprecatedlist="false"
+ notree="false"
+ noindex="false"
+ nohelp="false"
+ nonavbar="false"
+ serialwarn="false"
+ charset="ISO-8859-1"
+ docencoding="iso-8859-1"
+ source="1.6"
+ linksource="true"
+ breakiterator="false">
+ <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+ <link href="http://docs.oracle.com/javaee/6/api/"/>
+ </javadoc>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Package target -->
+ <!-- ====================================================================== -->
+
+ <target name="package" depends="compile,test" description="Package the application">
+ <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
+ compress="true"
+ index="false"
+ basedir="${maven.build.outputDir}"
+ excludes="**/package.html">
+ <manifest>
+ <attribute name="Main-Class" value="Main"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- A dummy target for the package named after the type it creates -->
+ <!-- ====================================================================== -->
+
+ <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+ <!-- ====================================================================== -->
+ <!-- Download dependencies target -->
+ <!-- ====================================================================== -->
+
+ <target name="test-offline">
+ <condition property="maven.mode.offline">
+ <equals arg1="${maven.settings.offline}" arg2="true"/>
+ </condition>
+ </target>
+
+</project>
diff --git a/dev-java/commons-graph/Manifest b/dev-java/commons-graph/Manifest
index e8bbd79..674c558 100644
--- a/dev-java/commons-graph/Manifest
+++ b/dev-java/commons-graph/Manifest
@@ -1 +1 @@
-DIST graph2-0.8.1.cvs20040118.tar.gz 42653 SHA256 916e3ca83376acd9ca64ee87988c8a19dc86c6468d087ede82d1e05c14a5a142 SHA512 110f2365b9568a4059233c6c6e75aec1a52b4fdd9110d55f0a6b79df324f047bde87d49134d8ba73417223919ddce972dd4a3c86841f843dd0109ebb17177083 WHIRLPOOL e3cd70bc98187a4f581bfa60125cfbfd0490264582d8fe4f536f7ecfd12a2f8228b1ff64db5414f8fa95ea976be5db08a054eecbb86e098cba62cc8cedd6f4c1
+DIST commons-graph-0.1.tar.gz 96009 SHA256 b68f5c7132e9eea4872dfc0d5fd74c138d2489355540dff752a91311cbac040d SHA512 7214fd60eb348a7feee9c194f562e5a7cf1f211ba589d2a85eaae52ed3ced7089842405dfbd99413b1f06f87ea1a19d244989daa1e0f6fb857fa752647d52b16 WHIRLPOOL 90c014761b2a1f8572eba4339f2ea81ec34666a83c21ea27326b366f0089cc5f20a5d6bc53aefa1d09019114b34f424496af95a604c1b55b5bdfec879ab51a0b
diff --git a/dev-java/commons-graph/commons-graph-0.1.ebuild b/dev-java/commons-graph/commons-graph-0.1.ebuild
new file mode 100644
index 0000000..2d7af9b
--- /dev/null
+++ b/dev-java/commons-graph/commons-graph-0.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A toolkit for managing graphs and graph based data structures"
+HOMEPAGE="https://commons.apache.org/sandbox/commons-graph/"
+SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+DEPEND=">=virtual/jdk-1.6
+ test? (
+ dev-java/ant-junit:0
+ )"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_TEST_TARGET="test"
+
+# Dubious tests.
+JAVA_RM_FILES=(
+ src/test/java/org/apache/commons/graph/coloring/GraphColoringTestCase.java
+ src/test/java/org/apache/commons/graph/spanning/KruskalTestCase.java
+ src/test/java/org/apache/commons/graph/scc/TarjanTestCase.java
+)
+
+java_prepare() {
+ cp "${FILESDIR}"/"${P}-build.xml" build.xml || die
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar target/${P}.jar
+ use doc && java-pkg_dojavadoc target/site/apidocs
+ use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild b/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild
deleted file mode 100644
index 7a80de0..0000000
--- a/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 eutils
-MY_PN=graph2
-MY_PV=${PV%%_*}.cvs${PV##*_p}
-MY_P=${MY_PN}-${MY_PV}
-API_PV=${PV%%_*}
-DESCRIPTION="A toolkit for managing graphs and graph based data structures"
-# There doesn't seem to be a real home page, so we'll point to a viewcvs
-HOMEPAGE="http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/graph2/"
-# this was extracted from a source rpm at jpackage
-SRC_URI="mirror://gentoo/distfiles/${MY_P}.tar.gz"
-COMMON_DEP="
- dev-java/commons-collections
- dev-java/jdepend"
-DEPEND=">=virtual/jdk-1.3
- test? ( dev-java/ant-junit )
- ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.3
- ${COMMON_DEP}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S=${WORKDIR}/${MY_P}
-
-src_unpack(){
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-gentoo.diff"
- mkdir -p target/lib
- cd target/lib
- java-pkg_jar-from commons-collections
- java-pkg_jar-from jdepend
-}
-
-src_install(){
- java-pkg_newjar target/${PN}-${API_PV}.jar ${PN}.jar
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc src/java/*
-}
-
-src_test() {
- cd "${S}/target/lib"
- java-pkg_jar-from junit
- cd "${S}"
- ANT_TASKS="ant-junit" eant test
-}
diff --git a/dev-java/commons-graph/files/commons-graph-0.1-build.xml b/dev-java/commons-graph/files/commons-graph-0.1-build.xml
new file mode 100644
index 0000000..5c3a9c1
--- /dev/null
+++ b/dev-java/commons-graph/files/commons-graph-0.1-build.xml
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!-- -->
+<!-- Any modifications will be overwritten. -->
+<!-- -->
+<!-- Generated by Maven Ant Plugin on 10/6/15 9:24 AM -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<project name="commons-graph-from-maven" default="package" basedir=".">
+
+ <!-- ====================================================================== -->
+ <!-- Build environment properties -->
+ <!-- ====================================================================== -->
+
+ <property file="${user.home}/.m2/maven.properties"/>
+ <property file="maven-build.properties"/>
+
+ <property name="maven.build.finalName" value="commons-graph-0.1"/>
+ <property name="maven.build.dir" value="target"/>
+ <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+ <property name="maven.build.srcDir.0" value="src/main/java"/>
+ <property name="maven.build.resourceDir.0" value="."/>
+ <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+ <property name="maven.build.testDir.0" value="src/test/java"/>
+ <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+ <property name="maven.build.testResourceDir.1" value="."/>
+ <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+ <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+ <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+ <property name="maven.settings.offline" value="false"/>
+ <property name="maven.settings.interactiveMode" value="true"/>
+
+ <!-- ====================================================================== -->
+ <!-- Defining classpaths -->
+ <!-- ====================================================================== -->
+
+ <path id="build.classpath"/>
+ <path id="build.test.classpath">
+ <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
+ <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <pathelement location="${maven.repo.local}/com/carrotsearch/junit-benchmarks/0.3.0/junit-benchmarks-0.3.0-jdk15.jar"/>
+ <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
+ <pathelement location="${maven.repo.local}/com/h2database/h2/1.3.158/h2-1.3.158.jar"/>
+ </path>
+
+ <!-- ====================================================================== -->
+ <!-- Cleaning up target -->
+ <!-- ====================================================================== -->
+
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${maven.build.dir}"/>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Compilation target -->
+ <!-- ====================================================================== -->
+
+ <target name="compile" description="Compile the code">
+ <mkdir dir="${maven.build.outputDir}"/>
+ <javac destdir="${maven.build.outputDir}"
+ encoding="iso-8859-1"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ target="1.6"
+ verbose="false"
+ fork="false"
+ source="1.6">
+ <src>
+ <pathelement location="${maven.build.srcDir.0}"/>
+ </src>
+ <classpath refid="build.classpath"/>
+ </javac>
+ <mkdir dir="${maven.build.outputDir}/META-INF"/>
+ <copy todir="${maven.build.outputDir}/META-INF">
+ <fileset dir="${maven.build.resourceDir.0}">
+ <include name="NOTICE.txt"/>
+ <include name="LICENSE.txt"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Test-compilation target -->
+ <!-- ====================================================================== -->
+
+ <target name="compile-tests"
+ depends="compile"
+ description="Compile the test code"
+ unless="maven.test.skip">
+ <mkdir dir="${maven.build.testOutputDir}"/>
+ <javac destdir="${maven.build.testOutputDir}"
+ encoding="iso-8859-1"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ target="1.6"
+ verbose="false"
+ fork="false"
+ source="1.6">
+ <src>
+ <pathelement location="${maven.build.testDir.0}"/>
+ </src>
+ <classpath>
+ <path refid="build.test.classpath"/>
+ <pathelement location="${maven.build.outputDir}"/>
+ </classpath>
+ </javac>
+ <mkdir dir="${maven.build.testOutputDir}/META-INF"/>
+ <copy todir="${maven.build.testOutputDir}/META-INF">
+ <fileset dir="${maven.build.testResourceDir.1}">
+ <include name="NOTICE.txt"/>
+ <include name="LICENSE.txt"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Run all tests -->
+ <!-- ====================================================================== -->
+
+ <target name="test"
+ depends="compile-tests, junit-missing"
+ unless="junit.skipped"
+ description="Run the test cases">
+ <mkdir dir="${maven.test.reports}"/>
+ <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+ <sysproperty key="basedir" value="."/>
+ <formatter type="xml"/>
+ <formatter type="plain" usefile="false"/>
+ <classpath>
+ <path refid="build.test.classpath"/>
+ <pathelement location="${maven.build.outputDir}"/>
+ <pathelement location="${maven.build.testOutputDir}"/>
+ </classpath>
+ <batchtest todir="${maven.test.reports}" unless="test">
+ <fileset dir="${maven.build.testDir.0}">
+ <include name="**/Test*.java"/>
+ <include name="**/*Test.java"/>
+ <include name="**/*TestCase.java"/>
+ <exclude name="**/*Abstract*Test.java"/>
+ <exclude name="**/TestRunner.java"/>
+ </fileset>
+ </batchtest>
+ <batchtest todir="${maven.test.reports}" if="test">
+ <fileset dir="${maven.build.testDir.0}">
+ <include name="**/${test}.java"/>
+ <exclude name="**/*Abstract*Test.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="test-junit-present">
+ <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+ </target>
+
+ <target name="test-junit-status"
+ depends="test-junit-present">
+ <condition property="junit.missing">
+ <and>
+ <isfalse value="${junit.present}"/>
+ <isfalse value="${maven.test.skip}"/>
+ </and>
+ </condition>
+ <condition property="junit.skipped">
+ <or>
+ <isfalse value="${junit.present}"/>
+ <istrue value="${maven.test.skip}"/>
+ </or>
+ </condition>
+ </target>
+
+ <target name="junit-missing"
+ depends="test-junit-status"
+ if="junit.missing">
+ <echo>=================================== WARNING ===================================</echo>
+ <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+ <echo>===============================================================================</echo>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Javadoc target -->
+ <!-- ====================================================================== -->
+
+ <target name="javadoc" description="Generates the Javadoc of the application">
+ <javadoc sourcepath="${maven.build.srcDir.0}"
+ packagenames="*"
+ destdir="${maven.reporting.outputDirectory}/apidocs"
+ access="protected"
+ old="false"
+ verbose="false"
+ encoding="iso-8859-1"
+ version="true"
+ use="true"
+ author="true"
+ splitindex="false"
+ nodeprecated="false"
+ nodeprecatedlist="false"
+ notree="false"
+ noindex="false"
+ nohelp="false"
+ nonavbar="false"
+ serialwarn="false"
+ charset="ISO-8859-1"
+ source="1.6"
+ linksource="true"
+ breakiterator="false">
+ <link href="http://download.oracle.com/javase/6/docs/api/"/>
+ <link href="http://download.oracle.com/javaee/6/api/"/>
+ </javadoc>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Package target -->
+ <!-- ====================================================================== -->
+
+ <target name="package" depends="compile,test" description="Package the application">
+ <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
+ compress="true"
+ index="false"
+ basedir="${maven.build.outputDir}"
+ excludes="**/package.html">
+ <manifest>
+ <attribute name="Main-Class" value="Main"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- A dummy target for the package named after the type it creates -->
+ <!-- ====================================================================== -->
+
+ <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+ <!-- ====================================================================== -->
+ <!-- Download dependencies target -->
+ <!-- ====================================================================== -->
+
+ <target name="test-offline">
+ <condition property="maven.mode.offline">
+ <equals arg1="${maven.settings.offline}" arg2="true"/>
+ </condition>
+ </target>
+
+</project>
diff --git a/dev-java/commons-graph/files/commons-graph-0.8.1_p20040118-gentoo.diff b/dev-java/commons-graph/files/commons-graph-0.8.1_p20040118-gentoo.diff
deleted file mode 100644
index c7ffe45..0000000
--- a/dev-java/commons-graph/files/commons-graph-0.8.1_p20040118-gentoo.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru graph2-0.8.1.cvs20040118/build.xml graph2-0.8.1.cvs20040118-patched/build.xml
---- graph2-0.8.1.cvs20040118/build.xml 2003-02-18 09:45:49.000000000 -0500
-+++ graph2-0.8.1.cvs20040118-patched/build.xml 2005-09-04 22:44:31.000000000 -0400
-@@ -46,7 +47,7 @@
- </classpath>
- </javac>
- </target>
-- <target name="jar" description="o Create the jar" depends="compile,test">
-+ <target name="jar" description="o Create the jar" depends="compile">
- <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
- </jar>
- </target>
-@@ -162,4 +163,4 @@
- <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
- </unjar>
- </target>
--</project>
-\ No newline at end of file
-+</project>
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
deleted file mode 100644
index cefc420..0000000
--- a/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P="${P}-src"
-DESCRIPTION="A Java and XML based scripting and processing engine"
-HOMEPAGE="http://commons.apache.org/jelly/"
-SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="
- dev-java/commons-beanutils:1.7
- dev-java/commons-cli:1
- dev-java/commons-collections:0
- dev-java/commons-discovery:0
- dev-java/commons-jexl:1.0
- dev-java/commons-lang:0
- dev-java/commons-logging:0
- dev-java/dom4j:1
- dev-java/jakarta-jstl:0
- dev-java/jaxen:1.1
- dev-java/junit:0
- java-virtuals/servlet-api:2.5"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.4
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
- # disables dependency fetching, and remove tests as a dependency of jar
- epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dlibdir=."
-EANT_GENTOO_CLASSPATH="
- commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
- commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,jakarta-jstl
- jaxen-1.1,junit,servlet-api-2.5"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar ${PN}.jar
-
- dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
-
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild
deleted file mode 100644
index 0aca101..0000000
--- a/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P="${P}-src"
-DESCRIPTION="A Java and XML based scripting and processing engine"
-HOMEPAGE="http://commons.apache.org/jelly/"
-SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
- dev-java/commons-beanutils:1.7
- dev-java/commons-cli:1
- dev-java/commons-collections:0
- dev-java/commons-discovery:0
- dev-java/commons-jexl:1.0
- dev-java/commons-lang:0
- dev-java/commons-logging:0
- dev-java/dom4j:1
- dev-java/tomcat-jstl-spec:1.2.5
- dev-java/jaxen:1.1
- dev-java/junit:0
- java-virtuals/servlet-api:2.5"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.4
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
- # disables dependency fetching, and remove tests as a dependency of jar
- epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dlibdir=."
-EANT_GENTOO_CLASSPATH="
- commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
- commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec-1.2.5
- jaxen-1.1,junit,servlet-api-2.5"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar ${PN}.jar
-
- dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
-
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild
new file mode 100644
index 0000000..1442a62
--- /dev/null
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${P}-src"
+DESCRIPTION="A Java and XML based scripting and processing engine"
+HOMEPAGE="http://commons.apache.org/jelly/"
+SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+ dev-java/dom4j:1
+ dev-java/junit:0
+ dev-java/jaxen:1.1
+ dev-java/commons-cli:1
+ dev-java/commons-lang:0
+ dev-java/commons-jexl:1.0
+ dev-java/commons-logging:0
+ dev-java/commons-discovery:0
+ dev-java/commons-collections:0
+ dev-java/commons-beanutils:1.7
+ dev-java/tomcat-jstl-spec:1.2.5
+ java-virtuals/servlet-api:3.0"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.6
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+ # disables dependency fetching, and remove tests as a dependency of jar
+ epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dlibdir=."
+EANT_GENTOO_CLASSPATH="
+ commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
+ commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec-1.2.5
+ jaxen-1.1,junit,servlet-api-3.0"
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar target/${P}.jar ${PN}.jar
+ dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
+ use doc && java-pkg_dojavadoc dist/docs/api
+ use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
new file mode 100644
index 0000000..424d1f5
--- /dev/null
+++ b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Expression language engine, can be embedded in applications and frameworks"
+HOMEPAGE="http://commons.apache.org/jexl/"
+SRC_URI="mirror://apache/jakarta/commons/jexl/source/${P}-src.tar.gz"
+
+CDEPEND="dev-java/commons-logging
+ dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ test? ( dev-java/ant-junit )
+ ${CDEPEND}"
+
+LICENSE="Apache-2.0"
+SLOT="1.0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+ # https://issues.apache.org/jira/browse/JEXL-31
+ epatch "${FILESDIR}/${PV}-test-target.patch"
+
+ mkdir -p target/lib && cd target/lib
+ java-pkg_jar-from junit junit.jar
+ java-pkg_jar-from commons-logging
+}
+
+src_test() {
+ ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+ java-pkg_newjar target/${P}*.jar
+ dodoc RELEASE-NOTES.txt || die
+ use doc && java-pkg_dojavadoc dist/docs/api
+ use source && java-pkg_dosrc "${S}"/src/java/*
+}
diff --git a/dev-java/commons-jexl/commons-jexl-1.1.ebuild b/dev-java/commons-jexl/commons-jexl-1.1.ebuild
deleted file mode 100644
index 8f01544..0000000
--- a/dev-java/commons-jexl/commons-jexl-1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Expression language engine, can be embedded in applications and frameworks"
-HOMEPAGE="http://commons.apache.org/jexl/"
-SRC_URI="mirror://apache/jakarta/commons/jexl/source/${P}-src.tar.gz"
-
-CDEPEND="dev-java/commons-logging
- =dev-java/junit-3*"
-
-RDEPEND=">=virtual/jre-1.4
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
- test? ( dev-java/ant-junit )
- ${CDEPEND}"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S="${WORKDIR}/${P}-src"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # https://issues.apache.org/jira/browse/JEXL-31
- epatch "${FILESDIR}/1.1-test-target.patch"
-
- mkdir -p target/lib && cd target/lib
- java-pkg_jar-from junit junit.jar
- java-pkg_jar-from commons-logging
-}
-
-src_test() {
- ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
- java-pkg_newjar target/${P}*.jar
-
- dodoc RELEASE-NOTES.txt || die
-
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc "${S}"/src/java/*
-}
diff --git a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
index b38d155..22b774f 100644
--- a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
+++ b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,23 +14,28 @@
CDEPEND="dev-java/commons-logging:0"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
>=dev-java/javacc-5
test? ( dev-java/ant-junit:0 )
${CDEPEND}"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
S="${WORKDIR}/${P}-src"
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="commons-logging"
+# Dubious tests.
+JAVA_RM_FILES=(
+ src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
+)
+
java_prepare() {
cp "${FILESDIR}"/${PV}-build.xml build.xml || die
@@ -43,15 +48,13 @@
|| die "Parser.java code generation via javacc failed"
}
-src_install() {
- java-pkg_dojar target/${PN}.jar
-
- dodoc RELEASE-NOTES.txt NOTICE.txt
-
- use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
- use source && java-pkg_dosrc "${S}"/src/main/java/*
-}
-
src_test() {
java-pkg-2_src_test
}
+
+src_install() {
+ java-pkg_dojar target/${PN}.jar
+ dodoc RELEASE-NOTES.txt NOTICE.txt
+ use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
+ use source && java-pkg_dosrc "${S}"/src/main/java/*
+}
diff --git a/dev-java/constantine/Manifest b/dev-java/constantine/Manifest
index a49d39b..38ecc18 100644
--- a/dev-java/constantine/Manifest
+++ b/dev-java/constantine/Manifest
@@ -1,2 +1 @@
-DIST constantine-0.6.tar.bz2 35684 SHA256 1d4cf61f15d508de1f5f4058a12529cfbe60f4056f167056f24e515695d39733 SHA512 16063f59a868ca6f629dcf9e42957edaebc9c5db21a6d856040420b943a127c89e7b1979e5ba051b26eabfb67fb70abd0ab6d2f5f6109d0fefbffbe716c0c980 WHIRLPOOL 42a4ac393889eab46ba133e86afd19ad90d3921abbe4c2c6871480d1747429f5bde46ec3d0a08ee3e1ffa885e3c4e40cf06b787b47976b56c7fc46124d62dcf2
DIST constantine-0.7.tar.gz 65563 SHA256 5600c264d3f32a48342e4b00643a8a8a543f15c6107a1c1be024e328a74e59b1 SHA512 2694caae29bae1a3e1d765ac02c4014bc6fd3dac8370feb5d12f43119c057fc2a2e75b0aa37eec0164bf8a82a1bafb0f41565f397b956ae53a52f7cb803508c7 WHIRLPOOL 6a7c3ae5b0423690005656c69897d82244d05ea27056c4dbe4229390b648bce23775b699e8d719f347ea602e76313af5e19d47e932637fd919fb2fa2b64142d6
diff --git a/dev-java/constantine/constantine-0.6.ebuild b/dev-java/constantine/constantine-0.6.ebuild
deleted file mode 100644
index b22a2a7..0000000
--- a/dev-java/constantine/constantine-0.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="source test"
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="Provides Java values for common platform C constants"
-HOMEPAGE="http://kenai.com/projects/constantine"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-
-DEPEND=">=virtual/jdk-1.5
- test? ( dev-java/ant-junit4 )"
-
-src_compile() {
- # ecj doesn't like some cast for some reason
- java-pkg_force-compiler javac
- java-pkg-2_src_compile
-}
-
-src_install() {
- java-pkg_dojar dist/${PN}.jar
- use source && java-pkg_dosrc src/*
-}
-
-src_test() {
- ANT_TASKS="ant-junit4" eant test -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
-}
diff --git a/dev-java/constantine/constantine-0.7-r1.ebuild b/dev-java/constantine/constantine-0.7-r1.ebuild
new file mode 100644
index 0000000..b1e08eb
--- /dev/null
+++ b/dev-java/constantine/constantine-0.7-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Provides Java values for common platform C constants"
+HOMEPAGE="https://github.com/wmeissner/jnr-constants"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND=">=virtual/jdk-1.6
+ test? (
+ dev-java/ant-junit:0
+ )"
+
+src_compile() {
+ # ecj doesn't like some cast for some reason
+ java-pkg_force-compiler javac
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ ANT_TASKS="ant-junit4" eant test -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
+}
+
+src_install() {
+ java-pkg_dojar dist/${PN}.jar
+ use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/constantine/constantine-0.7.ebuild b/dev-java/constantine/constantine-0.7.ebuild
deleted file mode 100644
index 9b5555d..0000000
--- a/dev-java/constantine/constantine-0.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="source test"
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="Provides Java values for common platform C constants"
-HOMEPAGE="https://github.com/wmeissner/jnr-constants"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-
-DEPEND=">=virtual/jdk-1.5
- test? ( dev-java/ant-junit4 )"
-
-src_compile() {
- # ecj doesn't like some cast for some reason
- java-pkg_force-compiler javac
- java-pkg-2_src_compile
-}
-
-src_install() {
- java-pkg_dojar dist/${PN}.jar
- use source && java-pkg_dosrc src/*
-}
-
-src_test() {
- ANT_TASKS="ant-junit4" eant test -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
-}
diff --git a/dev-java/cssparser/Manifest b/dev-java/cssparser/Manifest
index 4af7701..618b261 100644
--- a/dev-java/cssparser/Manifest
+++ b/dev-java/cssparser/Manifest
@@ -1,2 +1 @@
-DIST cssparser-0.9.16-sources.jar 243889 SHA256 e21b075401a7a17fd3316a392631b77c245f8217d9da90e89fd926436098f151 SHA512 dac0f322d21c6f2ae65128ab83a6de9eb93f5c152e9e6f42de3e18b9be23d73083f42af50eeaa415da400c297fad34381ddd0f626b7aafa89c97a8b46a0d61b4 WHIRLPOOL 0c73080c9bf916eddc694de40da8a8b8ae543cf7863179f33649f3a38c95a7304d6ad98a79d78621225767c430ca1409063209b5012870557027554611648562
DIST cssparser-0.9.17-sources.jar 244187 SHA256 5bb68dd6788951487eedeb1ba198a290899e9fe04eab9598ef051e42218aaa88 SHA512 6506483bb11d0d1a306308d8f458057f410b7e26db2f930e433878dfa97d29a3ece42cb27ce8715d908360e5ff7cacaf9d09323510ba036c7599ec67de970414 WHIRLPOOL 46781cb9d1fd939c11d5e2d816c70d3eef0bb7c2c421c9a45ddce5d2433a7e75d9540848743a62b7494ee2cd162ed10e71a9faacabc5bd897107627b011cea9a
diff --git a/dev-java/cssparser/cssparser-0.9.16.ebuild b/dev-java/cssparser/cssparser-0.9.16.ebuild
deleted file mode 100644
index 6a4d934..0000000
--- a/dev-java/cssparser/cssparser-0.9.16.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="API for parsing CSS 2 in Java"
-HOMEPAGE="http://cssparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/sac:0"
-DEPEND=">=virtual/jdk-1.6
- ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/cssparser/cssparser-0.9.17.ebuild b/dev-java/cssparser/cssparser-0.9.17.ebuild
index cda7022..6a4d934 100644
--- a/dev-java/cssparser/cssparser-0.9.17.ebuild
+++ b/dev-java/cssparser/cssparser-0.9.17.ebuild
@@ -10,7 +10,7 @@
SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
CDEPEND="dev-java/sac:0"
DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
index d6477b9..679a036 100644
--- a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
+++ b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
@@ -27,15 +27,10 @@
app-arch/unzip"
S="${WORKDIR}/${P}"
-
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-JAVA_SRC_DIR="src"
-
JAVA_GENTOO_CLASSPATH="commons-collections,commons-logging,servlet-api-2.5"
java_prepare() {
- unzip -d src ${P}-sources.jar || die
- rm -rf src/net/sf/ehcache/hibernate || die
- rm *.jar || die
+ unpack ./${P}-sources.jar
+ rm -vr net/sf/ehcache/hibernate || die
+ java-pkg_clean
}
diff --git a/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch b/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch
new file mode 100644
index 0000000..16d0a05
--- /dev/null
+++ b/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch
@@ -0,0 +1,22 @@
+--- src/org/hibernate/cache/EhCache.java.orig 2015-10-07 14:06:39.968486000 +0000
++++ src/org/hibernate/cache/EhCache.java 2015-10-07 14:06:49.900486000 +0000
+@@ -192,9 +192,9 @@
+ catch (IllegalStateException e) {
+ throw new CacheException(e);
+ }
+- catch (IOException e) {
+- throw new CacheException(e);
+- }
++ // catch (IOException e) {
++ // throw new CacheException(e);
++ // }
+ }
+
+ /**
+@@ -289,4 +289,4 @@
+ return "EHCache(" + getRegionName() + ')';
+ }
+
+-}
+\ No newline at end of file
++}
diff --git a/dev-java/hibernate/hibernate-3.1.3-r4.ebuild b/dev-java/hibernate/hibernate-3.1.3-r4.ebuild
deleted file mode 100644
index a1cb1e1..0000000
--- a/dev-java/hibernate/hibernate-3.1.3-r4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-WANT_ANT_TASKS="ant-antlr ant-swing ant-junit"
-JAVA_PKG_IUSE="doc source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV="3.1"
-DESCRIPTION="A powerful, ultra-high performance object / relational persistence and query service for Java"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.hibernate.org"
-LICENSE="LGPL-2"
-IUSE=""
-SLOT="3.1"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
- >=dev-java/antlr-2.7.7:0[java]
- dev-java/c3p0:0
- dev-java/cglib:3
- dev-java/commons-collections:0
- dev-java/commons-logging:0
- dev-java/dom4j:1
- dev-java/ehcache:0
- dev-java/oscache:0
- dev-java/proxool:0
- dev-java/swarmcache:1.0
- java-virtuals/transaction-api:0
- dev-java/sun-jacc-api:0
- dev-java/ant-core:0
- dev-java/asm:2.2"
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.6
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# Avoid this to happen.
-# [javac] /var/tmp/portage/dev-java/hibernate-3.1.3-r4/work/hibernate-3.1/src/org/hibernate/dialect/MimerSQLDialect.java:13: error: unmappable character for encoding UTF8
-# [javac] * @author Fredrik �lund <fredrik.alund@mimer.se>
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-java_prepare() {
- java-ant_rewrite-bootclasspath 1.5
-
- # this depends on jboss
- rm src/org/hibernate/cache/JndiBoundTreeCacheProvider.java \
- src/org/hibernate/cache/TreeCache.java \
- src/org/hibernate/cache/TreeCacheProvider.java
-
- rm -v *.jar lib/*.jar || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-c3p0,commons-collections,commons-logging,cglib-3,transaction-api
-dom4j-1,ehcache,oscache,proxool,swarmcache-1.0
-sun-jacc-api,antlr,ant-core,asm-2.2
-"
-EANT_EXTRA_ARGS="-Dnosplash -Ddist.dir=dist"
-
-src_install() {
- java-pkg_dojar hibernate3.jar
- dodoc changelog.txt readme.txt
- use doc && java-pkg_dohtml -r doc/api doc/other doc/reference
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/hibernate/hibernate-3.1.3-r5.ebuild b/dev-java/hibernate/hibernate-3.1.3-r5.ebuild
new file mode 100644
index 0000000..151b353
--- /dev/null
+++ b/dev-java/hibernate/hibernate-3.1.3-r5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+WANT_ANT_TASKS="ant-antlr ant-swing ant-junit"
+JAVA_PKG_IUSE="doc source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV="3.1"
+DESCRIPTION="A powerful, ultra-high performance object / relational persistence and query service for Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.hibernate.org"
+LICENSE="LGPL-2"
+IUSE=""
+SLOT="3.1"
+KEYWORDS="amd64 x86"
+
+CDEPENDEND="
+ >=dev-java/antlr-2.7.7:0[java]
+ dev-java/c3p0:0
+ dev-java/cglib:3
+ dev-java/commons-collections:0
+ dev-java/commons-logging:0
+ dev-java/dom4j:1
+ dev-java/ehcache:1.2
+ dev-java/oscache:0
+ dev-java/proxool:0
+ dev-java/swarmcache:1.0
+ java-virtuals/transaction-api:0
+ dev-java/sun-jacc-api:0
+ dev-java/ant-core:0
+ dev-java/asm:2.2"
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPENDEND}"
+DEPEND=">=virtual/jdk-1.6
+ ${CDEPENDEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+PATCHES=(
+ "${FILESDIR}"/"${P}-EhCache.java.patch"
+)
+
+java_prepare() {
+ epatch "${PATCHES[@]}"
+
+ java-ant_rewrite-bootclasspath 1.5
+
+ # this depends on jboss
+ rm src/org/hibernate/cache/JndiBoundTreeCacheProvider.java \
+ src/org/hibernate/cache/TreeCache.java \
+ src/org/hibernate/cache/TreeCacheProvider.java
+
+ rm -v *.jar lib/*.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+c3p0,commons-collections,commons-logging,cglib-3,transaction-api
+dom4j-1,ehcache-1.2,oscache,proxool,swarmcache-1.0
+sun-jacc-api,antlr,ant-core,asm-2.2
+"
+EANT_EXTRA_ARGS="-Dnosplash -Ddist.dir=dist"
+
+src_install() {
+ java-pkg_dojar hibernate3.jar
+ dodoc changelog.txt readme.txt
+ use doc && java-pkg_dohtml -r doc/api doc/other doc/reference
+ use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/icedtea/files/TryXShmAttach.patch b/dev-java/icedtea/files/TryXShmAttach.patch
new file mode 100644
index 0000000..4157bb6
--- /dev/null
+++ b/dev-java/icedtea/files/TryXShmAttach.patch
@@ -0,0 +1,201 @@
+
+# HG changeset patch
+# User andrew
+# Date 1438275152 -3600
+# Node ID a2334007f1a8504d2bd4a2c2a037732c289649c3
+# Parent ab23850139cb2c666e613010842a1f984b184a3a
+PR2568: openjdk causes a full desktop crash on RHEL 6 i586
+Summary: Re-apply "8025775: JNI warnings in TryXShmAttach"; some changes lost in bad merge changeset 4b26f93b23ba
+
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XConstants.java
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Thu Jul 30 17:52:32 2015 +0100
+@@ -699,9 +699,4 @@
+ public static final long XkbModifierMapMask = (1L<<2);
+ public static final long XkbVirtualModsMask = (1L<<6); //server map
+
+- /*****************************************************************
+- * X SHARED MEMORY EXTENSION FUNCTIONS
+- *****************************************************************/
+-
+- public static final int X_ShmAttach = 1;
+ }
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XErrorHandler.java
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Thu Jul 30 17:52:32 2015 +0100
+@@ -41,29 +41,6 @@
+ return XErrorHandlerUtil.SAVED_XERROR_HANDLER(display, err);
+ }
+ }
+-
+- /**
+- * This is a base synthetic error handler containing a boolean flag which allows
+- * to show that an error is handled or not.
+- */
+- public static class XErrorHandlerWithFlag extends XBaseErrorHandler {
+- private volatile boolean errorOccurred = false;
+-
+- public boolean getErrorOccurredFlag() {
+- return errorOccurred;
+- }
+-
+- /**
+- * Sets an internal boolean flag to a particular value. Should be always called
+- * with {@code false} value of the parameter {@code errorOccurred} before this
+- * error handler is set as current.
+- * @param errorOccurred {@code true} to indicate that an error was handled,
+- * {@code false} to reset the internal boolean flag
+- */
+- public void setErrorOccurredFlag(boolean errorOccurred) {
+- this.errorOccurred = errorOccurred;
+- }
+- }
+
+ /*
+ * Instead of validating window id, we simply call XGetWindowProperty,
+@@ -99,75 +76,4 @@
+ return theInstance;
+ }
+ }
+-
+- /**
+- * This is a synthetic error handler for errors generated by the native function
+- * {@code XShmAttach}. If an error is handled, an internal boolean flag of the
+- * handler is set to {@code true}.
+- */
+- public static final class XShmAttachHandler extends XErrorHandlerWithFlag {
+- private XShmAttachHandler() {}
+-
+- @Override
+- public int handleError(long display, XErrorEvent err) {
+- if (err.get_minor_code() == XConstants.X_ShmAttach) {
+- setErrorOccurredFlag(true);
+- return 0;
+- }
+- return super.handleError(display, err);
+- }
+-
+- // Shared instance
+- private static XShmAttachHandler theInstance = new XShmAttachHandler();
+- public static XShmAttachHandler getInstance() {
+- return theInstance;
+- }
+- }
+-
+- /**
+- * This is a synthetic error handler for {@code BadAlloc} errors generated by the
+- * native {@code glX*} functions. Its internal boolean flag is set to {@code true},
+- * if an error is handled.
+- */
+- public static final class GLXBadAllocHandler extends XErrorHandlerWithFlag {
+- private GLXBadAllocHandler() {}
+-
+- @Override
+- public int handleError(long display, XErrorEvent err) {
+- if (err.get_error_code() == XConstants.BadAlloc) {
+- setErrorOccurredFlag(true);
+- return 0;
+- }
+- return super.handleError(display, err);
+- }
+-
+- private static GLXBadAllocHandler theInstance = new GLXBadAllocHandler();
+- public static GLXBadAllocHandler getInstance() {
+- return theInstance;
+- }
+- }
+-
+- /**
+- * This is a synthetic error handler for errors generated by the native function
+- * {@code XChangeWindowAttributes}. If an error is handled, an internal boolean
+- * flag of the handler is set to {@code true}.
+- */
+- public static final class XChangeWindowAttributesHandler extends XErrorHandlerWithFlag {
+- private XChangeWindowAttributesHandler() {}
+-
+- @Override
+- public int handleError(long display, XErrorEvent err) {
+- if ((err.get_request_code() == XProtocolConstants.X_ChangeWindowAttributes) &&
+- (err.get_error_code() == XConstants.BadAccess)) {
+- setErrorOccurredFlag(true);
+- return 0;
+- }
+- return super.handleError(display, err);
+- }
+-
+- private static XChangeWindowAttributesHandler theInstance = new XChangeWindowAttributesHandler();
+- public static XChangeWindowAttributesHandler getInstance() {
+- return theInstance;
+- }
+- }
+ }
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_GraphicsEnv.h
+--- openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Thu Jul 30 17:52:32 2015 +0100
+@@ -54,7 +54,7 @@
+
+ void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps);
+ void resetXShmAttachFailed();
+-jboolean TryXShmAttach(JNIEnv *env, Display *display, XShmSegmentInfo *shminfo);
++jboolean isXShmAttachFailed();
+
+ #endif /* MITSHM */
+
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_xembed_server.c
+--- openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c Thu Jul 30 17:52:32 2015 +0100
+@@ -644,19 +644,12 @@
+ return dim;
+ }
+
+-Boolean isMapped(JNIEnv* env, Window w) {
++Boolean isMapped(Window w) {
+ XWindowAttributes attr;
+ Status status = 0;
+- jboolean errorOccurredFlag;
+- jobject errorHandlerRef;
+- jobject savedError;
+- unsigned char xerror_code;
+-
+- EXEC_WITH_XERROR_HANDLER(env, "sun/awt/X11/XErrorHandler$IgnoreBadWindowHandler",
+- "()Lsun/awt/X11/XErrorHandler$IgnoreBadWindowHandler;", JNI_FALSE,
+- errorHandlerRef, errorOccurredFlag,
+- status = XGetWindowAttributes(awt_display, w, &attr));
+- xerror_code = GET_XERROR_CODE(env, savedError);
++ WITH_XERROR_HANDLER(xerror_ignore_bad_window);
++ status = XGetWindowAttributes(awt_display, w, &attr);
++ RESTORE_XERROR_HANDLER;
+ if (status == 0 || xerror_code != Success) {
+ return False;
+ }
+@@ -692,7 +685,7 @@
+ sdata->version = *data;
+ flags = *(data+1);
+ new_mapped = (flags & XEMBED_MAPPED) != 0;
+- currently_mapped = isMapped(env, sdata->handle);
++ currently_mapped = isMapped(sdata->handle);
+ if (new_mapped != currently_mapped) {
+ if (new_mapped) {
+ XMapWindow(awt_display, sdata->handle);
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+--- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Thu Jul 30 17:52:32 2015 +0100
+@@ -551,8 +551,6 @@
+ {
+ XImage *img = NULL;
+ XShmSegmentInfo *shminfo;
+- JNIEnv* env;
+- jboolean xShmAttachResult;
+
+ shminfo = malloc(sizeof(XShmSegmentInfo));
+ if (shminfo == NULL) {
+@@ -603,7 +601,7 @@
+ */
+ shmctl(shminfo->shmid, IPC_RMID, 0);
+
+- if (xShmAttachResult == JNI_FALSE) {
++ if (isXShmAttachFailed() == JNI_TRUE) {
+ J2dRlsTraceLn1(J2D_TRACE_ERROR,
+ "X11SD_SetupSharedSegment XShmAttach has failed: %s",
+ strerror(errno));
+
diff --git a/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild
new file mode 100644
index 0000000..9645c54
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild
@@ -0,0 +1,416 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="5"
+SLOT="7"
+
+inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+
+ICEDTEA_VER=$(get_version_component_range 2-4)
+ICEDTEA_BRANCH=$(get_version_component_range 2-3)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+CORBA_TARBALL="2545636482d6.tar.bz2"
+JAXP_TARBALL="ffbe529eeac7.tar.bz2"
+JAXWS_TARBALL="b9776fab65b8.tar.bz2"
+JDK_TARBALL="61d3e001dee6.tar.bz2"
+LANGTOOLS_TARBALL="9c6e1de67d7d.tar.bz2"
+OPENJDK_TARBALL="39b2c4354d0a.tar.bz2"
+HOTSPOT_TARBALL="b19bc5aeaa09.tar.bz2"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="http://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+ http://icedtea.classpath.org/download/source/${SRC_PKG}
+ ${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
+ ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+ ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT="test"
+
+IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality
+ jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
+ pulseaudio sctp selinux smartcard source +sunec test zero +webstart"
+
+REQUIRED_USE="gtk? ( awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+ >=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+ >=net-print/cups-1.2.12"
+X_COMMON_DEP="
+ >=media-libs/giflib-4.1.6:=
+ >=media-libs/libpng-1.2:0=
+ >=x11-libs/libX11-1.1.3
+ >=x11-libs/libXext-1.1.1
+ >=x11-libs/libXi-1.1.3
+ >=x11-libs/libXrender-0.9.4
+ >=x11-libs/libXtst-1.0.3
+ x11-libs/libXt"
+X_DEPEND="
+ >=x11-libs/libXau-1.0.3
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXinerama-1.0.2
+ x11-proto/inputproto
+ >=x11-proto/xextproto-7.1.1
+ x11-proto/xineramaproto
+ x11-proto/xproto"
+
+COMMON_DEP="
+ >=dev-libs/glib-2.26:2
+ >=dev-util/systemtap-1
+ media-libs/fontconfig
+ >=media-libs/freetype-2.5.3:2=[infinality?]
+ >=media-libs/lcms-2.5
+ >=sys-libs/zlib-1.2.3:=
+ virtual/jpeg:0=
+ gtk? (
+ >=dev-libs/atk-1.30.0
+ >=x11-libs/cairo-1.8.8:=
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.8:2=
+ >=x11-libs/pango-1.24.5
+ )
+ javascript? ( dev-java/rhino:1.6 )
+ kerberos? ( virtual/krb5 )
+ nss? ( >=dev-libs/nss-3.12.5-r1 )
+ sctp? ( net-misc/lksctp-tools )
+ smartcard? ( sys-apps/pcsc-lite )
+ sunec? ( >=dev-libs/nss-3.16.1-r1 )"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND="${COMMON_DEP}
+ !dev-java/icedtea:0
+ !dev-java/icedtea-web:7
+ >=gnome-base/gsettings-desktop-schemas-3.12.2
+ media-fonts/dejavu
+ alsa? ( ${ALSA_COMMON_DEP} )
+ awt? ( ${X_COMMON_DEP} )
+ cjk? (
+ media-fonts/arphicfonts
+ media-fonts/baekmuk-fonts
+ media-fonts/lklug
+ media-fonts/lohit-fonts
+ media-fonts/sazanami
+ )
+ cups? ( ${CUPS_COMMON_DEP} )
+ selinux? ( sec-policy/selinux-java )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+ || (
+ >=dev-java/gcj-jdk-4.3
+ dev-java/icedtea-bin:7
+ dev-java/icedtea-bin:6
+ dev-java/icedtea:7
+ dev-java/icedtea:6
+ )
+ app-arch/cpio
+ app-arch/unzip
+ app-arch/zip
+ app-misc/ca-certificates
+ >=dev-java/ant-core-1.8.2
+ dev-lang/perl
+ >=dev-libs/libxslt-1.1.26
+ dev-libs/openssl
+ sys-apps/attr
+ sys-apps/lsb-release
+ virtual/pkgconfig
+ pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+ nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+ pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+ local CHECKREQS_DISK_BUILD
+
+ if use doc; then
+ CHECKREQS_DISK_BUILD="9000M"
+ else
+ CHECKREQS_DISK_BUILD="8500M"
+ fi
+
+ check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ icedtea_check_requirements
+}
+
+pkg_setup() {
+ icedtea_check_requirements
+
+ JAVA_PKG_WANT_BUILD_VM="
+ icedtea-7 icedtea-bin-7
+ icedtea-6 icedtea-bin-6
+ gcj-jdk"
+ JAVA_PKG_WANT_SOURCE="1.5"
+ JAVA_PKG_WANT_TARGET="1.5"
+
+ java-vm-2_pkg_setup
+ java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+ unpack ${SRC_PKG}
+}
+
+java_prepare() {
+ if ! use cups; then
+ # CUPS is always needed at build time but you can at least make it dlopen.
+ sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
+ fi
+
+ # For bootstrap builds as the sandbox control file might not yet exist.
+ addpredict /proc/self/coredump_filter
+
+ # icedtea doesn't like some locales. #330433 #389717
+ export LANG="C" LC_ALL="C"
+}
+
+src_configure() {
+ local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
+ local vm=$(java-pkg_get-current-vm)
+
+ # gcj-jdk ensures ecj is present.
+ if use jbootstrap || has "${vm}" gcj-jdk; then
+ use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+ config+=" --enable-bootstrap"
+ else
+ config+=" --disable-bootstrap"
+ fi
+
+ # Use Zero if requested
+ if use zero; then
+ use_zero="yes"
+ fi
+
+ # Use JamVM if requested
+ if use jamvm; then
+ use_jamvm="yes"
+ fi
+
+ # Use CACAO if requested
+ if use cacao; then
+ use_cacao="yes"
+ fi
+
+ # Are we on a architecture with a HotSpot port?
+ # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+ if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+ hotspot_port="yes"
+ fi
+
+ # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+ # Otherwise use CACAO on ppc and Zero on anything else
+ if test "x${hotspot_port}" != "xyes"; then
+ if use ppc; then
+ use_cacao="yes"
+ else
+ use_zero="yes"
+ fi
+ fi
+
+ # Turn on JamVM if needed (non-HS archs) or requested
+ if test "x${use_jamvm}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-jamvm"'
+ fi
+ jamvm_config="--enable-jamvm"
+ fi
+
+ # Turn on CACAO if needed (non-HS archs) or requested
+ if test "x${use_cacao}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-cacao"'
+ fi
+ cacao_config="--enable-cacao"
+ fi
+
+ # Turn on Zero if needed (non-HS/CACAO archs) or requested
+ if test "x${use_zero}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+ fi
+ zero_config="--enable-zero"
+ fi
+
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+ if use javascript ; then
+ config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+ else
+ config+=" --without-rhino"
+ fi
+
+ unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=561500
+ ln -s "${FILESDIR}/TryXShmAttach.patch" || die
+ export DISTRIBUTION_PATCHES="TryXShmAttach.patch"
+
+ econf ${config} \
+ --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+ --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+ --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+ --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+ --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+ --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
+ --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+ --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+ --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+ --with-jdk-home="$(java-config -O)" \
+ --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+ --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --with-pkgversion="Gentoo ${PF}" \
+ --disable-downloading --disable-Werror \
+ --disable-hotspot-tests --disable-jdk-tests \
+ --enable-system-lcms --enable-system-jpeg \
+ --enable-system-zlib \
+ $(use_enable awt system-gif) \
+ $(use_enable awt system-png) \
+ $(use_enable !debug optimizations) \
+ $(use_enable doc docs) \
+ $(use_enable gtk system-gtk) \
+ $(use_enable infinality) \
+ $(use_enable kerberos system-kerberos) \
+ $(use_enable nss) \
+ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+ $(use_enable sctp system-sctp) \
+ $(use_enable smartcard system-pcsc) \
+ $(use_enable sunec) \
+ ${zero_config} ${cacao_config} ${jamvm_config}
+}
+
+src_compile() {
+ # Would use GENTOO_VM otherwise.
+ export ANT_RESPECT_JAVA_HOME=TRUE
+
+ # With ant >=1.8.2 all required tasks are part of ant-core
+ export ANT_TASKS="none"
+
+ emake
+}
+
+src_test() {
+ # Use Xvfb for tests
+ unset DISPLAY
+
+ Xemake check
+}
+
+src_install() {
+ default
+
+ local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+ local ddest="${ED}${dest#/}"
+
+ if ! use alsa; then
+ rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+ fi
+
+ if ! use awt; then
+ rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
+ "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
+ fi
+
+ if ! use examples; then
+ rm -r "${ddest}"/demo "${ddest}"/sample || die
+ fi
+
+ if ! use source; then
+ rm -v "${ddest}"/src.zip || die
+ fi
+
+ # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
+ if use webstart || use nsplugin; then
+ dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
+ dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
+ fi
+ if use webstart; then
+ dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
+ dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
+ fi
+
+ # Fix the permissions.
+ find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+ # We need to generate keystore - bug #273306
+ einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+ mkdir "${T}/certgen" && cd "${T}/certgen" || die
+ cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+ for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+ openssl x509 -text -in "${c}" >> all.crt || die
+ done
+ ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+ cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+ chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+ # OpenJDK7 should be able to use fontconfig instead, but wont hurt to
+ # install it anyway. Bug 390663
+ cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+ eprefixify "${T}"/fontconfig.Gentoo.properties
+ insinto "${dest}"/jre/lib
+ doins "${T}"/fontconfig.Gentoo.properties
+
+ set_java_env "${FILESDIR}/icedtea.env"
+ java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+ if has_version "<=dev-java/icedtea-7.2.0:7"; then
+ # portage would preserve the symlink otherwise, related to bug #384397
+ rm -f "${EROOT}/usr/lib/jvm/icedtea7"
+ elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
+ elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
+ elog "If you had icedtea7 as system VM, the change should be automatic, however"
+ elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+ elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+ fi
+
+ gnome2_icon_savelist;
+}
+
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-java/icedtea/icedtea-7.2.6.1.ebuild b/dev-java/icedtea/icedtea-7.2.6.1.ebuild
deleted file mode 100644
index 2027cea..0000000
--- a/dev-java/icedtea/icedtea-7.2.6.1.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-SLOT="7"
-
-inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-4)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="2545636482d6.tar.bz2"
-JAXP_TARBALL="ffbe529eeac7.tar.bz2"
-JAXWS_TARBALL="b9776fab65b8.tar.bz2"
-JDK_TARBALL="61d3e001dee6.tar.bz2"
-LANGTOOLS_TARBALL="9c6e1de67d7d.tar.bz2"
-OPENJDK_TARBALL="39b2c4354d0a.tar.bz2"
-HOTSPOT_TARBALL="b19bc5aeaa09.tar.bz2"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="http://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
- http://icedtea.classpath.org/download/source/${SRC_PKG}
- ${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL}
- ${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
- ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL}
- ${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
- ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
- ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~x86"
-RESTRICT="test"
-
-IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality
- jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
- pulseaudio sctp selinux smartcard source +sunec test zero +webstart"
-
-REQUIRED_USE="gtk? ( awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
- >=net-print/cups-1.2.12"
-X_COMMON_DEP="
- >=media-libs/giflib-4.1.6:=
- >=media-libs/libpng-1.2:0=
- >=x11-libs/libX11-1.1.3
- >=x11-libs/libXext-1.1.1
- >=x11-libs/libXi-1.1.3
- >=x11-libs/libXrender-0.9.4
- >=x11-libs/libXtst-1.0.3
- x11-libs/libXt"
-X_DEPEND="
- >=x11-libs/libXau-1.0.3
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXinerama-1.0.2
- x11-proto/inputproto
- >=x11-proto/xextproto-7.1.1
- x11-proto/xineramaproto
- x11-proto/xproto"
-
-COMMON_DEP="
- >=dev-libs/glib-2.26:2
- >=dev-util/systemtap-1
- media-libs/fontconfig
- >=media-libs/freetype-2.5.3:2=[infinality?]
- >=media-libs/lcms-2.5
- >=sys-libs/zlib-1.2.3:=
- virtual/jpeg:0=
- gtk? (
- >=dev-libs/atk-1.30.0
- >=x11-libs/cairo-1.8.8:=
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.8:2=
- >=x11-libs/pango-1.24.5
- )
- javascript? ( dev-java/rhino:1.6 )
- kerberos? ( virtual/krb5 )
- nss? ( >=dev-libs/nss-3.12.5-r1 )
- sctp? ( net-misc/lksctp-tools )
- smartcard? ( sys-apps/pcsc-lite )
- sunec? ( >=dev-libs/nss-3.16.1-r1 )"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND="${COMMON_DEP}
- !dev-java/icedtea:0
- !dev-java/icedtea-web:7
- >=gnome-base/gsettings-desktop-schemas-3.12.2
- media-fonts/dejavu
- alsa? ( ${ALSA_COMMON_DEP} )
- awt? ( ${X_COMMON_DEP} )
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- cups? ( ${CUPS_COMMON_DEP} )
- selinux? ( sec-policy/selinux-java )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
- || (
- >=dev-java/gcj-jdk-4.3
- dev-java/icedtea-bin:7
- dev-java/icedtea-bin:6
- dev-java/icedtea:7
- dev-java/icedtea:6
- )
- app-arch/cpio
- app-arch/unzip
- app-arch/zip
- app-misc/ca-certificates
- >=dev-java/ant-core-1.8.2
- dev-lang/perl
- >=dev-libs/libxslt-1.1.26
- dev-libs/openssl
- sys-apps/attr
- sys-apps/lsb-release
- virtual/pkgconfig
- pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
- nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
- local CHECKREQS_DISK_BUILD
-
- if use doc; then
- CHECKREQS_DISK_BUILD="9000M"
- else
- CHECKREQS_DISK_BUILD="8500M"
- fi
-
- check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- icedtea_check_requirements
-}
-
-pkg_setup() {
- icedtea_check_requirements
-
- JAVA_PKG_WANT_BUILD_VM="
- icedtea-7 icedtea-bin-7
- icedtea-6 icedtea-bin-6
- gcj-jdk"
- JAVA_PKG_WANT_SOURCE="1.5"
- JAVA_PKG_WANT_TARGET="1.5"
-
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${SRC_PKG}
-}
-
-java_prepare() {
- if ! use cups; then
- # CUPS is always needed at build time but you can at least make it dlopen.
- sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
- fi
-
- # For bootstrap builds as the sandbox control file might not yet exist.
- addpredict /proc/self/coredump_filter
-
- # icedtea doesn't like some locales. #330433 #389717
- export LANG="C" LC_ALL="C"
-}
-
-src_configure() {
- local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
- local vm=$(java-pkg_get-current-vm)
-
- # gcj-jdk ensures ecj is present.
- if use jbootstrap || has "${vm}" gcj-jdk; then
- use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
- config+=" --enable-bootstrap"
- else
- config+=" --disable-bootstrap"
- fi
-
- # Use Zero if requested
- if use zero; then
- use_zero="yes"
- fi
-
- # Use JamVM if requested
- if use jamvm; then
- use_jamvm="yes"
- fi
-
- # Use CACAO if requested
- if use cacao; then
- use_cacao="yes"
- fi
-
- # Are we on a architecture with a HotSpot port?
- # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
- if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
- hotspot_port="yes"
- fi
-
- # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
- # Otherwise use CACAO on ppc and Zero on anything else
- if test "x${hotspot_port}" != "xyes"; then
- if use ppc; then
- use_cacao="yes"
- else
- use_zero="yes"
- fi
- fi
-
- # Turn on JamVM if needed (non-HS archs) or requested
- if test "x${use_jamvm}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-jamvm"'
- fi
- jamvm_config="--enable-jamvm"
- fi
-
- # Turn on CACAO if needed (non-HS archs) or requested
- if test "x${use_cacao}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-cacao"'
- fi
- cacao_config="--enable-cacao"
- fi
-
- # Turn on Zero if needed (non-HS/CACAO archs) or requested
- if test "x${use_zero}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
- fi
- zero_config="--enable-zero"
- fi
-
- config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
- if use javascript ; then
- config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
- else
- config+=" --without-rhino"
- fi
-
- unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
- econf ${config} \
- --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
- --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
- --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
- --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
- --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
- --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
- --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
- --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
- --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
- --with-jdk-home="$(java-config -O)" \
- --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
- --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --with-pkgversion="Gentoo ${PF}" \
- --disable-downloading --disable-Werror \
- --disable-hotspot-tests --disable-jdk-tests \
- --enable-system-lcms --enable-system-jpeg \
- --enable-system-zlib \
- $(use_enable awt system-gif) \
- $(use_enable awt system-png) \
- $(use_enable !debug optimizations) \
- $(use_enable doc docs) \
- $(use_enable gtk system-gtk) \
- $(use_enable infinality) \
- $(use_enable kerberos system-kerberos) \
- $(use_enable nss) \
- $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
- $(use_enable sctp system-sctp) \
- $(use_enable smartcard system-pcsc) \
- $(use_enable sunec) \
- ${zero_config} ${cacao_config} ${jamvm_config}
-}
-
-src_compile() {
- # Would use GENTOO_VM otherwise.
- export ANT_RESPECT_JAVA_HOME=TRUE
-
- # With ant >=1.8.2 all required tasks are part of ant-core
- export ANT_TASKS="none"
-
- emake
-}
-
-src_test() {
- # Use Xvfb for tests
- unset DISPLAY
-
- Xemake check
-}
-
-src_install() {
- default
-
- local dest="/usr/$(get_libdir)/icedtea${SLOT}"
- local ddest="${ED}${dest#/}"
-
- if ! use alsa; then
- rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- if ! use awt; then
- rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
- "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
- fi
-
- if ! use examples; then
- rm -r "${ddest}"/demo "${ddest}"/sample || die
- fi
-
- if ! use source; then
- rm -v "${ddest}"/src.zip || die
- fi
-
- # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
- if use webstart || use nsplugin; then
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
- fi
- if use webstart; then
- dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
- dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
- fi
-
- # Fix the permissions.
- find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
- # We need to generate keystore - bug #273306
- einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
- mkdir "${T}/certgen" && cd "${T}/certgen" || die
- cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
- for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
- openssl x509 -text -in "${c}" >> all.crt || die
- done
- ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
- cp -vRP cacerts "${ddest}/jre/lib/security/" || die
- chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
- # OpenJDK7 should be able to use fontconfig instead, but wont hurt to
- # install it anyway. Bug 390663
- cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
- eprefixify "${T}"/fontconfig.Gentoo.properties
- insinto "${dest}"/jre/lib
- doins "${T}"/fontconfig.Gentoo.properties
-
- set_java_env "${FILESDIR}/icedtea.env"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
- if has_version "<=dev-java/icedtea-7.2.0:7"; then
- # portage would preserve the symlink otherwise, related to bug #384397
- rm -f "${EROOT}/usr/lib/jvm/icedtea7"
- elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
- elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
- elog "If you had icedtea7 as system VM, the change should be automatic, however"
- elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
- elog "and the same holds for any user VM settings. Sorry for the inconvenience."
- fi
-
- gnome2_icon_savelist;
-}
-
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-java/invokebinder/Manifest b/dev-java/invokebinder/Manifest
index a1dfa6b..966c75c 100644
--- a/dev-java/invokebinder/Manifest
+++ b/dev-java/invokebinder/Manifest
@@ -1 +1,2 @@
DIST invokebinder-1.2.tar.gz 28581 SHA256 378ab47e625729974b25c81a60abd425abf155a27f60c7c2728ad3a78fd9a1d4 SHA512 aaf56fa008307d56805c6de7d47285d358f4c5018f1704a8f3b44c5bda5045dc20f588e70ce6fbb3486a48f80d30a7669d568e373717401780b13dd4737a8b16 WHIRLPOOL 1c46acfcb2d6c2c53bb24e94aca5afdc578fb6a72c7b3f83e80c22e69cb98e44257c10ba92bfa86c4ec766fea6216cb0604d9be5b2bb755efcae0fa5b0bc8859
+DIST invokebinder-1.6.tar.gz 36027 SHA256 db59600de448c9253976c0a288ad6575edbdc83ed6a6d58332b902ab9d337c4d SHA512 cacdd6dd5fe74bbba940be1b3d53b183adc247b74e89cc0784805b2ad2c63d12ca1abe20bacf0a90ea50db7574e43d4ac52b5a46e61912e5153e2ac2f6bc559a WHIRLPOOL 967f8bb39b588d381e3495756e79b7e738f631935aadddf5c6396d7367fcd19584f4d4ae3cb9734aafac17ca62906da8fc0459a9194f9f55671d5503b19265de
diff --git a/dev-java/invokebinder/files/invokebinder-1.6-build.xml b/dev-java/invokebinder/files/invokebinder-1.6-build.xml
new file mode 100644
index 0000000..55c846c
--- /dev/null
+++ b/dev-java/invokebinder/files/invokebinder-1.6-build.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!-- -->
+<!-- Any modifications will be overwritten. -->
+<!-- -->
+<!-- Generated by Maven Ant Plugin on 10/12/15 9:24 PM -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<project name="invokebinder-from-maven" default="package" basedir=".">
+
+ <!-- ====================================================================== -->
+ <!-- Build environment properties -->
+ <!-- ====================================================================== -->
+
+ <property file="${user.home}/.m2/maven.properties"/>
+ <property file="maven-build.properties"/>
+
+ <property name="maven.build.finalName" value="invokebinder-1.6"/>
+ <property name="maven.build.dir" value="target"/>
+ <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+ <property name="maven.build.srcDir.0" value="src/main/java"/>
+ <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+ <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+ <property name="maven.build.testDir.0" value="src/test/java"/>
+ <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+ <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+ <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+ <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+ <property name="maven.settings.offline" value="false"/>
+ <property name="maven.settings.interactiveMode" value="true"/>
+
+ <!-- ====================================================================== -->
+ <!-- Defining classpaths -->
+ <!-- ====================================================================== -->
+
+ <path id="build.classpath"/>
+ <path id="build.test.classpath">
+ <pathelement location="${maven.repo.local}/junit/junit/4.9/junit-4.9.jar"/>
+ <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ </path>
+
+ <!-- ====================================================================== -->
+ <!-- Cleaning up target -->
+ <!-- ====================================================================== -->
+
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${maven.build.dir}"/>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Compilation target -->
+ <!-- ====================================================================== -->
+
+ <target name="compile" description="Compile the code">
+ <mkdir dir="${maven.build.outputDir}"/>
+ <javac destdir="${maven.build.outputDir}"
+ encoding="UTF-8"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ target="1.7"
+ verbose="false"
+ fork="false"
+ source="1.7">
+ <src>
+ <pathelement location="${maven.build.srcDir.0}"/>
+ </src>
+ <classpath refid="build.classpath"/>
+ </javac>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Test-compilation target -->
+ <!-- ====================================================================== -->
+
+ <target name="compile-tests"
+ depends="compile"
+ description="Compile the test code"
+ unless="maven.test.skip">
+ <mkdir dir="${maven.build.testOutputDir}"/>
+ <javac destdir="${maven.build.testOutputDir}"
+ encoding="UTF-8"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ target="1.7"
+ verbose="false"
+ fork="false"
+ source="1.7">
+ <src>
+ <pathelement location="${maven.build.testDir.0}"/>
+ </src>
+ <classpath>
+ <path refid="build.test.classpath"/>
+ <pathelement location="${maven.build.outputDir}"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Run all tests -->
+ <!-- ====================================================================== -->
+
+ <target name="test"
+ depends="compile-tests, junit-missing"
+ unless="junit.skipped"
+ description="Run the test cases">
+ <mkdir dir="${maven.test.reports}"/>
+ <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+ <sysproperty key="basedir" value="."/>
+ <formatter type="xml"/>
+ <formatter type="plain" usefile="false"/>
+ <classpath>
+ <path refid="build.test.classpath"/>
+ <pathelement location="${maven.build.outputDir}"/>
+ <pathelement location="${maven.build.testOutputDir}"/>
+ </classpath>
+ <batchtest todir="${maven.test.reports}" unless="test">
+ <fileset dir="${maven.build.testDir.0}">
+ <include name="**/Test*.java"/>
+ <include name="**/*Test.java"/>
+ <include name="**/*TestCase.java"/>
+ <exclude name="**/*Abstract*Test.java"/>
+ </fileset>
+ </batchtest>
+ <batchtest todir="${maven.test.reports}" if="test">
+ <fileset dir="${maven.build.testDir.0}">
+ <include name="**/${test}.java"/>
+ <exclude name="**/*Abstract*Test.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="test-junit-present">
+ <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+ </target>
+
+ <target name="test-junit-status"
+ depends="test-junit-present">
+ <condition property="junit.missing">
+ <and>
+ <isfalse value="${junit.present}"/>
+ <isfalse value="${maven.test.skip}"/>
+ </and>
+ </condition>
+ <condition property="junit.skipped">
+ <or>
+ <isfalse value="${junit.present}"/>
+ <istrue value="${maven.test.skip}"/>
+ </or>
+ </condition>
+ </target>
+
+ <target name="junit-missing"
+ depends="test-junit-status"
+ if="junit.missing">
+ <echo>=================================== WARNING ===================================</echo>
+ <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+ <echo>===============================================================================</echo>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Javadoc target -->
+ <!-- ====================================================================== -->
+
+ <target name="javadoc" description="Generates the Javadoc of the application">
+ <javadoc sourcepath="${maven.build.srcDir.0}"
+ packagenames="*"
+ destdir="${maven.reporting.outputDirectory}/apidocs"
+ access="protected"
+ old="false"
+ verbose="false"
+ version="true"
+ use="true"
+ author="true"
+ splitindex="false"
+ nodeprecated="false"
+ nodeprecatedlist="false"
+ notree="false"
+ noindex="false"
+ nohelp="false"
+ nonavbar="false"
+ serialwarn="false"
+ charset="ISO-8859-1"
+ linksource="false"
+ breakiterator="false"/>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Package target -->
+ <!-- ====================================================================== -->
+
+ <target name="package" depends="compile,test" description="Package the application">
+ <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
+ compress="true"
+ index="false"
+ basedir="${maven.build.outputDir}"
+ excludes="**/package.html"/>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- A dummy target for the package named after the type it creates -->
+ <!-- ====================================================================== -->
+
+ <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+ <!-- ====================================================================== -->
+ <!-- Download dependencies target -->
+ <!-- ====================================================================== -->
+
+ <target name="test-offline">
+ <condition property="maven.mode.offline">
+ <equals arg1="${maven.settings.offline}" arg2="true"/>
+ </condition>
+ </target>
+
+</project>
diff --git a/dev-java/invokebinder/invokebinder-1.6.ebuild b/dev-java/invokebinder/invokebinder-1.6.ebuild
new file mode 100644
index 0000000..dbc0c03
--- /dev/null
+++ b/dev-java/invokebinder/invokebinder-1.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Provide a friendly DSL for binding method handles"
+HOMEPAGE="https://github.com/headius/invokebinder"
+SRC_URI="https://github.com/headius/${PN}/archive/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+
+S="${WORKDIR}/${PN}-${P}"
+
+DEPEND=">=virtual/jdk-1.7
+ test? (
+ dev-java/ant-junit:0
+ )"
+RDEPEND=">=virtual/jre-1.7"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_TEST_TARGET="test"
+
+java_prepare() {
+ cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar "target/${P}.jar" "${PN}.jar"
+ use source && java-pkg_dosrc src/main/java/com
+ if use doc; then
+ java-pkg_dojavadoc target/site/apidocs
+ dodoc README.markdown
+ fi
+}
diff --git a/dev-java/jama/jama-1.0.3-r1.ebuild b/dev-java/jama/jama-1.0.3-r1.ebuild
new file mode 100644
index 0000000..46145fc
--- /dev/null
+++ b/dev-java/jama/jama-1.0.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="Jama"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Java Matrix Package"
+HOMEPAGE="http://math.nist.gov/javanumerics/jama/"
+SRC_URI="http://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
diff --git a/dev-java/jama/jama-1.0.3.ebuild b/dev-java/jama/jama-1.0.3.ebuild
deleted file mode 100644
index c043f05..0000000
--- a/dev-java/jama/jama-1.0.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit base java-pkg-2
-
-MY_PN="Jama"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Java Matrix Package"
-HOMEPAGE="http://math.nist.gov/javanumerics/jama/"
-SRC_URI="http://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"
-
-src_compile() {
- mkdir -p build || die
-
- ejavac -d build $(find Jama -name '*.java')
-
- $(java-config -j) cf ${MY_PN}.jar -C build ${MY_PN} || die
-}
-
-src_install() {
- java-pkg_dojar ${MY_PN}.jar
-
- dodoc Jama/ChangeLog
-
- use doc && java-pkg_dojavadoc Jama/doc
- use source && java-pkg_dosrc Jama
-}
diff --git a/dev-java/javacsv/javacsv-2.1.ebuild b/dev-java/javacsv/javacsv-2.1.ebuild
index 9ab7870..e4dbc11 100644
--- a/dev-java/javacsv/javacsv-2.1.ebuild
+++ b/dev-java/javacsv/javacsv-2.1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="mirror://sourceforge/${PN}/${P/-/}.zip"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jcodings/jcodings-1.0.11.ebuild b/dev-java/jcodings/jcodings-1.0.11.ebuild
index eac57c8..d73a645 100644
--- a/dev-java/jcodings/jcodings-1.0.11.ebuild
+++ b/dev-java/jcodings/jcodings-1.0.11.ebuild
@@ -14,7 +14,7 @@
LICENSE="MIT"
SLOT="1"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND=">=virtual/jre-1.5"
DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/joni/Manifest b/dev-java/joni/Manifest
index d8d7066..c4a48f7 100644
--- a/dev-java/joni/Manifest
+++ b/dev-java/joni/Manifest
@@ -1,2 +1 @@
-DIST joni-1.1.4.tar.gz 120701 SHA256 644f24378cffa2efe9d59c3a28616c80319693a42eeb0234550f9e1f2e8ba11e SHA512 68ac4559e3b6ac2506126af7c8159a87a7906fe45e71828478051f1a84a10b9b62c966168b260d1e0b0395cbd1792a428b2e1ac458db32b57b7a84c81f9e7804 WHIRLPOOL fce0621bf6302423c31036cb084f92455578321b940ad6b9a91f078fdadd9a94a4e0f52aeb42a9beb7fb6be3b789a54f99becf094c3a7462d3b9246edbb4967f
DIST joni-2.1.0.tar.gz 125084 SHA256 9c8cb9abd7d8d086b777ade94a7ac68aaf7b9343720f81796d8c1a6c49e4cc39 SHA512 dd40b3a857deb02848d4a87de010ec6b9c96fb962643ea1022833a1bb5ebd76ffac403ff2a54497df288998939ed81910c22c02a2df1f7290112bb2ea506db0e WHIRLPOOL 4f5befc5b9813fb54cf813184fd152bbe3af98c73fda0d9c89dfbc42aa7b2f621b20738c23bad0682954ff8c7566a4053173857f06dac36036d6178c8ae9b89d
diff --git a/dev-java/joni/joni-1.1.4.ebuild b/dev-java/joni/joni-1.1.4.ebuild
deleted file mode 100644
index f0d4526..0000000
--- a/dev-java/joni/joni-1.1.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-JAVA_PKG_IUSE="source"
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="Java port of the Oniguruma regular expression engine"
-HOMEPAGE="http://jruby.codehaus.org/"
-SRC_URI="https://github.com/jruby/joni/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-CDEPEND="dev-java/asm:3
- dev-java/jcodings:0"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.5"
-
-src_unpack() {
- unpack ${A}
- mv j* "${S}"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="build"
-EANT_GENTOO_CLASSPATH="asm-3 jcodings"
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/joni/joni-2.1.0.ebuild b/dev-java/joni/joni-2.1.0.ebuild
index cfc2b47..b9bf769 100644
--- a/dev-java/joni/joni-2.1.0.ebuild
+++ b/dev-java/joni/joni-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@
LICENSE="MIT"
SLOT="2.1"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
CDEPEND="dev-java/asm:3
dev-java/jcodings:1"
diff --git a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
index 2257f1c..6ea32d6 100644
--- a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
+++ b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/portletapi/portletapi-2.0.ebuild b/dev-java/portletapi/portletapi-2.0.ebuild
index e5546ac..31306de 100644
--- a/dev-java/portletapi/portletapi-2.0.ebuild
+++ b/dev-java/portletapi/portletapi-2.0.ebuild
@@ -15,7 +15,7 @@
LICENSE="Apache-2.0"
SLOT="2.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
diff --git a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
new file mode 100644
index 0000000..4074eee
--- /dev/null
+++ b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="TGGraphLayout"
+
+DESCRIPTION="TouchGraph provides a set of interfaces for graph visualization"
+HOMEPAGE="http://touchgraph.sourceforge.net"
+SRC_URI="mirror://sourceforge/touchgraph/TGGL_${PV//./}_jre11.zip"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_PN}"
+
+JAVA_SRC_DIR="com"
+
+src_install() {
+ java-pkg-simple_src_install
+ dodoc "TGGL ReleaseNotes.txt"
+}
diff --git a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22.ebuild b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22.ebuild
deleted file mode 100644
index eda9479..0000000
--- a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-MY_PN="TGGraphLayout"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-DESCRIPTION="TouchGraph provides a set of interfaces for graph visualization"
-HOMEPAGE="http://touchgraph.sourceforge.net"
-SRC_URI="mirror://sourceforge/touchgraph/TGGL_${PV//./}_jre11.zip"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_compile() {
- mkdir -p bin || die
- ejavac -d bin `find com -name "*.java" || die`
- `java-config -j` cvf ${MY_PN}.jar -C bin . || die
-}
-
-src_install() {
- java-pkg_newjar ${MY_PN}.jar
- dodoc "TGGL ReleaseNotes.txt" || die
- use source && java-pkg_dosrc com
-}
diff --git a/dev-java/vldocking/Manifest b/dev-java/vldocking/Manifest
new file mode 100644
index 0000000..7412990
--- /dev/null
+++ b/dev-java/vldocking/Manifest
@@ -0,0 +1 @@
+DIST vldocking-3.0.5.zip 1734159 SHA256 a2c25fbe8ca1c2a8f3731e224096625d865eedae1843426624946851c58066f6 SHA512 a9943a767baa68b8cd8a75fad1e6e05e6f0083551c32c9af2b20258e2fe1fcc181a7700cc668b862e0cc2b04392a987ecfb92bf5203f273c72a8e2a2f4a72cd8 WHIRLPOOL 51f1fe5b9365d17e0f3349d1ad8872216dcfd3c643b12303b3b9b19d7a832a4fa643ab3a4071c40857a0a87f2ee563b4d68f2cfaff209d88981b452bd0ea81df
diff --git a/dev-java/vldocking/metadata.xml b/dev-java/vldocking/metadata.xml
new file mode 100644
index 0000000..ee58970
--- /dev/null
+++ b/dev-java/vldocking/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>java</herd>
+ <upstream>
+ <remote-id type="github">cmadsen/vldocking</remote-id>
+ </upstream>
+ <maintainer>
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-java/vldocking/vldocking-3.0.5.ebuild b/dev-java/vldocking/vldocking-3.0.5.ebuild
new file mode 100644
index 0000000..46f99c8
--- /dev/null
+++ b/dev-java/vldocking/vldocking-3.0.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Docking solution for Java Swing"
+HOMEPAGE="https://github.com/cmadsen/vldocking"
+SRC_URI="https://github.com/cmadsen/${PN}/archive/${P}.zip"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/slf4j-log4j12:0
+ dev-java/slf4j-api:0
+"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}
+"
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}
+"
+
+JAVA_GENTOO_CLASSPATH="
+ slf4j-log4j12
+ slf4j-api
+"
+
+java_prepare() {
+ java-pkg_clean
+}
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
new file mode 100644
index 0000000..5aa669a
--- /dev/null
+++ b/dev-lang/crystal/Manifest
@@ -0,0 +1,6 @@
+DIST crystal-0.7.7-1-linux-i686.tar.gz 11289486 SHA256 7a1ccdce29c1437da1cbaafa3fefd5ebc3c4b84b885964a6d4eaf8bfc5922831
+DIST crystal-0.7.7-1-linux-x86_64.tar.gz 10907197 SHA256 433acbe8e88fe0c3df67ad64bd436349a6bcfc146284f0a690283ebefb93b5e6
+DIST crystal-0.7.7.tar.gz 709692 SHA256 5506f69ed59592666aa667a33ba90b07f1de2cc1ebeee25e771715f8521065f8
+DIST crystal-0.8.0-1-linux-i686.tar.gz 11465702 SHA256 47b96c790458daa4179a777ba9356959e597f38cfda535a3f9069d46b362579d
+DIST crystal-0.8.0-1-linux-x86_64.tar.gz 11004413 SHA256 6a0414b903cd99bfed8ebe2a447dc0c85f4fbc31e493064e44d37770e95a4b0e
+DIST crystal-0.8.0.tar.gz 731304 SHA256 986a000bb2eded22e446fd55c543062770ec4000e28791f0b07f63fcee37b245
diff --git a/dev-lang/crystal/crystal-0.7.7.ebuild b/dev-lang/crystal/crystal-0.7.7.ebuild
new file mode 100644
index 0000000..b5f4005
--- /dev/null
+++ b/dev-lang/crystal/crystal-0.7.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+BV=${PV}-1
+BV_AMD64=${BV}-linux-x86_64
+BV_X86=${BV}-linux-i686
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="http://crystal-lang.org"
+SRC_URI="https://github.com/manastech/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
+ amd64? ( https://github.com/manastech/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
+ x86? ( https://github.com/manastech/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples +xml +yaml"
+
+# dev-libs/boehm-gc[static-libs] dependency problem, check the issue: https://github.com/manastech/crystal/issues/1382
+DEPEND="
+ <sys-devel/llvm-3.7.0
+ dev-libs/boehm-gc[static-libs]
+ dev-libs/libatomic_ops
+ dev-libs/libevent
+ dev-libs/libpcre
+ sys-libs/libunwind
+ dev-libs/pcl
+ dev-libs/gmp:0
+"
+RDEPEND="${DEPEND}
+ xml? ( dev-libs/libxml2 )
+ yaml? ( dev-libs/libyaml )
+"
+
+src_compile() {
+ emake \
+ release=1 \
+ PATH="${PATH}":"${WORKDIR}"/${PN}-${BV}/bin \
+ CRYSTAL_PATH=src \
+ CRYSTAL_CONFIG_VERSION=${PV} \
+ CRYSTAL_CONFIG_PATH="libs:/usr/$(get_libdir)/crystal"
+ use doc && emake doc
+}
+
+src_test() {
+ emake spec \
+ CRYSTAL_PATH=src \
+ CRYSTAL_CONFIG_VERSION=${PV}
+}
+
+src_install() {
+ insinto /usr/$(get_libdir)/crystal
+ doins -r src/.
+ dobin .build/crystal
+
+ insinto /usr/share/zsh/site-functions
+ newins etc/completion.zsh _crystal
+
+ use examples && dodoc -r samples
+
+ if use doc ; then
+ docinto api
+ dodoc -r doc/.
+ fi
+}
diff --git a/dev-lang/crystal/crystal-0.8.0.ebuild b/dev-lang/crystal/crystal-0.8.0.ebuild
new file mode 100644
index 0000000..b5f4005
--- /dev/null
+++ b/dev-lang/crystal/crystal-0.8.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+BV=${PV}-1
+BV_AMD64=${BV}-linux-x86_64
+BV_X86=${BV}-linux-i686
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="http://crystal-lang.org"
+SRC_URI="https://github.com/manastech/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
+ amd64? ( https://github.com/manastech/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
+ x86? ( https://github.com/manastech/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples +xml +yaml"
+
+# dev-libs/boehm-gc[static-libs] dependency problem, check the issue: https://github.com/manastech/crystal/issues/1382
+DEPEND="
+ <sys-devel/llvm-3.7.0
+ dev-libs/boehm-gc[static-libs]
+ dev-libs/libatomic_ops
+ dev-libs/libevent
+ dev-libs/libpcre
+ sys-libs/libunwind
+ dev-libs/pcl
+ dev-libs/gmp:0
+"
+RDEPEND="${DEPEND}
+ xml? ( dev-libs/libxml2 )
+ yaml? ( dev-libs/libyaml )
+"
+
+src_compile() {
+ emake \
+ release=1 \
+ PATH="${PATH}":"${WORKDIR}"/${PN}-${BV}/bin \
+ CRYSTAL_PATH=src \
+ CRYSTAL_CONFIG_VERSION=${PV} \
+ CRYSTAL_CONFIG_PATH="libs:/usr/$(get_libdir)/crystal"
+ use doc && emake doc
+}
+
+src_test() {
+ emake spec \
+ CRYSTAL_PATH=src \
+ CRYSTAL_CONFIG_VERSION=${PV}
+}
+
+src_install() {
+ insinto /usr/$(get_libdir)/crystal
+ doins -r src/.
+ dobin .build/crystal
+
+ insinto /usr/share/zsh/site-functions
+ newins etc/completion.zsh _crystal
+
+ use examples && dodoc -r samples
+
+ if use doc ; then
+ docinto api
+ dodoc -r doc/.
+ fi
+}
diff --git a/dev-lang/crystal/metadata.xml b/dev-lang/crystal/metadata.xml
new file mode 100644
index 0000000..95201e8
--- /dev/null
+++ b/dev-lang/crystal/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>longlene@gmail.com</email>
+ <name>Lixiao Chen</name>
+ </maintainer>
+ <longdescription lang="en">
+ Crystal is a programming language that resembles Ruby but compiles to
+ native code and tries to be much more efficient, at the cost of
+ disallowing certain dynamic aspects of Ruby.
+ </longdescription>
+ <use>
+ <flag name="yaml">
+ Use the <pkg>dev-libs/libyaml</pkg> library to enable Crystal yaml
+ module
+ </flag>
+ <flag name="xml">
+ Use the <pkg>dev-libs/libxml2</pkg> library to enable Crystal xml
+ module
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-lang/ekopath/Manifest b/dev-lang/ekopath/Manifest
index 7fc5001..6018d21 100644
--- a/dev-lang/ekopath/Manifest
+++ b/dev-lang/ekopath/Manifest
@@ -2,3 +2,4 @@
DIST ekopath-2015-08-11-installer.run 59150939 SHA256 31f491e3744257ae87b735be418287ac4530bf525cd4c61fdb0f2438f0600e4b SHA512 ada2dc774247e5ea76f35f6f9311d58d99ec599e41befc0820650affae88be6916a2dd50bf9e67e4920db2ab16fc185fb088e523c1abc75ed7bfc5ec261e0eb1 WHIRLPOOL 721deca6bb973bf64219709cd0fc95907a2c5cfb447a295e45410939f700244197fd2a382ae537a847c10368af44fcbc538ddc9529769cfa4613eab118362df7
DIST ekopath-2015-09-10-installer.run 57138157 SHA256 fd4eca09107b9967ba01e508098c00fddbb809ba637e42aa1bb4b7518e947394 SHA512 67f99cbf74e1840de3ee4f1da810031b9e67c1ecfd7de6ff56c8303bdcdf6d9eedbb9eab975d7a6bb1ccbb3c5a65a3f60c7219f2321bd2eb4949f04979142148 WHIRLPOOL d41c1ca250b81d584d4f088ad8b03fe975bbb9fe5d6ef50c2d501904e0f187cefaf41e772c0cbd835106c1fed995a7e754a875fd621314b28bdde19a2a14fb88
DIST ekopath-2015-09-21-installer.run 57536286 SHA256 a3aab3f1cc018222644a7d4e10d0ebe68d38626074e95638d54ae9b690721332 SHA512 3a98635f233055a81435f6dd0044f13efe7b97a7554ca5c9b50586b74a3e848076842ce0bc04c07283e8cbf92bf21fcc9b4ca36888c379ddd3190364fea9bc90 WHIRLPOOL 3bd6debddb33776ca85951a942ff87a869ca6ee0defcd493750f1682dc0f769f5c1e44820510323cd7a983b486cab07b34a955d65b890fe3d0e36171036e678d
+DIST ekopath-2015-10-10-installer.run 57723481 SHA256 0cd16e8c70d3e7938474e8885a721f0e50871a01a742b7a653dd1e6791e32baf SHA512 a4e33475b0fce0f3e9e0b744f1ba898983223cee15861491b6f7c3584c381b25c922fc17a7fd759f609f8c73ecbfbd53eeaaea38ddd9151d1cd7e46d0f1cf883 WHIRLPOOL 45744d16e34297ba47bc028382f1dc29cf0611cbff76a179640629ea89526818b4580c63e69d54541bbe915963c761b9abfe809ee2854be58e73ad80bc4e7143
diff --git a/dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild b/dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild
index ab16a2f..c886d13 100644
--- a/dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild
+++ b/dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild
@@ -38,7 +38,7 @@
}
src_prepare() {
- cat > 99${PN} <<-EOF
+ cat > 99${PN} <<-EOF || die
PATH=${EROOT%/}/opt/${PN}/bin
ROOTPATH=${EROOT%/}/opt/${PN}/bin
LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
diff --git a/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild b/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild
index ab16a2f..c886d13 100644
--- a/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild
+++ b/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild
@@ -38,7 +38,7 @@
}
src_prepare() {
- cat > 99${PN} <<-EOF
+ cat > 99${PN} <<-EOF || die
PATH=${EROOT%/}/opt/${PN}/bin
ROOTPATH=${EROOT%/}/opt/${PN}/bin
LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
diff --git a/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild b/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild
index ab16a2f..c886d13 100644
--- a/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild
+++ b/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild
@@ -38,7 +38,7 @@
}
src_prepare() {
- cat > 99${PN} <<-EOF
+ cat > 99${PN} <<-EOF || die
PATH=${EROOT%/}/opt/${PN}/bin
ROOTPATH=${EROOT%/}/opt/${PN}/bin
LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
diff --git a/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild b/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild
index ab16a2f..c886d13 100644
--- a/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild
+++ b/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild
@@ -38,7 +38,7 @@
}
src_prepare() {
- cat > 99${PN} <<-EOF
+ cat > 99${PN} <<-EOF || die
PATH=${EROOT%/}/opt/${PN}/bin
ROOTPATH=${EROOT%/}/opt/${PN}/bin
LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
diff --git a/dev-lang/ekopath/ekopath-6.0.551_p20151010.ebuild b/dev-lang/ekopath/ekopath-6.0.551_p20151010.ebuild
new file mode 100644
index 0000000..c886d13
--- /dev/null
+++ b/dev-lang/ekopath/ekopath-6.0.551_p20151010.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator multilib pax-utils
+
+MY_PV=$(get_version_component_range 1-3)
+DATE=$(get_version_component_range 4)
+DATE=${DATE#p}
+DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
+INSTALLER=${PN}-${DATE}-installer.run
+
+DESCRIPTION="PathScale EKOPath Compiler Suite"
+HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
+SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="!!app-arch/rpm"
+RDEPEND=""
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="
+ opt/${PN}/lib/${MY_PV}/x8664/*
+ opt/${PN}/bin/*"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
+ chmod +x "${S}/${INSTALLER}" || die
+}
+
+src_prepare() {
+ cat > 99${PN} <<-EOF || die
+ PATH=${EROOT%/}/opt/${PN}/bin
+ ROOTPATH=${EROOT%/}/opt/${PN}/bin
+ LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
+ MANPATH=${EROOT%/}/opt/${PN}/docs/man
+ EOF
+}
+
+src_install() {
+ # EI_PAX marking is obsolete and PT_PAX breaks the binary.
+ # We must use XT_PAX to run the installer.
+ if [[ ${PAX_MARKINGS} == "XT" ]]; then
+ pax-mark m "${INSTALLER}"
+ fi
+
+ ./"${INSTALLER}" \
+ --prefix "${ED%/}/opt/${PN}" \
+ --mode unattended || die
+
+ if [[ ! -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]]; then
+ local guess
+ cd "${ED%/}/opt/${PN}/lib" && guess=( * )
+
+ if [[ ${guess[@]} ]]; then
+ die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
+ else
+ die "No libdir installed"
+ fi
+ fi
+ [[ -x ${ED%}/opt/${PN}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
+
+ rm -r "${ED}/opt/${PN}"/uninstall* || die
+ doenvd 99${PN}
+}
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index c2e4eb5..dc652ab 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,2 +1 @@
-DIST ispc-1.8.1.tar.gz 19222737 SHA256 adef83008bf9e2eb1947f0fbc38670d8bf801ddb36b1f22c4429a1c394e31f60 SHA512 515fd08d416f2f94444ae8771d1f5922b06c87fbebb552ab4003bf961307c1637eab35c46dcd9c356ce6ec159b441ff001edb4488c3dd6629496960a92bafe75 WHIRLPOOL ace2600866156e11a8cf90bb9e6c73a6cdcd1992d72761d9f3c64b16c6a34055410ac3172d6fb746a2a057704d6531e03f91bdbc7f7f480fa4884cbf91d75c3a
DIST ispc-1.8.2.tar.gz 19259133 SHA256 d17ea68b7192d261a2830d6e00df656a73fbccd08a249433fcaf24a886902a9d SHA512 bb1f64afe41af138c386fb12a2a7f477f7bc8df2543191bbe7e5d7624e6b00dfec11ba422f6f396cd91af1c7b4cb5d2b3febf7902740d85c6d068de8ab94765a WHIRLPOOL 45ba7c52b3ada111f518b2a94d71d8c259040114ae84881c693f6e3491bd4b6897563eba4bccb6ae83a7cb90901bf1723bcbfeb9a124267ed235b1b8fdf61d69
diff --git a/dev-lang/ispc/ispc-1.8.1.ebuild b/dev-lang/ispc/ispc-1.8.1.ebuild
deleted file mode 100644
index 0d283bb..0000000
--- a/dev-lang/ispc/ispc-1.8.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs python-any-r1
-
-DESCRIPTION="Intel SPMD Program Compiler"
-HOMEPAGE="https://ispc.github.com/"
-
-if [[ ${PV} = *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://github.com/ispc/ispc.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD BSD-2 UoI-NCSA"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
- >=sys-devel/clang-3.0
- >=sys-devel/llvm-3.0
- "
-DEPEND="
- ${RDEPEND}
- ${PYTHON_DEPS}
- sys-devel/bison
- sys-devel/flex
- "
-
-src_compile() {
- sed -i '/^\t@/s/@//' Makefile || die #make all slient commands ("@") verbose
- emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
-}
-
-src_install() {
- dobin ispc
- dodoc README.rst
-
- if use examples; then
- insinto "/usr/share/doc/${PF}/examples"
- docompress -x "/usr/share/doc/${PF}/examples"
- doins -r examples/*
- fi
-}
diff --git a/dev-lang/ispc/ispc-1.8.2-r1.ebuild b/dev-lang/ispc/ispc-1.8.2-r1.ebuild
new file mode 100644
index 0000000..7c0ad7e
--- /dev/null
+++ b/dev-lang/ispc/ispc-1.8.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs python-any-r1
+
+DESCRIPTION="Intel SPMD Program Compiler"
+HOMEPAGE="https://ispc.github.com/"
+
+if [[ ${PV} = *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://github.com/ispc/ispc.git"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD BSD-2 UoI-NCSA"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+ >=sys-devel/clang-3.4
+ >=sys-devel/llvm-3.4
+ "
+DEPEND="
+ ${RDEPEND}
+ ${PYTHON_DEPS}
+ sys-devel/bison
+ sys-devel/flex
+ "
+
+src_compile() {
+ sed -i '/^\t@/s/@//' Makefile || die #make all slient commands ("@") verbose
+ emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
+}
+
+src_install() {
+ dobin ispc
+ dodoc README.rst
+
+ if use examples; then
+ insinto "/usr/share/doc/${PF}/examples"
+ docompress -x "/usr/share/doc/${PF}/examples"
+ doins -r examples/*
+ fi
+}
diff --git a/dev-lang/ispc/ispc-1.8.2.ebuild b/dev-lang/ispc/ispc-1.8.2.ebuild
deleted file mode 100644
index 0d283bb..0000000
--- a/dev-lang/ispc/ispc-1.8.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs python-any-r1
-
-DESCRIPTION="Intel SPMD Program Compiler"
-HOMEPAGE="https://ispc.github.com/"
-
-if [[ ${PV} = *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://github.com/ispc/ispc.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD BSD-2 UoI-NCSA"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
- >=sys-devel/clang-3.0
- >=sys-devel/llvm-3.0
- "
-DEPEND="
- ${RDEPEND}
- ${PYTHON_DEPS}
- sys-devel/bison
- sys-devel/flex
- "
-
-src_compile() {
- sed -i '/^\t@/s/@//' Makefile || die #make all slient commands ("@") verbose
- emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
-}
-
-src_install() {
- dobin ispc
- dodoc README.rst
-
- if use examples; then
- insinto "/usr/share/doc/${PF}/examples"
- docompress -x "/usr/share/doc/${PF}/examples"
- doins -r examples/*
- fi
-}
diff --git a/dev-lang/orc/orc-0.4.24.ebuild b/dev-lang/orc/orc-0.4.24.ebuild
index 9a09f8c..de2d36c 100644
--- a/dev-lang/orc/orc-0.4.24.ebuild
+++ b/dev-lang/orc/orc-0.4.24.ebuild
@@ -11,7 +11,7 @@
LICENSE="BSD BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm hppa ~ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples hardened static-libs"
RDEPEND=""
diff --git a/dev-lang/perl/perl-5.20.2-r1.ebuild b/dev-lang/perl/perl-5.20.2-r1.ebuild
index 31c32d1..17997be 100644
--- a/dev-lang/perl/perl-5.20.2-r1.ebuild
+++ b/dev-lang/perl/perl-5.20.2-r1.ebuild
@@ -57,13 +57,15 @@
src_remove_dual perl-core/ExtUtils-ParseXS 3.240.0 xsubpp
src_remove_dual perl-core/IO-Compress 2.64.0 zipdetails
src_remove_dual perl-core/JSON-PP 2.272.30 json_pp
- src_remove_dual perl-core/Module-Build 0.420.500 config_data
src_remove_dual perl-core/Module-CoreList 5.201.502.140 corelist
src_remove_dual perl-core/Pod-Parser 1.620.0 pod2usage podchecker podselect
src_remove_dual perl-core/Pod-Perldoc 3.230.0 perldoc
src_remove_dual perl-core/Test-Harness 3.330.0 prove
src_remove_dual perl-core/podlators 2.5.3 pod2man pod2text
src_remove_dual_man perl-core/podlators 2.5.3 /usr/share/man/man1/perlpodstyle.1
+ if [[ ${EBUILD_PHASE} == "install" ]] ; then #553726
+ rm "${ED}"/usr/bin/config_data "${ED}"/usr/share/man/man1/config_data.1 || die
+ fi
}
# eblit-include [--skip] <function> [version]
diff --git a/dev-lang/perl/perl-5.20.2.ebuild b/dev-lang/perl/perl-5.20.2.ebuild
index 0385c8c..f652574 100644
--- a/dev-lang/perl/perl-5.20.2.ebuild
+++ b/dev-lang/perl/perl-5.20.2.ebuild
@@ -57,13 +57,15 @@
src_remove_dual perl-core/ExtUtils-ParseXS 3.240.0 xsubpp
src_remove_dual perl-core/IO-Compress 2.64.0 zipdetails
src_remove_dual perl-core/JSON-PP 2.272.30 json_pp
- src_remove_dual perl-core/Module-Build 0.420.500 config_data
src_remove_dual perl-core/Module-CoreList 5.201.502.140 corelist
src_remove_dual perl-core/Pod-Parser 1.620.0 pod2usage podchecker podselect
src_remove_dual perl-core/Pod-Perldoc 3.230.0 perldoc
src_remove_dual perl-core/Test-Harness 3.330.0 prove
src_remove_dual perl-core/podlators 2.5.3 pod2man pod2text
src_remove_dual_man perl-core/podlators 2.5.3 /usr/share/man/man1/perlpodstyle.1
+ if [[ ${EBUILD_PHASE} == "install" ]] ; then #553726
+ rm "${ED}"/usr/bin/config_data "${ED}"/usr/share/man/man1/config_data.1 || die
+ fi
}
# eblit-include [--skip] <function> [version]
diff --git a/dev-lang/python/python-2.7.10.ebuild b/dev-lang/python/python-2.7.10.ebuild
index a32787e..ada87dd 100644
--- a/dev-lang/python/python-2.7.10.ebuild
+++ b/dev-lang/python/python-2.7.10.ebuild
@@ -17,7 +17,7 @@
LICENSE="PSF-2"
SLOT="2.7"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.4.3.ebuild b/dev-lang/python/python-3.4.3.ebuild
index 791103f..69fc0be 100644
--- a/dev-lang/python/python-3.4.3.ebuild
+++ b/dev-lang/python/python-3.4.3.ebuild
@@ -17,7 +17,7 @@
LICENSE="PSF-2"
SLOT="3.4"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.5.0-r1.ebuild b/dev-lang/python/python-3.5.0-r1.ebuild
index 7797ceb..f3d4b41 100644
--- a/dev-lang/python/python-3.5.0-r1.ebuild
+++ b/dev-lang/python/python-3.5.0-r1.ebuild
@@ -17,7 +17,7 @@
LICENSE="PSF-2"
SLOT="3.5"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index d9c7471..f56f4d2 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -12,4 +12,5 @@
DIST ruby-patches-2.1.6-r1.tar.bz2 2348 SHA256 2c158373217a719f2961c1f2cf2f3494eb43c413dc41ba7f9c1d88c60baca7f7 SHA512 01367d463a3aa72261742ae468d96ca1fb06a2d6b2a7a0cc416e449a7ae602d4478fb2394390636725424f252fa95c5db7d2c8116dc0b1e4477d8d641961980f WHIRLPOOL b39e8b9bdd8d05958b3b4c5884bfdd65c99b9aee2470a48ca748cbf336948bf0bb9f834ce3fec5e9365abaf385de760012f67dec6db257d7cbeff04ce0c5c7fb
DIST ruby-patches-2.1.7.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
DIST ruby-patches-2.2.2-r1.tar.bz2 3066 SHA256 65342c7cd5146f0d5025932d31e2ed40e1247355d68356e17a06b0ff728fbef1 SHA512 1c578b868db179bca6dd7800528ac23076b1f44519d93b92fafd724d8e5a158512b05cb3d5f7a4f5ada156692978f98cab7dd5b4282701e57c33d50bcda977de WHIRLPOOL 241622b25acdc8b2a7cb912bac2f6e29a4331798ba67507821b3fb295791d7bea8b7933540f2cd47cc7e8477df14be478286d018b7afe9ae121cd8c49c58dc83
+DIST ruby-patches-2.2.3-r1.tar.bz2 3143 SHA256 45ce438c31c62313f193546a883afe19ccb6dda3276d1378eb5dfd33bd7b8bbe SHA512 e5799b8008276d98f3cd1bd57b1b76a39d052a7c920d84ef245961c2db55e96e7b7081b71aa04843844786cdeee759eb415b46d8e44611d5ff8f658ad12be7bb WHIRLPOOL d9d6dd5562574c2597cbb81b9dbb15c345cad9096e24cc82515fd021882a4e7fa375f37e660b1ce2075ef66bc7582bae4d0c3e819713549dbe7c5c3d4c658ded
DIST ruby-patches-2.2.3.tar.bz2 2263 SHA256 a08bfaf193adf8e92e7937c9e8db3ec4a880e80dd9c99a5621a00a9233d4d2cd SHA512 dafbb40254d9703a7ed66314f6d9d0dd4c88485a5cef28ff1e3c7020c28cfaac1561ecfb72a465811b59213dbaf9aece6b52240ae895e47f5be63d7f88bc5543 WHIRLPOOL 54b91871b991d38cd4c573884389aaa4ee81afc14fd918e968f0b82df95264930d71199741be820c816998ca9134c496a028e13d00b93cae3c870981f28c2160
diff --git a/dev-lang/ruby/ruby-2.2.3-r1.ebuild b/dev-lang/ruby/ruby-2.2.3-r1.ebuild
new file mode 100644
index 0000000..c47b5c4
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.2.3-r1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#PATCHSET=1
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_P="${PN}-$(get_version_component_range 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+RUBYVERSION=2.2.0
+
+if [[ -n ${PATCHSET} ]]; then
+ if [[ ${PVR} == ${PV} ]]; then
+ PATCHSET="${PV}-r0.${PATCHSET}"
+ else
+ PATCHSET="${PVR}.${PATCHSET}"
+ fi
+else
+ PATCHSET="${PVR}"
+fi
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
+ https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl xemacs ncurses +readline"
+
+RDEPEND="
+ berkdb? ( sys-libs/db:= )
+ gdbm? ( sys-libs/gdbm )
+ jemalloc? ( dev-libs/jemalloc )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ socks5? ( >=net-proxy/dante-1.1.13 )
+ ncurses? ( sys-libs/ncurses:0= )
+ readline? ( sys-libs/readline:0 )
+ dev-libs/libyaml
+ virtual/libffi
+ sys-libs/zlib
+ >=app-eselect/eselect-ruby-20141227
+ !<dev-ruby/rdoc-3.9.4
+ !<dev-ruby/rubygems-1.8.10-r1"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+ >=dev-ruby/minitest-5.4.3[ruby_targets_ruby22]
+ >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22]
+ >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22]
+"
+
+PDEPEND="
+ ${BUNDLED_GEMS}
+ virtual/rubygems[ruby_targets_ruby22]
+ >=dev-ruby/json-1.8.1[ruby_targets_ruby22]
+ >=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
+ rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )
+ xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+ EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+ epatch "${WORKDIR}/patches"
+
+ # We can no longer unbundle all of rake because rubygems now depends
+ # on this. We leave the actual rake code around to bootstrap
+ # rubygems, but remove the bits that would cause a file collision.
+ einfo "Unbundling gems..."
+ cd "$S"
+ rm -r \
+ {bin,lib}/rake lib/rake.rb man/rake.1 \
+ bin/gem || die "removal failed"
+ # Remove bundled gems that we will install via PDEPEND, bug
+ # 539700. Use explicit version numbers to ensure rm fails when they
+ # change so we can update dependencies accordingly.
+ rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die
+
+ # Fix a hardcoded lib path in configure script
+ sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+ configure.in || die "sed failed"
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=
+
+ # The Tk module can no longer be built because the module code is no
+ # longer compatible with newer stable versions.
+ # https://bugs.gentoo.org/show_bug.cgi?id=500894
+ local modules="tk"
+
+ # -fomit-frame-pointer makes ruby segfault, see bug #150413.
+ filter-flags -fomit-frame-pointer
+ # In many places aliasing rules are broken; play it safe
+ # as it's risky with newer compilers to leave it as it is.
+ append-flags -fno-strict-aliasing
+ # SuperH needs this
+ use sh && append-flags -mieee
+
+ # Socks support via dante
+ if use socks5 ; then
+ # Socks support can't be disabled as long as SOCKS_SERVER is
+ # set and socks library is present, so need to unset
+ # SOCKS_SERVER in that case.
+ unset SOCKS_SERVER
+ fi
+
+ # Increase GC_MALLOC_LIMIT if set (default is 8000000)
+ if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+ append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+ fi
+
+ # ipv6 hack, bug 168939. Needs --enable-ipv6.
+ use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+ # Determine which modules *not* to build depending in the USE flags.
+ if ! use readline ; then
+ modules="${modules},readline"
+ fi
+ if ! use berkdb ; then
+ modules="${modules},dbm"
+ fi
+ if ! use gdbm ; then
+ modules="${modules},gdbm"
+ fi
+ if ! use ssl ; then
+ modules="${modules},openssl"
+ fi
+ if ! use ncurses ; then
+ modules="${modules},curses"
+ fi
+
+ INSTALL="${EPREFIX}/usr/bin/install -c" econf \
+ --program-suffix=${MY_SUFFIX} \
+ --with-soname=ruby${MY_SUFFIX} \
+ --docdir=${EPREFIX}/usr/share/doc/${P} \
+ --enable-shared \
+ --enable-pthread \
+ --disable-rpath \
+ --with-out-ext="${modules}" \
+ $(use_enable jemalloc jemalloc) \
+ $(use_enable socks5 socks) \
+ $(use_enable doc install-doc) \
+ --enable-ipv6 \
+ $(use_enable debug) \
+ ${myconf} \
+ --enable-option-checking=no \
+ || die "econf failed"
+}
+
+src_compile() {
+ emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+ emake -j1 V=1 test || die "make test failed"
+
+ elog "Ruby's make test has been run. Ruby also ships with a make check"
+ elog "that cannot be run until after ruby has been installed."
+ elog
+ if use rubytests; then
+ elog "You have enabled rubytests, so they will be installed to"
+ elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+ elog "than root, and you must place them into a writeable directory."
+ elog "Then call: "
+ elog
+ elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+ else
+ elog "Enable the rubytests USE flag to install the make check tests"
+ fi
+}
+
+src_install() {
+ # Remove the remaining bundled gems. We do this late in the process
+ # since they are used during the build to e.g. create the
+ # documentation.
+ rm -rf ext/json || die
+
+ # Ruby is involved in the install process, we don't want interference here.
+ unset RUBYOPT
+
+ local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+ LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+ RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+ for d in $(find "${S}/ext" -type d) ; do
+ RUBYLIB="${RUBYLIB}:$d"
+ done
+ export LD_LIBRARY_PATH RUBYLIB
+
+ emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+ # Remove installed rubygems copy
+ rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+ rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+ rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+ if use doc; then
+ make DESTDIR="${D}" install-doc || die "make install-doc failed"
+ fi
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r sample
+ fi
+
+ dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+ if use rubytests; then
+ pushd test
+ insinto /usr/share/${PN}-${SLOT}/test
+ doins -r .
+ popd
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+ eselect ruby set ruby${MY_SUFFIX}
+ fi
+
+ elog
+ elog "To switch between available Ruby profiles, execute as root:"
+ elog "\teselect ruby set ruby(19|20|...)"
+ elog
+}
+
+pkg_postrm() {
+ eselect ruby cleanup
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index d1731a9..0006df0 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,16 +1,10 @@
DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe44ec1d8d04351a776996d SHA512 a850b0f6b283d34aa77d5e9d8a0053161fa534fa6d8935c7472362ff7b59ea6035de0658d9e38c317e2d92ed810370f2adc3e92b6346fc0ff392d18f1c8012a6 WHIRLPOOL 448d844fe45aee97ad2e37bea3f81dd5eb388e1dcb9f1c4dc54c18991aa91d481bff5b70174fb06edb06c1361759621a570a083fe36d62bffdf6028c49244b2a
DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
-DIST swi-prolog-7.2.0-gentoo-patchset-0.tar.gz 1629 SHA256 b41a9c416ea0976c1a5f49d6d10090fa8ac41a6fe82982410fec0f09e73e09f0 SHA512 35449b56aa671ca937b2ee0e40ab7b19cd5a1b68277084a22c06c9e00f1318ab4d6603993b4aa44e9a6d8ab1418661a4d409160b93db04b7ca6e7c199831348e WHIRLPOOL 8a46b84865a2da2f315bf877cc1e464b59abc2891a91a5ee20530af39b353127c9d5ffabc4dea076137d619354dff259524ca28f0d4407c165be08e1b5c6fd38
-DIST swi-prolog-7.2.1-gentoo-patchset-0.tar.gz 1636 SHA256 b8aa8cda2e5903341e4f51187a4901d810ad3b4c03db514315fbf1dea671b924 SHA512 839ebe9ceaf010198edd36a8bd19eccfaba779e95b83a1908f1532d16eb650656758de68ee70195057e4c975d76aff46b2ca3f5c3f93e1698355227678148510 WHIRLPOOL efe93a16272ab99c6dc1bfaedabaddaef389c8c07d34f3ee5af1d417612601c85a39c56ce5b0d7ca167a84537277fcab76290f3fb2427e4b30ff7911d79f8d2d
DIST swi-prolog-7.2.2-gentoo-patchset-0.tar.gz 1414 SHA256 145f585828da45d89c6abebb7707ef224334a6e102dd50302b1af549d8d8a3c8 SHA512 32642e5e133971fbcec777791c050dd548545050353e23e08e0457487d3b5ec46e9491be4cdfb8d0a0a8af613dc64b569969aaa31a0d8691e0c3fdd9b5c645d0 WHIRLPOOL f394d4da284e31e4f431cda1af54d3dd4f2995bf04de985750c7b0f89f2ad6ed2fca8c921ffe711ae83b8f0d478c864bf81b531a9fe71ab9be73df20083e5c21
DIST swi-prolog-7.2.3-gentoo-patchset-0.tar.gz 1418 SHA256 b8cca09211889c3fdca47bcc3093f0811b773553d457b6d4cd423d0a3483ac8b SHA512 6fe185bc6a015bdb0c1466818f2e45897c098d98c091854cb86f1756458585724a8d17c1c8a5593ee054cbe0400c322b27bf107194aa1ba91d478623ff468e39 WHIRLPOOL aa9df0ddc7a01e776074c32f381b92f2738c86ac7a3462749cb24954549e1979c5c8c17038a3161772e41c7f39637ee3547efcda52ef2362e03d814af4cd885b
-DIST swi-prolog-7.3.5-gentoo-patchset-0.tar.gz 1418 SHA256 578af69e8219375bd91959d83363d748d10354e9b7f8025d2229e2c894d148ac SHA512 ec16f0fb8f4c04d3c80547dd385fe8dabe98030f017dffd4ebf76ca2fcae8c564ba95ca3706d5bd2df9a00766fcad99dd0797b72af21dba84ad40b030d13c088 WHIRLPOOL 2b0acc37ba216fdc24a43834d0e26c20f5888c51a8d97b4f3379d7906ecc40f63c7dec45a3321430ca12fec195d9e08d7fd6017415ff7845e2299adce9da502f
-DIST swi-prolog-7.3.6-gentoo-patchset-0.tar.gz 1426 SHA256 e5de1588a2bbb225e78e4494856d2dc3987592bd76abdbe4c8af0a71458eb1d0 SHA512 e0d05aaabd335be1401d2558f8fe176053449e6b5823bcf407a1073f255c019cc869747e3f02627eab9641aadf0de421a945ad9c3a4edca2263590099f4cc972 WHIRLPOOL a878ac0bacd685657bf526cd6ff0bfbe09cf5ac50499b6e4313f1020ae10d7958502eddd5c84c752fdcf2995106ff635e5c4c0087e10f1c3718d262aecd91b0c
DIST swi-prolog-7.3.7-gentoo-patchset-0.tar.gz 1709 SHA256 81f5f0de37f1fe07c25352caa151b3d13f92265fbbf5476f8713dc349fd214ec SHA512 88eec4a4a709714bbde2cbf457064adb193dc51b4c7f143cb9ab5526b4cdf6a434aa81b79c7e65537381b9a166a84ae5666776f572952bffc1ead894eb8bac32 WHIRLPOOL 00b8c5b637173c2725cae62086b58a2acfd475447232d11fa1d9cf038b0a662bf226fb3a39a3b5bd4d22d8c6b51a67d0fbddb09e88d6f778c84022b6d46be0e7
-DIST swipl-7.2.0.tar.gz 16211509 SHA256 801423b8293d08b96b575ffa96d91cce3acf2473f04c23d58657dd668287f8cb SHA512 94c89e7f76ff545821e2e984a630d37863f305fe71f0cc79a3fd4e41e1b69f4a74f924a4f429d054480b2dd030ceba5fc65fefb75933cf19aeb18c0a03863bf6 WHIRLPOOL 815d1a900a501ad8d9cb843bd42bf1756f1d5c70d994637960c7849140b3ab414b26da06c85998870027ec27678050a68d3480bb81ed23978be9e10e7920e631
-DIST swipl-7.2.1.tar.gz 16175699 SHA256 f81bd713c5a7544f9b2af694cc0e74aaaf7a70e0a67203caab6ee9493e1dd01f SHA512 514d89963a7b6cae2e33cb01a2b67cb7ec6fd0dbfa7010608b87a3207626f04cd57ce71f816d10be9ac0266d0f2d243f773fc0bd46b37caf04fc2435748d96be WHIRLPOOL ba396ec4465d9ebdf14efea44fa958d655c87b14af201421a6ac88db17bb46391129f0a9ce9a29229457b0f940892a126f6ee55285dbf0ba9395ed01066585ff
+DIST swi-prolog-7.3.8-gentoo-patchset-0.tar.gz 1430 SHA256 e927f0efce19b949fa9f2d4f5ad53488eafdd66891cd71f5051bed997491bb7d SHA512 989c7d893cc6213f76a9eb5422662dabd9d63489b0a8924a37e3293323d81215ea13510a2fb2a37f07fdee2417aafbd8e07d1f16b2d974da724aebdbb371d47a WHIRLPOOL b24e68a2e600dbf445202228a411077be3e75c838599a375c85c9185628d9109971c3b43622fbe260688961d52bf30d4a490e5961a43d2378132d339c8961420
DIST swipl-7.2.2.tar.gz 16179490 SHA256 c137bbe1d652a6aaa003278045e592637cd9fd5f1d52b05f9f0751bfd9449c8d SHA512 b25ed01e49628d9b463acd0e3687eaef0e3f74e8f834a1442e66913fabf948ae6f6d662c21e3cbb1ca5793ceb96701be31c3b1d2d3a0a9694ea4706f9a64939e WHIRLPOOL 1309284a4d610cb37196aca678d4823bba384ba04a84ef1212c3580bad40da3359fbe4035a13cbfdd21a4eca75df2b8a3c398a1da9061a71ba8da8276c2b17dd
DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b WHIRLPOOL de695c8e0317921dcc13898f7a3c88d1012e3f87f633cd25766ca5cb6637b29ca81b9245d015614089291a7d9abd0d8c7109ccae1df9297d78301d241cb258b3
-DIST swipl-7.3.5.tar.gz 16185426 SHA256 e8dd7cf6077dabc6cbefe2087fec36f5219d84ac15c9b8ee89db4dcc17edd91f SHA512 0da707a44907cc152a42f45eb9370622826c3b840c774a976716ae032d1f411b0ac783e28eb9789b55d069921f5186c901b05686f14122cd6741972d4754fdde WHIRLPOOL 6b9e2822d91021c3223ddd0c21ed0c8621df405314c8b995d88a6f235cfc25633eb34605c61f1fd10ed2b29c44a6929b6503cc4d09c72c1fcd65dd41f77ecaa2
-DIST swipl-7.3.6.tar.gz 16188830 SHA256 cb3e0ebccfeda043e32a3706aa0304c9ecdef9da0bf762f27ad9acbabcdb3a08 SHA512 9036edd5704fcd40c2c50a7fa93871bea44ffc98a3707bed8c0b0355648630ffdfeea6ed33a73057eb0c741fb73db2daf24d64f471566e3ca35a24c2c6a1b996 WHIRLPOOL efa48bfbce96ad3907f686a13ca159322cc0554e7c20f56c54250ea774f75a4937d230bb365252242f76bb692c35b2e7a2fa27fd9caa6a75f8bda4b42a51538d
DIST swipl-7.3.7.tar.gz 16065373 SHA256 db291d45753f6fc1af5f0ff174d1770ce4e0455d2eb1f6be7ac3cac263571cc7 SHA512 93987a45cb34df6da1415845a4f79004e9e64a8fe4552f3b74ebb4dc509329a0850000c693090f452541ca1bd9187f7c40b7dc6b0159f650e2bc769bd7d48d21 WHIRLPOOL 277725e359ea29faa8c83e1d9089fdcf9483d20b866a4b36bcc19a09c63bc24379352751524d35c0758e9355c20b53a45180bd4bcec4352ededf2c9ab4c836ee
+DIST swipl-7.3.8.tar.gz 16075095 SHA256 c7a31eac0020831cddd31045bc12dca10b437b737545a8a42fa193a3937ae882 SHA512 98a144e1a22c4b3bc5c0e4865b19930956aa1b60336f4da2538340502b5b27e327db8a4bc498c64ed3b63510c0d5c29ccf51843da70fb787ae1367a312a2f543 WHIRLPOOL 5b23f3f674745297377cc63960899841b73e57de48d24fd1e3de81d34b6db53e2fefd53efb7fd8ab4850d359cf12584a6c2686ead952f55f72fc62bdf223381b
diff --git a/dev-lang/swi-prolog/metadata.xml b/dev-lang/swi-prolog/metadata.xml
index 2adce0b..49e918f 100644
--- a/dev-lang/swi-prolog/metadata.xml
+++ b/dev-lang/swi-prolog/metadata.xml
@@ -4,5 +4,6 @@
<herd>prolog</herd>
<use>
<flag name='archive'>Use libarchive for extension packs</flag>
+ <flag name='uuid'>Use ossp-uuid for UUID pack</flag>
</use>
</pkgmetadata>
diff --git a/dev-lang/swi-prolog/swi-prolog-7.2.0.ebuild b/dev-lang/swi-prolog/swi-prolog-7.2.0.ebuild
deleted file mode 100644
index 55e2a48..0000000
--- a/dev-lang/swi-prolog/swi-prolog-7.2.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
- archive? ( app-arch/libarchive )
- zlib? ( sys-libs/zlib )
- odbc? ( dev-db/unixODBC )
- readline? ( sys-libs/readline )
- gmp? ( dev-libs/gmp )
- ssl? ( dev-libs/openssl )
- java? ( >=virtual/jdk-1.5 )
- X? (
- virtual/jpeg
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXt
- x11-libs/libICE
- x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- X? ( x11-proto/xproto )
- java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
- EPATCH_FORCE=yes
- EPATCH_SUFFIX=patch
- epatch "${WORKDIR}"/${PV}
-
- # OSX/Intel ld doesn't like an archive without table of contents
- sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- use ppc && append-flags -mno-altivec
- use hardened && append-flags -fno-unit-at-a-time
- use debug && append-flags -DO_DEBUG
-
- # ARCH is used in the configure script to figure out host and target
- # specific stuff
- export ARCH=${CHOST}
-
- export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
- cd "${S}"/src || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_enable gmp) \
- $(use_enable readline) \
- $(use_enable static-libs static) \
- --enable-shared \
- --enable-custom-flags COFLAGS="${CFLAGS}"
-
- if ! use minimal ; then
- local jpltestconf
- if use java && use test ; then
- jpltestconf="--with-junit=$(java-config --classpath junit)"
- fi
-
- cd "${S}/packages" || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with archive) \
- $(use_with java jpl) \
- ${jpltestconf} \
- $(use_with odbc) \
- $(use_with ssl) \
- $(use_with X xpce) \
- $(use_with zlib) \
- COFLAGS='"${CFLAGS}"'
- fi
-}
-
-src_compile() {
- cd "${S}"/src || die
- emake
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_test() {
- cd "${S}/src" || die
- emake check
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake check
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_install() {
- emake -C src DESTDIR="${D}" install
-
- if ! use minimal ; then
- emake -C packages DESTDIR="${D}" install
- if use doc ; then
- emake -C packages DESTDIR="${D}" html-install
- fi
- ./packages/report-failed || die "Cannot report failed packages"
- fi
-
- dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.2.1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.2.1.ebuild
deleted file mode 100644
index 55e2a48..0000000
--- a/dev-lang/swi-prolog/swi-prolog-7.2.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
- archive? ( app-arch/libarchive )
- zlib? ( sys-libs/zlib )
- odbc? ( dev-db/unixODBC )
- readline? ( sys-libs/readline )
- gmp? ( dev-libs/gmp )
- ssl? ( dev-libs/openssl )
- java? ( >=virtual/jdk-1.5 )
- X? (
- virtual/jpeg
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXt
- x11-libs/libICE
- x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- X? ( x11-proto/xproto )
- java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
- EPATCH_FORCE=yes
- EPATCH_SUFFIX=patch
- epatch "${WORKDIR}"/${PV}
-
- # OSX/Intel ld doesn't like an archive without table of contents
- sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- use ppc && append-flags -mno-altivec
- use hardened && append-flags -fno-unit-at-a-time
- use debug && append-flags -DO_DEBUG
-
- # ARCH is used in the configure script to figure out host and target
- # specific stuff
- export ARCH=${CHOST}
-
- export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
- cd "${S}"/src || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_enable gmp) \
- $(use_enable readline) \
- $(use_enable static-libs static) \
- --enable-shared \
- --enable-custom-flags COFLAGS="${CFLAGS}"
-
- if ! use minimal ; then
- local jpltestconf
- if use java && use test ; then
- jpltestconf="--with-junit=$(java-config --classpath junit)"
- fi
-
- cd "${S}/packages" || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with archive) \
- $(use_with java jpl) \
- ${jpltestconf} \
- $(use_with odbc) \
- $(use_with ssl) \
- $(use_with X xpce) \
- $(use_with zlib) \
- COFLAGS='"${CFLAGS}"'
- fi
-}
-
-src_compile() {
- cd "${S}"/src || die
- emake
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_test() {
- cd "${S}/src" || die
- emake check
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake check
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_install() {
- emake -C src DESTDIR="${D}" install
-
- if ! use minimal ; then
- emake -C packages DESTDIR="${D}" install
- if use doc ; then
- emake -C packages DESTDIR="${D}" html-install
- fi
- ./packages/report-failed || die "Cannot report failed packages"
- fi
-
- dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
new file mode 100644
index 0000000..5378ee5
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
+ mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses
+ archive? ( app-arch/libarchive )
+ zlib? ( sys-libs/zlib )
+ odbc? ( dev-db/unixODBC )
+ readline? ( sys-libs/readline )
+ gmp? ( dev-libs/gmp )
+ ssl? ( dev-libs/openssl )
+ java? ( >=virtual/jdk-1.5 )
+ uuid? ( dev-libs/ossp-uuid )
+ X? (
+ virtual/jpeg
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXpm
+ x11-libs/libXt
+ x11-libs/libICE
+ x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+ X? ( x11-proto/xproto )
+ java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+ EPATCH_FORCE=yes
+ EPATCH_SUFFIX=patch
+ epatch "${WORKDIR}"/${PV}
+
+ if ! use uuid; then
+ mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+ fi
+
+ # OSX/Intel ld doesn't like an archive without table of contents
+ sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ use ppc && append-flags -mno-altivec
+ use hardened && append-flags -fno-unit-at-a-time
+ use debug && append-flags -DO_DEBUG
+
+ # ARCH is used in the configure script to figure out host and target
+ # specific stuff
+ export ARCH=${CHOST}
+
+ export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+ cd "${S}"/src || die
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_enable gmp) \
+ $(use_enable readline) \
+ $(use_enable static-libs static) \
+ --enable-shared \
+ --enable-custom-flags COFLAGS="${CFLAGS}"
+
+ if ! use minimal ; then
+ local jpltestconf
+ if use java && use test ; then
+ jpltestconf="--with-junit=$(java-config --classpath junit)"
+ fi
+
+ cd "${S}/packages" || die
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_with archive) \
+ $(use_with java jpl) \
+ ${jpltestconf} \
+ $(use_with odbc) \
+ $(use_with ssl) \
+ $(use_with X xpce) \
+ $(use_with zlib) \
+ COFLAGS='"${CFLAGS}"'
+ fi
+}
+
+src_compile() {
+ cd "${S}"/src || die
+ emake
+
+ if ! use minimal ; then
+ cd "${S}/packages" || die
+ emake
+ ./report-failed || die "Cannot report failed packages"
+ fi
+}
+
+src_test() {
+ cd "${S}/src" || die
+ emake check
+
+ if ! use minimal ; then
+ cd "${S}/packages" || die
+ emake check
+ ./report-failed || die "Cannot report failed packages"
+ fi
+}
+
+src_install() {
+ emake -C src DESTDIR="${D}" install
+
+ if ! use minimal ; then
+ emake -C packages DESTDIR="${D}" install
+ if use doc ; then
+ emake -C packages DESTDIR="${D}" html-install
+ fi
+ ./packages/report-failed || die "Cannot report failed packages"
+ fi
+
+ dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
+}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.5.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.5.ebuild
deleted file mode 100644
index fbf2c69..0000000
--- a/dev-lang/swi-prolog/swi-prolog-7.3.5.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
- archive? ( app-arch/libarchive )
- zlib? ( sys-libs/zlib )
- odbc? ( dev-db/unixODBC )
- readline? ( sys-libs/readline )
- gmp? ( dev-libs/gmp )
- ssl? ( dev-libs/openssl )
- java? ( >=virtual/jdk-1.5 )
- X? (
- virtual/jpeg
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXt
- x11-libs/libICE
- x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- X? ( x11-proto/xproto )
- java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
- EPATCH_FORCE=yes
- EPATCH_SUFFIX=patch
- epatch "${WORKDIR}"/${PV}
-
- # OSX/Intel ld doesn't like an archive without table of contents
- sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- use ppc && append-flags -mno-altivec
- use hardened && append-flags -fno-unit-at-a-time
- use debug && append-flags -DO_DEBUG
-
- # ARCH is used in the configure script to figure out host and target
- # specific stuff
- export ARCH=${CHOST}
-
- export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
- cd "${S}"/src || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_enable gmp) \
- $(use_enable readline) \
- $(use_enable static-libs static) \
- --enable-shared \
- --enable-custom-flags COFLAGS="${CFLAGS}"
-
- if ! use minimal ; then
- local jpltestconf
- if use java && use test ; then
- jpltestconf="--with-junit=$(java-config --classpath junit)"
- fi
-
- cd "${S}/packages" || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with archive) \
- $(use_with java jpl) \
- ${jpltestconf} \
- $(use_with odbc) \
- $(use_with ssl) \
- $(use_with X xpce) \
- $(use_with zlib) \
- COFLAGS='"${CFLAGS}"'
- fi
-}
-
-src_compile() {
- cd "${S}"/src || die
- emake
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_test() {
- cd "${S}/src" || die
- emake check
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake check
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_install() {
- emake -C src DESTDIR="${D}" install
-
- if ! use minimal ; then
- emake -C packages DESTDIR="${D}" install
- if use doc ; then
- emake -C packages DESTDIR="${D}" html-install
- fi
- ./packages/report-failed || die "Cannot report failed packages"
- fi
-
- dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.6.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.6.ebuild
deleted file mode 100644
index fbf2c69..0000000
--- a/dev-lang/swi-prolog/swi-prolog-7.3.6.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
- archive? ( app-arch/libarchive )
- zlib? ( sys-libs/zlib )
- odbc? ( dev-db/unixODBC )
- readline? ( sys-libs/readline )
- gmp? ( dev-libs/gmp )
- ssl? ( dev-libs/openssl )
- java? ( >=virtual/jdk-1.5 )
- X? (
- virtual/jpeg
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXt
- x11-libs/libICE
- x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- X? ( x11-proto/xproto )
- java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
- EPATCH_FORCE=yes
- EPATCH_SUFFIX=patch
- epatch "${WORKDIR}"/${PV}
-
- # OSX/Intel ld doesn't like an archive without table of contents
- sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- use ppc && append-flags -mno-altivec
- use hardened && append-flags -fno-unit-at-a-time
- use debug && append-flags -DO_DEBUG
-
- # ARCH is used in the configure script to figure out host and target
- # specific stuff
- export ARCH=${CHOST}
-
- export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
- cd "${S}"/src || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_enable gmp) \
- $(use_enable readline) \
- $(use_enable static-libs static) \
- --enable-shared \
- --enable-custom-flags COFLAGS="${CFLAGS}"
-
- if ! use minimal ; then
- local jpltestconf
- if use java && use test ; then
- jpltestconf="--with-junit=$(java-config --classpath junit)"
- fi
-
- cd "${S}/packages" || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with archive) \
- $(use_with java jpl) \
- ${jpltestconf} \
- $(use_with odbc) \
- $(use_with ssl) \
- $(use_with X xpce) \
- $(use_with zlib) \
- COFLAGS='"${CFLAGS}"'
- fi
-}
-
-src_compile() {
- cd "${S}"/src || die
- emake
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_test() {
- cd "${S}/src" || die
- emake check
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake check
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_install() {
- emake -C src DESTDIR="${D}" install
-
- if ! use minimal ; then
- emake -C packages DESTDIR="${D}" install
- if use doc ; then
- emake -C packages DESTDIR="${D}" html-install
- fi
- ./packages/report-failed || die "Cannot report failed packages"
- fi
-
- dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.8.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.8.ebuild
new file mode 100644
index 0000000..c5eb39d
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.8.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
+ mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
+
+RDEPEND="sys-libs/ncurses
+ archive? ( app-arch/libarchive )
+ berkdb? ( >=sys-libs/db-4 )
+ zlib? ( sys-libs/zlib )
+ odbc? ( dev-db/unixODBC )
+ readline? ( sys-libs/readline )
+ gmp? ( dev-libs/gmp )
+ ssl? ( dev-libs/openssl )
+ java? ( >=virtual/jdk-1.5 )
+ X? (
+ virtual/jpeg
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXpm
+ x11-libs/libXt
+ x11-libs/libICE
+ x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+ X? ( x11-proto/xproto )
+ java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+ EPATCH_FORCE=yes
+ EPATCH_SUFFIX=patch
+ epatch "${WORKDIR}"/${PV}
+
+ # OSX/Intel ld doesn't like an archive without table of contents
+ sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ use ppc && append-flags -mno-altivec
+ use hardened && append-flags -fno-unit-at-a-time
+ use debug && append-flags -DO_DEBUG
+
+ # ARCH is used in the configure script to figure out host and target
+ # specific stuff
+ export ARCH=${CHOST}
+
+ export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+ cd "${S}"/src || die
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_enable gmp) \
+ $(use_enable readline) \
+ $(use_enable static-libs static) \
+ --enable-shared \
+ --enable-custom-flags COFLAGS="${CFLAGS}"
+
+ if ! use minimal ; then
+ local jpltestconf
+ if use java && use test ; then
+ jpltestconf="--with-junit=$(java-config --classpath junit)"
+ fi
+
+ cd "${S}/packages" || die
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_with archive) \
+ $(use_with berkdb bdb ) \
+ $(use_with java jpl) \
+ ${jpltestconf} \
+ $(use_with odbc) \
+ $(use_with ssl) \
+ $(use_with X xpce) \
+ $(use_with zlib) \
+ COFLAGS='"${CFLAGS}"'
+ fi
+}
+
+src_compile() {
+ cd "${S}"/src || die
+ emake
+
+ if ! use minimal ; then
+ cd "${S}/packages" || die
+ emake
+ ./report-failed || die "Cannot report failed packages"
+ fi
+}
+
+src_test() {
+ cd "${S}/src" || die
+ emake check
+
+ if ! use minimal ; then
+ cd "${S}/packages" || die
+ emake check
+ ./report-failed || die "Cannot report failed packages"
+ fi
+}
+
+src_install() {
+ emake -C src DESTDIR="${D}" install
+
+ if ! use minimal ; then
+ emake -C packages DESTDIR="${D}" install
+ if use doc ; then
+ emake -C packages DESTDIR="${D}" html-install
+ fi
+ ./packages/report-failed || die "Cannot report failed packages"
+ fi
+
+ dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
+}
diff --git a/dev-lang/vala/vala-0.28.1.ebuild b/dev-lang/vala/vala-0.28.1.ebuild
index befc463..fba3edb 100644
--- a/dev-lang/vala/vala-0.28.1.ebuild
+++ b/dev-lang/vala/vala-0.28.1.ebuild
@@ -12,7 +12,7 @@
LICENSE="LGPL-2.1"
SLOT="0.28"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild b/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild
index 8faf2b4..38b6d67 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2.1"
SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ppc ppc64 ~sparc x86"
IUSE="+introspection nls"
# FIXME: yaml is optional with --enable-dep11 but not
diff --git a/dev-libs/atk/atk-2.16.0-r1.ebuild b/dev-libs/atk/atk-2.16.0-r1.ebuild
index 23ec024..304f996 100644
--- a/dev-libs/atk/atk-2.16.0-r1.ebuild
+++ b/dev-libs/atk/atk-2.16.0-r1.ebuild
@@ -12,7 +12,7 @@
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="+introspection nls test"
RDEPEND="
diff --git a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild b/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
index a2a507f..3cf57ca 100644
--- a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
+++ b/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
@@ -12,12 +12,9 @@
LICENSE="BSD"
SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~mips ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
S="${WORKDIR}"
LIBNAME=lib${PN}
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 224a8b3..a6e04d0 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -3,3 +3,4 @@
DIST efl-1.13.1.tar.xz 40332672 SHA256 7e06e11678063fd74522f8fc56eb3d0235e9d7f889639e2ecff4bb663a2568d6 SHA512 29324acdeffa287f4ef9c72938cfc18ab4f8ae40a0b2ddbdeccb323361bfe10da43b65a419561e04a7c2c148b1a9bc820a71ad735fbf2988940e982b73e2b2f5 WHIRLPOOL 10639471666c7aae6283f4ff442b10fea7e5159f36207a676030a9a6961e86faee72026b1bdd4c512f0831db7a945dbf53e2e3da67defb4527d3adc72ee52756
DIST efl-1.15.0.tar.xz 43130156 SHA256 5d9580e9ba961fc64222d54a73849c730477c209dde89cc123dde14f22d532bc SHA512 59f28ddee01b4b5f1d7117a9e4c051e7074fbd5712dae7d9f99f0a4d09d41963cc411eeec664f3e1c57e84ad6ebde9c58ddcc9931eef0468817a90fe96a1dfdd WHIRLPOOL 113a0da4c0f2a7b22bcfd12b2f83a85a999979ec97a423cd53310e9ef9d15d8f1d0db5dd035bc931116d4a79b435144366c1930ffe3f11d48fd439ca37124e36
DIST efl-1.15.1.tar.xz 43177472 SHA256 56efb5a88328f8ed04552d6e10d7b9ff2d3c7ed9da669ae06d457b9a801554d8 SHA512 72fdb7107ec818f2c97ff88521ca505a1f4b7705a3eede7ab1c22a6d98aa1b4245dac431d95f682c49767a0621a81843c0bd1eb44a98f9fe71380a1c5a253bd7 WHIRLPOOL 19eff46b6e96ff6b80e6d27f516632e7c83b449d39a28a8d595a9871401de9230799bf0bbc926d688c626d20db83f1bab8dad4ef5f07e4086737c3f75a9082a4
+DIST efl-1.15.2.tar.xz 43176564 SHA256 dd738f19f454621a7fa1fdb4c008457c170989f5f0c535edfed7b6773ae6c2a4 SHA512 bee8d7473bac73545ca02180f42614b7ae6ee0628fe8879b35bbf6809353535df8b1fa01f19ddc81d2ee1ecb5e36512b63c3be4b6b982f4efe8e410aa8ad5c56 WHIRLPOOL 380debdded1989412579cbe17d057512acb8381527c6c50606e6e936ea8bd0f1f1077861ca9afbb5661f404eb658c0dc288d991b204fbca72506d7b89f511df2
diff --git a/dev-libs/efl/efl-1.15.2.ebuild b/dev-libs/efl/efl-1.15.2.ebuild
new file mode 100644
index 0000000..fcf0d81
--- /dev/null
+++ b/dev-libs/efl/efl-1.15.2.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+ EGIT_SUB_PROJECT="core"
+ EGIT_URI_APPEND="${PN}"
+elif [[ *"${PV}" == *"_pre"* ]] ; then
+ MY_P=${P%%_*}
+ SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
+ EKEY_STATE="snap"
+else
+ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
+ EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 valgrind wayland webp X xim xine xpm"
+
+REQUIRED_USE="
+ pulseaudio? ( sound )
+ opengl? ( || ( X sdl wayland ) )
+ gles? ( || ( X wayland ) )
+ gles? ( !sdl )
+ gles? ( egl )
+ sdl? ( opengl )
+ wayland? ( egl !opengl gles )
+ xim? ( X )
+"
+
+RDEPEND="
+ drm? (
+ >=dev-libs/libinput-0.8
+ media-libs/mesa[gbm]
+ >=x11-libs/libdrm-2.4
+ >=x11-libs/libxkbcommon-0.3.0
+ )
+ fontconfig? ( media-libs/fontconfig )
+ fribidi? ( dev-libs/fribidi )
+ gif? ( media-libs/giflib )
+ glib? ( dev-libs/glib:2 )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? (
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ harfbuzz? ( media-libs/harfbuzz )
+ ibus? ( app-i18n/ibus )
+ jpeg2k? ( media-libs/openjpeg:0 )
+ !oldlua? ( >=dev-lang/luajit-2.0.0 )
+ oldlua? ( dev-lang/lua )
+ physics? ( >=sci-physics/bullet-2.80 )
+ pixman? ( x11-libs/pixman )
+ png? ( media-libs/libpng:0= )
+ pulseaudio? ( media-sound/pulseaudio )
+ scim? ( app-i18n/scim )
+ sdl? (
+ media-libs/libsdl2
+ virtual/opengl
+ )
+ sound? ( media-libs/libsndfile )
+ systemd? ( sys-apps/systemd )
+ tiff? ( media-libs/tiff:0 )
+ tslib? ( x11-libs/tslib )
+ valgrind? ( dev-util/valgrind )
+ wayland? (
+ >=dev-libs/wayland-1.8.0
+ >=x11-libs/libxkbcommon-0.3.1
+ media-libs/mesa[gles2,wayland]
+ )
+ webp? ( media-libs/libwebp )
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXinerama
+ x11-libs/libXp
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/libXScrnSaver
+
+ opengl? (
+ x11-libs/libX11
+ x11-libs/libXrender
+ virtual/opengl
+ )
+
+ gles? (
+ x11-libs/libX11
+ x11-libs/libXrender
+ virtual/opengl
+ )
+ )
+ xine? ( >=media-libs/xine-lib-1.1.1 )
+ xpm? ( x11-libs/libXpm )
+
+ sys-apps/dbus
+ >=sys-apps/util-linux-2.20.0
+ sys-libs/zlib
+ virtual/jpeg
+
+ !dev-libs/ecore
+ !dev-libs/edbus
+ !dev-libs/eet
+ !dev-libs/eeze
+ !dev-libs/efreet
+ !dev-libs/eina
+ !dev-libs/eio
+ !dev-libs/embryo
+ !dev-libs/eobj
+ !dev-libs/ephysics
+ !media-libs/edje
+ !media-libs/emotion
+ !media-libs/ethumb
+ !media-libs/evas
+"
+#external lz4 support currently broken because of unstable ABI/API
+# app-arch/lz4
+
+#soft blockers added above for binpkg users
+#hard blocks are needed for building
+CORE_EFL_CONFLICTS="
+ !!dev-libs/ecore
+ !!dev-libs/edbus
+ !!dev-libs/eet
+ !!dev-libs/eeze
+ !!dev-libs/efreet
+ !!dev-libs/eina
+ !!dev-libs/eio
+ !!dev-libs/embryo
+ !!dev-libs/eobj
+ !!dev-libs/ephysics
+ !!media-libs/edje
+ !!media-libs/emotion
+ !!media-libs/ethumb
+ !!media-libs/evas
+"
+
+DEPEND="
+ ${CORE_EFL_CONFLICTS}
+
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ if use ssl && use gnutls ; then
+ einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
+ einfo "gnutls has been selected for you."
+ fi
+ if use opengl && use gles ; then
+ einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
+ einfo "opengl has been selected for you."
+ fi
+
+ E_ECONF=(
+ --with-profile=$(usex debug debug release)
+ --with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
+ --with-x11=$(usex X xlib none)
+ $(use_with X x)
+ --with-opengl=$(usex opengl full $(usex gles es none))
+ --with-glib=$(usex glib)
+ --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba
+
+ $(use_enable bmp image-loader-bmp)
+ $(use_enable bmp image-loader-wbmp)
+ $(use_enable drm)
+ $(use_enable doc)
+ $(use_enable eet image-loader-eet)
+ $(use_enable egl)
+ $(use_enable fbcon fb)
+ $(use_enable fontconfig)
+ $(use_enable fribidi)
+ $(use_enable gif image-loader-gif)
+ $(use_enable gstreamer gstreamer1)
+ $(use_enable harfbuzz)
+ $(use_enable ico image-loader-ico)
+ $(use_enable ibus)
+ $(use_enable jpeg2k image-loader-jp2k)
+ $(use_enable neon)
+ $(use_enable nls)
+ $(use_enable oldlua lua-old)
+ $(use_enable physics)
+ $(use_enable pixman)
+ $(use_enable pixman pixman-font)
+ $(use_enable pixman pixman-rect)
+ $(use_enable pixman pixman-line)
+ $(use_enable pixman pixman-poly)
+ $(use_enable pixman pixman-image)
+ $(use_enable pixman pixman-image-scale-sample)
+ $(use_enable png image-loader-png)
+ $(use_enable ppm image-loader-pmaps)
+ $(use_enable psd image-loader-psd)
+ $(use_enable pulseaudio)
+ $(use_enable scim)
+ $(use_enable sdl)
+ $(use_enable sound audio)
+ $(use_enable systemd)
+ $(use_enable tga image-loader-tga)
+ $(use_enable tiff image-loader-tiff)
+ $(use_enable tslib)
+ $(use_enable v4l2)
+ $(use_enable valgrind)
+ $(use_enable wayland)
+ $(use_enable webp image-loader-webp)
+ $(use_enable xim)
+ $(use_enable xine)
+ $(use_enable xpm image-loader-xpm)
+ --enable-cserve
+ --enable-image-loader-generic
+ --enable-image-loader-jpeg
+
+ --disable-tizen
+ --disable-gesture
+ --disable-gstreamer
+ --enable-xinput2
+ --disable-xinput22
+ --disable-multisense
+ --enable-libmount
+
+ # external lz4 support currently broken because of unstable ABI/API
+ #--enable-liblz4
+ )
+
+ enlightenment_src_configure
+}
+
+src_install() {
+ MAKEOPTS+=" -j1"
+
+ enlightenment_src_install
+}
diff --git a/dev-libs/engine_pkcs11/engine_pkcs11-0.1.8-r1.ebuild b/dev-libs/engine_pkcs11/engine_pkcs11-0.1.8-r1.ebuild
new file mode 100644
index 0000000..bf3f261
--- /dev/null
+++ b/dev-libs/engine_pkcs11/engine_pkcs11-0.1.8-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="engine_pkcs11 is an implementation of an engine for OpenSSL"
+HOMEPAGE="http://www.opensc-project.org/engine_pkcs11"
+SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="libressl"
+
+RDEPEND=">=dev-libs/libp11-0.2.5
+ !libressl? ( >=dev-libs/openssl-0.9.7d:0 )
+ libressl? ( dev-libs/libressl )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ --docdir="/usr/share/doc/${PF}" \
+ --htmldir="/usr/share/doc/${PF}/html" \
+ --disable-static --enable-shared \
+ --enable-doc
+}
diff --git a/dev-libs/geoip/geoip-1.6.6.ebuild b/dev-libs/geoip/geoip-1.6.6.ebuild
index c5c62ed..5b02c56 100644
--- a/dev-libs/geoip/geoip-1.6.6.ebuild
+++ b/dev-libs/geoip/geoip-1.6.6.ebuild
@@ -14,7 +14,7 @@
# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
LICENSE="LGPL-2.1 GPL-2 MaxMind2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
IUSE="static-libs"
RESTRICT="test"
diff --git a/dev-libs/gjs/gjs-1.43.3.ebuild b/dev-libs/gjs/gjs-1.43.3.ebuild
index c22d63f..1e9cc29 100644
--- a/dev-libs/gjs/gjs-1.43.3.ebuild
+++ b/dev-libs/gjs/gjs-1.43.3.ebuild
@@ -13,7 +13,7 @@
LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
SLOT="0"
IUSE="+cairo examples gtk test"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~ia64 ~ppc ppc64 ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.36:2
diff --git a/dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch b/dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch
new file mode 100644
index 0000000..259b572
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch
@@ -0,0 +1,15 @@
+https://bugzilla.gnome.org/756477
+
+fix build w/newer releases of bionic (android)
+
+--- a/gio/gthreadedresolver.c
++++ b/gio/gthreadedresolver.c
+@@ -263,7 +263,7 @@ lookup_by_address_finish (GResolver *resolver,
+
+ #if defined(G_OS_UNIX)
+
+-#ifdef __BIONIC__
++#if defined __BIONIC__ && !defined BIND_4_COMPAT
+ /* Copy from bionic/libc/private/arpa_nameser_compat.h
+ * and bionic/libc/private/arpa_nameser.h */
+ typedef struct {
diff --git a/dev-libs/glib/glib-2.44.1-r1.ebuild b/dev-libs/glib/glib-2.44.1-r1.ebuild
new file mode 100644
index 0000000..25be870
--- /dev/null
+++ b/dev-libs/glib/glib-2.44.1-r1.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+# Building with --disable-debug highly unrecommended. It will build glib in
+# an unusable form as it disables some commonly used API. Please do not
+# convert this to the use_enable form, as it results in a broken build.
+GCONF_DEBUG="yes"
+# Completely useless with or without USE static-libs, people need to use
+# pkg-config
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic multilib \
+ pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+ http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+REQUIRED_USE="
+ utils? ( ${PYTHON_REQUIRED_USE} )
+ test? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+RDEPEND="
+ !<dev-util/gdbus-codegen-${PV}
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+ xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+ fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+ utils? (
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+ || (
+ >=dev-libs/elfutils-0.142
+ >=dev-libs/libelf-0.8.12
+ >=sys-freebsd/freebsd-lib-9.2_rc1
+ )
+ )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-libs/libxslt-1.0
+ >=sys-devel/gettext-0.11
+ >=dev-util/gtk-doc-am-1.20
+ systemtap? ( >=dev-util/systemtap-1.3 )
+ test? (
+ sys-devel/gdb
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+ >=sys-apps/dbus-1.2.14 )
+ !<dev-util/gtk-doc-1.15-r2
+"
+# gobject-introspection blocker to ensure people don't mix
+# different g-i and glib major versions
+
+PDEPEND="!<gnome-base/gvfs-1.6.4-r990
+ dbus? ( gnome-base/dconf )
+ mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+# Earlier versions of gvfs do not work with glib
+
+pkg_setup() {
+ if use kernel_linux ; then
+ CONFIG_CHECK="~INOTIFY_USER"
+ if use test; then
+ CONFIG_CHECK="~IPV6"
+ WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+ export IPV6_DISABLED="yes"
+ fi
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+ mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+ if use test; then
+ # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+ if ! has_version dev-util/desktop-file-utils ; then
+ ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+ ewarn "think on installing it to get these tests run."
+ sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+ sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
+ sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
+ sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
+ fi
+
+ # gdesktopappinfo requires existing terminal (gnome-terminal or any
+ # other), falling back to xterm if one doesn't exist
+ if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+ ewarn "Some tests will be skipped due to missing terminal program"
+ sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+ fi
+
+ # Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
+ if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
+ ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
+ ewarn "not being present on your system, think on installing them to get these tests run."
+ sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
+ sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
+ sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
+ sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
+ sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
+ sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
+ sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
+ # needed to prevent gdbus-threading from asserting
+ ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
+ fi
+
+ # Some tests need ipv6, upstream bug #667468
+ if [[ -n "${IPV6_DISABLED}" ]]; then
+ sed -i -e "/gdbus\/peer-to-peer/d" gio/tests/gdbus-peer.c || die
+ sed -i -e "/gdbus\/delayed-message-processing/d" gio/tests/gdbus-peer.c || die
+ sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c || die
+ fi
+
+ # thread test fails, upstream bug #679306
+ # FIXME: we need to check if it's still failing as upstream thinks something
+ # is wrong in our setups
+ #epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+
+ # This test is prone to fail, bug #504024, upstream bug #723719
+ sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die
+ else
+ # Don't build tests, also prevents extra deps, bug #512022
+ sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
+ fi
+
+ # gdbus-codegen is a separate package
+ epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
+
+ epatch "${FILESDIR}/${PN}-2.44.1-bionic-nameser.patch"
+
+ # leave python shebang alone
+ sed -e '/${PYTHON}/d' \
+ -i glib/Makefile.{am,in} || die
+
+ # Gentoo handles completions in a different directory
+ sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+ gio/Makefile.am || die
+
+ epatch_user
+
+ # Also needed to prevent cross-compile failures, see bug #267603
+ eautoreconf
+
+ gnome2_src_prepare
+
+ epunt_cxx
+}
+
+multilib_src_configure() {
+ # Avoid circular depend with dev-util/pkgconfig and
+ # native builds (cross-compiles won't need pkg-config
+ # in the target ROOT to work here)
+ if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
+ if has_version sys-apps/dbus; then
+ export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+ export DBUS1_LIBS="-ldbus-1"
+ fi
+ export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+ export LIBFFI_LIBS="-lffi"
+ fi
+
+ # These configure tests don't work when cross-compiling.
+ if tc-is-cross-compiler ; then
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756473
+ case ${CHOST} in
+ hppa*|metag*) export glib_cv_stack_grows=yes ;;
+ *) export glib_cv_stack_grows=no ;;
+ esac
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756474
+ export glib_cv_uscore=no
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756475
+ export ac_cv_func_posix_get{pwuid,grgid}_r=yes
+ fi
+
+ local myconf
+
+ case "${CHOST}" in
+ *-mingw*) myconf="${myconf} --with-threads=win32" ;;
+ *) myconf="${myconf} --with-threads=posix" ;;
+ esac
+
+ # FIXME: Always use internal libpcre, bug #254659
+ # (maybe consider going back to system lib)
+ # libelf used only by the gresource bin
+ ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+ $(use_enable xattr) \
+ $(use_enable fam) \
+ $(use_enable selinux) \
+ $(use_enable static-libs static) \
+ $(use_enable systemtap dtrace) \
+ $(use_enable systemtap systemtap) \
+ $(multilib_native_use_enable utils libelf) \
+ --disable-compile-warnings \
+ --enable-man \
+ --with-pcre=internal \
+ --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+ if multilib_is_native_abi; then
+ local d
+ for d in glib gio gobject; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ export XDG_CONFIG_DIRS=/etc/xdg
+ export XDG_DATA_DIRS=/usr/local/share:/usr/share
+ export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+ unset GSETTINGS_BACKEND # bug 352451
+ export LC_TIME=C # bug #411967
+ python_export_best
+
+ # Related test is a bit nitpicking
+ mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+ chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+ # Hardened: gdb needs this, bug #338891
+ if host-is-pax ; then
+ pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+ || die "Hardened adjustment failed"
+ fi
+
+ # Need X for dbus-launch session X11 initialization
+ Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS ChangeLog* NEWS* README"
+ einstalldocs
+
+ if use utils ; then
+ python_replicate_script "${ED}"/usr/bin/gtester-report
+ else
+ rm "${ED}usr/bin/gtester-report"
+ rm "${ED}usr/share/man/man1/gtester-report.1"
+ fi
+
+ # Do not install charset.alias even if generated, leave it to libiconv
+ rm -f "${ED}/usr/lib/charset.alias"
+
+ # Don't install gdb python macros, bug 291328
+ rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ if has_version '<x11-libs/gtk+-3.0.12:3'; then
+ # To have a clear upgrade path for gtk+-3.0.x users, have to resort to
+ # a warning instead of a blocker
+ ewarn
+ ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
+ ewarn "You should upgrade to a newer version of gtk+:3 immediately."
+ fi
+}
diff --git a/dev-libs/glib/glib-2.44.1.ebuild b/dev-libs/glib/glib-2.44.1.ebuild
index 9c642db..7cfb342 100644
--- a/dev-libs/glib/glib-2.44.1.ebuild
+++ b/dev-libs/glib/glib-2.44.1.ebuild
@@ -32,7 +32,7 @@
test? ( ${PYTHON_REQUIRED_USE} )
"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
RDEPEND="
!<dev-util/gdbus-codegen-${PV}
diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml
index 8f096da..9dda65d 100644
--- a/dev-libs/glib/metadata.xml
+++ b/dev-libs/glib/metadata.xml
@@ -11,7 +11,8 @@
<flag name="systemtap">Build support for profiling and tracing using
<pkg>dev-util/systemtap</pkg></flag>
<flag name="utils">Install gtester-report utility to generate test
- report files for your software.</flag>
+ report files for your software; build gresource utility with
+ ELF support.</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:gnome:glib</remote-id>
diff --git a/dev-libs/gmp/gmp-6.0.0a.ebuild b/dev-libs/gmp/gmp-6.0.0a.ebuild
index 44d1647..b10c9d1 100644
--- a/dev-libs/gmp/gmp-6.0.0a.ebuild
+++ b/dev-libs/gmp/gmp-6.0.0a.ebuild
@@ -17,7 +17,7 @@
LICENSE="|| ( LGPL-3+ GPL-2+ )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="doc cxx pgo static-libs"
DEPEND="sys-devel/m4
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.44.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.44.0.ebuild
index 45624c6..7cee7a1 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.44.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.44.0.ebuild
@@ -12,7 +12,7 @@
LICENSE="HPND"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild
index 05f87ea..c896d46 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild
@@ -19,7 +19,7 @@
${PYTHON_REQUIRED_USE}
test? ( cairo )
"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# virtual/pkgconfig needed at runtime, bug #505408
# We force glib and goi to be in sync by this way as explained in bug #518424
diff --git a/dev-libs/gom/gom-0.3.0.ebuild b/dev-libs/gom/gom-0.3.0.ebuild
index e613aa7..c548aa5 100644
--- a/dev-libs/gom/gom-0.3.0.ebuild
+++ b/dev-libs/gom/gom-0.3.0.ebuild
@@ -26,7 +26,7 @@
>=dev-util/intltool-0.40.0
sys-devel/gettext
virtual/pkgconfig
- test? ( x11-libs/gdk-pixbuf )
+ x11-libs/gdk-pixbuf
"
src_configure() {
diff --git a/dev-libs/gom/gom-0.3.1.ebuild b/dev-libs/gom/gom-0.3.1.ebuild
index 340b4f1..c64ba52 100644
--- a/dev-libs/gom/gom-0.3.1.ebuild
+++ b/dev-libs/gom/gom-0.3.1.ebuild
@@ -26,7 +26,7 @@
>=dev-util/intltool-0.40.0
sys-devel/gettext
virtual/pkgconfig
- test? ( x11-libs/gdk-pixbuf )
+ x11-libs/gdk-pixbuf
"
src_configure() {
diff --git a/dev-libs/json-c/json-c-0.12.ebuild b/dev-libs/json-c/json-c-0.12.ebuild
index e01bc48..ed1c33c 100644
--- a/dev-libs/json-c/json-c-0.12.ebuild
+++ b/dev-libs/json-c/json-c-0.12.ebuild
@@ -14,7 +14,7 @@
LICENSE="MIT"
SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc static-libs"
RDEPEND="
diff --git a/dev-libs/leveldb/leveldb-1.18-r1.ebuild b/dev-libs/leveldb/leveldb-1.18-r1.ebuild
index d50d0be..e31c42c 100644
--- a/dev-libs/leveldb/leveldb-1.18-r1.ebuild
+++ b/dev-libs/leveldb/leveldb-1.18-r1.ebuild
@@ -12,8 +12,8 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc"
+KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="+snappy static-libs +tcmalloc kernel_FreeBSD"
DEPEND="tcmalloc? ( dev-util/google-perftools )
snappy? (
@@ -38,8 +38,14 @@
# which the Makefile runs for us automatically.
tc-export AR CC CXX
export OPT="-DNDEBUG ${CPPFLAGS}"
+ local targetos
+ if use kernel_FreeBSD; then
+ targetos="FreeBSD"
+ else
+ targetos="Linux"
+ fi
- TARGET_OS="Linux" \
+ TARGET_OS=${targetos} \
USE_SNAPPY=$(usex snappy) \
USE_TCMALLOC=no \
TMPDIR=${T} \
diff --git a/dev-libs/libdbh/Manifest b/dev-libs/libdbh/Manifest
new file mode 100644
index 0000000..9f816f5
--- /dev/null
+++ b/dev-libs/libdbh/Manifest
@@ -0,0 +1 @@
+DIST libdbh2-5.0.19.tar.gz 1608949 SHA256 2e534f24c4df99f6e2ba726e3982d7361b56361ed5eb16e7dfdc07fac26ceba2 SHA512 35c368e82f8f7c4c7d4960731214ff3863530795b16716c0be7351e0ca10740ac26a99930369f4df78c8e108d929124c222b5942ce5f521ecb58afd38d55bbe9 WHIRLPOOL 33c68c83e55f90bfa19ee10e9ba37b1dba95d1506b40bb9b992df151e96f35dc87d0969bfc3c2c8a0d5d95862a5d36e9a37199a7e94af26128870a9f3ff5939b
diff --git a/dev-libs/libdbh/libdbh-5.0.19.ebuild b/dev-libs/libdbh/libdbh-5.0.19.ebuild
new file mode 100644
index 0000000..633df46
--- /dev/null
+++ b/dev-libs/libdbh/libdbh-5.0.19.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=${PN}2-${PV}
+
+DESCRIPTION="a small library to create and manage 64-bit disk based hash tables"
+HOMEPAGE="https://www.gnu.org/software/libdbh/"
+SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+ DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+
+src_prepare() {
+ sed -i -e "s:-O2:${CFLAGS}:" m4/rfm-conditionals.m4 || die
+ eautoreconf
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/dev-libs/libdbh/metadata.xml b/dev-libs/libdbh/metadata.xml
new file mode 100644
index 0000000..fcc6fe9
--- /dev/null
+++ b/dev-libs/libdbh/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>angelos@gentoo.org</email>
+ <name>Christoph Mende</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-libs/libevent/libevent-2.0.22-r2.ebuild b/dev-libs/libevent/libevent-2.0.22-r2.ebuild
new file mode 100644
index 0000000..b30827f
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.0.22-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils libtool multilib-minimal
+
+MY_P="${P}-stable"
+
+DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor"
+HOMEPAGE="http://libevent.org/"
+SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+# libevent-2.0.so.5
+SLOT="0/2.0-5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug libressl +ssl static-libs test +threads"
+
+DEPEND="
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
+"
+RDEPEND="
+ ${DEPEND}
+ !<=dev-libs/9libs-1.0
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/event2/event-config.h
+)
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( README ChangeLog )
+
+src_prepare() {
+ elibtoolize
+
+ # don't waste time building tests/samples
+ # https://github.com/libevent/libevent/pull/143
+ # https://github.com/libevent/libevent/pull/144
+ sed -i \
+ -e 's|^\(SUBDIRS =.*\)sample test\(.*\)$|\1\2|' \
+ Makefile.in || die "sed Makefile.in failed"
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" \
+ econf \
+ $(use_enable debug debug-mode) \
+ $(use_enable debug malloc-replacement) \
+ $(use_enable ssl openssl) \
+ $(use_enable static-libs static) \
+ $(use_enable threads thread-support)
+}
+
+src_test() {
+ # The test suite doesn't quite work (see bug #406801 for the latest
+ # installment in a riveting series of reports).
+ :
+ # emake -C test check | tee "${T}"/tests
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/dev-libs/libevent/libevent-2.1.5-r3.ebuild b/dev-libs/libevent/libevent-2.1.5-r3.ebuild
new file mode 100644
index 0000000..95610a9
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.1.5-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils libtool multilib-minimal
+
+MY_P="${P}-beta"
+
+DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor"
+HOMEPAGE="http://libevent.org/"
+SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+# libevent-2.1.so.5
+SLOT="0/2.1-5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug libressl +ssl static-libs test +threads"
+
+DEPEND="
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
+"
+RDEPEND="
+ ${DEPEND}
+ !<=dev-libs/9libs-1.0
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/event2/event-config.h
+)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ elibtoolize
+ # don't waste time building tests
+ # https://github.com/libevent/libevent/pull/144
+ sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
+}
+
+multilib_src_configure() {
+ # fix out-of-source builds
+ mkdir -p test || die
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ $(use_enable debug debug-mode) \
+ $(use_enable debug malloc-replacement) \
+ $(use_enable ssl openssl) \
+ $(use_enable static-libs static) \
+ $(use_enable threads thread-support)
+}
+
+src_test() {
+ # The test suite doesn't quite work (see bug #406801 for the latest
+ # installment in a riveting series of reports).
+ :
+ # emake -C test check | tee "${T}"/tests
+}
+
+DOCS=( ChangeLog{,-1.4,-2.0} )
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index fc1817a..179af26 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,9 +12,13 @@
LICENSE="BSD"
SLOT="0"
KEYWORDS=""
-IUSE="debug +ssl static-libs test +threads"
+IUSE="debug libressl +ssl static-libs test +threads"
-DEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )"
+DEPEND="
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )"
RDEPEND="
${DEPEND}
!<=dev-libs/9libs-1.0
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index dced38d..1d359c5 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,6 +1,5 @@
DIST libgit2-0.20.0.tar.gz 3255478 SHA256 509ab8091623df5b745cd13682539ca2dc2372051d3418355a7acc5b4a20c2f1 SHA512 0512a2d6daa149f6c6bada3b9ea8b228d6ba9180d7030cf41f3e9888fb15f068ef7c7722f636f8750c4643b58453299179d73e0b71e08ae79439060a27efe9d6 WHIRLPOOL 996a3639bd8f598b07f12115a2af0b5d28de51163338c34b39872046776a0144e57a0598ab493dcf717fa16ed093d9b00546009d2a4426a27a0451e97759783b
DIST libgit2-0.21.5.tar.gz 3460366 SHA256 46ca07becbdcda0da96a553d9f45e64ead29276ba14049e4bc8e2730ed1aa494 SHA512 080624aa1479b9b393d4b3341b2dd5640e7d61f21c44b04c54bdd6be589fcdfc628219046f3dfda48f563560a1db1f9ddf0626d2802a1f60122b9609d0412dce WHIRLPOOL 6bdc7d40afb9bf427ffe96d87a920b4421f902f0548018477324d69a563751696a1288c5564d87efbabac779273f1992f6d79f9ac101814cfbcbcdc11584dba3
DIST libgit2-0.22.3.tar.gz 3594098 SHA256 511fe60e7c12c3525b4e0489861e5c1fe0e331d604bee9a3dfb8420c2f288f60 SHA512 2bbb04789702d206e65b18d96752113d2c1b0af7b7779cf7c90c326ec47f535b36327b0171ae1f614179c24275e2c04c51d62e44eedba87530509a29c15ab25c WHIRLPOOL 2fbb2739856e6cef3ae1a103e1b999b3362c79536423e5cd6d46d60276a14e87298ec36e2e03e8ea0fa8ebe28a140ba20ce077fb30ab3fc0d1337ec3b04fde87
-DIST libgit2-0.23.0.tar.gz 3714985 SHA256 49d75c601eb619481ecc0a79f3356cc26b89dfa646f2268e434d7b4c8d90c8a1 SHA512 e0f414529ba6faf877b1848101fda3f5dc4b84e75c56996378c098d1bdc5f03e60c22a1ee5768a8a9a5d5aab313f52ce8df5b1bd3f9bfb2c36aae7117a368f22 WHIRLPOOL 9716f3ac340bd28d151814488898a09df8f867b7a40b59e71c12b6d7d8af3c7ac41ac0ae8de239be0743db03b4451ca87462835faac7f6938d5a82564a7b1f13
-DIST libgit2-0.23.1.tar.gz 3717102 SHA256 113748018e5876bea84af5c749af25b62f58cb4ca82730dcbffaac90c87f7056 SHA512 3932c7d50dc9b6a78ca38edc76be9c78d969062bad4e0a81d46d9f461e35b7bf2afc3bdaf0024ed889db49c02c5a20163cf6e559f06e7364bc5290d6322de14e WHIRLPOOL f3cbe285cee813b92059765c2fb2672b26e154d671604609f2d26fcb26534e3f831d47b09a006718451fe0c40fa01fd58e740a3776aa84afca59fbf2884a2956
DIST libgit2-0.23.2.tar.gz 3717748 SHA256 20c0a6ee92c0e19207dac6ddc336b4ae4a1c4ddf91be0891e4b6e6ccba16df0b SHA512 aa11be93a135eeddd07d2f2a4cba019d42e33f185141caac1d0f89083652aa612f1381e3011396c6078b46f8bbeea894eb5fc25fcebbe13cb14dd9dfd8f40240 WHIRLPOOL 0f83fb7a15f77a13b5e06d81337f0f28bc2e55340b204d8009f5fb7e6ab47e7beb4c79c264a27e581696c87c5fe42927bbef15124c036d2f634ff47a5f8197a9
+DIST libgit2-0.23.3.tar.gz 3718675 SHA256 2d5c80426675928cda6e9a313ae38b2a72c1a55b7c3d4884dc21f7b312ff1eae SHA512 5c4a33e9d0a34bd3c4ab61c9c3fd45fe84204c6941506cd989acda552932205e2edadd9b731cb19c650b1ea69e5ac1ac313c55ea7881ccb8a17f3a3c8db03ef8 WHIRLPOOL 068d1de53a7f8d832ebf38dec674de613327a9ba7c791c270f63e681c5ca09ed578e87361d5f69976883e109b7e818d3b3c7b27c6ae474db197cfe0fe5f735be
diff --git a/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild b/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild
index e6f27ac..3fdf8df 100644
--- a/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild
+++ b/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild
@@ -58,7 +58,7 @@
cmake-utils_src_install
if use examples ; then
- find examples -name .gitignore -delete || die
+ find examples -name .gitignore -delete || die
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
diff --git a/dev-libs/libgit2/libgit2-0.21.5.ebuild b/dev-libs/libgit2/libgit2-0.21.5.ebuild
index 239be84..4397ec8 100644
--- a/dev-libs/libgit2/libgit2-0.21.5.ebuild
+++ b/dev-libs/libgit2/libgit2-0.21.5.ebuild
@@ -56,7 +56,7 @@
cmake-utils_src_install
if use examples ; then
- find examples -name .gitignore -delete || die
+ find examples -name .gitignore -delete || die
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
diff --git a/dev-libs/libgit2/libgit2-0.22.3.ebuild b/dev-libs/libgit2/libgit2-0.22.3.ebuild
index 4371996..cfd605b 100644
--- a/dev-libs/libgit2/libgit2-0.22.3.ebuild
+++ b/dev-libs/libgit2/libgit2-0.22.3.ebuild
@@ -68,7 +68,7 @@
cmake-utils_src_install
if use examples ; then
- find examples -name .gitignore -delete || die
+ find examples -name .gitignore -delete || die
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
diff --git a/dev-libs/libgit2/libgit2-0.23.0.ebuild b/dev-libs/libgit2/libgit2-0.23.0.ebuild
deleted file mode 100644
index b5c16ea..0000000
--- a/dev-libs/libgit2/libgit2-0.23.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/23"
-IUSE="examples gssapi ssh test threads trace"
-
-RDEPEND="
- dev-libs/openssl:0
- sys-libs/zlib
- net-libs/http-parser
- gssapi? ( virtual/krb5 )
- ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
- # skip online tests
- sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- $(cmake-utils_use_build test CLAR)
- $(cmake-utils_use_enable trace TRACE)
- $(cmake-utils_use_use gssapi GSSAPI)
- $(cmake-utils_use_use ssh SSH)
- $(cmake-utils_use threads THREADSAFE)
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- if [[ ${EUID} -eq 0 ]] ; then
- # repo::iterator::fs_preserves_error fails if run as root
- # since root can still access dirs with 0000 perms
- ewarn "Skipping tests: non-root privileges are required for all tests to pass"
- else
- local TEST_VERBOSE=1
- cmake-utils_src_test
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use examples ; then
- find examples -name .gitignore -delete || die
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-libs/libgit2/libgit2-0.23.1.ebuild b/dev-libs/libgit2/libgit2-0.23.1.ebuild
deleted file mode 100644
index b5c16ea..0000000
--- a/dev-libs/libgit2/libgit2-0.23.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/23"
-IUSE="examples gssapi ssh test threads trace"
-
-RDEPEND="
- dev-libs/openssl:0
- sys-libs/zlib
- net-libs/http-parser
- gssapi? ( virtual/krb5 )
- ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
- # skip online tests
- sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- $(cmake-utils_use_build test CLAR)
- $(cmake-utils_use_enable trace TRACE)
- $(cmake-utils_use_use gssapi GSSAPI)
- $(cmake-utils_use_use ssh SSH)
- $(cmake-utils_use threads THREADSAFE)
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- if [[ ${EUID} -eq 0 ]] ; then
- # repo::iterator::fs_preserves_error fails if run as root
- # since root can still access dirs with 0000 perms
- ewarn "Skipping tests: non-root privileges are required for all tests to pass"
- else
- local TEST_VERBOSE=1
- cmake-utils_src_test
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use examples ; then
- find examples -name .gitignore -delete || die
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-libs/libgit2/libgit2-0.23.2-r1.ebuild b/dev-libs/libgit2/libgit2-0.23.2-r1.ebuild
new file mode 100644
index 0000000..ab7043e
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.23.2-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/23"
+IUSE="examples gssapi libressl ssh test threads trace"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ sys-libs/zlib
+ net-libs/http-parser
+ gssapi? ( virtual/krb5 )
+ ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
+
+src_prepare() {
+ # skip online tests
+ sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+ $(cmake-utils_use_build test CLAR)
+ $(cmake-utils_use_enable trace TRACE)
+ $(cmake-utils_use_use gssapi GSSAPI)
+ $(cmake-utils_use_use ssh SSH)
+ $(cmake-utils_use threads THREADSAFE)
+ )
+ cmake-utils_src_configure
+}
+
+src_test() {
+ if [[ ${EUID} -eq 0 ]] ; then
+ # repo::iterator::fs_preserves_error fails if run as root
+ # since root can still access dirs with 0000 perms
+ ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+ else
+ local TEST_VERBOSE=1
+ cmake-utils_src_test
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use examples ; then
+ find examples -name .gitignore -delete || die
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-libs/libgit2/libgit2-0.23.2.ebuild b/dev-libs/libgit2/libgit2-0.23.2.ebuild
deleted file mode 100644
index b5c16ea..0000000
--- a/dev-libs/libgit2/libgit2-0.23.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/23"
-IUSE="examples gssapi ssh test threads trace"
-
-RDEPEND="
- dev-libs/openssl:0
- sys-libs/zlib
- net-libs/http-parser
- gssapi? ( virtual/krb5 )
- ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
- # skip online tests
- sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- $(cmake-utils_use_build test CLAR)
- $(cmake-utils_use_enable trace TRACE)
- $(cmake-utils_use_use gssapi GSSAPI)
- $(cmake-utils_use_use ssh SSH)
- $(cmake-utils_use threads THREADSAFE)
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- if [[ ${EUID} -eq 0 ]] ; then
- # repo::iterator::fs_preserves_error fails if run as root
- # since root can still access dirs with 0000 perms
- ewarn "Skipping tests: non-root privileges are required for all tests to pass"
- else
- local TEST_VERBOSE=1
- cmake-utils_src_test
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use examples ; then
- find examples -name .gitignore -delete || die
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-libs/libgit2/libgit2-0.23.3.ebuild b/dev-libs/libgit2/libgit2-0.23.3.ebuild
new file mode 100644
index 0000000..ab7043e
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.23.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/23"
+IUSE="examples gssapi libressl ssh test threads trace"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ sys-libs/zlib
+ net-libs/http-parser
+ gssapi? ( virtual/krb5 )
+ ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
+
+src_prepare() {
+ # skip online tests
+ sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+ $(cmake-utils_use_build test CLAR)
+ $(cmake-utils_use_enable trace TRACE)
+ $(cmake-utils_use_use gssapi GSSAPI)
+ $(cmake-utils_use_use ssh SSH)
+ $(cmake-utils_use threads THREADSAFE)
+ )
+ cmake-utils_src_configure
+}
+
+src_test() {
+ if [[ ${EUID} -eq 0 ]] ; then
+ # repo::iterator::fs_preserves_error fails if run as root
+ # since root can still access dirs with 0000 perms
+ ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+ else
+ local TEST_VERBOSE=1
+ cmake-utils_src_test
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use examples ; then
+ find examples -name .gitignore -delete || die
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
index b5c16ea..ab7043e 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -19,10 +19,11 @@
LICENSE="GPL-2-with-linking-exception"
SLOT="0/23"
-IUSE="examples gssapi ssh test threads trace"
+IUSE="examples gssapi libressl ssh test threads trace"
RDEPEND="
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
sys-libs/zlib
net-libs/http-parser
gssapi? ( virtual/krb5 )
@@ -68,7 +69,7 @@
cmake-utils_src_install
if use examples ; then
- find examples -name .gitignore -delete || die
+ find examples -name .gitignore -delete || die
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
diff --git a/dev-libs/libiconv/libiconv-1.14-r2.ebuild b/dev-libs/libiconv/libiconv-1.14-r2.ebuild
new file mode 100644
index 0000000..ae98764
--- /dev/null
+++ b/dev-libs/libiconv/libiconv-1.14-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
+HOMEPAGE="https://www.gnu.org/software/libiconv/"
+SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="static-libs"
+
+DEPEND="!sys-libs/glibc
+ !userland_GNU? ( !sys-apps/man-pages )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-no-gets.patch
+ elibtoolize
+}
+
+multilib_src_configure() {
+ # Disable NLS support because that creates a circular dependency
+ # between libiconv and gettext
+ ECONF_SOURCE="${S}" \
+ econf \
+ --docdir="\$(datarootdir)/doc/${PF}/html" \
+ --disable-nls \
+ --enable-shared \
+ $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+ use static-libs || find "${ED}" -name 'lib*.la' -delete
+
+ # Install in /lib as utils installed in /lib like gnutar
+ # can depend on this
+ gen_usr_ldscript -a iconv charset
+
+ # If we have a GNU userland, we probably have sys-apps/man-pages
+ # installed, which means we want to rename our copies #503162.
+ # The use of USELAND=GNU is kind of a hack though ...
+ if use userland_GNU ; then
+ cd "${ED}"/usr/share/man || die
+ local f
+ for f in man*/*.[0-9] ; do
+ mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
+ done
+ fi
+}
diff --git a/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
new file mode 100644
index 0000000..8c4a55f
--- /dev/null
+++ b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2012-07-11 14:07:33.167169453 -0400
++++ b/configure.ac 2015-10-04 09:59:31.023669616 -0400
+@@ -66,7 +66,7 @@
+ AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+
+ LT_LIB_M
+-LIBINDICATOR_LIBS+="$LIBM"
++LIBINDICATOR_LIBS+=" $LIBM"
+
+ ##############################
+ # Custom Junk
diff --git a/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild b/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
index 1438177..da93c44 100644
--- a/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=4
-inherit eutils flag-o-matic virtualx
+inherit autotools eutils flag-o-matic virtualx
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@
virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild b/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
index 2e6134c..d19d3a1 100644
--- a/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=4
-inherit eutils flag-o-matic virtualx
+inherit autotools eutils flag-o-matic virtualx
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@
virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild
index 8180ac3..ef3c8a5 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=4
-inherit eutils flag-o-matic virtualx
+inherit autotools eutils flag-o-matic virtualx
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@
virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
index a837b39..d9f5a82 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit eutils flag-o-matic virtualx multilib-minimal
+inherit autotools eutils flag-o-matic virtualx multilib-minimal
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@
virtual/pkgconfig[${MULTILIB_USEDEP}]
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
multilib_src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild
index c0bf1d5..6210182 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=4
-inherit eutils flag-o-matic virtualx
+inherit autotools eutils flag-o-matic virtualx
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@
virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index 4300524..d28de01 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit eutils flag-o-matic virtualx multilib-minimal
+inherit autotools eutils flag-o-matic virtualx multilib-minimal
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@
virtual/pkgconfig[${MULTILIB_USEDEP}]
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
multilib_src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libinput/libinput-1.0.1.ebuild b/dev-libs/libinput/libinput-1.0.1.ebuild
index 3a5f1f5..1b8dca4 100644
--- a/dev-libs/libinput/libinput-1.0.1.ebuild
+++ b/dev-libs/libinput/libinput-1.0.1.ebuild
@@ -11,7 +11,7 @@
LICENSE="MIT"
SLOT="0/10"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE="test"
# Tests require write access to udev rules directory which is a no-no for live system.
# Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
new file mode 100644
index 0000000..ea4c35a
--- /dev/null
+++ b/dev-libs/libintl/Manifest
@@ -0,0 +1 @@
+DIST gettext-0.19.6.tar.gz 18619659 SHA256 ed4b4c19bd3a3034eb6769500a3592ff616759ef43cf30586dbb7a17c9dd695d SHA512 46adfd4a6d0038aba999658bebe51117e3ab3dc149a9054c1087d3e79ec7ba3371a7e78a8ca30a8872d162c2dc44aba6e67e4d64808c4f92e1e2bd674174f1db WHIRLPOOL 1988f9ddfd603734b4a632291925c8e5b31e7384eea1c6641d52aa58cb6b8f892e7664dd145a53435b7d2a4540ac65aeae1cb528a004c35832087c2820dafbcb
diff --git a/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch b/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch
new file mode 100644
index 0000000..bf96e69
--- /dev/null
+++ b/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch
@@ -0,0 +1,35 @@
+this has been sent upstream
+
+From eac944b0757963ac1ba035ea72617734510ede22 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Mon, 12 Oct 2015 17:58:51 -0400
+Subject: [PATCH] intl/localename: control langinfo.h inclusion
+
+This header is only used to work around buggy behavior in old versions
+of glibc, so do not include it all the time. Otherwise we get build
+failures on systems that do not provide langinfo.h.
+
+* gettext-runtime/intl/localename.c: Wrap langinfo.h include with same
+ifdefs used in the source later on.
+---
+ gettext-runtime/intl/localename.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
+index f8cf3f2..c27be86 100644
+--- a/gettext-runtime/intl/localename.c
++++ b/gettext-runtime/intl/localename.c
+@@ -38,7 +38,9 @@
+ # if defined __APPLE__ && defined __MACH__
+ # include <xlocale.h>
+ # endif
+-# include <langinfo.h>
++# if __GLIBC__ >= 2 && !defined __UCLIBC__
++# include <langinfo.h>
++# endif
+ # if !defined IN_LIBINTL
+ # include "glthread/lock.h"
+ # endif
+--
+2.5.2
+
diff --git a/dev-libs/libintl/libintl-0.19.6.ebuild b/dev-libs/libintl/libintl-0.19.6.ebuild
new file mode 100644
index 0000000..a8fbdac
--- /dev/null
+++ b/dev-libs/libintl/libintl-0.19.6.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Note: Keep version bumps in sync with sys-devel/gettext.
+
+EAPI="5"
+
+MY_P="gettext-${PV}"
+
+inherit eutils multilib-minimal toolchain-funcs libtool
+
+DESCRIPTION="the GNU international library (split out of gettext)"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="static-libs +threads"
+
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
+# Block C libraries known to provide libintl.
+RDEPEND="${DEPEND}
+ !sys-libs/glibc
+ !<sys-devel/gettext-0.19.6-r1"
+
+S="${WORKDIR}/${MY_P}/gettext-runtime"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.19.5-langinfo.patch
+
+ # The libtool files are stored higher up, so make sure we run in the
+ # whole tree and not just the subdir we build.
+ elibtoolize "${WORKDIR}"
+}
+
+multilib_src_configure() {
+ local myconf=(
+ # Emacs support is now in a separate package.
+ --without-emacs
+ --without-lispdir
+ # Normally this controls nls behavior in general, but the libintl
+ # subdir is skipped unless this is explicitly set. ugh.
+ --enable-nls
+ # This magic flag enables libintl.
+ --with-included-gettext
+ # The gettext package provides this library.
+ --disable-c++
+ --disable-libasprintf
+ # No java until someone cares.
+ --disable-java
+
+ $(use_enable static-libs static)
+ $(use_enable threads)
+ )
+ ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ # We only need things in the intl/ subdir.
+ emake DESTDIR="${D}" install -C intl
+
+ gen_usr_ldscript -a intl
+}
+
+multilib_src_install_all() {
+ use static-libs || prune_libtool_files --all
+
+ rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
+
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/dev-libs/libintl/metadata.xml b/dev-libs/libintl/metadata.xml
new file mode 100644
index 0000000..96a2d58
--- /dev/null
+++ b/dev-libs/libintl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+</pkgmetadata>
diff --git a/dev-libs/liblinear/liblinear-210-r1.ebuild b/dev-libs/liblinear/liblinear-210-r1.ebuild
new file mode 100644
index 0000000..cbd8d0e
--- /dev/null
+++ b/dev-libs/liblinear/liblinear-210-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="A Library for Large Linear Classification"
+HOMEPAGE="http://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
+SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="blas"
+
+RDEPEND="
+ blas? ( virtual/blas )
+"
+DEPEND="
+ ${RDEPEND}
+ blas? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+ sed -i \
+ -e '/^AR/s|=|?=|g' \
+ -e '/^RANLIB/s|=|?=|g' \
+ -e '/^CFLAGS/d;/^CXXFLAGS/d' \
+ blas/Makefile || die
+ sed -i \
+ -e 's|make|$(MAKE)|g' \
+ -e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
+ -e '/^CFLAGS/d;/^CXXFLAGS/d' \
+ -e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
+ Makefile || die
+ if use blas; then
+ sed -i -e 's:blas/blas.a::g' Makefile || die
+ fi
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ CFLAGS="${CFLAGS} -fPIC" \
+ CXXFLAGS="${CXXFLAGS} -fPIC" \
+ AR="$(tc-getAR) rcv" \
+ RANLIB="$(tc-getRANLIB)" \
+ LIBS="$(usex blas "$( $(tc-getPKG_CONFIG) --libs blas )" blas/blas.a)" \
+ lib all
+}
+
+src_install() {
+ dolib ${PN}.so.3
+ dosym ${PN}.so.3 /usr/$(get_libdir)/${PN}.so
+
+ newbin predict ${PN}-predict
+ newbin train ${PN}-train
+
+ doheader linear.h
+
+ dodoc README
+}
diff --git a/dev-libs/liblognorm/files/liblognorm-1.1.2-issue_135.patch b/dev-libs/liblognorm/files/liblognorm-1.1.2-issue_135.patch
new file mode 100644
index 0000000..4b4a063
--- /dev/null
+++ b/dev-libs/liblognorm/files/liblognorm-1.1.2-issue_135.patch
@@ -0,0 +1,110 @@
+From 4b35ca1e6fff50f47eb5419b879b287f49dcf1d8 Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards <rgerhards@adiscon.com>
+Date: Mon, 24 Aug 2015 09:05:52 +0200
+Subject: [PATCH] "fix": process last line if it misses the terminating LF
+
+This problem occurs with the very last line of a rulebase (at EOF).
+If it is not properly terminated (LF missing), it is silently ignored.
+Previous versions did obviously process lines in this case. While
+technically this is invalid input, we can't outrule that such rulebases
+exist. For example, they do in the rsyslog testbench, which made
+us aware of the problem (see https://github.com/rsyslog/rsyslog/issues/489 ).
+
+I think the proper way of addressing this is to process such lines without
+termination, as many other tools do as well.
+
+closes https://github.com/rsyslog/liblognorm/issues/135
+---
+ src/samp.c | 5 ++++-
+ tests/Makefile.am | 2 ++
+ tests/field_mac48.sh | 1 -
+ tests/missing_line_ending.rb | 1 +
+ tests/missing_line_ending.sh | 25 +++++++++++++++++++++++++
+ 5 files changed, 32 insertions(+), 2 deletions(-)
+ create mode 100644 tests/missing_line_ending.rb
+ create mode 100755 tests/missing_line_ending.sh
+
+diff --git a/src/samp.c b/src/samp.c
+index ef57047..0a9ae0a 100644
+--- a/src/samp.c
++++ b/src/samp.c
+@@ -801,7 +801,10 @@ ln_sampRead(ln_ctx ctx, FILE *const __restrict__ repo, int *const __restrict__ i
+ int c = fgetc(repo);
+ if(c == EOF) {
+ *isEof = 1;
+- goto done;
++ if(i == 0)
++ goto done;
++ else
++ done = 1; /* last line missing LF, still process it! */
+ } else if(c == '\n') {
+ ++linenbr;
+ if(!inParser && i != 0)
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index a3a3842..cfcf010 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -13,6 +13,7 @@ user_test_LDFLAGS = -no-install
+ TESTS_SHELLSCRIPTS = \
+ parser_whitespace.sh \
+ parser_LF.sh \
++ missing_line_ending.sh \
+ field_hexnumber.sh \
+ field_mac48.sh \
+ field_name_value.sh \
+@@ -54,6 +55,7 @@ REGEXP_TESTS = \
+ field_regex_while_regex_support_is_disabled.sh
+
+ EXTRA_DIST = exec.sh \
++ missing_line_ending.rb \
+ $(TESTS_SHELLSCRIPTS) \
+ $(REGEXP_TESTS) \
+ $(json_eq_self_sources) \
+diff --git a/tests/field_mac48.sh b/tests/field_mac48.sh
+index bd2898e..0f17166 100755
+--- a/tests/field_mac48.sh
++++ b/tests/field_mac48.sh
+@@ -21,4 +21,3 @@ assert_output_json_eq '{ "originalmsg": "f0:f6:1c:xf:cc:a2", "unparsed-data": "f
+
+
+ cleanup_tmp_files
+-
+diff --git a/tests/missing_line_ending.rb b/tests/missing_line_ending.rb
+new file mode 100644
+index 0000000..b252483
+--- /dev/null
++++ b/tests/missing_line_ending.rb
+@@ -0,0 +1 @@
++rule=:%field:mac48%
+\ No newline at end of file
+diff --git a/tests/missing_line_ending.sh b/tests/missing_line_ending.sh
+new file mode 100755
+index 0000000..18f4d2c
+--- /dev/null
++++ b/tests/missing_line_ending.sh
+@@ -0,0 +1,25 @@
++# added 2015-05-05 by Rainer Gerhards
++# This file is part of the liblognorm project, released under ASL 2.0
++. $srcdir/exec.sh
++
++test_def $0 "dmac48 syntax"
++# we need to use a canned file, as we cannot easily reproduce the
++# malformed lines
++cp missing_line_ending.rb $(rulebase_file_name)
++
++execute 'f0:f6:1c:5f:cc:a2'
++assert_output_json_eq '{"field": "f0:f6:1c:5f:cc:a2"}'
++
++execute 'f0-f6-1c-5f-cc-a2'
++assert_output_json_eq '{"field": "f0-f6-1c-5f-cc-a2"}'
++
++# things that need to NOT match
++
++execute 'f0-f6:1c:5f:cc-a2'
++assert_output_json_eq '{ "originalmsg": "f0-f6:1c:5f:cc-a2", "unparsed-data": "f0-f6:1c:5f:cc-a2" }'
++
++execute 'f0:f6:1c:xf:cc:a2'
++assert_output_json_eq '{ "originalmsg": "f0:f6:1c:xf:cc:a2", "unparsed-data": "f0:f6:1c:xf:cc:a2" }'
++
++
++#cleanup_tmp_files
diff --git a/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild b/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
new file mode 100644
index 0000000..066a0c4
--- /dev/null
+++ b/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF="yes"
+
+inherit autotools-utils
+
+DESCRIPTION="Fast samples-based log normalization library"
+HOMEPAGE="http://www.liblognorm.com"
+SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
+IUSE="debug doc static-libs test"
+
+RDEPEND="
+ >=dev-libs/libestr-0.1.3
+ >=dev-libs/json-c-0.11:=
+"
+
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ doc? ( >=dev-python/sphinx-1.2.2 )
+"
+
+DOCS=( ChangeLog )
+
+PATCHES=(
+ "${FILESDIR}"/respect_CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.1.2-issue_135.patch
+)
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable doc docs)
+ $(use_enable test testbench)
+ $(use_enable debug)
+ --disable-regexp
+ )
+
+ autotools-utils_src_configure
+}
+
+src_test() {
+ # When adding new tests via patches we have to make them executable
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ emake --jobs 1 check
+}
diff --git a/dev-libs/liblognorm/liblognorm-1.1.2.ebuild b/dev-libs/liblognorm/liblognorm-1.1.2.ebuild
deleted file mode 100644
index 5c28073..0000000
--- a/dev-libs/liblognorm/liblognorm-1.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF="yes"
-
-inherit autotools-utils
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE="debug doc pcre static-libs test"
-
-RDEPEND="
- >=dev-libs/json-c-0.11:=
- >=dev-libs/libestr-0.1.3
- pcre? ( >=dev-libs/libpcre-8.35 )
-"
-
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- doc? ( >=dev-python/sphinx-1.2.2 )
-"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
- "${FILESDIR}"/respect_CFLAGS.patch
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable doc docs)
- $(use_enable pcre regexp)
- $(use_enable test testbench)
- )
-
- autotools-utils_src_configure
-}
-
-src_test() {
- emake --jobs 1 check
-}
diff --git a/dev-libs/liboil/liboil-0.3.17.ebuild b/dev-libs/liboil/liboil-0.3.17.ebuild
index 9cee2b8..b4500f4 100644
--- a/dev-libs/liboil/liboil-0.3.17.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17.ebuild
@@ -46,7 +46,7 @@
src_install() {
emake DESTDIR="${D}" install || die
- dodoc AUTHORS BUG-REPORTING HACKING NEWS README || die
+ dodoc AUTHORS BUG-REPORTING HACKING NEWS README || die
}
pkg_postinst() {
diff --git a/dev-libs/libpwquality/libpwquality-1.3.0.ebuild b/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
index e149f27..5fdd69b 100644
--- a/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
@@ -13,7 +13,7 @@
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE="pam python static-libs"
RDEPEND="
diff --git a/dev-libs/libtubo/Manifest b/dev-libs/libtubo/Manifest
new file mode 100644
index 0000000..99f5e1d
--- /dev/null
+++ b/dev-libs/libtubo/Manifest
@@ -0,0 +1 @@
+DIST libtubo0-5.0.15.tar.bz2 389945 SHA256 98f6d14f6a2688bd2435c73b254f23f4b4f3e5f3a4be56d843f7a3cdf0ec31db SHA512 148147ef30b4f803ed3e45d07b85ce9fe68750938fd6a1f5e87f08e1da41d633b99934f0766ba0f62c793bd664ab43335e273068bbae1d2fe06f0cc9825d1d98 WHIRLPOOL d792fa428afe2593ad84e5293834e95b828203ca80b0aa685feddce467a5f07939e6483799905e5a365619c27857f4e60b410d4d58e74c9013b6f673878212ba
diff --git a/dev-libs/libtubo/libtubo-5.0.15.ebuild b/dev-libs/libtubo/libtubo-5.0.15.ebuild
new file mode 100644
index 0000000..081a357
--- /dev/null
+++ b/dev-libs/libtubo/libtubo-5.0.15.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+MY_P=${PN}0-${PV}
+
+DESCRIPTION="small and simple interprocess communication library"
+HOMEPAGE="http://xffm.org/libtubo"
+SRC_URI="mirror://sourceforge/xffm/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+ DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/dev-libs/libtubo/metadata.xml b/dev-libs/libtubo/metadata.xml
new file mode 100644
index 0000000..fcc6fe9
--- /dev/null
+++ b/dev-libs/libtubo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>angelos@gentoo.org</email>
+ <name>Christoph Mende</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 42882ca..1689008 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,3 +1,4 @@
DIST libwacom-0.11.tar.bz2 424554 SHA256 995f192e53f09444b79b66986227ebbac477520956363dededa19af3d8746284 SHA512 465f1ea9354bcba7d1c5d9fe146192b7ba1593973690718b2584b4786feb434f672556e7eed799761f96a37fe79bd14ae33ab7695d3ce9d5214cf9bc5b26eecc WHIRLPOOL 7f29b09a9bdee0d9cb2f5712414bdbcccf1b2a31a387020de2c1f911411934a3ae61a1d430b40e3402282fbc60e0d184b82c1cd524e43c8417d678f27063f607
DIST libwacom-0.12.tar.bz2 441360 SHA256 487baeb0b2067fd8ae3871e4a5971684878a35bb5f9c63d6a34fcc7612004d08 SHA512 1dcb7fd8ac9230410f4a582d4150856845a4f4ab545dae331b25efa634161b900c39b6a379174f795b692d2ef6b3887b6e5c175b73c3cfdfc37b182ff0218872 WHIRLPOOL 147dc4f0d834e64e4b2dbd7848abc50a38da7b15bf7e93f76e0a109ae412b4f0cd24053f4694f2703de4d07acdbfb7cc199ebd193e3ab13b2aa9b57498d16a0a
DIST libwacom-0.13.tar.bz2 439767 SHA256 976b8801007ac96c6512751a0ef6903b482cd361f256965c2884196c88788176 SHA512 8474e4da6d4d44cb4dd2db2c203e9e57c646328b25bb0009e91cc358833f64052a24b6e8f9507d3459014ffebccc4b50c99a0f5d6c97b9b5a19c135a165aeba0 WHIRLPOOL 2c88a953aebed3596f6172a3c76c34516fda410770bb7a815ded02ca657fe3e6cf55fdd4dd5529df9cd9ebb9325886c78228b7cb9dbf970e2858fa5d31ab5c3a
+DIST libwacom-0.15.tar.bz2 440516 SHA256 ab65c589d5d6de176c5280ebe9cc1e807b9fa6fce7224b88f280b19464bb7713 SHA512 10c38cb9af4f07a09c0248bff827bc9ceba99200e1298452b5a3745666ccac5ad01b6122563cddff83ec0072ff40321c053f190d4af3477967a4cb419d444aa6 WHIRLPOOL a8b65d32a15cb7c5c5b3e486bae0fddebec7f917ee93d01a65a81f7d9e3525fe74df6af3edb6786eb9946c71f29f0397f8be1ab52df21ac60f0b35a3ec35994a
diff --git a/dev-libs/libwacom/libwacom-0.15.ebuild b/dev-libs/libwacom/libwacom-0.15.ebuild
new file mode 100644
index 0000000..6165dab
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-0.15.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils udev
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+ dev-libs/glib:2
+ virtual/libgudev:=
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+ if ! use doc; then
+ sed -e 's:^\(SUBDIRS = .* \)doc:\1:' -i Makefile.in || die
+ fi
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ local udevdir="$(get_udevdir)"
+ dodir "${udevdir}/rules.d"
+ # generate-udev-rules must be run from inside tools directory
+ pushd tools > /dev/null
+ ./generate-udev-rules > "${ED}/${udevdir}/rules.d/65-libwacom.rules" || die "generating udev rules failed"
+ popd > /dev/null
+ use doc && dohtml -r doc/html/*
+ prune_libtool_files
+}
diff --git a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
index 89ceb0a..e6d95c1 100644
--- a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
@@ -16,7 +16,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/npth/npth-1.1.ebuild b/dev-libs/npth/npth-1.1.ebuild
index 28cc111..8084a24 100644
--- a/dev-libs/npth/npth-1.1.ebuild
+++ b/dev-libs/npth/npth-1.1.ebuild
@@ -11,5 +11,5 @@
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 ~x86"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86"
IUSE="static-libs"
diff --git a/dev-libs/npth/npth-1.2.ebuild b/dev-libs/npth/npth-1.2.ebuild
index 7972b9f..d925771 100644
--- a/dev-libs/npth/npth-1.2.ebuild
+++ b/dev-libs/npth/npth-1.2.ebuild
@@ -11,5 +11,5 @@
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="static-libs"
diff --git a/dev-libs/openssl/openssl-0.9.8z_p7.ebuild b/dev-libs/openssl/openssl-0.9.8z_p7.ebuild
index d3807f0..817c1c8 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p7.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p7.ebuild
@@ -31,9 +31,11 @@
)
!=dev-libs/openssl-0.9.8*:0"
DEPEND="${RDEPEND}
- sys-apps/diffutils
>=dev-lang/perl-5
- test? ( sys-devel/bc )"
+ test? (
+ sys-apps/diffutils
+ sys-devel/bc
+ )"
# Do not install any docs
DOCS=()
diff --git a/dev-libs/openssl/openssl-1.0.2d-r2.ebuild b/dev-libs/openssl/openssl-1.0.2d-r2.ebuild
index 7d2d03c..e45dd24 100644
--- a/dev-libs/openssl/openssl-1.0.2d-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2d-r2.ebuild
@@ -31,10 +31,12 @@
!<net-misc/openssh-5.9_p1-r4
!<net-libs/neon-0.29.6-r1"
DEPEND="${RDEPEND}
- sys-apps/diffutils
>=dev-lang/perl-5
sctp? ( >=net-misc/lksctp-tools-1.0.12 )
- test? ( sys-devel/bc )"
+ test? (
+ sys-apps/diffutils
+ sys-devel/bc
+ )"
PDEPEND="app-misc/ca-certificates"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/openssl/openssl-1.0.2d.ebuild b/dev-libs/openssl/openssl-1.0.2d.ebuild
index ec9fb82..98f1978 100644
--- a/dev-libs/openssl/openssl-1.0.2d.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2d.ebuild
@@ -32,10 +32,12 @@
!<net-misc/openssh-5.9_p1-r4
!<net-libs/neon-0.29.6-r1"
DEPEND="${RDEPEND}
- sys-apps/diffutils
>=dev-lang/perl-5
sctp? ( >=net-misc/lksctp-tools-1.0.12 )
- test? ( sys-devel/bc )"
+ test? (
+ sys-apps/diffutils
+ sys-devel/bc
+ )"
PDEPEND="app-misc/ca-certificates"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/pcl/Manifest b/dev-libs/pcl/Manifest
new file mode 100644
index 0000000..bd5561a
--- /dev/null
+++ b/dev-libs/pcl/Manifest
@@ -0,0 +1 @@
+DIST pcl-1.12.tar.gz 384986 SHA256 e7b30546765011575d54ae6b44f9d52f138f5809221270c815d2478273319e1a
diff --git a/dev-libs/pcl/metadata.xml b/dev-libs/pcl/metadata.xml
new file mode 100644
index 0000000..00c0b46
--- /dev/null
+++ b/dev-libs/pcl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>longlene@gmail.com</email>
+ <name>Lixiao Chen</name>
+ </maintainer>
+ <longdescription lang="en">
+ The Portable Coroutine Library (PCL) implements the low level
+ functionality for coroutines
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-libs/pcl/pcl-1.12.ebuild b/dev-libs/pcl/pcl-1.12.ebuild
new file mode 100644
index 0000000..1e03c69
--- /dev/null
+++ b/dev-libs/pcl/pcl-1.12.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Portable Coroutine Library"
+HOMEPAGE="http://xmailserver.org/libpcl.html"
+SRC_URI="http://xmailserver.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~x86"
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.11-r1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.11-r1.ebuild
new file mode 100644
index 0000000..739b3c1
--- /dev/null
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.11-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="PKCS#11 helper library"
+HOMEPAGE="http://www.opensc-project.org/opensc/wiki/pkcs11-helper"
+SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gnutls libressl nss static-libs"
+
+RDEPEND="
+ !libressl? ( >=dev-libs/openssl-0.9.7:0 )
+ libressl? ( dev-libs/libressl )
+ gnutls? ( >=net-libs/gnutls-1.4.4 )
+ nss? ( dev-libs/nss )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( >=app-doc/doxygen-1.4.7 )"
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable doc) \
+ $(use_enable gnutls crypto-engine-gnutls) \
+ $(use_enable nss crypto-engine-nss) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-libs/poco/poco-1.4.6_p4-r1.ebuild b/dev-libs/poco/poco-1.4.6_p4-r1.ebuild
new file mode 100644
index 0000000..0e0e4d4
--- /dev/null
+++ b/dev-libs/poco/poco-1.4.6_p4-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs flag-o-matic multilib versionator
+
+MY_P="${P/_}"
+MY_DOCP="${PN}-$(get_version_component_range 1-3)-all-doc"
+
+DESCRIPTION="C++ class libraries to simplify the development of network-centric, portable applications"
+HOMEPAGE="http://pocoproject.org/"
+SRC_URI="http://pocoproject.org/releases/poco-$(get_version_component_range 1-3)/${MY_P}-all.tar.bz2
+ doc? ( mirror://sourceforge/poco/${MY_DOCP}.zip )"
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples iodbc libressl mysql odbc sqlite ssl test"
+
+DEPEND=">=dev-libs/libpcre-8.13
+ dev-libs/expat
+ sys-libs/zlib
+ mysql? ( virtual/mysql )
+ odbc? ( iodbc? ( dev-db/libiodbc )
+ !iodbc? ( dev-db/unixODBC ) )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ sqlite? ( dev-db/sqlite:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}-all"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PV}-gentoo.patch \
+ "${FILESDIR}"/poco-1.4.4-patch-for-libpcre-8.32.patch
+}
+
+src_configure() {
+ targets="libexecs"
+ odbc="unixodbc"
+
+ if use ssl; then
+ targets="${targets} NetSSL_OpenSSL-libexec Crypto-libexec"
+ echo NetSSL_OpenSSL >> components
+ echo Crypto >> components
+ fi
+ if use odbc; then
+ targets="${targets} Data/ODBC-libexec"
+ echo Data/ODBC >> components
+ if use iodbc; then
+ append-flags "-I/usr/include/iodbc"
+ odbc="iodbc"
+ fi
+ fi
+ if use sqlite; then
+ targets="${targets} Data/SQLite-libexec"
+ echo Data/SQLite >> components
+ fi
+ if use mysql; then
+ targets="${targets} Data/MySQL-libexec"
+ echo Data/MySQL >> components
+ fi
+
+ if use test; then
+ targets="${targets} cppunit tests"
+ echo CppUnit >> components
+ use ssl && targets="${targets} NetSSL_OpenSSL-tests Crypto-tests"
+ use odbc && targets="${targets} Data/ODBC-tests"
+ use sqlite && targets="${targets} Data/SQLite-tests"
+ use mysql && targets="${targets} Data/MySQL-tests"
+ fi
+
+ local myconf
+ use test || myconf="--no-tests"
+ # not autoconf
+ ./configure \
+ --no-samples ${myconf} \
+ --prefix=/usr \
+ --unbundled \
+ || die "configure failed"
+
+ sed -i \
+ -e 's|-O2||g' \
+ -e "s|CC = .*|CC = $(tc-getCC)|" \
+ -e "s|CXX = .*|CXX = $(tc-getCXX)|" \
+ -e "s|RANLIB = .*|RANLIB = $(tc-getRANLIB)|" \
+ -e "s|LIB = ar|LIB = $(tc-getAR)|" \
+ -e "s|STRIP = .*|STRIP = /bin/true|" \
+ -e "s|CFLAGS = |CFLAGS = ${CFLAGS}|" \
+ -e "s|CXXFLAGS = |CXXFLAGS = ${CXXFLAGS} |" \
+ -e "s|LINKFLAGS =|LINKFLAGS = ${LDFLAGS} |" \
+ -e "s|SHAREDOPT_LINK = -Wl,-rpath,\$(LIBPATH)|SHAREDOPT_LINK =|" \
+ build/config/Linux build/config/FreeBSD || die "sed failed"
+ sed -i -e "s|SHLIBFLAGS)|SHLIBFLAGS) ${LDFLAGS}|" build/rules/lib || die
+}
+
+src_compile() {
+ emake POCO_PREFIX=/usr GENTOO_ODBC="${odbc}" LIBDIR="$(get_libdir)" ${targets} || die "emake failed"
+}
+
+src_install() {
+ emake POCO_PREFIX=/usr LIBDIR="$(get_libdir)" DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc CHANGELOG CONTRIBUTORS NEWS README
+
+ use doc && dohtml -r "${WORKDIR}/${MY_DOCP}"/*
+
+ if use examples ; then
+ for d in Net XML Data Util NetSSL_OpenSSL Foundation ; do
+ insinto /usr/share/doc/${PF}/examples/${d}
+ doins -r ${d}/samples
+ done
+ find "${D}/usr/share/doc/${PF}/examples" \
+ -iname "*.sln" -or -iname "*.vcproj" -or \
+ -iname "*.vmsbuild" -or -iname "*.properties" \
+ | xargs rm
+ fi
+}
diff --git a/dev-libs/ppl/ppl-1.1.ebuild b/dev-libs/ppl/ppl-1.1.ebuild
index 58a2abe..d73da14 100644
--- a/dev-libs/ppl/ppl-1.1.ebuild
+++ b/dev-libs/ppl/ppl-1.1.ebuild
@@ -10,7 +10,7 @@
LICENSE="GPL-3"
SLOT="0/4.13" # SONAMEs
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
IUSE="+cxx doc lpsol pch static-libs test"
RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index 2dfa037..3aba458 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,2 +1,3 @@
-DIST softhsm-1.3.5.tar.gz 440157 SHA256 28b5062a13450faf6099fcb82d25d21f0ac7d202ba31ec85e943246cdcf87ebd SHA512 8da873d84ce3f554ff90975f2c37750c24ee4b254b480a203bfe600d2314ae1aba4d67b96bc9c5cb6787f592e597551e850a84ee36046f408aea7d5d5d7c8787 WHIRLPOOL d01878dbf17d4e06305df23826bc07fff535c9e9734be376ef2d0a99891ddca0bdd1689285e199a6f81143d38c55334c8df9969470cc0098724fb5d24871ad92
DIST softhsm-1.3.6.tar.gz 435893 SHA256 e39ac8e851220edd2b2afbe4d9e06d956bccc20bc72752740eabf95692359486 SHA512 fa344b298da6f15a616eaaa90e9e2153cb48ee1a5d4c3089a4195080efc5d15cccf27536279206587f8e1a55ac1b3745303712797296aba560be5ca958783b70 WHIRLPOOL 6451e039d31932306627f6af23041dbd7d386d1b137eb529332f45ce523ae0c61b736876815ca614a8ec54b0dbae9d83b510bbf126dafd17cbf6d12c745ed7a8
+DIST softhsm-1.3.7.tar.gz 438437 SHA256 d12d6456a85561266d9da427565f3ee3746a35df6670d5e6be75de253c2810a4 SHA512 287400b981b7b420a300593129696e4739afe085a8106047ef429bc741d205bed214386b422572327c3bda63f0fb1b7558bb4d30d184ca3ec2ba9900153f075d WHIRLPOOL 47e66a8ae7f85b6505bdd751114a1594bc2e4b7bea71c6681bf77e8b7cc226d3515d9bdbd74ef0327899257d1844722c95446115f22724474f03cee0a99ca4f3
+DIST softhsm-2.0.0.tar.gz 936954 SHA256 eae8065f6c472af24f4c056d6728edda0fd34306f41a818697f765a6a662338d SHA512 1db5b79bc59707d97a3c8ba5306d6778cd02d7049a6b294ef5e60214ef7b1dcc4d51405cc32f3720443d9477377e8b04b68d6cee143731f87b6357e4e5565fe2 WHIRLPOOL 014213f4501145c493ad4c22d0cfd262f7ca8693c3d13ca74d34bd7b24f85cf60a5117d0869e7544d9d61b0473b676e582ea41bdeba647427ffc1067def9f8f7
diff --git a/dev-libs/softhsm/softhsm-1.3.5.ebuild b/dev-libs/softhsm/softhsm-1.3.5.ebuild
deleted file mode 100644
index 8431790..0000000
--- a/dev-libs/softhsm/softhsm-1.3.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="A software PKCS#11 implementation"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.opendnssec.org/files/source/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-SLOT="0"
-LICENSE="BSD"
-
-RDEPEND="
- dev-db/sqlite:3
- >=dev-libs/botan-1.10.1[threads]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_configure() {
- econf \
- --disable-static \
- --localstatedir=/var \
- --with-botan="${EPREFIX}/usr/" \
- $(use_enable amd64 64bit) \
- $(use debug && echo "--with-loglevel=4")
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-libs/softhsm/softhsm-1.3.7.ebuild b/dev-libs/softhsm/softhsm-1.3.7.ebuild
new file mode 100644
index 0000000..9b6e5df
--- /dev/null
+++ b/dev-libs/softhsm/softhsm-1.3.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A software PKCS#11 implementation"
+HOMEPAGE="http://www.opendnssec.org/"
+SRC_URI="http://www.opendnssec.org/files/source/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+SLOT="0"
+LICENSE="BSD"
+
+RDEPEND="
+ dev-db/sqlite:3
+ dev-libs/botan[threads]
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS )
+
+src_configure() {
+ econf \
+ --disable-static \
+ --localstatedir=/var \
+ --with-botan="${EPREFIX}/usr/" \
+ $(use_enable amd64 64bit) \
+ $(use debug && echo "--with-loglevel=4")
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete
+}
diff --git a/dev-libs/softhsm/softhsm-2.0.0.ebuild b/dev-libs/softhsm/softhsm-2.0.0.ebuild
new file mode 100644
index 0000000..dc1cee0
--- /dev/null
+++ b/dev-libs/softhsm/softhsm-2.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A software PKCS#11 implementation"
+HOMEPAGE="http://www.opendnssec.org/"
+SRC_URI="http://www.opendnssec.org/files/source/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+SLOT="0"
+LICENSE="BSD"
+
+RDEPEND="
+ dev-db/sqlite:3
+ dev-libs/botan[threads]
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( NEWS README.md )
+
+src_configure() {
+ econf \
+ --disable-static \
+ --localstatedir=/var \
+ --with-botan="${EPREFIX}/usr/" \
+ $(use_enable amd64 64bit) \
+ $(use debug && echo "--with-loglevel=4")
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete
+}
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index d058721..ef4d8b9 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -2,3 +2,4 @@
DIST uriparser-0.8.0.tar.bz2 433581 SHA256 1dd9f9779d8f17822bd7d68ba042fd67779b6e4ccf162bd3c9d0ff19a8ba9bf7 SHA512 e80efc8484f0b67107cad317cef72db9de906a86020c3ab31178e06e958782f0a744fe257b1e6cd130dd25c6747e684ece93ce5f755864303df34c6b763d2e5b WHIRLPOOL 43b9526747ad87c0e93f8f218243cdd853517c5a8d9290e9e19618104462b5150589d301e320035abadbae32e7141de4d5684954e7650a476c33da54d8e4cbea
DIST uriparser-0.8.1.tar.bz2 341433 SHA256 8ad27e4ea603680c840008d21fb7efea354c79647e90b6fe6788aca18293f094 SHA512 6a1f4cc72a62cd74fa814e262233bd44d882ce4ee189a2ca7a6ef1cb3893492adf801b0391d3eea1f8ef443971f7195cbe8143158514225c875e76d677a9040e WHIRLPOOL 308625b4e612a27b6bf3ae0d70da69be25c8a702470f793d69175d94d16e7440f1d7249026f4cf3ccb51a501b109168dd4a772287e6ba7ceb03702cb753bd6eb
DIST uriparser-0.8.2.tar.bz2 341959 SHA256 6d6e66b0615f65e9e2391933dab7e45eca0947160f10c6b47bc50feda93e508f SHA512 857c12229aece80065f923b6191e5771c6cd26e7eb42e62a35ae5793174df72b818a59c7b4d9a8dbd8f3f5d4b5885b43a05f0e40aa1be9d9b6f6a9b323c56ca9 WHIRLPOOL 56b370eb16c4eed16838c80d71860d6fe66ad4cd5d4cdba72e9bcb0bfc56fd39d479b73fe8f3df27fb8b5b19ca0fda53172b602dd33e946c1829e92b8fe6fd5f
+DIST uriparser-0.8.3.tar.bz2 358228 SHA256 28640ddc91809ebedf7bcaa11aeaebcdac4321323e54416c9eb76303adae0fad SHA512 e8fe7f0e48af84d165038ba8c4a324cd0cd9fbabe4b37b0035681f24cf69470d34bdcb15bda36594dd770383b475a91ed8d33e1a897fb8bf9dcb1d2454c55fc1 WHIRLPOOL dd49cb7b64bad476fe8c822d8644a74b9a361a463431186026bd1cc94bc01b9af5bd0b73324b2c01f80a82d90c648f66ba8b5c8545ab71609b01accd33fa40a4
diff --git a/dev-libs/uriparser/uriparser-0.8.3.ebuild b/dev-libs/uriparser/uriparser-0.8.3.ebuild
new file mode 100644
index 0000000..a52452d
--- /dev/null
+++ b/dev-libs/uriparser/uriparser-0.8.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
+HOMEPAGE="http://uriparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc qt4 test unicode"
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig
+ doc? ( >=app-doc/doxygen-1.5.8
+ qt4? ( dev-qt/qthelp:4 ) )
+ test? ( >=dev-util/cpptest-1.1.1 )"
+
+REQUIRED_USE="test? ( unicode )"
+
+src_configure() {
+ econf \
+ --disable-sizedown \
+ $(use_enable test) \
+ --enable-char \
+ $(use_enable unicode wchar_t) \
+ $(use_enable doc) \
+ --docdir=/usr/share/doc/${PF}/
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog THANKS
+
+ if use doc && use qt4; then
+ dodoc doc/*.qch
+ docompress -x /usr/share/doc/${PF}/${P}.qch
+ fi
+}
diff --git a/dev-libs/uriparser/uriparser-0.8.4.ebuild b/dev-libs/uriparser/uriparser-0.8.4.ebuild
new file mode 100644
index 0000000..a52452d
--- /dev/null
+++ b/dev-libs/uriparser/uriparser-0.8.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
+HOMEPAGE="http://uriparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc qt4 test unicode"
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig
+ doc? ( >=app-doc/doxygen-1.5.8
+ qt4? ( dev-qt/qthelp:4 ) )
+ test? ( >=dev-util/cpptest-1.1.1 )"
+
+REQUIRED_USE="test? ( unicode )"
+
+src_configure() {
+ econf \
+ --disable-sizedown \
+ $(use_enable test) \
+ --enable-char \
+ $(use_enable unicode wchar_t) \
+ $(use_enable doc) \
+ --docdir=/usr/share/doc/${PF}/
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog THANKS
+
+ if use doc && use qt4; then
+ dodoc doc/*.qch
+ docompress -x /usr/share/doc/${PF}/${P}.qch
+ fi
+}
diff --git a/dev-libs/vala-common/vala-common-0.28.1.ebuild b/dev-libs/vala-common/vala-common-0.28.1.ebuild
index 6c1132f..fe21125 100644
--- a/dev-libs/vala-common/vala-common-0.28.1.ebuild
+++ b/dev-libs/vala-common/vala-common-0.28.1.ebuild
@@ -12,7 +12,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE=""
# Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/wayland/wayland-1.7.0.ebuild b/dev-libs/wayland/wayland-1.7.0.ebuild
index 1da40f2..5ae52c6 100644
--- a/dev-libs/wayland/wayland-1.7.0.ebuild
+++ b/dev-libs/wayland/wayland-1.7.0.ebuild
@@ -24,7 +24,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE="doc static-libs"
RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index a3c2b93..e52a23a 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -8,12 +8,15 @@
DIST sbcl-1.1.18-x86-64-linux-binary.tar.bz2 9196684 SHA256 c945406f9421736982efc4eaaeb376b19331422f5b5a349382ed53c742d6cb0a SHA512 d63a33532ae6390c00d789c22c4a504b621e707b8aa5f72d12b497be8a590a75604a18f384fa2d27df3a4a0ef3ecd4c27e7bfc4f74fde3a014df1aad5dd8ff0c WHIRLPOOL 980726e0dd182c2b29c5ac4deab994d028e0003a3e2ac3e38a0c052f6607fc75f6b298fb60c99ff9f373c9ba1f243d6bd97de2cb765aad559867598affd510ab
DIST sbcl-1.1.6-x86-darwin-binary.tar.bz2 9091955 SHA256 5801c60e2a875d263fccde446308b613c0253a84a61ab63569be62eb086718b3 SHA512 5b9d58ba1a7bcf3aa5011ac5ba1c8dba65e44b2c3f8a31b15db54de6b34ea0f7482c45f1cc4e1323e154ce79fbba030112df3795cb323bca46bac50f15d2a138 WHIRLPOOL 673e84bbf685e07568530ccb2c3822dbfffd6226d3de90bfef13078466ae245f63dd2fc4ac48b4d64ca1453cc831ad6913af21540bd3b35fe51700161ca26086
DIST sbcl-1.1.8-x86-64-darwin-binary.tar.bz2 9045228 SHA256 729054dc27d6b53bd734eac4dffeaa9e231e97bdbe4927d7a68c8f0210cad700 SHA512 d29cf032dd52b014fcc5c48fc5dd0a1f8065838cd9078d129742302c64263b7d630232d1f9c051b56b8b2b34f1bef338aeaf81ff827799032e44ca6165483e34 WHIRLPOOL f44112707f000a46d26a6af65e651868639beddab4be9c84c8f2bc8488f198ab661cb6aa62f1d38fbcbe48f259c0c2e54d255ae45db22f648b56aaaa4f104984
+DIST sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 10038928 SHA256 057d3a1c033fb53deee994c0135110636a04f92d2f88919679864214f77d0452 SHA512 c271796f854fe884e0d8aa6504bbe2e6c078de1555fc9a823463640cfd8c793dbddcb3f32932788d84a41e2b8a085b95c97c13a15c43fc909dcaad18ce25f215 WHIRLPOOL 2c39d1ac1490693b758b54b473970deaa9078f00bc579745fbbed169e696846fda888f105bc77d610a8cb1c0f995c6e6ad572b9163d55b3701db02f7f68824b8
DIST sbcl-1.2.13-source.tar.bz2 5567609 SHA256 e6d93a94cbf821b2c500a9440ca640588e9ac6914dba2f6b5445a5e14eeb1205 SHA512 f5f7bfb9e8c6a3dcf8c1bac62dba9ca1385b9689141c24951bec95ee5383f53e4279dd5c3fb382a79b06ef113d3d4aaa3b05fff69f8a819a0988ba03983c0c48 WHIRLPOOL 260de2f717544f4e9678b3e40bf59b16d83e3cdfad681c4a9e94fba9ec312a7647243a41076a9e64caa9ebfe33515561c854b939561019f14a3d07faf2425197
DIST sbcl-1.2.13-x86-64-linux-binary.tar.bz2 10154344 SHA256 900e58adb9a449e3b5177207908a361de71be1e3aec712aff731ba9a9903f3ab SHA512 483aafc9b38cf317ea764d66e1faf70560cca4c04355ae0a0669692c985034335ec155fc9557acab8cc5f2ee668615985950b2fa96d0acc900b74aceeeafb64c WHIRLPOOL bc9218f7a32194a19b12cd218b2ebfb1dbce01717289241ba62a1b39a424fc2d0620c80b536d1c0a605322e99c52ae0f01d943bd93b7e4c1388ae9b7ab7464bc
DIST sbcl-1.2.14-source.tar.bz2 5565538 SHA256 b9146dd6460c05bca508f6dda83003580911833eedd51dbc09d8eca80b0f5c06 SHA512 471b215419f9303e010cbfb99866e09a43cc68a63680b5267662a12585b145b9f520592c37c81eabfe81b102255cd82fabb74cca731d8c3eed50747df34a6e2c WHIRLPOOL e89cd4c2ff1b2716c0ba62aed6d2107f05094c053c91db8a14638a80a5b63f83102fc1c125164edf251ed2ca507e00c298a9278efe83ad5f3b27ab53ddd48131
DIST sbcl-1.2.14-x86-64-linux-binary.tar.bz2 9723047 SHA256 e06a43a3490a2d9239b55a0e64b8c46d285ea509a940456013bfe90ba6a2dd2c SHA512 7c079c68104a44fd004b371f533502f478a7294b5577c7fd900adcdf22be1a18bdedeab3be259606c059d14c38c639f061866969ccd56e24fe64198dd96bf20c WHIRLPOOL 738f20eeeb50aef368c7fcdb7979a4c10f72f5889a9e7e0220a48be54d57f141ea0b2b59e10422878b227d5bdfe57eecaacdd6b3936a30535453c96925099806
DIST sbcl-1.2.15-source.tar.bz2 5585753 SHA256 d95a6e8a4b658f9973825f8d44d6195a645b0d6a33d865324c0c658b8bcb1651 SHA512 a34947cff6d8e54068942df307a84a755d2ddb549d2da394545d3d37a821a8cccc3f4cab30741948e000c06bb3e422963e29a349007143a64bb97cc013c45771 WHIRLPOOL 13b413327525961f29dac6f91fb100383a3be515abc1db0255d94b5c1448b0f749defa5a36033883b57747412f5ec4646e303260f39ce7caa4f73dbea82ff231
DIST sbcl-1.2.15-x86-64-linux-binary.tar.bz2 9799234 SHA256 5c1db23dfa6b8d2c0a66fe0b08928dd7dc50499be022388587e370d1d377ebae SHA512 15d4173d80b38f3dc32445a605e95618dd02386ca007e162b36a2f5808ab7f925f8246ccb4a68b02ec5d09af74919818ca2254e6593862b074f4b715796fc8ca WHIRLPOOL 29d40cb1c7c2af4a4b4666dacb373fc8af82fe95f058ca54d9232e75c957803d5b20338d74f37b87de05ce395b8954c2c89ed90d95a29570b40fcd76df4b634b
+DIST sbcl-1.2.16-source.tar.bz2 5592726 SHA256 8ea9adaa04385aeeac219273a79bd662b9cc2662662af2dc886e5f095b4a6f21 SHA512 f65f87dec66067c57d04ea1d01d60e3906d27b739365cd31d63c14df2745019d327040951c24751893f0eb26d120774b009da340863ee40de6427ac791007d29 WHIRLPOOL d118ecc182b53179c14962e5e2802569764ea2a8540b7080ad7faa5cea13c22fa42fa411e3e052a46fe5aa7f2000987c5c672e16423d2a529069df9ed308c191
+DIST sbcl-1.2.16-x86-64-linux-binary.tar.bz2 9779671 SHA256 e1745b4f5403bfa301c02109e51dd0607ce0326c660444aeff989f55cb84d9ed SHA512 efd3120a9c9c205464471f70f2202fe7ebe657fe5f16fadb70c6354083fa539f3c89c0b1d4d58b6a4f58720d54304128f9408c7619dd039230d5f5232f1d6321 WHIRLPOOL e34c2dc41c86afd2a11c0761b93543c6ddf46141580030f77070d92ba9b57fff92938b156f98df444b485e44bed300c366db91e970f4d3f30fc9ed19e6eee67c
DIST sbcl-1.2.7-armhf-linux-binary.tar.bz2 9914851 SHA256 5e75a328882b739befcf5c38e8039b830668a8ca7bafe56a9e13ef23f39eb253 SHA512 2c82bdfe4f070a43964e694f81ccdbb84f8dd3bf77c807343daadff877b518fcd52e05513691543ca076c2b6de8bcf8b2e672b31f5ed3f545bedb02bbf7cd868 WHIRLPOOL 8e0eab53a9bfe10a1ccaa5c950e9fe045aeaa23f9f66ca98badd5a0fce3ad5828c0059904c73584dd4591fb3f9b2eefb5210a19f2de9fd8d699d48b0cee3bbef
DIST sbcl-1.2.7-powerpc-linux-binary.tar.bz2 9884585 SHA256 d2f86db4f6fe2b6e6bbc6353ce28dead1b142ed36885080b97304db55aae2861 SHA512 7b9fef12d3d6397adec6a0c26d1431a18b8d91b5bf009034eb2501de9fd60dc04dd2e3cd2d9feb9204d4631360aea88ba07a9ad75dad0767b5dcc5e62e84e790 WHIRLPOOL 4b884ab946e8c54775970aa502054f42a92d01257449796c7d1a6bd1ff5835ddae1c94aa5d936a7a5b115183c6cee5251034646559e4435a6663896fa302c4be
DIST sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 10438955 SHA256 a0a13e83b35dbac36284459747a03c6db20cd089864e16a6380a12a6aa138115 SHA512 9566cebf8fc29ead1f919309e3f98aeb618e97b34c80f53d1f739f1a3f4ef4cbaebd1c67f0b32172a0cdf14dc405eb75d0e916dedf3b8a758cdec2368d25f5c1 WHIRLPOOL 4946b9a4463c92517233298f898510ca57b4127da93d7d42cf28005bbd96b8d1eba7472f73029f45d6c0e75f3de5b893a34f33feee92a60cef8ae4f2b4d4fa0e
diff --git a/dev-lisp/sbcl/sbcl-1.2.16.ebuild b/dev-lisp/sbcl/sbcl-1.2.16.ebuild
new file mode 100644
index 0000000..3ff88d6
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.2.16.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.2.7
+BV_AMD64=1.2.16
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.2.7
+BV_PPC_MACOS=1.0.47
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_SPARC_SOLARIS=1.0.23
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+ x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+ amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+ ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+ sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+ alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+ arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+ ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+ x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+ x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+ sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
+ x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+ x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+ doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+ pax_kernel? ( sys-apps/paxctl sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+ !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+ use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+ echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+ sed 's/^X//' > "${CONFIG}" <<-'EOF'
+ (lambda (list)
+ X (flet ((enable (x) (pushnew x list))
+ X (disable (x) (setf list (remove x list))))
+ EOF
+ if use x86 || use amd64; then
+ sbcl_feature "$(usep threads)" ":sb-thread"
+ fi
+ sbcl_feature "true" ":sb-ldb"
+ sbcl_feature "false" ":sb-test"
+ sbcl_feature "$(usep unicode)" ":sb-unicode"
+ sbcl_feature "$(usep zlib)" ":sb-core-compression"
+ sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+ sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+ X )
+ X list)
+ EOF
+ cat "${CONFIG}"
+}
+
+src_unpack() {
+ unpack ${A}
+ mv sbcl-*-* sbcl-binary || die
+ cd "${S}"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/gentoo-fix_install_man.patch
+ # bug #468482
+ epatch "${FILESDIR}"/concurrency-test-1.2.6.patch
+ # bugs #486552, #527666, #517004
+ epatch "${FILESDIR}"/bsd-sockets-test-1.2.11.patch
+ # bugs #560276, #561018
+ epatch "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+ epatch "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+ epatch "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
+
+ # To make the hardened compiler NOT compile with -fPIE -pie
+ if gcc-specs-pie ; then
+ einfo "Disabling PIE..."
+ epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
+ fi
+
+ # bug #526194
+ sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
+ -e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
+ -i src/runtime/GNUmakefile || die
+
+ sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+ -i make-config.sh || die
+
+ cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+
+ use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+ # Some shells(such as dash) don't have "time" as builtin
+ # and we don't want to DEPEND on sys-process/time
+ sed "s,^time ,," -i make.sh || die
+ sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+ # #define SBCL_HOME ...
+ sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+ # change location of /etc/sbclrc ...
+ sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+ find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+ # customizing SBCL version as per
+ # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+ echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+ # applying customizations
+ sbcl_apply_features
+}
+
+src_compile() {
+ local bindir="${WORKDIR}"/sbcl-binary
+
+ strip-unsupported-flags ; filter-flags -fomit-frame-pointer
+
+ if host-is-pax ; then
+ # To disable PaX on hardened systems
+ pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+ # Hack to disable PaX on second GENESIS stage
+ sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+ "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+ fi
+
+ # clear the environment to get rid of non-ASCII strings, see bug 174702
+ # set HOME for paludis
+ env - HOME="${T}" PATH="${PATH}" \
+ CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+ CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+ GNUMAKE=make ./make.sh \
+ "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+ || die "make failed"
+
+ # need to set HOME because libpango(used by graphviz) complains about it
+ if use doc; then
+ env - HOME="${T}" PATH="${PATH}" \
+ CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+ ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+ make -C doc/manual info html || die "Cannot build manual"
+ env - HOME="${T}" PATH="${PATH}" \
+ CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+ ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+ make -C doc/internals info html || die "Cannot build internal docs"
+ fi
+}
+
+src_test() {
+ ewarn "Unfortunately, it is known that some tests fail eg."
+ ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+ ewarn "development and not of Gentoo's side. Please, before filing"
+ ewarn "any bug(s) search for older submissions. Thank you."
+ time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+ # install system-wide initfile
+ dodir /etc/
+ sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+ ;;; The following is required if you want source location functions to
+ ;;; work in SLIME, for example.
+ X
+ (setf (logical-pathname-translations "SYS")
+ X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+ X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+ X
+ ;;; Setup ASDF2
+ (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+ EOF
+
+ # Install documentation
+ unset SBCL_HOME
+ INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+ sh install.sh || die "install.sh failed"
+
+ # bug #517008
+ pax-mark -mr "${D}"/usr/bin/sbcl
+
+ # rm empty directories lest paludis complain about this
+ find "${ED}" -empty -type d -exec rmdir -v {} +
+
+ if use doc; then
+ dohtml -r doc/manual/
+ doinfo doc/manual/*.info*
+ dohtml -r doc/internals/sbcl-internals
+ doinfo doc/internals/sbcl-internals.info
+ docinto internals-notes && dodoc doc/internals-notes/*
+ else
+ rm -Rv "${ED}/usr/share/doc/${PF}" || die
+ fi
+
+ dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO
+
+ # install the SBCL source
+ if use source; then
+ ./clean.sh
+ cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+ fi
+
+ # necessary for running newly-saved images
+ echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+ echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+ doenvd "${ENVD}"
+}
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
new file mode 100644
index 0000000..1b7e99d
--- /dev/null
+++ b/dev-lua/lua-openssl/Manifest
@@ -0,0 +1 @@
+DIST lua-openssl-0.4.1.tar.gz 363525 SHA256 cce51e33b07b6450854d2e57e129b5f369b749a780d58c44719c834f198ee340 SHA512 c6deda86f77f9d6de1863611db9eb82506ea9789ec0425cb40cdb7d142d53aa633d53e1446b7eeb464636261385822d9cedc841bd35163931cc3758e7c3a308d WHIRLPOOL cbb5367bc7b716bcde731340339e7dafc3b4c5a542e1cf30e4fcf1d6c720e4f49676afe33f77860ab1da0a55b6dde434d0c312ae42c96765512494c6e8bbeb49
diff --git a/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch b/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch
new file mode 100644
index 0000000..bf5374e
--- /dev/null
+++ b/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch
@@ -0,0 +1,86 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+
+Fix Makefile to respect system CFLAGS, LDFLAGS, and CC provided by environment.
+Allow to specify pkg-config command using variable, to be friendly with
+cross-compiling etc.
+
+diff --git a/Makefile b/Makefile
+index 195ef6b..375fb65 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,9 +2,10 @@ T=openssl
+
+ PREFIX ?=/usr/local
+ LIB_OPTION ?= -shared
++PKG_CONFIG ?= pkg-config
+
+ #Lua auto detect
+-LUA_VERSION ?= $(shell pkg-config luajit --print-provides)
++LUA_VERSION ?= $(shell $(PKG_CONFIG) luajit --print-provides)
+ ifeq ($(LUA_VERSION),) ############ Not use luajit
+ LUAV ?= $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)")
+ LUA_CFLAGS ?= -I$(PREFIX)/include/lua$(LUAV)
+@@ -12,8 +13,8 @@ LUA_LIBS ?= -L$(PREFIX)/lib
+ LUA_LIBDIR ?= $(PREFIX)/lib/lua/$(LUAV)
+ else
+ LUAV ?= $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)")
+-LUA_CFLAGS ?= $(shell pkg-config luajit --cflags)
+-LUA_LIBS ?= $(shell pkg-config luajit --libs)
++LUA_CFLAGS ?= $(shell $(PKG_CONFIG) luajit --cflags)
++LUA_LIBS ?= $(shell $(PKG_CONFIG) luajit --libs)
+ LUA_LIBDIR ?= $(PREFIX)/lib/lua/$(LUAV)
+ endif
+
+@@ -22,30 +23,30 @@ SYS := $(shell gcc -dumpmachine)
+
+ ifneq (, $(findstring linux, $(SYS)))
+ # Do linux things
+-LDFLAGS = -fPIC -lrt -ldl
+-OPENSSL_LIBS ?= $(shell pkg-config openssl --libs)
+-OPENSSL_CFLAGS ?= $(shell pkg-config openssl --cflags)
+-CFLAGS = -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
++LDFLAGS += -fPIC -lrt -ldl
++OPENSSL_LIBS ?= $(shell $(PKG_CONFIG) openssl --libs)
++OPENSSL_CFLAGS ?= $(shell $(PKG_CONFIG) openssl --cflags)
++CFLAGS += -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
+ endif
+ ifneq (, $(findstring apple, $(SYS)))
+ # Do darwin things
+-LDFLAGS = -fPIC -lrt -ldl
+-OPENSSL_LIBS ?= $(shell pkg-config openssl --libs)
+-OPENSSL_CFLAGS ?= $(shell pkg-config openssl --cflags)
+-CFLAGS = -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
++LDFLAGS += -fPIC -lrt -ldl
++OPENSSL_LIBS ?= $(shell $(PKG_CONFIG) openssl --libs)
++OPENSSL_CFLAGS ?= $(shell $(PKG_CONFIG) openssl --cflags)
++CFLAGS += -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
+ endif
+ ifneq (, $(findstring mingw, $(SYS)))
+ # Do mingw things
+ V = $(shell lua -e "v=string.gsub('$(LUAV)','%.','');print(v)")
+-LDFLAGS = -mwindows -lcrypt32 -lssl -lcrypto -lws2_32 $(PREFIX)/bin/lua$(V).dll
++LDFLAGS += -mwindows -lcrypt32 -lssl -lcrypto -lws2_32 $(PREFIX)/bin/lua$(V).dll
+ LUA_CFLAGS = -DLUA_LIB -DLUA_BUILD_AS_DLL -I$(PREFIX)/include/
+-CFLAGS = $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
++CFLAGS += $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
+ endif
+ ifneq (, $(findstring cygwin, $(SYS)))
+ # Do cygwin things
+-OPENSSL_LIBS ?= $(shell pkg-config openssl --libs)
+-OPENSSL_CFLAGS ?= $(shell pkg-config openssl --cflags)
+-CFLAGS = -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
++OPENSSL_LIBS ?= $(shell $(PKG_CONFIG) openssl --libs)
++OPENSSL_CFLAGS ?= $(shell $(PKG_CONFIG) openssl --cflags)
++CFLAGS += -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
+ endif
+ #custome config
+ ifeq (.config, $(wildcard .config))
+@@ -61,7 +62,7 @@ WARN_MOST = -Wall -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnest
+ WARN = -Wall -Wno-unused-value
+ WARN_MIN =
+ CFLAGS += $(WARN_MIN) -DPTHREADS
+-CC= gcc -g $(CFLAGS) -Ideps
++CC ?= gcc -g $(CFLAGS) -Ideps
+
+
+ OBJS=src/asn1.o src/auxiliar.o src/bio.o src/cipher.o src/cms.o src/compat.o src/crl.o src/csr.o src/dh.o src/digest.o src/dsa.o \
diff --git a/dev-lua/lua-openssl/lua-openssl-0.4.1.ebuild b/dev-lua/lua-openssl/lua-openssl-0.4.1.ebuild
new file mode 100644
index 0000000..94b2ce6
--- /dev/null
+++ b/dev-lua/lua-openssl/lua-openssl-0.4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="OpenSSL binding for Lua"
+HOMEPAGE="https://github.com/zhaozg/lua-openssl"
+SRC_URI="https://github.com/zhaozg/lua-openssl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT openssl PHP-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="luajit"
+
+RDEPEND="
+ luajit? ( dev-lang/luajit:2 )
+ !luajit? ( >=dev-lang/lua-5.1:0 )
+ dev-libs/openssl:0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-Makefile.patch"
+ use luajit && LUAV=luajit || LUAV=lua
+}
+
+src_compile() {
+ local pkgconfig=$(tc-getPKG_CONFIG)
+ emake \
+ CC="$(tc-getCC) \$(CFLAGS) -Ideps" \
+ PKG_CONFIG="$pkgconfig" \
+ LUA_CFLAGS="$($pkgconfig --cflags $LUAV)" \
+ LUA_LIBS="$($pkgconfig --libs $LUAV)" \
+ LUA_LIBDIR="$($pkgconfig --variable INSTALL_CMOD $LUAV)"
+}
+
+src_install() {
+ emake \
+ LUA_LIBDIR="${D}$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $LUAV)" \
+ install
+ einstalldocs
+}
diff --git a/dev-lua/lua-openssl/metadata.xml b/dev-lua/lua-openssl/metadata.xml
new file mode 100644
index 0000000..ea45693
--- /dev/null
+++ b/dev-lua/lua-openssl/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>jakub@jirutka.cz</email>
+ <name>Jakub Jirutka</name>
+ </maintainer>
+ <use>
+ <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
+ <pkg>dev-lang/lua</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="github">zhaozg/lua-openssl</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ml/cmdliner/Manifest b/dev-ml/cmdliner/Manifest
index 1dc6fe4..9ca91d5 100644
--- a/dev-ml/cmdliner/Manifest
+++ b/dev-ml/cmdliner/Manifest
@@ -1 +1,2 @@
DIST cmdliner-0.9.7.tbz 50343 SHA256 9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a SHA512 ea1ee186f6072dc836e23a7fcc0756d016c61d4d34ef2416842d1e6e73707b2bbd6aaccd8f57472560dbeab75d3d26159ad8276813882726a11e4530dc6f45e6 WHIRLPOOL 79acdf4807cc5befad01fa1f22a214bc2c6a66dbba4b2b2c041ba72c0b2982d7ca61c632766bfe498987f61d6636a818fae1c96df1bf02e87073c9247b6babf0
+DIST cmdliner-0.9.8.tbz 53249 SHA256 7dfaafdd88ec9d96abf8ded4c0ea7111948194400220a56e4bb44a1edfa4bd41 SHA512 6c71c360eaba7f7127e422a71a00a830a086f1d6750897bea0ebc1cc10f8fdaf9e9532d354abd84dbc6c5fcc1878f19d3f424fd9335e7226b625b63b51c89cab WHIRLPOOL 25739c09f78cc8ade6d0e5805f48eb14a6c42f0891832747caef44fc6135c81feaa0055b2874256bde2270753106c60accd50c24771333c2cb16913d9bd38c3d
diff --git a/dev-ml/cmdliner/cmdliner-0.9.8.ebuild b/dev-ml/cmdliner/cmdliner-0.9.8.ebuild
new file mode 100644
index 0000000..87faba3
--- /dev/null
+++ b/dev-ml/cmdliner/cmdliner-0.9.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Declarative definition of command line interfaces for OCaml"
+HOMEPAGE="http://erratique.ch/software/cmdliner"
+SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ ocaml pkg/build.ml \
+ native=$(usex ocamlopt true false) \
+ native-dynlink=$(usex ocamlopt true false) \
+ || die
+}
+
+src_install() {
+ # Can't use opam-installer here as it is an opam dep...
+ findlib_src_preinst
+ local nativelibs=""
+ use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
+ ocamlfind install cmdliner _build/pkg/META \
+ _build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
+ dodoc README.md TODO.md CHANGES.md
+ use doc && dohtml -r doc/
+}
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index 8a45793..ce0c8df 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,3 +1,4 @@
DIST menhir-20141215.tar.gz 556231 SHA256 2592967c123a31e1b6566ab9f6034e7a0a709d57d547097f05693baf96a46fa4 SHA512 1fff6b987016be37eaca0bb3fea7ec0c498c1448d076e991e1555718cf760318a8d710622af930175f234f49f8dd767ce62cc880c33458958ceeb1bda4817243 WHIRLPOOL 28e6018ce127b28e362aaf1fe030240253cb2ffb0a52d9b34e81c71882ae517376aa3df6c5d19c6db13819260f667f5708522486a74bc498bad3dac11378b56c
DIST menhir-20150914.tar.gz 626388 SHA256 a3057ec0867377ceaf9caecf69d331440d9c0fb70e39ade619a7856aa67d535d SHA512 7717fcc63ae938eb7c8ae3a5e7d279a357735c0e3b062d9060cc70d3016640e1427d25ee8182e3e034c678d9b0e706fe219f707dd4d14689457f321b135b1fef WHIRLPOOL d66204d753d0677f9eb51d09641f9148077e62caa7ae042665697036457724040950bbb190df6bd029224a0607a67cac8f4597927b4f667ca09091e07d09f7bd
DIST menhir-20150921.tar.gz 627213 SHA256 4d8588dc847ef33f3af64d30e19bc791a57f61cda2b7086267bc8743ea4a2622 SHA512 a3100819cef6577c2806ebab765c966c11acd9fc9de061e64ef1bf4ca8b0076b0b878f12abf951a3c5882216f173936f2899444ca4126c477fa9cbef231c6b4e WHIRLPOOL cec19d79e7b79ea3dc2159673082931c8c360a865078d0af0bdd152fd1e481adb7218caf7f404005e6653493d04fda7659c1aa3b7527bbf8e0b75f284ff676d0
+DIST menhir-20151005.tar.gz 627178 SHA256 154f2537472c65e3e395de87484020cc9aedee5898b9c8756cd02245b3a568b0 SHA512 5275732b7d8699b23a470716900a9c28f4123bd85f18d582bf69a839009009782a680bb65fd7e543515898ea5899fd2b1c8eca5c776067b70ef450093d437f82 WHIRLPOOL b500268821f8b14c7cd46447c84c73d72a12365e1d991babf037746fbf76b18f41bdb0ed812d469ef7de7c2e8966f4151272773d2cd3b3fce250bc21b506dee0
diff --git a/dev-ml/menhir/menhir-20151005.ebuild b/dev-ml/menhir/menhir-20151005.ebuild
new file mode 100644
index 0000000..a8d4107
--- /dev/null
+++ b/dev-ml/menhir/menhir-20151005.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="LR(1) parser generator for the OCaml language"
+HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
+SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
+
+LICENSE="QPL-1.0 LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ if ! use ocamlopt ; then
+ export TARGET=byte
+ fi
+}
+
+src_compile() {
+ emake PREFIX="${EPREFIX}"/usr -j1
+}
+
+src_install() {
+ findlib_src_preinst
+ emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
+ use examples && docompress -x /usr/share/doc/${PF}/demos
+ dodoc AUTHORS CHANGES
+}
diff --git a/dev-perl/Acme-Damn/Acme-Damn-0.50.0.ebuild b/dev-perl/Acme-Damn/Acme-Damn-0.50.0.ebuild
deleted file mode 100644
index 9a804fd..0000000
--- a/dev-perl/Acme-Damn/Acme-Damn-0.50.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=IBB
-MODULE_VERSION=0.05
-inherit perl-module
-
-DESCRIPTION="Module, that 'unblesses' Perl objects"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-perl/Test-Exception )"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${PN}-respect-cflags.patch" )
-
-SRC_TEST="do"
diff --git a/dev-perl/Acme-Damn/Acme-Damn-0.60.0.ebuild b/dev-perl/Acme-Damn/Acme-Damn-0.60.0.ebuild
index f9de1cf..199937d 100644
--- a/dev-perl/Acme-Damn/Acme-Damn-0.60.0.ebuild
+++ b/dev-perl/Acme-Damn/Acme-Damn-0.60.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Module, that 'unblesses' Perl objects"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND=""
diff --git a/dev-perl/Acme-Damn/Manifest b/dev-perl/Acme-Damn/Manifest
index f159f6d..acdace9 100644
--- a/dev-perl/Acme-Damn/Manifest
+++ b/dev-perl/Acme-Damn/Manifest
@@ -1,2 +1 @@
-DIST Acme-Damn-0.05.tar.gz 8363 SHA256 a8e8c122ffdf7f34a0a20472efd59514944766e4d9bbb58d1440bc44b6d2bfd8 SHA512 19b46816adbd7087cbffb6bca8437051a888f9e81fca8b033eac4c906a67e4695690adf7cf8333c066cbb3d7045b6ae086daf0e64f0dcd06c5b0226fe02b4409 WHIRLPOOL a10480e963163884f258a42500f42e53cd013b31f5061559f014059e5abb8cf106dec0f3c2b6bac75e6130b811e9636758660ad3de5e74ce9dcd06773be97be7
DIST Acme-Damn-0.06.tar.gz 8635 SHA256 7925c932b9f89d2ca413680af68ed9809e7093e4ecd5bc2bd4147bdaee39ee6f SHA512 f225e5f835ce9b054087008d354278356704694147cf8e1027c0bd2c4a8c118ebbdeac2c97634e4c85cf45d29bf38a92861770c35b8423b6f12a1bc6319ff52d WHIRLPOOL 50b288b6a313505238935b0f58d4885407ad6f0c349696c229ad874e6b67f92f7d00eb3a8ace474e47d1f66c321c881d50009b07478d9994e5ba8795d2a02470
diff --git a/dev-perl/AnyEvent-HTTP/AnyEvent-HTTP-2.150.0-r1.ebuild b/dev-perl/AnyEvent-HTTP/AnyEvent-HTTP-2.150.0-r1.ebuild
deleted file mode 100644
index 730c375..0000000
--- a/dev-perl/AnyEvent-HTTP/AnyEvent-HTTP-2.150.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MLEHMANN
-MODULE_VERSION=2.15
-inherit perl-module
-
-DESCRIPTION="Simple but non-blocking HTTP/HTTPS client"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/AnyEvent-6
- dev-perl/common-sense"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/AnyEvent-HTTP/AnyEvent-HTTP-2.210.0.ebuild b/dev-perl/AnyEvent-HTTP/AnyEvent-HTTP-2.210.0.ebuild
deleted file mode 100644
index 4bf3a29..0000000
--- a/dev-perl/AnyEvent-HTTP/AnyEvent-HTTP-2.210.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MLEHMANN
-MODULE_VERSION=2.21
-inherit perl-module
-
-DESCRIPTION="Simple but non-blocking HTTP/HTTPS client"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-perl/AnyEvent-5.330.0
- >=dev-perl/common-sense-3.300.0
-"
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/AnyEvent-HTTP/AnyEvent-HTTP-2.220.0.ebuild b/dev-perl/AnyEvent-HTTP/AnyEvent-HTTP-2.220.0.ebuild
index 8270c1c..2b706a8 100644
--- a/dev-perl/AnyEvent-HTTP/AnyEvent-HTTP-2.220.0.ebuild
+++ b/dev-perl/AnyEvent-HTTP/AnyEvent-HTTP-2.220.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Simple but non-blocking HTTP/HTTPS client"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/AnyEvent-HTTP/Manifest b/dev-perl/AnyEvent-HTTP/Manifest
index 75c9e20..5b25dea 100644
--- a/dev-perl/AnyEvent-HTTP/Manifest
+++ b/dev-perl/AnyEvent-HTTP/Manifest
@@ -1,3 +1 @@
-DIST AnyEvent-HTTP-2.15.tar.gz 27311 SHA256 7e1467ad76a6d77bb93426e4db375b2f550e39452ce4ed9173e586987a911f30 SHA512 16da33285e47264550e12a1433628bbcb540a5706a51d856435cc6a593944aa513dc908861c72e7eae6044fe7401148e0e9dfe04140392c7dc1f3d02e0a87787 WHIRLPOOL ed946968050b127e424e5a7137b3272d93620ca5f4537c7ecbad62c2ce2e2de1d7550dcac769efa818604e49c26cbc674956b7efef9a50ede8acb1fd3dccb052
-DIST AnyEvent-HTTP-2.21.tar.gz 26710 SHA256 9d4b30fe2f1b0f50f39feb72c237a7cc67dfadeb761afcb1ace78f0a6110256e SHA512 c3b940d9b419102bf49b8c38f991e350ca25eaf87255e1de6c49f1172091e8c0cb692d191e406f80ac05f77297b7c95fdb551893bbea02b0d18e08374a30b0e4 WHIRLPOOL 10d1624870b809c9866e758931ed2147d32d902145860b90e2e11c0a96feaab6a7f61dcacf5484eba4a10e725de4939e0d3da5081655321d0a6a7c674eb0e8ab
DIST AnyEvent-HTTP-2.22.tar.gz 27965 SHA256 864544a4f35b3f14b59f42a26d338d98cfe8fae726eb3578dcf36eed0df5aa6e SHA512 3408b5339cc85e8d37dc6c4f40a0f1ad9436fb9b261e6a14b5a7913f8ee6c2ba7e80aec376af48190c76219fbcadf9c68c2d67c4ab60c77044093f6ec70f4aac WHIRLPOOL b8c92e89a9a22a1a2376c2893c190e3f5fe83f8017b1da6b3d33fc1807d3a24243f2048f904df682683fe22629aa875efb157e176b072f7f9ab0f2da9a4e22ae
diff --git a/dev-perl/App-perlbrew/App-perlbrew-0.720.0.ebuild b/dev-perl/App-perlbrew/App-perlbrew-0.720.0.ebuild
deleted file mode 100644
index df831f0..0000000
--- a/dev-perl/App-perlbrew/App-perlbrew-0.720.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MODULE_AUTHOR=GUGOD
-MODULE_VERSION=0.72
-inherit perl-module
-
-DESCRIPTION='Manage perl installations in your $HOME'
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-perl/CPAN-Perl-Releases-1.940.0
- >=dev-perl/Capture-Tiny-0.250.0
- >=dev-perl/Devel-PatchPerl-1.280.0
- >=virtual/perl-Pod-Parser-1.620.0
- >=dev-perl/local-lib-2.0.14
-"
-DEPEND="${RDEPEND}
- >=virtual/perl-ExtUtils-MakeMaker-6.590.0
- >=virtual/perl-File-Temp-0.230.400
- >=dev-perl/IO-All-0.510.0
- >=dev-perl/Path-Class-0.330.0
- test? (
- >=dev-perl/Test-Exception-0.320.0
- >=virtual/perl-Test-Simple-1.1.2
- >=dev-perl/Test-NoWarnings-1.40.0
- >=dev-perl/Test-Output-1.30.0
- >=dev-perl/Test-Spec-0.470.0
- )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/App-perlbrew/App-perlbrew-0.730.0.ebuild b/dev-perl/App-perlbrew/App-perlbrew-0.730.0.ebuild
index 31d2542..2da8751 100644
--- a/dev-perl/App-perlbrew/App-perlbrew-0.730.0.ebuild
+++ b/dev-perl/App-perlbrew/App-perlbrew-0.730.0.ebuild
@@ -10,7 +10,7 @@
DESCRIPTION='Manage perl installations in your $HOME'
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/App-perlbrew/Manifest b/dev-perl/App-perlbrew/Manifest
index 2ba5f26..8b666c6 100644
--- a/dev-perl/App-perlbrew/Manifest
+++ b/dev-perl/App-perlbrew/Manifest
@@ -1,2 +1 @@
-DIST App-perlbrew-0.72.tar.gz 82509 SHA256 0fa6879f21750b15f96635cac4d70b2a06b515e88040d402379e8a64c8f3984c SHA512 e6e91e9300e02e2031386b4023b4974adbd8df22f18799618e2d3308df1af56ff9453dee7a4c1c38c530a5ca87b018b26f8b28d7cac1f41071e2d196d84b0892 WHIRLPOOL 54eb84df5362daa00484ec8b665cd24e130c98475c1c68dae3092050ae8da043e0d946669278fd68932710839f31d62484e519ee3171f1bf1b9d8dfae8f56051
DIST App-perlbrew-0.73.tar.gz 82802 SHA256 acbc9e7b9913ef453bcac3e6caa6620d4bd67e129e63f060a82f96542554a77a SHA512 ceb78a62b179d4a6ad9e8788e849869cf9b45e526501d73cba004f96827d01ba03969307a1179840e6629e9f90385f7bae81b3662e0be81d00bcd462da59d28a WHIRLPOOL 27655d050da48012e71598e0a03b87be542e8eebcf0a610a15e45eaab5c55d82e25755f59c7be9d51ea45028752dfce31e8bfbe8bb93059b08ed07d03cd4b6c3
diff --git a/dev-perl/Archive-Any/Archive-Any-0.94.100.ebuild b/dev-perl/Archive-Any/Archive-Any-0.94.100.ebuild
index 00e88ec..1408d14 100644
--- a/dev-perl/Archive-Any/Archive-Any-0.94.100.ebuild
+++ b/dev-perl/Archive-Any/Archive-Any-0.94.100.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Single interface to deal with file archives"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/BZ-Client/BZ-Client-1.40.0.ebuild b/dev-perl/BZ-Client/BZ-Client-1.40.0.ebuild
deleted file mode 100644
index 509fdea..0000000
--- a/dev-perl/BZ-Client/BZ-Client-1.40.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=JWIED
-MODULE_VERSION=1.04
-inherit perl-module
-
-DESCRIPTION="A client for the Bugzilla web services API."
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-perl/URI
- dev-perl/XML-Writer
- dev-perl/XML-Parser
-"
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/BZ-Client/BZ-Client-1.72.0.ebuild b/dev-perl/BZ-Client/BZ-Client-1.72.0.ebuild
new file mode 100644
index 0000000..78792c0
--- /dev/null
+++ b/dev-perl/BZ-Client/BZ-Client-1.72.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=DJZORT
+MODULE_VERSION=1.072
+inherit perl-module
+
+DESCRIPTION="A client for the Bugzilla web services API."
+
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-perl/URI
+ dev-perl/XML-Writer
+ dev-perl/XML-Parser
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/BZ-Client/Manifest b/dev-perl/BZ-Client/Manifest
index 0c6b350..298b03f 100644
--- a/dev-perl/BZ-Client/Manifest
+++ b/dev-perl/BZ-Client/Manifest
@@ -1 +1 @@
-DIST BZ-Client-1.04.tar.gz 23551 SHA256 302f1ea306a47c061fd843e4edd8156e823d5c9fbe1a0e1e41a70dd474e32873 SHA512 2aa1ce341db477375d465da0acc121348901d3504f3e2c235c2d6ab608014ce8255001c06021ce583ec03db99cda26902e5bc796906cb1046784de42c09d7e00 WHIRLPOOL 4c3cf40dca7a9623d2854d51a5fbd01537a02199b9257ba494130281cd720e0f04cd03251d74878739d72a14b5a1e66311fb7de41b9fcfe2642ca5f98689efc1
+DIST BZ-Client-1.072.tar.gz 32692 SHA256 4f39e7739af68df67231719865e579b08d0bf1befebee69aad8015b229388f1a SHA512 d26c7e03d62013e5b308e33920e350ddaf5f93cc7a2939f1a6cee6746fa8e25138fad31454c0f0b8c1f4834ec939226b98d472891c0c1f22120e18a751755898 WHIRLPOOL 3415f6ad89d477c7c2fc2291428ee8144d57ee705af749c79f9b257054ccaca4510a53e79fd30f494f056891852f2c3cd098e14a393617ea2ff9f77833652a48
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.140.0.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.140.0.ebuild
deleted file mode 100644
index 8845fae..0000000
--- a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.140.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MODULE_AUTHOR=BINGOS
-MODULE_VERSION=2.14
-inherit perl-module
-
-DESCRIPTION='Mapping Perl releases on CPAN to the location of the tarballs'
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
- test? (
- virtual/perl-File-Spec
- virtual/perl-IO
- >=virtual/perl-Test-Simple-0.470.0
- )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.340.0.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.340.0.ebuild
index a87410b..c104a08 100644
--- a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.340.0.ebuild
+++ b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.340.0.ebuild
@@ -9,7 +9,7 @@
DESCRIPTION='Mapping Perl releases on CPAN to the location of the tarballs'
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND=""
diff --git a/dev-perl/CPAN-Perl-Releases/Manifest b/dev-perl/CPAN-Perl-Releases/Manifest
index 48b8508..ea713f5 100644
--- a/dev-perl/CPAN-Perl-Releases/Manifest
+++ b/dev-perl/CPAN-Perl-Releases/Manifest
@@ -1,2 +1 @@
-DIST CPAN-Perl-Releases-2.14.tar.gz 23361 SHA256 f25b724425ce874fc9c8dfc9a68635ee4f1607933a5c7d8d6f91fd5e958ab94b SHA512 413445ae36df4b9c93e7094242d2d7b54a943f2bbc0b2763ea0aebf0bdced7d7ae1a9996d39677053510715cd2862684504097b28864ebdbdaa7cf838a55bd53 WHIRLPOOL 248816017577b555a4e6829366f018da2d3b41d4ddb1ad29d461dcb6d2f4fb266ca0afb914646bdc3df595d1d5df712153685316fc586bebabf7cecf2ccb4423
DIST CPAN-Perl-Releases-2.34.tar.gz 24163 SHA256 a4e3236b024c2b1b2f837222f433e6108b7adf926ec0883d205921d0d8e0928c SHA512 160014056e17cf6d6a111fd59beb4c5c6b574f992346821b5ed97e2d5b6e69ccfd0033572093eecfd8ed5384727ebb1dc56f7e59238573c85a182badc8cfe3cc WHIRLPOOL 7431e6a9e58e77b1d331611cbb4a31071e6285ccba659613ad74190032f29b10da100402c819b7014450facacddc8279cd610a6879cdae66a7e8104bfe3ad415
diff --git a/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild b/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild
index 8c9cf72..fa91a25 100644
--- a/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild
+++ b/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Canary to check perl compatibility for schmorp's modules"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.240.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.240.0.ebuild
deleted file mode 100644
index bd7939d..0000000
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.240.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=0.24
-inherit perl-module
-
-DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="test"
-
-DEPEND="
- test? (
- dev-perl/Inline
- )
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.280.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.280.0.ebuild
deleted file mode 100644
index 7de5c4e..0000000
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.280.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=0.28
-inherit perl-module
-
-DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND="
- virtual/perl-Carp
- virtual/perl-Exporter
- virtual/perl-File-Spec
- virtual/perl-File-Temp
- virtual/perl-IO
- virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
- test? (
- virtual/perl-Test-Simple
- )
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.300.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.300.0.ebuild
index fe07801..d7397e0 100644
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.300.0.ebuild
+++ b/dev-perl/Capture-Tiny/Capture-Tiny-0.300.0.ebuild
@@ -12,7 +12,7 @@
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Capture-Tiny/Manifest b/dev-perl/Capture-Tiny/Manifest
index 000c77d..de8da32 100644
--- a/dev-perl/Capture-Tiny/Manifest
+++ b/dev-perl/Capture-Tiny/Manifest
@@ -1,3 +1 @@
-DIST Capture-Tiny-0.24.tar.gz 33995 SHA256 9bcf6f8472f8ea50401536cb070ac0c7770837d155c4d6abe212759863aae065 SHA512 8df98fb84d877fed984e1e8fb89c71d2e94baa99eb0d5323f9e413d361a87072b417ce65b00444b5e543ccda05d88753334537534747381a59e5b75eef04eae7 WHIRLPOOL 3b3de2582c08584e20a15179094d3911b2cdb5ebbff73f7a9f47013e14fa2e43bb7df894e3aa96aebf549e9cddadd9a7ad62dff4ee1d287dae819187e50d3e95
-DIST Capture-Tiny-0.28.tar.gz 34455 SHA256 e394caddb0e1a46e8cc4bf499eaae6c265dd201d34cac46d2f3e507c23afef84 SHA512 0db8f593f2f18fde56483df7078a563df6155ce089c4f81081d596de08a1887d17926f2cbbdc437376258d8fbbb8860444aa28709bf6e174a8a88ef02a2c0b04 WHIRLPOOL edf1c05b5c654e0be595eb7accf4c1726df9d3617d7bc414c67d0d4d40df236fdf344168a5a41d42a460c8284d4c07fff2ea1593c6f435f645a1714472f63ad2
DIST Capture-Tiny-0.30.tar.gz 34578 SHA256 a3b4e55278757e77d50df0b1a79f42e6e8354b7d41db806da39bf161bee63aea SHA512 c85b3d1eec69cbee68fc529a439b2e26076beae4b92001805fd0984e27a69c09a2cdecd9409797f77395ef3804934e20e0a78bbac2af83753c2e8d71b971fbac WHIRLPOOL 4a8a5a3537250306fd08b21096db7753c5610429c9dfd183e6b7916a7f83636fe03ce7f034c278d07961e8b709ab625812acb7a8524929430c7895927dcf35c5
diff --git a/dev-perl/Color-Calc/Color-Calc-1.73.0.ebuild b/dev-perl/Color-Calc/Color-Calc-1.73.0.ebuild
index b412640..2b617da 100644
--- a/dev-perl/Color-Calc/Color-Calc-1.73.0.ebuild
+++ b/dev-perl/Color-Calc/Color-Calc-1.73.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION='Simple calculations with RGB colors'
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND=">=dev-perl/Graphics-ColorNames-2.100.0
diff --git a/dev-perl/Color-Library/Color-Library-0.21.0-r1.ebuild b/dev-perl/Color-Library/Color-Library-0.21.0-r1.ebuild
index ffe1a08..1999462 100644
--- a/dev-perl/Color-Library/Color-Library-0.21.0-r1.ebuild
+++ b/dev-perl/Color-Library/Color-Library-0.21.0-r1.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="An easy-to-use and comprehensive named-color library"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Config-Any/Config-Any-0.240.0-r1.ebuild b/dev-perl/Config-Any/Config-Any-0.240.0-r1.ebuild
deleted file mode 100644
index 47d9f16..0000000
--- a/dev-perl/Config-Any/Config-Any-0.240.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=BRICAS
-MODULE_VERSION=0.24
-inherit perl-module
-
-DESCRIPTION="Support several config file formats"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-aix"
-IUSE="test"
-
-RDEPEND=">=dev-perl/Module-Pluggable-3.9
- !<dev-perl/config-general-2.47
- !<dev-perl/Config-General-2.47
-"
-DEPEND="${RDEPEND}
- test? (
- dev-perl/Test-Pod
- dev-perl/Test-Pod-Coverage
- )
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Config-Any/Config-Any-0.260.0.ebuild b/dev-perl/Config-Any/Config-Any-0.260.0.ebuild
index 97440bf..b7cd07c 100644
--- a/dev-perl/Config-Any/Config-Any-0.260.0.ebuild
+++ b/dev-perl/Config-Any/Config-Any-0.260.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Load configuration from different file formats, transparently"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-aix"
+KEYWORDS="amd64 arm ppc x86 ~ppc-aix"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Config-Any/Manifest b/dev-perl/Config-Any/Manifest
index a7d1e41..631ff71 100644
--- a/dev-perl/Config-Any/Manifest
+++ b/dev-perl/Config-Any/Manifest
@@ -1,2 +1 @@
-DIST Config-Any-0.24.tar.gz 35024 SHA256 710f8fc8f9414205cb58399bfbb4d9aaf7883f8ce046cee22913f6818795c61a SHA512 7eee9ea2794d87aada9a46668ac9c947b34c7107f53a3da9de21a3ebebc63b8718e3f8cea1009697909047d376de0e8fcd137d6d3dd66cb719bf7e48a50cd093 WHIRLPOOL 09a88c044427cd3bc919b944fac41f115440d240d616e7f6a194e66810ec7130dbcc55aa87664eaf4322cf1272b3348cf71ea8a287ff4723c5ea1eccf3888ab4
DIST Config-Any-0.26.tar.gz 35193 SHA256 f9ae12d5c1f084385dd9d55dd25c09a6f69f1a76c938d4d06ea3c6d85710a594 SHA512 15bac8e71340b181dd195ae211add730d8be01fcd7bbf4a7d3ed10b7fd2d7f207501a88a6ed03999d7207672249c4045defc931b7e9eb56e00166fdf7daccfda WHIRLPOOL 1534dfea6d6774be38d61ef683482081cac84c94c51bf8c31a0260d12d2829bc8194fa5edd2ced61c6665e1661ef77e4aa9700c8d980128992722060ba538e53
diff --git a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
index 4b81842..e665024 100644
--- a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
+++ b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Extract data from Macintosh BinHex files"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild
index d33942b..f54f766 100644
--- a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild
+++ b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="A Perl interface to the uulib library"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
PATCHES=( "${FILESDIR}/${P}-unbundle.patch" )
diff --git a/dev-perl/Coro/Coro-6.410.0.ebuild b/dev-perl/Coro/Coro-6.410.0.ebuild
deleted file mode 100644
index 780c105..0000000
--- a/dev-perl/Coro/Coro-6.410.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MLEHMANN
-MODULE_VERSION=6.41
-inherit perl-module
-
-DESCRIPTION="The only real threads in perl"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-perl/AnyEvent-5
- >=dev-perl/Guard-0.500.0
- virtual/perl-Scalar-List-Utils
- >=virtual/perl-Storable-2.150.0
- dev-perl/common-sense
- <dev-lang/perl-5.22.0
-"
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Coro/Coro-6.420.0.ebuild b/dev-perl/Coro/Coro-6.420.0.ebuild
deleted file mode 100644
index 7fba707..0000000
--- a/dev-perl/Coro/Coro-6.420.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MLEHMANN
-MODULE_VERSION=6.42
-inherit perl-module
-
-DESCRIPTION="The only real threads in perl"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-perl/AnyEvent-5
- >=dev-perl/Guard-0.500.0
- virtual/perl-Scalar-List-Utils
- >=virtual/perl-Storable-2.150.0
- dev-perl/common-sense
- <dev-lang/perl-5.22.0
-"
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Coro/Coro-6.470.0.ebuild b/dev-perl/Coro/Coro-6.470.0.ebuild
deleted file mode 100644
index 7f19044..0000000
--- a/dev-perl/Coro/Coro-6.470.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MLEHMANN
-MODULE_VERSION=6.47
-inherit perl-module
-
-DESCRIPTION="The only real threads in perl"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-perl/AnyEvent-5
- >=dev-perl/Guard-0.500.0
- virtual/perl-Scalar-List-Utils
- >=virtual/perl-Storable-2.150.0
- dev-perl/common-sense
- <dev-lang/perl-5.22.0
-"
-DEPEND="${RDEPEND}
- dev-perl/Canary-Stability
- >=virtual/perl-ExtUtils-MakeMaker-6.520.0
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Coro/Coro-6.480.0.ebuild b/dev-perl/Coro/Coro-6.480.0.ebuild
new file mode 100644
index 0000000..4dbc80b
--- /dev/null
+++ b/dev-perl/Coro/Coro-6.480.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=MLEHMANN
+MODULE_VERSION=6.48
+inherit perl-module
+
+DESCRIPTION="The only real threads in perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-perl/AnyEvent-5
+ >=dev-perl/Guard-0.500.0
+ virtual/perl-Scalar-List-Utils
+ >=virtual/perl-Storable-2.150.0
+ dev-perl/common-sense
+ <dev-lang/perl-5.22.0
+"
+DEPEND="${RDEPEND}
+ dev-perl/Canary-Stability
+ >=virtual/perl-ExtUtils-MakeMaker-6.520.0
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Coro/Manifest b/dev-perl/Coro/Manifest
index d8f8ca3..532e7f4 100644
--- a/dev-perl/Coro/Manifest
+++ b/dev-perl/Coro/Manifest
@@ -1,3 +1 @@
-DIST Coro-6.41.tar.gz 189177 SHA256 aaffe8d389c11f36c2bb14fb3c1a5525873d86dc6b66a41e42dc50ef49552fe4 SHA512 0f628854506080681a42d455c9e5a279e6129a590345f3d70e9051c281d7457dfe711466ff2716740b319d3b925a6b55a02b24cd765292ca4f53a07cf61aace7 WHIRLPOOL 3663f189b4d162a8b1d29845111f6d420ab92f52aa028ca737d7cb718a01bd278cf3421d1d725a61a9a7cf447728cf26c6bc65698e4f30989aa3a5bc63648fd7
-DIST Coro-6.42.tar.gz 189506 SHA256 5a803c6d8a2585c96a15438c53ae3d66b078cb966c20b7db12b4278b0fd06298 SHA512 a3ca165166320bddb6d66f4dd6015a6161b830aded9bb63c8ee989fe1129601cbd9d0b94fcecc6dd0402f3609b38ed62ed7f6267e8864148e4979028f7efc9d4 WHIRLPOOL c12b18c5e42b1b123eb9d010fd80327e7534312c60adb1fd61d212ddab881fb4f5dc09b7f140c4429ccf25ff3e9c0c026d29e655d5f11236c58979b16d59d329
-DIST Coro-6.47.tar.gz 191649 SHA256 c341cd0968d61948eefcb83c4fafaf3c5b81e12676c4198e3bae2dbc1ae0c00f SHA512 2ec5bd0632f5c658b6cdfc9fca100891d213ee2c182584c5724d9e0e5f6f28441d40b25cacb50fd0ae344e744f096cbfcb40fbea02f2d6e21129d39d37fa9c94 WHIRLPOOL 54fca2de51012cb7c82ff9034279bd7fa92abac025219b1b992ee2ca195b798711af07dfd66a1bac1d51cf76afc83f2c010d44e7feadd29b931e995940fb980f
+DIST Coro-6.48.tar.gz 191735 SHA256 fe3dd716ad66530a185b96b0fa3e1a973ad8ca152c45641682ac49a849ca01ae SHA512 39b51f3f7fa4c9d1223e2ae8f03a3968892635e511f2db4b61c4b517d9769ccfe0ff83565015ac15a1011c726ea405fe37dc9df1aa9ed713dd11dfad935e3cee WHIRLPOOL fa2c2085dd17d8ac205391bb201d622b7a6fef3505a630d0f8f4be4e9bb341e402a41b7d05c890418198c6ef3c4fb5a8d509e28782282a10a6a13e00a1d59b23
diff --git a/dev-perl/Data-GUID/Data-GUID-0.48.0.ebuild b/dev-perl/Data-GUID/Data-GUID-0.48.0.ebuild
index 10314e8..6dac596 100644
--- a/dev-perl/Data-GUID/Data-GUID-0.48.0.ebuild
+++ b/dev-perl/Data-GUID/Data-GUID-0.48.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Data-Stag/Data-Stag-0.110.0-r1.ebuild b/dev-perl/Data-Stag/Data-Stag-0.110.0-r1.ebuild
deleted file mode 100644
index 9825945..0000000
--- a/dev-perl/Data-Stag/Data-Stag-0.110.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=CMUNGALL
-MODULE_VERSION=0.11
-inherit perl-module
-
-DESCRIPTION="Structured Tags datastructures"
-HOMEPAGE="http://stag.sourceforge.net/ ${HOMEPAGE}"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-perl/IO-String"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Data-Stag/Data-Stag-0.130.0-r1.ebuild b/dev-perl/Data-Stag/Data-Stag-0.130.0-r1.ebuild
deleted file mode 100644
index e41d39e..0000000
--- a/dev-perl/Data-Stag/Data-Stag-0.130.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=CMUNGALL
-MODULE_VERSION=0.13
-inherit perl-module
-
-DESCRIPTION="Structured Tags datastructures"
-HOMEPAGE="http://stag.sourceforge.net/ ${HOMEPAGE}"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/IO-String"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Data-Stag/Data-Stag-0.140.0-r1.ebuild b/dev-perl/Data-Stag/Data-Stag-0.140.0-r1.ebuild
index 5b8cec1..90f11c9 100644
--- a/dev-perl/Data-Stag/Data-Stag-0.140.0-r1.ebuild
+++ b/dev-perl/Data-Stag/Data-Stag-0.140.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@
HOMEPAGE="http://stag.sourceforge.net/ ${HOMEPAGE}"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="dev-perl/IO-String"
diff --git a/dev-perl/Data-Stag/Manifest b/dev-perl/Data-Stag/Manifest
index bf9e760..97ed57a 100644
--- a/dev-perl/Data-Stag/Manifest
+++ b/dev-perl/Data-Stag/Manifest
@@ -1,3 +1 @@
-DIST Data-Stag-0.11.tar.gz 425766 SHA256 69da86fb0351286445fb06575e631065eeb5ccefceeeb3387fa163ce86b53ab2 SHA512 48a5b762757d3523fbefce1fc7fb70310df532e36293cd4a145e22551355ccc349c3ad0ac58c7823afc0e81e9e1ce3ace99a97da01c293137f42a04313ed102e WHIRLPOOL 5f8cebbafa77a6df19345d2586abe460676cd097c13a272307c09e732546a787653a3179e5b6e1e9cbd0b53e4066e8407a78e03ccdc15616159aeb54ddeae6ee
-DIST Data-Stag-0.13.tar.gz 428040 SHA256 cd814b9f20254e99f1cde26d414a5072f54754022481a389fe4348cc7e2e06d1 SHA512 a1b1573f7e8a3406a599830e02b945727c21438a780a972991f5aac48622f32ebe43c403aa2c251c636365aa1c13ea4df8102ab84533babab2342de2a3188ed4 WHIRLPOOL ce0192bd54aa8faa2285dbb2f448b31fe157ebd39440f0cf54a13ccd009fabd1178908c09e836d311e076f19f16a78138005a4b81bfc17e153f7c3015cfacbbc
DIST Data-Stag-0.14.tar.gz 428107 SHA256 4ab122508d2fb86d171a15f4006e5cf896d5facfa65219c0b243a89906258e59 SHA512 72b0b5995795d593a844356e1955bd15e5c1cfc31934e55b748badcc21a29b7862475e7304bd56bd22086fcd31657a37f83acd8aee9343767c31dbfe8aba8e99 WHIRLPOOL 6de7bc02ad41382d84976bb3ce6a2e6a3c1227839201c618f9a0cb9b38be25d163118be6f0711f734dc5fb432cde232f0d47649c5610f66d0c58da9e1f700eb9
diff --git a/dev-perl/Data-Types/Data-Types-0.90.0.ebuild b/dev-perl/Data-Types/Data-Types-0.90.0.ebuild
index e4c8a5f..3e3da74 100644
--- a/dev-perl/Data-Types/Data-Types-0.90.0.ebuild
+++ b/dev-perl/Data-Types/Data-Types-0.90.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Validate and convert data types."
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="test"
SRC_TEST=do
DEPEND="dev-perl/Module-Build
diff --git a/dev-perl/Data-Utilities/Data-Utilities-0.40.0-r1.ebuild b/dev-perl/Data-Utilities/Data-Utilities-0.40.0-r1.ebuild
index 7de4402..2fb8209 100644
--- a/dev-perl/Data-Utilities/Data-Utilities-0.40.0-r1.ebuild
+++ b/dev-perl/Data-Utilities/Data-Utilities-0.40.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@
DESCRIPTION="Merge nested Perl data structures"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="dev-perl/Clone"
diff --git a/dev-perl/Date-Simple/Date-Simple-3.30.0-r1.ebuild b/dev-perl/Date-Simple/Date-Simple-3.30.0-r1.ebuild
index bd6795c..eb2056e 100644
--- a/dev-perl/Date-Simple/Date-Simple-3.30.0-r1.ebuild
+++ b/dev-perl/Date-Simple/Date-Simple-3.30.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@
SLOT="0"
LICENSE="|| ( Artistic GPL-2 GPL-3 )" # Artistic or GPL2+
-KEYWORDS="~amd64 ~x86 ~x86-solaris"
+KEYWORDS="amd64 x86 ~x86-solaris"
IUSE=""
SRC_TEST=do
diff --git a/dev-perl/DateTime-Set/DateTime-Set-0.320.0.ebuild b/dev-perl/DateTime-Set/DateTime-Set-0.320.0.ebuild
deleted file mode 100644
index 75d0cf0..0000000
--- a/dev-perl/DateTime-Set/DateTime-Set-0.320.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=FGLOCK
-MODULE_VERSION=0.32
-inherit perl-module
-
-DESCRIPTION="Datetime sets and set math"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/DateTime-0.12
- >=dev-perl/Set-Infinite-0.59
- dev-perl/Params-Validate"
-DEPEND="${RDEPEND}
- dev-perl/Module-Build"
-
-SRC_TEST=do
diff --git a/dev-perl/DateTime-Set/DateTime-Set-0.340.0.ebuild b/dev-perl/DateTime-Set/DateTime-Set-0.340.0.ebuild
index 0de0397..2fa0d5e 100644
--- a/dev-perl/DateTime-Set/DateTime-Set-0.340.0.ebuild
+++ b/dev-perl/DateTime-Set/DateTime-Set-0.340.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Datetime sets and set math"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/DateTime-Set/Manifest b/dev-perl/DateTime-Set/Manifest
index 57f4a6c..d50af91 100644
--- a/dev-perl/DateTime-Set/Manifest
+++ b/dev-perl/DateTime-Set/Manifest
@@ -1,2 +1 @@
-DIST DateTime-Set-0.32.tar.gz 45003 SHA256 7496541d69f7667f6e2789f3c95aa265c6fb658102525f01bfea8f3d0cea0500 SHA512 ae152f06b012762c471688821e2fd40f8245417329fc7061180134bdaa33b1e043c04497f2d1a837dccb324c28b4fc39daad792cee500727dc2df1333fa97656 WHIRLPOOL 98f7b207b70ebe648f90e0c15b8a38b2ee84350f0134ea95dd78c6f2ffc6ec6c575bf006e451e7cc58fcacab90d6404c88f9d57826427ff67b2f9913588a77fe
DIST DateTime-Set-0.3400.tar.gz 44951 SHA256 abff0431185a11824a2edda8b8934bc3d52d8a8612b24469e1c8c8f9533247ac SHA512 6bb8f1bdcfeb572c348563cdba96150c9d9b8fb837270a5a75860d7cc81fa548e0d88d14a294360064521b466739ebb3f98c7b6fdf99fd816aa2aa32bcea234a WHIRLPOOL 8f751414c464c41ef8a84b157fb23dc47340ff942dbc609b67587e964316b86152979da778202ff72162856ffabeac4b9e307d29d1d16c37137a1261adfc02a3
diff --git a/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.340.0.ebuild b/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.340.0.ebuild
deleted file mode 100644
index dd43d7d..0000000
--- a/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.340.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MODULE_AUTHOR=BINGOS
-MODULE_VERSION=1.34
-inherit perl-module
-
-DESCRIPTION="Patch perl source a la Devel::PPPort's buildperl.pl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-perl/File-pushd-1.0.0
- virtual/perl-IO
- virtual/perl-MIME-Base64
- dev-perl/Module-Pluggable
-"
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.380.0.ebuild b/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.380.0.ebuild
index cb2a469..6cf719f 100644
--- a/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.380.0.ebuild
+++ b/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.380.0.ebuild
@@ -9,7 +9,7 @@
DESCRIPTION="Patch perl source a la Devel::PPPort's buildperl.pl"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Devel-PatchPerl/Manifest b/dev-perl/Devel-PatchPerl/Manifest
index 78416a2..886b9fb 100644
--- a/dev-perl/Devel-PatchPerl/Manifest
+++ b/dev-perl/Devel-PatchPerl/Manifest
@@ -1,2 +1 @@
-DIST Devel-PatchPerl-1.34.tar.gz 108652 SHA256 be294c95841f521a6b53f429e4fd2fc6f4b34a7fa1d66a8bba7434d5d12af643 SHA512 9e25285dd0a9c67357e627bd144fc43e5fa7644e6f647f9e69e84550c63e1173ca068cee8a883be6540c1d7a4f16533c7751552dfcf525260da187ea41a4e6b1 WHIRLPOOL 7b9761ce66db4cbe08ee1c1f1f8d473d1b0afc47aabf34b2de931019554691363acb41ba499e2939397484d8c8839c6a5d0855dc49650e836bc4fd9f7e54e905
DIST Devel-PatchPerl-1.38.tar.gz 109406 SHA256 f3e55d9211f984c5956e7decd85e5d59b4d1613d3543bb4007be6f3d89ae2725 SHA512 4762d956107d7d86f1208ec706df5399493a388f8af24c741c20ef1aaa8b9202e1f6528725c2ee7e33e192c9c1b8d218774fcc5b4428d48683d1c56679fd134a WHIRLPOOL e9415fffde1afe6fc610d8c253d9724444ef88f2a05d719721ed148e24ca72298eed62a3096583906a80c5cba4ced12a1fafccd5f214dcd11a96f3781733cfa2
diff --git a/dev-perl/Expect/Expect-1.320.0-r1.ebuild b/dev-perl/Expect/Expect-1.320.0-r1.ebuild
index 585829f..929308e 100644
--- a/dev-perl/Expect/Expect-1.320.0-r1.ebuild
+++ b/dev-perl/Expect/Expect-1.320.0-r1.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Expect for Perl"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
IUSE="test minimal"
RDEPEND="
diff --git a/dev-perl/Expect/Expect-1.320.0.ebuild b/dev-perl/Expect/Expect-1.320.0.ebuild
deleted file mode 100644
index d7be088..0000000
--- a/dev-perl/Expect/Expect-1.320.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SZABGAB
-MODULE_VERSION=1.32
-inherit perl-module
-
-DESCRIPTION="Expect for Perl"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-RDEPEND="
- virtual/perl-Carp
- virtual/perl-Exporter
- virtual/perl-IO
- >=dev-perl/IO-Tty-1.110.0
-"
-DEPEND="${RDEPEND}
- >=virtual/perl-ExtUtils-MakeMaker-6.640.0
- test? (
- virtual/perl-File-Temp
- >=dev-perl/Test-Exception-0.320.0
- virtual/perl-Test-Simple
- )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
index 1e15d8f..4387b15 100644
--- a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
+++ b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
@@ -9,7 +9,7 @@
DESCRIPTION='A wrapper for perl'\''s configuration'
LICENSE=" || ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
IUSE="test"
DEPEND="
diff --git a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
index 23c88eb..b5b7b8b 100644
--- a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
+++ b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
@@ -9,7 +9,7 @@
DESCRIPTION='Various portability utilities for module builders'
LICENSE=" || ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
IUSE="test"
DEPEND="
diff --git a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
index d10d487..2c0bb68 100644
--- a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
+++ b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
@@ -9,7 +9,7 @@
DESCRIPTION='Build.PL install path logic made easy'
LICENSE=" || ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
IUSE="test"
DEPEND="
diff --git a/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild b/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild
index b651585..6fd971e 100644
--- a/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild
+++ b/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild
@@ -12,7 +12,7 @@
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
IUSE=""
SRC_TEST=do
diff --git a/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.130.0.ebuild b/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.130.0.ebuild
index e528bc5..b724c5d 100644
--- a/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.130.0.ebuild
+++ b/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.130.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="WWW color names and equivalent RGB values"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND=">=dev-perl/Graphics-ColorNames-0.320.0"
diff --git a/dev-perl/Graphics-ColorNames/Graphics-ColorNames-2.110.0-r1.ebuild b/dev-perl/Graphics-ColorNames/Graphics-ColorNames-2.110.0-r1.ebuild
index 9ab8715..3ced20b 100644
--- a/dev-perl/Graphics-ColorNames/Graphics-ColorNames-2.110.0-r1.ebuild
+++ b/dev-perl/Graphics-ColorNames/Graphics-ColorNames-2.110.0-r1.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Defines RGB values for common color names"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="recommended"
COMMON_DEPEND="
diff --git a/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r1.ebuild b/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r1.ebuild
index 25c0b8d..f7182db 100644
--- a/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r1.ebuild
+++ b/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,7 +9,7 @@
DESCRIPTION="convert between color spaces"
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
# Pacakge warrants IUSE examples"
IUSE=""
diff --git a/dev-perl/Guard/Guard-1.22.0-r1.ebuild b/dev-perl/Guard/Guard-1.22.0-r1.ebuild
deleted file mode 100644
index 613101f..0000000
--- a/dev-perl/Guard/Guard-1.22.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MLEHMANN
-MODULE_VERSION=1.022
-inherit perl-module
-
-DESCRIPTION="Safe cleanup blocks"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Guard/Guard-1.23.0.ebuild b/dev-perl/Guard/Guard-1.23.0.ebuild
index 4027743..590e862 100644
--- a/dev-perl/Guard/Guard-1.23.0.ebuild
+++ b/dev-perl/Guard/Guard-1.23.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Safe cleanup blocks"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Guard/Manifest b/dev-perl/Guard/Manifest
index 4cfc6d0..983a9cc 100644
--- a/dev-perl/Guard/Manifest
+++ b/dev-perl/Guard/Manifest
@@ -1,2 +1 @@
-DIST Guard-1.022.tar.gz 6793 SHA256 35f1ba97f19a5029ecd1eba94399259592e359e0f5686aef6e758496484a5869 SHA512 9eb1c4fa29f6190115fe11215ff5d27bb3e7f5ab60c7f40c4142ad9ff8aad91b0b169204e4d0f1b1638381c0c99e6a0b5627b8b6d60fad62f1392a9d1e49751e WHIRLPOOL 463c8231bb56114d2c75fedd3efc96c00b4401e5f15ad767a2520804fe0f5d37f2906538eddfe7b831fd1aeba32c7e5dcd1a57be1ff0aa3375452d91d40d1575
DIST Guard-1.023.tar.gz 7065 SHA256 34c4ddf91fc93d1090d86da14df706d175b1610c67372c01e12ce9555d4dd1dc SHA512 a991d6f9ebfadffbcabaccc45d964c40c46c7212c6de089f0c496040e151236c59cc7dd7076464f0ef96936f2c4cd462fbedf8e729d522f1090682eda976676f WHIRLPOOL 63eb6e3167adf35fa3bb428b28e768f0922fa7e7df36243631ded455eefa3259af241ed8d857bd048856465ba42fabc81e0794e12ed71c19878f6968b06bd9d9
diff --git a/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.20.0-r1.ebuild b/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.20.0-r1.ebuild
index c54d5c2..3a18367 100644
--- a/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.20.0-r1.ebuild
+++ b/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.20.0-r1.ebuild
@@ -12,7 +12,7 @@
DESCRIPTION="Provide the stuff missing in Hash::Util"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND=""
diff --git a/dev-perl/Hash-MultiValue/Hash-MultiValue-0.150.0.ebuild b/dev-perl/Hash-MultiValue/Hash-MultiValue-0.150.0.ebuild
deleted file mode 100644
index a8e55e1..0000000
--- a/dev-perl/Hash-MultiValue/Hash-MultiValue-0.150.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MIYAGAWA
-MODULE_VERSION=0.15
-inherit perl-module
-
-DESCRIPTION="Store multiple values per key"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/Filter"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/Hash-MultiValue/Hash-MultiValue-0.160.0.ebuild b/dev-perl/Hash-MultiValue/Hash-MultiValue-0.160.0.ebuild
index d7aab00..933c73d 100644
--- a/dev-perl/Hash-MultiValue/Hash-MultiValue-0.160.0.ebuild
+++ b/dev-perl/Hash-MultiValue/Hash-MultiValue-0.160.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Store multiple values per key"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND=""
diff --git a/dev-perl/Hash-MultiValue/Manifest b/dev-perl/Hash-MultiValue/Manifest
index f3fbe72..298d8ee 100644
--- a/dev-perl/Hash-MultiValue/Manifest
+++ b/dev-perl/Hash-MultiValue/Manifest
@@ -1,2 +1 @@
-DIST Hash-MultiValue-0.15.tar.gz 19827 SHA256 805d0eba514f18d9af60f7d8baf50b5b6e004bbaa12da43642d40575f93c83c9 SHA512 fd97db887590c8c9ecbd0e58434df01fae8e3d2aa2335245ea1217d454e50c3bf1177921dd340f4cca3685808bebc573d13c892da7ccd685d3658c1db9d96465 WHIRLPOOL 6e53b5f51d85eb5adf09dd5648321b1a62838345d052bf28c934fcffc3aac0e0d7bd689089cc96659db3252530a495ecf106c3f3024b90419402730e11e8cab3
DIST Hash-MultiValue-0.16.tar.gz 19841 SHA256 66181df7aa68e2786faf6895c88b18b95c800a8e4e6fb4c07fd176410a3c73f4 SHA512 a6e1cab00ff24492bc84343b83a1282ad0eaded6633e7c511389dfb1d21cd8987dc2f1ad9ab69df69f36b651d68c70df3160666ff9ee584dbb1b6ab7095b78ac WHIRLPOOL 57e563f204b16e46c6052655a37cc09e72c82203d6a85f07b5d171aec5be4287b4c1935bab5702f6c13412e862e21868f5ccaa5d9e49e01d64e7179acb1ca30a
diff --git a/dev-perl/Hash-NoRef/Hash-NoRef-0.30.0-r1.ebuild b/dev-perl/Hash-NoRef/Hash-NoRef-0.30.0-r1.ebuild
index 56bc7c1..739bee2 100644
--- a/dev-perl/Hash-NoRef/Hash-NoRef-0.30.0-r1.ebuild
+++ b/dev-perl/Hash-NoRef/Hash-NoRef-0.30.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,5 +11,5 @@
DESCRIPTION="A HASH that store values without increasing the reference count (weak references)"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
diff --git a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild
index 7c894c6..9514819 100644
--- a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild
+++ b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Lexically scoped subroutine wrappers"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/IO-All/IO-All-0.820.0.ebuild b/dev-perl/IO-All/IO-All-0.820.0.ebuild
deleted file mode 100644
index b66fe70..0000000
--- a/dev-perl/IO-All/IO-All-0.820.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=FREW
-MODULE_VERSION=0.82
-
-inherit perl-module
-
-DESCRIPTION="unified IO operations"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- >=virtual/perl-Scalar-List-Utils-1.380.0
- >=virtual/perl-File-Spec-3.480.0
-"
-
-REPDENDS="
- >=virtual/perl-ExtUtils-MakeMaker-6.300.0
-"
-
-SRC_TEST=do
diff --git a/dev-perl/IO-All/IO-All-0.860.0.ebuild b/dev-perl/IO-All/IO-All-0.860.0.ebuild
index a2d59a0..efdb384 100644
--- a/dev-perl/IO-All/IO-All-0.860.0.ebuild
+++ b/dev-perl/IO-All/IO-All-0.860.0.ebuild
@@ -12,7 +12,7 @@
DESCRIPTION="unified IO operations"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# needs Scalar::Util
diff --git a/dev-perl/IO-All/Manifest b/dev-perl/IO-All/Manifest
index 0a00b90..c96c230 100644
--- a/dev-perl/IO-All/Manifest
+++ b/dev-perl/IO-All/Manifest
@@ -1,2 +1 @@
-DIST IO-All-0.82.tar.gz 77739 SHA256 6470f8097930d041e7dd93b218ef62048cce058712fa009588f69708a1920d00 SHA512 18bac30ce5e31e69d747720c838230b8f38ad781cae1f3bec613e01d531139f42c4995e648f662c56af30cdbf905dee77cfd39c53fb9487c0d7d4d24d723a1de WHIRLPOOL 801ebaa266f505aea1e99320fdbe4048aa2a222810768bee142626c256c7b9398a8e33e774d7979ee38830ba594c9b8dea664cee28f36f2249f6663880c94747
DIST IO-All-0.86.tar.gz 78648 SHA256 4574c2cfb8ca591783a62744d51952452e9304ff103865f2ee8c9c23a7e928d8 SHA512 3bf2f1caae19d10905d8c959b88e0ef43703b3cd0fb389060fd6a6a0bba4d6b24a92b8d2568f4bbfca6b7614270adb7131225a7b7f9394b26467bdb780a16a0e WHIRLPOOL c280d410d76bb46188fef590c250a1058a202fe918d17a08fc8d007570d9821497d2419fa16267e254c94be6138b341281b9255a54c18251d8799106ab686b28
diff --git a/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild b/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild
index 06060fa..0424cb2 100644
--- a/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild
+++ b/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Change and print terminal line settings"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RDEPEND=""
diff --git a/dev-perl/IO-Util/IO-Util-1.500.0-r1.ebuild b/dev-perl/IO-Util/IO-Util-1.500.0-r1.ebuild
index 7aada46..1876276 100644
--- a/dev-perl/IO-Util/IO-Util-1.500.0-r1.ebuild
+++ b/dev-perl/IO-Util/IO-Util-1.500.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,5 +11,5 @@
DESCRIPTION="A selection of general-utility IO function"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
diff --git a/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild b/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
new file mode 100644
index 0000000..4e3c795
--- /dev/null
+++ b/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=PEVANS
+MODULE_VERSION=0.10
+inherit perl-module
+
+DESCRIPTION="Higher-order list utility functions"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+ >=dev-perl/Module-Build-0.380.0
+ test? (
+ dev-perl/Test-Pod
+ )
+"
+
+SRC_TEST=do
diff --git a/dev-perl/List-UtilsBy/List-UtilsBy-0.90.0-r1.ebuild b/dev-perl/List-UtilsBy/List-UtilsBy-0.90.0-r1.ebuild
deleted file mode 100644
index 811884c..0000000
--- a/dev-perl/List-UtilsBy/List-UtilsBy-0.90.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=PEVANS
-MODULE_VERSION=0.09
-inherit perl-module
-
-DESCRIPTION="Higher-order list utility functions"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
- >=dev-perl/Module-Build-0.380.0
- test? (
- dev-perl/Test-Pod
- )
-"
-
-SRC_TEST=do
diff --git a/dev-perl/List-UtilsBy/Manifest b/dev-perl/List-UtilsBy/Manifest
index 50348e3..92ebaa6 100644
--- a/dev-perl/List-UtilsBy/Manifest
+++ b/dev-perl/List-UtilsBy/Manifest
@@ -1 +1 @@
-DIST List-UtilsBy-0.09.tar.gz 22358 SHA256 41e52a159af343af5b529ba17fb04d5ea861dd57a8615e3f3806a284d07f9af5 SHA512 faa86f0002e96f3d0ba093134bb084d8d43b297bf5947ccf79ef6916304e2d9005ba1e87437d053d7ffc170f01c8f5bd739c80bbff2b8bb1127840024d4c2992 WHIRLPOOL 5b16c678771e4499ed9553abadb1bcd23dbb4620dc7f9585dc693b47a605c4c7f13a055e484842affd5105d902e27918b048b6613c942226f08e97a5b013100f
+DIST List-UtilsBy-0.10.tar.gz 21845 SHA256 bed74094c625aa34a5ae94a7e1fe1856f08e1bd26b8ba152bfe7a51d3277192e SHA512 3e73ca8a99da111ff8869fce9561f52163bd4173589f0ff5c17913afea080279765a1f306af50b11040e26eea0f8ae9d993a93b0f0908ed15fa301e421dc0384 WHIRLPOOL 82347f0d556aad8e67cbf7e45bed1301d1a0ffe4ece7f3661a33fe4b80dac096d8adef13a1346219a1823538a1e6fe1270956112394af009798de3fb976d1139
diff --git a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
index 2972696..b7400b3 100644
--- a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
+++ b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
@@ -9,7 +9,7 @@
DESCRIPTION='A tiny replacement for Module::Build'
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Module-Locate/Module-Locate-1.790.0.ebuild b/dev-perl/Module-Locate/Module-Locate-1.790.0.ebuild
index 9f27cd5..c4f67cb 100644
--- a/dev-perl/Module-Locate/Module-Locate-1.790.0.ebuild
+++ b/dev-perl/Module-Locate/Module-Locate-1.790.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Locate modules in the same fashion as require and use"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Net-ARP/Manifest b/dev-perl/Net-ARP/Manifest
index 8c5f372..8834142 100644
--- a/dev-perl/Net-ARP/Manifest
+++ b/dev-perl/Net-ARP/Manifest
@@ -1 +1 @@
-DIST Net-ARP-1.0.6.tgz 17304 SHA256 c285a78e1ca8f516d72dd9a5207737687282ba6c59046b890717e6adf421ba05 SHA512 6b5b6b4b5255e5bb9e9b85e359083e4c859d98da868e19af21571dd211d0b2622e667522d047fd724aedfc7c66e464677b8e90aa823160b6a965bc5a84420a90 WHIRLPOOL df92b37f581faa41827477ab00cfd4b35737beae79322691b73d92581e6ce82e0bac1be9ce5154b5e2d807370ae9b7e951a1a9fa13c0027db83dfde4f086cfe0
+DIST Net-ARP-1.0.9.tgz 71377 SHA256 53fc3883755d75bed1671f9844f131ad364bdfb18313ed1ea78dc67b6901b18e SHA512 c2dc333ab4675709a4b2d9e53cbcc2f7cb226b89c366a841240d9b8a72802f2ad68c8acc40b27878c720198b63df34cd26091cd5f3ae528b597d4b214a316a91 WHIRLPOOL 879ca15bfbca34192ce4a364ea9b61deb8384c3b86c494b9ab52bbe57419b6ddfe0f1d0e165e6a97f52e1e128da2e4801a17aa93589875872a459f29657c64f0
diff --git a/dev-perl/Net-ARP/Net-ARP-1.0.6.ebuild b/dev-perl/Net-ARP/Net-ARP-1.0.6.ebuild
deleted file mode 100644
index 84dd32a..0000000
--- a/dev-perl/Net-ARP/Net-ARP-1.0.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=CRAZYDJ
-MODULE_VERSION=1.0.6
-MODULE_A_EXT=tgz
-inherit perl-module
-
-DESCRIPTION="Perl extension for creating ARP packets"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-perl/Net-Pcap"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}"/1.0.6-header.diff )
-
-src_prepare() {
- perl -MDevel::PPPort -e 'Devel::PPPort::WriteFile();'
- perl-module_src_prepare
-}
diff --git a/dev-perl/Net-ARP/Net-ARP-1.0.9.ebuild b/dev-perl/Net-ARP/Net-ARP-1.0.9.ebuild
new file mode 100644
index 0000000..5a2b770
--- /dev/null
+++ b/dev-perl/Net-ARP/Net-ARP-1.0.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=CRAZYDJ
+MODULE_VERSION=1.0.9
+MODULE_A_EXT=tgz
+inherit perl-module
+
+DESCRIPTION="Perl extension for creating ARP packets"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-perl/Net-Pcap"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/"${PV}"-header.diff )
+
+src_prepare() {
+ perl -MDevel::PPPort -e 'Devel::PPPort::WriteFile();'
+ perl-module_src_prepare
+}
diff --git a/dev-perl/Net-ARP/files/1.0.6-header.diff b/dev-perl/Net-ARP/files/1.0.9-header.diff
similarity index 100%
rename from dev-perl/Net-ARP/files/1.0.6-header.diff
rename to dev-perl/Net-ARP/files/1.0.9-header.diff
diff --git a/dev-perl/Net-IP-Minimal/Net-IP-Minimal-0.60.0.ebuild b/dev-perl/Net-IP-Minimal/Net-IP-Minimal-0.60.0.ebuild
index b563283..145fef4 100644
--- a/dev-perl/Net-IP-Minimal/Net-IP-Minimal-0.60.0.ebuild
+++ b/dev-perl/Net-IP-Minimal/Net-IP-Minimal-0.60.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,7 +9,7 @@
DESCRIPTION='Minimal functions from Net::IP'
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/Net-SSH2/Manifest b/dev-perl/Net-SSH2/Manifest
index 978f49e..71d8462 100644
--- a/dev-perl/Net-SSH2/Manifest
+++ b/dev-perl/Net-SSH2/Manifest
@@ -1,5 +1 @@
-DIST Net-SSH2-0.46.tar.gz 112190 SHA256 814f662140956d8b39cae277c1341d17b6be4494283cefbce70d234c8082dfe0 SHA512 36ffed2c96660c3a009b3ad42c944450cd710426953fb909d1e8989dcdb3d0d7807361c672d4904bff33cd1a206479149e7f2dc09c16b806a9ff2a6355e41ed8 WHIRLPOOL 9854701fb497306566bee86c5850fd7fc0466ce639c5ac794f63502b02dc093af60699625e57605660a0fc0a310b808ad3d313b72802a33b771482bbcdcbdd9f
-DIST Net-SSH2-0.47.tar.gz 114097 SHA256 b3f6c01dd98f347a7fa73fb470fb5abeebbe0820349b9ead8b622f02fae0ad4a SHA512 164a1c5752015cd405e733eaab24d8f0399fdc615a1e2bafb3c98f200f6feaa9eee72c59cdb829d373a34c78e2f4581156d96a2a2bf0bb45f402902d58fd6135 WHIRLPOOL 894dac5dd3414ea4b055f8ddf57cab0b4373dd76884a3e7627f6fe71bd431f36e779fab7553d02cd5c3bc90624056e53e30661982cfedb71513bc318cf83ac2f
-DIST Net-SSH2-0.48.tar.gz 114268 SHA256 b62c9fd708da50b0fc8a25d525e1416612b2095e377ec490651177c57de83a5d SHA512 b383f3f160e652f588096dc05c9d24a1c689367af6647537d5343384c08f869479a4c53e2cf1964fc87fa11d15db69c60c1708d6c2ab46e97a4472d0c1442a89 WHIRLPOOL 384636170a95990c7ed21098132ebf2516f26ef76a13022be439b8f6cc2e99fad9db86f4ee755968bdcb0d87d6f7258064b2c455ad464af868228c52f86fdfe8
-DIST Net-SSH2-0.52.tar.gz 114675 SHA256 d2bfa64d9d489c1be2e635fc70fcc1d69b0d3b11e1be24683151e1d10bb4dce1 SHA512 a5721ea48478191923808595cd43dbccb468902fc4feae38642c9ee1aa0fa86218afcaa9639cb776fc03eb4542e489660b6b7c229033750cd340f622b67d9834 WHIRLPOOL 49f45c6aa561370c398326c0e20123dd5b538527fdd9da7ba4d5c728e6652d0b83209775696e2e27cea24727ab0802613e1c1871f0e2a11f198937f341f60c2d
-DIST Net-SSH2-0.53.tar.gz 114860 SHA256 f072ecb816c6b9ef9ad03057a765590e8bc1ad401fdea215f272fa8405ce57dc SHA512 c3aaa97f2c5fe987c5f28fca2d6687b6ff759d6ab70f6136e581f439cd06af70de5410628187c94168db43464e0713eeed9f50185f7bf0305fd01e0ac7ee5817 WHIRLPOOL 647d02e1ea6289fb2c4ed1b566b225155b6ccadf15860184dd5f82be815d8a7eb8f49d937999f21a93fdbafefa9cc6ef9ef32bc8e144ba816b8afd9520d00bbd
+DIST Net-SSH2-0.55.tar.gz 123165 SHA256 492a23eba5e9951944087262a042136269c1434a678e0148ca3202e50259a43e SHA512 6ada62f1863c23d11bc09087e8336fcfdd3dfc3dec533d93151ab9d5cb41132601585809b7e5ed5ce03430dab6b063353d68600f9912ddb460f6ad661df31f51 WHIRLPOOL dd0ba4105bc7fca2f29e2803c887af19f5c4ede531ca14ffbbb6415c7d730d59619b897fd2833e0bc2348abec1c545a87138800048de0972538cce671406b8a1
diff --git a/dev-perl/Net-SSH2/Net-SSH2-0.460.0.ebuild b/dev-perl/Net-SSH2/Net-SSH2-0.460.0.ebuild
deleted file mode 100644
index b2744d6..0000000
--- a/dev-perl/Net-SSH2/Net-SSH2-0.460.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RKITOVER
-MODULE_VERSION=0.46
-inherit perl-module
-
-DESCRIPTION="Net::SSH2 - Support for the SSH 2 protocol via libssh2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="net-libs/libssh2
->=virtual/perl-ExtUtils-MakeMaker-6.50"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Net-SSH2/Net-SSH2-0.470.0.ebuild b/dev-perl/Net-SSH2/Net-SSH2-0.470.0.ebuild
deleted file mode 100644
index da2d646..0000000
--- a/dev-perl/Net-SSH2/Net-SSH2-0.470.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RKITOVER
-MODULE_VERSION=0.47
-inherit perl-module
-
-DESCRIPTION="Net::SSH2 - Support for the SSH 2 protocol via libssh2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gcrypt"
-
-RDEPEND="
- sys-libs/zlib
- net-libs/libssh2
- !gcrypt? (
- dev-libs/openssl
- )
- gcrypt? (
- dev-libs/libgcrypt:0
- )
-"
-DEPEND="${RDEPEND}
- >=virtual/perl-ExtUtils-MakeMaker-6.50
-"
-
-SRC_TEST="do"
-
-src_configure() {
- use gcrypt && myconf=gcrypt
- perl-module_src_configure
-}
diff --git a/dev-perl/Net-SSH2/Net-SSH2-0.480.0.ebuild b/dev-perl/Net-SSH2/Net-SSH2-0.480.0.ebuild
deleted file mode 100644
index 29d667c..0000000
--- a/dev-perl/Net-SSH2/Net-SSH2-0.480.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RKITOVER
-MODULE_VERSION=0.48
-inherit perl-module
-
-DESCRIPTION="Net::SSH2 - Support for the SSH 2 protocol via libssh2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gcrypt"
-
-RDEPEND="
- sys-libs/zlib
- net-libs/libssh2
- !gcrypt? (
- dev-libs/openssl
- )
- gcrypt? (
- dev-libs/libgcrypt:0
- )
-"
-DEPEND="${RDEPEND}
- >=virtual/perl-ExtUtils-MakeMaker-6.50
-"
-
-SRC_TEST="do"
-
-src_configure() {
- use gcrypt && myconf=gcrypt
- perl-module_src_configure
-}
diff --git a/dev-perl/Net-SSH2/Net-SSH2-0.520.0.ebuild b/dev-perl/Net-SSH2/Net-SSH2-0.520.0.ebuild
deleted file mode 100644
index 3723a13..0000000
--- a/dev-perl/Net-SSH2/Net-SSH2-0.520.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RKITOVER
-MODULE_VERSION=0.52
-inherit perl-module
-
-DESCRIPTION="Net::SSH2 - Support for the SSH 2 protocol via libssh2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gcrypt"
-
-RDEPEND="
- sys-libs/zlib
- net-libs/libssh2
- !gcrypt? (
- dev-libs/openssl
- )
- gcrypt? (
- dev-libs/libgcrypt:0
- )
-"
-DEPEND="${RDEPEND}
- >=virtual/perl-ExtUtils-MakeMaker-6.50
-"
-
-SRC_TEST="do"
-
-src_configure() {
- use gcrypt && myconf=gcrypt
- perl-module_src_configure
-}
diff --git a/dev-perl/Net-SSH2/Net-SSH2-0.530.0-r1.ebuild b/dev-perl/Net-SSH2/Net-SSH2-0.530.0-r1.ebuild
deleted file mode 100644
index ba31c41..0000000
--- a/dev-perl/Net-SSH2/Net-SSH2-0.530.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RKITOVER
-MODULE_VERSION=0.53
-inherit perl-module
-
-DESCRIPTION="Net::SSH2 - Support for the SSH 2 protocol via libssh2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gcrypt libressl"
-
-RDEPEND="
- sys-libs/zlib
- net-libs/libssh2
- !gcrypt? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )
- gcrypt? (
- dev-libs/libgcrypt:0
- )
-"
-DEPEND="${RDEPEND}
- >=virtual/perl-ExtUtils-MakeMaker-6.50
-"
-
-SRC_TEST="do"
-
-src_configure() {
- use gcrypt && myconf=gcrypt
- perl-module_src_configure
-}
diff --git a/dev-perl/Net-SSH2/Net-SSH2-0.530.0.ebuild b/dev-perl/Net-SSH2/Net-SSH2-0.530.0.ebuild
deleted file mode 100644
index 7b44b3c..0000000
--- a/dev-perl/Net-SSH2/Net-SSH2-0.530.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RKITOVER
-MODULE_VERSION=0.53
-inherit perl-module
-
-DESCRIPTION="Net::SSH2 - Support for the SSH 2 protocol via libssh2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gcrypt"
-
-RDEPEND="
- sys-libs/zlib
- net-libs/libssh2
- !gcrypt? (
- dev-libs/openssl
- )
- gcrypt? (
- dev-libs/libgcrypt:0
- )
-"
-DEPEND="${RDEPEND}
- >=virtual/perl-ExtUtils-MakeMaker-6.50
-"
-
-SRC_TEST="do"
-
-src_configure() {
- use gcrypt && myconf=gcrypt
- perl-module_src_configure
-}
diff --git a/dev-perl/Net-SSH2/Net-SSH2-0.550.0.ebuild b/dev-perl/Net-SSH2/Net-SSH2-0.550.0.ebuild
new file mode 100644
index 0000000..40b1cbc
--- /dev/null
+++ b/dev-perl/Net-SSH2/Net-SSH2-0.550.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=SALVA
+MODULE_VERSION=0.55
+inherit perl-module
+
+DESCRIPTION="Net::SSH2 - Support for the SSH 2 protocol via libssh2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gcrypt libressl"
+
+RDEPEND="
+ sys-libs/zlib
+ net-libs/libssh2
+ !gcrypt? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ gcrypt? (
+ dev-libs/libgcrypt:0
+ )
+"
+DEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.50
+"
+
+SRC_TEST="do"
+
+src_configure() {
+ use gcrypt && myconf=gcrypt
+ perl-module_src_configure
+}
diff --git a/dev-perl/OpenGL/OpenGL-0.670.3.ebuild b/dev-perl/OpenGL/OpenGL-0.670.3.ebuild
index d089f1e..8b1cb70 100644
--- a/dev-perl/OpenGL/OpenGL-0.670.3.ebuild
+++ b/dev-perl/OpenGL/OpenGL-0.670.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@
LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86 ~ppc64 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-perl/PPI/PPI-1.220.ebuild b/dev-perl/PPI/PPI-1.220.ebuild
index ebcf415..061154a 100644
--- a/dev-perl/PPI/PPI-1.220.ebuild
+++ b/dev-perl/PPI/PPI-1.220.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Path-Class/Path-Class-0.350.0.ebuild b/dev-perl/Path-Class/Path-Class-0.350.0.ebuild
index eb5665d..d0d89d2 100644
--- a/dev-perl/Path-Class/Path-Class-0.350.0.ebuild
+++ b/dev-perl/Path-Class/Path-Class-0.350.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Cross-platform path specification manipulation"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Perl-Tags/Perl-Tags-0.280.0-r2.ebuild b/dev-perl/Perl-Tags/Perl-Tags-0.280.0-r2.ebuild
index 50cdc7b..f573bb8 100644
--- a/dev-perl/Perl-Tags/Perl-Tags-0.280.0-r2.ebuild
+++ b/dev-perl/Perl-Tags/Perl-Tags-0.280.0-r2.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Generate (possibly exuberant) Ctags style tags for Perl sourcecode"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE="test"
PERL_RM_FILES=(
diff --git a/dev-perl/Pod-Readme/Pod-Readme-0.110.0-r1.ebuild b/dev-perl/Pod-Readme/Pod-Readme-0.110.0-r1.ebuild
index 0379015..5f9bfe7 100644
--- a/dev-perl/Pod-Readme/Pod-Readme-0.110.0-r1.ebuild
+++ b/dev-perl/Pod-Readme/Pod-Readme-0.110.0-r1.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Convert POD to README file"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="dev-perl/regexp-common"
diff --git a/dev-perl/Set-Infinite/Set-Infinite-0.650.0-r1.ebuild b/dev-perl/Set-Infinite/Set-Infinite-0.650.0-r1.ebuild
index d86fd6a..6b75efe 100644
--- a/dev-perl/Set-Infinite/Set-Infinite-0.650.0-r1.ebuild
+++ b/dev-perl/Set-Infinite/Set-Infinite-0.650.0-r1.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Sets of intervals"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
SRC_TEST=do
diff --git a/dev-perl/Shell/Shell-0.720.0.ebuild b/dev-perl/Shell/Shell-0.720.0.ebuild
index 3fb0149..d27f803 100644
--- a/dev-perl/Shell/Shell-0.720.0.ebuild
+++ b/dev-perl/Shell/Shell-0.720.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@
DESCRIPTION="Shell - run shell commands transparently within perl"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
SRC_TEST=do
diff --git a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
index ae81b2a..18db153 100644
--- a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
+++ b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Most commonly needed test functions and features"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Test-Object/Test-Object-0.70.0-r1.ebuild b/dev-perl/Test-Object/Test-Object-0.70.0-r1.ebuild
index 62144a2..2ad6067 100644
--- a/dev-perl/Test-Object/Test-Object-0.70.0-r1.ebuild
+++ b/dev-perl/Test-Object/Test-Object-0.70.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@
DESCRIPTION="Thoroughly testing objects via registered handlers"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
RDEPEND="virtual/perl-File-Spec
diff --git a/dev-perl/Test-Output/Manifest b/dev-perl/Test-Output/Manifest
index e6bf162..7a61c5f 100644
--- a/dev-perl/Test-Output/Manifest
+++ b/dev-perl/Test-Output/Manifest
@@ -1,2 +1 @@
-DIST Test-Output-1.01.tar.gz 12277 SHA256 8d3529e2983b66bbef4fa3bbc3954971b9e6fc23b518443ac3c6bba8cd86e241 SHA512 50085c468d676e770a1a98221f40e332048501f0b7da32fab42e0e0824e630ab8fe45ddfe6b29bd3c560e420e34b5191774f79ee9e1fac59e79771aff56cf1ce WHIRLPOOL 492b5e46bfb373f1ea27005d047bda34181b93a0897bfe023f170fe2d2b1f49792d9f97ac558a3becec39cfcf765b9630ddbf1ca36dcb7767b2dd733a85d15e9
DIST Test-Output-1.03.tar.gz 12346 SHA256 3110af65c6fc59b9fa46b08a47508c5e85f6edc6355f0879e28b11f9ad0c2989 SHA512 b7f793564c906f40444f249272dde55db1357923da72b6638634aece779d9cc5e8f4d7de0326fabb33e7c11eccf089069532f8f61529526467b579e1bacb4ee1 WHIRLPOOL 5fcbe799b28bd451141e44823548115242b02ad3555ae215b5427baefeeacfa7173c91fe0d9b6ff97ac2bbbaeef67d2a3147a8888b7175be5a3da99f80ffeed8
diff --git a/dev-perl/Test-Output/Test-Output-1.10.0-r1.ebuild b/dev-perl/Test-Output/Test-Output-1.10.0-r1.ebuild
deleted file mode 100644
index 26a9a20..0000000
--- a/dev-perl/Test-Output/Test-Output-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=BDFOY
-MODULE_VERSION=1.01
-inherit perl-module
-
-DESCRIPTION="Utilities to test STDOUT and STDERR messages"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND="
- dev-perl/Sub-Exporter
- virtual/perl-Test-Simple"
-DEPEND="${RDEPEND}
- test? (
- || ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-Tester-0.107 )
- dev-perl/Test-Pod
- dev-perl/Test-Pod-Coverage
- )"
-
-SRC_TEST=do
diff --git a/dev-perl/Test-Output/Test-Output-1.30.0.ebuild b/dev-perl/Test-Output/Test-Output-1.30.0.ebuild
index a3b28fa..e1af282 100644
--- a/dev-perl/Test-Output/Test-Output-1.30.0.ebuild
+++ b/dev-perl/Test-Output/Test-Output-1.30.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Utilities to test STDOUT and STDERR messages"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Test-Portability-Files/Test-Portability-Files-0.60.0-r1.ebuild b/dev-perl/Test-Portability-Files/Test-Portability-Files-0.60.0-r1.ebuild
index feb2fcf..a19d412 100644
--- a/dev-perl/Test-Portability-Files/Test-Portability-Files-0.60.0-r1.ebuild
+++ b/dev-perl/Test-Portability-Files/Test-Portability-Files-0.60.0-r1.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Check file names portability"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Test-Spec/Test-Spec-0.470.0.ebuild b/dev-perl/Test-Spec/Test-Spec-0.470.0.ebuild
index 1a182d9..1bacb59 100644
--- a/dev-perl/Test-Spec/Test-Spec-0.470.0.ebuild
+++ b/dev-perl/Test-Spec/Test-Spec-0.470.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,7 +9,7 @@
DESCRIPTION='Write tests in a declarative specification style'
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild b/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild
index 7805779..e99fb6a 100644
--- a/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild
+++ b/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@
DESCRIPTION="Track the number of times subs are called"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
DEPEND=">=dev-perl/Hook-LexWrap-0.20
diff --git a/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r1.ebuild b/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r1.ebuild
index 10c6427..c85afb1 100644
--- a/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r1.ebuild
+++ b/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@
DESCRIPTION="Tying a subroutine, function or method to a hash"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="dev-perl/Params-Validate"
diff --git a/dev-perl/autobox/autobox-2.830.0.ebuild b/dev-perl/autobox/autobox-2.830.0.ebuild
index 64a1ea2..ace4982 100644
--- a/dev-perl/autobox/autobox-2.830.0.ebuild
+++ b/dev-perl/autobox/autobox-2.830.0.ebuild
@@ -9,7 +9,7 @@
DESCRIPTION="Call methods on native types"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/autovivification/autovivification-0.160.0.ebuild b/dev-perl/autovivification/autovivification-0.160.0.ebuild
index c7fde40..5c556e5 100644
--- a/dev-perl/autovivification/autovivification-0.160.0.ebuild
+++ b/dev-perl/autovivification/autovivification-0.160.0.ebuild
@@ -9,7 +9,7 @@
DESCRIPTION="Lexically disable autovivification"
LICENSE=" || ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="virtual/perl-XSLoader"
diff --git a/dev-perl/boolean/Manifest b/dev-perl/boolean/Manifest
index db652b2..e166f4b 100644
--- a/dev-perl/boolean/Manifest
+++ b/dev-perl/boolean/Manifest
@@ -1,2 +1 @@
-DIST boolean-0.42.tar.gz 14640 SHA256 8b0595090a78d1235f74b18d01b4e1e8fa375e08f291eba732d55e8cbdb37e5c SHA512 dbfe7c6a96bf253d68c3e8ca8a5df5f3da82e54ca7d43f39192e72ee59a26b527fe81316374b7c1bbf491262c528994c198ff6feddc7dcafac84c8907fcdcb92 WHIRLPOOL 42346b8054f78b05afc56b3efc511163b244ebd7a1653dc874a4a4b03d81e92ea0bfba94490c32e42f31d12ea72ec37ec5f2b459459dea2e615ce60a954efa19
DIST boolean-0.45.tar.gz 14641 SHA256 f2fa412c8042bb1e97675cdac8dfb9696e5c4036bd439401031a5afe1b7d19a2 SHA512 1acc26a5015f067e701fa52cbc80fb1fe84f2b4246690a96fc1efb608fb9c40cf0998f9932a485e659e3ea03a7c05d82d779fb029ed70a0a468f7bf3573f260e WHIRLPOOL eb56cc406bf61caa44cd05bce4e8a2cb6273606972a946feace651e161789cb8545ee257c1831ddb3c4d5df371d244a7c3589371f906f76796d7d0e2a616396b
diff --git a/dev-perl/boolean/boolean-0.420.0.ebuild b/dev-perl/boolean/boolean-0.420.0.ebuild
deleted file mode 100644
index 09bff9f..0000000
--- a/dev-perl/boolean/boolean-0.420.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=INGY
-MODULE_VERSION=0.42
-inherit perl-module
-
-DESCRIPTION="Boolean support for Perl"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
- test? (
- dev-perl/JSON
- )
-"
-
-SRC_TEST=do
diff --git a/dev-perl/boolean/boolean-0.450.0.ebuild b/dev-perl/boolean/boolean-0.450.0.ebuild
index ece392d..369fc41 100644
--- a/dev-perl/boolean/boolean-0.450.0.ebuild
+++ b/dev-perl/boolean/boolean-0.450.0.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Boolean support for Perl"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND=""
diff --git a/dev-perl/local-lib/Manifest b/dev-perl/local-lib/Manifest
index 275a860..cd323f9 100644
--- a/dev-perl/local-lib/Manifest
+++ b/dev-perl/local-lib/Manifest
@@ -1,2 +1 @@
-DIST local-lib-1.008026.tar.gz 67540 SHA256 4c8ce3b5bdf2ff1868153e84bc0ce0c503adec145a6de3664f031b9f54fd04c2 SHA512 8923abcf78794da4a1ce71005e43e179f7009b08c3b05e0a76c3a6c6d61961ed066f83f52548a07c55d0a7b58965f57ab3b3a16afdf820fe014476ef4b743396 WHIRLPOOL 3151fc70212df4a167924e20587513a4683ee5c92b56424964f82f14cb7563a49dce60d907a990442b5c89c7a4b5c0987810e4d3cf518171e998820a4eec2aee
DIST local-lib-2.000014.tar.gz 51593 SHA256 ae63356ab780c5a3aa46287b48daea748a3dd021d9b52dff8bf480b43787fa2b SHA512 3a7bb68af992215eb6787082fea7c09d5468aabe5c6478d028ce99ae878f6efdd8982804ba2c396af1fc0a5b46a4fa7f0e4831d9c32f1abd41ef631976c5efe8 WHIRLPOOL 990e3ca60a88544a0394fbb994832aff9c50988dde0372d8d7e437a72c28d30bf27438acfb8423aa57965bf58140e7a3284d6151a80cbd51bffc4ed201b6e6c1
diff --git a/dev-perl/local-lib/files/1.008026/0001_No_CPAN.patch b/dev-perl/local-lib/files/1.008026/0001_No_CPAN.patch
deleted file mode 100644
index e75f590..0000000
--- a/dev-perl/local-lib/files/1.008026/0001_No_CPAN.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.PL 2013-11-05 18:07:13.000000000 +0000
-+++ Makefile.PL 2013-12-23 15:21:32.582135695 +0000
-@@ -37,6 +37,10 @@
- DEATH
-
- my $cwd;
-+
-+{ # GENTOO
-+ last;
-+
- BEGIN {
- $cwd = Cwd::cwd();
- # watch out for fancy dashes. these can wind up in our @ARGV if the user is
-@@ -176,6 +180,8 @@
- }
- }
-
-+} # END GENTOO
-+
- use inc::Module::Install;
-
- name 'local-lib';
-@@ -185,6 +191,9 @@
- requires 'ExtUtils::Install' => '1.43'; # version INSTALL_BASE was added
- requires 'Module::Build' => '0.36'; # PERL_MB_OPT
-
-+{ # GENTOO
-+ last;
-+
- # don't bother fixing CPAN.pm if bootstrapped from cpanminus
- unless ($ENV{PERL5_CPANM_IS_RUNNING}) {
- my $required_CPAN = '1.82';
-@@ -251,6 +260,9 @@
- auto_install;
- }
- chdir($cwd);
-+
-+} # END GENTOO
-+
- resources(
- # r/w: p5sagit@git.shadowcat.co.uk:local-lib.git
- repository => 'git://git.shadowcat.co.uk/p5sagit/local-lib.git',
diff --git a/dev-perl/local-lib/local-lib-1.8.26.ebuild b/dev-perl/local-lib/local-lib-1.8.26.ebuild
deleted file mode 100644
index da1d1f3..0000000
--- a/dev-perl/local-lib/local-lib-1.8.26.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MODULE_AUTHOR=HAARG
-MODULE_VERSION=1.008026
-inherit perl-module
-
-DESCRIPTION='create and use a local lib/ for perl modules with PERL5LIB'
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=(
- "${FILESDIR}/${MODULE_VERSION}/0001_No_CPAN.patch"
-)
-
-RDEPEND="
- >=virtual/perl-CPAN-1.820.0
- >=virtual/perl-ExtUtils-Install-1.430.0
- >=virtual/perl-ExtUtils-MakeMaker-6.740.0
- >=dev-perl/Module-Build-0.360.0
-"
-DEPEND="${RDEPEND}
- >=virtual/perl-ExtUtils-MakeMaker-6.590.0
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/local-lib/local-lib-2.0.14.ebuild b/dev-perl/local-lib/local-lib-2.0.14.ebuild
index c245cda..a649580 100644
--- a/dev-perl/local-lib/local-lib-2.0.14.ebuild
+++ b/dev-perl/local-lib/local-lib-2.0.14.ebuild
@@ -9,7 +9,7 @@
DESCRIPTION='create and use a local lib/ for perl modules with PERL5LIB'
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="
diff --git a/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.3.ebuild b/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.3.ebuild
index 02b2220..d1bc479 100644
--- a/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.3.ebuild
+++ b/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.3.ebuild
@@ -6,7 +6,7 @@
inherit php-pear-r1
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
DESCRIPTION="A SQL Builder, Object Interface to Database Tables"
LICENSE="PHP-2.02 PHP-3"
diff --git a/dev-php/PEAR-File_Passwd/PEAR-File_Passwd-1.1.7-r1.ebuild b/dev-php/PEAR-File_Passwd/PEAR-File_Passwd-1.1.7-r1.ebuild
deleted file mode 100644
index 63a1db7..0000000
--- a/dev-php/PEAR-File_Passwd/PEAR-File_Passwd-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit php-pear-r1
-
-DESCRIPTION="Manipulate many kinds of password files"
-
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
diff --git a/dev-php/PEAR-File_Passwd/PEAR-File_Passwd-1.1.7-r3.ebuild b/dev-php/PEAR-File_Passwd/PEAR-File_Passwd-1.1.7-r3.ebuild
index 70953d8..ad8146b 100644
--- a/dev-php/PEAR-File_Passwd/PEAR-File_Passwd-1.1.7-r3.ebuild
+++ b/dev-php/PEAR-File_Passwd/PEAR-File_Passwd-1.1.7-r3.ebuild
@@ -10,7 +10,7 @@
LICENSE="PHP-3"
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=""
DEPEND="dev-lang/php:*[pcre(+)]"
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
deleted file mode 100644
index 8c818cf..0000000
--- a/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-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"
-IUSE=""
-DEPEND="|| ( <dev-lang/php-5.3[pcre,iconv] >=dev-lang/php-5.3[iconv] )"
diff --git a/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r3.ebuild b/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r3.ebuild
index e27ac6e..c75e2fc 100644
--- a/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r3.ebuild
+++ b/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r3.ebuild
@@ -9,7 +9,7 @@
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:*[iconv,pcre(+)]"
RDEPEND="${DEPEND}"
diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4-r2.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4-r2.ebuild
index eabc826..6597ad5 100644
--- a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4-r2.ebuild
+++ b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4-r2.ebuild
@@ -15,7 +15,7 @@
LICENSE="LGPL-2.1"
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"
DEPEND="dev-lang/php:*[pcre(+)]
diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild
deleted file mode 100644
index 58101de..0000000
--- a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# BIG FAT WARNING!
-# Do not use any pear eclass here since pear itself depends on this package.
-# Using the pear eclass will thus create a circular dependency
-
-EAPI="2"
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Graph datastructure manipulation library"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
- >=dev-php/PEAR-PEAR-1.8.1"
-PDEPEND="dev-php/pear"
-HOMEPAGE="http://pear.php.net/package/Structures_Graph"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- insinto /usr/share/php
- doins -r Structures
-
- dohtml -r docs/html/*
-}
diff --git a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r1.ebuild b/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r1.ebuild
deleted file mode 100644
index 4afaa95..0000000
--- a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="Terminal screen handling and optimization package"
-
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-my_conf="--enable-ncursesw"
diff --git a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r2.ebuild b/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r2.ebuild
new file mode 100644
index 0000000..9ecc187
--- /dev/null
+++ b/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_PHP="php5-6 php5-5 php5-4"
+
+inherit php-ext-pecl-r2
+
+DESCRIPTION="Terminal screen handling and optimization package"
+
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+my_conf="--enable-ncursesw"
diff --git a/dev-python/Babel/Babel-2.1.1-r1.ebuild b/dev-python/Babel/Babel-2.1.1-r1.ebuild
new file mode 100644
index 0000000..ba579d6
--- /dev/null
+++ b/dev-python/Babel/Babel-2.1.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of tools for internationalizing Python applications"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Make the tests use implementation-specific datadir,
+ # because they try to write in it.
+ sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
+ -i tests/messages/test_frontend.py || die
+ sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # Create implementation-specific datadir for tests.
+ cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
+ export BUILD_DIR
+ py.test || die
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/CacheControl/CacheControl-0.11.5-r1.ebuild b/dev-python/CacheControl/CacheControl-0.11.5-r1.ebuild
new file mode 100644
index 0000000..62ca021
--- /dev/null
+++ b/dev-python/CacheControl/CacheControl-0.11.5-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The httplib2 caching algorithms packaged up for use with requests"
+HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.python.org/pypi/cachecontrol/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="redis test"
+
+RDEPEND="
+ dev-python/requests[${PYTHON_USEDEP}]
+ >=dev-python/lockfile-0.9[${PYTHON_USEDEP}]
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
+DEPENDS="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+ py.test -v || die
+}
diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
index 1cfcbb4..260be47 100644
--- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
@@ -14,7 +14,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86"
IUSE="redis test"
RDEPEND="
diff --git a/dev-python/Kivy/Kivy-1.8.0.ebuild b/dev-python/Kivy/Kivy-1.8.0.ebuild
deleted file mode 100644
index af6192a..0000000
--- a/dev-python/Kivy/Kivy-1.8.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A software library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="http://kivy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo camera doc examples garden gstreamer spell"
-
-RDEPEND="
- dev-python/pygame[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]
- cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
- camera? ( media-libs/opencv )
- garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
- gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
- spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
- "
-RDEPEND="${DEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
- sed -e '/data_files=/d' -i "${S}/setup.py" || die
- epatch "${FILESDIR}/cython-fixes.patch"
- if has_version '>=dev-python/cython-0.22' ; then
- epatch "${FILESDIR}/cython-0.22.patch"
- fi
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- use doc && DOCS=( doc/sources/. )
- use examples && EXAMPLES=( examples )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/Kivy/Kivy-1.9.0-r1.ebuild b/dev-python/Kivy/Kivy-1.9.0-r1.ebuild
new file mode 100644
index 0000000..8bd7347
--- /dev/null
+++ b/dev-python/Kivy/Kivy-1.9.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A software library for rapid development of hardware-accelerated multitouch applications"
+HOMEPAGE="http://kivy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="cairo camera doc examples garden gstreamer spell"
+
+RDEPEND="
+ dev-python/pygame[${PYTHON_USEDEP}]
+ virtual/python-imaging[${PYTHON_USEDEP}]
+ cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
+ camera? ( media-libs/opencv )
+ garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
+ gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+ spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
+ "
+DEPEND="${RDEPEND}
+ <=dev-python/cython-0.22[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ media-libs/mesa
+"
+
+PATCHES=( "${FILESDIR}"/${P}-cython-0.22-backport.patch )
+
+python_prepare_all() {
+ sed -e '/data_files=/d' -i "${S}/setup.py" || die
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ use doc && DOCS=( doc/sources/. )
+ use examples && EXAMPLES=( examples )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/Kivy/Kivy-1.9.0.ebuild b/dev-python/Kivy/Kivy-1.9.0.ebuild
deleted file mode 100644
index 9dbec84..0000000
--- a/dev-python/Kivy/Kivy-1.9.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A software library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="http://kivy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo camera doc examples garden gstreamer spell"
-
-RDEPEND="
- dev-python/pygame[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]
- cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
- camera? ( media-libs/opencv )
- garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
- gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
- spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
- "
-DEPEND="${RDEPEND}
- <=dev-python/cython-0.22[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}"/${P}-cython-0.22-backport.patch )
-
-python_prepare_all() {
- sed -e '/data_files=/d' -i "${S}/setup.py" || die
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- use doc && DOCS=( doc/sources/. )
- use examples && EXAMPLES=( examples )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
index f81ab10..7e5371c 100644
--- a/dev-python/Kivy/Manifest
+++ b/dev-python/Kivy/Manifest
@@ -1,2 +1 @@
-DIST Kivy-1.8.0.tar.gz 14655888 SHA256 1bb5add88132c902ed746e7624034ecaab49e61f3fbbfde231604e887e6fb324 SHA512 e7057b008cceec9513961ddc3d4aaef2aa1a10de9c2de09ad82bd90ca88300047374e5f8c982cb018712fb0465c03208108c3110887ef383c00a45ee9e5bc81d WHIRLPOOL a6530edebcae34aede981c2f0db37a26a9378e148a073dc1396096b4db04ebdef0f6d96de4222383a5e2d84858bdf10383611751f9bf5ae625eafc67d1cf702f
DIST Kivy-1.9.0.tar.gz 16178808 SHA256 b828617f858963f7873f5c81bb8824ca1dfa265e7811fce03599e2ba7200ffa0 SHA512 e0efc27f8ae070f5748570ee9224220791d32e931bbaf0bad5ddee894cf1d0f9ded5eebcc54d3b666491edaab0316923311f5e0cc7b1e46929d87ea3bec87f21 WHIRLPOOL c57c696752c88d3c8643e126180aa00b864df45bad0de4e6456143fd0f1486085a258a787ec2e4017b982004dd5a1212b11dbcb352f1f72b77591fa5fd9c934e
diff --git a/dev-python/Kivy/files/cython-0.22.patch b/dev-python/Kivy/files/cython-0.22.patch
deleted file mode 100644
index 9b125f9..0000000
--- a/dev-python/Kivy/files/cython-0.22.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- kivy/graphics.orig/shader.pyx 2015-02-19 07:27:13.062070969 +0100
-+++ kivy/graphics/shader.pyx 2015-02-19 07:27:22.838737743 +0100
-@@ -221,13 +221,13 @@
- '''
- glUseProgram(0)
-
-- cdef void set_uniform(self, str name, value):
-+ cdef void set_uniform(self, str name, value) except *:
- if name in self.uniform_values and self.uniform_values[name] == value:
- return
- self.uniform_values[name] = value
- self.upload_uniform(name, value)
-
-- cdef void upload_uniform(self, str name, value):
-+ cdef void upload_uniform(self, str name, value) except *:
- '''Pass a uniform variable to the shader.
- '''
- cdef long vec_size, index, x, y
-@@ -412,7 +412,7 @@
- mat[x] = <GLfloat>value.mat[x]
- glUniformMatrix4fv(loc, 1, False, mat)
-
-- cdef int get_uniform_loc(self, str name):
-+ cdef int get_uniform_loc(self, str name) except *:
- cdef bytes c_name = name.encode('utf-8')
- cdef int loc = glGetUniformLocation(self.program, c_name)
- self.uniform_locations[name] = loc
-@@ -453,11 +453,11 @@
- # save for the next run.
- self._current_vertex_format = vertex_format
-
-- cdef void build(self):
-+ cdef void build(self) except *:
- self.build_vertex()
- self.build_fragment()
-
-- cdef void build_vertex(self, int link=1):
-+ cdef void build_vertex(self, int link=1) except *:
- if self.vertex_shader is not None:
- glDetachShader(self.program, self.vertex_shader.shader)
- self.vertex_shader = None
-@@ -467,7 +467,7 @@
- if link:
- self.link_program()
-
-- cdef void build_fragment(self, int link=1):
-+ cdef void build_fragment(self, int link=1) except *:
- if self.fragment_shader is not None:
- glDetachShader(self.program, self.fragment_shader.shader)
- self.fragment_shader = None
-@@ -477,7 +477,7 @@
- if link:
- self.link_program()
-
-- cdef void link_program(self):
-+ cdef void link_program(self) except *:
- if self.vertex_shader is None or self.fragment_shader is None:
- return
-
---- kivy/graphics.orig/instructions.pyx 2015-02-19 07:27:13.062070969 +0100
-+++ kivy/graphics/instructions.pyx 2014-01-20 03:49:50.000000000 +0100
-@@ -233,15 +233,15 @@
- if self.context_pop:
- context.pop_states(self.context_pop)
-
-- cdef void set_state(self, str name, value):
-+ cdef void set_state(self, str name, value) except *:
- self.context_state[name] = value
- self.flag_update()
-
-- cdef void push_state(self, str name):
-+ cdef void push_state(self, str name) except *:
- self.context_push.append(name)
- self.flag_update()
-
-- cdef void pop_state(self, str name):
-+ cdef void pop_state(self, str name) except *:
- self.context_pop.append(name)
- self.flag_update()
-
-@@ -764,29 +764,29 @@
- cdef get_state(self, str name):
- return self.state_stacks[name][-1]
-
-- cdef void set_states(self, dict states):
-+ cdef void set_states(self, dict states) except *:
- cdef str name
- for name, value in states.iteritems():
- self.set_state(name, value)
-
-- cdef void push_state(self, str name):
-+ cdef void push_state(self, str name) except *:
- stack = self.state_stacks[name]
- stack.append(stack[-1])
- self.flag_update()
-
-- cdef void push_states(self, list names):
-+ cdef void push_states(self, list names) except *:
- cdef str name
- for name in names:
- self.push_state(name)
-
-- cdef void pop_state(self, str name):
-+ cdef void pop_state(self, str name) except *:
- stack = self.state_stacks[name]
- oldvalue = stack.pop()
- if oldvalue != stack[-1]:
- self.set_state(name, stack[-1])
- self.flag_update()
-
-- cdef void pop_states(self, list names):
-+ cdef void pop_states(self, list names) except *:
- cdef str name
- for name in names:
- self.pop_state(name)
-@@ -806,10 +806,10 @@
- texture.bind()
- self.flag_update()
-
-- cdef void enter(self):
-+ cdef void enter(self) except *:
- self._shader.use()
-
-- cdef void leave(self):
-+ cdef void leave(self) except *:
- self._shader.stop()
-
- cdef void apply(self):
---- kivy/graphics.orig/instructions.pxd 2015-02-19 07:44:16.315415541 +0100
-+++ kivy/graphics/instructions.pxd 2014-01-20 03:49:50.000000000 +0100
-@@ -115,7 +115,7 @@
- cdef void pop_states(self, list names) except *
- cdef void enter(self) except *
- cdef void leave(self) except *
-- cdef void apply(self) except *
-+ cdef void apply(self)
- cpdef draw(self)
- cdef void reload(self)
-
diff --git a/dev-python/Kivy/files/cython-fixes.patch b/dev-python/Kivy/files/cython-fixes.patch
deleted file mode 100644
index b9eca4c..0000000
--- a/dev-python/Kivy/files/cython-fixes.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- kivy/lib/gstplayer/_gstplayer.pyx.orig 2014-01-29 17:45:32.000000000 +0100
-+++ kivy/lib/gstplayer/_gstplayer.pyx 2015-01-01 21:24:55.480191418 +0100
-@@ -207,7 +207,7 @@
- self.eos_cb()
-
- def load(self):
-- cdef char *c_uri
-+ cdef bytes py_uri
-
- # if already loaded before, clean everything.
- if self.pipeline != NULL:
-@@ -256,8 +256,8 @@
-
- # configure playbin
- g_object_set_int(self.pipeline, 'async-handling', 1)
-- c_uri = <bytes>self.uri.encode('utf-8')
-- g_object_set_void(self.playbin, 'uri', c_uri)
-+ py_uri = <bytes>self.uri.encode('utf-8')
-+ g_object_set_void(self.playbin, 'uri', <char *>py_uri)
-
- # attach the callback
- # NOTE no need to create a weakref here, as we manage to grab/release
---- kivy/graphics/shader.pyx.orig 2014-01-20 03:49:50.000000000 +0100
-+++ kivy/graphics/shader.pyx 2015-01-01 21:25:01.446858150 +0100
-@@ -421,6 +421,7 @@
- cdef void bind_vertex_format(self, VertexFormat vertex_format):
- cdef unsigned int i
- cdef vertex_attr_t *attr
-+ cdef bytes name
-
- # if the current vertex format used in the shader is the current one, do
- # nothing.
-@@ -445,7 +446,8 @@
- attr = &vertex_format.vattr[i]
- if attr.per_vertex == 0:
- continue
-- attr.index = glGetAttribLocation(self.program, <char *><bytes>attr.name)
-+ name = <bytes>attr.name
-+ attr.index = glGetAttribLocation(self.program, <char *>name)
- glEnableVertexAttribArray(attr.index)
-
- # save for the next run.
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 9dc53ab..46577c7 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1 +1,2 @@
DIST aiohttp-0.14.4.tar.gz 1253273 SHA256 2338c8506ce7853ac2df7efba731a3fd015a7ee2561afab0d69ddefb43403f5a SHA512 453626e2acb2da85b39fd9dab01c51bbbbdf3422e2d7ff833e8be141f43d27d046646bafe6d58d96d37457208ecc2347a3724f056152c639c18de99da619538d WHIRLPOOL 42e8e23c3b1c28463617f9137288886ccf2d61fe404e8b06e105e0a48b36b06382a7a58a6e6c91bc38886e09874ba6112300fd6bf3adfce704129a7edbc4936d
+DIST aiohttp-0.17.4.tar.gz 475034 SHA256 a2f122b41f29eb10772f1600ada5fec849c5dc717c1dcaa05c95bf0712af8843 SHA512 bca0aa93f51fae32eff383ffbd7790886a822647e77884fb5a26b6d2673429b61cf5483527297740a4b237b3e038934990df1061e32e6617d6a3da10276b9116 WHIRLPOOL a7abec0b3daa84078beee9057b5dfdf021b7522fa6b7f847f65008a061802f2cd61dee34886b833c8465f0a5379af9cb45b1f2117cd0b386b6ea488f3f9f2b3c
diff --git a/dev-python/aiohttp/aiohttp-0.17.4.ebuild b/dev-python/aiohttp/aiohttp-0.17.4.ebuild
new file mode 100644
index 0000000..5efb496
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-0.17.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/aiohttp/aiohttp-0.14.4-r1.ebuild,v 1.1 2015/03/16 11:08:45 bman Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://github.com/KeepSafe/aiohttp https://pypi.python.org/pypi/aiohttp"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+CDEPEND="
+ dev-python/chardet[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3')
+ $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python3_3')
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/cython[${PYTHON_USEDEP}]
+ doc? (
+ >=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${CDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ www-servers/gunicorn[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ PYTHONPATH="$(PWD):${PYTHONPATH}" nosetests tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/metadata.xml b/dev-python/aiohttp/metadata.xml
index 79da0ee..4f715e8 100644
--- a/dev-python/aiohttp/metadata.xml
+++ b/dev-python/aiohttp/metadata.xml
@@ -5,6 +5,10 @@
<email>bman@gentoo.org</email>
<name>Aaron Bauman</name>
</maintainer>
+ <maintainer>
+ <email>alunduil@gentoo.org</email>
+ <name>Alex Brandt</name>
+ </maintainer>
<upstream>
<remote-id type="pypi">aiohttp</remote-id>
<remote-id type="github">KeepSafe/aiohttp</remote-id>
diff --git a/dev-python/alabaster/alabaster-0.7.6-r1.ebuild b/dev-python/alabaster/alabaster-0.7.6-r1.ebuild
new file mode 100644
index 0000000..54702d6
--- /dev/null
+++ b/dev-python/alabaster/alabaster-0.7.6-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
+HOMEPAGE="https://github.com/bitprophet/alabaster"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/amodem/Manifest b/dev-python/amodem/Manifest
index 5318677..8856ed7 100644
--- a/dev-python/amodem/Manifest
+++ b/dev-python/amodem/Manifest
@@ -1,3 +1,2 @@
-DIST amodem-1.11.tar.gz 19869 SHA256 00a4c19fb8a9e6dff9459a2cb021c0adc5c669ac1658685f2388457c409931c6 SHA512 f045a771215b50eb387a92209bd1aba0f47f7779b78b720ce49590d6e14ad0b176be6099f78e3b959a61f018b06768bad1f39555c77388d545d088f5cede3fb7 WHIRLPOOL b6b42dd5b240c4704ee26a86a43e9b254673bee2782c976317abf501075b0ed225028df650e03f1b88195c31d75269217ee573ac29370af2afc367cc7488fae9
DIST amodem-1.12.0.tar.gz 19926 SHA256 725a9a57f8f636ba61083b557ee36cfb9b2d30b9a226e1ebd23f15c398357199 SHA512 7707545f77c0680959e6df398cf48c6600d2b9f94e26f6752a47a8434475cc4dff4147a00c7a8a89740d203aed4974ea4cb034921c2da93838bac5faf02816c5 WHIRLPOOL ad25d9ffd1979128396bacaad359974db2ba4d2f2d1d9e79dda61ca1108a6909f37ede43f1d12c7c27025486074fcad955caedff599a466a1fa58bfd57290447
-DIST amodem-1.12.tar.gz 27490 SHA256 d4842f2df83d0eda7036665d0699e2c265a1933a3b0c3d6555040c52bdac282e SHA512 7fc5927137f0c250092aafafcfacd218218874c4bd2803a126f5310cf22aa2339217094420cba7b003492477670ba83c04ff7610fc15b80c905eb75ee35b1d2d WHIRLPOOL 1c5f0337f47ddc5bd4812e891f7fa2c8c5699541eb5530def8d1b7bd2331b7a039c711077ddc5ba6c748b0ab7a887765f859e3782d29e2c0e1ced921a5d18ae1
+DIST amodem-1.13.tar.gz 20171 SHA256 e24145268ffd0540754d5ce17a21b2602488cd6f0b7be2907f1734e60f73ccc1 SHA512 daf1d86fd201153da46e5b0f31d07c0fdea2dc55aa3136d72de894e6ae6c9ddb753d4cd8227b5e3ac44a6803aff00c3299045ebd620b95d1ee8fb4945e7958b4 WHIRLPOOL cd1c74a9edf2691fa41cec96ac2db66119602fb7a1836b3f87de0c157365fd61c3c259e2a13762dcd756df021bb09e95d7f6ec8cec3ac0f3f0b75596497a4254
diff --git a/dev-python/amodem/amodem-1.11.ebuild b/dev-python/amodem/amodem-1.11.ebuild
deleted file mode 100644
index 1eb9d3a..0000000
--- a/dev-python/amodem/amodem-1.11.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Transmit data between two computers using audio"
-HOMEPAGE="https://github.com/romanz/amodem"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/amodem/amodem-1.12.ebuild b/dev-python/amodem/amodem-1.12.ebuild
deleted file mode 100644
index 2089e14..0000000
--- a/dev-python/amodem/amodem-1.12.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Transmit data between two computers using audio"
-HOMEPAGE="https://github.com/romanz/amodem"
-SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
- mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/amodem/amodem-1.13.ebuild b/dev-python/amodem/amodem-1.13.ebuild
new file mode 100644
index 0000000..402feda
--- /dev/null
+++ b/dev-python/amodem/amodem-1.13.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Transmit data between two computers using audio"
+HOMEPAGE="https://github.com/romanz/amodem"
+SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/ansi2html/ansi2html-1.1.0.ebuild b/dev-python/ansi2html/ansi2html-1.1.0.ebuild
index 94229dd..33968f3 100644
--- a/dev-python/ansi2html/ansi2html-1.1.0.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.1.0.ebuild
@@ -17,14 +17,17 @@
KEYWORDS="~amd64 ~arm ~x86"
IUSE="test"
-RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
DEPEND="
test? (
${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
)
- dev-python/setuptools[${PYTHON_USEDEP}]"
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ "
python_test() {
chmod -x "${S}"/tests/* || die
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 895ad44..229de1b 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -2,3 +2,4 @@
DIST bandit-0.13.0.tar.gz 73142 SHA256 4593957b236564599dec7c8b2da5b084f9b257213688a3a97b2643c04721eb66 SHA512 1605fb2e3e43a85ccf89a0b18c517082543d20b55149383d3704d71854817cfef3fd5e1095dd58e24efe0324ca9430fc8d7ab9f3e4f1db1ca0ffe7c4f8e17577 WHIRLPOOL 3becc739b966c2ff550988f04b1dbb03b285b120ff1f2bf4822a0b2277bdd2dc23f7e5c4d5ce6ea98dc45211d9ee7ed52f37e602f2d18558eacce356b81f79a5
DIST bandit-0.13.1.tar.gz 68706 SHA256 e8383d751d0eacd0491e6821c6a176e317316ba3afd7005d11690467a091dd0c SHA512 c3d439f17c02b3ef24c52aa8044c414ffccb2e5e60b7d744d1ec20ff9aff40e6254626c032230da59ec2bf4d923bc16ef9f777b34a09b73cccb782b4f536d869 WHIRLPOOL c9f5ff8410f28fb361d50854b5e8750f3f71ce951e91d50570438282559c9fb92aadc38efb5b87b8d262a589ca5bcb2d8f410443a7d431c51729f310e64d217d
DIST bandit-0.13.2.tar.gz 68888 SHA256 ef78c4dda20f758f95aca467fbb6609a696b6df13104d324b329b1bca963e30d SHA512 0809b7bca2f88e579760c7dcd3fedd1bdd394930eb0cd203ec24d75a18cc8007fa0db304a378f2d99d9cfd5e8b1f34a4ebe427a4bcb5daadf3d29acf0a26da42 WHIRLPOOL c91c140a79816d55f46b4b81e8554e2e36ff47b217da0258cc8ca220b59fd1b0622bd938956280ee111ee994cee81a442da3148fc1be9f0ff8c7d1ea2cdc305d
+DIST bandit-0.14.0.tar.gz 93482 SHA256 b5adb05564c96cc08dbecce80a36632ed6d601e0b68d73ba9de12682d4b57fd8 SHA512 b10514ac00e9f0d4392d34b6479e7818e6d4e37215c8351a5c1562f675f4329eb356d9a0c53c4e87f0fdbc6731c8e21de83c91aa9901620974da54ba84c72846 WHIRLPOOL acab078de2a83a6dce0c93f69d8fa25833fa8bd02810a9e6b96c5c3af0cf7138b4204089896f117e3f96fd6c194e190d53edc4819c6e177f1c718ef05968ce40
diff --git a/dev-python/bandit/bandit-0.13.2-r1.ebuild b/dev-python/bandit/bandit-0.13.2-r1.ebuild
index 01230dc..0fa7a88 100644
--- a/dev-python/bandit/bandit-0.13.2-r1.ebuild
+++ b/dev-python/bandit/bandit-0.13.2-r1.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
inherit distutils-r1
diff --git a/dev-python/bandit/bandit-0.14.0.ebuild b/dev-python/bandit/bandit-0.14.0.ebuild
new file mode 100644
index 0000000..f0a8639
--- /dev/null
+++ b/dev-python/bandit/bandit-0.14.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A security linter from OpenStack Security"
+HOMEPAGE="https://openstack.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+ >=dev-python/pbr-1.3.0[${PYTHON_USEDEP}]
+ <dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ test? (
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+ <dev-python/hacking-0.10[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.2[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ )"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]"
+
+python_test() {
+ testr init
+ testr run || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ mv "${D}/usr/etc" "${D}/" || die
+}
diff --git a/dev-python/bcolz/Manifest b/dev-python/bcolz/Manifest
index 2688c47..ed76696 100644
--- a/dev-python/bcolz/Manifest
+++ b/dev-python/bcolz/Manifest
@@ -1,3 +1,2 @@
DIST bcolz-0.10.0.tar.gz 541803 SHA256 cbe1c18440325058d764b3997fbf988af0257c2a4f7d64ec7150735191fdcc81 SHA512 ac6b30c3a1f1cd32563fcec670bd7b3639173547e8f6d319295358a38d4e39439bb26d7c908b30378d9a384b8667bc75023ebcf35f797a1250bdba1a25cbeebd WHIRLPOOL 5827303b5a8c356e183a88411a466276b9e3fe3e9d0f7999d5cb2923f34a6031816f0b829c7826dc956be312bccbcd4d24820ce4b861e940f2f9b0399cc3ff31
-DIST bcolz-0.8.1.tar.gz 533475 SHA256 c70f986a919842909ae96ff18994e3011d237c9fd0bbc0ee9f3588db736c4296 SHA512 022546f0908130f4af26be79ab9b10fb3d2951a1fe5e953201b249cbd4bcbd3003279c0b71009f29046bdf4b660a6e2d87672c7f47054a03f1df4d9dab83cb0a WHIRLPOOL dff6b600a36bc760a65d3271068d9ea19854eca3b3fe08248bf22d41da0b71315eb254ad175c78f54eb5170397c4d587c48ec3eefc74e5903214adde057f3f76
-DIST bcolz-0.9.0.tar.gz 530950 SHA256 086b1ad62accf6b45e9386edfa23ccc9f8a1feaec5803e7f39753139eb016a50 SHA512 0b71d670a42baa49e7ba3b856cad11cd163142054b0330f469de5ab30e456b58ebae5bffced4214b1988094fd92c7784cc7d7af026f28632abe26e3954850087 WHIRLPOOL 6edfd8b9addbdbe5d7d4bc2f6df77e8a3e61b94d62cb2b091fafabc4f749b1e8333819a607293a3c3d1cea9c7345d250e0e2e38ef6f5e636c65330a6c1be9fb6
+DIST bcolz-0.11.3.tar.gz 582564 SHA256 8750785f52e39f7b117784ed2909a0a702bb11d3f67c49d781df55618bfead07 SHA512 c47d7d4065ed413a28da84486044fd0d9fe83ab09f0112251d4bb46e5d5b5fdd56bab59a8fea7466bd46d62219fe77b12d1a9e8acb17c503f80b42c16cb60e53 WHIRLPOOL 8544d41086182d2a2e4f00a85c58b32716900f047651cce3fc3e9ff7b7993ae4d98c4b363ec10cd70ee9f23a46cb092ea51430eac4a6fdb6697aeecedee90095
diff --git a/dev-python/bcolz/bcolz-0.10.0.ebuild b/dev-python/bcolz/bcolz-0.10.0.ebuild
index 7193031..c1551f6 100644
--- a/dev-python/bcolz/bcolz-0.10.0.ebuild
+++ b/dev-python/bcolz/bcolz-0.10.0.ebuild
@@ -18,9 +18,12 @@
IUSE="doc test"
# numexpr is optional but set hard rdepend
-RDEPEND=">=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+RDEPEND="
+ >=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+ <dev-python/numpy-1.10[${PYTHON_USEDEP}]
>=dev-python/numexpr-1.4.1[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/cython-0.22[${PYTHON_USEDEP}]
+DEPEND="
+ >=dev-python/cython-0.22[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/bcolz/bcolz-0.11.3.ebuild b/dev-python/bcolz/bcolz-0.11.3.ebuild
new file mode 100644
index 0000000..b178b40
--- /dev/null
+++ b/dev-python/bcolz/bcolz-0.11.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides columnar and compressed data containers"
+HOMEPAGE=" https://github.com/Blosc/bcolz"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# numexpr is optional but set hard rdepend
+RDEPEND="
+ >=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+ >=dev-python/numexpr-1.4.1[${PYTHON_USEDEP}]"
+DEPEND="
+ >=dev-python/setuptools-0.18[${PYTHON_USEDEP}]
+ >=dev-python/cython-0.22[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+ $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7)
+ )"
+
+python_prepare_all() {
+ if use doc; then
+ mkdir doc/_static || die
+ fi
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ distutils-r1_python_compile
+}
+
+python_compile_all() {
+ use doc && sphinx-build -b html -c doc/ doc/ doc/html
+}
+
+python_test() {
+ pushd "${BUILD_DIR}"/lib > /dev/null
+ "${PYTHON}" -m unittest discover || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/bcolz/bcolz-0.8.1.ebuild b/dev-python/bcolz/bcolz-0.8.1.ebuild
deleted file mode 100644
index b379bbc..0000000
--- a/dev-python/bcolz/bcolz-0.8.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides columnar and compressed data containers"
-HOMEPAGE=" https://github.com/Blosc/bcolz"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-# numexpr is optional but set hard rdeoend
-RDEPEND=">=dev-python/numpy-1.7[${PYTHON_USEDEP}]
- >=dev-python/numexpr-1.4.1[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/cython-0.22[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- if use doc; then
- mkdir doc/_static || die
- fi
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
- distutils-r1_python_compile
-}
-
-python_compile_all() {
- use doc && sphinx-build -b html -c doc/ doc/ doc/html
-}
-
-python_test() {
- pushd "${BUILD_DIR}"/lib > /dev/null
- "${PYTHON}" -m unittest discover || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/bcolz/bcolz-0.9.0.ebuild b/dev-python/bcolz/bcolz-0.9.0.ebuild
deleted file mode 100644
index 7193031..0000000
--- a/dev-python/bcolz/bcolz-0.9.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides columnar and compressed data containers"
-HOMEPAGE=" https://github.com/Blosc/bcolz"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# numexpr is optional but set hard rdepend
-RDEPEND=">=dev-python/numpy-1.7[${PYTHON_USEDEP}]
- >=dev-python/numexpr-1.4.1[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/cython-0.22[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- if use doc; then
- mkdir doc/_static || die
- fi
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
- distutils-r1_python_compile
-}
-
-python_compile_all() {
- use doc && sphinx-build -b html -c doc/ doc/ doc/html
-}
-
-python_test() {
- pushd "${BUILD_DIR}"/lib > /dev/null
- "${PYTHON}" -m unittest discover || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7b38589..825e611 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,3 @@
DIST 1.1.11.tar.gz 1975224 SHA256 b4e6edc12177dd4f720259aa7027bab00fb9db2029e40e77e67c552ef9f41132 SHA512 b0b10299d93314de582cfd21511987fe210df1618c49f6c706c4341a3a635a85cd48d8848a69f83391a227ab5dc3881509a02b4cc47b1e27d18cf353d4de850b WHIRLPOOL 21e662fe7f713a98e5e16225e3860585f0abb8e4a47b5f0ae52262a929a32ce563e1108c80602c9c2136180957c1b8bb4b89d8b9fc84415c155212d326f08b90
-DIST botocore-1.2.1.tar.gz 2002263 SHA256 3e3f75a52355d0d6feda98d2dd3345605227104174b45bc028507f055a90dd28 SHA512 fcdc2d655e717599a39d40775e276c51367c057f5558b2daffc376d6283faf617d85efe5f8258186dacf0e062f9d22eff3ba7b74c595833a93b8b638cf0d2f31 WHIRLPOOL e8d53c3585c2a764b52dbef9d0d2309e039de25c3ba286703fc3785f69af99bd54e149075fe0a9faadb81fa875df19b3dd6c4ffc9559c6c525f5429371dd6517
+DIST botocore-1.2.10.tar.gz 2202147 SHA256 8541895aa2abe2183fa15efe33794db7428fec3302e0c9bf1db13fa1668e2b66 SHA512 5395776f50c5302d2fa75af702ced17da66a4c0435d62aed907f1ceaa93d38acc2d91a250d2153d852239a08d9f7f0bf361523cc89168a6cb81ef6f8a6ec5124 WHIRLPOOL aa4ff7a2aa1a900642782783b85479943bcce85c7df0c056d989d329c0693424110859a1d9d358e0cc5af94be174c96786c2f339e78934c114011606dfce11ec
DIST botocore-1.2.4.tar.gz 2007943 SHA256 6330dec53831e4f961e2503a4d9bfe9e790e1e7ac716f8edc07f1b37ff2765da SHA512 c2d0ee934a0b0a25a617a100528daa2951e6cb5139bd7dc5d550bcffcb777119f141b96e0a60dda1277dc8199acfd33e80d002bd3cc730c011e5dadfc52c6f33 WHIRLPOOL f2ff39099b08808e4684abf0d800c05593d66ae68a68f112abab97a715a4c6248ef6f193816faf481e8bc5a3814b22978c0e06a29e5a4cdfb39e24d112b5ef21
diff --git a/dev-python/botocore/botocore-1.2.1.ebuild b/dev-python/botocore/botocore-1.2.1.ebuild
deleted file mode 100644
index 5908e96..0000000
--- a/dev-python/botocore/botocore-1.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="
- >=dev-python/docutils-0.10[${PYTHON_USEDEP}]
- ~dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
- <dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? (
- >=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
- <dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- )
- test? (
- ${CDEPEND}
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- nosetests tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/botocore-1.2.10.ebuild b/dev-python/botocore/botocore-1.2.10.ebuild
new file mode 100644
index 0000000..6927baa
--- /dev/null
+++ b/dev-python/botocore/botocore-1.2.10.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+ >=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ <dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+ <dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? (
+ >=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+ <dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${CDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ nosetests tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/bpython/bpython-0.14.2.ebuild b/dev-python/bpython/bpython-0.14.2.ebuild
index 8f389d7..590489d 100644
--- a/dev-python/bpython/bpython-0.14.2.ebuild
+++ b/dev-python/bpython/bpython-0.14.2.ebuild
@@ -21,6 +21,7 @@
RDEPEND="
>=dev-python/curtsies-0.1.18[${PYTHON_USEDEP}]
+ <dev-python/curtsies-0.2.0[${PYTHON_USEDEP}]
dev-python/greenlet[${PYTHON_USEDEP}]
dev-python/jedi[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/certifi/certifi-2015.9.6.2-r1.ebuild b/dev-python/certifi/certifi-2015.9.6.2-r1.ebuild
new file mode 100644
index 0000000..00427b5
--- /dev/null
+++ b/dev-python/certifi/certifi-2015.9.6.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="http://certifi.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/certifi/certifi-2015.9.6.2.ebuild b/dev-python/certifi/certifi-2015.9.6.2.ebuild
index e2beeae..cebbac0 100644
--- a/dev-python/certifi/certifi-2015.9.6.2.ebuild
+++ b/dev-python/certifi/certifi-2015.9.6.2.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/cffi/cffi-1.2.1-r1.ebuild b/dev-python/cffi/cffi-1.2.1-r1.ebuild
new file mode 100644
index 0000000..e424073
--- /dev/null
+++ b/dev-python/cffi/cffi-1.2.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc"
+
+RDEPEND="
+ virtual/libffi
+ dev-python/pycparser[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ py.test -x -v --ignore testing/test_zintegration.py c/ testing/ || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
new file mode 100644
index 0000000..3235886
--- /dev/null
+++ b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python attributes without the boilerplate"
+HOMEPAGE="https://characteristic.readthedocs.org/ https://github.com/hynek/characteristic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Prevent un-needed download during build
+ sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/chardet/chardet-2.3.0-r1.ebuild b/dev-python/chardet/chardet-2.3.0-r1.ebuild
new file mode 100644
index 0000000..f83a234
--- /dev/null
+++ b/dev-python/chardet/chardet-2.3.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal encoding detector"
+HOMEPAGE="https://github.com/chardet/chardet https://pypi.python.org/pypi/chardet"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/chardet/chardet-2.3.0.ebuild b/dev-python/chardet/chardet-2.3.0.ebuild
index 8a7ce64..d6e8951 100644
--- a/dev-python/chardet/chardet-2.3.0.ebuild
+++ b/dev-python/chardet/chardet-2.3.0.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI=5
+
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
inherit distutils-r1
diff --git a/dev-python/click/click-5.1-r1.ebuild b/dev-python/click/click-5.1-r1.ebuild
new file mode 100644
index 0000000..71da877
--- /dev/null
+++ b/dev-python/click/click-5.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Prevent un-needed d'loading
+ sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ emake test
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/colorama/colorama-0.3.3-r1.ebuild b/dev-python/colorama/colorama-0.3.3-r1.ebuild
new file mode 100644
index 0000000..7f861fa
--- /dev/null
+++ b/dev-python/colorama/colorama-0.3.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Makes ANSI escape character sequences for producing colored terminal text & cursor positioning"
+HOMEPAGE="https://code.google.com/p/colorama/ https://pypi.python.org/pypi/colorama https://github.com/tartley/colorama"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+python_install_all() {
+ use examples && local EXAMPLES=( demos/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild
index a5b8c2d..eae1e35 100644
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ b/dev-python/colorama/colorama-0.3.3.ebuild
@@ -13,7 +13,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="examples"
python_install_all() {
diff --git a/dev-python/coverage/coverage-4.0-r1.ebuild b/dev-python/coverage/coverage-4.0-r1.ebuild
new file mode 100644
index 0000000..40187ee
--- /dev/null
+++ b/dev-python/coverage/coverage-4.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="http://nedbatchelder.com/code/coverage/ https://pypi.python.org/pypi/coverage"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_compile() {
+ if [[ ${EPYTHON} == python2.7 ]]; then
+ local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ export CFLAGS
+ fi
+
+ distutils-r1_python_compile
+}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.0.2-r1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.0.2-r1.ebuild
new file mode 100644
index 0000000..f09f565
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.0.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/cryptography-1.0.2-r1.ebuild b/dev-python/cryptography/cryptography-1.0.2-r1.ebuild
new file mode 100644
index 0000000..c8cd8f4
--- /dev/null
+++ b/dev-python/cryptography/cryptography-1.0.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# only works with >=pypy-2.6
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="libressl test"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ $(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
+ $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
+ >=dev-python/idna-2.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy)
+ >=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+ "
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+ dev-python/iso8601[${PYTHON_USEDEP}]
+ dev-python/pretend[${PYTHON_USEDEP}]
+ >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
+ <dev-python/pytest-2.8[${PYTHON_USEDEP}]
+ )"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_test() {
+ py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 2907728..f4cbc00 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,3 +1,4 @@
DIST Cython-0.22.tar.gz 1584483 SHA256 14307e7a69af9a0d0e0024d446af7e51cc0e3e4d0dfb10d36ba837e5e5844015 SHA512 856220fa579e272ac38dcef091760f527431ff3b98df9af6e68416fcf77d9659ac5abe5c7dee41331f359614637a4ff452033085335ee499830ed126ab584267 WHIRLPOOL d9919e1fe33f7ea02833c485e10667d8470d7c69901b2419c6c4c1d464f9ef2444795e14903cc66b6fee40ec5a4c20308c331ad93fd8818f207d0a21cccf9b2b
DIST Cython-0.23.2.tar.gz 1627642 SHA256 85a8713db65d9ad3e7e2f01e6ac424d4ae2a40349f1391b2b0f494ccb7e0fda7 SHA512 ae1d20f3efc2ae9eeb73d1d536895992280b4b3222bd6911bae886971cb222c98a581a770c48d65ec1fa40cfa7b7639580fe86e4986b5fba5c9257d351dfc1a3 WHIRLPOOL c019b43508104f0ce9375b1eed740d9bf4ba9bdff66fccbc4b272f61a9899327d1e3a1026215f4014db89aefb0f69caafd4e055271cd67500b95ad3fb3ab5263
DIST Cython-0.23.3.tar.gz 1628634 SHA256 590274ac8dbd1e62cc79d94eb2e2f4ae60cea91a9f8d50b8697d39aba451e82e SHA512 93d02fb7009fe005a91ccf83a3428c449e46c4ff913993e71affdee5a4155d932dcf93238fb85194f44c8b5dd7acd3e3dd83e86b407e4c41e6895abf1f3499ae WHIRLPOOL aa3a289f10608628991b368e9a6bda0821c5f957d1536963e7336ee81e04f554bb7fcce8c2bab429bde1ef7d1490a75770a45caec83d809aaf41f60b36f37924
+DIST Cython-0.23.4.tar.gz 1628326 SHA256 fec42fecee35d6cc02887f1eef4e4952c97402ed2800bfe41bbd9ed1a0730d8e SHA512 67f4d2be22def78318e8d3edc99b944c50291dc812064b0c8829dd453881bb288037087ee8472b161b9624ac13a50ece71a0d7560c9f2f7d94cc6fcad107e749 WHIRLPOOL f92dfc40080bb005bfdf220d8dc65c40b9ffa1e29b7c0c3e5c4e165f653f9b443af70191a3f7498777db07b9353147334d542e5e46109d4452f548d411d979dc
diff --git a/dev-python/cython/cython-0.23.3-r1.ebuild b/dev-python/cython/cython-0.23.3-r1.ebuild
new file mode 100644
index 0000000..1a85940
--- /dev/null
+++ b/dev-python/cython/cython-0.23.3-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://www.cython.org/ https://pypi.python.org/pypi/Cython"
+SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+RDEPEND=""
+# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
+# spanning several packages. This bug has been fixed in the recent release of version 9.1
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_compile() {
+ if ! python_is_python3; then
+ local CFLAGS="${CFLAGS}"
+ local CXXFLAGS="${CXXFLAGS}"
+ append-flags -fno-strict-aliasing
+ fi
+
+ # Python gets confused when it is in sys.path before build.
+ local PYTHONPATH=
+ export PYTHONPATH
+
+ distutils-r1_python_compile
+}
+
+python_compile_all() {
+ use doc && unset XDG_CONFIG_HOME && emake -C docs html
+}
+
+python_test() {
+ tc-export CC
+ "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ use examples && local EXAMPLES=( Demos/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/cython/cython-0.23.4.ebuild b/dev-python/cython/cython-0.23.4.ebuild
new file mode 100644
index 0000000..1a85940
--- /dev/null
+++ b/dev-python/cython/cython-0.23.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://www.cython.org/ https://pypi.python.org/pypi/Cython"
+SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+RDEPEND=""
+# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
+# spanning several packages. This bug has been fixed in the recent release of version 9.1
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_compile() {
+ if ! python_is_python3; then
+ local CFLAGS="${CFLAGS}"
+ local CXXFLAGS="${CXXFLAGS}"
+ append-flags -fno-strict-aliasing
+ fi
+
+ # Python gets confused when it is in sys.path before build.
+ local PYTHONPATH=
+ export PYTHONPATH
+
+ distutils-r1_python_compile
+}
+
+python_compile_all() {
+ use doc && unset XDG_CONFIG_HOME && emake -C docs html
+}
+
+python_test() {
+ tc-export CC
+ "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ use examples && local EXAMPLES=( Demos/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/distlib/distlib-0.2.1-r1.ebuild b/dev-python/distlib/distlib-0.2.1-r1.ebuild
new file mode 100644
index 0000000..7df0c54
--- /dev/null
+++ b/dev-python/distlib/distlib-0.2.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distribution utilities"
+HOMEPAGE="https://pypi.python.org/pypi/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+python_test() {
+ sed \
+ -e '/PIP_AVAILABLE/s:True:False:g' \
+ -i tests/*py || die
+ PYTHONHASHSEED=0 esetup.py test
+}
diff --git a/dev-python/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild
index 1feab56..77daeee 100644
--- a/dev-python/distlib/distlib-0.2.1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1.ebuild
@@ -14,7 +14,7 @@
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
python_test() {
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 3f4d2d9..da9a215 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -3,3 +3,4 @@
DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695aba17fd0ff024307454dc3a56 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 WHIRLPOOL 5de086952bda9449f85798e8fe3bac82f11e1b856c1d39e340399e71ca6bf183318eebf1f536714567036485637166a929082a1ba9d6c1816f07c53dcc12c72a
DIST Django-1.7.10.tar.gz 7584312 SHA256 b9357d2cebe61997055d417d607f9c650e817cd1a383b9a1b88bf1edad797c75 SHA512 ef9c8f3f5db17474970805bd5a3956c65766362d883013c19d32cb0fcc795de74a831758d66d18103255e5c510b2ee384099f08e12d75c567caad2d80404cc20 WHIRLPOOL 380f05ff7f51dfc50f578f946b5b83ae36ab8a96a10ccce9c62642f5b2434c2ba9de2d1d9bc57859db003e4569fa0c3e118cf51cd80a9fe40c04c49fdf213999
DIST Django-1.8.4.tar.gz 7265101 SHA256 826996c81e1cc773500124d5c19212e4a7681a55ee169fab9085f2b3015a70d8 SHA512 34dee1d004f4b149bd8b0405bcad66c0b4ad68b3c0069b1631af2c457cbcc165d6a730d221777110525be74cf9369b695d4fc8d752317d0819fd338250222351 WHIRLPOOL 504f0271b74b9e93b74255922360fddcff3f6875297fcbd464e27212679b2275c98773088feab97fe8d0c0de664789653c72d614ed2d5fb9c648655685f895aa
+DIST Django-1.8.5.tar.gz 7270297 SHA256 2d174e4a3f54708d0d5b6ff1bf54ae71652e83bb06d7576b3b20d916b29c3653 SHA512 91a8788ec6a9f3592615da55948d080719425a2135e241e7b5014c6b9c354daa53c2caeadd9ac3d991730c8ef8fba579a0aa4f3094a1e83b0600811e9a3bd20b WHIRLPOOL af7037d853f6d9ea67df412589aab22113a8f4fb41c79d9f42e9b8fa0184b273a75815a558dddfeb8650f14532f77fc9585fc3c72912beaa152a932e667fcb06
diff --git a/dev-python/django/django-1.6.11.ebuild b/dev-python/django/django-1.6.11.ebuild
index e3f0bb0..fc8df50 100644
--- a/dev-python/django/django-1.6.11.ebuild
+++ b/dev-python/django/django-1.6.11.ebuild
@@ -89,7 +89,7 @@
bashcomp_alias ${PN}-admin django-admin.py
if use doc; then
- rm -fr docs/_build/html/_sources || die
+ rm -fr docs/_build/html/_sources || die
local HTML_DOCS=( docs/_build/html/. )
fi
diff --git a/dev-python/django/django-1.8.5.ebuild b/dev-python/django/django-1.8.5.ebuild
new file mode 100644
index 0000000..d1795ee
--- /dev/null
+++ b/dev-python/django/django-1.8.5.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_REQ_USE='sqlite?'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="
+ https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
+ mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+ "
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+ test? (
+ ${PYTHON_DEPS//sqlite?/sqlite}
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/numpy[$(python_gen_usedep 'python*')]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
+)
+
+pkg_setup() {
+ webapp_pkg_setup
+}
+
+python_prepare_all() {
+ # Prevent d'loading in the doc build
+ sed -e '/^ "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ # Tests have non-standard assumptions about PYTHONPATH,
+ # and don't work with ${BUILD_DIR}/lib.
+ PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp extras/django_bash_completion ${PN}-admin
+ bashcomp_alias ${PN}-admin django-admin.py
+
+ if use doc; then
+ rm -fr docs/_build/html/_sources || die
+ local HTML_DOCS=( docs/_build/html/. )
+ fi
+
+ insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+ doins -r django/contrib/admin/static/admin/.
+ distutils-r1_python_install_all
+}
+
+src_install() {
+ distutils-r1_src_install
+ webapp_src_install
+}
+
+pkg_postinst() {
+ elog "Additional Backend support can be enabled via"
+ optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
+ optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
+ optfeature "PostgreSQL backend support" dev-python/psycopg:2
+ echo ""
+ elog "Other features can be enhanced by"
+ optfeature "GEO Django" sci-libs/gdal[geos]
+ optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+ optfeature "ImageField Support" virtual/python-imaging
+ optfeature "Password encryption" dev-python/bcrypt
+ optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+ echo ""
+ elog "A copy of the admin media is available to webapp-config for installation in a"
+ elog "webroot, as well as the traditional location in python's site-packages dir"
+ elog "for easy development."
+ webapp_pkg_postinst
+}
diff --git a/dev-python/docutils/docutils-0.12-r1.ebuild b/dev-python/docutils/docutils-0.12-r1.ebuild
new file mode 100644
index 0000000..470ac18
--- /dev/null
+++ b/dev-python/docutils/docutils-0.12-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DISTUTILS_NO_PARALLEL_BUILD=1
+
+python_compile_all() {
+ # Generate html docs from reStructured text sources.
+
+ # Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+ cp docutils/writers/html4css1/html4css1.css . || die
+
+ cd tools || die
+ "${PYTHON}" buildhtml.py --input-encoding=utf-8 \
+ --stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+python_test() {
+ if python_is_python3; then
+ pushd test3 > /dev/null || die
+ else
+ pushd test > /dev/null || die
+ fi
+ "${PYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
+ popd > /dev/null || die
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ # Install tools.
+ python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+ local doc="${1}"
+ local dir="txt/$(dirname ${doc})"
+ docinto "${dir}"
+ dodoc "${doc}"
+}
+
+python_install_all() {
+ local DOCS=( *.txt )
+ local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+ distutils-r1_python_install_all
+
+ local doc
+ while IFS= read -r -d '' doc; do
+ install_txt_doc "${doc}"
+ done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/enable/enable-4.5.1.ebuild b/dev-python/enable/enable-4.5.1.ebuild
index 31a0a80..300c03c 100644
--- a/dev-python/enable/enable-4.5.1.ebuild
+++ b/dev-python/enable/enable-4.5.1.ebuild
@@ -41,7 +41,10 @@
DISTUTILS_IN_SOURCE_BUILD=1
-PATCHES=( "${FILESDIR}"/${PN}-4.4.1-swig.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.4.1-swig.patch
+ "${FILESDIR}"/${P}-gcc-5.patch
+ )
python_prepare_all() {
append-cflags -fno-strict-aliasing
diff --git a/dev-python/enable/files/enable-4.5.1-gcc-5.patch b/dev-python/enable/files/enable-4.5.1-gcc-5.patch
new file mode 100644
index 0000000..b18b8ea
--- /dev/null
+++ b/dev-python/enable/files/enable-4.5.1-gcc-5.patch
@@ -0,0 +1,22 @@
+From 55a74ccfc33764499497022dd3649be4bb1091ed Mon Sep 17 00:00:00 2001
+From: Nathan Ringo <tikiking1@users.noreply.github.com>
+Date: Wed, 10 Jun 2015 22:06:57 -0500
+Subject: [PATCH] Fixes #200
+
+---
+ kiva/agg/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kiva/agg/setup.py b/kiva/agg/setup.py
+index 5b4d458..c6e290a 100644
+--- a/kiva/agg/setup.py
++++ b/kiva/agg/setup.py
+@@ -170,7 +170,7 @@ def get_ft2_sources((lib_name, build_info), build_dir):
+ f = os.popen("g++ --version")
+ line0 = f.readline()
+ f.close()
+- m = re.match(r'.+?\s(3|4)\.\d+', line0)
++ m = re.match(r'.+?\s([3-5])\.\d+', line0)
+ if int(m.group(1)) < 4:
+ use_32bit_workaround = True
+
diff --git a/dev-python/enable/metadata.xml b/dev-python/enable/metadata.xml
index de31ed9..aee1004 100644
--- a/dev-python/enable/metadata.xml
+++ b/dev-python/enable/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/expects/Manifest b/dev-python/expects/Manifest
index 1dd12fe..c03a3e3 100644
--- a/dev-python/expects/Manifest
+++ b/dev-python/expects/Manifest
@@ -1,5 +1,3 @@
-DIST expects-0.2.1.tar.gz 22474 SHA256 0c70230281f68c4c93a4a1ba98da37ccc2529c849a28c555ab93050f2a084321 SHA512 c7a51f35e4c1468df19838b9dd74a9fe214c906b7bbf203f61841d2f0cfe60cffd1388b841a39ce14a59394594e148cbaf1777b08b90879136421186ab757585 WHIRLPOOL 0e62e27c4d96156463c1b8001459c6795a4398b7ec8a23283c3bccba7cbe4feb0a763e6086c2ffda7762d82e2a481812049f6920ccbade9e27e6046cf58601b0
DIST expects-0.4.2.tar.gz 23813 SHA256 b1e0b27141f784fe81a143153f23d3c8220fe8ec1003eb580b3eeb38eb778007 SHA512 6701a1a3099073c70d8f729b7ca72e4b9b3eb6d6f9e7d6d2d654a3b684c5ab101c343b4c3556f45d763ab1479dbc3eb3db209c4d9f5d2254cc4111e74a4a3c1a WHIRLPOOL 44ef85ca96225c22f91468e8b8b6368a26138f0fb9ee22dc89c282fb91adf4425d177ba62891239515affc639053165c6080f972c9435619c50a47fd81a27894
-DIST expects-0.7.2.tar.gz 398201 SHA256 ed72a184c2453b4f244cf887ee4545ac40dc0d88a1a224eabf150980a88877a9 SHA512 55db29e2bbba881933bf5d28e38f2c1e1087b4e43f15359a2af40e91066658973244fac4dcaf7eca79d6006d78d232232acbd1a2fc03ec1df62223e1226fb94a WHIRLPOOL 9eae839eb607f29f57be70e39fc6adb02fa8b9038d070016c090f75dec5ce05528fd3d18ca72e1d2aaa4205df31f20521fc23ad741b1b73b54262ac273e9e14e
-DIST expects-0.8.0_rc1.tar.gz 27424 SHA256 3822d470c3bebe749928e360e7bfdecf0ac6541717040de31cb265f1372dfb43 SHA512 5130b545164fdb8d8306b5d4fc3d83dcfaf9bb56428b9140def434bb1339b479568ba7aab88f5eedf646cadca12ee331163af5be0937633049baf695b309653b WHIRLPOOL 951ab90c1b3c143b3109676207c5f2a5480238555d10662f45c1a1336618c0e38307801aa0e61fc8bc978d333f3f44cd64da811742ebc65008815e635d0536d9
DIST expects-0.8.0_rc2.tar.gz 27307 SHA256 c7959a0b0f76a186b1d3687fbdedaf551f8bbbddbd66e5307c3a52c787a779de SHA512 6ae4553838ce4d27993772cec33f1e1a18d539af4a9b0f62f66ef1fb78464a46f5b76a420096d2d36881f4dc581b69e8f6c8783b89d794df753fdffab275cc33 WHIRLPOOL 04a04534571e8a15bcc2e1d7a9fc2b63bb772a8adaaf0b6239d375f1e5f750be7d7fa9fd10f5d84f017c4e3ad6274a7955e5b70928ee6eec7c199181169e5741
+DIST expects-0.8.0_rc3.tar.gz 27478 SHA256 a2809c6c51cf18b3316102f21e9d14d195edfd34526cfcad7d959d592deacbd4 SHA512 2566ddfcb83bb3d58dbddcc881f2b743cca061057f77a52da49d3eb6c16dc1fafaca900734d7023550c85dfd0b86d433a9328daf5a989ab91757d83e9eaa4d81 WHIRLPOOL 7e6c81a27c2dd01d261731db6deefe0830515731dc485278bbf2d5de84a726cef7cea2a5ecd514ccda169167f7cb0ca32f7b02de95c6bdcbd23f26faf502b87d
diff --git a/dev-python/expects/expects-0.2.1.ebuild b/dev-python/expects/expects-0.2.1.ebuild
deleted file mode 100644
index 51fcf02..0000000
--- a/dev-python/expects/expects-0.2.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python"
-HOMEPAGE="https://github.com/jaimegildesagredo/expects"
-SRC_URI="https://github.com/jaimegildesagredo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( ~dev-python/mamba-0.6[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
- rm -f "${HOME}"/.pydistutils.cfg || die "Couldn't remove pydistutils.cfg"
-
- distutils_install_for_testing
-
- mamba || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/expects/expects-0.7.2.ebuild b/dev-python/expects/expects-0.7.2.ebuild
deleted file mode 100644
index 5021b32..0000000
--- a/dev-python/expects/expects-0.7.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python"
-HOMEPAGE="https://github.com/jaimegildesagredo/expects"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( dev-python/mamba[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- mamba || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/expects/expects-0.8.0_rc1.ebuild b/dev-python/expects/expects-0.8.0_rc1.ebuild
deleted file mode 100644
index f96e461..0000000
--- a/dev-python/expects/expects-0.8.0_rc1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python"
-HOMEPAGE="https://github.com/jaimegildesagredo/expects"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( dev-python/mamba[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- mamba || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/expects/expects-0.8.0_rc3.ebuild b/dev-python/expects/expects-0.8.0_rc3.ebuild
new file mode 100644
index 0000000..db3f4dd
--- /dev/null
+++ b/dev-python/expects/expects-0.8.0_rc3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python"
+HOMEPAGE="https://github.com/jaimegildesagredo/expects"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/mamba[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ mamba || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/extras/extras-0.0.3-r1.ebuild b/dev-python/extras/extras-0.0.3-r1.ebuild
new file mode 100644
index 0000000..cd914da
--- /dev/null
+++ b/dev-python/extras/extras-0.0.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Useful extra bits for Python that should be in the standard library"
+HOMEPAGE="https://github.com/testing-cabal/extras/ https://pypi.python.org/pypi/extras/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/testtools[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+ "${PYTHON}" ${PN}/tests/test_extras.py || die
+}
diff --git a/dev-python/fixtures/fixtures-1.3.1-r1.ebuild b/dev-python/fixtures/fixtures-1.3.1-r1.ebuild
index ac95e29..6772b2c 100644
--- a/dev-python/fixtures/fixtures-1.3.1-r1.ebuild
+++ b/dev-python/fixtures/fixtures-1.3.1-r1.ebuild
@@ -14,7 +14,7 @@
LICENSE="|| ( Apache-2.0 BSD )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
# nose not listed but provides coverage output of tests
diff --git a/dev-python/fixtures/fixtures-1.3.1-r2.ebuild b/dev-python/fixtures/fixtures-1.3.1-r2.ebuild
new file mode 100644
index 0000000..d3aa138
--- /dev/null
+++ b/dev-python/fixtures/fixtures-1.3.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
+HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# nose not listed but provides coverage output of tests
+# run of test files by python lacks any output except on fail
+RDEPEND="
+ >=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+#DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+ emake check
+}
diff --git a/dev-python/funcsigs/funcsigs-0.4.ebuild b/dev-python/funcsigs/funcsigs-0.4.ebuild
index 136adb2..2538752 100644
--- a/dev-python/funcsigs/funcsigs-0.4.ebuild
+++ b/dev-python/funcsigs/funcsigs-0.4.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 pypy pypy3 )
inherit distutils-r1
@@ -14,7 +14,7 @@
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="
diff --git a/dev-python/gst-python/gst-python-1.4.0.ebuild b/dev-python/gst-python/gst-python-1.4.0.ebuild
index e55658e..190a126 100644
--- a/dev-python/gst-python/gst-python-1.4.0.ebuild
+++ b/dev-python/gst-python/gst-python-1.4.0.ebuild
@@ -13,7 +13,7 @@
LICENSE="LGPL-2"
SLOT="1.0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-python/html5lib/html5lib-0.9999999-r1.ebuild b/dev-python/html5lib/html5lib-0.9999999-r1.ebuild
new file mode 100644
index 0000000..3f95776
--- /dev/null
+++ b/dev-python/html5lib/html5lib-0.9999999-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTML parser based on the HTML5 specification"
+HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+ nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/idna/idna-2.0-r1.ebuild b/dev-python/idna/idna-2.0-r1.ebuild
new file mode 100644
index 0000000..9a53690
--- /dev/null
+++ b/dev-python/idna/idna-2.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="https://github.com/kjd/idna"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/idna/idna-2.0.ebuild b/dev-python/idna/idna-2.0.ebuild
index e9d42ef..c91b33d 100644
--- a/dev-python/idna/idna-2.0.ebuild
+++ b/dev-python/idna/idna-2.0.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
inherit distutils-r1
diff --git a/dev-python/ipaddress/ipaddress-1.0.14-r1.ebuild b/dev-python/ipaddress/ipaddress-1.0.14-r1.ebuild
new file mode 100644
index 0000000..74fbeef
--- /dev/null
+++ b/dev-python/ipaddress/ipaddress-1.0.14-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="IPv4/IPv6 manipulation library, a port of the ipaddress module"
+HOMEPAGE="https://github.com/phihag/ipaddress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ "${PYTHON}" test_ipaddress.py || die
+}
diff --git a/dev-python/ipaddress/ipaddress-1.0.14.ebuild b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
index 8be6c8d..603e385 100644
--- a/dev-python/ipaddress/ipaddress-1.0.14.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
@@ -14,7 +14,7 @@
SLOT="0"
LICENSE="PSF-2"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index a7ca2e2..49d8b3f 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,2 +1 @@
-DIST ipython-2.2.0.tar.gz 11912007 SHA256 b7ca77ba54a02f032055b73f5f62b01431f818ae00f63716b78f881c2b2564e2 SHA512 4953bf5e9d6d5c6ad538d07d62b5b100fd86a37f6b861238501581c0059bd4655345ca05cf395e79709c38ce4cb9c6293f5d11ac0252a618ad8272b161140d13 WHIRLPOOL a5e433a3a840b65fd0644f023cc9e93862e48a906e4e9d1596ebbd24290d486be580dca017ef1586da980b6792dcd7ed9aab4af81421bbf083d885927db6fcc8
DIST ipython-3.2.1.tar.gz 10884249 SHA256 c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe WHIRLPOOL 9f020c167559259931dcb177d0c3a5211939632e5775c2627795ba390cf57bd62c378c15b7ee9b9ed2079180f8df8e062eb9673ed9cfc025a56f1da82c9428d1
diff --git a/dev-python/ipython/files/2.1.0-disable-tests.patch b/dev-python/ipython/files/2.1.0-disable-tests.patch
deleted file mode 100644
index bdbb1be..0000000
--- a/dev-python/ipython/files/2.1.0-disable-tests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-The extension magics for oct2py and rpy live now in the oct2py and rpy2 package. The tests shipped with ipython are broken. We should disable
-those tests and remove the magics files:
-
-IPython/extensions/rmagic.py -> rpy/ipython/rmagic.py
-IPython/extension/octavemagic.py -> oct2py/ipython/octavemagic.py
-
-deleted: IPython/extensions/octavemagic.py
-deleted: IPython/extensions/rmagic.py
-modified: IPython/testing/iptest.py
-
-diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
-index 45d2c78..db0bdfe 100644
---- a/IPython/testing/iptest.py
-+++ b/IPython/testing/iptest.py
-@@ -250,12 +250,10 @@ sec = test_sections['extensions']
- if not have['cython']:
- sec.exclude('cythonmagic')
- sec.exclude('tests.test_cythonmagic')
--if not have['oct2py']:
-- sec.exclude('octavemagic')
-- sec.exclude('tests.test_octavemagic')
--if not have['rpy2'] or not have['numpy']:
-- sec.exclude('rmagic')
-- sec.exclude('tests.test_rmagic')
-+sec.exclude('octavemagic')
-+sec.exclude('tests.test_octavemagic')
-+sec.exclude('rmagic')
-+sec.exclude('tests.test_rmagic')
- # autoreload does some strange stuff, so move it to its own test section
- sec.exclude('autoreload')
- sec.exclude('tests.test_autoreload')
-
diff --git a/dev-python/ipython/ipython-2.2.0-r1.ebuild b/dev-python/ipython/ipython-2.2.0-r1.ebuild
deleted file mode 100644
index 62c6f8e..0000000
--- a/dev-python/ipython/ipython-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-PYTHON_REQ_USE='readline,sqlite'
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
-
-PY2_USEDEP=$(python_gen_usedep python2_7)
-CDEPEND="
- dev-python/decorator[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/simplegeneric[${PYTHON_USEDEP}]
- matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- octave? ( dev-python/oct2py[${PYTHON_USEDEP}] )
- smp? ( >=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}] )
- wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
-RDEPEND="${CDEPEND}
- notebook? (
- >=www-servers/tornado-3.1[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- >=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-libs/mathjax
- )
- nbconvert? (
- >=app-text/pandoc-1.12.1
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- )
- qt4? (
- || (
- dev-python/PyQt4[${PYTHON_USEDEP}]
- dev-python/pyside[${PYTHON_USEDEP}]
- )
- dev-python/pygments[${PYTHON_USEDEP}]
- >=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/mock[${PY2_USEDEP}]
- )
- doc? (
- dev-python/cython[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/numpydoc[${PYTHON_USEDEP}]
- dev-python/pymongo[${PYTHON_USEDEP}]
- dev-python/rpy[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- >=www-servers/tornado-3.1[${PYTHON_USEDEP}]
- )"
-
-PATCHES=(
- "${FILESDIR}"/2.1.0-substitute-files.patch
- "${FILESDIR}"/2.1.0-disable-tests.patch
- "${FILESDIR}"/${P}-login-backport.patch
- )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- # Remove out of date insource files
- rm IPython/extensions/rmagic.py || die
- rm IPython/extensions/octavemagic.py || die
-
- # Prevent un-needed download during build
- if use doc; then
- sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
- fi
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-src_test() {
- # virtualx has trouble with parallel runs.
- local DISTUTILS_NO_PARALLEL_BUILD=1
- distutils-r1_src_test
-}
-
-python_test() {
- distutils_install_for_testing
- local fail
- run_tests() {
- pushd ${TEST_DIR} > /dev/null
- "${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
- popd > /dev/null
- }
- VIRTUALX_COMMAND=run_tests virtualmake
- [[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
- distutils-r1_python_install
- use notebook && dosym /usr/share/mathjax $(python_get_sitedir)/IPython/html/static/mathjax
-
- # Create ipythonX.Y symlinks.
- # TODO:
- # 1. do we want them for pypy? No. pypy has no numpy
- # 2. handle it in the eclass instead (use _python_ln_rel).
- # With pypy not an option the dosym becomes unconditional
- dosym ../lib/python-exec/${EPYTHON}/ipython \
- /usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/build/html/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- elog "To enable sympyprinting, it's required to emerge sympy"
- elog "To enable cythonmagic, it's required to emerge cython"
-}
diff --git a/dev-python/ipython/ipython-3.2.1-r1.ebuild b/dev-python/ipython/ipython-3.2.1-r1.ebuild
index 462f413..6d8bee1 100644
--- a/dev-python/ipython/ipython-3.2.1-r1.ebuild
+++ b/dev-python/ipython/ipython-3.2.1-r1.ebuild
@@ -15,7 +15,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
REQUIRED_USE="
diff --git a/dev-python/iso8601/iso8601-0.1.10-r1.ebuild b/dev-python/iso8601/iso8601-0.1.10-r1.ebuild
new file mode 100644
index 0000000..c4f84eb
--- /dev/null
+++ b/dev-python/iso8601/iso8601-0.1.10-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple module to parse ISO 8601 dates"
+HOMEPAGE="https://code.google.com/p/pyiso8601/ https://pypi.python.org/pypi/iso8601"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
+
+python_test() {
+ "${PYTHON}" -m pytest --verbose ${PN} || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/jinja/jinja-2.8-r1.ebuild b/dev-python/jinja/jinja-2.8-r1.ebuild
new file mode 100644
index 0000000..06c864c
--- /dev/null
+++ b/dev-python/jinja/jinja-2.8-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit eutils distutils-r1
+
+MY_PN=Jinja2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure Python"
+HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="doc examples"
+
+RDEPEND="
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ !dev-python/jinja:compat"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# XXX: handle Babel better?
+
+S=${WORKDIR}/${MY_P}
+
+wrap_opts() {
+ local mydistutilsargs=()
+
+ if [[ ${EPYTHON} == python* ]]; then
+ mydistutilargs+=( --with-debugsupport )
+ fi
+
+ "${@}"
+}
+
+python_compile() {
+ wrap_opts distutils-r1_python_compile
+ if [[ ${EPYTHON} == python3.2 ]]; then
+ 2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
+ fi
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+
+ distutils-r1_python_install_all
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins ext/Vim/*
+}
+
+pkg_postinst() {
+ if ! has_version dev-python/Babel; then
+ elog "For i18n support, please emerge dev-python/Babel."
+ fi
+}
diff --git a/dev-python/jsonschema/jsonschema-2.4.0.ebuild b/dev-python/jsonschema/jsonschema-2.4.0.ebuild
index a686c7e..cf839a5 100644
--- a/dev-python/jsonschema/jsonschema-2.4.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.4.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
python_test() {
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index 9b65ac9..16fa764 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,3 +1,4 @@
DIST keystonemiddleware-1.5.0.tar.gz 176315 SHA256 73e98aab8bceb7843b6cc8aba2cbff824a379428519e2f9ffbb8e32578b38fe8 SHA512 365643f7eba633587d8055204df04cfb40bdcc28c57d7ecf8c4ed67803b9b027b6334f868a1bc634d9beefd7410d74da08a7ed599637ec1656e6ef6196043dab WHIRLPOOL da7014869d3fc1ac5339671344542e33c22ac07adfb76ad00144cdcf4e1e26c60eea7ca7867cea6c6e105af1d05be64eff7d55ae1b3cf5114597da966b756b55
DIST keystonemiddleware-1.5.2.tar.gz 176172 SHA256 5f443162157946d2f33c4729d0bde55291f12963b0f1ee553984aedd8a509d51 SHA512 172143f2e80860de3d89f53667bf670c1986cfc63a21392bf977b3beaa5669db76f46997d6939952856cb4abc970b57920810980d00db7e7cd711bdbede5908e WHIRLPOOL 99a4553778b5dae07a710e78f816c8b30def42bfc7024cac7d6be8d8b6f76326383ed72935c6526758ac65fb26945937869985cba167d8804fe3a7cf2e3c4208
DIST keystonemiddleware-2.2.0.tar.gz 179743 SHA256 e3fca3fdc093d7fd3817bbd767faca7f0aa221b54155808694eb1286fae469f9 SHA512 9aa498aa0bceec1774c70dc7fc4ce8c398e72721d33e715594b3396e160f9b60dfc3533687f0706eb272abd812b44d31b2a76fece739a2ccad33039b37f3fca5 WHIRLPOOL a1b348e3e2f004038afa6b2b06d018d2e1130af1b2eb0e5740ea6a716dabaa98fe7a58cfd6e5100e5cdd6c7297fb150f4d9cc45dd8c831b7ca54a265b0d56662
+DIST keystonemiddleware-2.3.1.tar.gz 181764 SHA256 9970f8187cb0a91cb2d78ef9a088147b2c9457653e95caa7b8bcd11bd450bec1 SHA512 976aece1d308607eec6f406bb94f1e6dddc27edebc8d99bd7bc00dfbc1f21479da2c76404a99eb677e6647afd42f68b82d6f519659d7483db6fa9d68f839cf5f WHIRLPOOL e6a568e7c96886907eaeba9bc843833ffece8f441bfbe760b77c597c38a5a2720b702a527830d61f07bf0e3adbe4a90d6198b97b487ca08c3e4829058f7e0ef4
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild
new file mode 100644
index 0000000..18bd9b7
--- /dev/null
+++ b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+#PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A middleware for the OpenStack Keystone API"
+HOMEPAGE="https://github.com/openstack/keystonemiddleware"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ test? (
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.2[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+ >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
+ )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ testr init
+ testr run || die "testsuite failed under python2.7"
+ flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ use examples && local EXAMPLES=( examples/.)
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild b/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild
index 5fb696a..7fcef40 100644
--- a/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild
+++ b/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild
@@ -14,7 +14,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 568af82..15460f6 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,4 +1,3 @@
-DIST libvirt-python-1.2.15.tar.gz 166128 SHA256 9a6dfbd487d49f887a41aca4bfb1b4e043fd9fbdfc041252cae84023f5c387ba SHA512 5687308c2f16199ecc4ec935719da1e2d34d0fb3752437a4c662d7c83d972f49ee5e852daf7233fa9aa29f25bbaed1c26d17740faf56c1771bbc2134bcb8958b WHIRLPOOL d2173060d5d3763ba367fbf3140800d6534c27f36b91d7a944ff2f5ce36f9ac54bd86fb6df1399cfa8610ef62c0b0b87427fc68dc1e0be77b0c7b3f94f7d9e30
-DIST libvirt-python-1.2.17.tar.gz 170511 SHA256 f4d3db4012a800a2519e62bbef4ce14a37e030a20ab18f5b66759533a39b36ed SHA512 bd77558bc59f2abedb55582fed56bb73b33089cfa5de4a109c145bb087dfaa258ad4b022ca00b30fbac5c09f53f7a60fc270e658afd1cc57e618568b89adbfcd WHIRLPOOL a6e5c11401ebf66acadf075dbe360d43607b238b29f090cb822e7ae019d0a6a9ed5f80fa0d86b5f0b09cfcc103ee3ba77b49efdf0bbd18037df29450ee7306f6
DIST libvirt-python-1.2.18.tar.gz 171009 SHA256 204535ef160c9d10600b5fc3417f00f382e74b137a85b33774b97eb36d8a3638 SHA512 bf9f246d8bc2e55dc0cdeb22901b2dd2858b058c0616a2d5db3ca4a700c3430c9cd1f904ec3090cab7c3db1d40195a6365fed3b7b18fbd1d975fdca5fa57ce29 WHIRLPOOL a1e684360341b896bd96d6a313320ddb7ad455c64e4d1577076713e4913c95d2bd6f9222a6ac45b735a33d8e7fff06b40327e298d21e214857db17c859fb4849
DIST libvirt-python-1.2.19.tar.gz 172149 SHA256 88ab63b0c53e435bd2c6e8551805fe273353708efd4dfab908257dc5f37bec49 SHA512 670cc7af3fc5e67fa8daa8312278ecf81608ceddd34c40fc799e0c2836a5a8c3489186dee5ffcd806bf70840c1aa7b64178eef334f35c4bbe5fe21413b473d3b WHIRLPOOL 74e73e1dcabd0ed67988f34cd12c7ecc3d71e5dbfc4a5f81f22e3aeed37ee3fa343b780bbafa7941a79abffdb4d7a566e65b73c185c695567d6558e18ef58b32
+DIST libvirt-python-1.2.20.tar.gz 170437 SHA256 e1ea097546edc7cb0e7fd01e2ca9906ac12cc4f16d07f15f8f0f5154626ba446 SHA512 2fd642b1f7efee46331636098e8bc9d1194f399bb93e9d445103a70264332bb6b216bb42846432707e1538f73f96c4c141dde84779d3b36cc93f6f7914466ef9 WHIRLPOOL 19c56d69a8c61814b8312e5b0920efae6433bffe3cd33237a34efb6847abd4bafa686481cd40c72cc0f92290d0c70efc53d83c42d2b6a2f20928608321c41351
diff --git a/dev-python/libvirt-python/libvirt-python-1.2.15.ebuild b/dev-python/libvirt-python/libvirt-python-1.2.15.ebuild
deleted file mode 100644
index 1f38cff..0000000
--- a/dev-python/libvirt-python/libvirt-python-1.2.15.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-inherit eutils distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
- SRC_URI=""
- KEYWORDS=""
- RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
- SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
- KEYWORDS="amd64 x86"
- RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="http://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="test"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}] )"
-
-# testsuite is currently not included in upstream tarball
-RESTRICT="test"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/libvirt-python/libvirt-python-1.2.17.ebuild b/dev-python/libvirt-python/libvirt-python-1.2.20.ebuild
similarity index 100%
rename from dev-python/libvirt-python/libvirt-python-1.2.17.ebuild
rename to dev-python/libvirt-python/libvirt-python-1.2.20.ebuild
diff --git a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
new file mode 100644
index 0000000..6fc6533
--- /dev/null
+++ b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backports of the linecache module"
+HOMEPAGE="https://github.com/testing-cabal/linecache2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+ dev-python/pbr[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/fixtures[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND=""
+
+python_test() {
+ "${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/linecache2/linecache2-1.0.0.ebuild b/dev-python/linecache2/linecache2-1.0.0.ebuild
index 0893a58..eaac720 100644
--- a/dev-python/linecache2/linecache2-1.0.0.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
IUSE="test"
DEPEND="
diff --git a/dev-python/lockfile/lockfile-0.10.2-r1.ebuild b/dev-python/lockfile/lockfile-0.10.2-r1.ebuild
new file mode 100644
index 0000000..4de50b1
--- /dev/null
+++ b/dev-python/lockfile/lockfile-0.10.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Platform-independent file locking module"
+HOMEPAGE="https://launchpad.net/pylockfile https://pypi.python.org/pypi/lockfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+ dev-python/pbr[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+DOCS=( ACKS README RELEASE-NOTES )
+
+python_compile_all() {
+ if use doc; then
+ einfo "Generation of documentation"
+ emake -C doc/source html || die "Generation of documentation failed"
+ fi
+}
+
+python_test() {
+ # "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
+ nosetests || die "test_lockfile failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/source/.build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/lockfile/lockfile-0.10.2.ebuild b/dev-python/lockfile/lockfile-0.10.2.ebuild
index dd00ec9..a08d2ef 100644
--- a/dev-python/lockfile/lockfile-0.10.2.ebuild
+++ b/dev-python/lockfile/lockfile-0.10.2.ebuild
@@ -14,7 +14,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc test"
DEPEND="
diff --git a/dev-python/lockfile/metadata.xml b/dev-python/lockfile/metadata.xml
index 3caf380..deb69e0 100644
--- a/dev-python/lockfile/metadata.xml
+++ b/dev-python/lockfile/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/lxml/lxml-3.4.4.ebuild b/dev-python/lxml/lxml-3.4.4.ebuild
index 80f5f65..efda919 100644
--- a/dev-python/lxml/lxml-3.4.4.ebuild
+++ b/dev-python/lxml/lxml-3.4.4.ebuild
@@ -14,7 +14,7 @@
LICENSE="BSD ElementTree GPL-2 PSF-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 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 ~x64-solaris ~x86-solaris"
IUSE="doc examples +threads test"
# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
diff --git a/dev-python/lz4/lz4-0.7.0.ebuild b/dev-python/lz4/lz4-0.7.0.ebuild
index 5e4d293..c706375 100644
--- a/dev-python/lz4/lz4-0.7.0.ebuild
+++ b/dev-python/lz4/lz4-0.7.0.ebuild
@@ -20,3 +20,10 @@
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
# Tests still excluded by upstream
+
+python_prepare_all() {
+ sed \
+ -e '/nose/s:setup_requires:test_requires:g' \
+ -i setup.py || die
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/m2crypto/m2crypto-0.22.3-r5.ebuild b/dev-python/m2crypto/m2crypto-0.22.3-r5.ebuild
new file mode 100644
index 0000000..70bd900
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.22.3-r5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
+HOMEPAGE="https://github.com/martinpaljak/M2Crypto https://pypi.python.org/pypi/M2Crypto"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
+IUSE="libressl"
+
+RDEPEND="
+ !libressl? ( >=dev-libs/openssl-0.9.8:0= )
+ libressl? ( dev-libs/libressl:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-lang/swig-1.3.28:0
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+PATCHES=(
+ "${FILESDIR}"/0.22.3-Use-swig-generated-python-loader.patch
+ "${FILESDIR}"/0.22.3-packaging.patch
+)
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/markupsafe/markupsafe-0.23-r1.ebuild b/dev-python/markupsafe/markupsafe-0.23-r1.ebuild
new file mode 100644
index 0000000..3732393
--- /dev/null
+++ b/dev-python/markupsafe/markupsafe-0.23-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="MarkupSafe"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
+HOMEPAGE="https://pypi.python.org/pypi/MarkupSafe"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile() {
+ distutils-r1_python_compile
+ if [[ ${EPYTHON} == python3.2 ]]; then
+ 2to3 --no-diffs -n -w -f unicode ${PN} || die
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild
new file mode 100644
index 0000000..c67e7fc
--- /dev/null
+++ b/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Basic functions for handling mime-types in python"
+HOMEPAGE="
+ https://code.google.com/p/mimeparse
+ https://github.com/dbtsai/python-mimeparse"
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+ "${PYTHON}" mimeparse_test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ if [[ ${EPYTHON} == pypy ]]; then
+ local pyver=2.7
+ elif [[ ${EPYTHON} == pypy3 ]]; then
+ local pyver=3.2
+ else
+ local pyver=${EPYTHON#python}
+ fi
+ python_export PYTHON_SITEDIR
+
+ # Previous versions were just called 'mimeparse'
+ cp "${D%/}${PYTHON_SITEDIR}/python_mimeparse-${PV}-py${pyver}.egg-info" \
+ "${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die
+}
diff --git a/dev-python/mistune/mistune-0.5.1.ebuild b/dev-python/mistune/mistune-0.5.1.ebuild
index 972db3e..842e4c9 100644
--- a/dev-python/mistune/mistune-0.5.1.ebuild
+++ b/dev-python/mistune/mistune-0.5.1.ebuild
@@ -14,7 +14,7 @@
SLOT="0"
LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND=""
diff --git a/dev-python/mock/mock-1.2.0.ebuild b/dev-python/mock/mock-1.2.0.ebuild
index 33ee937..1c7a20b 100644
--- a/dev-python/mock/mock-1.2.0.ebuild
+++ b/dev-python/mock/mock-1.2.0.ebuild
@@ -13,7 +13,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~s390 ~sh ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~s390 ~sh ~sparc ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc test"
CDEPEND="$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' 'python2_7')"
diff --git a/dev-python/mock/mock-1.3.0-r1.ebuild b/dev-python/mock/mock-1.3.0-r1.ebuild
index 0214a28..2dcbea7 100644
--- a/dev-python/mock/mock-1.3.0-r1.ebuild
+++ b/dev-python/mock/mock-1.3.0-r1.ebuild
@@ -14,7 +14,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc test"
CDEPEND="$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' 'python2_7')
diff --git a/dev-python/mock/mock-1.3.0-r2.ebuild b/dev-python/mock/mock-1.3.0-r2.ebuild
new file mode 100644
index 0000000..ddcdc19
--- /dev/null
+++ b/dev-python/mock/mock-1.3.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
+HOMEPAGE="https://github.com/testing-cabal/mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc test"
+
+CDEPEND="$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' 'python2_7')
+ >=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+DEPEND="
+ >=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+ test? (
+ ${CDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]' python{2_7,3_3} pypy)
+ )"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/six-1.7[${PYTHON_USEDEP}]
+"
+
+python_test() {
+ nosetests || die "tests fail under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local DOCS=( docs/*.txt )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index 213d31c..248f3a2 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,2 +1,3 @@
DIST monotonic-0.2.tar.gz 6652 SHA256 c5e81e875a43e218135ea2aa4c367523894e1a2d7633ddafbed5292c527644a8 SHA512 0da2f9504aebf1b046a06156e30b8d6b6fde29c642f442ba8e5a43336309fca0fe636488ea69e463fcba5951d990723fddc2b9172211f6d8c57b0ab3ebab1a66 WHIRLPOOL 129f6a170856780d727ff2ef11d4b3688971b7376c9e9f590c7bc85aa20ba35d699751ddd5de58d144d4a3d540a2aac7d3f9fd3a63d010d88d7f93ffa62c836c
DIST monotonic-0.3.tar.gz 6707 SHA256 2825ba5ded67b1a70d44529634d3f4ddfad67a5ed7fdcf026022a3ce175be07b SHA512 772154934ffdd1a12aacc331761ce219980caac1bce243fd0740320a25152cf800142c5787c9423270bf02d18e88973dcd981781e2279b28ce364063102f1099 WHIRLPOOL 83d34eac5ee577ba8c42c6276d1c3a46fc30a63919ffd6f86260c09aaf6720ab171db89dfdaa28fd6d42ebb309725ff2e4e0e6c8306c21f9f12dce3d71436e71
+DIST monotonic-0.4.tar.gz 6702 SHA256 852f656adbf623ee859def6ca2f5498f4cae3256f8320d5c50570ee8a0592ab6 SHA512 604f7d9f2b36e03413a0f9c341b45698440f3b004cd7120d3905e4712ac85daeadc0580ebd471ad9ad699aa2ec625908f13b604b10f656c803f6e885553d7e6c WHIRLPOOL f13cd567de00c24800da8b40ae1018f54b95e98c2ccda194ea2e8cf080c1ee47d0670db59ddaf72df373906d46107ec10a62581544076c7e70379119f3443dfd
diff --git a/dev-python/monotonic/monotonic-0.4.ebuild b/dev-python/monotonic/monotonic-0.4.ebuild
new file mode 100644
index 0000000..7ca4432
--- /dev/null
+++ b/dev-python/monotonic/monotonic-0.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
+HOMEPAGE="https://github.com/atdt/monotonic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/more-itertools/more-itertools-2.2.ebuild b/dev-python/more-itertools/more-itertools-2.2.ebuild
index 05e5703..7577385 100644
--- a/dev-python/more-itertools/more-itertools-2.2.ebuild
+++ b/dev-python/more-itertools/more-itertools-2.2.ebuild
@@ -8,7 +8,7 @@
inherit distutils-r1
DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.python.org/pypi/${PN}"
+HOMEPAGE="https://pypi.python.org/pypi/more-itertools"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0-r1.ebuild
new file mode 100644
index 0000000..c2341b1
--- /dev/null
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
+HOMEPAGE="
+ https://github.com/cedadev/ndg_httpsclient/
+ https://pypi.python.org/pypi/ndg-httpsclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${P/-/_}"
+
+# doc build by Makefile in folder documentation is broken
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
index 01ec815..b2a1f73 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
@@ -3,12 +3,14 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
-HOMEPAGE="https://github.com/cedadev/ndg_httpsclient/
+HOMEPAGE="
+ https://github.com/cedadev/ndg_httpsclient/
https://pypi.python.org/pypi/ndg-httpsclient"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
@@ -17,7 +19,7 @@
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
-RDEPEND="dev-python/pyopenssl[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild b/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
index c3bcaa4..be10a29 100644
--- a/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
index 901728f..467060e 100644
--- a/dev-python/nose/metadata.xml
+++ b/dev-python/nose/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/nose/nose-1.3.7-r1.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild
new file mode 100644
index 0000000..b8ea30e
--- /dev/null
+++ b/dev-python/nose/nose-1.3.7-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
+HOMEPAGE="
+ https://pypi.python.org/pypi/nose
+ http://readthedocs.org/docs/nose/
+ https://bitbucket.org/jpellerin/nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~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 test"
+
+RDEPEND="
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
+ test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
+
+python_prepare_all() {
+ # Tests need to be converted, and they don't respect BUILD_DIR.
+ use test && DISTUTILS_IN_SOURCE_BUILD=1
+
+ # Disable tests requiring network connection.
+ sed \
+ -e "s/test_resolve/_&/g" \
+ -e "s/test_raises_bad_return/_&/g" \
+ -e "s/test_raises_twisted_error/_&/g" \
+ -i unit_tests/test_twisted.py || die "sed failed"
+ # Disable versioning of nosetests script to avoid collision with
+ # versioning performed by the eclass.
+ sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
+ -i setup.py || die "sed2 failed"
+
+ # Prevent un-needed d'loading during doc build
+ sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ local add_targets=()
+
+ if use test; then
+ add_targets+=( egg_info )
+ python_is_python3 && add_targets+=( build_tests )
+ fi
+
+ distutils-r1_python_compile ${add_targets[@]}
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+src_test() {
+ # nosetests use heavy multiprocessing during the tests.
+ # this shall make them less likely to kill your system or timeout.
+ local DISTUTILS_NO_PARALLEL_BUILD=1
+
+ distutils-r1_src_test
+}
+
+python_test() {
+ "${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+
+ if use doc; then
+ dohtml -r -A txt doc/.build/html/.
+ fi
+}
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
index 5af1375..fefdcad 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-9999.ebuild
@@ -19,7 +19,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS=""
IUSE="doc examples test"
RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 330b8dd..888858f 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,3 +1,4 @@
+DIST numpy-1.10.0.post2.tar.gz 4082399 SHA256 2ebd29edb2f1a4a19e86cfc27c1b2283314d57509b2bfc6606b4f05d620c230b SHA512 60a4fc0ed07b8944cf7994c2fcf24eae49c659cc387d5dd5c824054fd82d9542bb07afa34a89a71bdb4a52a33b00f6eff845b611b12cf147a52308fa517730b0 WHIRLPOOL 855c6a0026c7d23d212b94beda676d191752ff22ff58305bc7a460513bfa19bc32e561ceb6d38b94065c3e7e315a7341840bf21c5ca7c748befb53af221a969a
DIST numpy-1.8.0.tar.gz 3779617 SHA256 2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253 SHA512 ec3d002ed786335e8748983261c96f88a9f1520fc345ad5b810dc02a5e126e15fe5afb02bed1f4b43d580a1da39583d86b84f57dc456b0702653e34e5357c857 WHIRLPOOL 8796d90795ddec62e6d72be433ea00917a63ef39cf3fe81e094f653e1863b69ecdce812995877f78e4324434141b03e2ceb3f872ed4e023b19c6bd9bcc294ac2
DIST numpy-1.8.1.tar.gz 3794076 SHA256 3d722fc3ac922a34c50183683e828052cd9bb7e9134a95098441297d7ea1c7a9 SHA512 39ef9e13f8681a2c2ba3d74ab96fd28c5669e653308fd1549f262921814fa7c276ce6d9fb65ef135006584c608bdf3db198d43f66c9286fc7b3c79803dbc1f57 WHIRLPOOL 10615c0c70c153156034447e9c3f2b70b0259173a44af3b5cc641dd31c0af71ef1053a9cc7938deff5edb899ae2666b2b3109491d7394f03d1a81cb19722d398
DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311
diff --git a/dev-python/numpy/numpy-1.10.0_p2-r1.ebuild b/dev-python/numpy/numpy-1.10.0_p2-r1.ebuild
new file mode 100644
index 0000000..dd9c6fd
--- /dev/null
+++ b/dev-python/numpy/numpy-1.10.0_p2-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.9.1"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz
+ doc? (
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+ )"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+ doc? ( app-arch/unzip )
+ lapack? ( virtual/pkgconfig )
+ test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
+)
+
+src_unpack() {
+ default
+ mv "${WORKDIR}"/* "${S}" || die
+
+ if use doc; then
+ unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+ fi
+}
+
+pc_incdir() {
+ $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+ sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+ $(tc-getPKG_CONFIG) --libs-only-L $@ | \
+ sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+ $(tc-getPKG_CONFIG) --libs-only-l $@ | \
+ sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+ -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+ | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+ if use lapack; then
+ append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+ local libdir="${EPREFIX}"/usr/$(get_libdir)
+ # make sure _dotblas.so gets built
+ sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+ cat >> site.cfg <<-EOF
+ [blas]
+ include_dirs = $(pc_incdir cblas)
+ library_dirs = $(pc_libdir cblas blas):${libdir}
+ blas_libs = $(pc_libs cblas blas)
+ [lapack]
+ library_dirs = $(pc_libdir lapack):${libdir}
+ lapack_libs = $(pc_libs lapack)
+ EOF
+ else
+ export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+ fi
+
+ export CC="$(tc-getCC) ${CFLAGS}"
+
+ append-flags -fno-strict-aliasing
+
+ # See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+ # with the subtle difference that we don't want to break Darwin where
+ # -shared is not a valid linker argument
+ if [[ ${CHOST} != *-darwin* ]]; then
+ append-ldflags -shared
+ fi
+
+ # only one fortran to link with:
+ # linking with cblas and lapack library will force
+ # autodetecting and linking to all available fortran compilers
+ append-fflags -fPIC
+ if use lapack; then
+ NUMPY_FCONFIG="config_fc --noopt --noarch"
+ # workaround bug 335908
+ [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+ fi
+
+ # don't version f2py, we will handle it.
+ sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+ # we don't have f2py-3.3
+ sed \
+ -e "/f2py_cmd/s:'f2py'.*:'f2py':g" \
+ -i numpy/tests/test_scripts.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
+}
+
+python_test() {
+ distutils_install_for_testing ${NUMPY_FCONFIG}
+
+ cd "${TMPDIR}" || die
+ ${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+ if use doc; then
+ dohtml -r "${WORKDIR}"/html/*
+ dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+ fi
+
+ # absent in 1.9
+ #docinto f2py
+ #dodoc numpy/f2py/docs/*.txt
+ #doman numpy/f2py/f2py.1
+}
diff --git a/dev-python/numpy/numpy-1.10.0_p2.ebuild b/dev-python/numpy/numpy-1.10.0_p2.ebuild
new file mode 100644
index 0000000..f7fdd3d
--- /dev/null
+++ b/dev-python/numpy/numpy-1.10.0_p2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.9.1"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz
+ doc? (
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+ )"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+ doc? ( app-arch/unzip )
+ lapack? ( virtual/pkgconfig )
+ test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
+)
+
+src_unpack() {
+ default
+ mv "${WORKDIR}"/* "${S}" || die
+
+ if use doc; then
+ unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+ fi
+}
+
+pc_incdir() {
+ $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+ sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+ $(tc-getPKG_CONFIG) --libs-only-L $@ | \
+ sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+ $(tc-getPKG_CONFIG) --libs-only-l $@ | \
+ sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+ -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+ | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+ if use lapack; then
+ append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+ local libdir="${EPREFIX}"/usr/$(get_libdir)
+ # make sure _dotblas.so gets built
+ sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+ cat >> site.cfg <<-EOF
+ [blas]
+ include_dirs = $(pc_incdir cblas)
+ library_dirs = $(pc_libdir cblas blas):${libdir}
+ blas_libs = $(pc_libs cblas blas)
+ [lapack]
+ library_dirs = $(pc_libdir lapack):${libdir}
+ lapack_libs = $(pc_libs lapack)
+ EOF
+ else
+ export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+ fi
+
+ export CC="$(tc-getCC) ${CFLAGS}"
+
+ append-flags -fno-strict-aliasing
+
+ # See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+ # with the subtle difference that we don't want to break Darwin where
+ # -shared is not a valid linker argument
+ if [[ ${CHOST} != *-darwin* ]]; then
+ append-ldflags -shared
+ fi
+
+ # only one fortran to link with:
+ # linking with cblas and lapack library will force
+ # autodetecting and linking to all available fortran compilers
+ append-fflags -fPIC
+ if use lapack; then
+ NUMPY_FCONFIG="config_fc --noopt --noarch"
+ # workaround bug 335908
+ [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+ fi
+
+ # don't version f2py, we will handle it.
+ sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+ # we don't have f2py-3.3
+ sed \
+ -e "/f2py_cmd/s:'f2py'.*:'f2py':g" \
+ -i numpy/tests/test_scripts.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
+}
+
+python_test() {
+ distutils_install_for_testing ${NUMPY_FCONFIG}
+
+ cd "${TMPDIR}" || die
+ ${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+ if use doc; then
+ dohtml -r "${WORKDIR}"/html/*
+ dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+ fi
+
+ # absent in 1.9
+ #docinto f2py
+ #dodoc numpy/f2py/docs/*.txt
+ #doman numpy/f2py/f2py.1
+}
diff --git a/dev-python/numpy/numpy-1.9.2.ebuild b/dev-python/numpy/numpy-1.9.2.ebuild
index cd771ba..c8b50a7 100644
--- a/dev-python/numpy/numpy-1.9.2.ebuild
+++ b/dev-python/numpy/numpy-1.9.2.ebuild
@@ -24,7 +24,7 @@
# It appears the docs haven't been upgraded, still @ 1.8.1
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack test"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index cf98eba..e67768c 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,2 +1,3 @@
DIST openpyxl-2.2.3.tar.gz 108576 SHA256 7d46b38960bae1e912eb8161bb4e040d2611f295126703a18865b65c49a49a7c SHA512 aac0fac10611f15b4b006b4c6ca6fd7c854d3c7bc8203fcfcb932898cf599a809f14ee21f42f263bc75cc98b907fcb7dd5953c328aa0a5adeb2c7e5556de5aba WHIRLPOOL ca98df2cc6c5985c1d12c7493403aa6cabe02192d91d1dfadb73e8823eaf94661738afc6cd1e28b4183b34f123e0fcaab4472748de8724abc79683f0119be7f9
DIST openpyxl-2.2.4.tar.gz 108810 SHA256 bd1b795ffc928f8c3f64fc0182e087a5f9afe7df94c78335a8d12eed872d182a SHA512 b33832bf194ef80cb5ce8dc4ee06f5c2f372fcd1074f7a4b0fea94c9528d17a80bfc83bb2a20e40118bd2250d63ade1a772bbc20533b9355472284a186ebe977 WHIRLPOOL 4a799125391a587a027e936a60f3853440ffe754e1078b6e95b3d7077ff89f0b308fd7e431561fdc7bb8707a17cbf39088ef88395e101dd578bcdcf568e9e6e4
+DIST openpyxl-2.2.6.tar.gz 108959 SHA256 0e580133106976da044b5861231283fb4e1b2d439787e0f668f28eb2dfd7468e SHA512 a306b5c646714c32b08d21c513720bbd355920ca457dc9a013b68422be7c6be28ea0558180e20be532b1c8f6c7e032bc981aba0640f171546a80a39acb0219b2 WHIRLPOOL 18fe3526599f247a864762c091284695725895ae206f573e27c4f95e1ed0b49207ff2f8fa4949245dd31a82ae429c51a374bbc5d0152580cf192802690b750b3
diff --git a/dev-python/openpyxl/openpyxl-2.2.6.ebuild b/dev-python/openpyxl/openpyxl-2.2.6.ebuild
new file mode 100644
index 0000000..b61d84c
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-2.2.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="http://openpyxl.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/jdcal[${PYTHON_USEDEP}]"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ )"
+
+# tests aren't contained in tarball
+RESTRICT="test"
+
+python_test() {
+ py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/packaging/packaging-15.3-r1.ebuild b/dev-python/packaging/packaging-15.3-r1.ebuild
index 5069126..2952aa7 100644
--- a/dev-python/packaging/packaging-15.3-r1.ebuild
+++ b/dev-python/packaging/packaging-15.3-r1.ebuild
@@ -14,7 +14,7 @@
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND=""
diff --git a/dev-python/packaging/packaging-15.3-r2.ebuild b/dev-python/packaging/packaging-15.3-r2.ebuild
new file mode 100644
index 0000000..6d77cb9
--- /dev/null
+++ b/dev-python/packaging/packaging-15.3-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/pretend[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-setuptools.patch )
+
+python_test() {
+ py.test --capture=no --strict -v || die
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index f1eb82b..e05319e 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1 +1,2 @@
DIST pandas-0.16.2.tar.gz 4931751 SHA256 e01853dfe111f3aea005315573400b7216ddbabbf1f28d482a71217d67ae4f81 SHA512 44874e12a42a01dd7ed88f3f97e954732a534a5e2dc4815ef6203bdb2d88850a607e6631a35ae8fc79f4621a5dfaa34f39bb1c9a0ecfb17da1cf0c10f35ff27b WHIRLPOOL 6f2874ac07b49f4b2aaefdb87375b7c5adb31e3ff60c6b808f3e3467ad82999dd894de884ebbfd64fc7235e875d17ce871b516c96ff71a17310b708597168702
+DIST pandas-0.17.0.tar.gz 6508621 SHA256 320d4fdf734b82adebc8fde9d8ca4b05fe155a72b6f7aa95d76242da8748d6a4 SHA512 bae6964e263c7ff6cac722cdfe23081f23c357d9bc39a670b5627bef4630c236a58aa8c0393eae921721bf7049c8e5266b4dea71dd957da5d89dafc14a04797b WHIRLPOOL d654eb2f9ffbfedbde60e4a6e6ce6f54650a8a68b4d20035744aa55111525d6bba4dae2ccbfce65acf71bb200e2e6029c7f6c9bcc9d0c582d808444738baedb1
diff --git a/dev-python/pandas/pandas-0.17.0.ebuild b/dev-python/pandas/pandas-0.17.0.ebuild
new file mode 100644
index 0000000..96b90f0
--- /dev/null
+++ b/dev-python/pandas/pandas-0.17.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 eutils flag-o-matic virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="http://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc excel html test R"
+
+EXTRA_DEPEND="
+ >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
+ dev-python/openpyxl[${PYTHON_USEDEP}]
+ dev-python/pymysql[${PYTHON_USEDEP}]
+ dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
+ dev-python/psycopg:2[${PYTHON_USEDEP}]
+ dev-python/statsmodels[${PYTHON_USEDEP}]
+ dev-python/sqlalchemy[${PYTHON_USEDEP}]
+ "
+CDEPEND="
+ >dev-python/numpy-1.7[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+ !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+ >=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ dev-python/ipython[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+ dev-python/openpyxl[${PYTHON_USEDEP}]
+ >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/rpy[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+ dev-python/xlrd[$(python_gen_usedep 'python2_7')]
+ dev-python/xlwt[$(python_gen_usedep 'python2_7')]
+ x11-misc/xclip
+ )
+ test? (
+ ${EXTRA_DEPEND}
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ x11-misc/xclip
+ x11-misc/xsel
+ )"
+# dev-python/statsmodels invokes a circular dep
+# hence rm from doc? ( ), again
+RDEPEND="${CDEPEND}
+ >=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+ dev-python/bottleneck[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/pytables[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ excel? (
+ dev-python/xlrd[$(python_gen_usedep 'python2_7')]
+ dev-python/xlwt[$(python_gen_usedep 'python2_7')]
+ || (
+ dev-python/xlsxwriter[${PYTHON_USEDEP}]
+ >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+ )
+ )
+ html? (
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ || (
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}] )
+ )
+ R? ( dev-python/rpy[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Prevent un-needed download during build
+ sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ # To build docs the need be located in $BUILD_DIR,
+ # else PYTHONPATH points to unusable modules.
+ if use doc; then
+ cd "${BUILD_DIR}"/lib || die
+ cp -ar "${S}"/doc . && cd doc || die
+ LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die
+ fi
+}
+
+python_test() {
+ local test_pandas='not network and not disabled'
+ [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
+ pushd "${BUILD_DIR}"/lib > /dev/null
+ VIRTUALX_COMMAND="nosetests"
+ PYTHONPATH=. MPLCONFIGDIR=. HOME=. \
+ virtualmake --verbosity=3 -A "${test_pandas}" pandas
+ popd > /dev/null
+}
+
+python_install_all() {
+ if use doc; then
+ dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+ einfo "An initial build of docs is absent of references to statsmodels"
+ einfo "due to circular dependency. To have them included, emerge"
+ einfo "statsmodels next and re-emerge pandas with USE doc"
+ fi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ local x
+ elog "Please install"
+ for x in ${EXTRA_DEPEND}; do
+ optfeature "additional functionality" "${x%%[*}"
+ done
+}
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 3a9ed3e..2b56f37 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,5 +1,3 @@
-DIST paramiko-1.10.1.tar.gz 822839 SHA256 5fac0dbb3d7498bf4a7e1b8fac920cb8977a90e260d43d7e30fac2d6dd5fbabc SHA512 89d2333592ceff1bb5de9d9cbc4e6b44d29e470c26eeecfe0f34c3506cbead87934347ccfa5a1ac72a70024ce4961858f01b51990569d99971dc24177eac407f WHIRLPOOL 91873637f22068264033a41da517e5b2504bc779aee0ca0252ea0158b80dad1cc472310d40e1a8dfc33e25d86ce80748935e459a0b2e591da9d279127ee0629f
-DIST paramiko-1.12.2.tar.gz 907747 SHA256 d73bdafd1cb7181f7fd22164b55578f2389487aa50e58fa915b22e2f539b50cb SHA512 a8247c27ef3068b1c73ca39d7ce0da36ea7cbf28bdac805c92fd73bbe57c7f84e38433d330d54ea850ef952c57ff596dfb6627caee8e8b9c4ce69b1958fed094 WHIRLPOOL 13b03cb6fa1ec09451a45cba148b6d9790b75affb74bacfb20ada00ffb4e5cc7db5de6a6eda24433882ad305c76ccb1bb29e1e7170d53420e5b2c055b3b98dc3
-DIST paramiko-1.13.0.tar.gz 1108744 SHA256 920d68fdb549189c7ebff89f432cc242161d76554a91ae38fad94e7ab70349f5 SHA512 b05b93eb27600ac9df178aa4f045ee6b20f0052ea5e3f937d4eb6c6e1940208b02f9d6ddabf3070edaf4a68b86ca817ae77ebfb24a7d1dc725be86f99b071fc6 WHIRLPOOL 47baf72cbc9f51532477cc1f4665c6c7a66eaf47eb5b856d506cc4286d832cdda2881f86ef919837dfe43e6db99c186a127d01dbecf012d4b4d4afbd1a7215df
DIST paramiko-1.15.1.tar.gz 1219256 SHA256 6ed97e2281bb48728692cdc621f6b86a65fdc1d46b178ce250cfec10b977a04c SHA512 146076792e42965aaca08e74630c18422ed767a3da64c63fa63da9a464e1dade5a3f77635a5aae569e5a382d9a31eb4ee738399cd93895e355b4a57119c99f1c WHIRLPOOL 4f4bb6276363130d14c80e55d5c6858712a25404735e9671969d79ff1d1b1399918e24b6c80b275bbf76373a95cb407ca34fba5da8bc92bcd1322e4651ad1354
DIST paramiko-1.15.2.tar.gz 1220578 SHA256 4f56a671a3eecbb76e6143e6e4ca007d503a39aa79aa9e14ade667fa53fd6e55 SHA512 c8fe6c5e4c99ac0922c08f3c006b55852f54c3043eb3ddae5b6e5fba0592bf08b10ec399ec6865bbe84c759c8a15a00722247409b666f42e93b18bfd658158cd WHIRLPOOL 477e9e3d93f4faa9471c2a3e87ac96e7fe0ecdbdfb838b348ba2873e4bc408e78a5840f02002db6bbea18de8b9e2c83240db5a3c16543e4949ea62250de7a26a
+DIST paramiko-1.15.3.tar.gz 1212786 SHA256 7e17ec363c73acb0e77a5fcc6e44a0dd494339a9067e99a997a7d32b4272fef1 SHA512 60e9b55985bf575a2a0f37c63ee183a247652b51b23573ea0ae3a8304418cdb7f91cf661a577cc04d06ea9ef644a24ea0e985a80ee6f7c137e5eee6bd172b332 WHIRLPOOL 329748854b4a97c3f52daa5619a7eee7f33217b524d9baa6f761ee25abc9e578c457599a8385b9813dfb973bcc6ef83c3d10d9527002ac88f4477e384115f860
diff --git a/dev-python/paramiko/paramiko-1.10.1.ebuild b/dev-python/paramiko/paramiko-1.10.1.ebuild
deleted file mode 100644
index 35c3b20..0000000
--- a/dev-python/paramiko/paramiko-1.10.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc examples"
-
-RDEPEND=">=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
- "${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/. )
- use examples && local EXAMPLES=( demos/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/paramiko/paramiko-1.12.2.ebuild b/dev-python/paramiko/paramiko-1.12.2.ebuild
deleted file mode 100644
index 73a6038..0000000
--- a/dev-python/paramiko/paramiko-1.12.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="doc examples"
-
-RDEPEND=">=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]
- dev-python/ecdsa"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
- "${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/. )
- use examples && local EXAMPLES=( demos/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/paramiko/paramiko-1.13.0.ebuild b/dev-python/paramiko/paramiko-1.13.0.ebuild
deleted file mode 100644
index 057e546..0000000
--- a/dev-python/paramiko/paramiko-1.13.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="doc examples"
-
-RDEPEND=">=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]
- >=dev-python/ecdsa-0.9[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Required for testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
- "${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/. )
- use examples && local EXAMPLES=( demos/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/paramiko/paramiko-1.15.3.ebuild b/dev-python/paramiko/paramiko-1.15.3.ebuild
new file mode 100644
index 0000000..4ca3739
--- /dev/null
+++ b/dev-python/paramiko/paramiko-1.15.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE="doc examples"
+
+RDEPEND="
+ >=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]
+ !=dev-python/pycrypto-2.4[${PYTHON_USEDEP}]
+ >=dev-python/ecdsa-0.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Required for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+ "${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/. )
+ use examples && local EXAMPLES=( demos/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index ef07123..c3325d6 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -8,3 +8,4 @@
DIST pbr-1.6.0.tar.gz 99945 SHA256 4eaee8ff5544703edd1951ed1dc0b283da99a74f740d9f9055eeefcf329de1d1 SHA512 a0393cc7774ea3e181ba75c976f5961686afeb214d8c16f3fdd3838154323cd856ded759cae1c6a25b0371c72d95e579b04de0902d56c432ef137f820032c0fd WHIRLPOOL f0a4c4744a86ee1285490ec78fa8e9dc910d926b05746ccf1be5342fe4369bf33a6373ff4fc9981f2547fa83dbc743de4b204a79c9eee8bd4396a983c5509686
DIST pbr-1.7.0.tar.gz 99850 SHA256 d6e696dbd2b311225e3a21fe11d611989434cb366ff7919cef5ef1add859526e SHA512 333c99132008997b988f93488b1c4d42a30e14ee179866ee4624bdaae3c11ea2bd321d15c86ee435d325dd80fe1de64ff75113c2c8f5f7b31248188c9e3719fe WHIRLPOOL 62effaec7fb99c89dbba36af71208472c4cfb7fbbb2549440f995048b1ff0b0b2899b099774574c5501bc2d575253a6c8e5df7afccd449f3052a0ebf07f1269e
DIST pbr-1.8.0.tar.gz 102868 SHA256 44a0ef9295bb59698f461124741a21a0f7f76d42e160d8a0a4bf1693338036fc SHA512 e1c1e7f0ebff7d7dc8af6c3a6fe1841ee80a9620b25f4146bd30ccbd2212e6332fa8c2aa1ca044cda2915a8bad6df468bd1dc365c330508fa8f07b8fa231736f WHIRLPOOL 9fe6546bef29a3f19d3e8f1ca09ce6f004e17bcadfb3fb5460d9a0db382f3e76218637ad8e34f4e5b6ae7caa8c38a54563ec1193b0ea7e5a56da71c48681dd3c
+DIST pbr-1.8.1.tar.gz 104584 SHA256 e2127626a91e6c885db89668976db31020f0af2da728924b56480fc7ccf09649 SHA512 909b3ef463787d68f75f300b483ffb7d1e54ef246ed893ab5cf84e5489e171b67b77c90a1f90259ca274eeb286a66a3f221d5e0c17df5d14d0aa263d36ba6eb4 WHIRLPOOL 69bf79cc322583b17e86ccb130894dbd5aed4b0b6c8c273c977a3a5ac79190cd15b96b28d76995021eb69c30b76bcf7e9a061c0280483da9ec0c69d33e9f0822
diff --git a/dev-python/pbr/pbr-1.6.0.ebuild b/dev-python/pbr/pbr-1.6.0.ebuild
index c404425..83c997d 100644
--- a/dev-python/pbr/pbr-1.6.0.ebuild
+++ b/dev-python/pbr/pbr-1.6.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~mips ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="
diff --git a/dev-python/pbr/pbr-1.7.0.ebuild b/dev-python/pbr/pbr-1.7.0.ebuild
index f42181a..4949503 100644
--- a/dev-python/pbr/pbr-1.7.0.ebuild
+++ b/dev-python/pbr/pbr-1.7.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="
diff --git a/dev-python/pbr/pbr-1.8.0.ebuild b/dev-python/pbr/pbr-1.8.0.ebuild
index 51f3e2a..08b368d 100644
--- a/dev-python/pbr/pbr-1.8.0.ebuild
+++ b/dev-python/pbr/pbr-1.8.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
diff --git a/dev-python/pbr/pbr-1.8.1-r1.ebuild b/dev-python/pbr/pbr-1.8.1-r1.ebuild
new file mode 100644
index 0000000..72d3896
--- /dev/null
+++ b/dev-python/pbr/pbr-1.8.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.2[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+PDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
+
+# This normally actually belongs here.
+python_prepare_all() {
+ # This test passes when run within the source and doesn't represent a failure, but rather
+ # a gentoo sandbox constraint
+ # Rm tests that rely upon the package being already installed and fail
+ sed -e s':test_console_script_develop:_&:' \
+ -e s':test_console_script_install:_&:' \
+ -e s':test_sdist_extra_files:_&:' \
+ -e s':test_command_hooks:_&:' \
+ -e s':test_sdist_git_extra_files:_&:' \
+ -i pbr/tests/test_core.py || die
+ sed -e s':test_command_hooks:_&:' \
+ -e s':test_global_setup_hooks:_&:' \
+ -i pbr/tests/test_hooks.py || die
+ einfo "rogue tests disabled"
+ sed -i '/^hacking/d' test-requirements.txt || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ distutils_install_for_testing
+
+ rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+ testr init || die "testr init failed under ${EPYTHON}"
+ testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/pbr/pbr-1.8.1.ebuild b/dev-python/pbr/pbr-1.8.1.ebuild
new file mode 100644
index 0000000..3dab5b2
--- /dev/null
+++ b/dev-python/pbr/pbr-1.8.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.2[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+PDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
+
+# This normally actually belongs here.
+python_prepare_all() {
+ # This test passes when run within the source and doesn't represent a failure, but rather
+ # a gentoo sandbox constraint
+ # Rm tests that rely upon the package being already installed and fail
+ sed -e s':test_console_script_develop:_&:' \
+ -e s':test_console_script_install:_&:' \
+ -e s':test_sdist_extra_files:_&:' \
+ -e s':test_command_hooks:_&:' \
+ -e s':test_sdist_git_extra_files:_&:' \
+ -i pbr/tests/test_core.py || die
+ sed -e s':test_command_hooks:_&:' \
+ -e s':test_global_setup_hooks:_&:' \
+ -i pbr/tests/test_hooks.py || die
+ einfo "rogue tests disabled"
+ sed -i '/^hacking/d' test-requirements.txt || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ distutils_install_for_testing
+
+ rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+ testr init || die "testr init failed under ${EPYTHON}"
+ testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 8e1f71c..a8e98a9 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,3 +1,2 @@
-DIST pexpect-2.4.tar.gz 113251 SHA256 43c788f59dcf4bed677fd0b16891787dbf747e210ffedb6e90156fbbbd4d3b7b SHA512 0d5db34f3dc0e1a5bf7d8d0ab584897e4142592f35765762e4ca60d112106b91485098c91ad95a3cb3ad1f3d600619fa0ad41d930085e75974d78e0f06280a9f WHIRLPOOL 587a94b785645a950a643bff7bf972af285faea9dcf73064eb40e96d7cb29e87543bb14c65cdc2366573236ec56cc03c4076bc952899e567872628ff5c4d9785
-DIST pexpect-3.0.tar.gz 146662 SHA256 1d6cee0fa5ab212f9ddac9852bab0df5fff11a173ed1bfde9346d5c8aa42d14c SHA512 f84cbc843978baf0ab05bae63dd080d4ca14e8fd51de4e53cf33ddb6219c9e460f68861e44104a59ddb2c1b9dc8568bc87ee778ea52b10e18e365b771ca9aa63 WHIRLPOOL e2def4eb61007d5cbb5370daa82672f6063bf87a2a238237720652f85051bb72383b4d808c8a7148063fafe020ce1253a83f97237594b52a75f8a49689e38171
DIST pexpect-3.3.tar.gz 132330 SHA256 dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba SHA512 66cc501f1c7bb8ba0be4cdc0db840629f51416dc54ae44dc770adb38f1a385116b0a8b9bc7f1cc1447f05ede36ef1b519f5c4e710e6cb736c923ecfc87497cfa WHIRLPOOL e708e722d4e2598958f8d724b84148608e9a53041077b1a1a2af84d5281e11f0c6c050ee88489eebc48bd5556c22e0fe9386680d34b1941ddf21539296629513
+DIST pexpect-4.0.1.tar.gz 143657 SHA256 232795ebcaaf2e120396dbbaa3a129eda51757eeaae1911558f4ef8ee414fc6c SHA512 c2476f977964379faa3ecef1bc4800f3a87bd6cdd9e2d52e4e4f33a4060a97bb54f0770dfb5804d5a863eaf6ddef6b11be1d24f1617cc4837015202868ca7e87 WHIRLPOOL 91bc9e259f547b34d6a8847f3154601487e5f4d0ce1d7698078eb653fc12209c4d708f902e00cfb483f3872ce42063d65d8900dcaf9c727421f5e8b3d730e076
diff --git a/dev-python/pexpect/metadata.xml b/dev-python/pexpect/metadata.xml
index b4c5048..4342ade 100644
--- a/dev-python/pexpect/metadata.xml
+++ b/dev-python/pexpect/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/pexpect/pexpect-2.4-r1.ebuild b/dev-python/pexpect/pexpect-2.4-r1.ebuild
deleted file mode 100644
index 3af1044..0000000
--- a/dev-python/pexpect/pexpect-2.4-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
-HOMEPAGE="http://pexpect.sourceforge.net/ https://pypi.python.org/pypi/pexpect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pexpect/pexpect-2.4.ebuild b/dev-python/pexpect/pexpect-2.4.ebuild
deleted file mode 100644
index ca9e593..0000000
--- a/dev-python/pexpect/pexpect-2.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2"
-
-inherit distutils
-
-DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
-HOMEPAGE="http://pexpect.sourceforge.net/ https://pypi.python.org/pypi/pexpect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_MODNAME="ANSI.py fdpexpect.py FSM.py pexpect.py pxssh.py screen.py"
-
-src_install() {
- distutils_src_install
-
- use doc && dohtml -r doc/*
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/dev-python/pexpect/pexpect-3.0.ebuild b/dev-python/pexpect/pexpect-3.0.ebuild
deleted file mode 100644
index 49e06cd..0000000
--- a/dev-python/pexpect/pexpect-3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
-HOMEPAGE="http://pexpect.sourceforge.net/ https://pypi.python.org/pypi/pexpect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/_build/html/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pexpect/pexpect-4.0.1-r1.ebuild b/dev-python/pexpect/pexpect-4.0.1-r1.ebuild
new file mode 100644
index 0000000..8071929
--- /dev/null
+++ b/dev-python/pexpect/pexpect-4.0.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
+HOMEPAGE="
+ http://pexpect.sourceforge.net/
+ https://pypi.python.org/pypi/pexpect/
+ https://github.com/pexpect/pexpect/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
+DEPEND="
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # tests failing
+ # https://github.com/pexpect/pexpect/issues/282
+ # https://github.com/pexpect/pexpect/issues/283
+ # https://github.com/pexpect/pexpect/issues/284
+ rm tests/test_maxcanon.py tests/test_async.py || die
+ touch .coveragerc || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ py.test tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pexpect/pexpect-4.0.1.ebuild b/dev-python/pexpect/pexpect-4.0.1.ebuild
new file mode 100644
index 0000000..33a9571
--- /dev/null
+++ b/dev-python/pexpect/pexpect-4.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
+HOMEPAGE="
+ http://pexpect.sourceforge.net/
+ https://pypi.python.org/pypi/pexpect/
+ https://github.com/pexpect/pexpect/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
+DEPEND="
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # tests failing
+ # https://github.com/pexpect/pexpect/issues/282
+ # https://github.com/pexpect/pexpect/issues/283
+ # https://github.com/pexpect/pexpect/issues/284
+ rm tests/test_maxcanon.py tests/test_async.py || die
+ touch .coveragerc || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ py.test tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pillow/pillow-3.0.0.ebuild b/dev-python/pillow/pillow-3.0.0.ebuild
index 511398d..eca59cf 100644
--- a/dev-python/pillow/pillow-3.0.0.ebuild
+++ b/dev-python/pillow/pillow-3.0.0.ebuild
@@ -66,6 +66,11 @@
sed -i -e 's:feature.jpeg2000 =:& None #:' setup.py || die
fi
+ sed \
+ -e "/required/s:=.*:= set():g" \
+ -e "/if feature in/s:'jpeg', 'libz'::g" \
+ -i setup.py || die
+
distutils-r1_python_prepare_all
}
diff --git a/dev-python/pip/pip-7.1.2-r1.ebuild b/dev-python/pip/pip-7.1.2-r1.ebuild
new file mode 100644
index 0000000..cfdac50
--- /dev/null
+++ b/dev-python/pip/pip-7.1.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.com/pypa/pip/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+# Check pip/_vendor/vendor.txt for this
+VENDOR_DEPEND="
+ >=dev-python/distlib-0.2.1[${PYTHON_USEDEP}]
+ >=dev-python/html5lib-0.999999[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9[${PYTHON_USEDEP}]
+ >=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+ >=dev-python/CacheControl-0.11.5[${PYTHON_USEDEP}]
+ >=dev-python/lockfile-0.10.2[${PYTHON_USEDEP}]
+ >=dev-python/progress-1.2[${PYTHON_USEDEP}]
+ >=dev-python/ipaddress-1.0.14[${PYTHON_USEDEP}]
+ >=dev-python/packaging-15.3[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+"
+RDEPEND="${VENDOR_DEPEND}
+ >=dev-python/setuptools-18.2[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+# required test data isn't bundled with the tarball
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch
+ "${FILESDIR}"/${P}-unbundle.patch
+ )
+
+python_prepare_all() {
+ mv pip/_vendor/__init__.py "${T}" || die
+ rm -r pip/_vendor/* || die
+ mv "${T}"/__init__.py pip/_vendor/__init__.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ local DOCS=( AUTHORS.txt docs/*.rst )
+ distutils-r1_python_install_all
+
+ COMPLETION="${T}"/completion.tmp
+
+ ${EPYTHON} pip/__init__.py completion --bash > "${COMPLETION}" || die
+ newbashcomp "${COMPLETION}" ${PN}
+
+ ${EPYTHON} pip/__init__.py completion --zsh > "${COMPLETION}" || die
+ insinto /usr/share/zsh/site-functions
+ newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pip/pip-7.1.2.ebuild b/dev-python/pip/pip-7.1.2.ebuild
index bff3c34..524cdda 100644
--- a/dev-python/pip/pip-7.1.2.ebuild
+++ b/dev-python/pip/pip-7.1.2.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
# Check pip/_vendor/vendor.txt for this
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index 164ee42..5543d78 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -1,2 +1,3 @@
DIST ply-3.4.tar.gz 138342 SHA256 af435f11b7bdd69da5ffbc3fecb8d70a7073ec952e101764c88720cdefb2546b SHA512 6f6ee528393ff83eff2530ca468caf12e4c89b817a38302738597f1478dd41758036c8f32f88f60d1a26e70d9cfceab5530ddcfd3f058c1ee722be95c27e6bcc WHIRLPOOL f2f58e2d0c1170d35554999ca643c102d6821a7535b5782ee7317a4100cf56b5648d643c274cefd66a7b484ae3a9e952bcf4b98d50e7fd1ff220853f982a2f4c
DIST ply-3.6.tar.gz 281690 SHA256 61367b9eb2f4b819f69ea116750305270f1df8859992c9e356d6a851f25a4b47 SHA512 1a408d7cd4cdc9d747154623672e6baaf37ad2190cb9d6d6a7c1e1cc3cb40f15547734441b8fc99ecd67d7804d767576bdf0ed219cc669bf3d0df37498c55c55 WHIRLPOOL 2868a0046519750a446b683a85966650407afc1ea32ab6d8209b46b280529ca6aa8c47816782020b4c90f6f92d4733dd07565b6518e20c7a036d743edc629496
+DIST ply-3.8.tar.gz 157286 SHA256 e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8 SHA512 2c8cf0ee49ca6dec9ec8d5146e98885e871c26125fb5764988fbefae984ee94b4240f265762aaab26d6ec24989b35a4fd6905c3c0d14aac8a085e89b7d6159ef WHIRLPOOL f4258065a479033d2100c2fe9f725a8fbdfb278dabc71a6aa27d7846352dc11496cf34596a0ca0669ce72238702978f1c8a587313410218aa014b80bc98dec37
diff --git a/dev-python/ply/metadata.xml b/dev-python/ply/metadata.xml
index 57a9a95..d643b33 100644
--- a/dev-python/ply/metadata.xml
+++ b/dev-python/ply/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>python</herd>
-<longdescription>
+ <herd>python</herd>
+ <longdescription>
PLY is a Python-only implementation of the popular compiler construction
tools lex and yacc. The implementation borrows ideas from a number of
previous efforts; most notably John Aycock's SPARK toolkit. However,
@@ -11,8 +11,8 @@
that it provides extensive input validation and error reporting--much
more so than other Python parsing tools.
</longdescription>
-<longdescription lang="ja">
+ <longdescription lang="ja">
PLYはLexとYaccの有名なコンパイラ・コンストラクション・ツールのPython言語実装です
-。この実装は以前の試みから幾つものアイディアを借りています。そのほとんどがJohn AycockのSPARKツールキットからです。しかしながら、実装の全体像はC言語によるLexとYaccにより近いモデルです。PLYの他の重要点は幅広い入力バリデーションとエラー報告を>提供する点です。 -- その二点は他のPython言語パーサーより優れています。
+。この実装は以前の試みから幾つものアイディアを借りています。そのほとんどがJohn AycockのSPARKツールキットからです。しかしながら、実装の全体像はC言語によるLexとYaccにより近いモデルです。PLYの他の重要点は幅広い入力バリデーションとエラー報告を>提供する点です。 -- その二点は他のPython言語パーサーより優れています。
</longdescription>
</pkgmetadata>
diff --git a/dev-python/ply/ply-3.8-r1.ebuild b/dev-python/ply/ply-3.8-r1.ebuild
new file mode 100644
index 0000000..d32b5aa
--- /dev/null
+++ b/dev-python/ply/ply-3.8-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Lex-Yacc library"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# See bug #458648 for reference
+RESTRICT="test"
+
+DOCS=( ANNOUNCE CHANGES TODO )
+
+PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
+
+python_test() {
+ cp -r -l test "${BUILD_DIR}"/ || die
+ cd "${BUILD_DIR}"/test || die
+
+ local t
+ for t in testlex.py testyacc.py; do
+ "${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
+ done
+}
+
+python_install_all() {
+ local HTML_DOCS=( doc/. )
+ use examples && local EXAMPLES=( example/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/ply/ply-3.8.ebuild b/dev-python/ply/ply-3.8.ebuild
new file mode 100644
index 0000000..1e5e55f
--- /dev/null
+++ b/dev-python/ply/ply-3.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Lex-Yacc library"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# See bug #458648 for reference
+RESTRICT="test"
+
+DOCS=( ANNOUNCE CHANGES TODO )
+
+PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
+
+python_test() {
+ cp -r -l test "${BUILD_DIR}"/ || die
+ cd "${BUILD_DIR}"/test || die
+
+ local t
+ for t in testlex.py testyacc.py; do
+ "${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
+ done
+}
+
+python_install_all() {
+ local HTML_DOCS=( doc/. )
+ use examples && local EXAMPLES=( example/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pretend/pretend-1.0.8-r1.ebuild b/dev-python/pretend/pretend-1.0.8-r1.ebuild
new file mode 100644
index 0000000..fa1f8d0
--- /dev/null
+++ b/dev-python/pretend/pretend-1.0.8-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for stubbing in Python"
+HOMEPAGE="https://github.com/alex/pretend/ https://pypi.python.org/pypi/pretend/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/progress/progress-1.2-r1.ebuild b/dev-python/progress/progress-1.2-r1.ebuild
new file mode 100644
index 0000000..ac4092c
--- /dev/null
+++ b/dev-python/progress/progress-1.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Easy to use progress bars"
+HOMEPAGE="https://pypi.python.org/pypi/progress https://github.com/verigak/progress/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="ISC"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Not bundled
+RESTRICT="test"
+
+python_test() {
+ "${PYTHON}" test_progress.py || die
+}
diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild
index 0bb4b47..58659f4 100644
--- a/dev-python/progress/progress-1.2.ebuild
+++ b/dev-python/progress/progress-1.2.ebuild
@@ -14,7 +14,7 @@
SLOT="0"
LICENSE="ISC"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/ptyprocess/ptyprocess-0.5-r1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5-r1.ebuild
new file mode 100644
index 0000000..1c1b3c9
--- /dev/null
+++ b/dev-python/ptyprocess/ptyprocess-0.5-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Run a subprocess in a pseudo terminal"
+HOMEPAGE="https://github.com/pexpect/ptyprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+ py.test --verbose --verbose || die
+}
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.ebuild
index 8a98664..1a1280e 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
inherit distutils-r1
@@ -14,7 +14,7 @@
LICENSE="ISC"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild b/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild
index ef80909..5b93a72 100644
--- a/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild
+++ b/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild
@@ -13,7 +13,7 @@
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
IUSE=""
RDEPEND="!dev-python/bcrypt"
diff --git a/dev-python/py/py-1.4.30-r1.ebuild b/dev-python/py/py-1.4.30-r1.ebuild
new file mode 100644
index 0000000..a4de0a1
--- /dev/null
+++ b/dev-python/py/py-1.4.30-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ # 1 failure, test_comments, under both pypy only.
+ # Also appears the home repo has no issue tracker.
+ [[ "${EPYTHON}" == pypy ]] && return
+ py.test || die "testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pyasn1-modules/metadata.xml b/dev-python/pyasn1-modules/metadata.xml
index f95ded4..a9d9baa 100644
--- a/dev-python/pyasn1-modules/metadata.xml
+++ b/dev-python/pyasn1-modules/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8-r1.ebuild
new file mode 100644
index 0000000..a34c654
--- /dev/null
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="pyasn1 modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ echoit() { echo "$@"; "$@"; }
+ local exit_status=0 test
+ for test in test/*.sh; do
+ PATH="${S}/tools:${PATH}" \
+ echoit sh "${test}" || exit_status=1
+ done
+ return ${exit_status}
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ insinto /usr/share/${P}
+ doins -r tools
+}
diff --git a/dev-python/pyasn1/metadata.xml b/dev-python/pyasn1/metadata.xml
index fb9d923..96fdefb 100644
--- a/dev-python/pyasn1/metadata.xml
+++ b/dev-python/pyasn1/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/pyasn1/pyasn1-0.1.9-r1.ebuild b/dev-python/pyasn1/pyasn1-0.1.9-r1.ebuild
new file mode 100644
index 0000000..671c341
--- /dev/null
+++ b/dev-python/pyasn1/pyasn1-0.1.9-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ASN.1 library for Python"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ "${PYTHON}" test/suite.py || die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+ local HTML_DOCS=( doc/pyasn1-tutorial.html )
+ use doc && HTML_DOCS=( doc/. )
+
+ distutils-r1_src_install
+}
diff --git a/dev-python/pyatspi/pyatspi-2.16.0.ebuild b/dev-python/pyatspi/pyatspi-2.16.0.ebuild
index 12f5955..db1853a 100644
--- a/dev-python/pyatspi/pyatspi-2.16.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.16.0.ebuild
@@ -14,7 +14,7 @@
# Note: only some of the tests are GPL-licensed, everything else is LGPL
LICENSE="LGPL-2 GPL-2+"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86"
IUSE="" # test
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pycadf/Manifest b/dev-python/pycadf/Manifest
index d2b6570..4c6cecf 100644
--- a/dev-python/pycadf/Manifest
+++ b/dev-python/pycadf/Manifest
@@ -1,3 +1,4 @@
DIST pycadf-0.6.0.tar.gz 277434 SHA256 9ba1e9ac52ee2a2d6d9cc89847323559cc2ffe7b4d80b703944a0a1f75c7093f SHA512 97e223296e5cf77bbc2f7f8b2caba70f76d418ccd476bbc07462dac2c01399f920ae7801f1e30ef91ac6dbfe340b8b45dff2426bf457c1239f54293dbadeef61 WHIRLPOOL 96644ae4b82352cd0a296f3a9adf161b8500d043d8d2bce239c23473a53e1a2feb43f60d92c67bf1543b3b101bbf722bf9104b2c6b16fa7240b94e86cc6a2aa1
DIST pycadf-0.8.0.tar.gz 255774 SHA256 240d7775682a0f49fb580310dd6459e8a8b5f5619dfdc687f043c3fe21b48ba1 SHA512 3b8446c33f0bf740b0f2384bb9e4c5ab5d960690e50bd52cf2217eb184f9f8061dfe39da9b21ef275a7c66ba4e35b912bfd9476469b28c3c2cd6f33d912ac6f7 WHIRLPOOL bf28052eee894a1a986c1903f44f2f800f096979188a6b0ff502b7316d38ce7c43197405e635da097de038e24c1d870140a4ddd1c0eaa543841b3073055f1c19
DIST pycadf-1.0.0.tar.gz 247178 SHA256 8278865dba0c6d7d2c83f51629c0f215393e8cbc36719c845b591f40dd80609f SHA512 7f7a4bb1d89ee3a63c9c74980995864b6e80a4e7df2111b4bafb42ba977ab2b86aac5e288d930068789cae9cabee13300ede7ae3c520440cc5fdfdac057085c0 WHIRLPOOL 68eab74a8e7a727d178dfdaa7cef27d0a41538540c450446a768775de61854eb82ca070792e694bad422ccacfae894b73226ab9224d82f742fdcd037ebd2c725
+DIST pycadf-1.1.0.tar.gz 248161 SHA256 af114ba08d535ad9600e961c1048e1c7214c669a7ee3611f46ea06b917b46953 SHA512 f3215fda9c76422ffdaa65d11c65c3835562539f61f02c91e167433c8e65a55b81290792ae827a8b4e7c497878322b802e42c666658a3cf11682e2a72002c8cf WHIRLPOOL d75adc656d344a667ff1b5d3063f300be8fe57d9e5fd32b86bfa242d132e3ee587f72aa4d1eb104c468c71005e3b9825581c145dc7c8b64b7c701274016004da
diff --git a/dev-python/pycadf/pycadf-1.1.0.ebuild b/dev-python/pycadf/pycadf-1.1.0.ebuild
new file mode 100644
index 0000000..bee046c
--- /dev/null
+++ b/dev-python/pycadf/pycadf-1.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
+HOMEPAGE="https://pypi.python.org/pypi/pycadf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/pbr[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ )
+ doc? (
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ )"
+# !=1.2.0 of sphinx deleted since it is not in portage anyway
+RDEPEND="
+ >=dev-python/oslo-config-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+ testr init || die "testr init failed under ${EPYTHON}"
+ testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pycparser/pycparser-2.14-r1.ebuild b/dev-python/pycparser/pycparser-2.14-r1.ebuild
new file mode 100644
index 0000000..d479b06
--- /dev/null
+++ b/dev-python/pycparser/pycparser-2.14-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="C parser and AST generator written in Python"
+HOMEPAGE="https://github.com/eliben/pycparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_compile() {
+ distutils-r1_python_compile
+ pushd "${BUILD_DIR}/lib/pycparser" > /dev/null || die
+ "${PYTHON}" _build_tables.py || die
+ popd > /dev/null || die
+}
+
+python_test() {
+ nosetests || die
+}
diff --git a/dev-python/pycuda/pycuda-2012.1.ebuild b/dev-python/pycuda/pycuda-2012.1.ebuild
index 17edba4..d0511b0 100644
--- a/dev-python/pycuda/pycuda-2012.1.ebuild
+++ b/dev-python/pycuda/pycuda-2012.1.ebuild
@@ -52,7 +52,7 @@
local myopts=()
use opengl && myopts+=( --cuda-enable-gl )
- mkdir "${BUILD_DIR}" || die
+ mkdir "${BUILD_DIR}" || die
cd "${BUILD_DIR}" || die
[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
"${EPYTHON}" "${S}"/configure.py \
diff --git a/dev-python/pycuda/pycuda-2013.1.1.ebuild b/dev-python/pycuda/pycuda-2013.1.1.ebuild
index 6f04a04..0066748 100644
--- a/dev-python/pycuda/pycuda-2013.1.1.ebuild
+++ b/dev-python/pycuda/pycuda-2013.1.1.ebuild
@@ -52,7 +52,7 @@
local myopts=()
use opengl && myopts+=( --cuda-enable-gl )
- mkdir "${BUILD_DIR}" || die
+ mkdir "${BUILD_DIR}" || die
cd "${BUILD_DIR}" || die
[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
"${EPYTHON}" "${S}"/configure.py \
diff --git a/dev-python/pycuda/pycuda-2014.1.ebuild b/dev-python/pycuda/pycuda-2014.1.ebuild
index 5c547e8..bfb7af9 100644
--- a/dev-python/pycuda/pycuda-2014.1.ebuild
+++ b/dev-python/pycuda/pycuda-2014.1.ebuild
@@ -52,7 +52,7 @@
local myopts=()
use opengl && myopts+=( --cuda-enable-gl )
- mkdir "${BUILD_DIR}" || die
+ mkdir "${BUILD_DIR}" || die
cd "${BUILD_DIR}" || die
[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
"${EPYTHON}" "${S}"/configure.py \
diff --git a/dev-python/pycuda/pycuda-9999.ebuild b/dev-python/pycuda/pycuda-9999.ebuild
index f799fce..b0a1697 100644
--- a/dev-python/pycuda/pycuda-9999.ebuild
+++ b/dev-python/pycuda/pycuda-9999.ebuild
@@ -53,7 +53,7 @@
local myopts=()
use opengl && myopts+=( --cuda-enable-gl )
- mkdir "${BUILD_DIR}" || die
+ mkdir "${BUILD_DIR}" || die
cd "${BUILD_DIR}" || die
[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
"${EPYTHON}" "${S}"/configure.py \
diff --git a/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild b/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild
new file mode 100644
index 0000000..a4c4b72
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+# The selftests fail with pypy, and urlgrabber segfaults for me.
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl"
+SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+RDEPEND=">=net-misc/curl-7.25.0-r1[ssl=]
+ ssl? (
+ net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
+ curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )"
+
+# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
+# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
+ )"
+# Needed for individual runs of testsuite by python impls.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+ sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ # Override faulty detection in setup.py, bug 510974.
+ export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
+}
+
+python_compile() {
+ python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ distutils-r1_python_compile
+}
+
+python_test() {
+ emake -j1 do-test
+}
+
+python_install_all() {
+ local HTML_DOCS=( doc/. )
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 0e400e2..a058caa 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,3 +1 @@
-DIST pyftpdlib-1.0.1.tar.gz 116428 SHA256 bec5c2af5942c3970d53b1a9fa27286eba40c2089e3e0ef653ff6f5ed0c4865b SHA512 478f04cb156a6178f03aee40190f17b65e42f04c60311936bf068d11f9ffbd8ae9a118fea456386ccf5184e3fed6270b40b4dfec6523902e310f78ec73785be8 WHIRLPOOL 71b34ef1031b402b2be0d7aac64f796820a20e022fc71fb451777cc4dc50b28ba48dca20608958cd670d90a9baf839c8e4933ddb63b0484fff425faaa5e5e3b1
-DIST pyftpdlib-1.3.0.tar.gz 120206 SHA256 5dec22e691bd75ee0097f2e623df6c7b81a7cc373118f1550a16079dbddc701f SHA512 eacd617aa136c2a9a8836d25c632f30fbc9ad14650d34e0a8f6562c1a5af8e2e3ae0592d7f5456b88818142d63a08c140e75ce2e0a73811c29a7dd5e08700b87 WHIRLPOOL e4ee34587e60f9a41b5332a62a5e4d4914822ffa1bd4cc700ebb03a31fdca50ffa15a55d6d5afb73177d20bbbb30123ca6756629eef936d6bbb8a5d959535d74
DIST pyftpdlib-1.4.0.tar.gz 116280 SHA256 5fdd1492efe478f4c354f7d65d9308359751c8fb1d0376466b74a76721c5fcf3 SHA512 61cf28d72a3a99bdc9bddcf434275e4edaeff60bf6481c1e854d81a4ea23ae97b73c8da9d0629a705a003ae8a941c529f9b9ed7cfa25759bd5cd6517f9958ff9 WHIRLPOOL 676f58061e07aa8a9dcce9c7076962875866cebca8eacdd624053cab32de3a7bdb0b17337105839b6c997bf2b4263e759c962362930afddaedc1e9a151b855fa
diff --git a/dev-python/pyftpdlib/files/pyftpdlib-1-pypy-test.patch b/dev-python/pyftpdlib/files/pyftpdlib-1-pypy-test.patch
deleted file mode 100644
index e1b3055..0000000
--- a/dev-python/pyftpdlib/files/pyftpdlib-1-pypy-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur pyftpdlib-1.0.1.orig/test/test_ftpd.py pyftpdlib-1.0.1/test/test_ftpd.py
---- test/test_ftpd.py 2013-02-23 03:07:13.000000000 +0800
-+++ test/test_ftpd.py 2013-03-13 23:05:48.392965468 +0800
-@@ -33,7 +33,7 @@
- import threading
- import unittest
- import socket
--import os
-+import os, sys
- import shutil
- import time
- import re
-@@ -1358,6 +1358,7 @@
- self.assertEqual(getmode(), '0555')
-
-
-+@unittest.skipIf(hasattr(sys, 'pypy_version_info'), "temp. disabling of pypy")
- class TestFtpStoreData(TestCase):
- """Test STOR, STOU, APPE, REST, TYPE."""
- server_class = FTPd
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
deleted file mode 100644
index 1ecfe3f..0000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="ssl(+)"
-# pypy has no spwd.so
-
-inherit distutils-r1
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://code.google.com/p/pyftpdlib/ https://pypi.python.org/pypi/pyftpdlib"
-SRC_URI="https://pyftpdlib.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="examples ssl"
-
-DEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-DOCS="CREDITS HISTORY"
-
-#PATCHES=( "${FILESDIR}"/${PN}-1-pypy-test.patch )
-
-python_test() {
- cd "${BUILD_DIR}" || die
- for test in "${S}"/test/test_*.py; do
- "${PYTHON}" "${test}" || die "Testing failed with ${EPYTHON}"
- done
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r demo test
- fi
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.3.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.3.0.ebuild
deleted file mode 100644
index bae34f1..0000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://code.google.com/p/pyftpdlib/ https://pypi.python.org/pypi/pyftpdlib"
-SRC_URI="https://pyftpdlib.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="examples ssl"
-
-DEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-# Usual; requ'd for a sane testsuite run
-DISTUTILS_NO_PARALLEL_BUILD=1
-
-python_prepare_all() {
- # https://code.google.com/p/pyftpdlib/issues/detail?id=292&thanks=292&ts=1400308829
- # Disable failing test
- sed -e 's:test_on_incomplete_file_received:_&:' -i test/test_ftpd.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- "${PYTHON}" test/test_ftpd.py || die
-}
-
-python_install_all() {
- use examples && local EXAMPLES=( demo/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.4.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.4.0.ebuild
index eac8e30..d6cff0b 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.4.0.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.4.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="examples ssl"
DEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pygments/pygments-2.0.2-r1.ebuild b/dev-python/pygments/pygments-2.0.2-r1.ebuild
new file mode 100644
index 0000000..33077c7
--- /dev/null
+++ b/dev-python/pygments/pygments-2.0.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 bash-completion-r1 vcs-snapshot
+
+MY_PN="Pygments"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ virtual/ttf-fonts )"
+# dev-texlive/texlive-latexrecommended
+# Removing / commenting out this dep. I can find no mention of it in tests other than
+# importing pygment's own tex module. If it's there and I missed it just uncomment and re-add
+# Tests pass without it
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ cp -r -l tests "${BUILD_DIR}"/ || die
+ # With pypy3 there is 1 error out of 1556 tests when run as is and
+ # (SKIP=8, errors=1, failures=1) when run with 2to3; meh
+ nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+ newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pygobject/pygobject-3.16.2.ebuild b/dev-python/pygobject/pygobject-3.16.2.ebuild
index f25eb08..bce88e8 100644
--- a/dev-python/pygobject/pygobject-3.16.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.16.2.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2.1+"
SLOT="3"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cairo examples test +threads"
REQUIRED_USE="
diff --git a/dev-python/pyldap/pyldap-2.4.20-r1.ebuild b/dev-python/pyldap/pyldap-2.4.20-r1.ebuild
new file mode 100644
index 0000000..55a781d
--- /dev/null
+++ b/dev-python/pyldap/pyldap-2.4.20-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="https://pypi.python.org/pypi/pyldap https://github.com/pyldap/pyldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+IUSE="doc examples sasl ssl"
+
+# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
+# python team: Please do not remove python-ldap-2.3.9 from the tree.
+# OpenSSL is an optional runtime dep.
+# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
+RDEPEND="
+ >net-nds/openldap-2.4.11
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/python-ldap"
+
+python_prepare_all() {
+ sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
+ -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+ -i setup.cfg || die "error fixing setup.cfg"
+
+ local mylibs="ldap"
+ if use sasl; then
+ use ssl && mylibs="ldap_r"
+ mylibs="${mylibs} sasl2"
+ else
+ sed -e 's/HAVE_SASL//g' -i setup.cfg || die
+ fi
+ use ssl && mylibs="${mylibs} ssl crypto"
+ use elibc_glibc && mylibs="${mylibs} resolv"
+
+ sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
+ -i setup.cfg || die "error setting up libs in setup.cfg"
+
+ # set test expected to fail to expectedFailure
+ sed -e "s:^ def test_bad_urls: @unittest.expectedFailure\n def test_bad_urls:" \
+ -i Tests/t_ldapurl.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C Doc html
+}
+
+python_test() {
+ # XXX: the tests supposedly can start local slapd
+ # but it requires some manual config, it seems.
+
+ "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( Demo/. )
+ use doc && local HTML_DOCS=( Doc/.build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pyldap/pyldap-2.4.20.ebuild b/dev-python/pyldap/pyldap-2.4.20.ebuild
deleted file mode 100644
index 1f121f3..0000000
--- a/dev-python/pyldap/pyldap-2.4.20.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="https://pypi.python.org/pypi/pyldap https://github.com/pyldap/pyldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
-IUSE="doc examples sasl ssl"
-
-# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
-# python team: Please do not remove python-ldap-2.3.9 from the tree.
-# OpenSSL is an optional runtime dep.
-# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
-RDEPEND="
- !dev-python/python-ldap[${PYTHON_USEDEP}]
- >net-nds/openldap-2.4.11
- dev-python/pyasn1[${PYTHON_USEDEP}]
- dev-python/pyasn1-modules[${PYTHON_USEDEP}]
- sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
- -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
- -i setup.cfg || die "error fixing setup.cfg"
-
- local mylibs="ldap"
- if use sasl; then
- use ssl && mylibs="ldap_r"
- mylibs="${mylibs} sasl2"
- else
- sed -e 's/HAVE_SASL//g' -i setup.cfg || die
- fi
- use ssl && mylibs="${mylibs} ssl crypto"
- use elibc_glibc && mylibs="${mylibs} resolv"
-
- sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
- -i setup.cfg || die "error setting up libs in setup.cfg"
-
- # set test expected to fail to expectedFailure
- sed -e "s:^ def test_bad_urls: @unittest.expectedFailure\n def test_bad_urls:" \
- -i Tests/t_ldapurl.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C Doc html
-}
-
-python_test() {
- # XXX: the tests supposedly can start local slapd
- # but it requires some manual config, it seems.
-
- "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use examples && local EXAMPLES=( Demo/. )
- use doc && local HTML_DOCS=( Doc/.build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index f2f31da..d15c924 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,4 +1,5 @@
DIST pymongo-2.6.3.tar.gz 324241 SHA256 cabe1d785ad5db6ed8ff70dcb9c987958fc75400f066ec78911ca3f37184a4e2 SHA512 6da3cbf035b52379c24df37b76e1eb743b12c1026116e28e4e7b6450e2674d730f9c8c2dd85f352c6ee4c9f604decaffc2dbc57fe64268bd7522d8ce155cca9e WHIRLPOOL ac36dd88c4311237ecda66a6008fa0d89d0670e331df6c49a08a1d3bc4ddcafe72e8e003009c206d3ac12afb1b14afe2d3615834a5a8df5ce30442f7b49fdbf2
DIST pymongo-2.7.2.tar.gz 381455 SHA256 8fb45e3edec006f4b11580fc579bec7781a8b3201ce0abf31593f086070e51f6 SHA512 0e78495462d670c168e716a7c34e05f6a11a203f0bf9b32c1488608343588a48cbbb76ce715411b310359de19d9cd57c75f80ac7d8195a122a760cec22e8d0c7 WHIRLPOOL 6cb7eedc530908c2fdb17b6e31561d9c860d6fd1edddb4d66288c3fe11bc199ebc58538a70508b2540b827077f62345a86729644fdf8d37c1b9934de03e77543
DIST pymongo-2.8.1.tar.gz 399521 SHA256 300ea5762d059c07d1bb2578f35bd0e55bc31753951e2de3d6fe2ed54438e374 SHA512 8d02829eb8683572ffe8c1be5ee50a4c778e1a0b938820859be215b583e719d079183b1a26bc074fad7e31e8944756b82b146657ad528123514b59c725f6d7aa WHIRLPOOL b0c8c373771d3a4525ddf30db5903a6b1241aa1e160e688c215bef21395d598faa65f12e57ea8fe0f16d1c0eaa0abad02ebf3e0b9df2acb8e1c8e6ff9c20a214
+DIST pymongo-2.9.tar.gz 430741 SHA256 90e994cfe5928841960dabdca709e75ab4d0f44b288fd59742113982d96290c4 SHA512 c12701797643b41503829b6c7e573cfff7d8c63c56d9eb195f1a67dc3204cd7ed2a28ee2bd2ce34d0c68bade3f44c8bd5c069b15082bf3388c3a401a35424b1e WHIRLPOOL 699a7f658734837f40fe4190251f8e8bb69dba80bbc6dba60207bb18d5dfb43ec5d1c6aca8810b45e7914705305416d0f76face88fd0c43aa20c6d0765eff01c
DIST pymongo-3.0.3.tar.gz 419692 SHA256 3c6b2317f8031bc1e200fd1ea35f00a96f4569e3f3f220a5e66ab6227d96ccaf SHA512 7a20fdcae5b3f852bded19c95b36ef6a8141bce0179440a2c5966cbb9f18f3985b7b6b4584c5253c34d0f846d809d72ec0ae076c88472a3de6f090466e9132b4 WHIRLPOOL ae610909b610c7d116dd3aa7c04ab9ce357b25208b07c025924c53bb36183a6d344ecff214def6a01b929dc50d698464c8dd33b6eafd2d88d6666d8534858a38
diff --git a/dev-python/pymongo/pymongo-2.9.ebuild b/dev-python/pymongo/pymongo-2.9.ebuild
new file mode 100644
index 0000000..9dd9181
--- /dev/null
+++ b/dev-python/pymongo/pymongo-2.9.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit check-reqs distutils-r1
+
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc kerberos test"
+
+RDEPEND="
+ kerberos? ( dev-python/pykerberos )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-db/mongodb-2.6.0
+ )
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+reqcheck() {
+ if use test; then
+ # During the tests, database size reaches 1.5G.
+ local CHECKREQS_DISK_BUILD=1536M
+
+ check-reqs_${1}
+ fi
+}
+
+pkg_pretend() {
+ reqcheck pkg_pretend
+}
+
+pkg_setup() {
+ reqcheck pkg_setup
+}
+
+python_compile_all() {
+ if use doc; then
+ mkdir html || die
+ sphinx-build doc html || die
+ fi
+}
+
+src_test() {
+ # Yes, we need TCP/IP for that...
+ local DB_IP=127.0.0.1
+ local DB_PORT=27000
+
+ export DB_IP DB_PORT
+
+ # 1.5G of disk space per run.
+ local DISTUTILS_NO_PARALLEL_BUILD=1
+
+ distutils-r1_src_test
+}
+
+python_test() {
+ local dbpath=${TMPDIR}/mongo.db
+ local logpath=${TMPDIR}/mongod.log
+
+ # Now, the hard part: we need to find a free port for mongod.
+ # We're just trying to run it random port numbers and check the log
+ # for bind errors. It shall be noted that 'mongod --fork' does not
+ # return failure when it fails to bind.
+
+ mkdir -p "${dbpath}" || die
+ while true; do
+ ebegin "Trying to start mongod on port ${DB_PORT}"
+
+ LC_ALL=C \
+ mongod --dbpath "${dbpath}" --smallfiles --nojournal \
+ --bind_ip ${DB_IP} --port ${DB_PORT} \
+ --unixSocketPrefix "${TMPDIR}" \
+ --logpath "${logpath}" --fork \
+ && sleep 2
+
+ # Now we need to check if the server actually started...
+ if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+ # yay!
+ eend 0
+ break
+ elif grep -q 'Address already in use' "${logpath}"; then
+ # ay, someone took our port!
+ eend 1
+ : $(( DB_PORT += 1 ))
+ continue
+ else
+ eend 1
+ eerror "Unable to start mongod for tests. See the server log:"
+ eerror " ${logpath}"
+ die "Unable to start mongod for tests."
+ fi
+ done
+
+ local failed
+ #https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
+ pushd "${BUILD_DIR}"/../ > /dev/null
+ if [[ "${EPYTHON}" == python3* ]]; then
+ 2to3 --no-diffs -w test
+ fi
+ DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+ mongod --dbpath "${dbpath}" --shutdown
+
+ [[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+ rm -rf "${dbpath}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopenssl/metadata.xml b/dev-python/pyopenssl/metadata.xml
index 894e4e9..a50845d 100644
--- a/dev-python/pyopenssl/metadata.xml
+++ b/dev-python/pyopenssl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
new file mode 100644
index 0000000..6798618
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+ http://pyopenssl.sourceforge.net/
+ https://launchpad.net/pyopenssl
+ https://pypi.python.org/pypi/pyOpenSSL
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc examples"
+
+RDEPEND="
+ >=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-0.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+ # https://github.com/pyca/pyopenssl/issues/41
+ sed -e "s/test_digest/_&/" -i OpenSSL/test/test_crypto.py
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ esetup.py test
+
+ # https://bugs.launchpad.net/pyopenssl/+bug/1237953
+ rm -rf tmp* *.key *.pem || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild
index f9e19d9..51f0a60 100644
--- a/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI=5
+
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
inherit distutils-r1 flag-o-matic
@@ -11,7 +12,11 @@
MY_P=${MY_PN}-${PV}
DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="http://pyopenssl.sourceforge.net/ https://launchpad.net/pyopenssl https://pypi.python.org/pypi/pyOpenSSL"
+HOMEPAGE="
+ http://pyopenssl.sourceforge.net/
+ https://launchpad.net/pyopenssl
+ https://pypi.python.org/pypi/pyOpenSSL
+"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
@@ -42,7 +47,7 @@
esetup.py test
# https://bugs.launchpad.net/pyopenssl/+bug/1237953
- rm -rf tmp* *.key *.pem
+ rm -rf tmp* *.key *.pem || die
}
python_install_all() {
diff --git a/dev-python/pysnmp-apps/Manifest b/dev-python/pysnmp-apps/Manifest
index 2a983ad..324d60e 100644
--- a/dev-python/pysnmp-apps/Manifest
+++ b/dev-python/pysnmp-apps/Manifest
@@ -1,2 +1,2 @@
-DIST pysnmp-apps-0.3.2.tar.gz 23944 SHA256 d9908af7c7b7e286f0d457769fbfb071b6fdb2f46973f63de33de193046a6569 SHA512 142ea6b3467a8aa1ceb7f826b6629b1ef55285ee0144bf88f45fc3694a42b5ceadadebc27a73a19929d28fe9a69e4e84808b438c7861ba83f87a2a946a05dade WHIRLPOOL 4c867d977d027aeec55a26c0ee69b3df18ab650cdceeda15ed05d6c9295819883d472fffa6e50de8944a8a61afbf41d695b5630b411a9a3fc5a18c9cd3dbc281
DIST pysnmp-apps-0.3.4.tar.gz 24617 SHA256 c96c32d543c8f3866ee551962f0e1a0a8440e965bbcd8c1ed67c9a56cd17d18c SHA512 d384b7b77c5e5b684c00e77d0fc03498722dd1b9d61e876592489527d51f14140e360dc1f60a5a62d91d2fefef9bdae9c34ce9a205b4537c2278ac9d82a2c8d9 WHIRLPOOL edca9af1f891b2549edd3ee05c1441ff98f25c0aed00019c328adce0bc02a8fd844bdeab0f557936a0d555528eb379cda2a9f5f6dd1ec46cee3847522687dbb8
+DIST pysnmp-apps-0.4.0.tar.gz 25404 SHA256 c27934f37af2f32cc4817a7599af52f4c995f5f29a78334b8a8d29249a14f2c8 SHA512 990d25652c79da42f7b08c0c131957edc12eeb65c19d9e44955f7cfd70590a73d0d7148dcc76ddda6042b53a4b1375f11fbe9e488bd26161503f0863e6cb8fee WHIRLPOOL a250ee92162418d93a1e9f05b816bb23761aaea12cb3293c1648b352d58e1ec6ea5670565e69e71f0d0edca9a21e4470ef0e9254a08264c76a2d58d1ebbf9a83
diff --git a/dev-python/pysnmp-apps/metadata.xml b/dev-python/pysnmp-apps/metadata.xml
index c1fc8a2..2cf1edd 100644
--- a/dev-python/pysnmp-apps/metadata.xml
+++ b/dev-python/pysnmp-apps/metadata.xml
@@ -13,13 +13,13 @@
that it does not rely on any third party tool (it is not a wrapper!).
</longdescription>
<longdescription lang="ja">
-ãã㯠SNMP v.1/v.2 ã¨ã³ã¸ã³ã®Pythonè¨èªã§ã®å®è£
ã§ããé¢é£å¤ã«æ²¿ã£ãSNMPãªãã¸ã§
-ã¯ãIDãã/ã¸SNMPã¡ãã»ã¼ã¸ãã¢ã»ã³ãã«/ãã£ã¹ã¢ã»ã³ãã«ããã®ãä¸è¬çãªæ©è½ã§ã
-ãPySNMPã¯å¹¾ã¤ãã®TCP/IPãããã¯ã¼ãã³ã°ãç¹å®ãããã©ã³ã¹ãã¼ãã»ã¡ã½ãããæä¾
-ãã¾ãã
+これは SNMP v.1/v.2 エンジンのPython言語での実装です。関連値に沿ったSNMPオブジェ
+クトIDから/へSNMPメッセージをアセンブル/ディスアセンブルするのが一般的な機能です
+。PySNMPは幾つかのTCP/IPネットワーキングを特定するトランスポート・メソッドも提供
+します。
-PySNMPã¯å
¨ä½ãPythonè¨èªã§è¨è¿°ãããã©ã®ãµã¼ããã¼ãã£è£½ãã¼ã«ãä¿¡ç¨ããªãç«å ´ã§
-èªçµ¦èªè¶³ãã¾ãã(ããã¯ã©ããã¼ã»ãã¼ã«ã§ã¯ããã¾ããã)
+PySNMPは全体をPython言語で記述され、どのサードパーティ製ツールも信用しない立場で
+自給自足します。(これはラッパー・ツールではありません。)
</longdescription>
<upstream>
<remote-id type="pypi">pysnmp-apps</remote-id>
diff --git a/dev-python/pysnmp-apps/pysnmp-apps-0.3.2-r1.ebuild b/dev-python/pysnmp-apps/pysnmp-apps-0.3.2-r1.ebuild
deleted file mode 100644
index 70bc296..0000000
--- a/dev-python/pysnmp-apps/pysnmp-apps-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="PySNMP applications"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp-apps"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}]
- dev-python/pysnmp-mibs[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysnmp-apps/pysnmp-apps-0.4.0.ebuild b/dev-python/pysnmp-apps/pysnmp-apps-0.4.0.ebuild
new file mode 100644
index 0000000..6de1723
--- /dev/null
+++ b/dev-python/pysnmp-apps/pysnmp-apps-0.4.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="PySNMP applications"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp-apps"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}]
+ dev-python/pysnmp-mibs[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pysnmp-mibs/Manifest b/dev-python/pysnmp-mibs/Manifest
index cda2818..ff8c02b 100644
--- a/dev-python/pysnmp-mibs/Manifest
+++ b/dev-python/pysnmp-mibs/Manifest
@@ -1,2 +1,2 @@
-DIST pysnmp-mibs-0.1.3.tar.gz 1961708 SHA256 fa78171d63a91df29d18641516c02f5f9628fda35c2986a09a1a6fc9c9032753 SHA512 7879775f2b339f30db1bf0322c036deb7f97744630f6207efdafe6178d90e264cfa18398ed8628b07b53ed9d62ce8317a7ac8f109a4a57ee1a24d01ae32eaaf3 WHIRLPOOL a89b724d0fb36348616541f204a6a8b98207aab8c9ad557d6dff333002c39dbf369da996995f697f251d65428f10226551c4dcb5c2636cba55324b556f8c61b0
DIST pysnmp-mibs-0.1.4.tar.gz 1982745 SHA256 a499ef45d942f42ab9e922c7da93efa084a7ec490ba6cad576b64a7d573ec043 SHA512 12e285d1adb3d2f6d1f300b3ad56a5f9dcb359b840e51c4599cb3ed406cd5b34b189ec6eba94fc72e57703a3c374995b60176940eba0478f6cc2f8eb96fffaca WHIRLPOOL 3d7079397aa1312abc30bc75aba9aab46d1286cd95dc7bf8d5c8470a8ea75857004ee597ceb33c0bac2e9fe21f61cdf65c3911491651ab9ec693a687907ca6a0
+DIST pysnmp-mibs-0.1.5.tar.gz 2086656 SHA256 85db3b66eb686be46ccf82f77b5ff01520d49bafe459a479aeb15224a71216c5 SHA512 90c380e410f4099049fdf94e438a659d807890577e615f28587f50d76d403351322695a63bb716ff8273bde7c29c5b123c1adf6db1475ed331ca27ecec0b13a5 WHIRLPOOL f45972b2936e2455f1d0ef4b7ba081007cd1e080b0e0de84dce6b35dfb4796a47bfb7ffe874b468ce0155437b5267b8257fdfc50bacbca41422ecff816d47197
diff --git a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.3-r1.ebuild b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.3-r1.ebuild
deleted file mode 100644
index df6a847..0000000
--- a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="SNMP framework in Python - MIBs"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp-mibs"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.5.ebuild b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.5.ebuild
new file mode 100644
index 0000000..cd99a0b
--- /dev/null
+++ b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="SNMP framework in Python - MIBs"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp-mibs"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-python/pysnmp-4.2.3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 3c83956..803b9f3 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,3 +1,2 @@
-DIST pysnmp-3.4.4.tar.gz 91693 SHA256 e290758c17251435b5b8982cf96d3216da8f9f0ffd28beff1a5fd96efaa26bdf SHA512 7293722f11c44c4aebf25ca66be010150880b321ff1085a377f3233081a356084631b03a5c814b67feab48763622608837e9802b0256423b3bab3c8397427bb3 WHIRLPOOL 9db142ed1fd57144f5e4b20a8b3aace5a55b4f0cfef961d1b203e6f770fce8897c9458e26a22327e8a1bf5db8ca666b987feae8d1496077ebf86869de7ac4821
-DIST pysnmp-4.2.2.tar.gz 183998 SHA256 9402238abbaa24187544595d9ca37971b1e1ae0212d6307c60396290d32d6637 SHA512 6660212fdd92f0359ef8e45c71f4b6ee923a150e3dd051e1260386b9a9c11f000f489e0932b6919e21d85a280fbaa75125a418e126182c95c574539a44eb0d9b WHIRLPOOL 748a91b0251aa765576aa870a49e8c0e38729e00528a1e1a2fdc1d4baac2308b7fb42a0fbb05a8da993a64f29d49b0be0eb36fc91f79f7d3d9ab4911d0bc9318
DIST pysnmp-4.2.5.tar.gz 225014 SHA256 c46e65d99a604f690b3d5800e2f6e26e1ed9a3c7f7e17e7b4b4d897150f7077f SHA512 bf93d7dd7ca95ff8b272c90d0c7d4e528075c83d8d6d630ab50e392227188bd0abdd05ad98521d9c4c0a1891a0b448fb9e4411f8a1d6bc7a9c2f7bb132c0dca0 WHIRLPOOL 74724ca754a7f51d41d231e7c04a7dc027d167a293b2daf5e67b5a735ff92e0a57a44abee3355980e2d3b181aa31e8d10a205a151e44282878a1a3a4b31ac4d3
+DIST pysnmp-4.3.0.tar.gz 305695 SHA256 8baf97fb1c8bc4376e151d570b6b8358a0e93f002fae6d67ea78b0283bf64574 SHA512 6441c609d0720e517b51d5051318e89a9c5f82602ea23b003feaecf011c6e997873b45841edbe0fed869794ef473a264900c2e02135adfc70b165f80c97f885a WHIRLPOOL 93412136091643cf2f4ca1ec0de04231c6edd22aa7caf1124511773afbd8ccc9d3abc1c75475c16dc2a4a806274f50fc43eaff2c723ce19910e198d004e60a37
diff --git a/dev-python/pysnmp/pysnmp-3.4.4-r1.ebuild b/dev-python/pysnmp/pysnmp-3.4.4-r1.ebuild
deleted file mode 100644
index 518f21d..0000000
--- a/dev-python/pysnmp/pysnmp-3.4.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="SNMP framework in Python. Not a wrapper"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp"
-SRC_URI="mirror://sourceforge/pysnmp/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="CHANGES COMPATIBILITY README"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_install(){
- distutils-r1_src_install
-
- dohtml -r docs/
- insinto /usr/share/doc/${PF}
- doins -r examples
-}
diff --git a/dev-python/pysnmp/pysnmp-4.2.2-r1.ebuild b/dev-python/pysnmp/pysnmp-4.2.2-r1.ebuild
deleted file mode 100644
index e151589..0000000
--- a/dev-python/pysnmp/pysnmp-4.2.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python SNMP library"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
- >=dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
- dev-python/pycrypto[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
- local HTML_DOCS=( docs/*.{html,gif} )
- use examples && local EXAMPLES=( examples/. docs/mibs )
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- elog "You may also be interested in the following packages: "
- elog "dev-python/pysnmp-apps - example programs using pysnmp"
- elog "dev-python/pysnmp-mibs - IETF and other mibs"
- elog "net-libs/libsmi - to dump MIBs in python format"
-}
diff --git a/dev-python/pysnmp/pysnmp-4.3.0.ebuild b/dev-python/pysnmp/pysnmp-4.3.0.ebuild
new file mode 100644
index 0000000..432ce58
--- /dev/null
+++ b/dev-python/pysnmp/pysnmp-4.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python SNMP library"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+ >=dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
+ dev-python/pycrypto[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+ default
+
+ if use doc; then
+ touch docs/source/conf.py
+ emake -C docs html
+ fi
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/* )
+ use examples && local EXAMPLES=( examples/. docs/mibs )
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ elog "You may also be interested in the following packages: "
+ elog "dev-python/pysnmp-apps - example programs using pysnmp"
+ elog "dev-python/pysnmp-mibs - IETF and other mibs"
+ elog "net-libs/libsmi - to dump MIBs in python format"
+}
diff --git a/dev-python/pyspf/Manifest b/dev-python/pyspf/Manifest
index cb15e9a..738d0cc 100644
--- a/dev-python/pyspf/Manifest
+++ b/dev-python/pyspf/Manifest
@@ -1,2 +1 @@
-DIST pyspf-2.0.10.tar.gz 62890 SHA256 0a3be1cc1915649ed8960a1b8add4110379c3c348e98e642a53f69d028709de8 SHA512 8a10a82fe5226ffee6376ea19f1fe075bb8676cd7eeadbfec1de95326fb8e6f08ad466e84129c016b62452f26f0552f1a463fc6a53d992c67ae1d8b1a18b3a46 WHIRLPOOL 5cceeda27c6a84f827c1505f7808e371f5eecc95737a98cd77d0b06dcccd58fe0d0971b9ecfadc7c23c69ee921eefe56cbb98974c47ea3b57d1b0bcfae5e050f
DIST pyspf-2.0.11.tar.gz 63594 SHA256 693e80df3d61d69daaa2590e0f2bc8167d5fa36ce373d43987984cb00ae23928 SHA512 cababa82d1b6c206033a6583a67502d982a2c34baec0ccc08513a2bc9beb4cfc84dd5d615ac852fd25885c4abd43d9e8704f517c70fadb4a600d3b8a6254d755 WHIRLPOOL f1f97b8d0c6207a01d5d48aa3f63948749d3ceca590c146ec846638e263ba8155616e9d34af0bdfde3c1438869a3727a98154c054e0e33632c8cccd23d3f2e3d
diff --git a/dev-python/pyspf/pyspf-2.0.10.ebuild b/dev-python/pyspf/pyspf-2.0.10.ebuild
deleted file mode 100644
index 8340571..0000000
--- a/dev-python/pyspf/pyspf-2.0.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="ipv6?"
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the Sender Policy Framework (SPF) protocol"
-HOMEPAGE="https://pypi.python.org/pypi/pyspf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ipv6 test"
-
-# >=python-3.3 comes with the built-in ipaddress module
-RDEPEND="dev-python/authres[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/ipaddr-2.1.10[${PYTHON_USEDEP}]' python2_7)
- $(python_gen_cond_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]' python2_7)
- $(python_gen_cond_dep 'dev-python/pydns:3[${PYTHON_USEDEP}]' 'python3*')"
-
-DEPEND="test? ( ${RDEPEND}
- dev-python/pyyaml[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="test? ( ipv6 )"
-
-python_test() {
- pushd test &> /dev/null
- "${PYTHON}" testspf.py || die
- popd &> /dev/null
-}
diff --git a/dev-python/pyspf/pyspf-2.0.11.ebuild b/dev-python/pyspf/pyspf-2.0.11.ebuild
index 716992e..8340571 100644
--- a/dev-python/pyspf/pyspf-2.0.11.ebuild
+++ b/dev-python/pyspf/pyspf-2.0.11.ebuild
@@ -14,7 +14,7 @@
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="ipv6 test"
# >=python-3.3 comes with the built-in ipaddress module
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 5633c36..761f698 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,3 +2,4 @@
DIST pytest-2.7.3.tar.gz 548235 SHA256 d5a9c3db3515ab95902ba08c09d1e941a21a440dc2d65f31bac02667508a9efc SHA512 ad9b57f202c60c247dd4753fb8391e3e88b390e34de678ea12384d81d76693dd37e04f11f6da19a6eda2c74a73db23789856ccaa325d32b4beb6bff86d9e4173 WHIRLPOOL 4aecd53142e503083abe2631bf403509c515d52176c430b7ab1e0becdf404e0fce4bad4343a4ab62525a6e008de0c35b4fac4a352d06938288dbf8deb8a4a250
DIST pytest-2.8.0.zip 8189680 SHA256 29ed6fdb7b287f5353620494e950aba652c593c40556aece95a4d23d403ae2cb SHA512 98f7131c3396848ef7dbcf67e21e0329f8a3b771b3f8b832c1894758b34a2f852209f809001da856cfe8ea3773b257405ae2d5f8a04152242b8692e1511289ed WHIRLPOOL 3fd7f6ec73f11f29fd9b67bbb0c28dd73605604053160111212bd43d2c85c0b6cec5a25a979fecabb83a097c5621d5460747df5cb08796866349b7ba71b12005
DIST pytest-2.8.1.tar.gz 580991 SHA256 2b58662d356ee953bc40f7a73857d05f0bd07f0a8507c929de3006dd6b14c918 SHA512 b73237810b69ecd504c2bdeeee51af62d7ed23091b7bcc74cd1fcc8683dc582cadfd68b9eaed3259165bac6ddca5fb960b8dc295e82cfb9120f4b732d07843fe WHIRLPOOL 16b27620bd0edde16d28dc247352c0a1b6042ac79bcb7a76b67fc4917ef6a42462767343a5e86acfe6880ba0372a124fb11491e670abde6ffdb48e03963243db
+DIST pytest-2.8.2.tar.gz 563955 SHA256 da2fc57320dd11f621d166634c52b989aa2291af1296c32a27a11777aa4128b9 SHA512 0df6e0421d1575e1efc0bb0550c5993f802777cb616ab1514bf12ed11eb5ec35a142dd837ff65659989268c36e441e18108369991cd3d458d357aac6ba433991 WHIRLPOOL ea917f4aaec444d6edc830b4ec66f7adb305031f11328e47d12a609ec92368a5c56e9cf8e24bd1a9a4a6a0746b43133f0d9821cf27d74c15ed2a83a705ee6030
diff --git a/dev-python/pytest/pytest-2.7.3-r1.ebuild b/dev-python/pytest/pytest-2.7.3-r1.ebuild
new file mode 100644
index 0000000..e444994
--- /dev/null
+++ b/dev-python/pytest/pytest-2.7.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.29"
+RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
+
+#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Disable versioning of py.test script to avoid collision with
+ # versioning performed by the eclass.
+ sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+ grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+ # Prevent un-needed d'loading
+ sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ if use doc; then
+ mkdir doc/en/.build || die
+ emake -C doc/en html
+ fi
+}
+
+python_test() {
+ # test_nose.py not written to suit py3.2 in pypy3
+ if [[ "${EPYTHON}" == pypy3 ]]; then
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
+ --ignore=testing/test_nose.py \
+ || die "tests failed with ${EPYTHON}"
+ else
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
+ || die "tests failed with ${EPYTHON}"
+ fi
+}
+
+python_install_all() {
+ use doc && dohtml -r doc/en/_build/html/
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest/pytest-2.8.2-r1.ebuild b/dev-python/pytest/pytest-2.8.2-r1.ebuild
new file mode 100644
index 0000000..0b5e189
--- /dev/null
+++ b/dev-python/pytest/pytest-2.8.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.29"
+RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
+
+# dev-python/pluggy
+# https://github.com/hpk42/pluggy
+# See https://github.com/pytest-dev/pytest/issues/944
+# for why not now
+
+#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
+ doc? (
+ >=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/regendoc[${PYTHON_USEDEP}]
+ )"
+
+python_prepare_all() {
+ chmod o-w *egg*/* || die
+ # Disable versioning of py.test script to avoid collision with
+ # versioning performed by the eclass.
+ sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+ grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+ # Prevent un-needed d'loading
+ sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ if use doc; then
+ mkdir doc/en/.build || die
+ emake -C doc/en html
+ fi
+}
+
+python_test() {
+ # test_nose.py not written to suit py3.2 in pypy3
+ if [[ "${EPYTHON}" == pypy3 ]]; then
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
+ --ignore=testing/BUILD_nose.py \
+ || die "tests failed with ${EPYTHON}"
+ else
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \
+ || die "tests failed with ${EPYTHON}"
+ fi
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( doc/en/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest/pytest-2.8.2.ebuild b/dev-python/pytest/pytest-2.8.2.ebuild
new file mode 100644
index 0000000..6a87be6
--- /dev/null
+++ b/dev-python/pytest/pytest-2.8.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.29"
+RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
+
+# dev-python/pluggy
+# https://github.com/hpk42/pluggy
+# See https://github.com/pytest-dev/pytest/issues/944
+# for why not now
+
+#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
+ doc? (
+ >=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/regendoc[${PYTHON_USEDEP}]
+ )"
+
+python_prepare_all() {
+ chmod o-w *egg*/* || die
+ # Disable versioning of py.test script to avoid collision with
+ # versioning performed by the eclass.
+ sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+ grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+ # Prevent un-needed d'loading
+ sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ if use doc; then
+ mkdir doc/en/.build || die
+ emake -C doc/en html
+ fi
+}
+
+python_test() {
+ # test_nose.py not written to suit py3.2 in pypy3
+ if [[ "${EPYTHON}" == pypy3 ]]; then
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
+ --ignore=testing/BUILD_nose.py \
+ || die "tests failed with ${EPYTHON}"
+ else
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \
+ || die "tests failed with ${EPYTHON}"
+ fi
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( doc/en/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
index 1ec8795..bdacbf6 100644
--- a/dev-python/python-barbicanclient/Manifest
+++ b/dev-python/python-barbicanclient/Manifest
@@ -1,2 +1,3 @@
DIST python-barbicanclient-3.0.1.tar.gz 38349 SHA256 d298ee0fc9e785d44148d4590ac0d9eef05d560e379e98f75a7cb35ed6bfc7c8 SHA512 354d46e85d15af1b91ed4ded55918329d843b7b9d8374bb82a9fde771ca5e71336ecd2bcde65217338f85ffcf8910abb686e0e8853cb8bd0e0022c5298f8392a WHIRLPOOL b68f792f89df005bd1c14cebb44d6b4ba4aa3d391d66daf9714c74bbadd103f40785e8c9ebb8585a64608b3ff7e47ed102284efeffb1f30d49c2a6d5c9886446
DIST python-barbicanclient-3.0.3.tar.gz 62286 SHA256 959aca2ce3af2eed0f57e2fa9f0f9a484e40adc6b371e2c0fcc588aae9ca2b18 SHA512 0974af19781029b75e9432005fd1a50a3026531927f3718bf42b999e20877cc126a0bdd37c2de311978c132a0bfa7dbe186eb4f2cc022b8aaf2b7dc3e5c9c794 WHIRLPOOL 36635ebb89a22c898a70ce77f3dee4a88fa6969e432a63b3d554ae5d0d53cf7d5cbc29d6e63300a7acc543a9cfb0428c1ecd71c1c13994138b5c3d490f5a1d9f
+DIST python-barbicanclient-3.3.0.tar.gz 82210 SHA256 d5c68354fb5d18a6fcdcd0a0788b3f502dd6ffa57a2e47a1426cce2d63ecb6cf SHA512 9c9ea055a375cb631f081ac0dc54ff20f60e6f6c3340b0f0a92a91eed4858202d9f85e00b662a8b3b7b5183633d8f5500f6925df5a182b20046d66be48b34e37 WHIRLPOOL 94a1d91a2bb8c8aaddfe775e7a5e955eace20e75e6c75707bd56aa62a1538193161d14534c1cd9d91ece5fb57a03f0fa7e71370531c576d1f5c35a0ed113830b
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild
new file mode 100644
index 0000000..ab44a91
--- /dev/null
+++ b/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for Barbican API."
+HOMEPAGE="https://github.com/openstack/barbican"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/pbr-1.4.0[${PYTHON_USEDEP}]
+ <dev-python/pbr-2.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+ >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 0dee2ef..dca8a19 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -3,6 +3,4 @@
DIST python-3.3.2-docs-html.tar.bz2 4907895 SHA256 7434bbb654c45ccc29825f15df2137944c53c5b737a94eadbcbb006dd2848cd4 SHA512 56e44e826257e7939da21a2051ad3e742fc44a7d7cf3ab24f1f4d0709b73ad9d5d642f6c78b7bfd8ff70ef9e4b621dff5760b75ec6db6a69cf3052ab63b1d214 WHIRLPOOL cff83134aaf7ef3778bed8b3a7ab6bd9873ab24bffc250b30e12fda1b448acc8b7515990efeec1a6a789fbba96067b665aab858224e0343b6f38c520382b5584
DIST python-3.3.4-docs-html.tar.bz2 4951380 SHA256 43ab01c98d5bacb301519a99ed25192cebe0b69ac4a85b95302958b225868efc SHA512 c5eec99d94335f89c769f6386830ed951080609407cff4bc2600d6b294be396b97d24c20fd8e15dc6616fb06170445372d2c1bf9a8f2138e0e5ecb5a8a3094ee WHIRLPOOL 60a981284cdccada0db0b4768e8d1b36adb2aa05349bb414c980b5da6a5bb260e79cb1787dd2b33d3a88ccd061cb218628b8137595bc8785ece94649dcf7535c
DIST python-3.3.5-docs-html.tar.bz2 4955315 SHA256 471067c514a33b4ae4fc35ba600130572840326252a565e39157feb2911ef733 SHA512 6cf6d02bf980609561ec829407e0a4d541ddf949db0b6d3156f9fa90ed7c87f9ef16128e9c8226887568489826efcdde5ea38af246ec235a077227d73736ea71 WHIRLPOOL 78a6babcc5c7df64deb324368f32ae5cc5fed6fba9ff7392b7589f81187b893d9c977fa9a25168d60336b46f9237bf09ba5e6fbef888ee3489de57afd09e9067
-DIST python-3.4.0-docs-html.tar.bz2 5355183 SHA256 445037818f15c4b622212db9e8182e322eb16de3959718dbd339229ed39044fc SHA512 7d359ab5ad429e8f1d4a51ec05cddf2b6ce87fdb0226ece5336b538b2bfbeed10728e178860ccf29ebf8f135aadb731ca24d0ef4dca29e0f83b097d7e940ad3d WHIRLPOOL 8df8db23fb21c549fd43bb6974cf89be71339141a08bdda5c8fcaac6263f6e4ed7febbfda93e8f1101eee80e6fadffcfe9b2b9a7905b36425865d6c5cf5a730d
-DIST python-3.4.1-docs-html.tar.bz2 5381756 SHA256 c55ce2f1e1b0a1916de7376906c0538ca46a297e669aa7b24f954b9a0cbce257 SHA512 be53266b9fffef988c30d386d1d6cab4aaf16577e825615edd66b5c07404ae126f312bec30ad3f7a4d4b6f5c7d1c9179394e2ffddd1fd6f37182846a9be2cac0 WHIRLPOOL a8e8a6855fdb43a518b7d6bc599be66d36796cc7ed7710705b6460c906faa01f5a1d776dfff1a2eb44478b72bac2d890638ff5344a4cf2953b282977fd963bee
-DIST python-3.4.2-docs-html.tar.bz2 5406764 SHA256 fafee4eb5cf284e447106746b40672d7c15a9e4f33d0e83b534d01dc1b5d60fa SHA512 856a28bc4384e74d1d5bbbb5d31c814580c99a49bd359ca18cd88c10b585537bd89bf4fcb2c5e714bc31c3be33ddc6273ae5931c5093d8901ee699532c042162 WHIRLPOOL 06d931226c0b1e89fc2b21136bce953dd28fb5c123dd220dc2b3b6447c872d24001989580fda15f8645607bd34db3782eba832ebd5ff2809f340ffb7a2202529
+DIST python-3.4.3-docs-html.tar.bz2 5444773 SHA256 87d4f8739205fe6f2cbcb10c6f1b33546d3b7f41e6bc96de34f992ccf5c10fbf SHA512 492038df0afb05d60806d56d66e06069d195249db708e4261d39fa6206e0baec5c2db730431b5be03d8d37296d935f39a25bf1d449fb29521bdc4823584b9bf9 WHIRLPOOL c55241d450c6440d4e084a8189b569046352bd65b88a576fd0a8bc9a23665f52cc534da4d32061c0cbc31f41b2b63870fe4098ef28be2fed42311fa8e0decc46
diff --git a/dev-python/python-docs/python-docs-3.4.0-r1.ebuild b/dev-python/python-docs/python-docs-3.4.0-r1.ebuild
deleted file mode 100644
index 9e9ed09..0000000
--- a/dev-python/python-docs/python-docs-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="http://www.python.org/doc/"
-SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/python-${PV}-docs-html"
-
-pkg_setup() {
- # Compatibility with Arfrever's pre-release ebuilds.
- # Remove this in python-docs-3.4.1.
- if has_version "=dev-lang/python-3.4_pre*[doc]"; then
- rm -f "${EROOT}etc/env.d/60python-docs-3.4"
- fi
-}
-
-src_install() {
- dohtml -A xml -A inv -r ./
- echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
- doenvd "60python-docs-${SLOT}"
-}
-
-pkg_postrm() {
- if ! has_version "<dev-python/python-docs-${SLOT}_alpha" && ! has_version ">=dev-python/python-docs-${SLOT%.*}.$((${SLOT#*.}+1))_alpha"; then
- rm -f "${EROOT}etc/env.d/65python-docs"
- fi
-}
diff --git a/dev-python/python-docs/python-docs-3.4.1.ebuild b/dev-python/python-docs/python-docs-3.4.1.ebuild
deleted file mode 100644
index 9e9ed09..0000000
--- a/dev-python/python-docs/python-docs-3.4.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="http://www.python.org/doc/"
-SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/python-${PV}-docs-html"
-
-pkg_setup() {
- # Compatibility with Arfrever's pre-release ebuilds.
- # Remove this in python-docs-3.4.1.
- if has_version "=dev-lang/python-3.4_pre*[doc]"; then
- rm -f "${EROOT}etc/env.d/60python-docs-3.4"
- fi
-}
-
-src_install() {
- dohtml -A xml -A inv -r ./
- echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
- doenvd "60python-docs-${SLOT}"
-}
-
-pkg_postrm() {
- if ! has_version "<dev-python/python-docs-${SLOT}_alpha" && ! has_version ">=dev-python/python-docs-${SLOT%.*}.$((${SLOT#*.}+1))_alpha"; then
- rm -f "${EROOT}etc/env.d/65python-docs"
- fi
-}
diff --git a/dev-python/python-docs/python-docs-3.4.2.ebuild b/dev-python/python-docs/python-docs-3.4.2.ebuild
deleted file mode 100644
index 9e9ed09..0000000
--- a/dev-python/python-docs/python-docs-3.4.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="http://www.python.org/doc/"
-SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/python-${PV}-docs-html"
-
-pkg_setup() {
- # Compatibility with Arfrever's pre-release ebuilds.
- # Remove this in python-docs-3.4.1.
- if has_version "=dev-lang/python-3.4_pre*[doc]"; then
- rm -f "${EROOT}etc/env.d/60python-docs-3.4"
- fi
-}
-
-src_install() {
- dohtml -A xml -A inv -r ./
- echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
- doenvd "60python-docs-${SLOT}"
-}
-
-pkg_postrm() {
- if ! has_version "<dev-python/python-docs-${SLOT}_alpha" && ! has_version ">=dev-python/python-docs-${SLOT%.*}.$((${SLOT#*.}+1))_alpha"; then
- rm -f "${EROOT}etc/env.d/65python-docs"
- fi
-}
diff --git a/dev-python/python-docs/python-docs-3.4.3.ebuild b/dev-python/python-docs/python-docs-3.4.3.ebuild
new file mode 100644
index 0000000..caf682d
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.4.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="http://www.python.org/doc/"
+SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="3.4"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/python-${PV}-docs-html"
+
+src_install() {
+ dohtml -A xml -A inv -r ./
+ echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
+ doenvd "60python-docs-${SLOT}"
+}
diff --git a/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild b/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild
index 26eb385..4b7388f 100644
--- a/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild
+++ b/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild
@@ -32,6 +32,6 @@
python_test() {
VIRTUALX_COMMAND="${PYTHON}"
- cd "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
virtualmake "${S}"/tests/test.py
}
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index c6dd85e..de943c7 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,3 +1,3 @@
DIST python-keystoneclient-1.3.1.tar.gz 338187 SHA256 8a421dbdf01251119164bf6baa0ef78b261e5dd4d3508748e47b77d7652e7e92 SHA512 d11825b717d0aeec67d4dfb0382173ee834fe3dea2097b8ff9505b86bb08a5579d6fe87509d65022d4436a3a1b4d20f2a877ece3160b53979999495b77df0f08 WHIRLPOOL 9aa0af722f56eb4d98d7efb8a35b1db95207970fba0b32496a9ae4593a16471f976efe1e9bb3690106ec0f5a76b5a744e9177cc7c03d9ffe9ed54111e3bb138c
DIST python-keystoneclient-1.3.2.tar.gz 342434 SHA256 1b2fd5ceeefd8d75ee749acd2c3dd8805c833c89828075b814392069cd5ae1eb SHA512 4cd986c42256fbc366b81c07ab637fe81358dde530a8e9a5b3f59f4deef5d56fb1799fc82d35a3f04d3e3b810c94bfc21235e93a77c925d235322aeaa20e420c WHIRLPOOL 65b776c928126f92108c1585658a10b89e6563ff8e71f8f249fdb86e11b29811de12b17ddddb39845d66ff9533ae44d93148bd811d1e31577092c3b598348c03
-DIST python-keystoneclient-1.7.1.tar.gz 354799 SHA256 8457fb65cc88ce009bf757643a27ac00fd5805c7f42d56743d1b6dfc26861e79 SHA512 f70d2055ff0b2d30ffe8d45bcc3218170c38b681993c984d3165427acadbe1101288e4fe863fb29e4541c33c00784bed880ed739049de0412725ccdd9afa657b WHIRLPOOL 20135eb7bd7bc6346fb7635c47080f06c00afd781c8cfa8710f7ff163f622edee1c1506f6a06ed3628446748f4fd6f67e74b7dd4b52381cc8a6aa03ba1811fcd
+DIST python-keystoneclient-1.7.2.tar.gz 356107 SHA256 d862183e0e53e7d0696a71ad9b6a9ff9f96b7f445564357de722604ca14fd6d2 SHA512 9a3f3205549f54dea73dc499d65613816f10fc2b5773734b6762db95965ef7192e3ca052748a3258925a5e120ccc6ed8d55b8860dfae94c6503d38b871039942 WHIRLPOOL cf0e0a9e1344cdbafea479be99aa25c40c0a32ccbfa05533aa957fe5003316d940c859caa74c4b9fa0495661d472913af48c666489ae392ad547e5ceb4cc5501
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.7.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.7.1.ebuild
deleted file mode 100644
index d695353..0000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.7.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
-IUSE="doc examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-CDEPEND="
- >=dev-python/pbr-1.6[${PYTHON_USEDEP}]
- <dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-TCDEPEND="
- >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
- >=dev-python/mock-1.2[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/tempest-lib-0.6.1[${PYTHON_USEDEP}]
- >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- test? (
- ${TCDEPEND}
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/keyring-2.1[${PYTHON_USEDEP}]
- !~dev-python/keyring-3.3[${PYTHON_USEDEP}]
- >=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
- >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
- )
- doc? (
- ${TCDEPEND}
- >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
- >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-0.3.0
- >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
- !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
- <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
- >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-"
-PATCHES=(
-)
-
-python_prepare_all() {
- use doc && esetup.py build_sphinx
- sed -i '/^argparse/d' requirements.txt || die
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
- testr init || die "testr init failed under ${EPYTHON}"
- testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
- use examples && local EXAMPLES=( examples/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.7.2-r1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.7.2-r1.ebuild
new file mode 100644
index 0000000..dc9a708
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.7.2-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client Library for OpenStack Identity"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
+IUSE="doc examples test"
+
+# Note: blacklist version not in portage:
+#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
+
+CDEPEND="
+ >=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+TCDEPEND="
+ >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.2[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+ >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ test? (
+ ${TCDEPEND}
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/keyring-2.1[${PYTHON_USEDEP}]
+ !~dev-python/keyring-3.3[${PYTHON_USEDEP}]
+ >=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ )
+ doc? (
+ ${TCDEPEND}
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+ !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+ <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+"
+PATCHES=(
+)
+
+python_prepare_all() {
+ use doc && esetup.py build_sphinx
+ sed -i '/^argparse/d' requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+ testr init || die "testr init failed under ${EPYTHON}"
+ testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 6325d4b..3ff5490 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,3 +1,2 @@
DIST python-ldap-2.4.19.tar.gz 138503 SHA256 02fddb3accbfb54e40ff47a59457e422b253f9fb6cd64bb3851b349295fab048 SHA512 bfa8b87449f03d70d78bf890d1190ef5a153e1b84db97ca4b40465bfba9faedace2a69f4ae1279ef6323c01255f52993cf0e4374bc32d9660a5286dfc7c17b85 WHIRLPOOL 708c6744b41fc4c9dc4473a9ab088016aa722f5b196c080973fedbb07a08dd57f859ddb5d193665349f44d2d08ff9e2f797cfa6af23e34624f1d0a9e21d62d4d
-DIST python-ldap-2.4.20.tar.gz 142355 SHA256 4b8891539a3171d993cf7896b632ff088a4c707ae85ac3c77db1454f7949f3e2 SHA512 d8afe217c18d49b70089bc47bac7c48f57774b78b1dd44ae3a60e669a3df59058d8579b9de64a2349af612db8e3c1ea5bfa5a47148c651cbfa4038dbc58b9ff2 WHIRLPOOL 562993e84f5c41b3aefd808a047d6cf8ea6c4284171f7f0d858d3a7417a67e31b06f283ed557fbad3fde25a4a9d2c049cbce52c0759b94850ea19848e4192f64
DIST python-ldap-2.4.21.tar.gz 121176 SHA256 2a3ce606465d2d5fbd0a620516b6648ffd85c343d9305d49a2a1f7d338b8bbd4 SHA512 38f879bd70e5a31b2ec0f89c7a9aab6bdfe86285976300358828cdb83995edaaa960d29c8fcd9f333bda88a2015f306460de7bb24b2d514944d9dc83650acb75 WHIRLPOOL 8cc7526356e63642430804370ffd41cd1e74b74654d4302f90fe87a6471639848ae6ecff160a26daa39763718625b4bcdf3e2b6aaa58e98b00854e1692b30db5
diff --git a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
new file mode 100644
index 0000000..44369ed
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# setup.py is written only for py2, which suits pypy
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="http://www.python-ldap.org https://pypi.python.org/pypi/python-ldap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+IUSE="doc examples sasl ssl"
+
+# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
+# python team: Please do not remove python-ldap-2.3.9 from the tree.
+# OpenSSL is an optional runtime dep.
+# setup.py incorrectly sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
+RDEPEND=">net-nds/openldap-2.4.11
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/pyldap"
+
+python_prepare_all() {
+ sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
+ -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+ -i setup.cfg || die "error fixing setup.cfg"
+
+ local mylibs="ldap"
+ if use sasl; then
+ use ssl && mylibs="ldap_r"
+ mylibs="${mylibs} sasl2"
+ else
+ sed -e 's/HAVE_SASL//g' -i setup.cfg || die
+ fi
+ use ssl && mylibs="${mylibs} ssl crypto"
+ use elibc_glibc && mylibs="${mylibs} resolv"
+
+ sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
+ -i setup.cfg || die "error setting up libs in setup.cfg"
+
+ # set test expected to fail to expectedFailure
+ sed -e "s:^ def test_bad_urls: @unittest.expectedFailure\n def test_bad_urls:" \
+ -i Tests/t_ldapurl.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C Doc html
+}
+
+python_test() {
+ # XXX: the tests supposedly can start local slapd
+ # but it requires some manual config, it seems.
+
+ "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( Demo/. )
+ use doc && local HTML_DOCS=( Doc/.build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/python-ldap/python-ldap-2.4.19.ebuild b/dev-python/python-ldap/python-ldap-2.4.19.ebuild
deleted file mode 100644
index c3696c3..0000000
--- a/dev-python/python-ldap/python-ldap-2.4.19.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# setup.py is written only for py2, which suits pypy
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="http://www.python-ldap.org https://pypi.python.org/pypi/python-ldap"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
-IUSE="doc examples sasl ssl"
-
-# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
-# python team: Please do not remove python-ldap-2.3.9 from the tree.
-# OpenSSL is an optional runtime dep.
-# setup.py incorrectly sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
-RDEPEND=">net-nds/openldap-2.4.11
- dev-python/pyasn1[${PYTHON_USEDEP}]
- dev-python/pyasn1-modules[${PYTHON_USEDEP}]
- sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
- -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
- -i setup.cfg || die "error fixing setup.cfg"
-
- local mylibs="ldap"
- if use sasl; then
- use ssl && mylibs="ldap_r"
- mylibs="${mylibs} sasl2"
- else
- sed -e 's/HAVE_SASL//g' -i setup.cfg || die
- fi
- use ssl && mylibs="${mylibs} ssl crypto"
- use elibc_glibc && mylibs="${mylibs} resolv"
-
- sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
- -i setup.cfg || die "error setting up libs in setup.cfg"
-
- # set test expected to fail to expectedFailure
- sed -e "s:^ def test_bad_urls: @unittest.expectedFailure\n def test_bad_urls:" \
- -i Tests/t_ldapurl.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C Doc html
-}
-
-python_test() {
- # XXX: the tests supposedly can start local slapd
- # but it requires some manual config, it seems.
-
- "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use examples && local EXAMPLES=( Demo/. )
- use doc && local HTML_DOCS=( Doc/.build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/python-ldap/python-ldap-2.4.20.ebuild b/dev-python/python-ldap/python-ldap-2.4.20.ebuild
deleted file mode 100644
index 3309a2b..0000000
--- a/dev-python/python-ldap/python-ldap-2.4.20.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# setup.py is written only for py2, which suits pypy
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="http://www.python-ldap.org https://pypi.python.org/pypi/python-ldap"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
-IUSE="doc examples sasl ssl"
-
-# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
-# python team: Please do not remove python-ldap-2.3.9 from the tree.
-# OpenSSL is an optional runtime dep.
-# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
-RDEPEND=">net-nds/openldap-2.4.11
- dev-python/pyasn1[${PYTHON_USEDEP}]
- dev-python/pyasn1-modules[${PYTHON_USEDEP}]
- sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
- -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
- -i setup.cfg || die "error fixing setup.cfg"
-
- local mylibs="ldap"
- if use sasl; then
- use ssl && mylibs="ldap_r"
- mylibs="${mylibs} sasl2"
- else
- sed -e 's/HAVE_SASL//g' -i setup.cfg || die
- fi
- use ssl && mylibs="${mylibs} ssl crypto"
- use elibc_glibc && mylibs="${mylibs} resolv"
-
- sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
- -i setup.cfg || die "error setting up libs in setup.cfg"
-
- # set test expected to fail to expectedFailure
- sed -e "s:^ def test_bad_urls: @unittest.expectedFailure\n def test_bad_urls:" \
- -i Tests/t_ldapurl.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C Doc html
-}
-
-python_test() {
- # XXX: the tests supposedly can start local slapd
- # but it requires some manual config, it seems.
-
- "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use examples && local EXAMPLES=( Demo/. )
- use doc && local HTML_DOCS=( Doc/.build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/python-ldap/python-ldap-2.4.21-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.21-r1.ebuild
new file mode 100644
index 0000000..6526054
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-2.4.21-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="http://www.python-ldap.org https://pypi.python.org/pypi/python-ldap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+IUSE="doc examples sasl ssl"
+
+# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
+# python team: Please do not remove python-ldap-2.3.9 from the tree.
+# OpenSSL is an optional runtime dep.
+# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
+RDEPEND=">net-nds/openldap-2.4.11
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/pyldap"
+
+python_prepare_all() {
+ sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
+ -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+ -i setup.cfg || die "error fixing setup.cfg"
+
+ local mylibs="ldap"
+ if use sasl; then
+ use ssl && mylibs="ldap_r"
+ mylibs="${mylibs} sasl2"
+ else
+ sed -e 's/HAVE_SASL//g' -i setup.cfg || die
+ fi
+ use ssl && mylibs="${mylibs} ssl crypto"
+ use elibc_glibc && mylibs="${mylibs} resolv"
+
+ sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
+ -i setup.cfg || die "error setting up libs in setup.cfg"
+
+ # set test expected to fail to expectedFailure
+ sed -e "s:^ def test_bad_urls: @unittest.expectedFailure\n def test_bad_urls:" \
+ -i Tests/t_ldapurl.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C Doc html
+}
+
+python_test() {
+ # XXX: the tests supposedly can start local slapd
+ # but it requires some manual config, it seems.
+
+ "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( Demo/. )
+ use doc && local HTML_DOCS=( Doc/.build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/python-ldap/python-ldap-2.4.21.ebuild b/dev-python/python-ldap/python-ldap-2.4.21.ebuild
deleted file mode 100644
index 3309a2b..0000000
--- a/dev-python/python-ldap/python-ldap-2.4.21.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# setup.py is written only for py2, which suits pypy
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="http://www.python-ldap.org https://pypi.python.org/pypi/python-ldap"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
-IUSE="doc examples sasl ssl"
-
-# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
-# python team: Please do not remove python-ldap-2.3.9 from the tree.
-# OpenSSL is an optional runtime dep.
-# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
-RDEPEND=">net-nds/openldap-2.4.11
- dev-python/pyasn1[${PYTHON_USEDEP}]
- dev-python/pyasn1-modules[${PYTHON_USEDEP}]
- sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
- -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
- -i setup.cfg || die "error fixing setup.cfg"
-
- local mylibs="ldap"
- if use sasl; then
- use ssl && mylibs="ldap_r"
- mylibs="${mylibs} sasl2"
- else
- sed -e 's/HAVE_SASL//g' -i setup.cfg || die
- fi
- use ssl && mylibs="${mylibs} ssl crypto"
- use elibc_glibc && mylibs="${mylibs} resolv"
-
- sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
- -i setup.cfg || die "error setting up libs in setup.cfg"
-
- # set test expected to fail to expectedFailure
- sed -e "s:^ def test_bad_urls: @unittest.expectedFailure\n def test_bad_urls:" \
- -i Tests/t_ldapurl.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C Doc html
-}
-
-python_test() {
- # XXX: the tests supposedly can start local slapd
- # but it requires some manual config, it seems.
-
- "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use examples && local EXAMPLES=( Demo/. )
- use doc && local HTML_DOCS=( Doc/.build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index fe9c917..78856a7 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -29,6 +29,7 @@
DEPEND="${RDEPEND}
doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/pyasn1-modules[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/pyldap"
python_prepare_all() {
sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild
index fde6cf7..ac8b29a 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild
@@ -16,7 +16,7 @@
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
S="${WORKDIR}"/nbxmpp-${PV}
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 9ef6a89..e170b4f 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -3,3 +3,4 @@
DIST python-novaclient-2.23.2.tar.gz 224170 SHA256 730cb006395b2df336bbfd75aa2f459375594726a50fe3b9126212ed487fcf98 SHA512 a207afcdb14e811980c6f3962342e3aa4da52f2e9663f94dbbac78b9d5e1e5a555d657b61948acf07cf238eaf04e32b9e440e9495adf80e19e8877e5e6510bcb WHIRLPOOL 8bd7c7f3431ec9dc78ed023e15227c5c5d40becbb9ef06d6fee65d177732af8d98154b27a39da722716ff9fffab7bc0c9790306d5ae184c4335361ac990666a4
DIST python-novaclient-2.25.0.tar.gz 228156 SHA256 433e314223218031e7ea6e71baa54c1b13485d47fbb128ed3752e2a72ad7cb83 SHA512 b65495e94da9d42aa6eb51090ea7c2af6784e74121ea96c7021d013b8570af1df90d993df332b92274d5f92bc634149ad14616804e68e93fb4529b6b15dbb5c4 WHIRLPOOL 7401147c278a23768e18998b90842c6c17fe2c9dfb28cd320dfe0dc6ce7afd2e0481d6275deb82a4ce5c3ac826b8303390a8d80c011a242c4bed0fff2e446615
DIST python-novaclient-2.27.0.tar.gz 242744 SHA256 d1279d5c2857cf8c56cb953639b36225bc1fec7fa30ee632940823506a7638ef SHA512 f3594f6ee1edb431881e0ccd4cb97b4e631fee5cd6ce6874514bb09079837e038c60dd1bbba2807fc10271a8b8a96304c8aedcc18e7c40811a99d97594cc1414 WHIRLPOOL e79c23ce7ae5ef20e40ed1ab3fa01d8ba2be3b85c1c19fe2fed0c2425849cb62c4ab67464d771306c630b9406127196b5820a642b3b9c7c1664d2ca229da5a47
+DIST python-novaclient-2.30.1.tar.gz 258139 SHA256 e46564255c5a66dcd1c16a0a96fca7bfdf3cb4720830599b08447e174cd7f7f4 SHA512 0deeca5c48e31063d0d8bf5e86f85869c42f4d9806a8b0420e1e419773ef4a5784c8a4295a48b83c9cd4311aea60155bd489fd916f2e290b029b83fd856ad938 WHIRLPOOL 9d8a098fefa1bf400c6d26aa9d26d12dfdf4aa56c89b4552748cefca1eaf0f90af3d19f10a1e39d11c459a4580cfdc82e2fead1401ade8634d01af18db97ce30
diff --git a/dev-python/python-novaclient/python-novaclient-2.30.1.ebuild b/dev-python/python-novaclient/python-novaclient-2.30.1.ebuild
new file mode 100644
index 0000000..a0ec520
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-2.30.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+ >=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+ <dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ test? (
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/keyring-2.1[${PYTHON_USEDEP}]
+ !~dev-python/keyring-3.3[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.2[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/os-client-config-1.4.0[${PYTHON_USEDEP}]
+ !~dev-python/os-client-config-1.6.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+ )"
+RDEPEND="
+ >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+ <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+ >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+ # built in...
+ sed -i '/^argparse/d' requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ testr init
+ testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 8e05f2b..d983051 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,2 +1,3 @@
DIST python-openstackclient-1.0.4.tar.gz 203012 SHA256 4ae6d7b35fd1da2a07959fea9639e506871abfb769c62f3692d2f2585605ac85 SHA512 d1076456ec9867c5dd6c13059bff56cb358eb675666cc5c38de0414b8c0ea26e057c286ebe2a0146f68ca50c1a416cac5f680ec72b633879cefafa25c76dc9c9 WHIRLPOOL 25df1e0209145a9e9c9c36676e1423d42129b2f8408aa22fdb18cf75f9b138009033b27002c76832448f026b518671fd49eb4bea8877bed560153ac5a88e2e4d
DIST python-openstackclient-1.6.0.tar.gz 256666 SHA256 7400b86fc57032bfd7d4fed317ad2311bfb35ee192200c437b23c2ab85d49b24 SHA512 e62f9265566def5c43dc4fe6d4aeb7c61be802cd7f53db78bb3db681a97b140364afedff07a9e0bcc0622d39d9341150dab3ca7fa230b2c64a6c820d713acc89 WHIRLPOOL 6b7cd39f26fcd106f4e5819af8a54b4fb79e3a1dbb5aff79e7601392e25f6b7a80f94b1ff299e6d80d3afb7a064f03acfa202779f36677098f4b612dfc174d9c
+DIST python-openstackclient-1.7.1.tar.gz 265368 SHA256 c9a379d5688cf63e5ff9634929bac06204b562d2afe00fca14831ad0799e3240 SHA512 137d6bf2b6a2bd09073ca1ee63f3f6b38568baa3bc93796938e18dc694a6401353598369d8c7028d054cf31eed84bc38869375fa38649d4657b46907ba379b2c WHIRLPOOL afc99ef30eaba71059a3141eb4fe9c5f094e41cf35af12a44cf2209c3244747573651c7cbd722b750c48cc8c6897db574f3af8f1993892e953238e96d1f2f1e0
diff --git a/dev-python/python-openstackclient/python-openstackclient-1.6.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-1.6.0.ebuild
index 6ca19d9..087466a 100644
--- a/dev-python/python-openstackclient/python-openstackclient-1.6.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-1.6.0.ebuild
@@ -47,6 +47,7 @@
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
+ >=dev-python/os-client-config-1.4.0[${PYTHON_USEDEP}]
>=dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-1.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-openstackclient/python-openstackclient-1.7.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-1.7.1.ebuild
new file mode 100644
index 0000000..728f07f
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-1.7.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="https://github.com/openstack/python-openstackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+CDEPEND="
+ >=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+ <dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ test? (
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+ >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+ )
+ doc? (
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ )"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ >=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+ >=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
+ >=dev-python/os-client-config-1.4[${PYTHON_USEDEP}]
+ !~dev-python/os-client-config-1.6.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
+ >=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && esetup.py build_sphinx
+}
+
+python_test() {
+ testr init
+ testr run || die "testsuite failed under python2.7"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild
index 17c213c..c14fac7 100644
--- a/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild
+++ b/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild
@@ -50,7 +50,8 @@
>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
- <dev-python/prettytable-0.8[${PYTHON_USEDEP}]"
+ <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-1.10.0[${PYTHON_USEDEP}]"
python_prepare_all() {
sed -i '/^argparse/d' requirements.txt || die
diff --git a/dev-python/python-sipsimple/python-sipsimple-2.5.1-r1.ebuild b/dev-python/python-sipsimple/python-sipsimple-2.5.1-r1.ebuild
deleted file mode 100644
index f3e5e3c..0000000
--- a/dev-python/python-sipsimple/python-sipsimple-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="SIP SIMPLE client SDK is a Software Development Kit"
-HOMEPAGE="http://sipsimpleclient.org"
-SRC_URI="http://download.ag-projects.com/SipClient/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="libressl"
-
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
- dev-db/sqlite:3
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- dev-python/python-application[${PYTHON_USEDEP}]
- media-libs/alsa-lib
- media-libs/libv4l
- media-libs/libvpx
- sys-apps/util-linux
- virtual/ffmpeg
-"
-RDEPEND="${CDEPEND}
- dev-python/dnspython[${PYTHON_USEDEP}]
- dev-python/python-cjson[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/python-eventlib[${PYTHON_USEDEP}]
- dev-python/greenlet[${PYTHON_USEDEP}]
- dev-python/python-gnutls[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/python-msrplib[${PYTHON_USEDEP}]
- dev-python/python-xcaplib[${PYTHON_USEDEP}]
- dev-python/twisted-core[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- virtual/pkgconfig
-"
diff --git a/dev-python/python-sipsimple/python-sipsimple-2.5.1-r2.ebuild b/dev-python/python-sipsimple/python-sipsimple-2.5.1-r2.ebuild
new file mode 100644
index 0000000..855904f
--- /dev/null
+++ b/dev-python/python-sipsimple/python-sipsimple-2.5.1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="SIP SIMPLE client SDK is a Software Development Kit"
+HOMEPAGE="http://sipsimpleclient.org"
+SRC_URI="http://download.ag-projects.com/SipClient/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="libressl"
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+ dev-db/sqlite:3
+ !libressl? ( dev-libs/openssl:0[-bindist] )
+ libressl? ( dev-libs/libressl )
+ dev-python/python-application[${PYTHON_USEDEP}]
+ media-libs/alsa-lib
+ media-libs/libv4l
+ media-libs/libvpx
+ sys-apps/util-linux
+ virtual/ffmpeg
+"
+RDEPEND="${CDEPEND}
+ dev-python/dnspython[${PYTHON_USEDEP}]
+ dev-python/python-cjson[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/python-eventlib[${PYTHON_USEDEP}]
+ dev-python/greenlet[${PYTHON_USEDEP}]
+ dev-python/python-gnutls[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/python-msrplib[${PYTHON_USEDEP}]
+ dev-python/python-xcaplib[${PYTHON_USEDEP}]
+ dev-python/twisted-core[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}
+ dev-python/cython[${PYTHON_USEDEP}]
+ virtual/pkgconfig
+"
diff --git a/dev-python/pytz/pytz-2015.6-r1.ebuild b/dev-python/pytz/pytz-2015.6-r1.ebuild
new file mode 100644
index 0000000..5913f36
--- /dev/null
+++ b/dev-python/pytz/pytz-2015.6-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=sys-libs/timezone-data-2014i"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ # Use timezone-data zoneinfo.
+ "${FILESDIR}"/${PN}-2009j-zoneinfo.patch
+ # ...and do not install a copy of it.
+ "${FILESDIR}"/${PN}-2009h-zoneinfo-noinstall.patch
+)
+
+python_test() {
+ "${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyyaml/pyyaml-3.11-r1.ebuild b/dev-python/pyyaml/pyyaml-3.11-r1.ebuild
new file mode 100644
index 0000000..364e467
--- /dev/null
+++ b/dev-python/pyyaml/pyyaml-3.11-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_P="PyYAML-${PV}"
+
+DESCRIPTION="YAML parser and emitter for Python"
+HOMEPAGE="http://pyyaml.org/wiki/PyYAML https://pypi.python.org/pypi/PyYAML"
+SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="examples libyaml"
+
+RDEPEND="libyaml? ( dev-libs/libyaml )"
+DEPEND="${RDEPEND}
+ libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_configure_all() {
+ mydistutilsargs=( $(use_with libyaml) )
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}
+ fi
+}
diff --git a/dev-python/redis-py/redis-py-2.10.3-r1.ebuild b/dev-python/redis-py/redis-py-2.10.3-r1.ebuild
new file mode 100644
index 0000000..3a78bd4
--- /dev/null
+++ b/dev-python/redis-py/redis-py-2.10.3-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/andymccurdy/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-db/redis
+ >=dev-python/pytest-2.5.0[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+ # Make sure that tests will be used from BUILD_DIR rather than cwd.
+ mv tests tests-hidden || die
+
+ # Correct local import patch syntax
+ sed -e 's:from .conftest:from conftest:' \
+ -i tests-hidden/{test_connection_pool.py,test_commands.py,test_encoding.py,test_pubsub.py} \
+ || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ distutils-r1_python_compile
+
+ if use test; then
+ cp -r tests-hidden "${BUILD_DIR}"/tests || die
+ fi
+}
+
+python_test() {
+ local sock="${T}/redis.sock"
+
+ "${EPREFIX}/usr/sbin/redis-server" - <<- EOF
+ daemonize yes
+ pidfile "${T}"/redis.pid
+ unixsocket ${sock}
+ EOF
+
+ PYTHONPATH="${S}:${S}/tests-hidden"
+ esetup.py test
+ kill "$(<"${T}/redis.pid")"
+}
diff --git a/dev-python/redis-py/redis-py-2.10.3.ebuild b/dev-python/redis-py/redis-py-2.10.3.ebuild
index 0c5d14b..b94bf89 100644
--- a/dev-python/redis-py/redis-py-2.10.3.ebuild
+++ b/dev-python/redis-py/redis-py-2.10.3.ebuild
@@ -59,7 +59,7 @@
"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
daemonize yes
- pidfile ${T}/redis.pid
+ pidfile "${T}"/redis.pid
unixsocket ${sock}
EOF
diff --git a/dev-python/regendoc/regendoc-0.5-r1.ebuild b/dev-python/regendoc/regendoc-0.5-r1.ebuild
new file mode 100644
index 0000000..6a59d68
--- /dev/null
+++ b/dev-python/regendoc/regendoc-0.5-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="RegenDoc"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Check/update simple file/shell examples in documentation"
+HOMEPAGE="https://pypi.python.org/pypi/RegenDoc http://bitbucket.org/pytest-dev/regendoc/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index adcb5a1..afdda2f 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,3 +1,4 @@
DIST requests-2.6.0.tar.gz 450389 SHA256 1cdbed1f0e236f35ef54e919982c7a338e4fea3786310933d3a7887a04b74d75 SHA512 703728e04f4ae5f083892e1ad0cb54777ebcc0120fca9cd3c170e33233fccbb64a635e141e6d7b9c1f1f9d62dc00aa7c66ea890ae62cd6581c881c071a707510 WHIRLPOOL 3e65c251e164937092f349c943472b7e625b0fd963beb53a2b0f7b3b94063b833929b38082ec97298c26145b867334c38b9987c29cbeed5f4d59119f12c53a20
DIST requests-2.6.1.tar.gz 450975 SHA256 490b111c824d64b84797a899a4c22618bbc45323ac24a0a0bb4b73a8758e943c SHA512 8f88a52f1c10fb909a8e1d17e55be8878c032877e6cb61ffadcb3d1ad1e293d763ea0f7627308ac9df75e17661b4ff8c92464e77d41b05b1b7856b22a3423e49 WHIRLPOOL cb5168f41119fd76a30db511961ba6e852c1eec3941d79e287b782201632f1fc7206004c38a34474014a1463e902ded88056438ccaa7d4107e27c40300dbe0a1
DIST requests-2.7.0.tar.gz 451723 SHA256 398a3db6d61899d25fd4a06c6ca12051b0ce171d705decd7ed5511517b4bb93d SHA512 a93223c3fd21c58f7c0c901b17be17c23dba4efeed8c4347da9d4e04d96a6698e08e01482205661cb7757cc7560d9ae2e62b18f2b422af0cb90fd998fe963ff2 WHIRLPOOL b805d76ad747fc8a754fb0ca0439e8f303df057c2b256ed7f57533b311322e4e28b0d8f22111a3c5ad283823c1256cd24c93fec2aeabc6946013c17ab3540dd9
+DIST requests-2.8.0.tar.gz 457879 SHA256 b2f003589b60924909c0acde472590c5ea83906986a7a25b6f7929eb20923b7b SHA512 cf41db4b1a4639e940c2b5c1e0edaf2c4dedf0a8ead8381e211fd9e350f491e252f10cfba09bb64b4a062be98ee43e133957f489649db15116a1811e06958bb3 WHIRLPOOL 5e7e889bc016f403e221af05d01aebbec4c96175c983e240128d288884768dc0c119d76c022fd3ae5d2222cfda5415c866052fa5c5f325ee22cebb33c780df16
diff --git a/dev-python/requests/requests-2.8.0-r1.ebuild b/dev-python/requests/requests-2.8.0-r1.ebuild
new file mode 100644
index 0000000..07eb12b
--- /dev/null
+++ b/dev-python/requests/requests-2.8.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+# bundles dev-python/urllib3 snapshot
+RDEPEND="
+ app-misc/ca-certificates
+ >=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
+ dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
+ >=dev-python/py-1.4.30[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]
+ "
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+ )
+ "
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.0-system-chardet.patch
+ "${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
+)
+
+python_prepare_all() {
+ # use system chardet
+ rm -r requests/packages/chardet || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${PYTHON}" test_requests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/requests/requests-2.8.0.ebuild b/dev-python/requests/requests-2.8.0.ebuild
new file mode 100644
index 0000000..e52bb48
--- /dev/null
+++ b/dev-python/requests/requests-2.8.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+# bundles dev-python/urllib3 snapshot
+RDEPEND="
+ app-misc/ca-certificates
+ >=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
+ dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
+ >=dev-python/py-1.4.30[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]
+ "
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+ )
+ "
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.0-system-chardet.patch
+ "${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
+)
+
+python_prepare_all() {
+ # use system chardet
+ rm -r requests/packages/chardet || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${PYTHON}" test_requests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/retrying/retrying-1.3.2.ebuild b/dev-python/retrying/retrying-1.3.2.ebuild
index 29f677c..232be29 100644
--- a/dev-python/retrying/retrying-1.3.2.ebuild
+++ b/dev-python/retrying/retrying-1.3.2.ebuild
@@ -7,7 +7,7 @@
inherit distutils-r1
-DESCRIPTION="Retrying is a general-purpose retrying library."
+DESCRIPTION="General-purpose retrying library"
HOMEPAGE="https://github.com/rholder/retrying"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/retrying/retrying-1.3.3-r1.ebuild b/dev-python/retrying/retrying-1.3.3-r1.ebuild
new file mode 100644
index 0000000..7775740
--- /dev/null
+++ b/dev-python/retrying/retrying-1.3.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="https://github.com/rholder/retrying"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+ >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index 2a8b56d..ab990ee 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -8,13 +8,13 @@
inherit distutils-r1
-DESCRIPTION="Retrying is a general-purpose retrying library."
+DESCRIPTION="General-purpose retrying library"
HOMEPAGE="https://github.com/rholder/retrying"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="
diff --git a/dev-python/root_numpy/Manifest b/dev-python/root_numpy/Manifest
index 2682c56..6a2bf75 100644
--- a/dev-python/root_numpy/Manifest
+++ b/dev-python/root_numpy/Manifest
@@ -1,3 +1,4 @@
DIST root_numpy-3.2.0.tar.gz 316240 SHA256 ff64ebd9c4b8e99703bed8541bbd5f69742da0e442f8ab0833319252a0bf8006 SHA512 da08a33eeb225a57053eafc6247e55fec8c56e231455c255d71d3adfb6119d35d0b41fcf54d5d99690743a525e9d5ecfcde7efe53fb0551e38affa10e336485f WHIRLPOOL d0a105dcc4c03f33d3683fcdebcf8d140e9a6b6ea4fa7f7fcf4773b03dffd4972ff571aeb8c6e85caea09cc4df0fe3e73c9853d980cb0fe944dd7255e07a2e7e
DIST root_numpy-3.3.0.tar.gz 359688 SHA256 f658bdecada912aed0b92ea84a2e5a64660b28f1476c2387d1e208237da34e5a SHA512 97a75ed46cdb25ff6f7c680c359cc84cf1a9b0f6204d5ee9e7cf0d1bd0847910be7d0599e9a38df42593c56842d7cf6ecd982c2f3620db5c9162442af59c1acb WHIRLPOOL f03a0cf935e4e3ca55cc1d8752e29a5477f4e13972caa3cbfd09ef6902bf059d592af381d232a100cd3e25453def6e8b2530a0f5cb29333d5523d0159b315f7d
DIST root_numpy-3.3.1.tar.gz 361107 SHA256 932de8dea0d1586fe73c07b1a0859032cce4cd122a96c2aa5f4a0d55b8d47097 SHA512 5fe0340c8e0550492b97bde0a75bef4c3b5a302d61090f79e2858b9adf93e0b522dba341a3fb60ca6557d033c429f6c93c1330caf38568a6060ad41e664063e9 WHIRLPOOL 65507c731a53bbc7617a44e2cebb2b6ca11127b6c05d11998b04360fa32ff1cd9f6716bd391331dfdb97307bef08f72bfadf7b65bdc216a8a3090cf505d8a1e6
+DIST root_numpy-4.4.0.tar.gz 441522 SHA256 91a153de18cb0b364cd796db5756181987eaf67845356191a39543c0ca1e9ad5 SHA512 24afa043e4bdaa74412c36ff90ee8c1fc411801d9dc394ab5036035924910a7f4f304c5c90f4c5f389aaee9dda07b0b7e25566e68c4da424f1b4d59e6184f5b2 WHIRLPOOL 2bee9256663db1be4b2794221ccf0d7e36ec376b411e1127d9ccebbb3f229dc6c378f48293523fa01ddec131d3b9b318b24ce1a98efc9c3de98cfdd7fbec524a
diff --git a/dev-python/root_numpy/root_numpy-4.4.0.ebuild b/dev-python/root_numpy/root_numpy-4.4.0.ebuild
new file mode 100644
index 0000000..a2a71ee
--- /dev/null
+++ b/dev-python/root_numpy/root_numpy-4.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Interface between ROOT and numpy"
+HOMEPAGE="https://github.com/rootpy/root_numpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ sci-physics/root[python,${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+ cd "${BUILD_DIR}" || die
+ nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( tutorial/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/rootpy/Manifest b/dev-python/rootpy/Manifest
index de21adb..099aa46 100644
--- a/dev-python/rootpy/Manifest
+++ b/dev-python/rootpy/Manifest
@@ -1 +1,2 @@
DIST rootpy-0.7.1.tar.gz 305412 SHA256 d36399125ed8540b9a651e7b5c7ddeba686ef3107830d3d6d840cdae4834751c SHA512 460e5d79da08c141c762a5a92cf50694fe1fee8677a2439b5525b67e7d6a1a6af18a4e6dc91d379b394a97dc973da8f6baa534d46e506e0a7a4d0ee632de1a2a WHIRLPOOL d9663274a36c490bb4c872be83527d3dd414d9cca989cf20a2aca1ac5441532c9b29571d0ff885458fd2e820dc7905a679e1c9873305848ccd1fafa7820a84be
+DIST rootpy-0.8.0.tar.gz 415826 SHA256 ec0fc969101b6208e722bb9ae11dfe4a02ea53f8f91f591a5c2ea46f26581948 SHA512 0b9dc9c5bee263a2eb33b464bd96f4f9d0820a03722ca2fe3ccfaf11786caf7ccd6d25ffe4ffd42c4a5481bd3b33576cfbf68c01f2af7a981f6a2c1bedc514e2 WHIRLPOOL 7036db8d78c543259801557ebfd940cec7a3083c21757374cf5464a420643cd95cbadc898fe644181cbaa072587a0e49bd56f74f76a8670636604a32da14ddb4
diff --git a/dev-python/rootpy/rootpy-0.8.0.ebuild b/dev-python/rootpy/rootpy-0.8.0.ebuild
new file mode 100644
index 0000000..e221456
--- /dev/null
+++ b/dev-python/rootpy/rootpy-0.8.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="readline"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic layer on top of the ROOT framework's PyROOT bindings"
+HOMEPAGE="http://rootpy.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+ sci-physics/root[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/pytables[${PYTHON_USEDEP}]
+ dev-python/root_numpy[${PYTHON_USEDEP}]
+ dev-python/termcolor[${PYTHON_USEDEP}]"
+
+DEPEND="
+ sci-physics/root[${PYTHON_USEDEP}]
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# TOFIX: tests go in an infinite loop error
+RESTRICT=test
+
+python_test() {
+ cd "${BUILD_DIR}" || die
+ nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index 66cd92c..d10c4ea 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1 +1,2 @@
DIST rply-0.7.3.tar.gz 27346 SHA256 708f94da2cf5df72b0d0fe73a44a6f2310dd74004b0e7ef6bf812f941dac582a SHA512 45f8b2b9fb84940c1149b43ffda070d7ded47a5b8d8e86cf030603cb0fae78df954e629d9e6722e8f4d5ff2a7a2d516a92cf320d438cb6b1595d110e06dfc351 WHIRLPOOL b1c55fc76f0f6c7afae5dbce336a6a7510ed38ecd3c81ab22f19d9657c9f3547c8297028c35a60931db0197fdc0fee7cb1e7c50bad6769bba413247d759508da
+DIST rply-0.7.4.tar.gz 27392 SHA256 5fe9fc7c24dc3cfcaf443ef84fddcf420132746e64eced79b6735e7927e80329 SHA512 e3c3a828eb4b3cb20751ecb2d91efaabddbe3702d52b9adefe1748c07c843da1899e3944bcf0ab79f627ae428b8879cf99739ea7e0c6fd1acffc4ac4dee1b652 WHIRLPOOL 5d1cf3abf224a03a6210254577f388367b41c645fe4464e27e6c3537f933c79d6d004c33765c76a307973b5afde8954266da6d9bb6e850e841b9a987cc7f2e6c
diff --git a/dev-python/rply/rply-0.7.4.ebuild b/dev-python/rply/rply-0.7.4.ebuild
new file mode 100644
index 0000000..0d09e28
--- /dev/null
+++ b/dev-python/rply/rply-0.7.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python parser generator that also works with RPython"
+HOMEPAGE="https://github.com/alex/rply"
+SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/appdirs[${PYTHON_USEDEP}]
+ test? (
+ dev-python/py[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+ # https://github.com/alex/rply/issues/26; fail under py[3-4]
+ if python_is_python3; then
+ sed -e s':test_simple:_&:' -e s':test_empty_production:_&:' \
+ -i tests/test_parsergenerator.py
+ fi
+ distutils-r1_python_prepare
+}
+
+python_test() {
+ py.test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/service_identity/service_identity-14.0.0.ebuild b/dev-python/service_identity/service_identity-14.0.0.ebuild
index 8857b7b..316b2a5 100644
--- a/dev-python/service_identity/service_identity-14.0.0.ebuild
+++ b/dev-python/service_identity/service_identity-14.0.0.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI=5
+
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
inherit distutils-r1
@@ -16,13 +17,14 @@
KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh x86"
IUSE="doc test"
-RDEPEND="dev-python/pyasn1[${PYTHON_USEDEP}]
- dev-python/pyasn1-modules[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]
- >=dev-python/characteristic-14.0.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-cov[${PYTHON_USEDEP}] )"
+RDEPEND="
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]
+ >=dev-python/characteristic-14.0.0[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
python_prepare_all() {
# Prevent un-needed download during build
@@ -35,10 +37,7 @@
}
python_test() {
- # testsuite not supported by py3.2 which is about to become deprecated
- if ! [[ "${EPYTHON}" == python3.2 ]]; then
- py.test --cov service_identity --cov-report term-missing || die "tests failed under ${EPYTHON}"
- fi
+ py.test -v -v -x || die "tests failed under ${EPYTHON}"
}
python_install_all() {
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index d79324b..128a22c 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -10,6 +10,7 @@
DIST setuptools-18.1.tar.gz 630700 SHA256 ad52a9d5b3a6f39c2a1c2deb96cc4f6aff29d6511bdea2994322c40b60c9c36a SHA512 1367f3a10c1fef2f8061e430585f1927f6bd7c416e764d65cea1f4255824d549efa77beef8ff784bbd62c307b4b1123502e7b3fd01a243c0cc5b433a841cc8b5 WHIRLPOOL bbd3c540ff4233052be9b46f6b389900513f06aa1f79ad09495aa2c7fbdfa7bdf0e0766257a13fb9be01ce5288fdc1b3573d6411f71beb614fecc8fa72dd9e94
DIST setuptools-18.2.tar.gz 630990 SHA256 0994a58df27ea5dc523782a601357a2198b7493dcc99a30d51827a23585b5b1d SHA512 964449faecce8b039343ea4364e73e035b7a99ba425939c07ee86c2db75b3b34ddbfc5d03b468ee11266eed74208b2038b3785332ff90d74087ee1d45620912e WHIRLPOOL d05c8a6f06e33efbe007a9ab1bdc9fa867f9b761510134b3580b1cedde16ae17b01ef43942d5c7e0a86e1deb605fb0f6cb08eafa43f853b0cfcb3482365bae1e
DIST setuptools-18.3.2.tar.gz 626607 SHA256 8c4ab0c4f227730519dc1e020f875b3ef97e643c8f43a98a4fa0c46fbad12450 SHA512 0af522af1dc783e4d6b84c44d3cf4205aed75815bfc050ea89c4976434f08edd662501c4063b1618c0ce7a7120bcbd5331818d3f06912aa9136736018ec4b6a1 WHIRLPOOL 0b5275bbe6b595ebc88ba33bd0a344d3b7a9a63a81677449f862b51f10e16a1be4d4c97ff8f287299f1e0573e058c3f8fb5a0fc6e5643ac7137c2aa401397492
+DIST setuptools-18.4.tar.gz 626632 SHA256 cdea5098e60b4ad83453d58723a61dc481ca8e2df251fe4ccbea9afa5a7d111f SHA512 f45f0bdec365642d1648c502a964bafeb518e8f0ed63091a50b278629cf1e17df7f66769b0ddaab1e7c5ae2574673435ccab72886a2d5eb311eaac451c485854 WHIRLPOOL e0c5d69f57ce234b0e002a50c882df0bf1e908224c045baa8b5a62e91148d654f048cfbb64375b59f61f0845a5e850ec03594606933fdfaa9cce9b357bb45aa7
DIST setuptools-2.2.tar.gz 786831 SHA256 6fb1f21dea64e323e7ad2531a6795eeb6f5e17a85189dee61a86baca60b18984 SHA512 b5472e20f13c62ddc06513a964d8d85230a6cb8f4b0a6bc05c57d42aa3e682a850418246b5c1d769dba0cea18d7b262817f743b49a73383157a6b76d5637c296 WHIRLPOOL 6377efcf56082fdbea79cba7ae7c7d125d2368ea2309c9d655e4a568d40c8a6c9673dc1db63a2cb1f143436da411e664281ba239a058b5dff91b99cd2b5b332d
DIST setuptools-7.0.tar.gz 793737 SHA256 dd9c1a2a0fdf37a7b142626700e0a0b7a3a0657b735c50d367fca932803be061 SHA512 0c52bf2d22f7bbd7560e8bb3184406426cf759980add0e60a864f15d9bcf10f01a2bfe0eb598c8c965b2e89df8c4159c2b43028b560f04192bba47e67d9cda18 WHIRLPOOL 70c0076960af3c00d49f79d5a0c3e3ec47a0b5009a20377cb7eca1e0747d6249d433ae14a0b86e5ac1f3bcc1efd99b68e48bd741458389c27ea05406af64e55f
DIST setuptools-8.0.1.tar.gz 801353 SHA256 ab8eb279ca9062efc7e70f74a35f3dd9315835139ecaf3ae5bfdf4a7dc768e30 SHA512 c86a2c6ae5ed8205b9b37911002a8f551f2607ecab8b74b9eae6a7b92713c0d0a3d6aa54c4428df48765c1a2c9e21f53128bb1f138f7753e1f45188b0e357ff2 WHIRLPOOL 0ee70ee0a00118cb41005f77614bade6d5198a9164718bd7bb595b5cea0456ff829ac48cc8113c91d2f7830c4b4e9f4bd73245393621ae87e581b1e9b497f95d
diff --git a/dev-python/setuptools/setuptools-18.3.2-r1.ebuild b/dev-python/setuptools/setuptools-18.3.2-r1.ebuild
new file mode 100644
index 0000000..a2d5b1b
--- /dev/null
+++ b/dev-python/setuptools/setuptools-18.3.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://pypi.python.org/pypi/setuptools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+PDEPEND=">=dev-python/certifi-2015.04.28[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+ rm -r ./pkg_resources/_vendor || die
+ # disable tests requiring a network connection
+ rm setuptools/tests/test_packageindex.py || die
+
+ # don't run integration tests
+ rm setuptools/tests/test_integration.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+ # It tries to sandbox the test in a tempdir
+ HOME="${PWD}" py.test ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+ export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+ distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-18.4.ebuild b/dev-python/setuptools/setuptools-18.4.ebuild
new file mode 100644
index 0000000..a2d5b1b
--- /dev/null
+++ b/dev-python/setuptools/setuptools-18.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://pypi.python.org/pypi/setuptools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+PDEPEND=">=dev-python/certifi-2015.04.28[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+ rm -r ./pkg_resources/_vendor || die
+ # disable tests requiring a network connection
+ rm setuptools/tests/test_packageindex.py || die
+
+ # don't run integration tests
+ rm setuptools/tests/test_integration.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+ # It tries to sandbox the test in a tempdir
+ HOME="${PWD}" py.test ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+ export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+ distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.8.0-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.8.0-r1.ebuild
new file mode 100644
index 0000000..aa939b2
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-1.8.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+ py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index 59a820c..7e817ad 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,2 +1 @@
-DIST simpleeval-0.8.2.tar.gz 8282 SHA256 828e79056ae2083ff6091dd8d33855974300241c3dd7d4a173faf901a17c7b09 SHA512 288d597c646ee0c70e3a6e04fd8db112b7b7a00ad53101114cc1724110c2f71d7b5f382f9052ebdb8dbc6b48c1391c870966b72df368701548d513d3053c1759 WHIRLPOOL 88edf67da8cda1bc1ab0c66a908fc12b2e5a4b14db9f6f0e8dc771c53a4c731c38d2dbad3a8d2c2f2d8efc3b3f86ed7be1eceffa5c3d5b8cd5a096ee99c87d5c
-DIST simpleeval-0.8.5.tar.gz 13858 SHA256 76fb692abfc45c57a25540b976ddb4b3029162015e4f13735ac783bc4437a99b SHA512 da913e7dba3af05488e3bfa105c42ecc8d7ee74d3e520e32c362051b8c123b9357876cd23e400e34171042538297f32b1903f40f2b854759c856abd89548093f WHIRLPOOL c28f5e12e2032f4b0c65acefbaf2100d25124c8425c0018d0a1f9160ac082fd6c1f171f2a11b530c7c8aaaa512f21d61f222ce292d792384fd0930b4c9af769b
+DIST simpleeval-0.8.6.tar.gz 11378 SHA256 914194aec141d560e149f55749796e4556e3360919def7a09be90a27c06ee0d4 SHA512 99d2fce78cc15696eca7d3305092b2fec224b4b1cb48e06a4245bcb4fddff50224578d25bcaf0a99a4e322152eb74c78e82fb9d4dc2b2cf759d228b07153c887 WHIRLPOOL 4ac49dcaa87de3e2497a6d816a76a55be5b428ab6e4f5180be8d3312888bd2087dd200dec4671ff15e865a44fa71fc2383ce4d74d0927095d2f2a24512782ddb
diff --git a/dev-python/simpleeval/simpleeval-0.8.2.ebuild b/dev-python/simpleeval/simpleeval-0.8.2.ebuild
deleted file mode 100644
index 24e4ee1..0000000
--- a/dev-python/simpleeval/simpleeval-0.8.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple, safe single expression evaluator library"
-HOMEPAGE="https://github.com/danthedeckie/simpleeval"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS="README.rst"
diff --git a/dev-python/simpleeval/simpleeval-0.8.5.ebuild b/dev-python/simpleeval/simpleeval-0.8.6.ebuild
similarity index 100%
rename from dev-python/simpleeval/simpleeval-0.8.5.ebuild
rename to dev-python/simpleeval/simpleeval-0.8.6.ebuild
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index db42ca0..e8a200a 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,3 +1,4 @@
+DIST six-1.10.0.tar.gz 29630 SHA256 105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e WHIRLPOOL aad2fc7438b0df029bf477a783161dc169795c355be1281f1fe7aa4eb959eae5abf3bc96d097a221e0e5ad0b0494c29025bbe99bc28ff0c29ae1776e8691a70a
DIST six-1.3.0.tar.gz 17701 SHA256 d59793f9b255bd00de800b97f9a50cce4fc8a44c205f7defa5bb7d691d13b852 SHA512 e8974d4bf62325f98e301e68c237489ca39cfa9ed1066f1cdfa34e18d20d0baf788cb515e44f00f1c823f9f923d2b30f63443dbc5df8c934b1a69b8c68210130 WHIRLPOOL bd259a4e2cd0ae2629a8998a01641874266928d6fe3e65669198a9706cd4f90579902196680932b5c9207db1005376ae8b4cbc7b63f30afabe8993e719df9a5e
DIST six-1.6.1.tar.gz 24792 SHA256 d4392a7c8d91b005c002568a85faf617c67241c8cd8399cc395e8f1005aff80d SHA512 bd925295964696dc8632eb0b9d6632f25d4b461fefceb470d2bb537e98b0db9dddf9c2abb363657451b950572e91f1ab5973d12739781823f9b845abe5061057 WHIRLPOOL 54ee9309a0433231530962e64f19246cda75b36c191f6b567ccef4bb4c4cd631785d0641bc958b1cf360bc3eedcbc5bb268bc9ddf645b68c5c54bc80e184b3bc
DIST six-1.8.0.tar.gz 26925 SHA256 047bbbba41bac37c444c75ddfdf0573dd6e2f1fbd824e6247bb26fa7d8fa3830 SHA512 e705c0213396d1220f02f2c6f724ddb9d95eefc38459b6d9bc547be859303bd404969965416f7d1614d2eab416d647d0b53502414cdc46bcb597675cf509b9ff WHIRLPOOL 1a84ecd8635e93f104447b78a6beb577639a5eebef79af40fd8c8e9796ae35c1f49dea64546f46ec31e5589c86c4b36c9fc2e28226e0c9540aabd49ebcf7bf07
diff --git a/dev-python/six/six-1.10.0-r1.ebuild b/dev-python/six/six-1.10.0-r1.ebuild
new file mode 100644
index 0000000..f5c53b6
--- /dev/null
+++ b/dev-python/six/six-1.10.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 2 and 3 compatibility library"
+HOMEPAGE="https://bitbucket.org/gutworth/six https://pypi.python.org/pypi/six"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx )
+ test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}"/1.9.0-mapping.patch
+ )
+
+python_compile_all() {
+ use doc && emake -C documentation html
+}
+
+python_test() {
+ py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( documentation/_build/html/ )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
new file mode 100644
index 0000000..079a081
--- /dev/null
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 2 and 3 compatibility library"
+HOMEPAGE="https://bitbucket.org/gutworth/six https://pypi.python.org/pypi/six"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}"/1.9.0-mapping.patch
+ )
+
+python_compile_all() {
+ use doc && emake -C documentation html
+}
+
+python_test() {
+ py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( documentation/_build/html/ )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/six/six-9999.ebuild b/dev-python/six/six-9999.ebuild
index 19dd737..1807e5e 100644
--- a/dev-python/six/six-9999.ebuild
+++ b/dev-python/six/six-9999.ebuild
@@ -21,7 +21,7 @@
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx )
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+ test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
python_compile_all() {
use doc && emake -C documentation html
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.0-r1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.0-r1.ebuild
new file mode 100644
index 0000000..268fdd3
--- /dev/null
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
+HOMEPAGE="https://github.com/shibukawa/snowball_py https://pypi.python.org/pypi/snowballstemmer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/soya/metadata.xml b/dev-python/soya/metadata.xml
index de483c5..301d220 100644
--- a/dev-python/soya/metadata.xml
+++ b/dev-python/soya/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>python</herd>
+ <herd>python</herd>
</pkgmetadata>
diff --git a/dev-python/soya/soya-0.14-r1.ebuild b/dev-python/soya/soya-0.14-r1.ebuild
index 8191ec0..d8f3224 100644
--- a/dev-python/soya/soya-0.14-r1.ebuild
+++ b/dev-python/soya/soya-0.14-r1.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI="5"
+
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 flag-o-matic
@@ -13,7 +14,8 @@
DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
HOMEPAGE="http://oomadness.nekeme.net/Soya/FrontPage"
-SRC_URI="http://download.gna.org/soya/${MY_P}.tar.bz2
+SRC_URI="
+ http://download.gna.org/soya/${MY_P}.tar.bz2
doc? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )
examples? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )"
@@ -22,18 +24,21 @@
KEYWORDS="amd64 ppc x86"
IUSE="doc examples"
-DEPEND="=dev-games/ode-0.11.1
+DEPEND="
+ =dev-games/ode-0.11.1
dev-python/editobj
- virtual/python-imaging[${PYTHON_USEDEP}]
>=dev-python/pyopenal-0.1.6[${PYTHON_USEDEP}]
media-fonts/freefonts
+ media-libs/freetype:2
>=media-libs/cal3d-0.10
media-libs/freeglut
>=media-libs/freetype-2.5
>=media-libs/glew-1.3.3
>=media-libs/libsdl-1.2.8[opengl]
media-libs/openal
- virtual/opengl"
+ virtual/opengl
+ virtual/python-imaging[${PYTHON_USEDEP}]
+"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
@@ -51,15 +56,8 @@
}
python_install_all() {
- distutils-r1_python_install_all
+ use doc && DOCS=( "${WORKDIR}/${TUT_P}/doc"/{soya_guide,pudding/pudding}.pdf )
+ use examples && EXAMPLES=( "${WORKDIR}/${TUT_P}"/tutorial )
- insinto /usr/share/${PF}
- if use doc; then
- cd "${WORKDIR}/${TUT_P}/doc"
- doins soya_guide.pdf pudding/pudding.pdf || die "doins failed"
- fi
- if use examples; then
- cd "${WORKDIR}/${TUT_P}"
- doins -r tutorial || die "doins failed"
- fi
+ distutils-r1_python_install_all
}
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
index c7ed13b..1c954b8 100644
--- a/dev-python/sparql-wrapper/Manifest
+++ b/dev-python/sparql-wrapper/Manifest
@@ -1,5 +1,2 @@
-DIST SPARQLWrapper-1.5.2.tar.gz 24953 SHA256 65254c7c3cae093fbd5e6b65e2c725db3ad80ab7402c4aa59d18a9cb8f5695b4 SHA512 adb70599d5c67c4cbd5277de30325a993057ff50c72eba89cea6b5ba8daea9bd7717fef4cd62e250b77c818498580d7f26e359fc4a9e344b2ba82c71912fcee3 WHIRLPOOL a8231a0745e798240620f46af625ff325a770f97f100fbfa5cda4f2e8e1dd1f8b8900fae13a8ade9ba0f71a3fc714be14d83e34848479e7a4e93c7993a1b207c
DIST SPARQLWrapper-1.6.0.tar.gz 20698 SHA256 dadcbf190dd090d90325ca4126e96f262d620c45c4693ee9f168cf39af2fa373 SHA512 e70a003807329602360e0c1ffc4091668e5a7bbce84305ecee5a381759500282abc57f39879a8372a35f7edd36bf7d4f2dc8efad717bb620e430d207c52a4754 WHIRLPOOL f76f9ebc20daac75f0cdbddccd7bb48695289829ab08d9e013ab2e9c0220a7bd770afd5dc1431d520369dd8a1c6cd96034c4452537fb50b58d41b36fa0eb7b20
-DIST SPARQLWrapper-1.6.1.tar.gz 25894 SHA256 809ecc29ca6d3dcfdfd75163173d00b45405ddf5e848edc648b8aec553c765d0 SHA512 2500133ea235c1c91ef0f9479f570ec9376704e2ba39ec9d044bb24dfa56dd8613d4677d473d0694edd7095874c17f2277ccb2ef3c07ffff9c50b5b814f26812 WHIRLPOOL a460d9d82c0b0854a9eadefd242b7cac4daaa870e42ae6b9d5eed94cfc0fe76c914bd68517bec6449c1b614e40a684231b70982f95f2f39e8f8c01f5d56cc579
-DIST SPARQLWrapper-1.6.2.tar.gz 25939 SHA256 1af3dcccf5cfbc0c078f95109138a8be221d29e158a2ae81b239d857f7c3224d SHA512 a75cb881b34fd8963c35b9fb7bb3fb1662257c9a36a03d22227968fc8f23c7813b73d29d3bdc26f362023a871960ce6326d70f8fdfb911ceec88212ed3737831 WHIRLPOOL fe2a29206f0f8730e3046ee67649370f866043dfcaf42416753ec6f3e1795fa4372ef48db9a95b87e116e6f007d3c4d8d7b357622dc40d52448cb5dc8d73848f
DIST SPARQLWrapper-1.6.4.tar.gz 27467 SHA256 2899dae6baa88d5c3209408e70a1a9de04f0f4dd25f4e9480eb6707a398d1693 SHA512 49e4eea8cf6e0625ee3a259b4314b630eddb30475a786525f94f827353898c6d90b88e6b7b2bb65270cf8baec781b9bafa98df3cdbbb65a722d6f0af07906ce5 WHIRLPOOL 6e8f64a76d24fd864ab830bc86cbf4e97191ca19b3495f5446bd56f76e8cb4d4a8315d7ac38693776f8c063e58c873db3249cbe44aa7822daebc6c85a0893477
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.5.2.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.5.2.ebuild
deleted file mode 100644
index 4f78673..0000000
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.5.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-MY_PN=SPARQLWrapper
-DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.python.org/pypi/${MY_PN}"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/rdflib[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.6.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.6.0.ebuild
index 4f78673..8c202a0 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.6.0.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.6.0.ebuild
@@ -10,7 +10,7 @@
MY_PN=SPARQLWrapper
DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.python.org/pypi/${MY_PN}"
+HOMEPAGE="https://pypi.python.org/pypi/SPARQLWrapper"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="W3C"
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.6.1.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.6.1.ebuild
deleted file mode 100644
index b0d6078..0000000
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-MY_PN=SPARQLWrapper
-DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.python.org/pypi/${MY_PN}"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/rdflib[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.6.2.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.6.2.ebuild
deleted file mode 100644
index 709d5b5..0000000
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.6.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-MY_PN=SPARQLWrapper
-DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.python.org/pypi/${MY_PN}"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/rdflib[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild
index 9500f9e..5a0debb 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild
@@ -10,7 +10,7 @@
MY_PN=SPARQLWrapper
DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.python.org/pypi/${MY_PN}"
+HOMEPAGE="https://pypi.python.org/pypi/SPARQLWrapper"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="W3C"
diff --git a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
new file mode 100644
index 0000000..171dd36
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc latex test"
+
+# Portage has only >= minimum required versions of all rdeps making
+# setting of version borders unnecessary
+RDEPEND="
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ latex? (
+ dev-texlive/texlive-latexextra
+ app-text/dvipng
+ )"
+DEPEND="${DEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+ distutils-r1_python_compile
+
+ # Generate the grammar. It will be caught by install somehow.
+ # Note that the tests usually do it for us. However, I don't want
+ # to trust USE=test really running all the tests, especially
+ # with FEATURES=test-fail-continue.
+ pushd "${BUILD_DIR}"/lib > /dev/null || die
+ "${PYTHON}" -m sphinx.pycode.__init__ \
+ || die "Grammar generation failed."
+ popd > /dev/null || die
+}
+
+python_compile_all() {
+ use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
+}
+
+python_test() {
+ cp -r -l tests "${BUILD_DIR}"/ || die
+
+ if $(python_is_python3); then
+ 2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+ fi
+
+ nosetests -w "${BUILD_DIR}"/tests -v \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+}
+
+replacing_python_eclass() {
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 1.1.3-r4 ${pv}; then
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+pkg_preinst() {
+ if replacing_python_eclass; then
+ # the old python.eclass ebuild will want to remove our pickles...
+ backup_pickle() {
+ # array to enable filename expansion
+ local pickle_name=(
+ "${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
+ )
+
+ local dest=${ROOT}${pickle_name[0]#${D}}.backup
+
+ eumask_push 022
+ mkdir -p "${dest%/*}" || die
+ eumask_pop
+
+ cp -p -v "${pickle_name[0]}" "${dest}" \
+ || die "Unable to backup grammar pickle from overwriting"
+ }
+
+ python_foreach_impl backup_pickle
+ fi
+}
+
+pkg_postinst() {
+ if replacing_python_eclass; then
+ local warned
+
+ restore_pickle() {
+ local backup_name=(
+ "${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
+ )
+ local dest=${backup_name[0]%.backup}
+
+ mv -v "${backup_name[0]}" "${dest}" \
+ || die "Unable to restore grammar pickle backup"
+ }
+
+ python_foreach_impl restore_pickle
+
+ [[ ${warned} ]] && ewarn "Please try rebuilding the package."
+ fi
+}
diff --git a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild
new file mode 100644
index 0000000..1d82986
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy)
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc latex test"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
+ >=dev-python/six-1.4[${PYTHON_USEDEP}]
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ =dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
+ >=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+ latex? (
+ dev-texlive/texlive-latexextra
+ app-text/dvipng
+ )"
+DEPEND="${DEPEND}
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+ )"
+PDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+ distutils-r1_python_compile
+
+ # Generate the grammar. It will be caught by install somehow.
+ # Note that the tests usually do it for us. However, I don't want
+ # to trust USE=test really running all the tests, especially
+ # with FEATURES=test-fail-continue.
+ pushd "${BUILD_DIR}"/lib > /dev/null || die
+ "${PYTHON}" -m sphinx.pycode.__init__ \
+ || die "Grammar generation failed."
+ popd > /dev/null || die
+}
+
+python_compile_all() {
+ use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
+}
+
+python_test() {
+ mkdir -p "${BUILD_DIR}/sphinx_tempdir"
+ export SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+ cp -r -l tests "${BUILD_DIR}"/ || die
+
+ if $(python_is_python3); then
+ 2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+ fi
+
+ nosetests -w "${BUILD_DIR}"/tests -v \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+}
+
+replacing_python_eclass() {
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 1.1.3-r4 ${pv}; then
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+pkg_preinst() {
+ if replacing_python_eclass; then
+ # the old python.eclass ebuild will want to remove our pickles...
+ backup_pickle() {
+ # array to enable filename expansion
+ local pickle_name=(
+ "${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
+ )
+
+ local dest=${ROOT}${pickle_name[0]#${D}}.backup
+
+ eumask_push 022
+ mkdir -p "${dest%/*}" || die
+ eumask_pop
+
+ cp -p -v "${pickle_name[0]}" "${dest}" \
+ || die "Unable to backup grammar pickle from overwriting"
+ }
+
+ python_foreach_impl backup_pickle
+ fi
+}
+
+pkg_postinst() {
+ if replacing_python_eclass; then
+ local warned
+
+ restore_pickle() {
+ local backup_name=(
+ "${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
+ )
+ local dest=${backup_name[0]%.backup}
+
+ mv -v "${backup_name[0]}" "${dest}" \
+ || die "Unable to restore grammar pickle backup"
+ }
+
+ python_foreach_impl restore_pickle
+
+ [[ ${warned} ]] && ewarn "Please try rebuilding the package."
+ fi
+}
diff --git a/dev-python/sphinx/sphinx-1.3.1.ebuild b/dev-python/sphinx/sphinx-1.3.1.ebuild
index 3c4d939..48c7976 100644
--- a/dev-python/sphinx/sphinx-1.3.1.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.1.ebuild
@@ -20,22 +20,25 @@
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
IUSE="doc latex test"
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
>=dev-python/six-1.4[${PYTHON_USEDEP}]
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
- =dev-python/sphinx_rtd_theme-0.1*[${PYTHON_USEDEP}]
>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
latex? (
dev-texlive/texlive-latexextra
app-text/dvipng
)"
DEPEND="${DEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) )"
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+ )"
+PDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9-r1.ebuild
new file mode 100644
index 0000000..8bacdf2
--- /dev/null
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="ReadTheDocs.org theme for Sphinx"
+HOMEPAGE="https://github.com/snide/sphinx_rtd_theme/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]"
+
+# dev-python/sphinx previously set in PDEPEND which broke some doc builds.
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
index f7c5387..1b3504e 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI=5
+
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
inherit distutils-r1
@@ -16,5 +17,7 @@
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]"
+
+# dev-python/sphinx previously set in PDEPEND which broke some doc builds.
diff --git a/dev-python/subunit/subunit-1.1.0-r1.ebuild b/dev-python/subunit/subunit-1.1.0-r1.ebuild
new file mode 100644
index 0000000..96db9ac
--- /dev/null
+++ b/dev-python/subunit/subunit-1.1.0-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 eutils multilib-minimal
+
+DESCRIPTION="A streaming protocol for test results"
+HOMEPAGE="https://launchpad.net/subunit https://pypi.python.org/pypi/python-subunit"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="static-libs test"
+
+RDEPEND="
+ >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+ dev-python/extras[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-lang/perl:=
+ >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}]
+ >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}]
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? ( dev-python/testscenarios[${PYTHON_USEDEP}] )"
+
+# Take out rogue & trivial failing tests that exit the suite before it even gets started
+# The removed class in fact works fine in py3 and fails with py2.7 & pupu
+# The setu to restrict this patch is just those 2 is not worth it.
+PATCHES=( "${FILESDIR}"/1.0.0-tests.patch )
+
+src_prepare() {
+ sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
+
+ # Install perl modules in vendor_perl, bug 534654.
+ export INSTALLDIRS=vendor
+
+ # needed for perl modules
+ distutils-r1_src_prepare
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+ default
+ multilib_is_native_abi && distutils-r1_src_compile
+}
+
+python_test() {
+ local -x PATH="${PWD}/shell/share:${PATH}"
+ local -x PYTHONPATH=python
+ # Following tests are known to fail in py2.7 & pypy. They pass under py3.
+ # DO NOT re-file
+ # test_add_error test_add_error_details test_add_expected_failure
+ # test_add_expected_failure_details test_add_failure test_add_failure
+ # https://bugs.launchpad.net/subunit/+bug/1436686
+
+ "${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}"
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && distutils-r1_src_test
+}
+
+multilib_src_install() {
+ local targets=(
+ install-include_subunitHEADERS
+ install-pcdataDATA
+ install-exec-local
+ install-libLTLIBRARIES
+ )
+ emake DESTDIR="${D}" "${targets[@]}"
+
+ multilib_is_native_abi && distutils-r1_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/dev-python/subunit/subunit-1.1.0.ebuild b/dev-python/subunit/subunit-1.1.0.ebuild
index 2f42e1b..22bac6e 100644
--- a/dev-python/subunit/subunit-1.1.0.ebuild
+++ b/dev-python/subunit/subunit-1.1.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="Apache-2.0 BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="static-libs test"
RDEPEND="
diff --git a/dev-python/tempest-lib/Manifest b/dev-python/tempest-lib/Manifest
index 95d57cf..3fe5243 100644
--- a/dev-python/tempest-lib/Manifest
+++ b/dev-python/tempest-lib/Manifest
@@ -2,3 +2,4 @@
DIST tempest-lib-0.4.0.tar.gz 68776 SHA256 b1d00f9da6d14b5ffac87710efd9d533361b8af11003728ee3b47591358f17b0 SHA512 f0f959de4f003971929c015a5a020921f9338805d9f1109e8d42ec9b5eb43702858182c5eaf43bc1b1c4006a01f96243ec6aad9fa9b93823f04b499ad09f5c81 WHIRLPOOL 01b147dd7f5929407c1d01dc8ad10ae2cbd6c0f2f08e628689025cb649dec9446d881245ab81d1370a7ff93c4ab0d5b9fb4c7ac0837b5ba3ad0c8b7b90bf46a8
DIST tempest-lib-0.5.0.tar.gz 74579 SHA256 696c6ccbbe13236096a94176ba2970e44853962c5ab93186286316696f384b29 SHA512 3408cabec205c6c1b830a20a8e96333b69afeeaad35d5342aae8c13e01b5df177958fe2050eb24a37d572a495411f04675e9d9727f6ae34aed22093c9621cde4 WHIRLPOOL 1b8f138bd45a168e2c203ff31de19ddc0aecda8d377925223798d01de3a0ff16f55fb874b1297b7a80178ae4f8948528a0e58b8d2388d464b8afd56b30d8991c
DIST tempest-lib-0.7.0.tar.gz 60274 SHA256 bfad226eafb390c51851289b93444a7661416491fe8bedb3bc23d372583e0087 SHA512 887cdc5d95b25d6b566009b145cbe871e298abdde38eac76d8a28a61433ddd153b0ceadd322d49fb1242250b1876a45966c7c572280863d3dc4f3460c1904a2f WHIRLPOOL 6cf1c32d099cc56540bbeebebd027131251f189f49ecb632850095192cf11c429cf67493b9f16e1a187ba23888fd2a75b5386d022518af9260e37f9a23450872
+DIST tempest-lib-0.9.0.tar.gz 62964 SHA256 1dba850cdd046633fcca5147f1310bbc02d33a5eff649b6e0ce41ac4fbcd62e8 SHA512 5b14962c04642e93cdb25e8a119e75378467e697e19718a8c39e570a2be327caf32826fed3477b56f53be5df8e8876d7e014ff173a5795cd47db8ba85ea8927d WHIRLPOOL 233ee99345435ab955ab65a38014309e91916dd018835d913a7df5bfcf2ce4875b29b56a800f9cccdf7fb71ee886e24ce6b58eb61b4d7ae39f5f4da10f2f7a5a
diff --git a/dev-python/tempest-lib/tempest-lib-0.9.0.ebuild b/dev-python/tempest-lib/tempest-lib-0.9.0.ebuild
new file mode 100644
index 0000000..0f5877e
--- /dev/null
+++ b/dev-python/tempest-lib/tempest-lib-0.9.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to assist in creating functional or integrated test suites for OpenStack projects."
+HOMEPAGE="https://pypi.python.org/pypi/tempest-lib https://github.com/openstack/tempest-lib"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+ >=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+ <dev-python/pbr-2.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+ >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+ ${CDEPEND}
+ test? ( ${RDEPEND}
+ >=dev-python/hacking-0.10[${PYTHON_USEDEP}]
+ <dev-python/hacking-0.11[${PYTHON_USEDEP}]
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.7.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.1[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
+ )"
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests tempest_lib/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/terminado/terminado-0.5.ebuild b/dev-python/terminado/terminado-0.5.ebuild
index 3602db4..ba5bffb 100644
--- a/dev-python/terminado/terminado-0.5.ebuild
+++ b/dev-python/terminado/terminado-0.5.ebuild
@@ -14,7 +14,7 @@
SLOT="0"
LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
index a5d5209..8cdff6b 100644
--- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
@@ -14,7 +14,7 @@
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/testrepository/testrepository-0.0.18-r2.ebuild b/dev-python/testrepository/testrepository-0.0.18-r2.ebuild
new file mode 100644
index 0000000..6cac013
--- /dev/null
+++ b/dev-python/testrepository/testrepository-0.0.18-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A repository of test results"
+HOMEPAGE="https://launchpad.net/testscenarios"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+ >=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
+ >=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
+ dev-python/fixtures[${PYTHON_USEDEP}]"
+#bzr is listed but presumably req'd for a live repo test run
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( ${RDEPEND}
+ dev-python/testresources[${PYTHON_USEDEP}]
+ dev-python/testscenarios[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ )"
+
+# Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+ # some errors appear to have crept in the suite undert py3 since addition.
+ # Python2.7 now passes all.
+
+ esetup.py testr --coverage
+}
diff --git a/dev-python/testresources/testresources-0.2.7-r2.ebuild b/dev-python/testresources/testresources-0.2.7-r2.ebuild
index cb77788..8190811 100644
--- a/dev-python/testresources/testresources-0.2.7-r2.ebuild
+++ b/dev-python/testresources/testresources-0.2.7-r2.ebuild
@@ -14,7 +14,7 @@
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="
diff --git a/dev-python/testresources/testresources-0.2.7-r3.ebuild b/dev-python/testresources/testresources-0.2.7-r3.ebuild
new file mode 100644
index 0000000..c5333a4
--- /dev/null
+++ b/dev-python/testresources/testresources-0.2.7-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pyunit extension for managing expensive test resources"
+HOMEPAGE="https://launchpad.net/testresources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/testtools[${PYTHON_USEDEP}]
+ dev-python/fixtures[${PYTHON_USEDEP}]
+ )"
+RDEPEND=""
+
+python_test() {
+ nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
new file mode 100644
index 0000000..f7be22f
--- /dev/null
+++ b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pyunit extension for dependency injection"
+HOMEPAGE="https://launchpad.net/testscenarios"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+ # Remove a faulty file from tests, missing a required attribute
+ rm ${PN}/tests/test_testcase.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${PYTHON}" -m unittest discover
+}
diff --git a/dev-python/testscenarios/testscenarios-0.5.0.ebuild b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
index 82002ed..38fef5d 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
diff --git a/dev-python/testtools/metadata.xml b/dev-python/testtools/metadata.xml
index a8d7ead..248ba18 100644
--- a/dev-python/testtools/metadata.xml
+++ b/dev-python/testtools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>bazaar</herd>
diff --git a/dev-python/testtools/testtools-1.7.1.ebuild b/dev-python/testtools/testtools-1.7.1.ebuild
index 44d5c42..d4d3773 100644
--- a/dev-python/testtools/testtools-1.7.1.ebuild
+++ b/dev-python/testtools/testtools-1.7.1.ebuild
@@ -14,7 +14,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc"
IUSE="doc"
CDEPEND="
diff --git a/dev-python/testtools/testtools-1.8.0-r1.ebuild b/dev-python/testtools/testtools-1.8.0-r1.ebuild
new file mode 100644
index 0000000..6243aeb
--- /dev/null
+++ b/dev-python/testtools/testtools-1.8.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the Python standard library unit testing framework"
+HOMEPAGE="https://github.com/testing-cabal/testtools"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+ dev-python/extras[${PYTHON_USEDEP}]
+ dev-python/mimeparse[${PYTHON_USEDEP}]
+ >=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+ >=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
+ dev-python/traceback2[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ "${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/testtools/testtools-1.8.0.ebuild b/dev-python/testtools/testtools-1.8.0.ebuild
index 50bca34..d2f5d20 100644
--- a/dev-python/testtools/testtools-1.8.0.ebuild
+++ b/dev-python/testtools/testtools-1.8.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc"
IUSE="doc test"
CDEPEND="
diff --git a/dev-python/tlslite/tlslite-0.4.8.ebuild b/dev-python/tlslite/tlslite-0.4.8.ebuild
index ec5c394..05d3358 100644
--- a/dev-python/tlslite/tlslite-0.4.8.ebuild
+++ b/dev-python/tlslite/tlslite-0.4.8.ebuild
@@ -30,7 +30,7 @@
# Tests still hang
python_test() {
- cd tests || die
+ cd tests || die
"${PYTHON}" "${S}"/tests/tlstest.py client localhost:4443 . || die
"${PYTHON}" "${S}"/tests/tlstest.py server localhost:4442 . || die
}
diff --git a/dev-python/traceback2/traceback2-1.4.0-r1.ebuild b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
new file mode 100644
index 0000000..4e790e7
--- /dev/null
+++ b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backports of the traceback module"
+HOMEPAGE="https://github.com/testing-cabal/traceback2"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/pbr[${PYTHON_USEDEP}]
+"
+RDEPEND="dev-python/linecache2[${PYTHON_USEDEP}]"
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild
index 8fd8069..db883f2 100644
--- a/dev-python/traceback2/traceback2-1.4.0.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="
diff --git a/dev-python/traits/traits-4.5.0.ebuild b/dev-python/traits/traits-4.5.0.ebuild
index 388d99d..101e65f 100644
--- a/dev-python/traits/traits-4.5.0.ebuild
+++ b/dev-python/traits/traits-4.5.0.ebuild
@@ -22,7 +22,7 @@
test? ( ${RDEPEND} )"
python_prepare_all() {
- sed -i -e "s/'-O3'//g" setup.py || die
+ sed -i -e "s/'-O3'//g" setup.py || die
distutils-r1_python_prepare_all
}
diff --git a/dev-python/uhashring/Manifest b/dev-python/uhashring/Manifest
new file mode 100644
index 0000000..a742c46
--- /dev/null
+++ b/dev-python/uhashring/Manifest
@@ -0,0 +1 @@
+DIST uhashring-0.1.tar.gz 11063 SHA256 72d5999006e44a38a1cc0a99e9f5ac81d893948abb32752090936ffd89af7cdb SHA512 bdce3319b1b871ed68aeec7fe6e8dfe829409d57f0c91ce54ab5df52044845f5861ee93864bba5c083000f4c7b9e4502e7f3e1c08a0a9c64c65385c699342e6b WHIRLPOOL ef737c5df409ec50247605b680f9670010f4917df71f5e0b79795d181566228641e87e00ffd6201fc242285876b8a3125d02ac540ecdd26a32edac0f3bcf942a
diff --git a/dev-python/uhashring/metadata.xml b/dev-python/uhashring/metadata.xml
new file mode 100644
index 0000000..faafe4d
--- /dev/null
+++ b/dev-python/uhashring/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>python</herd>
+ <upstream>
+ <remote-id type="pypi">uhashring</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-python/uhashring/uhashring-0.1.ebuild b/dev-python/uhashring/uhashring-0.1.ebuild
new file mode 100644
index 0000000..28a5f34
--- /dev/null
+++ b/dev-python/uhashring/uhashring-0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Full featured consistent hashing python library compatible with ketama"
+HOMEPAGE="https://github.com/ultrabug/uhashring"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${RDEPEND}"
+
+RESTRICT="test"
diff --git a/dev-python/unittest2/unittest2-1.0.1-r1.ebuild b/dev-python/unittest2/unittest2-1.0.1-r1.ebuild
index 8726fab..ed801ee 100644
--- a/dev-python/unittest2/unittest2-1.0.1-r1.ebuild
+++ b/dev-python/unittest2/unittest2-1.0.1-r1.ebuild
@@ -13,7 +13,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc"
IUSE=""
CDEPEND="
diff --git a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
new file mode 100644
index 0000000..502d2ed
--- /dev/null
+++ b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The new features in unittest backported to Python 2.4+"
+HOMEPAGE="https://pypi.python.org/pypi/unittest2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/linecache2[${PYTHON_USEDEP}]
+ >=dev-python/six-1.4[${PYTHON_USEDEP}]
+ dev-python/traceback2[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+PATCHES=( "${FILESDIR}"/remove-argparse-dependence.patch )
+
+python_test() {
+ "${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild
index 1e08142..04eabee 100644
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
IUSE=""
CDEPEND="
diff --git a/dev-python/urllib3/urllib3-1.12.ebuild b/dev-python/urllib3/urllib3-1.12.ebuild
index 799ae84..9ea3aa7 100644
--- a/dev-python/urllib3/urllib3-1.12.ebuild
+++ b/dev-python/urllib3/urllib3-1.12.ebuild
@@ -14,7 +14,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
IUSE="doc test"
RDEPEND="
diff --git a/dev-python/vertex/vertex-0.3.1-r1.ebuild b/dev-python/vertex/vertex-0.3.1-r1.ebuild
new file mode 100644
index 0000000..c790604
--- /dev/null
+++ b/dev-python/vertex/vertex-0.3.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="An implementation of the Q2Q protocol"
+HOMEPAGE="http://divmod.org/trac/wiki/DivmodVertex https://pypi.python.org/pypi/Vertex"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+DEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-python/epsilon-0.6.0-r1[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.13-r1[${PYTHON_USEDEP}]
+ dev-python/twisted-core[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ dodoc NAME.txt
+}
diff --git a/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild b/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild
new file mode 100644
index 0000000..77713a1
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+ http://www.virtualenv.org/
+ https://pypi.python.org/pypi/virtualenv
+ https://github.com/pypa/virtualenv/
+"
+SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="
+ >=dev-python/pip-7.1.2[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ "
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )"
+
+DOCS=( docs/index.rst docs/changes.rst )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
+ "${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
+)
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ py.test -vvx || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/virtualenv/virtualenv-13.1.2.ebuild b/dev-python/virtualenv/virtualenv-13.1.2.ebuild
index d60c6d9..c67a30f 100644
--- a/dev-python/virtualenv/virtualenv-13.1.2.ebuild
+++ b/dev-python/virtualenv/virtualenv-13.1.2.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~mips ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="doc test"
diff --git a/dev-python/vulture/Manifest b/dev-python/vulture/Manifest
new file mode 100644
index 0000000..1aa3319
--- /dev/null
+++ b/dev-python/vulture/Manifest
@@ -0,0 +1 @@
+DIST vulture-0.8.1.tar.gz 18708 SHA256 3d5567f7300707a7e340fffd0fd1ebfc8d717114944c03c842b8b6c26e2d365a SHA512 b9ca6fd67dfca4ac9d98f25425401ef6edb80426fb483c2fbe7797c3991a58fe67bd8abc4c77b1e4615cfb81ddd786eab669b6d4b48f505563c29597664f1950 WHIRLPOOL a1b094f2d47acf158edd3fe525fc885e3dcee11e246ddb5aa7625afb74db4093e26a40e37780513a8c2a9fe56dafad10ca2e33cd4ff0c654364448c87ebd2481
diff --git a/dev-python/vulture/metadata.xml b/dev-python/vulture/metadata.xml
new file mode 100644
index 0000000..905ae22
--- /dev/null
+++ b/dev-python/vulture/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>python</herd>
+<upstream>
+ <remote-id type="pypi">vulture</remote-id>
+ <remote-id type="bitbucket">jendrikseipp/vulture</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/vulture/vulture-0.8.1.ebuild b/dev-python/vulture/vulture-0.8.1.ebuild
new file mode 100644
index 0000000..581c939
--- /dev/null
+++ b/dev-python/vulture/vulture-0.8.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="find unused classes, functions and variables in your code"
+HOMEPAGE="https://bitbucket.org/jendrikseipp/vulture https://pypi.python.org/pypi/vulture"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS=( README.txt NEWS.txt )
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
index dc0329c..e3d0ed9 100644
--- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
@@ -19,7 +19,7 @@
LICENSE="wxWinLL-3"
SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="cairo examples libnotify opengl"
RDEPEND="
diff --git a/dev-qt/qtchooser/qtchooser-0_p20150102.ebuild b/dev-qt/qtchooser/qtchooser-0_p20150102.ebuild
index 41ffb2b..530ac05 100644
--- a/dev-qt/qtchooser/qtchooser-0_p20150102.ebuild
+++ b/dev-qt/qtchooser/qtchooser-0_p20150102.ebuild
@@ -12,7 +12,7 @@
LICENSE="|| ( LGPL-2.1 GPL-3 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
IUSE="qt5 test"
DEPEND="qt5? ( test? (
diff --git a/dev-ros/amcl/amcl-1.13.0.ebuild b/dev-ros/amcl/amcl-1.13.0.ebuild
index a9c2fc0..8d1136f 100644
--- a/dev-ros/amcl/amcl-1.13.0.ebuild
+++ b/dev-ros/amcl/amcl-1.13.0.ebuild
@@ -21,6 +21,7 @@
dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
dev-libs/boost:=
dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
DEPEND="${RDEPEND}
test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
diff --git a/dev-ros/amcl/amcl-9999.ebuild b/dev-ros/amcl/amcl-9999.ebuild
index a9c2fc0..8d1136f 100644
--- a/dev-ros/amcl/amcl-9999.ebuild
+++ b/dev-ros/amcl/amcl-9999.ebuild
@@ -21,6 +21,7 @@
dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
dev-libs/boost:=
dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
DEPEND="${RDEPEND}
test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
diff --git a/dev-ros/audio_capture/Manifest b/dev-ros/audio_capture/Manifest
index aec3da0..3a2fcd2 100644
--- a/dev-ros/audio_capture/Manifest
+++ b/dev-ros/audio_capture/Manifest
@@ -1 +1,2 @@
DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
+DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
diff --git a/dev-ros/audio_capture/audio_capture-0.2.8.ebuild b/dev-ros/audio_capture/audio_capture-0.2.8.ebuild
new file mode 100644
index 0000000..dd65eac
--- /dev/null
+++ b/dev-ros/audio_capture/audio_capture-0.2.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transports audio from a source to a destination"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/roscpp
+ dev-libs/boost:=[threads]
+ media-libs/gstreamer:0.10
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ media-plugins/gst-plugins-lame:0.10
+ media-libs/gst-plugins-good:0.10
+ media-libs/gst-plugins-base:0.10
+"
diff --git a/dev-ros/audio_common_msgs/Manifest b/dev-ros/audio_common_msgs/Manifest
index aec3da0..3a2fcd2 100644
--- a/dev-ros/audio_common_msgs/Manifest
+++ b/dev-ros/audio_common_msgs/Manifest
@@ -1 +1,2 @@
DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
+DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.2.8.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.8.ebuild
new file mode 100644
index 0000000..e872a7e
--- /dev/null
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for transmitting audio via ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/audio_play/Manifest b/dev-ros/audio_play/Manifest
index aec3da0..3a2fcd2 100644
--- a/dev-ros/audio_play/Manifest
+++ b/dev-ros/audio_play/Manifest
@@ -1 +1,2 @@
DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
+DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
diff --git a/dev-ros/audio_play/audio_play-0.2.8.ebuild b/dev-ros/audio_play/audio_play-0.2.8.ebuild
new file mode 100644
index 0000000..d8c6704
--- /dev/null
+++ b/dev-ros/audio_play/audio_play-0.2.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Outputs audio to a speaker from a source node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/roscpp
+ dev-libs/boost:=[threads]
+ media-libs/gstreamer:0.10
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ media-plugins/gst-plugins-alsa:0.10
+ media-libs/gst-plugins-good:0.10
+ media-libs/gst-plugins-base:0.10
+"
diff --git a/dev-ros/calibration_estimation/Manifest b/dev-ros/calibration_estimation/Manifest
new file mode 100644
index 0000000..3890704
--- /dev/null
+++ b/dev-ros/calibration_estimation/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild b/dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild
new file mode 100644
index 0000000..b6c1e6f
--- /dev/null
+++ b/dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Runs an optimization to estimate the a robot's kinematic parameters"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ dev-libs/urdfdom[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
new file mode 100644
index 0000000..b6c1e6f
--- /dev/null
+++ b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Runs an optimization to estimate the a robot's kinematic parameters"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ dev-libs/urdfdom[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/calibration_estimation/metadata.xml b/dev-ros/calibration_estimation/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/calibration_estimation/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/calibration_launch/Manifest b/dev-ros/calibration_launch/Manifest
new file mode 100644
index 0000000..3890704
--- /dev/null
+++ b/dev-ros/calibration_launch/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/calibration_launch/calibration_launch-0.10.13.ebuild b/dev-ros/calibration_launch/calibration_launch-0.10.13.ebuild
new file mode 100644
index 0000000..8a48796
--- /dev/null
+++ b/dev-ros/calibration_launch/calibration_launch-0.10.13.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files that can be helpful in configuring the calibration stack to run on your robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ dev-ros/interval_intersection
+ dev-ros/joint_states_settler
+ dev-ros/laser_cb_detector
+ dev-ros/monocam_settler
+ dev-ros/roslaunch
+ dev-libs/urdfdom
+"
diff --git a/dev-ros/calibration_launch/calibration_launch-9999.ebuild b/dev-ros/calibration_launch/calibration_launch-9999.ebuild
new file mode 100644
index 0000000..8a48796
--- /dev/null
+++ b/dev-ros/calibration_launch/calibration_launch-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files that can be helpful in configuring the calibration stack to run on your robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ dev-ros/interval_intersection
+ dev-ros/joint_states_settler
+ dev-ros/laser_cb_detector
+ dev-ros/monocam_settler
+ dev-ros/roslaunch
+ dev-libs/urdfdom
+"
diff --git a/dev-ros/calibration_launch/metadata.xml b/dev-ros/calibration_launch/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/calibration_launch/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/calibration_msgs/Manifest b/dev-ros/calibration_msgs/Manifest
new file mode 100644
index 0000000..3890704
--- /dev/null
+++ b/dev-ros/calibration_msgs/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/calibration_msgs/calibration_msgs-0.10.13.ebuild b/dev-ros/calibration_msgs/calibration_msgs-0.10.13.ebuild
new file mode 100644
index 0000000..fe21a99
--- /dev/null
+++ b/dev-ros/calibration_msgs/calibration_msgs-0.10.13.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for storing calibration samples to be used in full robot calibration procedures"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild b/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild
new file mode 100644
index 0000000..fe21a99
--- /dev/null
+++ b/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for storing calibration samples to be used in full robot calibration procedures"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/calibration_msgs/metadata.xml b/dev-ros/calibration_msgs/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/calibration_msgs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/calibration_setup_helper/Manifest b/dev-ros/calibration_setup_helper/Manifest
new file mode 100644
index 0000000..3890704
--- /dev/null
+++ b/dev-ros/calibration_setup_helper/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.13.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.13.ebuild
new file mode 100644
index 0000000..80e3815
--- /dev/null
+++ b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.13.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Script to generate calibration launch and configurationfiles for your robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-ros/calibration_launch"
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild
new file mode 100644
index 0000000..80e3815
--- /dev/null
+++ b/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Script to generate calibration launch and configurationfiles for your robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-ros/calibration_launch"
diff --git a/dev-ros/calibration_setup_helper/metadata.xml b/dev-ros/calibration_setup_helper/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/calibration_setup_helper/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.9.2-r1.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.9.2-r1.ebuild
new file mode 100644
index 0000000..144fac9
--- /dev/null
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-1.9.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Plugin to image_transport for transparently sending images encoded as JPEG or PNG"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+ dev-ros/image_transport
+ dev-ros/tf
+ media-libs/opencv
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.9.2.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.9.2.ebuild
deleted file mode 100644
index f7a387a..0000000
--- a/dev-ros/compressed_image_transport/compressed_image_transport-1.9.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin to image_transport for transparently sending images encoded as JPEG or PNG"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- dev-ros/dynamic_reconfigure
- dev-ros/image_transport
- dev-ros/tf
- media-libs/opencv
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
index f7a387a..144fac9 100644
--- a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
@@ -6,6 +6,7 @@
ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -16,7 +17,7 @@
RDEPEND="
dev-ros/cv_bridge
- dev-ros/dynamic_reconfigure
+ dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
dev-ros/image_transport
dev-ros/tf
media-libs/opencv
diff --git a/dev-ros/costmap_2d/costmap_2d-1.13.0.ebuild b/dev-ros/costmap_2d/costmap_2d-1.13.0.ebuild
index 3f803fb..fa91c41 100644
--- a/dev-ros/costmap_2d/costmap_2d-1.13.0.ebuild
+++ b/dev-ros/costmap_2d/costmap_2d-1.13.0.ebuild
@@ -28,6 +28,7 @@
dev-ros/pluginlib
dev-ros/roscpp
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/tf
dev-ros/voxel_grid
dev-cpp/eigen:3
diff --git a/dev-ros/costmap_2d/costmap_2d-9999.ebuild b/dev-ros/costmap_2d/costmap_2d-9999.ebuild
index 3f803fb..fa91c41 100644
--- a/dev-ros/costmap_2d/costmap_2d-9999.ebuild
+++ b/dev-ros/costmap_2d/costmap_2d-9999.ebuild
@@ -28,6 +28,7 @@
dev-ros/pluginlib
dev-ros/roscpp
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/tf
dev-ros/voxel_grid
dev-cpp/eigen:3
diff --git a/dev-ros/filters/files/rostest.patch b/dev-ros/filters/files/rostest.patch
new file mode 100644
index 0000000..6a266fd
--- /dev/null
+++ b/dev-ros/filters/files/rostest.patch
@@ -0,0 +1,27 @@
+commit 5aef0d6619394df17bffe743071295ad041b5794
+Author: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+Date: Tue Feb 4 16:02:09 2014 +0100
+
+ make rostest in CMakeLists optional (ros/rosdistro#3010)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ccb54f9..97eea51 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,7 +5,7 @@ project(filters)
+ # Find dependencies
+ ##############################################################################
+
+-find_package(catkin REQUIRED COMPONENTS pluginlib roslib roscpp rosconsole rostest)
++find_package(catkin REQUIRED COMPONENTS pluginlib roslib roscpp rosconsole)
+ find_package(Boost COMPONENTS system filesystem thread REQUIRED)
+
+ include_directories(
+@@ -41,6 +41,7 @@ add_library(transfer_function src/transfer_function.cpp)
+ target_link_libraries(transfer_function ${catkin_LIBRARIES} ${Boost_LIBRARIES})
+
+ if(CATKIN_ENABLE_TESTING)
++ find_package(rostest)
+ # Test median filter
+ add_executable(median_test EXCLUDE_FROM_ALL test/test_median.cpp )
+ target_link_libraries(median_test median ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES})
diff --git a/dev-ros/filters/filters-1.7.4.ebuild b/dev-ros/filters/filters-1.7.4.ebuild
index 4b50ee0..d718f2d 100644
--- a/dev-ros/filters/filters-1.7.4.ebuild
+++ b/dev-ros/filters/filters-1.7.4.ebuild
@@ -18,4 +18,4 @@
dev-ros/pluginlib"
DEPEND="${RDEPEND}
test? ( dev-ros/rostest dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" )
+PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/rostest.patch" )
diff --git a/dev-ros/image_cb_detector/Manifest b/dev-ros/image_cb_detector/Manifest
new file mode 100644
index 0000000..3890704
--- /dev/null
+++ b/dev-ros/image_cb_detector/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.13.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.13.ebuild
new file mode 100644
index 0000000..5c19021
--- /dev/null
+++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Extracts checkerboard corners from ROS images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/cv_bridge[${PYTHON_USEDEP}]
+ dev-ros/image_transport
+ dev-ros/message_filters
+ dev-ros/roscpp
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
new file mode 100644
index 0000000..5c19021
--- /dev/null
+++ b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Extracts checkerboard corners from ROS images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/cv_bridge[${PYTHON_USEDEP}]
+ dev-ros/image_transport
+ dev-ros/message_filters
+ dev-ros/roscpp
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_cb_detector/metadata.xml b/dev-ros/image_cb_detector/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/image_cb_detector/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/imu_processors/Manifest b/dev-ros/imu_processors/Manifest
new file mode 100644
index 0000000..dc8ff72
--- /dev/null
+++ b/dev-ros/imu_processors/Manifest
@@ -0,0 +1 @@
+DIST imu_pipeline-0.2.1.tar.gz 7962 SHA256 91e0d491bd08dce8629876bf6005a1aaabcb130413ed749c4ab168e17f0118fa SHA512 43c990e3b5a813661111f15bbaf6101794480de0f5bd9af663ce48ebbcf75ee79fa388cf228216427e7ffcbc575a317f3b0ee3ae5b8e6cca2cc0cab736c139e4 WHIRLPOOL 189279d535c11add08df686ca84598f4e1c5a6a9835416b4f10bef2a85c192359da1795d52171d083d19cfee7e43ef011a676304046893d7f75d4a33a72c204c
diff --git a/dev-ros/imu_processors/imu_processors-0.2.1.ebuild b/dev-ros/imu_processors/imu_processors-0.2.1.ebuild
new file mode 100644
index 0000000..4a74115
--- /dev/null
+++ b/dev-ros/imu_processors/imu_processors-0.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Processors for sensor_msgs::Imu data"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/tf
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_processors/imu_processors-9999.ebuild b/dev-ros/imu_processors/imu_processors-9999.ebuild
new file mode 100644
index 0000000..4a74115
--- /dev/null
+++ b/dev-ros/imu_processors/imu_processors-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Processors for sensor_msgs::Imu data"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/tf
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_processors/metadata.xml b/dev-ros/imu_processors/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/imu_processors/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/imu_transformer/Manifest b/dev-ros/imu_transformer/Manifest
new file mode 100644
index 0000000..dc8ff72
--- /dev/null
+++ b/dev-ros/imu_transformer/Manifest
@@ -0,0 +1 @@
+DIST imu_pipeline-0.2.1.tar.gz 7962 SHA256 91e0d491bd08dce8629876bf6005a1aaabcb130413ed749c4ab168e17f0118fa SHA512 43c990e3b5a813661111f15bbaf6101794480de0f5bd9af663ce48ebbcf75ee79fa388cf228216427e7ffcbc575a317f3b0ee3ae5b8e6cca2cc0cab736c139e4 WHIRLPOOL 189279d535c11add08df686ca84598f4e1c5a6a9835416b4f10bef2a85c192359da1795d52171d083d19cfee7e43ef011a676304046893d7f75d4a33a72c204c
diff --git a/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild b/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild
new file mode 100644
index 0000000..bfb09b7
--- /dev/null
+++ b/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/message_filters
+ dev-ros/nodelet
+ dev-ros/roscpp
+ dev-ros/roslaunch
+ dev-ros/tf2
+ dev-ros/tf2_ros
+ dev-ros/topic_tools
+ dev-ros/tf2_sensor_msgs
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_transformer/imu_transformer-9999.ebuild b/dev-ros/imu_transformer/imu_transformer-9999.ebuild
new file mode 100644
index 0000000..bfb09b7
--- /dev/null
+++ b/dev-ros/imu_transformer/imu_transformer-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/message_filters
+ dev-ros/nodelet
+ dev-ros/roscpp
+ dev-ros/roslaunch
+ dev-ros/tf2
+ dev-ros/tf2_ros
+ dev-ros/topic_tools
+ dev-ros/tf2_sensor_msgs
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_transformer/metadata.xml b/dev-ros/imu_transformer/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/imu_transformer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/interval_intersection/Manifest b/dev-ros/interval_intersection/Manifest
new file mode 100644
index 0000000..3890704
--- /dev/null
+++ b/dev-ros/interval_intersection/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/interval_intersection/interval_intersection-0.10.13.ebuild b/dev-ros/interval_intersection/interval_intersection-0.10.13.ebuild
new file mode 100644
index 0000000..273edb7
--- /dev/null
+++ b/dev-ros/interval_intersection/interval_intersection-0.10.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for calculating the intersection of interval messages coming in on several topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/actionlib
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/roscpp_serialization
+ dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interval_intersection/interval_intersection-9999.ebuild b/dev-ros/interval_intersection/interval_intersection-9999.ebuild
new file mode 100644
index 0000000..273edb7
--- /dev/null
+++ b/dev-ros/interval_intersection/interval_intersection-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for calculating the intersection of interval messages coming in on several topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/actionlib
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/roscpp_serialization
+ dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interval_intersection/metadata.xml b/dev-ros/interval_intersection/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/interval_intersection/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/joint_states_settler/Manifest b/dev-ros/joint_states_settler/Manifest
new file mode 100644
index 0000000..3890704
--- /dev/null
+++ b/dev-ros/joint_states_settler/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/joint_states_settler/joint_states_settler-0.10.13.ebuild b/dev-ros/joint_states_settler/joint_states_settler-0.10.13.ebuild
new file mode 100644
index 0000000..f7d4e77
--- /dev/null
+++ b/dev-ros/joint_states_settler/joint_states_settler-0.10.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Reports how long a subset of joints has been settled"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/actionlib
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/roscpp_serialization
+ dev-ros/settlerlib
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild b/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild
new file mode 100644
index 0000000..f7d4e77
--- /dev/null
+++ b/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Reports how long a subset of joints has been settled"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/actionlib
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/roscpp_serialization
+ dev-ros/settlerlib
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/joint_states_settler/metadata.xml b/dev-ros/joint_states_settler/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/joint_states_settler/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.3.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.3.ebuild
index c3149db..d1109b7 100644
--- a/dev-ros/laser_assembler/laser_assembler-1.7.3.ebuild
+++ b/dev-ros/laser_assembler/laser_assembler-1.7.3.ebuild
@@ -23,6 +23,7 @@
dev-ros/laser_geometry[${PYTHON_USEDEP}]
dev-ros/pluginlib
dev-ros/message_filters[${PYTHON_USEDEP}]
+ dev-ros/filters
"
DEPEND="${RDEPEND}
test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
diff --git a/dev-ros/laser_assembler/laser_assembler-9999.ebuild b/dev-ros/laser_assembler/laser_assembler-9999.ebuild
index c3149db..d1109b7 100644
--- a/dev-ros/laser_assembler/laser_assembler-9999.ebuild
+++ b/dev-ros/laser_assembler/laser_assembler-9999.ebuild
@@ -23,6 +23,7 @@
dev-ros/laser_geometry[${PYTHON_USEDEP}]
dev-ros/pluginlib
dev-ros/message_filters[${PYTHON_USEDEP}]
+ dev-ros/filters
"
DEPEND="${RDEPEND}
test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest
new file mode 100644
index 0000000..3890704
--- /dev/null
+++ b/dev-ros/laser_cb_detector/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.13.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.13.ebuild
new file mode 100644
index 0000000..6cecd27
--- /dev/null
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.13.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Extracts checkerboard corners from a dense laser snapshot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/cv_bridge
+ dev-ros/image_cb_detector
+ dev-ros/message_filters
+ dev-ros/roscpp
+ dev-ros/settlerlib
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
new file mode 100644
index 0000000..6cecd27
--- /dev/null
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Extracts checkerboard corners from a dense laser snapshot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/cv_bridge
+ dev-ros/image_cb_detector
+ dev-ros/message_filters
+ dev-ros/roscpp
+ dev-ros/settlerlib
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/laser_cb_detector/metadata.xml b/dev-ros/laser_cb_detector/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/laser_cb_detector/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/monocam_settler/Manifest b/dev-ros/monocam_settler/Manifest
new file mode 100644
index 0000000..3890704
--- /dev/null
+++ b/dev-ros/monocam_settler/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/monocam_settler/metadata.xml b/dev-ros/monocam_settler/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/monocam_settler/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild b/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild
new file mode 100644
index 0000000..b413582
--- /dev/null
+++ b/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Listens on a ImageFeatures topic, and waits for the data to settle"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/roscpp_serialization
+ dev-ros/settlerlib
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/monocam_settler/monocam_settler-9999.ebuild b/dev-ros/monocam_settler/monocam_settler-9999.ebuild
new file mode 100644
index 0000000..b413582
--- /dev/null
+++ b/dev-ros/monocam_settler/monocam_settler-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Listens on a ImageFeatures topic, and waits for the data to settle"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/roscpp_serialization
+ dev-ros/settlerlib
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/move_base/move_base-1.13.0.ebuild b/dev-ros/move_base/move_base-1.13.0.ebuild
index c8fbfbd..3a687a8 100644
--- a/dev-ros/move_base/move_base-1.13.0.ebuild
+++ b/dev-ros/move_base/move_base-1.13.0.ebuild
@@ -23,6 +23,7 @@
dev-ros/nav_core
dev-ros/tf
dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-cpp/eigen:3
"
DEPEND="${RDEPEND}
diff --git a/dev-ros/move_base/move_base-9999.ebuild b/dev-ros/move_base/move_base-9999.ebuild
index c8fbfbd..3a687a8 100644
--- a/dev-ros/move_base/move_base-9999.ebuild
+++ b/dev-ros/move_base/move_base-9999.ebuild
@@ -23,6 +23,7 @@
dev-ros/nav_core
dev-ros/tf
dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-cpp/eigen:3
"
DEPEND="${RDEPEND}
diff --git a/dev-ros/octomap_ros/Manifest b/dev-ros/octomap_ros/Manifest
new file mode 100644
index 0000000..6483a21
--- /dev/null
+++ b/dev-ros/octomap_ros/Manifest
@@ -0,0 +1 @@
+DIST octomap_ros-0.4.0.tar.gz 5076 SHA256 6f4f90bbfe88c8314a406cfe70f0c4388d4d2d85a461d90911b2e6bf738ed153 SHA512 41910879d042dcbd969544e89fe40c1da8be75118ef1b813e3cb0319b83529a9c759fe99ed430b275d10d5df987bed7e2b4d7300ed561d159b6007de306bc8ce WHIRLPOOL 0840264e55bbcf9298e4d18ed0d39e8bfb7bbde7b42998ecdb28fa4b26e8184caa762747896a9e0da9f7028691836c508d22f74a61a8a20c7b562e2ec34892c1
diff --git a/dev-ros/octomap_ros/metadata.xml b/dev-ros/octomap_ros/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/octomap_ros/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/octomap_ros/octomap_ros-0.4.0.ebuild b/dev-ros/octomap_ros/octomap_ros-0.4.0.ebuild
new file mode 100644
index 0000000..36b7f89
--- /dev/null
+++ b/dev-ros/octomap_ros/octomap_ros-0.4.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/OctoMap/octomap_ros"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions between ROS / PCL and OctoMap's native types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf
+ dev-ros/pcl_ros
+ dev-ros/octomap_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/octomap_ros/octomap_ros-9999.ebuild b/dev-ros/octomap_ros/octomap_ros-9999.ebuild
new file mode 100644
index 0000000..36b7f89
--- /dev/null
+++ b/dev-ros/octomap_ros/octomap_ros-9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/OctoMap/octomap_ros"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions between ROS / PCL and OctoMap's native types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf
+ dev-ros/pcl_ros
+ dev-ros/octomap_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/Manifest b/dev-ros/rosapi/Manifest
new file mode 100644
index 0000000..901d1ec
--- /dev/null
+++ b/dev-ros/rosapi/Manifest
@@ -0,0 +1 @@
+DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
diff --git a/dev-ros/rosapi/metadata.xml b/dev-ros/rosapi/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/rosapi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosapi/rosapi-0.7.13.ebuild b/dev-ros/rosapi/rosapi-0.7.13.ebuild
new file mode 100644
index 0000000..b84f396
--- /dev/null
+++ b/dev-ros/rosapi/rosapi-0.7.13.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosnode[${PYTHON_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/rosbridge_library[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-9999.ebuild b/dev-ros/rosapi/rosapi-9999.ebuild
new file mode 100644
index 0000000..b84f396
--- /dev/null
+++ b/dev-ros/rosapi/rosapi-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosnode[${PYTHON_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/rosbridge_library[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosauth/Manifest b/dev-ros/rosauth/Manifest
new file mode 100644
index 0000000..d685376
--- /dev/null
+++ b/dev-ros/rosauth/Manifest
@@ -0,0 +1 @@
+DIST rosauth-0.1.7.tar.gz 6060 SHA256 c85c4163c94d20bce9864180785210bfe3dfd110114f18212bd711d1be87c48e SHA512 c52317cd173ec655b779f96ffe324cd136a54168484f26fff2a0d9fe2da6e25cc5109f1905d7528a9f6a433287873b63c53f96ec425ca6af740d4eea0b3250b5 WHIRLPOOL 9a21f936bea44735f3dbaf413cb9fbd93f7d673e186f99f7c7eff284d3187c44d096c1635a094cd35ce04a0909558ae174b16bb3a5d3ffe19022f655a8bc9238
diff --git a/dev-ros/rosauth/metadata.xml b/dev-ros/rosauth/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/rosauth/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosauth/rosauth-0.1.7.ebuild b/dev-ros/rosauth/rosauth-0.1.7.ebuild
new file mode 100644
index 0000000..ff0731f
--- /dev/null
+++ b/dev-ros/rosauth/rosauth-0.1.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/WPI-RAIL/rosauth"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Server Side tools for Authorization and Authentication of ROS Clients"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosauth/rosauth-9999.ebuild b/dev-ros/rosauth/rosauth-9999.ebuild
new file mode 100644
index 0000000..ff0731f
--- /dev/null
+++ b/dev-ros/rosauth/rosauth-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/WPI-RAIL/rosauth"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Server Side tools for Authorization and Authentication of ROS Clients"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosbridge_library/Manifest b/dev-ros/rosbridge_library/Manifest
new file mode 100644
index 0000000..901d1ec
--- /dev/null
+++ b/dev-ros/rosbridge_library/Manifest
@@ -0,0 +1 @@
+DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
diff --git a/dev-ros/rosbridge_library/metadata.xml b/dev-ros/rosbridge_library/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/rosbridge_library/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild
new file mode 100644
index 0000000..869e633
--- /dev/null
+++ b/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Core rosbridge package repsonsible for interpreting JSON and performing the appropriate ROS action"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosservice[${PYTHON_USEDEP}]
+ dev-ros/rostopic[${PYTHON_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-python/pymongo[${PYTHON_USEDEP}]
+ || ( dev-python/imaging[${PYTHON_USEDEP}] virtual/python-imaging[${PYTHON_USEDEP}] )
+ "
+DEPEND="${RDEPEND}
+ test? (
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ )
+"
diff --git a/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild b/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
new file mode 100644
index 0000000..869e633
--- /dev/null
+++ b/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Core rosbridge package repsonsible for interpreting JSON and performing the appropriate ROS action"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosservice[${PYTHON_USEDEP}]
+ dev-ros/rostopic[${PYTHON_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-python/pymongo[${PYTHON_USEDEP}]
+ || ( dev-python/imaging[${PYTHON_USEDEP}] virtual/python-imaging[${PYTHON_USEDEP}] )
+ "
+DEPEND="${RDEPEND}
+ test? (
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ )
+"
diff --git a/dev-ros/rosbridge_server/Manifest b/dev-ros/rosbridge_server/Manifest
new file mode 100644
index 0000000..901d1ec
--- /dev/null
+++ b/dev-ros/rosbridge_server/Manifest
@@ -0,0 +1 @@
+DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
diff --git a/dev-ros/rosbridge_server/metadata.xml b/dev-ros/rosbridge_server/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/rosbridge_server/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
new file mode 100644
index 0000000..997490d
--- /dev/null
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A WebSocket interface to rosbridge"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosauth[${PYTHON_USEDEP}]
+ "
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
new file mode 100644
index 0000000..997490d
--- /dev/null
+++ b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A WebSocket interface to rosbridge"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosauth[${PYTHON_USEDEP}]
+ "
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/Manifest b/dev-ros/rosserial_arduino/Manifest
new file mode 100644
index 0000000..2af1683
--- /dev/null
+++ b/dev-ros/rosserial_arduino/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_arduino/metadata.xml b/dev-ros/rosserial_arduino/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/rosserial_arduino/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.1.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.7.1.ebuild
new file mode 100644
index 0000000..4cc0fc8
--- /dev/null
+++ b/dev-ros/rosserial_arduino/rosserial_arduino-0.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Arduino/AVR Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_client[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-9999.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-9999.ebuild
new file mode 100644
index 0000000..4cc0fc8
--- /dev/null
+++ b/dev-ros/rosserial_arduino/rosserial_arduino-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Arduino/AVR Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_client[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_client/Manifest b/dev-ros/rosserial_client/Manifest
new file mode 100644
index 0000000..2af1683
--- /dev/null
+++ b/dev-ros/rosserial_client/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_client/metadata.xml b/dev-ros/rosserial_client/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/rosserial_client/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_client/rosserial_client-0.7.1.ebuild b/dev-ros/rosserial_client/rosserial_client-0.7.1.ebuild
new file mode 100644
index 0000000..8ce5721
--- /dev/null
+++ b/dev-ros/rosserial_client/rosserial_client-0.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Generalized client side source for rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_client/rosserial_client-9999.ebuild b/dev-ros/rosserial_client/rosserial_client-9999.ebuild
new file mode 100644
index 0000000..8ce5721
--- /dev/null
+++ b/dev-ros/rosserial_client/rosserial_client-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Generalized client side source for rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/Manifest b/dev-ros/rosserial_embeddedlinux/Manifest
new file mode 100644
index 0000000..2af1683
--- /dev/null
+++ b/dev-ros/rosserial_embeddedlinux/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_embeddedlinux/metadata.xml b/dev-ros/rosserial_embeddedlinux/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/rosserial_embeddedlinux/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.1.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.1.ebuild
new file mode 100644
index 0000000..666dc82
--- /dev/null
+++ b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Embedded Linux Enviroments"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_client[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-9999.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-9999.ebuild
new file mode 100644
index 0000000..666dc82
--- /dev/null
+++ b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Embedded Linux Enviroments"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_client[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_msgs/Manifest b/dev-ros/rosserial_msgs/Manifest
new file mode 100644
index 0000000..2af1683
--- /dev/null
+++ b/dev-ros/rosserial_msgs/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_msgs/metadata.xml b/dev-ros/rosserial_msgs/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/rosserial_msgs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-0.7.1.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-0.7.1.ebuild
new file mode 100644
index 0000000..82b7930
--- /dev/null
+++ b/dev-ros/rosserial_msgs/rosserial_msgs-0.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for automatic topic configuration using rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild
new file mode 100644
index 0000000..82b7930
--- /dev/null
+++ b/dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for automatic topic configuration using rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_python/Manifest b/dev-ros/rosserial_python/Manifest
new file mode 100644
index 0000000..2af1683
--- /dev/null
+++ b/dev-ros/rosserial_python/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_python/metadata.xml b/dev-ros/rosserial_python/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/rosserial_python/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_python/rosserial_python-0.7.1.ebuild b/dev-ros/rosserial_python/rosserial_python-0.7.1.ebuild
new file mode 100644
index 0000000..21d484d
--- /dev/null
+++ b/dev-ros/rosserial_python/rosserial_python-0.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A Python-based implementation of the ROS serial protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-python/pyserial[${PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_python/rosserial_python-9999.ebuild b/dev-ros/rosserial_python/rosserial_python-9999.ebuild
new file mode 100644
index 0000000..21d484d
--- /dev/null
+++ b/dev-ros/rosserial_python/rosserial_python-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A Python-based implementation of the ROS serial protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-python/pyserial[${PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/Manifest b/dev-ros/rosserial_server/Manifest
new file mode 100644
index 0000000..2af1683
--- /dev/null
+++ b/dev-ros/rosserial_server/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_server/metadata.xml b/dev-ros/rosserial_server/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/rosserial_server/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.1.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.1.ebuild
new file mode 100644
index 0000000..8ba454b
--- /dev/null
+++ b/dev-ros/rosserial_server/rosserial_server-0.7.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the rosserial server side"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/topic_tools
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/rosserial_server-9999.ebuild b/dev-ros/rosserial_server/rosserial_server-9999.ebuild
new file mode 100644
index 0000000..8ba454b
--- /dev/null
+++ b/dev-ros/rosserial_server/rosserial_server-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the rosserial server side"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/topic_tools
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/Manifest b/dev-ros/rosserial_windows/Manifest
new file mode 100644
index 0000000..2af1683
--- /dev/null
+++ b/dev-ros/rosserial_windows/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_windows/metadata.xml b/dev-ros/rosserial_windows/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/rosserial_windows/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.7.1.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.7.1.ebuild
new file mode 100644
index 0000000..fc6f584
--- /dev/null
+++ b/dev-ros/rosserial_windows/rosserial_windows-0.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Windows Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosserial_client[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/rosserial_windows-9999.ebuild b/dev-ros/rosserial_windows/rosserial_windows-9999.ebuild
new file mode 100644
index 0000000..fc6f584
--- /dev/null
+++ b/dev-ros/rosserial_windows/rosserial_windows-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Windows Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosserial_client[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/Manifest b/dev-ros/rosserial_xbee/Manifest
new file mode 100644
index 0000000..2af1683
--- /dev/null
+++ b/dev-ros/rosserial_xbee/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_xbee/metadata.xml b/dev-ros/rosserial_xbee/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/rosserial_xbee/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.1.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.7.1.ebuild
new file mode 100644
index 0000000..4e1c019
--- /dev/null
+++ b/dev-ros/rosserial_xbee/rosserial_xbee-0.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools to do point to multipoint communication between rosserial nodes connected to an xbee"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-python/pyserial[${PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_python[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-9999.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-9999.ebuild
new file mode 100644
index 0000000..4e1c019
--- /dev/null
+++ b/dev-ros/rosserial_xbee/rosserial_xbee-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools to do point to multipoint communication between rosserial nodes connected to an xbee"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-python/pyserial[${PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_python[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/settlerlib/Manifest b/dev-ros/settlerlib/Manifest
new file mode 100644
index 0000000..3890704
--- /dev/null
+++ b/dev-ros/settlerlib/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/settlerlib/metadata.xml b/dev-ros/settlerlib/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/settlerlib/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/settlerlib/settlerlib-0.10.13.ebuild b/dev-ros/settlerlib/settlerlib-0.10.13.ebuild
new file mode 100644
index 0000000..e00b304
--- /dev/null
+++ b/dev-ros/settlerlib/settlerlib-0.10.13.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Helper functions and routines to help creating a settler for a specific sensor channel"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/settlerlib/settlerlib-9999.ebuild b/dev-ros/settlerlib/settlerlib-9999.ebuild
new file mode 100644
index 0000000..e00b304
--- /dev/null
+++ b/dev-ros/settlerlib/settlerlib-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Helper functions and routines to help creating a settler for a specific sensor channel"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/sound_play/Manifest b/dev-ros/sound_play/Manifest
index aec3da0..3a2fcd2 100644
--- a/dev-ros/sound_play/Manifest
+++ b/dev-ros/sound_play/Manifest
@@ -1 +1,2 @@
DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
+DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
diff --git a/dev-ros/sound_play/sound_play-0.2.8.ebuild b/dev-ros/sound_play/sound_play-0.2.8.ebuild
new file mode 100644
index 0000000..c4b4cb1
--- /dev/null
+++ b/dev-ros/sound_play/sound_play-0.2.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/roslib
+ media-libs/gstreamer:0.10
+ dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ dev-python/gst-python[${PYTHON_USEDEP}]
+ app-accessibility/festival
+ media-libs/gst-plugins-good:0.10
+ media-libs/gst-plugins-base:0.10
+"
diff --git a/dev-ros/test_tf2/test_tf2-0.5.12-r1.ebuild b/dev-ros/test_tf2/test_tf2-0.5.12-r1.ebuild
new file mode 100644
index 0000000..76b129e
--- /dev/null
+++ b/dev-ros/test_tf2/test_tf2-0.5.12-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_experimental"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 unit tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/tf
+ dev-ros/tf2
+ dev-ros/tf2_bullet
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+ dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
+ dev-ros/tf2_kdl[${PYTHON_USEDEP}]
+ dev-ros/tf2_msgs
+ sci-libs/orocos_kdl
+ dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+ dev-libs/boost:=[threads]
+ dev-cpp/gtest"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.5.12.ebuild b/dev-ros/test_tf2/test_tf2-0.5.12.ebuild
deleted file mode 100644
index a84aea7..0000000
--- a/dev-ros/test_tf2/test_tf2-0.5.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry_experimental"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/tf
- dev-ros/tf2
- dev-ros/tf2_bullet
- dev-ros/tf2_ros[${PYTHON_USEDEP}]
- dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
- dev-ros/tf2_kdl[${PYTHON_USEDEP}]
- dev-ros/tf2_msgs
- sci-libs/orocos_kdl
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
- test? ( dev-cpp/gtest )"
-
-src_install() {
- :
-}
diff --git a/dev-ros/test_tf2/test_tf2-9999.ebuild b/dev-ros/test_tf2/test_tf2-9999.ebuild
index a84aea7..76b129e 100644
--- a/dev-ros/test_tf2/test_tf2-9999.ebuild
+++ b/dev-ros/test_tf2/test_tf2-9999.ebuild
@@ -30,8 +30,6 @@
sci-libs/orocos_kdl
dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
dev-libs/boost:=[threads]
- test? ( dev-cpp/gtest )"
+ dev-cpp/gtest"
-src_install() {
- :
-}
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/turtle_tf/Manifest b/dev-ros/turtle_tf/Manifest
new file mode 100644
index 0000000..9605317
--- /dev/null
+++ b/dev-ros/turtle_tf/Manifest
@@ -0,0 +1 @@
+DIST geometry_tutorials-0.2.2.tar.gz 15148 SHA256 4b3fdc98bf4cb97ba2f1c40666901fa7d08eb3dfed0d3323de4841de2e3a22cc SHA512 5a6fe2e26d11d3fe8c1fc6979d1d76b13b01df23ef1f0d5e5df094aa0441e1ded33d2402b88be1143a88002ecde2a6bddc3b03efca713bd5521c68de2e054548 WHIRLPOOL b9ce88950911e87d008a19de08fb829e59f0c6e81711859125b3bf377fff907e6054d2229d8dd13c39baf395c3da3d749fcf62144c88caf9eab0d7d76026e518
diff --git a/dev-ros/turtle_tf/metadata.xml b/dev-ros/turtle_tf/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/turtle_tf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/turtle_tf/turtle_tf-0.2.2.ebuild b/dev-ros/turtle_tf/turtle_tf-0.2.2.ebuild
new file mode 100644
index 0000000..5f86213
--- /dev/null
+++ b/dev-ros/turtle_tf/turtle_tf-0.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Demonstrates how to write a tf broadcaster and listener with the turtlesim"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf[${PYTHON_USEDEP}]
+ dev-ros/turtlesim[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf/turtle_tf-9999.ebuild b/dev-ros/turtle_tf/turtle_tf-9999.ebuild
new file mode 100644
index 0000000..5f86213
--- /dev/null
+++ b/dev-ros/turtle_tf/turtle_tf-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Demonstrates how to write a tf broadcaster and listener with the turtlesim"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf[${PYTHON_USEDEP}]
+ dev-ros/turtlesim[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf2/Manifest b/dev-ros/turtle_tf2/Manifest
new file mode 100644
index 0000000..9605317
--- /dev/null
+++ b/dev-ros/turtle_tf2/Manifest
@@ -0,0 +1 @@
+DIST geometry_tutorials-0.2.2.tar.gz 15148 SHA256 4b3fdc98bf4cb97ba2f1c40666901fa7d08eb3dfed0d3323de4841de2e3a22cc SHA512 5a6fe2e26d11d3fe8c1fc6979d1d76b13b01df23ef1f0d5e5df094aa0441e1ded33d2402b88be1143a88002ecde2a6bddc3b03efca713bd5521c68de2e054548 WHIRLPOOL b9ce88950911e87d008a19de08fb829e59f0c6e81711859125b3bf377fff907e6054d2229d8dd13c39baf395c3da3d749fcf62144c88caf9eab0d7d76026e518
diff --git a/dev-ros/turtle_tf2/metadata.xml b/dev-ros/turtle_tf2/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/turtle_tf2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/turtle_tf2/turtle_tf2-0.2.2.ebuild b/dev-ros/turtle_tf2/turtle_tf2-0.2.2.ebuild
new file mode 100644
index 0000000..64d8a70
--- /dev/null
+++ b/dev-ros/turtle_tf2/turtle_tf2-0.2.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Demonstrates how to write a tf2 broadcaster and listener with the turtlesim"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf2
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+ dev-ros/turtlesim[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild b/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild
new file mode 100644
index 0000000..64d8a70
--- /dev/null
+++ b/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Demonstrates how to write a tf2 broadcaster and listener with the turtlesim"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf2
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+ dev-ros/turtlesim[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/ammeter/Manifest b/dev-ruby/ammeter/Manifest
index b0cd0b4..9cf4ac1 100644
--- a/dev-ruby/ammeter/Manifest
+++ b/dev-ruby/ammeter/Manifest
@@ -1 +1,2 @@
DIST ammeter-1.1.2.gem 18432 SHA256 99c55552b25ad39598b7f45d24fa849853cff4abcef235d35fa6f8ffd427b1d5 SHA512 af723c7e4111862678902dfdba734b34c9893b6cd5a8dab754c24b41baf672bafab1044a2928f61d5078e82055ccfe2c05a060b1f8e4f4da164147ffd8241f6a WHIRLPOOL 21b38bf2a1781f664761e5c822ca1ab6c8346d6020b863cdbff3ed0238a618989aa66b2642207b8a3deee74fb6d521169a397ebc10a41e4b4a2d6cf06baf8c8c
+DIST ammeter-1.1.3.gem 18432 SHA256 7161be2080f78b5c41dbeb92ae1f0db450634493795c6b962e68d611ce03086a SHA512 57428515435dc50e6feaf64f647c64d28ea345360e8ef324d4b6c10902658bf30685902e862e4526be105291620aa191e134a80762abbc9625062c485fb45cf0 WHIRLPOOL dad6a009244daaa646ff333fae92f18fe5a09d24cd77ecea15aa87253a72a329f7676e0b578fa009b05ea3a3493897daa55e09e668147bfeecc67df6f5c2bc23
diff --git a/dev-ruby/ammeter/ammeter-1.1.3.ebuild b/dev-ruby/ammeter/ammeter-1.1.3.ebuild
new file mode 100644
index 0000000..4ba9d88
--- /dev/null
+++ b/dev-ruby/ammeter/ammeter-1.1.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Write specs for your Rails 3+ generators"
+HOMEPAGE="https://github.com/alexrothenberg/ammeter"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Restrict tests since they now require the specific rspec version to be
+# provided in an environment variable.
+#RESTRICT="test"
+
+ruby_add_rdepend "
+ >=dev-ruby/activesupport-3.0:*
+ >=dev-ruby/railties-3.0:*
+ >=dev-ruby/rspec-rails-2.2:*
+"
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/rails-4.0
+ >=dev-ruby/uglifier-1.3
+ >=dev-ruby/rake-0.10
+ >=dev-ruby/coffee-rails-4.0
+ >=dev-ruby/sass-rails-4.0
+ >=dev-ruby/jquery-rails-3.0
+ dev-util/cucumber
+ dev-util/aruba
+ dev-ruby/sqlite3
+ dev-ruby/bundler
+ )"
+
+all_ruby_prepare() {
+ # fix the gemspec; we remove the version dependencies from there, as
+ # it requires _older_ versions of its dependencies.. it doesn't
+ # really seem to be the case though. Also remove the references to
+ # git ls-files to avoid calling it.
+ sed -i \
+ -e '/git ls-files/d' \
+ -e '/\(cucumber\|aruba\)/s:,.*$::' \
+ ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # haml-rails is not packaged
+ sed -i -e '/haml-rails/d' ${RUBY_FAKEGEM_GEMSPEC} Gemfile || die
+ rm -f spec/ammeter/rspec/generator/matchers/have_correct_syntax_spec.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} -S bundle exec ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/arel/Manifest b/dev-ruby/arel/Manifest
index 9d8fefa..51b7428 100644
--- a/dev-ruby/arel/Manifest
+++ b/dev-ruby/arel/Manifest
@@ -1,5 +1,5 @@
DIST arel-3.0.3.gem 48128 SHA256 c0006e2169deee3b8cc2d258296388822eeb2db59832450b9b7316e1387d0da4 SHA512 88508336c02ad162cbd7aeed30639f0ff996b9c60f16731cfe5ff1c0ec37e337cee9f3ad225b7f77dfe2e6a8818ee34df6159af015f07e775b25b7a2ee30a1df WHIRLPOOL 4355dfb99a1239b53dda69e758c486f425b25cb50ff9ac19dfb1fe77146b0733bc5f26f4a643b055b5babe56d86493a27e68a36afdf5be5e8eea780893d4414a
DIST arel-4.0.2.gem 52736 SHA256 eddf4c7794df8ba2673e0d0f35e3f7b064f346c6f5be098a36e293e5c9c53a26 SHA512 dd7293388d99115c0511c9ece52adeb0fb0f9fbf5178d42e7fa54e1d2de4ef8ee0dae11be605851276591e540225fd96c9f50773e2a475db198c12bcb0bda8f5 WHIRLPOOL bf0c550b77efaff501bbea9eb3312aadfb0838d0e6e0c8f3bf2019d2499618bf5cbe2f4b754778b659d20db788f61d2158af3867282b50285fd73bfa2daeccf7
DIST arel-5.0.1.20140414130214.gem 52224 SHA256 c941f07bad89af26e8837c73d8a399b7777c721609f759eda015ed0081601636 SHA512 9f4c768712492ef8f7a938d89ce9c54c4e7c7ec2ff53ee52d5d12f0cefd7960895049f112b772864d034a4419acab91511173ddaab70a9f3d4027899af150011 WHIRLPOOL ebfae83108a1049dff2cdeb697c1c0514baa2ebdfbc0d885e586240397b33af8be8181268017a759fab9b7655992abceed844d80b91f8d85f8e9dfca98c3bc32
-DIST arel-6.0.0.tar.gz 51889 SHA256 9670d35a23a906c3f1f83b976df149fb3fbb7c6df0b82e446fade60ac5e58d3a SHA512 c638a8dd782abe11061f21f23188ea8af506ff6f76889fdc65874c71dd163c2c44bd908ba8571eeb569f6953f42afa2aae8974b0aa6158c4fc2623492b7d2b0a WHIRLPOOL 9347e130147ecf3d89df292b51c7b4a0022689c56ab254fa05091ff03ddffcb700ae7a1028de58eaff2c67075fbf203d11ca26852890d8d24cc9b4830340c906
DIST arel-6.0.2.tar.gz 51951 SHA256 5bb34a5dd4257a6f05b31f565db9c370df302f053ac42a63ea3f997fe8c593a3 SHA512 b7ad77a32b88296a2fe7b52ffbcfb2d5e7deb32c2dd02286a3c25563a565d323efa82a38047515f6e5bd9f99b5476f5aaeb2198f8213f5bb818dcf041817de90 WHIRLPOOL c27b868404e8dcee11ac24b5bed05052e8ab16b66eba0379a319e2a13f40b5f008994fbad599099e112a72fe2c54d157e8445ed0f27b9a089971e5bf769b0b8c
+DIST arel-6.0.3.tar.gz 52003 SHA256 476a51333ec8588213bbd91174af239d4910a68cd14a99de29d44ca5c24ec37a SHA512 8e04daacae0b07fd02c5623e86b87940e0d712e0ab7d85354d2ba8a9e0cc30d1549f128a39732d8dac5b83f3f77c1bfadb650b5726d1faf2bfeb64e0d51a8f04 WHIRLPOOL cae263da4bf2f3f869b3d658b0ced3f57349172f95ec05952ae6b2896704bc06c552814485ffcdc85d36f19ed68c386097e4b16c5317b05144b8176193896938
diff --git a/dev-ruby/arel/arel-6.0.0.ebuild b/dev-ruby/arel/arel-6.0.0.ebuild
deleted file mode 100644
index 8fbe00e..0000000
--- a/dev-ruby/arel/arel-6.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="arel.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Arel is a Relational Algebra for Ruby"
-HOMEPAGE="https://github.com/rails/arel"
-SRC_URI="https://github.com/rails/arel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
- test? (
- dev-ruby/bundler
- dev-ruby/test-unit:2
- >=dev-ruby/minitest-5.4:5
- )"
diff --git a/dev-ruby/arel/arel-6.0.3.ebuild b/dev-ruby/arel/arel-6.0.3.ebuild
new file mode 100644
index 0000000..9b31ccd
--- /dev/null
+++ b/dev-ruby/arel/arel-6.0.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.txt README.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="arel.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Arel is a Relational Algebra for Ruby"
+HOMEPAGE="https://github.com/rails/arel"
+SRC_URI="https://github.com/rails/arel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/test-unit:2
+ >=dev-ruby/minitest-5.4:5
+ )"
+
+all_ruby_prepare() {
+ sed -i -e "/[Bb]undler/d" \
+ -e '/specname/,$ s:^:#:' Rakefile || die
+
+ # Fix tests by providing an engine.
+ sed -i -e '591 s/new/new Table.engine/' \
+ -e '606 s/new/new Table.engine/' \
+ test/test_select_manager.rb || die
+}
diff --git a/dev-ruby/aws-sdk/Manifest b/dev-ruby/aws-sdk/Manifest
index bb15178..147b1da 100644
--- a/dev-ruby/aws-sdk/Manifest
+++ b/dev-ruby/aws-sdk/Manifest
@@ -1 +1,2 @@
+DIST aws-sdk-ruby-1.66.0.tar.gz 1774530 SHA256 265e20a99c17d3f476ce6f6e981fd37e8e529dac2a38eba1ef7a25205f8f49b6 SHA512 53b13bab1db26f9eb6ba411a7143377fbdc56548fe881742953f388af60508be30cc2c82a3dce89675be2c799774d30313d19b47875a52d4c9134ce5f4b1914c WHIRLPOOL 265d01034a3e31f8e12dc8962d67fa727e7123de0e5c56c633a84d4b7e91168f6c8ea9f4e4291ef54ef570f4675f2f087610bf11b11ec9efdb1c345c42dcb1ec
DIST aws-sdk-ruby-1.8.4.tar.gz 1476015 SHA256 c7b4634b845105fa9b8c5e994e13390894d2b0eba4a9841143e8a288b2df1931 SHA512 7b2acd2ced6ebb8cccaf44da50a4ee50967d856ee4d9c6020cd3c44c4549fce4336895a7a02e3f6249c1a96cb72d2a8c94d09241d90300e3fc0130b238a4fe6b WHIRLPOOL 2bcd8a65e8d1ac1031b8f4a5e18fdbe80c171a42c3db8cc4a0b07a07118ca62d82dcee681b379dd3b368ef91fc23483166326720e3660cb7ed1035617239dbd4
diff --git a/dev-ruby/aws-sdk/aws-sdk-1.66.0.ebuild b/dev-ruby/aws-sdk/aws-sdk-1.66.0.ebuild
new file mode 100644
index 0000000..8c83c45
--- /dev/null
+++ b/dev-ruby/aws-sdk/aws-sdk-1.66.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="ca-bundle.crt"
+
+GITHUB_USER="aws"
+GITHUB_PROJECT="${PN}-ruby"
+RUBY_S="${GITHUB_PROJECT}-${PV}"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Official SDK for Amazon Web Services"
+HOMEPAGE="http://aws.amazon.com/sdkforruby"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl
+ >=dev-ruby/json-1.4
+ >=dev-ruby/nokogiri-1.4.4"
+
+all_ruby_install() {
+ all_fakegem_install
+
+ insinto /usr/share/doc/${PF}
+ doins -r samples
+}
diff --git a/dev-ruby/bluecloth/bluecloth-2.2.0-r1.ebuild b/dev-ruby/bluecloth/bluecloth-2.2.0-r1.ebuild
index 5e25756..c9c1391 100644
--- a/dev-ruby/bluecloth/bluecloth-2.2.0-r1.ebuild
+++ b/dev-ruby/bluecloth/bluecloth-2.2.0-r1.ebuild
@@ -27,6 +27,7 @@
dev-ruby/hoe
dev-ruby/rake-compiler
test? (
+ dev-ruby/rspec:2
dev-ruby/diff-lcs
dev-ruby/tidy-ext
)"
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index 47cfcca..2bd86f9 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,5 +1,3 @@
-DIST bson-3.0.4.tar.gz 49517 SHA256 10a34e681804abfde9a2c047d9fa4554e40aef28f0a7114b88f7324215041de4 SHA512 8a57ff6706af44ef22841fdd33cd8c9d2ea4fd94dfde9f4fe94fdb08d95d3249b96939866459294c8258d99f37ff3e0ab8ac16b53fad1db6ddb26506135a4008 WHIRLPOOL 07f81925049e23c5f8f75e08b3eb4594e0df4a890bc864674d19a3a291eca8a58f121b3d045d14c44f454753dc3d0be425ff140d3d0eb72bc2cd8a61734d08d8
-DIST bson-3.2.0.tar.gz 50495 SHA256 a452bf4f77548697f36659413fa2c106e592d29b8259c285262a1db5c1ffae06 SHA512 258cd31e390cafb12b93d326686e2a08e55da44b458a68cbf5ce8ebc51a477844934a346a77914a9baf1004ca465b45d7399e7daab74b2b9e7389b7c23cbf777 WHIRLPOOL d8c192343dcabbf162d16dd4f19612ddeb43cdabe8e13559014db2ca2d7dda2c5df759631fba7f0f4ed7b5e2d76e7327dc4a46d695a792afbc84aaaf8f6b4489
-DIST bson-3.2.1.tar.gz 50640 SHA256 8e81a04bd433bd82fd558b1ef58b35a53448eb6dc9c85a808238b0d21dfa71d4 SHA512 c5565965615036608b87895d40d62b42193eb7ba31f168051222595f9095627157606ba8ba7966ed349ec05005645320ce10cc510e1fa47368f907368734fb0a WHIRLPOOL 1e1007132aeb99655f1af49de0696ba104d1ac9d63c09b3136e5e523318acb36c568fe813ecbd663212a109bd94486fda1074f12fd18b3336e600b239252a4e4
DIST bson-3.2.4.tar.gz 51208 SHA256 adcc339e4618fbd9bc8dc91677971118834adfd19bf6ae783d79308f2fb446b2 SHA512 d7817d5ec068895e4a883921dc8495aa9d44401b7a66c77f29b71434428efaf417f1219ebbb1bd7065a8beebba41c0c461e7b9f5376bc9259ada695f6eb97715 WHIRLPOOL 670239430ec0ccfe01a4a50d843fbc871faea06b0d5cf7db4cf53d32ec7a6dcca7ef06497589d1e0f4ee8e20e451bff33b7d0bcfea298b71dead22716f07eab2
+DIST bson-3.2.6.tar.gz 51846 SHA256 b7d848b93de622c32cc65cf6debf21aaa0e66d554d65cc7805dc8f76e56c55fb SHA512 da8d7c4e50bd5387a50f0ef471f1d854e0a1bf3f109bb793b16c8e4d110f6b98cb37aee126176eccb097c5d7814360ef85e96be4aa4704226a8490984a5dd3f2 WHIRLPOOL ece0e17aca10f684cdbea703702b5f886340fe93ede11045430c7711f2d546c5e2558003261d8252a29a55fc999664be0315f0ac693d02181a9dcf006d44a3c6
DIST mongo-ruby-driver-1.12.0.tar.gz 360669 SHA256 84c87d26601c9bd91a6604bcb3630be50d239e471542f9b0a68379705dd03e11 SHA512 725110c527867379def85fde50b6825e94a320356f062e4403d9d55c223f2503676f83ae42916d6ab45afd90d30b2a4272519e070c4af2095c0965297fd72bb6 WHIRLPOOL c152aa579a0535707909560cc73fc878521aac95c034ec71bca6c2397754b5e057c1e7ca32f6b2b3393ce975f122e65926820cdde29aa5f5734fb9717bd980e0
diff --git a/dev-ruby/bson/bson-3.0.4.ebuild b/dev-ruby/bson/bson-3.0.4.ebuild
deleted file mode 100644
index 86254a6..0000000
--- a/dev-ruby/bson/bson-3.0.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="bson-ruby"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
-HOMEPAGE="http://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="bson-ruby-${PV}"
-
-LICENSE="APSL-2"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE="test doc"
-
-ruby_add_bdepend \
- "test? (
- dev-ruby/rake
- dev-ruby/shoulda
- dev-ruby/mocha
- dev-ruby/test-unit:2
- )
- doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
- # Remove bundler support
- sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
- # Remove project-specific rspec options
- rm .rspec || die
-}
-
-each_ruby_configure() {
- ${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
- emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
- cp ext/bson/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/bson/bson-3.2.0.ebuild b/dev-ruby/bson/bson-3.2.0.ebuild
deleted file mode 100644
index 86254a6..0000000
--- a/dev-ruby/bson/bson-3.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="bson-ruby"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
-HOMEPAGE="http://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="bson-ruby-${PV}"
-
-LICENSE="APSL-2"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE="test doc"
-
-ruby_add_bdepend \
- "test? (
- dev-ruby/rake
- dev-ruby/shoulda
- dev-ruby/mocha
- dev-ruby/test-unit:2
- )
- doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
- # Remove bundler support
- sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
- # Remove project-specific rspec options
- rm .rspec || die
-}
-
-each_ruby_configure() {
- ${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
- emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
- cp ext/bson/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/bson/bson-3.2.1.ebuild b/dev-ruby/bson/bson-3.2.6.ebuild
similarity index 100%
rename from dev-ruby/bson/bson-3.2.1.ebuild
rename to dev-ruby/bson/bson-3.2.6.ebuild
diff --git a/dev-ruby/coolio/Manifest b/dev-ruby/coolio/Manifest
index 4758da0..00fe22a 100644
--- a/dev-ruby/coolio/Manifest
+++ b/dev-ruby/coolio/Manifest
@@ -1,2 +1,3 @@
DIST cool.io-1.2.1.gem 112128 SHA256 2ed7857bb7ec5c53e683a05db07798f0adbaaef35a960d9e0addfacc1fe6b684 SHA512 778605986fb33b1370d780cc986921b09dea2a4e54464753042b83c18d5a18d61f83920050bcc1f2452354d3965bbd0be26f56fafc4ec4700772e8350da33ccb WHIRLPOOL 57dfd569f7a4786e546a67a0b89a1335358f3f1621f265f554647636406218e6d95f0c4d85e498f38c9827c186d524487002d0a57fc8444caf931bd18691d01f
DIST cool.io-1.3.0.gem 105984 SHA256 f053b308cca450efa2d6e5195f8111e42302732cd38345c9d326af2786027de8 SHA512 0c7c3fa132b603a44e02eecc13c4ca0fdf11d4ddc90bcc7b3bda0c40c198116b1b9c5724a835e0734875a1a58c3c79974c2add7c6e5ec2036598f8a221cadbe8 WHIRLPOOL 640bff16aab808fbc879ca971d19de482338c944e9ac2febaefc4fdbceda45cc91075e668387b90188bbf71da08a3d8e08e366990c18f505b5a03d731c5eb622
+DIST cool.io-1.4.1.gem 109056 SHA256 3c40726d3f567e19ffa7db9a565c365793b637b4c1f1650d7dde479d35371164 SHA512 4226e02a0ec81379298389df779d11803a6dfe7853fad42b400e0b154c690cc01f7cb34e50e46b56edf04718195a9aff8e79b0de366f2f1f872567b23bbbb6b3 WHIRLPOOL a27d00ae8e90c29a7b5db0bf0b4e20374a58801838a8da1ffaca584c74c473808e90efa5af6abe5175598e802202f388f7d2a9731de3af5825d8c4e60567eb91
diff --git a/dev-ruby/coolio/coolio-1.4.1.ebuild b/dev-ruby/coolio/coolio-1.4.1.ebuild
new file mode 100644
index 0000000..66d55b4
--- /dev/null
+++ b/dev-ruby/coolio/coolio-1.4.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# iobuffer: -rbx
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+RUBY_FAKEGEM_NAME="cool.io"
+
+RUBY_FAKEGEM_GEMSPEC="cool.io.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A high performance event framework for Ruby which uses the libev C library"
+HOMEPAGE="https://coolio.github.com/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND+=" >=dev-libs/libev-4.19"
+RDEPEND+=" >=dev-libs/libev-4.19"
+
+RUBY_PATCHES=( "${PN}-1.1.0-libev.patch" )
+
+ruby_add_rdepend ">=dev-ruby/iobuffer-1"
+
+all_ruby_prepare() {
+ rm -r Gemfile* ext/libev ext/cool.io/libev.c lib/.gitignore || die
+
+ sed -i -e '/[Bb]undler/d' Rakefile || die
+ sed -i -e '28i s.add_dependency "iobuffer"' ${RUBY_FAKEGEM_GEMSPEC} || die
+ sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Avoid dependency on rake-compiler
+ sed -i -e '/extensiontask/ s:^:#:' \
+ -e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
+
+ # Remove specs that require network connectivity
+ rm -f spec/dns_spec.rb || die
+
+ # Use one address consistently
+ sed -i -e 's/localhost/127.0.0.1/' spec/{udp_socket,tcp_server,iobuffer}_spec.rb || die
+
+ # Remove specs that fail, possibly due to libev
+ # incompatibility. Should be investigated but cool.io is no longer
+ # maintained.
+ rm -f spec/udp_socket_spec.rb || die
+}
+
+each_ruby_configure() {
+ ${RUBY} -Cext/cool.io extconf.rb || die
+}
+
+each_ruby_compile() {
+ emake V=1 -Cext/cool.io
+ cp ext/cool.io/cool.io_ext$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/daemons/daemons-1.2.3.ebuild b/dev-ruby/daemons/daemons-1.2.3.ebuild
index f570879..d7a3d53 100644
--- a/dev-ruby/daemons/daemons-1.2.3.ebuild
+++ b/dev-ruby/daemons/daemons-1.2.3.ebuild
@@ -17,7 +17,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc 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/dbf/Manifest b/dev-ruby/dbf/Manifest
index 1de29e0..2092fa2 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -1,3 +1,4 @@
DIST dbf-2.0.10.gem 122880 SHA256 9426c197abf49633f850b2b0e97e6e9352dea050fe5a38b9301844abef3abf92 SHA512 80ede55b9672b831e8d598c269116a93446b966394c63aef1008e1b20b8d0db2cfb52320eb234182c8f841b301f5018ad39ef66589ee614772a68572d1855275 WHIRLPOOL e83f8aeb5f37c4a33815445175707119f5e67b381e9ca2533578433d55c4a5f33b498ef5b17808bbac04f368ff0f3ef36afbc8c3262d99291f8f045b124f30db
DIST dbf-2.0.11.gem 123392 SHA256 721529cc1a24b99e2563fdb9fb158615930b13b2e2ed67d1f973c33e7205625f SHA512 fa5cbcb64e114e24b0fbd2c8bdfba309238c854cd407798b0d8cd5a717a0d598713b0150055b4507813be59f1d9b8678721f1cca75f0562cdd121e222a52c353 WHIRLPOOL d399a82d6c0281da667e0eec19e337bd6a7e5f20e690dd63b55d111646009c3bd02140d54f82b56ec356b3b3da525e0bb4fea23120c5f8cab2cb115ad2ff0d00
+DIST dbf-2.0.12.gem 123392 SHA256 1bea0edefa1638dfd2018c53e8283e7ccefbbd889ff6761178eb20bf4c7603b9 SHA512 c43914baa9bd5c4fb796d95402bd6943e53aeb5e11fda1a707e0e538cb165fddf4c08cd7631b1a1528ea36f23afb8a94f44d222aa388139008a56015f93c61f0 WHIRLPOOL a807a9fc72f6fabfa6d01a3219b4cdd2d500c0aeb600772cfc729ee994e908e460cbc802feb716d600e008dcb3e026d175e74ef39568cc05ed4a8b9d280db483
DIST dbf-2.0.8.gem 115712 SHA256 d953117337e3d12720815304b5e584ccdd7d081b65d0a01dd2d825087e1b4f79 SHA512 b2098359f88b5df50113af979d0d95591b1b15db22e8554bced14f4a5190ac3f490971e7f857bb832d4957f82e6f82d5cbcea0332401a54cf41b897bfb1f3b74 WHIRLPOOL 7afdf410cfc43009e407a14ffe5944d1639ec4318d9517314b9d41734341777ce5833033462accf3ea699d26b4fd4a3fb410875ee4b9eda197199cefd3db7836
diff --git a/dev-ruby/dbf/dbf-2.0.12.ebuild b/dev-ruby/dbf/dbf-2.0.12.ebuild
new file mode 100644
index 0000000..d251e2d
--- /dev/null
+++ b/dev-ruby/dbf/dbf-2.0.12.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
+database files"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+ sed -i -e '/fastercsv/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index 079210c..a8dacb2 100644
--- a/dev-ruby/domain_name/Manifest
+++ b/dev-ruby/domain_name/Manifest
@@ -1,3 +1,4 @@
DIST domain_name-0.5.22.gem 94720 SHA256 cb8bbf0f14f9fa97f0ae9de40fa785f3a6c0b26cdd903afef165af2821907364 SHA512 e859e8fe90c98eda90d038843544719e60f4d1a12c50e77b892cbdcd34ea9c46fa314a9799cce71eb9393e2ef2c956cc013c96a893cbec13e98a11a3768b6697 WHIRLPOOL bb398969cfa3b4fa3b72d75f94fa343ef1724be95b8330810cdd371b3b3b4da2b61c125877a13949985d92eb66b8899a9699dca1156ec71530b1f106b6182d7f
DIST domain_name-0.5.23.gem 99328 SHA256 f1269404aa9611427e2733a75adcc0fc028a8143b7c9bdabbce58bad76a0b662 SHA512 a6693e952db042198935238b1609d2a497eb07d9c72458f5826be475b9d382c944f20bd912c4cda5135b8bb82a4dc4416bd65e23fd6196a20f5f2718c029bab2 WHIRLPOOL 2fd57ada46eb7c9e160d2605f19be1eb89fad0125e9a96687965a55a29663d72f357c46ab2ed753d824669d5ea5200b950ca57ebcbdd956d74a5c508afa237dc
DIST domain_name-0.5.24.gem 104448 SHA256 8cbd6aea8859823f89aefeec49232e9d4377456fd42d08accfbc0cc6b32a55f6 SHA512 46caf0be89c3b2f38f79180c14f4eaa1096f12f80feb881dafb394033d2c6118f481c898310d281d15acd5b9a54473c9d9ee8f0e77dda5b03c40a0d6f137f602 WHIRLPOOL df40be6b18f08f242bafeb985a93692e3286a3889b738790108c7df64eff90dfe28c874b06f7cefd7e8ee295753126ee2d32ceb89dca65c71b95721064301161
+DIST domain_name-0.5.25.gem 112128 SHA256 5b492888a095f2f00027a268932c93d0432bf8ada568a5c601ff53ce6a761b9b SHA512 cdc89ef2cc93d014727e203ffaa3921f3548077bcf4dfacc83a03f887a88393cea01efcf072ca785b375a6b24cdbd69f201f2fbd81a7341595e6ed2a5d2b362c WHIRLPOOL 1f5a9577aab4aea61eb88d590bd52b07cb21c597646ad28fce6631baee3ea527282393ce392a830232081a70c0628c6666e0fb29d5aec640cae44ff887d0261b
diff --git a/dev-ruby/domain_name/domain_name-0.5.25.ebuild b/dev-ruby/domain_name/domain_name-0.5.25.ebuild
new file mode 100644
index 0000000..2835d4b
--- /dev/null
+++ b/dev-ruby/domain_name/domain_name-0.5.25.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Domain Name manipulation library for Ruby"
+HOMEPAGE="https://github.com/knu/ruby-domain_name"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/test-unit-2.5.5
+ dev-ruby/shoulda
+ )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die
+ rm Gemfile* || die
+
+ # Remove development dependencies
+ sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
+ ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Avoid dependency on git.
+ sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+ ruby-ng_testrb-2 -Ilib:test test/test_*.rb
+}
diff --git a/dev-ruby/eventmachine/eventmachine-1.0.3-r1.ebuild b/dev-ruby/eventmachine/eventmachine-1.0.3-r1.ebuild
index 0e8a5f7..ab06620 100644
--- a/dev-ruby/eventmachine/eventmachine-1.0.3-r1.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.0.3-r1.ebuild
@@ -22,9 +22,9 @@
IUSE=""
DEPEND="${DEPEND}
- dev-libs/openssl"
+ dev-libs/openssl:0"
RDEPEND="${RDEPEND}
- dev-libs/openssl"
+ dev-libs/openssl:0"
ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/eventmachine/eventmachine-1.0.3-r2.ebuild b/dev-ruby/eventmachine/eventmachine-1.0.3-r2.ebuild
index 2bafdeb..6ae9778 100644
--- a/dev-ruby/eventmachine/eventmachine-1.0.3-r2.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.0.3-r2.ebuild
@@ -21,9 +21,9 @@
IUSE=""
DEPEND="${DEPEND}
- dev-libs/openssl"
+ dev-libs/openssl:0"
RDEPEND="${RDEPEND}
- dev-libs/openssl"
+ dev-libs/openssl:0"
ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index 196aa9b..f65427c 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,2 +1,3 @@
DIST faraday-0.9.0.tar.gz 53998 SHA256 0b3503ca485e25082ae20d67ec1f3594d802dc28e5f61e857b741520216f2927 SHA512 d69db4fced6edb7f161078d2fb3d60f11d8bbc14785e08a6aae262915a23cd3fd1f1b871a269491738e623b6b804626e812223678a5e3cc133baafc485c87dd4 WHIRLPOOL 3924f408edb4cc1e3d5df35c0b052f1f12d2f575b1671a4d5aaf4eb7b33e925e3fc5683b564e6d58ab556675022594abace05cf984b83652948c0e0e5c18a313
DIST faraday-0.9.1.tar.gz 56944 SHA256 27c82ff6eb0b25da7077bd724edc545bc9438e25554fa259434f825ffeb20da5 SHA512 9686f8fd5adc4380dee0cefc3a18f3b8dbe9a7785bfea5e0332dbb6f4d3af4311698e87eb6ac7f070fd758d68fb5f9cf9beec81e86a05da7fe6a5ba6fded1a3b WHIRLPOOL 59f060c2bb1441de7fd55565050e8c47f826c3361b2ca37bac2f812d5f9ba4b49a639f37bb2bc73d49ed5c3e0c1633b7c82bd428fa0ebc01e5d68defbe0deb09
+DIST faraday-0.9.2.tar.gz 57013 SHA256 ceaf7838acc09c3c4401f74e49f3169cd20922258817f3af817fe7eedcb592f3 SHA512 12c4ead8dca6baf6292291943ea1aab1a534509bf92c6e0a621c1c69e3493480fced68aa529d8678847028f2fc2a7672411df7e4d09e65a5e764c957fed1ee72 WHIRLPOOL d2c4545c7b3320099aa1c5cc85fe1ebbb508749abdcf80de6cdf9e98b642f356e9f0b9174e5191b531406c7df39a326f9e4e5f77d0699c85a915699a92983b6e
diff --git a/dev-ruby/faraday/faraday-0.9.2.ebuild b/dev-ruby/faraday/faraday-0.9.2.ebuild
new file mode 100644
index 0000000..d72206c
--- /dev/null
+++ b/dev-ruby/faraday/faraday-0.9.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
+ruby_add_bdepend "test? (
+ >=dev-ruby/test-unit-2.4
+ dev-ruby/httpclient
+ dev-ruby/rack-test
+ dev-ruby/sinatra
+ dev-ruby/net-http-persistent
+ dev-ruby/patron
+ )"
+
+all_ruby_prepare() {
+ # Remove bundler support.
+ rm Gemfile || die
+ sed -i -e '/[Bb]undler/d' Rakefile test/helper.rb || die
+ sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
+
+ # Remove simplecov and coveralls support, not needed to run tests.
+ sed -i -e '/simplecov/,/^ end/ s:^:#:' test/helper.rb || die
+
+ # Remove tests for adapters that are not packaged for Gentoo.
+ rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
+
+ # The proxy server is already killed, may be OS X vs Linux issue.
+ sed -i -e '138 s/^/#/' script/test || die
+
+ sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+ # Make sure the test scripts use the right ruby interpreter
+ sed -i -e 's:ruby:'${RUBY}':' script/* || die
+}
+
+each_ruby_test() {
+ each_fakegem_test
+
+ # Sleep some time to allow the sinatra test server to die
+ einfo "Waiting for test server to stop"
+ sleep 10
+}
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index f12f8d1..e83ebc7 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,2 +1,2 @@
-DIST faraday_middleware-0.9.1.tar.gz 20960 SHA256 2d0b7b205e46712addeb6f8c154e7376c4d3c17ed6fb214d79172e94f1b6ab73 SHA512 208f3f62354d2b3b6767e49be6a07f8610a1791678915e2ca24573b6e1179a02f9fdad41c171516497789e410765812f537a6c6b8249227a5f6e5bc1c4b37855 WHIRLPOOL e2b18b099fd7c37cc25fd5fa704218a2c2cc30605ad897af5963824d1257f9e1ec7114352c233bed13354cfca33e2deb2d28ba563f9baad8f5c0d5f50d912a67
+DIST faraday_middleware-0.10.0.tar.gz 22646 SHA256 210e69fc76e2f5c2b76771452e1b859129869961749262e16bee7b50ff98ddc3 SHA512 f516f040a7be7b14635e8685d6d63647fd49ef595f31c655b6cd8e6b9443a80e1d4c68a516cd4088c129a73e411748d15d97b24cbcf321fd15953292ca3c7964 WHIRLPOOL 5c1b3d64358a71b35bd7b721ffff1e76da248e59b3eff6404ef0d46c8c149d1c5045422b05a10bef5205d2bf65c19edff6ad7f96c7ff863ee4a3bd05def2035b
DIST faraday_middleware-0.9.2.tar.gz 21926 SHA256 014cfce128eb50a696168eb012e830c349c52c9e6ae25a5bbaea30f2c59de17d SHA512 74d0a63eac16f119ca2c2c6da16fe3b7a1c9e6949044ec312ed5828544bb83e3bdfd65a1991cfb1fdeb29543f1ee978781bed76299361683b69ed362feb4f18d WHIRLPOOL 3c4ebb2c690fb9624d7f908cc2b31e87264b7746d48873494e23de642067b2149e5fd115e27d00c332d652ad7f2321396a52ee8d09242169c952863859c43bad
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.10.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.10.0.ebuild
new file mode 100644
index 0000000..74cf6b4
--- /dev/null
+++ b/dev-ruby/faraday_middleware/faraday_middleware-0.10.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Various middleware for Faraday"
+HOMEPAGE="https://github.com/lostisland/faraday_middleware"
+SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+parsexml +oauth +mashify +rashify"
+
+ruby_add_rdepend "
+ >=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-0.10
+ parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
+ oauth? ( >=dev-ruby/simple_oauth-0.1 )
+ mashify? ( >=dev-ruby/hashie-1.2:* )
+ rashify? ( >=dev-ruby/rash-0.3 )"
+
+# Bundler must be used because the optional dependencies have different
+# version requirements that must be resolved.
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ >=dev-ruby/multi_xml-0.5.3
+ >=dev-ruby/rack-cache-1.1
+ >=dev-ruby/simple_oauth-0.1
+ >=dev-ruby/hashie-1.2
+ >=dev-ruby/rash-0.3 )"
+
+all_ruby_prepare() {
+ sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
+ -e '/rspec/ s/>=/~>/' \
+ -e "/simple_oauth/ s/, '< 0.3'//" Gemfile || die
+}
+
+each_ruby_test() {
+ ${RUBY} -S bundle exec rspec-3 spec || die
+}
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild
deleted file mode 100644
index af36868..0000000
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Various middleware for Faraday"
-HOMEPAGE="https://github.com/lostisland/faraday_middleware"
-SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+parsexml +oauth +mashify +rashify"
-
-ruby_add_rdepend "
- >=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-0.10
- parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
- oauth? ( >=dev-ruby/simple_oauth-0.1 )
- mashify? ( >=dev-ruby/hashie-1.2:* )
- rashify? ( >=dev-ruby/rash-0.3 )"
-
-# Bundler must be used because the optional dependencies have different
-# version requirements that must be resolved.
-ruby_add_bdepend "test? (
- dev-ruby/bundler
- >=dev-ruby/multi_xml-0.5.3
- >=dev-ruby/simple_oauth-0.1
- >=dev-ruby/hashie-1.2
- >=dev-ruby/rash-0.3 )"
-
-all_ruby_prepare() {
- sed -i -e '/\(cane\|simplecov\)/ s:^:#:' \
- -e '/rspec/ s/>=/~>/' Gemfile || die
-}
-
-each_ruby_test() {
- ${RUBY} -S bundle exec rspec-2 spec || die
-}
diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest
index 8458a74..2e9770e 100644
--- a/dev-ruby/gettext_i18n_rails/Manifest
+++ b/dev-ruby/gettext_i18n_rails/Manifest
@@ -1,2 +1,3 @@
DIST gettext_i18n_rails-1.2.2.tar.gz 20254 SHA256 4bdaff360864211ee8739155f881cbe505d36ae8ec0d592c8180779f6f84a35e SHA512 c2a02a2aaa118581e81b3ff375ebfb8b4e58fc2313e8d7f321d881370b546d906eec51f848d27f2996ca16938bc7580ed6c27d780d1531a251578ce9260bcb40 WHIRLPOOL c674993506104a8475b7a2be422f11558aa001f362cdc7786fc27cf3b44368ce5855a0ecdc555e28345ad81cd14c70d785c5952cd8bbf6506a0720534c658d38
DIST gettext_i18n_rails-1.2.3.tar.gz 20252 SHA256 48af9946c8165ece5c1c94c01045596e25f00bc679e3eb835e45992663444fd7 SHA512 b28bea0100ca5dd307ead1b77f4e71b491eb12899d772394c6e3ea73150ef4277c7305de0dfd2429ccc635af462f0b0f4f42280cdb666ebc7cee2cf9a43a04a2 WHIRLPOOL f54222b9940b58e16a2e1e27eb36d044ae42fe4b9ed1e06edeb57f5ea1e1ebc727de1cd564cd3679f0851b47fc5ebe93d3913a2ef90de8ebd56917a08ba19913
+DIST gettext_i18n_rails-1.3.0.tar.gz 20218 SHA256 b52a90e45d6bcdfac828cebbf52892ccadb320d148bb14a8267f8545b4347877 SHA512 90136a441aad8c5b26fe39454b675b444ff5cdfa87c4d6ec1738583ea5b6db793b1d05db94e9084905249a75f19239acf5812e6e8350d3ee2537aed76387c2d2 WHIRLPOOL b8503ad978faeeaff0a966be62392bbc0ef4361f28575e50afb799431fb311368b656a4c702749d4dd12f2e342f4c79abe5fe1cd56f64aa41441c073e53449e6
diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.0.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.0.ebuild
new file mode 100644
index 0000000..d424d4a
--- /dev/null
+++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="FastGettext / Rails integration"
+HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rails:4.0 dev-ruby/activerecord:4.0[sqlite] dev-ruby/temple )"
+ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0"
+
+all_ruby_prepare() {
+ rm Gemfile Gemfile.lock || die
+
+ # Remove specs for slim and hamlet, template engines we don't package.
+ rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
+
+ # Test against Rails 4.0 (newer versions don't work and we don't use
+ # appraisals for now).
+ sed -e '1igem "rails", "~>4.2.0"' -i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/hashr/Manifest b/dev-ruby/hashr/Manifest
index 58af1df..49779bd 100644
--- a/dev-ruby/hashr/Manifest
+++ b/dev-ruby/hashr/Manifest
@@ -1 +1,2 @@
DIST hashr-0.0.22.gem 9216 SHA256 476445351aed46deed60fabe2012f7cca3795864ea3e64bba0cc7d0f348faeb3 SHA512 92ae0718261ddb9731c546d408d3013cd0920d89e8e4b3a867ef1403bce14b0f7e296723f6b1d70eabf7b7a0df3b6e5ba6722d84ed0de4d619cda60c18a84555 WHIRLPOOL 18e01a1d91074df921b32a73ce0f7666ad6c8baccf2613a373664b7d4d1ae2c9ed5567609beb5d2c556d11d06155021cf729f77e57b992197b7ffcc9fa758c94
+DIST hashr-1.0.0.gem 10752 SHA256 2cc847de0d51905662f818f947a5a65f908bfff74742bfe1aff6de175ead3f88 SHA512 3d60f35804fd10f797be694b5bf1dd64d1a6c3e0d07572873ebb86f8dcaa9d979a777d29d92531fe784cc63b0b52b39bcfe19a438b0b359080590a23e93ab31f WHIRLPOOL 389e120b94d2e4571881e900490cb0eca819e96f1b35a48f9ecc621f99a547c1d1a7de38e455aecc6a0f510b2750af54269bfa3faae75711da92454f703f6e0d
diff --git a/dev-ruby/hashr/hashr-1.0.0.ebuild b/dev-ruby/hashr/hashr-1.0.0.ebuild
new file mode 100644
index 0000000..068c477
--- /dev/null
+++ b/dev-ruby/hashr/hashr-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Hash extension to make working with nested hashes easier and less error-prone"
+HOMEPAGE="https://github.com/svenfuchs/hashr"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/d' test/test_helper.rb || die
+}
diff --git a/dev-ruby/hoe/hoe-3.13.0-r1.ebuild b/dev-ruby/hoe/hoe-3.13.0-r1.ebuild
index 981d547..0607b0d 100644
--- a/dev-ruby/hoe/hoe-3.13.0-r1.ebuild
+++ b/dev-ruby/hoe/hoe-3.13.0-r1.ebuild
@@ -19,7 +19,7 @@
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=""
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index fbea505..d95e1d1 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -1,5 +1,3 @@
DIST http-0.6.3.gem 67072 SHA256 bbefb6ab1255f2967437b0ea9b29058066c89b1e30448e3494ca3840432cb272 SHA512 e5fe784e833da30e5ef6bcdc43b45a04fcf03d827b8336853591c5ba67b5ccf45cc18849ec4a78f3a0526b05cc50da2a7aadd5ea211284fe73f8dddbe89c642b WHIRLPOOL e231732948a938310280ecdac254c98607a473d29e2ffbc9a36a9c0dc4144f5c54e8a52603581391eb6a5046e932d41817d57b516c8dcd4099c7fc8a2bcfe86f
-DIST http-0.8.12.gem 71168 SHA256 12a8a0f88f7edc70efe9c773dd6025ca70d9e1be24d18d37b2990be893d02713 SHA512 6e25b185092dec0f59f3bb6ee47817a3f53df4090fcb07cf163a39389732f3a13fde63c6eca93a3b0f3423640ea791585903a24a7339fe594a268c66aec3c51e WHIRLPOOL 83ca8abeb1f276832da544f3d15869576c2b14687e1db6b9026c3180a671f0598d1836e7f94f56e332f786dc36657344b63902663bcb85e98d534bbfdf7fd9a8
-DIST http-0.9.0.gem 64000 SHA256 1c24039281a60d6f072748e733a0540be6764e5a31d1d29fb6f8db3e9b67fe1d SHA512 344cf1d1940f5b24d83f6d0e832584d3a3e1cbe89ba0bc8dabfc1262a5b1924e1ff225c72dd699abfd351f8ca16209048d77702d4e5f603bbd6ca5682c810a47 WHIRLPOOL 5980b7ef5e196784aa6bd87e26e66c0eb453e4100ba2b742f4792a6d5a73e0b15200f0b559c15eb344db76c11135eb1a0c6e84eedf28d8080e8ac20f7caba6b0
-DIST http-0.9.1.gem 64512 SHA256 549e27dcf9fece445ba785dfa108898b46f5d89b3db21afacc08e0ab193b04c2 SHA512 1f2ae51ad561b73e154379a5f941e64d166ad231a9da58d45218eb22c20396bf606ff70abdd11d3ebe5e95bfc5505ec304439f8cde286059eef6c9fe23a274b0 WHIRLPOOL ea197c6542871f45ea370f8ae5524947893fd90178c98ad8731603180c673c33ba8d072956a61d7802165960a9342a831b4f18e07abc9dc215bd2446538c7605
DIST http-0.9.3.gem 65024 SHA256 cb7c64d09c0d42255b3b881704bd1e3d282dd2170d7666ab0447c640fc046a2e SHA512 498ee87e97aed59e2a757c23e0013f3f5eaaf1fe4f51dc5caf91049124142eda43224e930a766c7c9104cc968ec8b2a4eb676f563d0adfd0249711f48e96bbd8 WHIRLPOOL 2283a2d2c3e6c5e99200949f85eeda0ef4cae5e864c0cf403c379b4332a7c9244f71be834100ffe25bea5f202fea3112d65ad41d0ccc4c2ef2c376d851984fda
+DIST http-0.9.8.gem 66560 SHA256 517790c159adc2755c0a6dac5b64d719d4dd8fb4437409e443f4a42b31ea89d2 SHA512 bb89147a3c28ebd75d2453e51c0c422557907e055b9a20a560b803bc64edfcdfe96e997ff225a26c9ca278211b0f70faaccf2d18ce2cdc9fd95bc4048093ef68 WHIRLPOOL 5a061560f2c34f951d862a11cdafae61a684f76b3a5298c46dc78f2f3536035cadae1c35ac26833774041a7687593b2b47a9b066e7a46cdaf1faa9d5bbb3217d
diff --git a/dev-ruby/http/http-0.8.12.ebuild b/dev-ruby/http/http-0.8.12.ebuild
deleted file mode 100644
index 196ca48..0000000
--- a/dev-ruby/http/http-0.8.12.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy-to-use client library for making requests from Ruby"
-HOMEPAGE="https://github.com/tarcieri/http"
-
-LICENSE="MIT"
-SLOT="0.8"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
- >=dev-ruby/addressable-2.3
- >=dev-ruby/http-cookie-1.0
- >=dev-ruby/http-form_data-1.0.1:1.0
- >=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
-
-ruby_add_bdepend "
- test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
- sed -i -e '/simplecov/,/end/ s:^:#:' \
- -e '1irequire "cgi"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/http/http-0.9.0.ebuild b/dev-ruby/http/http-0.9.0.ebuild
deleted file mode 100644
index 196ca48..0000000
--- a/dev-ruby/http/http-0.9.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy-to-use client library for making requests from Ruby"
-HOMEPAGE="https://github.com/tarcieri/http"
-
-LICENSE="MIT"
-SLOT="0.8"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
- >=dev-ruby/addressable-2.3
- >=dev-ruby/http-cookie-1.0
- >=dev-ruby/http-form_data-1.0.1:1.0
- >=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
-
-ruby_add_bdepend "
- test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
- sed -i -e '/simplecov/,/end/ s:^:#:' \
- -e '1irequire "cgi"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/http/http-0.9.1.ebuild b/dev-ruby/http/http-0.9.1.ebuild
deleted file mode 100644
index 196ca48..0000000
--- a/dev-ruby/http/http-0.9.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy-to-use client library for making requests from Ruby"
-HOMEPAGE="https://github.com/tarcieri/http"
-
-LICENSE="MIT"
-SLOT="0.8"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
- >=dev-ruby/addressable-2.3
- >=dev-ruby/http-cookie-1.0
- >=dev-ruby/http-form_data-1.0.1:1.0
- >=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
-
-ruby_add_bdepend "
- test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
- sed -i -e '/simplecov/,/end/ s:^:#:' \
- -e '1irequire "cgi"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/http/http-0.9.8.ebuild b/dev-ruby/http/http-0.9.8.ebuild
new file mode 100644
index 0000000..d4751d4
--- /dev/null
+++ b/dev-ruby/http/http-0.9.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy-to-use client library for making requests from Ruby"
+HOMEPAGE="https://github.com/tarcieri/http"
+
+LICENSE="MIT"
+SLOT="0.8"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+ >=dev-ruby/addressable-2.3
+ >=dev-ruby/http-cookie-1.0
+ >=dev-ruby/http-form_data-1.0.1:1.0
+ >=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
+
+ruby_add_bdepend "
+ test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+ sed -i -e '/simplecov/,/end/ s:^:#:' \
+ -e '1irequire "cgi"' spec/spec_helper.rb || die
+
+ # Avoid specs that require network access
+ sed -i -e '/.persistent/,/^ end/ s:^:#:' \
+ spec/lib/http_spec.rb || die
+ sed -i -e '/with non-ASCII URLs/,/^ end/ s:^:#:' \
+ spec/lib/http/client_spec.rb || die
+}
diff --git a/dev-ruby/itextomml/itextomml-1.5.2.ebuild b/dev-ruby/itextomml/itextomml-1.5.2.ebuild
index 91c46bf..abe4701 100644
--- a/dev-ruby/itextomml/itextomml-1.5.2.ebuild
+++ b/dev-ruby/itextomml/itextomml-1.5.2.ebuild
@@ -15,7 +15,7 @@
LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
#Tests don't fail here
diff --git a/dev-ruby/kramdown/kramdown-1.6.0.ebuild b/dev-ruby/kramdown/kramdown-1.6.0.ebuild
index f544900..3546ae7 100644
--- a/dev-ruby/kramdown/kramdown-1.6.0.ebuild
+++ b/dev-ruby/kramdown/kramdown-1.6.0.ebuild
@@ -17,7 +17,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="latex"
LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
diff --git a/dev-ruby/kramdown/kramdown-1.8.0.ebuild b/dev-ruby/kramdown/kramdown-1.8.0.ebuild
index 83897be..6e08470 100644
--- a/dev-ruby/kramdown/kramdown-1.8.0.ebuild
+++ b/dev-ruby/kramdown/kramdown-1.8.0.ebuild
@@ -17,7 +17,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="latex"
LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
diff --git a/dev-ruby/metasm/Manifest b/dev-ruby/metasm/Manifest
new file mode 100644
index 0000000..ff8d6ff
--- /dev/null
+++ b/dev-ruby/metasm/Manifest
@@ -0,0 +1 @@
+DIST metasm-1.0.2.gem 746496 SHA256 075f63f78e02b02fac991c3e2cc2c2c12b31a3d2ac580ffa66ba2a6e6c3c966f SHA512 b5f90e46be0d3b86c2b525823aa1fc1ea711a8abe9edaf2908af73d869e1f6dc5163f45ea20bd1034b0f10b17c25e7b7cd9af6a77ebfbf24d925a68a84d264e3 WHIRLPOOL 229fd1f8b80025b4fbf67fefe095e8815eb6cf1ab1d01985e8444dad9bda32cfb8da6953cf4937caa8496a77ebd4d4a3d6bd7d6fdfa56008b57c1010bff45bbd
diff --git a/dev-ruby/metasm/metadata.xml b/dev-ruby/metasm/metadata.xml
new file mode 100644
index 0000000..7ab844e
--- /dev/null
+++ b/dev-ruby/metasm/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>zerochaos@gentoo.org</email>
+ <name>Rick Farina</name>
+ </maintainer>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
diff --git a/dev-ruby/metasm/metasm-1.0.2-r1.ebuild b/dev-ruby/metasm/metasm-1.0.2-r1.ebuild
new file mode 100644
index 0000000..8e6dc56
--- /dev/null
+++ b/dev-ruby/metasm/metasm-1.0.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
+
+DESCRIPTION="cross-architecture assembler, disassembler, linker, and debugger"
+HOMEPAGE="http://metasm.cr0.org/"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+#IUSE="development test"
+RESTRICT=test
+IUSE=""
+
+RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
+
+ruby_add_rdepend ">=dev-ruby/railties-4.0.9:4.0
+ >=dev-ruby/activesupport-4.0.9:4.0
+ >=dev-ruby/activemodel-4.0.9:4.0"
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+ [ -f Gemfile.lock ] && rm Gemfile.lock
+ #For now, we don't support development or testing at all
+ #if ! use development; then
+ sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+ sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+ sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
+ #fi
+ #if ! use test; then
+ sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+ #fi
+ #if ! use test && ! use development; then
+ sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+ #fi
+}
+
+each_ruby_prepare() {
+ if [ -f Gemfile ]
+ then
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+ fi
+}
diff --git a/dev-ruby/metasm/metasm-1.0.2-r2.ebuild b/dev-ruby/metasm/metasm-1.0.2-r2.ebuild
new file mode 100644
index 0000000..71d8888
--- /dev/null
+++ b/dev-ruby/metasm/metasm-1.0.2-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="BUGS README TODO"
+
+RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
+
+inherit ruby-fakegem
+
+DESCRIPTION="cross-architecture assembler, disassembler, linker, and debugger"
+HOMEPAGE="http://metasm.cr0.org/"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+#IUSE="development test"
+IUSE=""
+
+RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
+
+ruby_add_rdepend ">=dev-ruby/railties-4.0.9:4.0
+ >=dev-ruby/activesupport-4.0.9:4.0
+ >=dev-ruby/activemodel-4.0.9:4.0"
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+ [ -f Gemfile.lock ] && rm Gemfile.lock
+ #For now, we don't support development or testing at all
+ #if ! use development; then
+ sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+ sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+ sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
+ #fi
+ #if ! use test; then
+ sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+ #fi
+ #if ! use test && ! use development; then
+ sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+ #fi
+}
+
+each_ruby_prepare() {
+ if [ -f Gemfile ]
+ then
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+ fi
+}
+
+each_ruby_test() {
+ ${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/metasploit-credential/Manifest b/dev-ruby/metasploit-credential/Manifest
index 948e652..208f07e 100644
--- a/dev-ruby/metasploit-credential/Manifest
+++ b/dev-ruby/metasploit-credential/Manifest
@@ -1 +1,2 @@
DIST metasploit-credential-1.0.0.gem 101888 SHA256 086cb65295f1294c213138bd2a9f2f727d945b90837a7e877b22bc6a47fe33f6 SHA512 4af09458a83d9425c5bfd744bc3f366c08d9175b4c303fa9ff53dd3f2163ba654748ea883d22f069e3b3be1218b57afe909f7ba31feb54c0b7ff781af8d5e631 WHIRLPOOL 506c707f3e1be0e90fad02397a34c70e44d1f423b5909d9f61152e2a4e929eadccf0736ec607c569fe75fff24c6003243d0a9a288979450b8c52d5f1feba1f6d
+DIST metasploit-credential-1.0.1.gem 101888 SHA256 e37e02d962a00733f8a82d486ee8b38aa287503d61812fba9cca05e834d873ca SHA512 e2d77cf1af9b9f7c09c3b98fc61c032dd5890bc019d09e208706ea93560402c82abc5a3dbc178442fbc1597d9e43e8a98f76bdb71fe470e7091d5e79bb30660f WHIRLPOOL 15b568fa61f64d895df9a7c5c04ae22232f9d805fca71c565fc2db871b4c443c163a922d52faa1953b3fadb157d71a6ea1866d2f740eff0db3262d78066c812e
diff --git a/dev-ruby/metasploit-credential/metasploit-credential-1.0.0.ebuild b/dev-ruby/metasploit-credential/metasploit-credential-1.0.0.ebuild
index 2b1c70c..828717a 100644
--- a/dev-ruby/metasploit-credential/metasploit-credential-1.0.0.ebuild
+++ b/dev-ruby/metasploit-credential/metasploit-credential-1.0.0.ebuild
@@ -24,5 +24,4 @@
dev-ruby/rubyzip:1
dev-ruby/rubyntlm
>=dev-ruby/railties-4.0.9:4.0
- dev-ruby/net-ssh
dev-ruby/pg"
diff --git a/dev-ruby/metasploit-credential/metasploit-credential-1.0.1.ebuild b/dev-ruby/metasploit-credential/metasploit-credential-1.0.1.ebuild
new file mode 100644
index 0000000..1537643
--- /dev/null
+++ b/dev-ruby/metasploit-credential/metasploit-credential-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db spec"
+
+DESCRIPTION="Code for modeling and managing credentials in Metasploit"
+HOMEPAGE="https://github.com/rapid7/metasploit-credential"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/metasploit-concern-1.0.0:1.0
+ >=dev-ruby/metasploit_data_models-1.2.0
+ >=dev-ruby/metasploit-model-1.0.0
+ dev-ruby/rubyzip:1
+ dev-ruby/rubyntlm
+ >=dev-ruby/railties-4.0.9:4.0
+ dev-ruby/pg"
diff --git a/dev-ruby/metasploit-payloads/Manifest b/dev-ruby/metasploit-payloads/Manifest
index f16e5c6..9450c38 100644
--- a/dev-ruby/metasploit-payloads/Manifest
+++ b/dev-ruby/metasploit-payloads/Manifest
@@ -1 +1,2 @@
+DIST metasploit-payloads-1.0.15.gem 5249536 SHA256 8d186c3bcf8a4537b9a96301e8cc0d847335d3cfa87ca5b2e88a6b2980eab240 SHA512 58afa5c4bc191a05e3ec009d94d40f2d9fc5a025962088845db14aefc410340fdc7b1e30f17c75936495a43fc99576d188960bc5755dbec434d7428fbbdd495a WHIRLPOOL d136642c1de9b18e652c421ad3b9fd859b8d8850dd539d66d4c8b410e09064d7872bc06c505b01d5389d1e2ebe22ed6b3c88aa3a0f08a1578f204201c24b3438
DIST metasploit-payloads-1.0.9.gem 5248000 SHA256 bd9eec335158dd25e579c680856f8c48aa9ba081a5d51d87a05dbb1e511087a3 SHA512 4c08284d4b1d667f545d97e879b2581830f34d42560ba6d6ed7adf32312adc841d5fdd8b55ab4e06a196d1e313fb44fbb861ccac7790e50f88260e2def0a76ed WHIRLPOOL a398dcad94b38626d4bd3d9980d05a24ccdbc12bbd2e902dd4f78c9bcd2cf4a26c76645d989a00aec69d041d9203c5ff31e0b0f948028ac6cd06ae724d573950
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
new file mode 100644
index 0000000..62177ba
--- /dev/null
+++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.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-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild,v 1.1 2014/10/19 23:24:24 zerochaos Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
+HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
+
+LICENSE="BSD"
+
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+#no tests
+RESTRICT="test strip"
+
+QA_PREBUILT="
+ usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+ usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
+ usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
+ usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
+ usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
+ usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
+ usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
+ "
+
+src_install() {
+ ruby-ng_src_install
+ #tell revdep-rebuild to ignore binaries meant for the target
+ dodir /etc/revdep-rebuild
+ cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT}
+ #These dirs contain prebuilt binaries for running on the TARGET not the HOST
+ SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
+ EOF
+}
diff --git a/dev-ruby/metasploit_data_models/Manifest b/dev-ruby/metasploit_data_models/Manifest
index fbf69cf..089d03b 100644
--- a/dev-ruby/metasploit_data_models/Manifest
+++ b/dev-ruby/metasploit_data_models/Manifest
@@ -1 +1,2 @@
DIST metasploit_data_models-1.2.5.gem 170496 SHA256 7aa426e8f0d69c7a2c00f916dfbbbd19817ec0fe5e55e2d1260fb37ff8b32e29 SHA512 b7bb1f12da67b0a052cba68e5f870bc7512baba884573a79095abd4d55539c18956615bd7097f1c1260507222f80644a2d0a65bb9f3ca7cc4c45e275ee5c9500 WHIRLPOOL d6702bdeb59e8dcac3516f2ba8be3a319348e6a08803bcc93a8beba6a76a6e3ca5ce8e46263f9e30c37f01c745ab4badd3665a3984f7ea6ae015bb4b8c3330ec
+DIST metasploit_data_models-1.2.7.gem 170496 SHA256 b5c31cce2d94fed8129a23f08a54dc4dbdccfaaf302db3fb574d14c675434aa0 SHA512 8380bec869fc506cfd3e8c7f128af102e2a0bc6ea22c6a2b6e7a19576a70907c504387bd020627a45067a2faac091c3e5ff4533cd786e19a99525b6b01192c87 WHIRLPOOL 29821d7ce975f07b63aa172ea962fd69ae9e9f3b2169a6d336442deee51fc6c66ad83e2a6d827a71ede3facd478c1453036d8b3290a5ba9173602cedb0a92b5e
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.5.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.5.ebuild
index 6f92227..7801599 100644
--- a/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.5.ebuild
+++ b/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.5.ebuild
@@ -28,7 +28,7 @@
dev-ruby/pg
dev-ruby/postgres_ext
>=dev-ruby/railties-4.0.9:4.0
- dev-ruby/recog
+ dev-ruby/recog:*
dev-ruby/arel-helpers
>=dev-ruby/metasploit-concern-1.0.0:1.0
>=dev-ruby/metasploit-model-1.0.0:1.0
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.7.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.7.ebuild
new file mode 100644
index 0000000..3ed4067
--- /dev/null
+++ b/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db script spec"
+
+DESCRIPTION="The database layer for Metasploit"
+HOMEPAGE="https://github.com/rapid7/metasploit_data_models"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT=test
+#IUSE="development test"
+IUSE=""
+
+RDEPEND="${RDEPEND} !dev-ruby/metasploit_data_models:0"
+
+ruby_add_rdepend "
+ >=dev-ruby/activerecord-4.0.9:4.0[postgres]
+ >=dev-ruby/activesupport-4.0.9:4.0
+ dev-ruby/pg
+ dev-ruby/postgres_ext
+ >=dev-ruby/railties-4.0.9:4.0
+ dev-ruby/recog:*
+ dev-ruby/arel-helpers
+ >=dev-ruby/metasploit-concern-1.0.0:1.0
+ >=dev-ruby/metasploit-model-1.0.0:1.0
+ <dev-ruby/thor-2.0"
+
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+ [ -f Gemfile.lock ] && rm Gemfile.lock
+ #if ! use development; then
+ sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+ sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+ #fi
+ #if ! use test; then
+ sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+ #fi
+ #if ! use test && ! use development; then
+ sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+ #fi
+}
+
+each_ruby_prepare() {
+ if [ -f Gemfile ]
+ then
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+ fi
+}
+
+all_ruby_install() {
+ ruby_fakegem_binwrapper mdm_console mdm_console-${SLOT}
+}
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 0c6fded..f61ff9b 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,4 +1,3 @@
DIST mini_magick-4.2.10.tar.gz 1060057 SHA256 b8f694648ff15729338f7534b057bc1be3fa47bc73fd935f78f872e2f6186996 SHA512 90ac378d7e9b4eb2fef7d2f036e90ea17e7b1fb42e4f022dd9921af818becbb7041e82796e84cefc05f25e42c1705bd9d623f28d9cda437821d0f7801f731168 WHIRLPOOL 9f96b85b3af696a65c80ca5ef4e3754ae993af86532bf624ee351c428c7faca14415e03a4eb7747bcff1a45fc60b7889e31eb0d98c715d29834ac9db9fe0ae4f
-DIST mini_magick-4.2.7.tar.gz 1059704 SHA256 55c829cbbc09020a7e48864374341b09c25700f343e6f443248bf99b906ed88c SHA512 172e71d3d9286d92541951d83a67e3be05ff207e27502472426fab10ca92339c371f52ca85790300bdb881b10470ed7810e01a85d3b4e1a2ed4e89dc0f117493 WHIRLPOOL 90d8a7544d11699724b873b30cdc9243d5c388ddb4216577119770ea38ac1d336a5af2853861a9a6dd957f1f0a17af363446882ebaae19853f20dbf10398f66e
-DIST mini_magick-4.2.9.tar.gz 1059967 SHA256 f168e4683a38209ec0298d94678b493c793fb785e657d850a08dff3ab461464e SHA512 d3ffc33d14030b27d106930dbf7183eb7884646103f063361e798670929c37bac36bed08cfd4e9c6128c51f8c6b05a3e2eeb440d01abe7f0b788211ede4e4c26 WHIRLPOOL cf5e7d76105f2d446917eea3596d6b4413700aa202e4124b29a233371125a397251ef2bdb3d7ee8f66272bf584e18933510e7290bf7c7d9a6f1f26d6991e1dd1
DIST mini_magick-4.3.3.tar.gz 1106623 SHA256 1ec9ee60cdd88839a958a1fccc82db20887607dc385d618aefcb81cdc577c33e SHA512 e451d5fc3fe6331698858350d1c6b704f6f3e601228b635a2469403f2b4457606144e04b5020daf67a21ff055d6aed4b138a1f107dc29cc02613541411ed0872 WHIRLPOOL f0783edc683931521a2dcd0f0d4594cc61e65a411650bbbc5223c33da80f9455087127bce4f1f36b0889b6d98ccaeda90b956bb59c789dde171cf8e28186118c
+DIST mini_magick-4.3.5.tar.gz 1106688 SHA256 2d891e22bd882fb0fd88846f7d3436944a38205af6c8205fa0cb25e9eaba2e05 SHA512 7d914cd87c9d14aa0680c9b008b93cc1e996df2793c13c004a23b6f813f9c3999d8bb52322661f57ef70c6af12821d3ae5cc92eef2e24896fe50bc9f27d3270b WHIRLPOOL 468048e55ba991466f99efdd598a79b65cc4324c15a9a63f1d79a4bd0068b7dfc616943824ee507839898c6ce690b6fed78ab8b21c8829cc14f90e4cafd40cbe
diff --git a/dev-ruby/mini_magick/mini_magick-4.2.7.ebuild b/dev-ruby/mini_magick/mini_magick-4.2.7.ebuild
deleted file mode 100644
index 2d07ad4..0000000
--- a/dev-ruby/mini_magick/mini_magick-4.2.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Manipulate images with minimal use of memory"
-HOMEPAGE="https://github.com/minimagick/minimagick"
-SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="minimagick-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-# It's only used at runtime in this case because this extension only
-# _calls_ the commands. But when we run tests we're going to need tiff
-# and jpeg support at a minimum.
-RDEPEND+=" media-gfx/imagemagick"
-DEPEND+=" test? ( media-gfx/imagemagick[tiff,jpeg,png] >=media-gfx/graphicsmagick-1.3.20[tiff,jpeg,png] )"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/posix-spawn )"
-
-all_ruby_prepare() {
- # remove executable bit from all files
- find "${S}" -type f -exec chmod -x {} +
-
- sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
-
- # Don't force a specific formatter but use overall Gentoo defaults.
- sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
-
- # Avoid test depending on graphicsmagick
- sed -e '/identifies when gm exists/,/^ end/ s:^:#:' \
- -i spec/lib/mini_magick_spec.rb || die
-}
diff --git a/dev-ruby/mini_magick/mini_magick-4.2.9.ebuild b/dev-ruby/mini_magick/mini_magick-4.3.5.ebuild
similarity index 100%
rename from dev-ruby/mini_magick/mini_magick-4.2.9.ebuild
rename to dev-ruby/mini_magick/mini_magick-4.3.5.ebuild
diff --git a/dev-ruby/minitest/minitest-4.7.5.ebuild b/dev-ruby/minitest/minitest-4.7.5.ebuild
deleted file mode 100644
index d3708a3..0000000
--- a/dev-ruby/minitest/minitest-4.7.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-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"
-IUSE="doc test"
-
-each_ruby_test() {
- ${RUBY} -Ilib:bin:test:. -S testrb test || die
-}
diff --git a/dev-ruby/minitest/minitest-5.3.3.ebuild b/dev-ruby/minitest/minitest-5.3.3.ebuild
deleted file mode 100644
index 3f768e9..0000000
--- a/dev-ruby/minitest/minitest-5.3.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-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 test"
-
-each_ruby_test() {
- for f in test/minitest/test_*.rb; do
- ${RUBY} -Ilib:test ${f} || die "${f} tests failed"
- done
-}
diff --git a/dev-ruby/multi_xml/multi_xml-0.5.5.ebuild b/dev-ruby/multi_xml/multi_xml-0.5.5.ebuild
index 6154b69..f74dfaa 100644
--- a/dev-ruby/multi_xml/multi_xml-0.5.5.ebuild
+++ b/dev-ruby/multi_xml/multi_xml-0.5.5.ebuild
@@ -18,7 +18,7 @@
HOMEPAGE="http://rdoc.info/gems/multi_xml"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index 6007379..6603a48 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -1,6 +1,3 @@
-DIST mysql2-0.3.17.gem 49152 SHA256 c69c5f08532cdd58e5f7dccaad7ac132edaa271dd2c8d69711cf5ce3c8f858e1 SHA512 bf3e818fa6a2396706b5078ab6a426ce22e7a24ca8e0ba310e831ed1887f9d6688084d99af34111f6447f089a2bf1364dd641434b61add9778eed5c4ce2d270e WHIRLPOOL 904e5def78e6a5457b7dfc7a561d7ddb9900f57812bc68b4b52dec3095276b93626198af4b29d648655143e93b210dfd66fa0dba202d16e1ef8d4e03ed93c016
-DIST mysql2-0.3.18.gem 50688 SHA256 d35477aaf1a5fc508511af5c521675b8878275ad0af9c12e1cf222b50e285735 SHA512 533cbea6c67ce1d02861d76b18c3a3c74e81a6f4edf0324dfeb29dc9f8a4fb40e5a4e4bc22b973784c1a6ac1862507860b50d5ce7da4aeac6e3a3c260f1fde7d WHIRLPOOL a6685345d5a82c098cbc40d5963d5be3cc0f16738d197cc40ec2a7b375ca578078f177dccfadd8aaee2a8eb85e346f9f097b0bc7af01045ccec3cc44f6226252
DIST mysql2-0.3.19.gem 52224 SHA256 d34c6804e1916361ff352da0f0f57e615909cad0edcbf18d9aba78e1ddc2918a SHA512 1486e6016854776307a42b8edd1b51f222c9ec4a3aa769aba03579c132e778673ed5cd788d129fecb73085a01989adf9813d36d20ff292573b6db041354270f5 WHIRLPOOL 12db1a0c0b8260bae189590094978038903e871e1e91cf9d502117a05807344a60d9b40be0c8a45e5be74f027eefbf7e2c2ab5d5ba2d8e9bcdabaf6b41c8024b
DIST mysql2-0.3.20.gem 52224 SHA256 37166b21ca4b92a7af9bea566d78884b05391cfc14f786c18e7f264b422f0758 SHA512 65088e57b3693cb2b28cd37fc595de43edb85dba14421c1c43cd0c4e41efc0a8a39bd541213170af95e712998b44411a4212d9b96750207ed9d7292aa1e66c91 WHIRLPOOL 23e9852f3f9ee76e4463c4397b1e96288e2f8575030f33540c7c8cc8ca8fc106be2aec1c117dd008e4026872850731b4396babbbbeb971e8dacf523fe33387c9
-DIST mysql2-0.4.0.gem 60416 SHA256 4eba64b84f84e10083deb56102b199d01559583d875ccf2620f8b04f59c05828 SHA512 9b203e434ada980c9070f7b1c8f24209c6ce91d5a918d1be55a07808464ced77f7fc053223c997f0f95ea9b8e920f132170804f4d3df31d205c4d6944b27e3c5 WHIRLPOOL 9ebb41ac53932dba5e8c5f39a08510752c61b879e5abf7639693511920dd9b5cc9f32e20c420c37ef3c5ea03455203617207f1f7697412a81a31a9875cab4ad0
DIST mysql2-0.4.1.gem 71680 SHA256 1ba5e782424a7a8d9ed75456c0df22d4196d6ca84a3a8a1ba3d009c5783d0fe2 SHA512 6abd2e63c5a24fa935d706afecba1a14b6fbb408a1a5e88b78b19a034426d7dbaaa82646b471d5d3965547d8377b196031f1a00e86a0da54665e485aa051ce7c WHIRLPOOL 21e6aa216a564335dd9e980e93ee29bd29a5958392c759d6e86c8a88f35d843eb8b9292c904ec3102c079e023757d0555a7faf8c9bb028151815bb68ad0024a2
diff --git a/dev-ruby/mysql2/mysql2-0.3.17.ebuild b/dev-ruby/mysql2/mysql2-0.3.17.ebuild
deleted file mode 100644
index 5cb7f3b..0000000
--- a/dev-ruby/mysql2/mysql2-0.3.17.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-
-LICENSE="MIT"
-SLOT="0.3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} virtual/mysql[-static]"
-RDEPEND="${RDEPEND} virtual/mysql[-static]"
-
-each_ruby_configure() {
- ${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext/mysql2 || die
- cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
-}
diff --git a/dev-ruby/mysql2/mysql2-0.3.18.ebuild b/dev-ruby/mysql2/mysql2-0.3.18.ebuild
deleted file mode 100644
index dfc9ed5..0000000
--- a/dev-ruby/mysql2/mysql2-0.3.18.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-
-LICENSE="MIT"
-SLOT="0.3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} virtual/mysql[-static]"
-RDEPEND="${RDEPEND} virtual/mysql:=[-static]"
-
-each_ruby_configure() {
- ${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext/mysql2 || die
- cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
-}
diff --git a/dev-ruby/mysql2/mysql2-0.4.0.ebuild b/dev-ruby/mysql2/mysql2-0.4.0.ebuild
deleted file mode 100644
index 0ab4e02..0000000
--- a/dev-ruby/mysql2/mysql2-0.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-
-LICENSE="MIT"
-SLOT="0.3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} virtual/libmysqlclient"
-RDEPEND="${RDEPEND} virtual/libmysqlclient:="
-
-each_ruby_configure() {
- ${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext/mysql2
- cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
-}
diff --git a/dev-ruby/mysql2/mysql2-0.4.1.ebuild b/dev-ruby/mysql2/mysql2-0.4.1.ebuild
index 0ab4e02..3b15943 100644
--- a/dev-ruby/mysql2/mysql2-0.4.1.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.4.1.ebuild
@@ -18,7 +18,7 @@
HOMEPAGE="https://github.com/brianmario/mysql2"
LICENSE="MIT"
-SLOT="0.3"
+SLOT="0.4"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE=""
diff --git a/dev-ruby/ox/ox-2.2.1.ebuild b/dev-ruby/ox/ox-2.2.1.ebuild
index 5e36f96..78b4037 100644
--- a/dev-ruby/ox/ox-2.2.1.ebuild
+++ b/dev-ruby/ox/ox-2.2.1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index c577130..8f3f92e 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,3 +1,2 @@
-DIST parser-2.2.2.3.gem 370176 SHA256 0cd6a3951d91378d958be6657442ee221ecd2a96620d8dd870b3d03f0e3cd11b SHA512 fc1e6eebe2b372140ae4df98fbee360a03575e722e4a98170abdfb7a685f7fbf6bbe10d7e40f2e4c9244da37588a8fbbe2bf33ee98b97a37120bfd152f031eda WHIRLPOOL 0d1966e163d7cf067bab865454f2b7ffcfe98b03d44576f93680af933d8b9bbd5b06e5d40c47615d2b3fb35a86f3a160f941970f4f7b0a3703b15727dccfed75
-DIST parser-2.2.2.5.gem 370176 SHA256 13a85b1545a0ecc04d1e3a62e8e6f903cd9fcb1d8cf9b298b83b42e651ea6d8a SHA512 03d3ec8c050a5dd2d85a79b5269e60313df02f8a743e9e2c1669d9a5854c3dad5f962394444f483ecd7014a546583d0f60736f672f38d5dcebcbe29dc98f97ca WHIRLPOOL ffbd7363d33a7050813b7149a3a1a5907cacee3e835bd8e467270b20e5972d209b289b46f91b479d3d3af3775db307f6952691b20db4cf2d60a6e013e02f3503
DIST parser-2.2.2.6.gem 370176 SHA256 1016f97e594d9abc92936e8b9ac0444438cf91df46afcf1fe607415cb227b066 SHA512 cdc9ac96e894b2cbcd26affceda8d0a327efde45b5562b9446739e9791b0f484c03bdcefa9405cc738d088b5e43d56ef58a9ffac8052908b5c82fcd8f2205668 WHIRLPOOL 8cb73c12540fbebe69f865c3ba51fbb14054773023852ee87242ee7034f3da3be23a646a325dd9bec3f18ae66d7dbc280844911f05a9ae51bb96c1495d262eb2
+DIST parser-2.2.3.0.gem 456704 SHA256 4cb1cf8b34f8d331c9f4a02e4b2f8068cde73b1c957c9c6f24401251d503ab91 SHA512 8f3c20417fd2c788573f0a0068f03c8bca80f3f3e49b0a2516b5f976e896453707fee50e248968a1f65294cb86f771749decd71d9a56588c1ef5cff9dd048cea WHIRLPOOL 8427e10f57128457a7490b807272fc6d09c6b36d91e8d28a493a429ada2d4a5526b3fa7dcfc3c06013b07e4fcddefdbdacdb8a0a578fefbc701ec8294d727582
diff --git a/dev-ruby/parser/parser-2.2.2.3.ebuild b/dev-ruby/parser/parser-2.2.2.3.ebuild
deleted file mode 100644
index 2a950c2..0000000
--- a/dev-ruby/parser/parser-2.2.2.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
-HOMEPAGE="https://github.com/whitequark/parser"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
- dev-ruby/minitest:5
- dev-ruby/racc
- dev-ruby/cliver )"
-ruby_add_rdepend "dev-ruby/ast
- dev-ruby/slop:3"
-
-all_ruby_prepare() {
- sed -i -e "/[Bb]undler/d" Rakefile || die
- sed -i -e "/simplecov/,+35d" test/helper.rb || die
-}
diff --git a/dev-ruby/parser/parser-2.2.2.5.ebuild b/dev-ruby/parser/parser-2.2.2.5.ebuild
deleted file mode 100644
index 2a950c2..0000000
--- a/dev-ruby/parser/parser-2.2.2.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
-HOMEPAGE="https://github.com/whitequark/parser"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
- dev-ruby/minitest:5
- dev-ruby/racc
- dev-ruby/cliver )"
-ruby_add_rdepend "dev-ruby/ast
- dev-ruby/slop:3"
-
-all_ruby_prepare() {
- sed -i -e "/[Bb]undler/d" Rakefile || die
- sed -i -e "/simplecov/,+35d" test/helper.rb || die
-}
diff --git a/dev-ruby/parser/parser-2.2.3.0.ebuild b/dev-ruby/parser/parser-2.2.3.0.ebuild
new file mode 100644
index 0000000..0bc7d5b
--- /dev/null
+++ b/dev-ruby/parser/parser-2.2.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+ dev-ruby/minitest:5
+ dev-ruby/racc
+ dev-ruby/cliver )"
+ruby_add_rdepend "dev-ruby/ast"
+
+all_ruby_prepare() {
+ sed -i -e "/[Bb]undler/d" Rakefile || die
+ sed -i -e "/simplecov/,+35d" test/helper.rb || die
+}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 0c4c56d..60ac4b0 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1 +1,2 @@
DIST puppetdb-termini_3.0.1-1puppetlabs1_all.deb 21662 SHA256 a1930ded1549187b9c6d1bbd267b0ffe353f498cd053364349a99ed34214c614 SHA512 7ddbf0ae264fcf6063ba180e6ba19e1c491ece7f11b761f6fa66ba39c89de6e7b1a14efa04a113e553892bf987f79f3175dd950f55ce05b985ef7ea19e470ab0 WHIRLPOOL 204d8f8889e4725cf515ce23b5f8b3c5c987899751e2c1a43acae3ef92d7c8297921cc60c739d3fa6f77259b1e539a40b70e9cf081ab15509f21ef5a0b892a2e
+DIST puppetdb-termini_3.1.0-1puppetlabs1_all.deb 21074 SHA256 58b7f2cd7f374c7d3be69be5d53b8def650b8cddf8848619981451532cfcc4eb SHA512 ac265806f33bbde23825a09f19710ee99e0f12195d921033aa156641e7c092e3ceefa40a855ce39a216ca486bf0d898d27ca3801be01af6f2e47b7582004c0bc WHIRLPOOL add162e4d66474cee3e6291c4305917128c3840fd8abda3ce4ff78337e1ac8c23a616fd5074f098f1036a9be75f21c27aa906c632cc49e5e2031a13b02d423bd
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-3.1.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-3.1.0.ebuild
new file mode 100644
index 0000000..98635db
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-3.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+inherit unpacker
+
+DESCRIPTION="Library needed to connect puppet to puppetdb"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/puppetdb/${PN}_${PV}-1puppetlabs1_all.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=""
+DEPEND+=""
+
+S=${WORKDIR}
+
+src_install() {
+ insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
+ doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
+}
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index 82f34e5..000031c 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,3 +1,2 @@
DIST racc-1.4.11.gem 113664 SHA256 1e2e420d5e2e4b9f2b352e9b2828448a2ee13a16fdebf6a7e863252b5054c840 SHA512 147c3c0ade40ec5544397a9dbf8579514d97145c2cc9f4e16508d41265c1b5cd6fc986c09367792592b5ab6b274e271eb7dded02ea9c398eadafb8addda4ef0c WHIRLPOOL e54b553547bf13816033c103a4de79e7e5bd50bf30b58a7525a059ce0556071f01ee6658ad00febbc024314f322ce114b41864d1833ce8bc282519fe5c868f40
DIST racc-1.4.12.gem 115712 SHA256 bd9a6b06cf502abfdd7823c833ba69b74d038e8d365a5ce42d502f528f531db0 SHA512 7ae244127ba80ef07e1e2cabc1ec4c7c306b93d155d89e95ba425139c3ca24fdbc3c8cef3958b344a0b821fdfc36e25524d8b27de7f8a01ae2f1732edb11987f WHIRLPOOL 5c34ab9ab841f2062d697f7005e05a4b5bc54c8e210543ac4cc917f0a331cc8c823da9976b1f013b2a54664009e5bdc57d04da86d06882ec288438a304583642
-DIST racc-1.4.9.gem 109056 SHA256 f9d53caeb1ff5ac633a270a45478e585e6e054c44f6da28415f3432caf8f61d5 SHA512 84dfe85c7f0054ee6b2895b7ae3d28bebb51183c023457f8006b13b50a10a74e0f97ab92e3724a5c492dae9cebadb6f9e6d78e32add6bb11b07dd25459b7a7c2 WHIRLPOOL 1ab62401c403044d45b292dec12257b25847b7577d11bdd795fb7946720492356ffed43686fca288afad9ddce47cd8735bf0e62c9b297cbcbb2b1680764c805e
diff --git a/dev-ruby/racc/racc-1.4.9.ebuild b/dev-ruby/racc/racc-1.4.9.ebuild
deleted file mode 100644
index d830e70..0000000
--- a/dev-ruby/racc/racc-1.4.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A LALR(1) parser generator for Ruby"
-HOMEPAGE="http://www.loveruby.net/en/racc.html"
-
-LICENSE="LGPL-2.1"
-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"
-IUSE="doc test"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
- sed -i -e 's|/tmp/out|${TMPDIR:-/tmp}/out|' test/helper.rb || die "tests fix failed"
-
- # Avoid depending on rake-compiler since we don't use it to compile
- # the extension.
- sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile
- sed -i -e '/ExtensionTask/,/^ end/ s:^:#:' Rakefile
-
- # Avoid isolation since dependencies are not properly declared.
- sed -i -e 's/, :isolate//' Rakefile || die
-}
-
-each_ruby_prepare() {
- ${RUBY} -Cext/racc extconf.rb || die
-}
-
-each_ruby_compile() {
- emake -Cext/racc
- # Copy over the file here so that we don't have to do
- # special ruby install for JRuby and the other
- # implementations.
- cp -l ext/racc/cparse$(get_modname) lib/racc/cparse$(get_modname) || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib -S testrb test/test_*.rb || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- dodoc -r rdoc
-
- docinto examples
- dodoc -r sample
-}
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index b7838b4..83c0f97 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -1 +1,2 @@
DIST rack-cache-1.2.gem 261632 SHA256 02bfed05f8b3266db804f2fa445801636ca2c6d211a3137ec796f88af5756e1c SHA512 510e0b98af47170b9030578feadf534132ae473b093df3f1fce6022fb97883b4c56dee441dd06df50e0ea06c4f0a1d00e11bf63f165e29d1e451f28ee8c17177 WHIRLPOOL f8ec4a460bf1bc89dad9dc6b666f6dfa3e8409434a3380d357c945f29da63bec609285c118ed28ce209f207ee3aaa56dd4ba5f3992286f762c2d33f4572b61f8
+DIST rack-cache-1.3.0.tar.gz 258225 SHA256 356f849e285fa2cf00c1d6823aa2202d14add67815b07b70048242f7c61c6df8 SHA512 d7028456b7059b775a75f35ae2f7a4a00bfe908ebc7e7f57b2f659f9690ac40085d3dc89acd0b1e540cf309e218a276504650a50f092557b7ef871a66aa6bfbf WHIRLPOOL 8e456b7eff61913cd75c2f1a20c55ff6f1430ca28384b6d743c976df7677b3334e6c83628c1fc9fb7d11b268b71c5c8e653ad8b0c59430a691071c37a657e916
diff --git a/dev-ruby/rack-cache/rack-cache-1.3.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.3.0.ebuild
new file mode 100644
index 0000000..1b2d83f
--- /dev/null
+++ b/dev-ruby/rack-cache/rack-cache-1.3.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+# no documentation is generable, it needs hanna, which is broken
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="A drop-in component to enable HTTP caching for Rack-based applications that produce freshness info"
+HOMEPAGE="https://github.com/rtomayko/rack-cache"
+SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+ruby_add_bdepend "test? ( dev-ruby/bacon )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/ s:^:#:' test/spec_setup.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} -S bacon -q -I.:lib:test test/*_test.rb || die
+}
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index d4e249d..2619bc6 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,3 +1,2 @@
-DIST recog-2.0.12.gem 196608 SHA256 49754e782aff74a1b9f95e48c2baafa5c4ec54d534013616d6dadb2b0d95fdd0 SHA512 d88347313807969ced0106a9134a70aa933d0ad8681067746c0c931a072add2466bf17e2eeb5c090e9be8f45eede66613659b942ca98f58fd0bc15d7ee523058 WHIRLPOOL b035279dbd74e6ddbe12b90a5433c5fe66055f8a71fa3be2c61b13dc364fafbf95deea021d9e6f1d38225d3ffae675abd23892f2b296b463e6348e7b6f98855e
DIST recog-2.0.14.gem 193024 SHA256 65d4916bf92aa052dd0624654df46f51ec91270d568b52f18491c0b74bd21abf SHA512 6e1a3872f1daaf86c00c1c535b5019761efa23af83d4ccf5996fa3a1e66a1aa468603e3582f48b88c74dc419b1a659ead683781f3c93f4f315d4aeebbf95f768 WHIRLPOOL 61695b3e8c768c93eaa56819951c65dea435751da6f60b50f291fa54e1e46b22b35b4ef12d202c326f8adefe9a6b55975bb20d5ff88d08e31b469c7b525d5afa
DIST recog-2.0.6.gem 188928 SHA256 333d867db310b908342f857ee4f3f60b869386ff7b908e06f4dec8b9352ceb97 SHA512 408e83889632127d584ce8d09244c63246807aa5f89d88c082bbfd441a2e708cd67f23aebf23fa08c5db6bfd7ff771071daf64df9a66224aa5f04fcaba3d1387 WHIRLPOOL 2aaef470b15e3b8ac99d99bc3f8975447d5aa3d05220540d61f4972083f8cf6a0b04ba89e88aefc0dfd355f59f6f1bd5e9754bf00b6b5a5a953ef21f42fc3509
diff --git a/dev-ruby/recog/recog-2.0.12.ebuild b/dev-ruby/recog/recog-2.0.12.ebuild
deleted file mode 100644
index 76db60c..0000000
--- a/dev-ruby/recog/recog-2.0.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pattern recognition for hosts, services, and content"
-HOMEPAGE="https://github.com/rapid7/${PN}"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/nokogiri"
-
-ruby_add_bdepend "test? (
- dev-ruby/regexp_parser
- dev-ruby/rspec:3
- dev-util/aruba
- dev-util/cucumber
-)"
-
-all_ruby_prepare() {
- sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
- RSPEC_VERSION=3 ruby-ng_rspec
- ruby-ng_cucumber
-}
diff --git a/dev-ruby/recog/recog-2.0.14-r1.ebuild b/dev-ruby/recog/recog-2.0.14-r1.ebuild
new file mode 100644
index 0000000..585356a
--- /dev/null
+++ b/dev-ruby/recog/recog-2.0.14-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pattern recognition for hosts, services, and content"
+HOMEPAGE="https://github.com/rapid7/${PN}"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/nokogiri
+ !<dev-ruby/recog-2.0.6-r1"
+
+ruby_add_bdepend "test? (
+ dev-ruby/regexp_parser
+ dev-ruby/rspec:3
+ dev-util/aruba
+ dev-util/cucumber
+)"
+
+all_ruby_prepare() {
+ sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+ RSPEC_VERSION=3 ruby-ng_rspec
+ ruby-ng_cucumber
+}
diff --git a/dev-ruby/recog/recog-2.0.14.ebuild b/dev-ruby/recog/recog-2.0.14.ebuild
deleted file mode 100644
index 761c372..0000000
--- a/dev-ruby/recog/recog-2.0.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pattern recognition for hosts, services, and content"
-HOMEPAGE="https://github.com/rapid7/${PN}"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/nokogiri"
-
-ruby_add_bdepend "test? (
- dev-ruby/regexp_parser
- dev-ruby/rspec:3
- dev-util/aruba
- dev-util/cucumber
-)"
-
-all_ruby_prepare() {
- sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
- RSPEC_VERSION=3 ruby-ng_rspec
- ruby-ng_cucumber
-}
diff --git a/dev-ruby/recog/recog-2.0.6-r1.ebuild b/dev-ruby/recog/recog-2.0.6-r1.ebuild
new file mode 100644
index 0000000..0655906
--- /dev/null
+++ b/dev-ruby/recog/recog-2.0.6-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+RUBY_FAKEGEM_BINWRAP=""
+inherit ruby-fakegem
+
+DESCRIPTION="Pattern recognition for hosts, services, and content"
+HOMEPAGE="https://github.com/rapid7/${PN}"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/nokogiri !=dev-ruby/recog-2.0.0
+ !<dev-ruby/recog-2.0.6-r1"
diff --git a/dev-ruby/recog/recog-2.0.6.ebuild b/dev-ruby/recog/recog-2.0.6.ebuild
deleted file mode 100644
index d8aa63d..0000000
--- a/dev-ruby/recog/recog-2.0.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pattern recognition for hosts, services, and content"
-HOMEPAGE="https://github.com/rapid7/${PN}"
-SRC_URI="mirror://rubygems/${P}.gem"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/nokogiri !=dev-ruby/recog-2.0.0"
diff --git a/dev-ruby/redcarpet/redcarpet-3.3.3.ebuild b/dev-ruby/redcarpet/redcarpet-3.3.3.ebuild
index b9cf190..83d91ce 100644
--- a/dev-ruby/redcarpet/redcarpet-3.3.3.ebuild
+++ b/dev-ruby/redcarpet/redcarpet-3.3.3.ebuild
@@ -16,7 +16,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/rexical/rexical-1.0.5-r3.ebuild b/dev-ruby/rexical/rexical-1.0.5-r3.ebuild
index 4f53c9f..00328c3 100644
--- a/dev-ruby/rexical/rexical-1.0.5-r3.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.5-r3.ebuild
@@ -15,7 +15,7 @@
HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
LICENSE="LGPL-2" # plus exception
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~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 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/ritex/ritex-1.0.1.ebuild b/dev-ruby/ritex/ritex-1.0.1.ebuild
index 6956fe1..2cdfb5a 100644
--- a/dev-ruby/ritex/ritex-1.0.1.ebuild
+++ b/dev-ruby/ritex/ritex-1.0.1.ebuild
@@ -15,7 +15,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
ruby_add_rdepend "dev-ruby/racc"
diff --git a/dev-ruby/rouge/rouge-1.10.1.ebuild b/dev-ruby/rouge/rouge-1.10.1.ebuild
index 81827a8..8fccd95 100644
--- a/dev-ruby/rouge/rouge-1.10.1.ebuild
+++ b/dev-ruby/rouge/rouge-1.10.1.ebuild
@@ -18,7 +18,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
IUSE=""
ruby_add_bdepend "doc? ( dev-ruby/redcarpet )"
diff --git a/dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild b/dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild
new file mode 100644
index 0000000..e8884f7
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="highlight"
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "
+ =dev-ruby/rspec-support-${SUBVERSION}*
+ !!<dev-ruby/rspec-core-2.14.8-r4
+ highlight? ( >=dev-ruby/coderay-1.0.9 )
+"
+
+ruby_add_bdepend "test? (
+ >=dev-ruby/nokogiri-1.5.2
+ >=dev-ruby/coderay-1.0.9
+ dev-ruby/syntax
+ >=dev-ruby/zentest-4.6.2
+ >=dev-ruby/rspec-expectations-3.0.0:3
+ >=dev-ruby/rspec-mocks-2.99.0:3
+ )"
+
+# Skip yard for ruby21 for now since we don't support ruby21 eselected
+# yet and we can't bootstrap otherwise.
+USE_RUBY=${USE_RUBY/ruby21 ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+ # Don't set up bundler: it doesn't understand our setup.
+ sed -i -e '/[Bb]undler/d' Rakefile || die
+
+ # Avoid dependency on cucumber since we can't run the features anyway.
+ sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+ # Duplicate exe also in bin. We can't change it since internal stuff
+ # also depends on this and fixing that is going to be fragile. This
+ # way we can at least install proper bin scripts.
+ cp -R exe bin || die
+
+ # Avoid unneeded dependency on git.
+ sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+ # Avoid aruba dependency so that we don't end up in dependency hell.
+ sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+ rm spec/integration/{filtering,order}_spec.rb spec/support/aruba_support.rb || die
+}
+
+each_ruby_prepare() {
+ sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+
+ case ${RUBY} in
+ *ruby22)
+ # The rubygems version bundled with ruby 2.2 causes warnings.
+ sed -i -e '/a library that issues no warnings when loaded/,/^ end/ s:^:#:' spec/rspec/core_spec.rb || die
+ ;;
+ esac
+}
+
+all_ruby_compile() {
+ if use doc ; then
+ yardoc || die
+ fi
+}
+
+each_ruby_test() {
+ PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild b/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild
new file mode 100644
index 0000000..d53e242
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~hppa ~ppc64"
+IUSE="highlight"
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "
+ =dev-ruby/rspec-support-${SUBVERSION}*
+ !!<dev-ruby/rspec-core-2.14.8-r4
+ highlight? ( >=dev-ruby/coderay-1.0.9 )
+"
+
+ruby_add_bdepend "test? (
+ >=dev-ruby/nokogiri-1.5.2
+ >=dev-ruby/coderay-1.0.9
+ dev-ruby/syntax
+ >=dev-ruby/thread_order-1.1.0
+ >=dev-ruby/zentest-4.6.2
+ >=dev-ruby/rspec-expectations-3.3.0:3
+ >=dev-ruby/rspec-mocks-2.99.0:3
+ )"
+
+# Skip yard for ruby22 for now since we don't support ruby22 eselected
+# yet and we can't bootstrap otherwise.
+USE_RUBY=${USE_RUBY/ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+ # Don't set up bundler: it doesn't understand our setup.
+ sed -i -e '/[Bb]undler/d' Rakefile || die
+
+ # Avoid dependency on cucumber since we can't run the features anyway.
+ sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+ # Duplicate exe also in bin. We can't change it since internal stuff
+ # also depends on this and fixing that is going to be fragile. This
+ # way we can at least install proper bin scripts.
+ cp -R exe bin || die
+
+ # Avoid unneeded dependency on git.
+ sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+ # Avoid aruba dependency so that we don't end up in dependency hell.
+ sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+ rm spec/integration/{filtering,order,persistence_failures}_spec.rb spec/support/aruba_support.rb || die
+
+ # Avoid a spec failing due to path issues
+ sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+ spec/rspec/core/configuration_spec.rb || die
+}
+
+each_ruby_prepare() {
+ sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+
+ # case ${RUBY} in
+ # *ruby22)
+ # # The rubygems version bundled with ruby 2.2 causes warnings.
+ # sed -i -e '/a library that issues no warnings when loaded/,/^ end/ s:^:#:' spec/rspec/core_spec.rb || die
+ # ;;
+ # esac
+}
+
+all_ruby_compile() {
+ if use doc ; then
+ yardoc || die
+ fi
+}
+
+each_ruby_test() {
+ PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/ruby-atk/Manifest b/dev-ruby/ruby-atk/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-atk/Manifest
+++ b/dev-ruby/ruby-atk/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-atk/ruby-atk-3.0.7.ebuild b/dev-ruby/ruby-atk/ruby-atk-3.0.7.ebuild
new file mode 100644
index 0000000..3199fc3
--- /dev/null
+++ b/dev-ruby/ruby-atk/ruby-atk-3.0.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Atk bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND+=" dev-libs/atk"
+RDEPEND+=" dev-libs/atk"
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' test/atk-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-cairo-gobject/Manifest b/dev-ruby/ruby-cairo-gobject/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-cairo-gobject/Manifest
+++ b/dev-ruby/ruby-cairo-gobject/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.0.7.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.0.7.ebuild
new file mode 100644
index 0000000..4a6f539
--- /dev/null
+++ b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.0.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+RUBY_S="ruby-gnome2-all-${PV}/cairo-gobject"
+
+DESCRIPTION="Ruby cairo-gobject bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/cairo"
+RDEPEND+=" x11-libs/cairo"
+
+ruby_add_rdepend "dev-ruby/rcairo
+ >=dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ ../gobject-introspection/test/gobject-introspection-test-utils.rb \
+ test/cairo-gobject-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-clutter-gstreamer/Manifest b/dev-ruby/ruby-clutter-gstreamer/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-clutter-gstreamer/Manifest
+++ b/dev-ruby/ruby-clutter-gstreamer/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.0.7.ebuild b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.0.7.ebuild
new file mode 100644
index 0000000..db9b1be
--- /dev/null
+++ b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.0.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Clutter bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter-gstreamer
+
+DEPEND+=" media-libs/clutter-gst"
+RDEPEND+=" media-libs/clutter-gst:*"
+
+ruby_add_rdepend ">=dev-ruby/ruby-clutter-${PV}
+ >=dev-ruby/ruby-gstreamer-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ ../gobject-introspection/test/gobject-introspection-test-utils.rb \
+ ../clutter/test/clutter-test-utils.rb \
+ test/clutter-gstreamer-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/and have_make/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-clutter-gtk/Manifest b/dev-ruby/ruby-clutter-gtk/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-clutter-gtk/Manifest
+++ b/dev-ruby/ruby-clutter-gtk/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.0.7.ebuild b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.0.7.ebuild
new file mode 100644
index 0000000..03d17ab
--- /dev/null
+++ b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.0.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Clutter bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter-gtk
+
+DEPEND+=" media-libs/clutter-gtk"
+RDEPEND+=" media-libs/clutter-gtk"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-clutter-${PV}
+ >=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ ../gobject-introspection/test/gobject-introspection-test-utils.rb \
+ ../clutter/test/clutter-test-utils.rb \
+ test/clutter-gtk-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/and have_make/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-clutter/Manifest b/dev-ruby/ruby-clutter/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-clutter/Manifest
+++ b/dev-ruby/ruby-clutter/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-clutter/ruby-clutter-3.0.7.ebuild b/dev-ruby/ruby-clutter/ruby-clutter-3.0.7.ebuild
new file mode 100644
index 0000000..3cb049b
--- /dev/null
+++ b/dev-ruby/ruby-clutter/ruby-clutter-3.0.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Clutter bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter
+
+DEPEND+=" media-libs/clutter"
+RDEPEND+=" media-libs/clutter"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-cairo-gobject-${PV}
+ >=dev-ruby/ruby-gobject-introspection-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ ../gobject-introspection/test/gobject-introspection-test-utils.rb \
+ ../cairo-gobject/test/cairo-gobject-test-utils.rb \
+ test/clutter-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-gdk3/Manifest b/dev-ruby/ruby-gdk3/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-gdk3/Manifest
+++ b/dev-ruby/ruby-gdk3/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gdk3/ruby-gdk3-3.0.7.ebuild b/dev-ruby/ruby-gdk3/ruby-gdk3-3.0.7.ebuild
new file mode 100644
index 0000000..0e601a4
--- /dev/null
+++ b/dev-ruby/ruby-gdk3/ruby-gdk3-3.0.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby GDK-3.x bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:3"
+RDEPEND+=" x11-libs/gtk+:3"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gdkpixbuf2-${PV}
+ >=dev-ruby/ruby-atk-${PV}
+ >=dev-ruby/ruby-cairo-gobject-${PV}
+ >=dev-ruby/ruby-pango-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ test/gdk-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-gdkpixbuf2/Manifest b/dev-ruby/ruby-gdkpixbuf2/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-gdkpixbuf2/Manifest
+++ b/dev-ruby/ruby-gdkpixbuf2/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.0.7.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.0.7.ebuild
new file mode 100644
index 0000000..9f1b629
--- /dev/null
+++ b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.0.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_NAME="gdk_pixbuf2"
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/${RUBY_FAKEGEM_NAME}
+
+DESCRIPTION="Ruby GdkPixbuf2 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" x11-libs/gtk+:2"
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
diff --git a/dev-ruby/ruby-gio2/Manifest b/dev-ruby/ruby-gio2/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-gio2/Manifest
+++ b/dev-ruby/ruby-gio2/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.0.7.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.0.7.ebuild
new file mode 100644
index 0000000..bf17420
--- /dev/null
+++ b/dev-ruby/ruby-gio2/ruby-gio2-3.0.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby binding of GooCanvas"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}
+ >=dev-ruby/ruby-gobject-introspection-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ test/gio2-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/which make/,/^ end/ s:^:#:' test/run-test.rb || die
+
+ # Make sure Makefile is generated fresh for each target
+ rm -f ext/gio2/Makefile || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.0.7.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.0.7.ebuild
new file mode 100644
index 0000000..fda9b60
--- /dev/null
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.0.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Glib2 bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND+=" >=dev-libs/glib-2"
+DEPEND+=" >=dev-libs/glib-2"
+
+ruby_add_bdepend "dev-ruby/pkg-config
+ test? ( >=dev-ruby/test-unit-2 )"
+
+all_ruby_prepare() {
+ # Our sandbox always provides LD_PRELOAD in the environment.
+ sed -i -e 's/unless ENV.empty?/unless (ENV.keys - ["LD_PRELOAD"]).empty?/' test/test_spawn.rb || die
+
+ # Remove pregenerated Makefile since it will otherwise be shared by all targets.
+ rm -f Makefile Makefile.lib ext/glib2/Makefile || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gnome2/ruby-gnome2-3.0.7.ebuild b/dev-ruby/ruby-gnome2/ruby-gnome2-3.0.7.ebuild
new file mode 100644
index 0000000..ffd5c7f
--- /dev/null
+++ b/dev-ruby/ruby-gnome2/ruby-gnome2-3.0.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng
+
+DESCRIPTION="Ruby Gnome2 bindings"
+HOMEPAGE="http://ruby-gnome2.sourceforge.jp/"
+SRC_URI=""
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+ >=dev-ruby/ruby-atk-${PV}
+ >=dev-ruby/ruby-clutter-${PV}
+ >=dev-ruby/ruby-clutter-gstreamer-${PV}
+ >=dev-ruby/ruby-clutter-gtk-${PV}
+ >=dev-ruby/ruby-gdkpixbuf2-${PV}
+ >=dev-ruby/ruby-gdk3-${PV}
+ >=dev-ruby/ruby-gio2-${PV}
+ >=dev-ruby/ruby-gstreamer-${PV}
+ >=dev-ruby/ruby-gtk2-${PV}
+ >=dev-ruby/ruby-gtk3-${PV}
+ >=dev-ruby/ruby-gtksourceview-${PV}
+ >=dev-ruby/ruby-gtksourceview3-${PV}
+ >=dev-ruby/ruby-pango-${PV}
+ >=dev-ruby/ruby-poppler-${PV}
+ >=dev-ruby/ruby-rsvg-${PV}
+ >=dev-ruby/ruby-vte-${PV}
+ >=dev-ruby/ruby-vte3-${PV}
+ >=dev-ruby/ruby-webkit-gtk2-${PV}
+ >=dev-ruby/ruby-webkit-gtk-${PV}"
diff --git a/dev-ruby/ruby-gobject-introspection/Manifest b/dev-ruby/ruby-gobject-introspection/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-gobject-introspection/Manifest
+++ b/dev-ruby/ruby-gobject-introspection/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.0.7.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.0.7.ebuild
new file mode 100644
index 0000000..0f03ada
--- /dev/null
+++ b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.0.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/gobject-introspection
+
+DESCRIPTION="Ruby GObjectIntrospection bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/gobject-introspection"
+RDEPEND+=" dev-libs/gobject-introspection"
+
+ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+ # Remove pregenerated Makefile since it will otherwise be shared by all targets.
+ rm -f Makefile Makefile.lib ext/gobject-introspection/Makefile || die
+
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' test/gobject-introspection-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_prepare() {
+ case ${RUBY} in
+ *ruby19)
+ # Avoid test with ruby20+ code.
+ rm -f test/test-repository.rb || die
+ ;;
+ esac
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gstreamer/Manifest b/dev-ruby/ruby-gstreamer/Manifest
index 1342718..de9954c 100644
--- a/dev-ruby/ruby-gstreamer/Manifest
+++ b/dev-ruby/ruby-gstreamer/Manifest
@@ -1,3 +1,4 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.4.tar.gz 1699429 SHA256 9274e21b2613ec9ef8b73dd27d180b3fa8b8214a442d742121b0d1cc7f313670 SHA512 33e79109e3acdb1fae07a2b4c867d9b83508ed275dd8fc6148bc976a9fefa2ea0cede01a6762570bdaf1d53173df40b978366837363b4d956b864c6a5f08bf39 WHIRLPOOL bb6a57ee7e4822d807d4506b8c78da1711b222d636d01a55792c5ba37b747997e3288afea3afeb71c96f75f2d58931d283a639632d7fcb1d8b1bc36c294a32af
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.0.7.ebuild b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.0.7.ebuild
new file mode 100644
index 0000000..b16ed87
--- /dev/null
+++ b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.0.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby GStreamer bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0"
+DEPEND="${DEPEND}
+ dev-libs/gobject-introspection
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0"
+
+ruby_add_rdepend "
+ ~dev-ruby/ruby-glib2-${PV}
+ ~dev-ruby/ruby-gobject-introspection-${PV}
+"
+
+all_ruby_prepare() {
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
diff --git a/dev-ruby/ruby-gtk2/Manifest b/dev-ruby/ruby-gtk2/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-gtk2/Manifest
+++ b/dev-ruby/ruby-gtk2/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-3.0.7.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-3.0.7.ebuild
new file mode 100644
index 0000000..5660e5f
--- /dev/null
+++ b/dev-ruby/ruby-gtk2/ruby-gtk2-3.0.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk2 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:2
+ x11-themes/hicolor-icon-theme"
+RDEPEND+=" x11-libs/gtk+:2"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}
+ >=dev-ruby/ruby-pango-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gdkpixbuf2-${PV}
+ >=dev-ruby/ruby-atk-${PV}
+ >=dev-ruby/ruby-pango-${PV}"
+
+all_ruby_prepare() {
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
diff --git a/dev-ruby/ruby-gtk3/Manifest b/dev-ruby/ruby-gtk3/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-gtk3/Manifest
+++ b/dev-ruby/ruby-gtk3/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7.ebuild
new file mode 100644
index 0000000..492bd3e
--- /dev/null
+++ b/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk3 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:3"
+RDEPEND+=" x11-libs/gtk+:3"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}
+ >=dev-ruby/ruby-pango-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gdkpixbuf2-${PV}
+ >=dev-ruby/ruby-atk-${PV}
+ >=dev-ruby/ruby-gdk3-${PV}
+ >=dev-ruby/ruby-gio2-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+# sed -i -e '/notify/ s:^:#:' \
+# test/clutter-gtk-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/which make/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
diff --git a/dev-ruby/ruby-gtksourceview/Manifest b/dev-ruby/ruby-gtksourceview/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-gtksourceview/Manifest
+++ b/dev-ruby/ruby-gtksourceview/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.0.7.ebuild b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.0.7.ebuild
new file mode 100644
index 0000000..23d8e06
--- /dev/null
+++ b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.0.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_NAME="gtksourceview2"
+
+inherit virtualx ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/gtksourceview2
+
+DESCRIPTION="Ruby bindings for gtksourceview"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" x11-libs/gtksourceview:2.0"
+DEPEND+=" x11-libs/gtksourceview:2.0"
+
+ruby_add_rdepend ">=dev-ruby/ruby-gtk2-${PV}"
+
+all_ruby_prepare() {
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
diff --git a/dev-ruby/ruby-gtksourceview3/Manifest b/dev-ruby/ruby-gtksourceview3/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-gtksourceview3/Manifest
+++ b/dev-ruby/ruby-gtksourceview3/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.0.7.ebuild b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.0.7.ebuild
new file mode 100644
index 0000000..f63087c
--- /dev/null
+++ b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.0.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk3 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtksourceview:3.0"
+RDEPEND+=" x11-libs/gtksourceview:3.0"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.16-r1.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.16-r1.ebuild
index 54b0bcd..285ac6a 100644
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.16-r1.ebuild
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.16-r1.ebuild
@@ -21,7 +21,7 @@
IUSE="ssl"
DEPEND=">=net-nds/openldap-2
dev-libs/cyrus-sasl
- ssl? ( dev-libs/openssl )"
+ ssl? ( dev-libs/openssl:0 )"
RDEPEND="${DEPEND}"
# Current test set is interactive due to certificate generation and requires
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.16-r2.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.16-r2.ebuild
deleted file mode 100644
index 465633f..0000000
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.16-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-# jruby: mkmf
-# rbx: require 'ldap' no such file to load
-USE_RUBY="ruby19 ruby20 ruby21"
-
-inherit multilib ruby-fakegem
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="ChangeLog FAQ NOTES README TODO"
-
-DESCRIPTION="A Ruby interface to some LDAP libraries"
-HOMEPAGE="http://ruby-ldap.sourceforge.net/"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
-IUSE="ssl"
-DEPEND=">=net-nds/openldap-2
- dev-libs/cyrus-sasl
- ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-# Current test set is interactive due to certificate generation and requires
-# running LDAP daemon
-RESTRICT="test"
-
-each_ruby_configure() {
- local myconf="--with-openldap2"
- if ! use ssl ; then
- myconf="${myconf} --without-libcrypto --without-libssl"
- fi
- ${RUBY} extconf.rb ${myconf} || die "extconf.rb failed"
- sed -i -e 's:-Wl,--no-undefined::' \
- -e "s/^ldflags = /ldflags = $\(LDFLAGS\) /" Makefile || die
-}
-
-each_ruby_compile() {
- emake V=1
- cp ldap$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.17.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.17.ebuild
index 8a1196b..10486fc 100644
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.17.ebuild
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.17.ebuild
@@ -19,7 +19,7 @@
IUSE="ssl"
DEPEND=">=net-nds/openldap-2
dev-libs/cyrus-sasl
- ssl? ( dev-libs/openssl )"
+ ssl? ( dev-libs/openssl:0 )"
RDEPEND="${DEPEND}"
# Current test set is interactive due to certificate generation and requires
diff --git a/dev-ruby/ruby-pango/Manifest b/dev-ruby/ruby-pango/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-pango/Manifest
+++ b/dev-ruby/ruby-pango/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-pango/ruby-pango-3.0.7.ebuild b/dev-ruby/ruby-pango/ruby-pango-3.0.7.ebuild
new file mode 100644
index 0000000..c8cd37c
--- /dev/null
+++ b/dev-ruby/ruby-pango/ruby-pango-3.0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Pango bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND+=" >=x11-libs/pango-1.2.1"
+RDEPEND+=" >=x11-libs/pango-1.2.1"
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}
+ >=dev-ruby/rcairo-1.14.0"
+ruby_add_bdepend ">=dev-ruby/rcairo-1.14.0"
+
+all_ruby_prepare() {
+ # Remove test depending on specific locales to be set up: bug 526248
+ rm -f test/test-language.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-poppler/Manifest b/dev-ruby/ruby-poppler/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-poppler/Manifest
+++ b/dev-ruby/ruby-poppler/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.0.7.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.0.7.ebuild
new file mode 100644
index 0000000..f08b6bd
--- /dev/null
+++ b/dev-ruby/ruby-poppler/ruby-poppler-3.0.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby poppler-glib bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" app-text/poppler[cairo]"
+DEPEND+=" app-text/poppler[cairo]"
+
+ruby_add_rdepend "dev-ruby/ruby-gdkpixbuf2
+ >=dev-ruby/ruby-glib2-${PV}
+ >=dev-ruby/ruby-gtk2-${PV}"
+
+all_ruby_prepare() {
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/if have_make/,/^ end/ s:^:#:' test/run-test.rb || die
+
+ # Avoid tests downloading a test PDF directly.
+ rm -f test/test_{annotation,document,page}.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-rsvg/Manifest b/dev-ruby/ruby-rsvg/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-rsvg/Manifest
+++ b/dev-ruby/ruby-rsvg/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-rsvg/ruby-rsvg-3.0.7.ebuild b/dev-ruby/ruby-rsvg/ruby-rsvg-3.0.7.ebuild
new file mode 100644
index 0000000..60beba1
--- /dev/null
+++ b/dev-ruby/ruby-rsvg/ruby-rsvg-3.0.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_NAME=rsvg2
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/rsvg2
+
+DESCRIPTION="Ruby bindings for librsvg"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=" >=gnome-base/librsvg-2.8"
+DEPEND+=" >=gnome-base/librsvg-2.8"
+
+ruby_add_rdepend "
+ >=dev-ruby/ruby-gdkpixbuf2-${PV}
+ >=dev-ruby/rcairo-1.12.8"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' test/rsvg2-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/and have_make/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-shadow/Manifest b/dev-ruby/ruby-shadow/Manifest
index 405e2cc..e4fcffc 100644
--- a/dev-ruby/ruby-shadow/Manifest
+++ b/dev-ruby/ruby-shadow/Manifest
@@ -1,2 +1,3 @@
DIST ruby-shadow-2.3.4.gem 10752 SHA256 3742a3dbe1100276bde815e8ad8d54eb041d4085f3013a31deb5e038d12e93e8 SHA512 30a626638d09da34273ac414c1716ebecc6112328a72adabaf3f31c99717630f7499a33d3ddf106c533a90775604a8038ea270ec6afccbf88adb3a8be7f6025b WHIRLPOOL 3449a1206aa39f76a5021afbea1f94fe11a585e16f9a7a89e74da7bdba6dafc63f8d8874f239cb8d14399d01a4819e074930b647e4d9bcbf812cec37d4d458cd
DIST ruby-shadow-2.4.1.gem 10752 SHA256 b335c8de1ac85e67e6d9013a0fa2d2f2a890e0b75fb38cf18ffa4cf62197f1af SHA512 a59006b17b290dccd33e33089f2cc9e714e119b867370cf0fb448e659a769e958897f24e2068a7a3699156ad580f2222b63b281a94221c57874b42836f075907 WHIRLPOOL da8c2d78d2a98c5fb24c1c018915e3aee7ecdef967da85595e4a675affe47508b80f110255ad2496921fe7439f9fcd234b971fc35be1e20c1f6d28b415e40dab
+DIST ruby-shadow-2.5.0.gem 11264 SHA256 c5e82fefb03169197a653ffeae533f81e99462d13b90ee7e5786287a2e2194a1 SHA512 1abd54df1bd4f29e135093df9b22886a726824f8b72b742017fd31bdc3fa39e3d79410a747cf2ebe4117f75e665fb89c904375b5c44a674bec91a4cc37646520 WHIRLPOOL f5f610cc4bbbe39c6a457d309436a054fe0300b7e8be13b269582e8328dde80f7f50eaf78a19af7da78a611063cc2d377e2c085a06f6d1a08b847ab08bef6b3e
diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
new file mode 100644
index 0000000..1f17a97
--- /dev/null
+++ b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="HISTORY README README.euc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="ruby shadow bindings"
+HOMEPAGE="https://github.com/apalmblad/ruby-shadow http://ttsky.net"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+each_ruby_configure() {
+ ${RUBY} extconf.rb || die "Configuration failed."
+ sed -i -e "/^ldflags =/s/$/ \$(LDFLAGS)/" Makefile || die
+}
+
+each_ruby_compile() {
+ emake V=1
+ mkdir -p lib
+ cp shadow$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/ruby-vte/Manifest b/dev-ruby/ruby-vte/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-vte/Manifest
+++ b/dev-ruby/ruby-vte/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-vte/ruby-vte-3.0.7.ebuild b/dev-ruby/ruby-vte/ruby-vte-3.0.7.ebuild
new file mode 100644
index 0000000..ddc2f72
--- /dev/null
+++ b/dev-ruby/ruby-vte/ruby-vte-3.0.7.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby vte bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" >=x11-libs/vte-0.12.1:0"
+DEPEND+=" >=x11-libs/vte-0.12.1:0"
+
+ruby_add_rdepend ">=dev-ruby/ruby-gtk2-${PV}"
diff --git a/dev-ruby/ruby-vte3/Manifest b/dev-ruby/ruby-vte3/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-vte3/Manifest
+++ b/dev-ruby/ruby-vte3/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-vte3/ruby-vte3-3.0.7.ebuild b/dev-ruby/ruby-vte3/ruby-vte3-3.0.7.ebuild
new file mode 100644
index 0000000..46ed99c
--- /dev/null
+++ b/dev-ruby/ruby-vte3/ruby-vte3-3.0.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby VTE bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/vte:2.90"
+RDEPEND+=" x11-libs/vte:2.90"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+
+ # Avoid tests that require a real pty.
+ rm -f test/test-pty.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-webkit-gtk/Manifest b/dev-ruby/ruby-webkit-gtk/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-webkit-gtk/Manifest
+++ b/dev-ruby/ruby-webkit-gtk/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-webkit-gtk/ruby-webkit-gtk-3.0.7.ebuild b/dev-ruby/ruby-webkit-gtk/ruby-webkit-gtk-3.0.7.ebuild
new file mode 100644
index 0000000..5774345
--- /dev/null
+++ b/dev-ruby/ruby-webkit-gtk/ruby-webkit-gtk-3.0.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby WebKitGtk bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" net-libs/webkit-gtk:3"
+RDEPEND+=" net-libs/webkit-gtk:3"
+
+RUBY_S="ruby-gnome2-all-${PV}/webkit-gtk"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gobject-introspection-${PV}
+ >=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ ../gobject-introspection/test/gobject-introspection-test-utils.rb \
+ test/webkit-gtk-test-utils.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-webkit-gtk2/Manifest b/dev-ruby/ruby-webkit-gtk2/Manifest
index eeb791e..f88b5ce 100644
--- a/dev-ruby/ruby-webkit-gtk2/Manifest
+++ b/dev-ruby/ruby-webkit-gtk2/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-webkit-gtk2/ruby-webkit-gtk2-3.0.7.ebuild b/dev-ruby/ruby-webkit-gtk2/ruby-webkit-gtk2-3.0.7.ebuild
new file mode 100644
index 0000000..12f9742
--- /dev/null
+++ b/dev-ruby/ruby-webkit-gtk2/ruby-webkit-gtk2-3.0.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby WebKitGtk+ for Gtk 2.0 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" net-libs/webkit-gtk:2"
+RDEPEND+=" net-libs/webkit-gtk:2"
+
+RUBY_S="ruby-gnome2-all-${PV}/webkit-gtk2"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gobject-introspection-${PV}
+ >=dev-ruby/ruby-gtk2-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ ../gobject-introspection/test/gobject-introspection-test-utils.rb \
+ test/webkit-gtk-test-utils.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index 60c513c..3d88b69 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -3,3 +3,4 @@
DIST sass-3.4.15.gem 336896 SHA256 6b461a469d29ec80b52b1401b5e5d58c48762a8f3e00f3b0b2d37b6791a87a59 SHA512 9a6db0d6bdcb788b850e47fb61c5b803e156178eecce7b0c7d0edd2a3578405fa6dc88d397051d738b8bf52c70b6457618afbaf14b5b6fb4bf5f43f057229d0b WHIRLPOOL c3691b0eae97f5b7f4ef1398b99e3702ac32d1894308f9c0ccd2c81a2d30c812e9b775b96d8898ea1941ad11de7f378cf988d38cac6fd8c4e32e678ddedcbaef
DIST sass-3.4.17.gem 339456 SHA256 2d0fda87240e0133e04f2fd30d0184c0cb13f9b5235fbf3fc4efc038f1b3da58 SHA512 905633b0dd09dbae396bbf0ee4527b079e37cad7b93215fcf37dd475b8cb18ed18fd40ec5ee1db76155c5890cb8ea495739ad34e3420f5058d784303469cb122 WHIRLPOOL 298c8416ad0d29f1ad74412d99f99ee4873804c4a90be5d340b5fb56f2fe07114e139d9100796d8ff25026a95938922e82dd1b08250cf9c91b5b9c972720807c
DIST sass-3.4.18.gem 339456 SHA256 1dbc7edeef048ae9d7e48089c8d77841d97a6cbed1b6bc894dc126f94c43b0ea SHA512 16e0360e130cdbd0e0e19d8198ac0d3d50debc49c950062e276be69613a99d539e23ab4b40887baed369034c5724acfe238920658dd586ff17c97dafb173dba2 WHIRLPOOL e3cff8cd416f2ed943fc17ef8c1c5a76d94f0680210685344506d1504daea09db24244151a43bf2f345b773850363148f503c10484a00d7faef1e0bef591bbdf
+DIST sass-3.4.19.gem 338944 SHA256 2faca8aa3b76beb0bc59dccabc5114eb4118af9d613121fbaa120e1c8b7f0290 SHA512 7ef5d6887784b98c19d389beb6f7d9d423f72e42c8f8da4b720482ba13a11273dc1ad86021e43e3e9325f57a8ca55b4b68504a21a9652eac96d23d871810aa83 WHIRLPOOL 3e9f2e3b1afdf4a65f820a9d63578572284e8ca64b2cdf40f2c67ae04fa554c4bf8ab847cf22d86ddaacb93068fcb38e4dc958cf1b29d7bec2a96531ee1865f0
diff --git a/dev-ruby/sass/sass-3.4.19.ebuild b/dev-ruby/sass/sass-3.4.19.ebuild
new file mode 100644
index 0000000..2e6adb8
--- /dev/null
+++ b/dev-ruby/sass/sass-3.4.19.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_NAME"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, selector inheritance, and more"
+HOMEPAGE="http://sass-lang.com/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+SLOT="$(get_version_component_range 1-2)"
+IUSE=""
+
+ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"
+
+ruby_add_rdepend ">=dev-ruby/listen-1.3.1:1 !!<dev-ruby/haml-3.1 !!<dev-ruby/sass-3.2.19-r1:0 !!<dev-ruby/sass-3.3.14-r1:3.3"
+
+# tests could use `less` if we had it
+
+all_ruby_prepare() {
+ rm -rf vendor/listen || die
+
+ # Don't require maruku as markdown provider but let yard decide.
+ sed -i -e '/maruku/d' .yardopts || die
+}
+
+each_ruby_test() {
+ RUBOCOP=false ${RUBY} -S rake test || die
+}
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 90449f5..ef11548 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -2,3 +2,4 @@
DIST selenium-webdriver-2.46.2.gem 2919424 SHA256 cb6575396f62f86f015c4905970d48da546c59109ed0aa318af061468d19a85c SHA512 b19bd428090381a12b577d82678ea8dfd2eec64c41e7c070c066ad8e9f106c3821a476038132f49862e1e01a5e940fa4e7a15f3655493753303dcedcccc55943 WHIRLPOOL e2413479641c6a4e687a824016af023f76286a0b89af3733e421d103d38e4dd73c8fcbc30b72135699c178060bfa2978ad15941864715c90f5a65311ae10b016
DIST selenium-webdriver-2.47.0.gem 2871808 SHA256 78dd73ab91fbaec770aec43e2366f8c8afeb4536367f8fd06de665fae722d09b SHA512 386f6485e346e570588fe533f8a2dd6927268fa5a438fd2fac6ec8ac064ba8f4b43a085acccbe8a94ed09c2bed52e0b799ea5eb7fb080d4a139dd5622a46e301 WHIRLPOOL b05364e972821eac7bc4bc498508457b6343e2a666f33420faf058b920a74c33c6d0cbe6d1b620ca1c4a2d77de05a7f59bbb77c2ec0498b02b9ed4f3edfcb1de
DIST selenium-webdriver-2.47.1.gem 2872832 SHA256 0140306e064fc40eb2dc632a88fd47dabe786ec2b29f7c59ee425d58113f7b86 SHA512 2973983dfca3ae1c97f55edc9db9480a7595676439c57ae58ec8af18ae6c5e210e2a2efcab630036079c4fed0513ce2e961b36dec3501b41e787a92ebf8cca98 WHIRLPOOL 137327e3066f9cdd52fc41ef1a36ee7a1ebb669b0a5dcbb9aafe7f49d180d2b41850b60089592b2ae9db8c9127764db2108543a173853b1ba4edf16131e8858c
+DIST selenium-webdriver-2.48.0.gem 884736 SHA256 8a67d2ca76bd20a6b2b3d63923756fad04c60bd86d95ca276cc256d12996ebef SHA512 1c270c7ab4176f38a776c000be57366b7143ca33b4ac34e3406710a5f5fb787fd70c77e4bca4d586be855ee7248a0b1d14fa7e0cab8b43f81f497468451d52a4 WHIRLPOOL b677111b1c0e2bcf823b186165d9c93aa3fe2d73e4be462053cd03a0757b1c6eb8d4006423266b95ea558c8d02a9a08d41e495640d0ee7e5bd9f1c78a5ce8a55
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-2.48.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-2.48.0.ebuild
new file mode 100644
index 0000000..6c67ddb
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-2.48.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="http://gemcutter.org/gems/selenium-webdriver"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
+ >=dev-ruby/multi_json-1.0.4
+ dev-ruby/rubyzip:1"
+
+all_ruby_prepare() {
+ # Make websocket a development dependency since it is only needed
+ # for the safari driver which we don't support on Gentoo.
+ sed -i -e '/websocket/,/version_requirements/ s/runtime/development/' ../metadata || die
+}
diff --git a/dev-ruby/sprockets/sprockets-2.12.3-r1.ebuild b/dev-ruby/sprockets/sprockets-2.12.3-r1.ebuild
index 7be0d99..30d14ef 100644
--- a/dev-ruby/sprockets/sprockets-2.12.3-r1.ebuild
+++ b/dev-ruby/sprockets/sprockets-2.12.3-r1.ebuild
@@ -25,10 +25,10 @@
IUSE=""
ruby_add_rdepend "
- =dev-ruby/hike-1* >=dev-ruby/hike-1.2
+ =dev-ruby/hike-1*:0 >=dev-ruby/hike-1.2:0
=dev-ruby/multi_json-1*
- =dev-ruby/rack-1*
- =dev-ruby/tilt-1* >=dev-ruby/tilt-1.3.1
+ =dev-ruby/rack-1*:*
+ =dev-ruby/tilt-1*:0 >=dev-ruby/tilt-1.3.1:0
!!<dev-ruby/sprockets-2.2.2-r1:2.2"
ruby_add_bdepend "test? (
@@ -55,6 +55,9 @@
# Require a newer version of execjs since we do not have this slotted.
sed -i -e '/execjs/ s/1.0/2.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Make sure the correct version of tilt is used when testing
+ sed -i -e '1igem "tilt", "~>1.3"' test/sprockets_test.rb || die
}
each_ruby_prepare() {
@@ -68,5 +71,10 @@
rm -rf test || die
mv test-new test || die
+ # Make sure we use the correct tilt version.
+ sed -i -e '2i gem "tilt", "~>1.3"' bin/sprockets || die
+
each_fakegem_test
+
+ sed -i -e '/tilt/d' bin/sprockets || die
}
diff --git a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
index db22069..6d5d5b1 100644
--- a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
@@ -16,7 +16,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test doc"
RUBY_PATCHES=( "${P}-require-set.patch" )
diff --git a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
index c8d9f9b..c074da5 100644
--- a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
+++ b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
@@ -27,7 +27,7 @@
LICENSE="Ruby"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="doc test"
all_ruby_compile() {
diff --git a/dev-ruby/thread_order/thread_order-1.1.0.ebuild b/dev-ruby/thread_order/thread_order-1.1.0.ebuild
index f825b9f..0c37bf2 100644
--- a/dev-ruby/thread_order/thread_order-1.1.0.ebuild
+++ b/dev-ruby/thread_order/thread_order-1.1.0.ebuild
@@ -18,7 +18,7 @@
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa ~ppc64"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/web-console/Manifest b/dev-ruby/web-console/Manifest
index 216fcd5..e8ee71f 100644
--- a/dev-ruby/web-console/Manifest
+++ b/dev-ruby/web-console/Manifest
@@ -1,2 +1 @@
-DIST web-console-2.1.3.tar.gz 32705 SHA256 558c97a2809282a7d397a6d9d6485d1db850c844c28ab4b5f40479a7a50781c5 SHA512 91cff2f02a0c498f97a4be344d0bf5b4f9aa6a2521f7511739fb71c61a45d309fc5b4a9ee4881311129a9f7526a9ec51c87258d5d3abeb77d00dc6c4c46516ff WHIRLPOOL fc4109fe6a517075b6d140cc38dbe56b9d52b4906be38c011e3dced5e1354cc909c2f753d102cf96fd184815a363a49c091545bccfe197d9cc721baa9f0fadfb
DIST web-console-2.2.1.tar.gz 37554 SHA256 147727d34bd4165a0c214a7f2761e2999dd4355f11661acb6da43f414fa33f9e SHA512 832838a975f805b8c35fb03233fc1a39c90ba5c36908b4e3fb355bcad3b7b7113cbbb2544474948453353a89953cdd2fecdd71bdbeab5ab06f71bd7f67a3be31 WHIRLPOOL d4d1e55a1864daab086e86e33debc800afb90c099556199c7cc13bfbd25098420df1756171f2722aecb449fec1df60a3f79725216ff3b28b8658de3369f0aa10
diff --git a/dev-ruby/web-console/web-console-2.1.3.ebuild b/dev-ruby/web-console/web-console-2.1.3.ebuild
deleted file mode 100644
index 623943a..0000000
--- a/dev-ruby/web-console/web-console-2.1.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A debugging tool for your Ruby on Rails applications"
-HOMEPAGE="https://github.com/rails/web-console"
-SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
- >=dev-ruby/activemodel-4.0:*
- >=dev-ruby/binding_of_caller-0.7.2
- >=dev-ruby/railties-4.0:*
- >=dev-ruby/sprockets-rails-2.0:* <dev-ruby/sprockets-rails-4.0:*
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/bundler
- >=dev-ruby/rails-4.0
- dev-ruby/sqlite3
- dev-ruby/mocha
- dev-ruby/simplecov
-)"
-
-all_ruby_prepare() {
- # Use an installed rails version rather than live source from github.
- sed -i -e '/rails/ s/,/#/' Gemfile || die
-}
diff --git a/dev-ruby/web-console/web-console-2.2.1-r1.ebuild b/dev-ruby/web-console/web-console-2.2.1-r1.ebuild
new file mode 100644
index 0000000..74e1962
--- /dev/null
+++ b/dev-ruby/web-console/web-console-2.2.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A debugging tool for your Ruby on Rails applications"
+HOMEPAGE="https://github.com/rails/web-console"
+SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+ >=dev-ruby/activemodel-4.0:*
+ >=dev-ruby/binding_of_caller-0.7.2
+ >=dev-ruby/railties-4.0:*
+ >=dev-ruby/sprockets-rails-2.0:* <dev-ruby/sprockets-rails-4.0:*
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ >=dev-ruby/rails-4.0
+ dev-ruby/sqlite3
+ dev-ruby/mocha
+ dev-ruby/simplecov
+)"
+
+all_ruby_prepare() {
+ # Use an installed rails version rather than live source from github.
+ sed -i -e '/rails/ s/,/#/' Gemfile || die
+}
diff --git a/dev-ruby/web-console/web-console-2.2.1.ebuild b/dev-ruby/web-console/web-console-2.2.1.ebuild
deleted file mode 100644
index 623943a..0000000
--- a/dev-ruby/web-console/web-console-2.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A debugging tool for your Ruby on Rails applications"
-HOMEPAGE="https://github.com/rails/web-console"
-SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
- >=dev-ruby/activemodel-4.0:*
- >=dev-ruby/binding_of_caller-0.7.2
- >=dev-ruby/railties-4.0:*
- >=dev-ruby/sprockets-rails-2.0:* <dev-ruby/sprockets-rails-4.0:*
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/bundler
- >=dev-ruby/rails-4.0
- dev-ruby/sqlite3
- dev-ruby/mocha
- dev-ruby/simplecov
-)"
-
-all_ruby_prepare() {
- # Use an installed rails version rather than live source from github.
- sed -i -e '/rails/ s/,/#/' Gemfile || die
-}
diff --git a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
new file mode 100644
index 0000000..dda1916
--- /dev/null
+++ b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils
+
+MY_P="${P^g}"
+
+DESCRIPTION="A Unix system friendly Scheme Interpreter"
+HOMEPAGE="http://practical-scheme.net/gauche/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6 libressl test"
+
+RDEPEND="sys-libs/gdbm"
+DEPEND="${RDEPEND}
+ test? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-rpath.diff
+ epatch "${FILESDIR}"/${PN}-gauche.m4.diff
+ epatch "${FILESDIR}"/${PN}-ext-ldflags.diff
+ epatch "${FILESDIR}"/${PN}-xz-info.diff
+ epatch "${FILESDIR}"/${PN}-rfc.tls.diff
+ eautoconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable ipv6) \
+ --with-slib="${EPREFIX}"/usr/share/slib
+}
+
+src_test() {
+ emake -j1 -s check
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install-pkg install-doc
+ dodoc AUTHORS ChangeLog HACKING README
+}
diff --git a/dev-scheme/guile/files/guile-1.8.8-gcc5.patch b/dev-scheme/guile/files/guile-1.8.8-gcc5.patch
new file mode 100644
index 0000000..742ea0b
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-gcc5.patch
@@ -0,0 +1,15 @@
+Preprocessor changes in GCC 5 cause guile-snarf to output garbage.
+
+https://bugs.gentoo.org/560736
+
+--- a/libguile/guile-snarf.in
++++ b/libguile/guile-snarf.in
+@@ -50,7 +50,7 @@
+ ## Apparently, AIX's preprocessor is unhappy if you try to #include an
+ ## empty file.
+ echo "/* cpp arguments: $@ */" ;
+- ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
++ ${cpp} -P -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
+ grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
+ }
+
diff --git a/dev-scheme/guile/files/guile-1.8.8-readline.patch b/dev-scheme/guile/files/guile-1.8.8-readline.patch
new file mode 100644
index 0000000..68f64c52
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-readline.patch
@@ -0,0 +1,34 @@
+Make guile-readline optional
+
+https://bugs.gentoo.org/392553
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,7 +24,7 @@
+ #
+ AUTOMAKE_OPTIONS = 1.10
+
+-SUBDIRS = oop libguile ice-9 guile-config guile-readline emacs \
++SUBDIRS = oop libguile ice-9 guile-config @GUILE_READLINE@ emacs \
+ scripts srfi doc examples test-suite benchmark-suite lang am
+
+ bin_SCRIPTS = guile-tools
+--- a/configure.in
++++ b/configure.in
+@@ -57,7 +57,15 @@ AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/)
+ #
+ #--------------------------------------------------------------------
+
+-AC_CONFIG_SUBDIRS(guile-readline)
++GUILE_READLINE=
++AC_ARG_ENABLE([readline],
++ [AS_HELP_STRING([--disable-readline],
++ [disable building guile-readline])],
++ if test "x$enable_readline" != xno; then
++ AC_CONFIG_SUBDIRS([guile-readline])
++ GUILE_READLINE="guile-readline"
++ fi)
++AC_SUBST([GUILE_READLINE])
+
+ #--------------------------------------------------------------------
+
diff --git a/dev-scheme/guile/files/guile-1.8.8-sandbox.patch b/dev-scheme/guile/files/guile-1.8.8-sandbox.patch
new file mode 100644
index 0000000..70d752f
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-sandbox.patch
@@ -0,0 +1,15 @@
+Prevent sandbox violation when installing
+
+https://bugs.gentoo.org/521546
+
+--- a/guile-config/Makefile.am
++++ b/guile-config/Makefile.am
+@@ -39,8 +39,3 @@ guile-config: guile-config.in ${top_builddir}/libguile/libpath.h
+ -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:
+ chmod +x guile-config.tmp
+ mv guile-config.tmp guile-config
+-
+-## Get rid of any copies of the configuration script under the old
+-## name, so people don't end up running ancient copies of it.
+-install-exec-local:
+- rm -f ${bindir}/build-guile
diff --git a/dev-scheme/guile/files/guile-1.8.8-tinfo.patch b/dev-scheme/guile/files/guile-1.8.8-tinfo.patch
new file mode 100644
index 0000000..6c4d011
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-tinfo.patch
@@ -0,0 +1,15 @@
+With ncurses[tinfo] tgoto will be in libtinfo
+
+https://bugs.gentoo.org/539316
+
+--- a/guile-readline/configure.in
++++ b/guile-readline/configure.in
+@@ -33,7 +33,7 @@ if test "$MINGW32" = "yes" ; then
+ fi
+ AC_SUBST(EXTRA_DEFS)
+
+-for termlib in ncurses curses termcap terminfo termlib ; do
++for termlib in ncurses curses termcap terminfo termlib tinfo ; do
+ AC_CHECK_LIB(${termlib}, tgoto,
+ [LIBS="-l${termlib} $LIBS"; break])
+ done
diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild
new file mode 100644
index 0000000..b638126
--- /dev/null
+++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools flag-o-matic elisp-common
+
+DESCRIPTION="Scheme interpreter"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
+
+RESTRICT="!regex? ( test )"
+
+RDEPEND="
+ >=dev-libs/gmp-4.1:0=
+ dev-libs/libltdl:0=
+ sys-devel/gettext
+ sys-libs/ncurses:0=
+ emacs? ( virtual/emacs )
+ readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo
+ sys-devel/libtool"
+
+# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
+# but there are lots of collisions. Most in /usr/share/libguile. Therefore
+# I'm slotting this in the same slot as guile-1.6* for now.
+SLOT="12"
+MAJOR="1.8"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-fix_guile-config.patch" \
+ "${FILESDIR}/${P}-gcc46.patch" \
+ "${FILESDIR}/${P}-gcc5.patch" \
+ "${FILESDIR}/${P}-makeinfo-5.patch" \
+ "${FILESDIR}/${P}-gtexinfo-5.patch" \
+ "${FILESDIR}/${P}-readline.patch" \
+ "${FILESDIR}/${P}-tinfo.patch" \
+ "${FILESDIR}/${P}-sandbox.patch"
+
+ sed \
+ -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \
+ -e "/AM_PROG_CC_STDC/d" \
+ -i guile-readline/configure.in
+
+ epatch_user
+
+ mv "${S}"/configure.{in,ac} || die
+ mv "${S}"/guile-readline/configure.{in,ac} || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # see bug #178499
+ filter-flags -ftree-vectorize
+
+ #will fail for me if posix is disabled or without modules -- hkBst
+ econf \
+ --disable-error-on-warning \
+ --disable-static \
+ --enable-posix \
+ $(use_enable networking) \
+ $(use_enable readline) \
+ $(use_enable regex) \
+ $(use deprecated || use_enable discouraged) \
+ $(use_enable deprecated) \
+ $(use_enable emacs elisp) \
+ $(use_enable nls) \
+ --disable-rpath \
+ $(use_enable debug-freelist) \
+ $(use_enable debug-malloc) \
+ $(use_enable debug guile-debug) \
+ $(use_with threads) \
+ --with-modules \
+ EMACS=no
+}
+
+src_compile() {
+ emake
+
+ # Above we have disabled the build system's Emacs support;
+ # for USE=emacs we compile (and install) the files manually
+ if use emacs; then
+ cd emacs
+ elisp-compile *.el || die
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS
+
+ # texmacs needs this, closing bug #23493
+ dodir /etc/env.d
+ echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
+
+ # necessary for registering slib, see bug 206896
+ keepdir /usr/share/guile/site
+
+ if use emacs; then
+ elisp-install ${PN} emacs/*.{el,elc} || die
+ elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
+ fi
+}
+
+pkg_postinst() {
+ [ "${EROOT}" == "/" ] && pkg_config
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
+
+pkg_config() {
+ if has_version dev-scheme/slib; then
+ einfo "Registering slib with guile"
+ install_slib_for_guile
+ fi
+}
+
+_pkg_prerm() {
+ rm -f "${EROOT}"/usr/share/guile/site/slibcat
+}
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index 1005abe..aee4d65 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -6,4 +6,6 @@
DIST racket-5.3.4-src-unix.tgz 19314579 SHA256 4d1fb86e001c497af674199f1ddff5534843bb94f21b9f0c1209b8bfdbad2d7b SHA512 35a05e31a11a8569d938af152a784358479cdad9f5007b04890d485ce92f04554df09d46179042478df96e018756b06e6c7c544b4f113272c31234b75ca740a9 WHIRLPOOL e114c4b18d4c18c8852627c9de207dd543e1f63b056bd1e8cbdecbe5e2a2a916d3144585ddb620c539ceb4c0710e0ee237803ffd4fa5b45e73434f7f017673e0
DIST racket-5.3.6-src-unix.tgz 19278914 SHA256 7fe0ffc1231f888cd481f175e428f0217257dd136d2513bde73954af5a7cfb8a SHA512 08e8b599e800f41c9497b07e163ed43ae02ae9d9bcc3e20da31eb2f6aa20aa4b0071db51e93696ae1bd644ddfa1c3aea587a334db24ced4a3654dcf5da138e8f WHIRLPOOL c2c34de08d0ec9942f040cc23ea7f2a9bb743d0dcc7125e1b5336b0845482e67abd46b1b5cb821e898c3db50767312f3a27e386a0b7046bf068feb23a1b1bf52
DIST racket-6.0.1-src-builtpkgs.tgz 101425779 SHA256 2b5f2bccb21d408041e167a4476115075c3b230ab50e1d66fe1a3c0ab205bfa1 SHA512 b51fade0afa33b11c4be7da8aec910a8b33bb1cc097748362ecc342b3cd50dcd1c6c52c68c3485b91bddd74a15f8767d357d911151c8cd263a0caa5d72a888a5 WHIRLPOOL d7944c7e1851bb48cc08c29d93763fb0c269ecbc33b59e02bbd6fc1592287376434c0c8c87bada29289d235d7816420170bc6c0f12f684eb9a32a7508342ce0b
+DIST racket-6.2.1-src-builtpkgs.tgz 113159311 SHA256 04429315159d86c71037e4c1157a724476065803e32346abc0ee37708aed0fcd SHA512 1776e22412d37de69019147e670c88b015d31c31c654cc647ee6598588e94cad32b8d52e4d1738febe3ed47aaf1dc89c5db03878a0e3a4baff75dab302c2a294 WHIRLPOOL 9de2f3068061b13067c6e05289ae6ca233c9c0a90ef639a6e9853df5deb9e1358f2609e712e472312bd599a0cbe79973c4525c5fa99bbc9cd59837d674498b68
DIST racket-minimal-6.0.1-src-builtpkgs.tgz 9139061 SHA256 f58aa4e3e831417b72d5c19aba20a5b0eaa1111af2f1afa3096b0a4e83b860a3 SHA512 99c7ecf5d7e1de40358a03a5878271e2864fa9e6fe11bab71bd68784bd058a2edbb4ec65ba455dbff2a943c78ec0f9a9b0f46b1532fc1b55be500593160da313 WHIRLPOOL bc3dc19d8c23129866adeb71d125314d66ce2e505d1a453f26c09e9aa42bc98626cba2ddb87d8ae53c7ad5939443defc88c4f1c4ce174567a01b1f56be9788ea
+DIST racket-minimal-6.2.1-src-builtpkgs.tgz 9736885 SHA256 47eceb5f23ab66a939650fa44dd89ffcb17a6227f58c6bc80e90aa8999c86b36 SHA512 048f247136b15c2b118f497e9058a34dc7135ad4fbe707345290238e1268dd72e0ba35d3fd1690d0f9e97e56748f8964eb80c23c6be278bc6e5e819414c0d4a9 WHIRLPOOL 3c475a8204cea6c802043f4e823d2b1cdc50055ebc3288768988d5e3bf8e502b32300228360603743a9b1d065a845bb1e22d12e4b0fe79a4a6132e2ba335be53
diff --git a/dev-scheme/racket/racket-6.2.1.ebuild b/dev-scheme/racket/racket-6.2.1.ebuild
new file mode 100644
index 0000000..20e48f0
--- /dev/null
+++ b/dev-scheme/racket/racket-6.2.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# for live ebuilds uncomment inherit git-2, comment SRC_URI and empty KEYWORDS
+
+inherit eutils pax-utils
+#inherit git-2
+
+DESCRIPTION="Racket is a general-purpose programming language with strong support for domain-specific languages"
+HOMEPAGE="http://racket-lang.org/"
+SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
+#SRC_URI="http://pre.racket-lang.org/installers/plt-${PV}-src-unix.tgz"
+EGIT_REPO_URI="git://git.racket-lang.org/plt.git"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc +futures +jit minimal +places +threads +X"
+REQUIRED_USE="futures? ( jit )"
+
+# see bug 426316: racket/draw (which depends on cairo) is sometimes used in compile-time code or when rendering documentation
+RDEPEND="dev-db/sqlite:3 x11-libs/cairo[X?] virtual/libffi"
+DEPEND="${RDEPEND}"
+
+EGIT_SOURCEDIR="${WORKDIR}/${P}"
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+ #remove bundled libraries
+ rm -rf foreign/libffi/
+}
+
+src_configure() {
+# according to vapier, we should use the bundled libtool
+# such that we don't preclude cross-compile. Thus don't use
+# --enable-lt=/usr/bin/libtool
+ econf \
+ $(use_enable X gracket) \
+ $(use_enable doc docs) \
+ --enable-shared \
+ $(use_enable jit) \
+ --enable-foreign \
+ $(use_enable places) \
+ $(use_enable futures) \
+ $(use_enable threads pthread)
+}
+
+src_compile() {
+ if use jit; then
+ pushd racket
+ emake cgc
+ pax-mark m .libs/racketcgc
+ emake 3m
+ pax-mark m .libs/racket3m
+ popd
+ fi
+ emake
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ #racket now comes with desktop files, but DESTDIR is mishandled
+ for f in /usr/share/applications/{drracket,slideshow}.desktop; do
+ sed -e "s|${D}||g" \
+ -i "${D}/${f}" || die "Failed to patch '${f}'"
+ done
+}
diff --git a/dev-scheme/slib/slib-3.2.2.ebuild b/dev-scheme/slib/slib-3.2.2.ebuild
index a418aa1..6e6c6be 100644
--- a/dev-scheme/slib/slib-3.2.2.ebuild
+++ b/dev-scheme/slib/slib-3.2.2.ebuild
@@ -31,7 +31,7 @@
_fix_txi_file() {
local inplace_filename="${1}"
- local tempfile="$(mktemp)"
+ local tempfile="$(emktemp)"
awk -f "${FILESDIR}"/slib-3.2.2-fix-texinfo.awk < "${inplace_filename}" > "${tempfile}"
mv "${tempfile}" "${inplace_filename}" || die
}
diff --git a/dev-scheme/stalin/stalin-0.11.ebuild b/dev-scheme/stalin/stalin-0.11.ebuild
index b9edc67..db6e73c 100644
--- a/dev-scheme/stalin/stalin-0.11.ebuild
+++ b/dev-scheme/stalin/stalin-0.11.ebuild
@@ -21,7 +21,7 @@
RESTRICT="strip"
src_prepare() {
- sed -i -e "s/-O3 -fomit-frame-pointer/${CFLAGS}/" makefile || die
+ sed -i -e "s/-O3 -fomit-frame-pointer/${CFLAGS}/" makefile || die
}
src_compile() {
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 92a450b..c2fe761 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,5 +1,3 @@
-DIST android-studio-ide-141.1890965-linux.zip 259139652 SHA256 f6c083902156ab83435fa91ae0743d9a2ae64e8aca1396afd553a44071366906 SHA512 bed422287003072ea4d65c05724fce22d3e847d5d292d2fa53cf799e344c2638d721e1e0c1c2b1444e1a52931e96f83499c5f9c6fb64e79aacbbf03dd1c10b61 WHIRLPOOL 58b542bb7f0a4375a5281e500ed74542c17af10582f305dd56792b7efb666a1a316a2d8fded99801d219ceceba919e527272b87067531a0a910d34197740dde1
DIST android-studio-ide-141.1980579-linux.zip 258628239 SHA256 46a1b492360f873f7b99f53b535ce79503f4127a8ee5d06afbe0f53ec5f56a21 SHA512 54a83e6a54cd07ade1bfd3756bdff9c3431594412a01809ac3d2b1b5b2fb1719b8dd4f980516eeba5f7016c7757950c93a1d368ad1034d1300b9fe44577a1bcd WHIRLPOOL 567bcc5ae38015a586224e7c5870d7766f18b4241b46aa53eb7459a7f26d859d9855632cdcf54d3b35bca1b7c39b15cfc1141d11a4d017d9b3e199b72f088b56
-DIST android-studio-ide-141.2117773-linux.zip 351742127 SHA256 061be01b266fea24517dfee24ed98cec1eee2ef840f062a697c6bd07d2db5d27 SHA512 e21291c3e759e1b500eca487ef1e43c2dfd44e051cffd6fe2abbf9445c7577846d8e11aaaf0cb7423b70185bbcbdca8bf4ae2d084fedba7f28adc9063409520c WHIRLPOOL 22e00aae65870af2d9e0c77754f9b0fe9a35b9798c2e0e4535288cbb9803a40c405b2235b078f97e203356e8468fb6e49f270d00704abdc2027448984adf794a
-DIST android-studio-ide-141.2135290-linux.zip 351992670 SHA256 60068d74bfa60f63f7e4920b8b43dff2f34d1956ee222a9bdec1b5590a38d4ac SHA512 799d37869276240854cbe8106146592e0fc9a019d3595d2c73f24f7ceabf76e6b0872d1594ca76cc4c59a9d7b573824e68b2a2c445f8b64334aa356aa415e112 WHIRLPOOL be853ac9ad8c16f633f6281c0ec16a1ce340caeac7d3f3653207cfa6c5d26e5c853980c090c5b18cc348fe0b3dc1eef96f565df3f879a192386746b9225fd90b
DIST android-studio-ide-141.2178183-linux.zip 352010593 SHA256 22316dc4cd17f82d02c7ca79efaa8d36ce7a6b3b384c6237ea1bcdd55d711762 SHA512 68f45638919d38a8c3c144ec2dc69ccbfe6467eddc570a2fadd7a36a79bdd609861224f06989b7e4ea1422c68914539221a4cf0a33e413da49fc72e1e418e717 WHIRLPOOL 4d0f63d22047e97bbb5b0a6d1382fdad5f4b1ddff59bda6d34b38ed5691c69a0b37e5a68a42ac3a3c0cff6c0b760bb7ec18a6a7d82f533ae97c3a06e94d4deb2
+DIST android-studio-ide-141.2288178-linux.zip 380821638 SHA256 a7a83d9af8b14589d7a791cbb2121fd63bcfc5ff44ef4ea7b9f16fdacdfcff13 SHA512 afc77575f9261060c28f27ee49b05b88de338c0b2b8d91eea2a8585243dc6404bc2784b7d15b2c05ac504228ceea11ccbbdfd4fa79a1037893232c55cb524b2f WHIRLPOOL 2d8d9c836b5049739d81c6ab374b87f3a1943252e555be2e3b52b11be7a54654d4947db1f87289c85e3d376a92c023508563c3705d956732132933c28ac12870
diff --git a/dev-util/android-studio/android-studio-1.2.0.12.141.1890965.ebuild b/dev-util/android-studio/android-studio-1.2.0.12.141.1890965.ebuild
deleted file mode 100644
index 597af23..0000000
--- a/dev-util/android-studio/android-studio-1.2.0.12.141.1890965.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils versionator
-
-RESTRICT="strip"
-QA_PREBUILT="opt/${PN}/bin/libbreakgen.so"
-if [[ $(get_version_component_count) -eq 6 ]]; then
- STUDIO_V=$(get_version_component_range 1-4)
- BUILD_V=$(get_version_component_range 5-6)
-else
- STUDIO_V=$(get_version_component_range 1-3)
- BUILD_V=$(get_version_component_range 4-5)
-fi
-
-DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="selinux"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/zip"
-RDEPEND=">=virtual/jdk-1.7
- selinux? ( sec-policy/selinux-android )
- >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
- >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
- >=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)]
- >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
- >=media-libs/freetype-2.5.5[abi_x86_32(-)]
- >=media-libs/libpng-1.2.51[abi_x86_32(-)]
- >=media-libs/mesa-10.2.8[abi_x86_32(-)]
- >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
- >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
- >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
- >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
- >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
- >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
- >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
- >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
- >=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
- >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
- >=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
- >=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
- >=x11-libs/libxshmfence-1.1[abi_x86_32(-)]"
-S=${WORKDIR}/${PN}
-
-src_install() {
- local dir="/opt/${PN}"
-
- insinto "${dir}"
- doins -r *
- fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
-
- newicon "bin/studio.png" "${PN}.png"
- make_wrapper ${PN} ${dir}/bin/studio.sh
- make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
-}
diff --git a/dev-util/android-studio/android-studio-1.3.1.0.141.2135290.ebuild b/dev-util/android-studio/android-studio-1.3.1.0.141.2135290.ebuild
deleted file mode 100644
index 37680af..0000000
--- a/dev-util/android-studio/android-studio-1.3.1.0.141.2135290.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils versionator
-
-RESTRICT="strip"
-QA_PREBUILT="opt/${PN}/bin/libbreakgen.so"
-if [[ $(get_version_component_count) -eq 6 ]]; then
- STUDIO_V=$(get_version_component_range 1-4)
- BUILD_V=$(get_version_component_range 5-6)
-else
- STUDIO_V=$(get_version_component_range 1-3)
- BUILD_V=$(get_version_component_range 4-5)
-fi
-
-DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/zip"
-RDEPEND=">=virtual/jdk-1.7
- selinux? ( sec-policy/selinux-android )
- >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
- >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
- >=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)]
- >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
- >=media-libs/freetype-2.5.5[abi_x86_32(-)]
- >=media-libs/libpng-1.2.51[abi_x86_32(-)]
- >=media-libs/mesa-10.2.8[abi_x86_32(-)]
- >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
- >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
- >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
- >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
- >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
- >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
- >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
- >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
- >=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
- >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
- >=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
- >=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
- >=x11-libs/libxshmfence-1.1[abi_x86_32(-)]"
-S=${WORKDIR}/${PN}
-
-src_install() {
- local dir="/opt/${PN}"
-
- insinto "${dir}"
- doins -r *
- fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
-
- newicon "bin/studio.png" "${PN}.png"
- make_wrapper ${PN} ${dir}/bin/studio.sh
- make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
-}
diff --git a/dev-util/android-studio/android-studio-1.4.0.10.141.2288178-r1.ebuild b/dev-util/android-studio/android-studio-1.4.0.10.141.2288178-r1.ebuild
new file mode 100644
index 0000000..2cff0d7
--- /dev/null
+++ b/dev-util/android-studio/android-studio-1.4.0.10.141.2288178-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen.so"
+if [[ $(get_version_component_count) -eq 6 ]]; then
+ STUDIO_V=$(get_version_component_range 1-4)
+ BUILD_V=$(get_version_component_range 5-6)
+else
+ STUDIO_V=$(get_version_component_range 1-3)
+ BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.7
+ selinux? ( sec-policy/selinux-android )
+ >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
+ >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
+ >=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)]
+ >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+ >=media-libs/freetype-2.5.5[abi_x86_32(-)]
+ >=media-libs/libpng-1.2.51[abi_x86_32(-)]
+ >=media-libs/mesa-10.2.8[abi_x86_32(-)]
+ || ( >=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] )
+ >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+ >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+ >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+ >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
+ >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+ >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+ >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+ >=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+ >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+ >=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
+ >=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+ >=x11-libs/libxshmfence-1.1[abi_x86_32(-)]"
+S=${WORKDIR}/${PN}
+
+src_install() {
+ local dir="/opt/${PN}"
+
+ insinto "${dir}"
+ doins -r *
+ fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
+
+ newicon "bin/studio.png" "${PN}.png"
+ make_wrapper ${PN} ${dir}/bin/studio.sh
+ make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
+}
diff --git a/dev-util/android-studio/android-studio-1.3.0.10.141.2117773.ebuild b/dev-util/android-studio/android-studio-1.4.0.10.141.2288178.ebuild
similarity index 100%
rename from dev-util/android-studio/android-studio-1.3.0.10.141.2117773.ebuild
rename to dev-util/android-studio/android-studio-1.4.0.10.141.2288178.ebuild
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index d7654b4..822c3d4 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1 @@
-DIST catalyst-2.0.16.tar.bz2 878929 SHA256 4578cbbc36a5d913b51967faad6feb9b8bb10a04794fe44e73b71790fa389142 SHA512 460ee4c996a7197f2d3e2504ef5ff205c74c0e7ca763a67dc57932a8df6199334fef3b234d90da1717d3f59b36081a29c768a864efa82129cd4f6e2de34ac3a8 WHIRLPOOL e43861bcb7286f85e8d0857d32f4e0ba9f39eea5bae2eac05e0b9e782ee2edad2a8171e1a0ea451c7ee67b21f2210f8ff3f2a9e37c16d16552c6c46e74637233
-DIST catalyst-2.0.17.tar.bz2 861341 SHA256 5f4142598d921e5174ff06f9571856760a324e79db5f3b63caf0d1a16adc813c SHA512 9d7b9ad383dcc5d4ba058596c0b607eb9601b28025d9300f63e68d78cbd5bca8fa3f3e03a81dc6b233021e773ba4301df0bf5cec51ca4368eb3577a68d33a92c WHIRLPOOL e97fc120141cc4f9f5c297652d8b43313780f615429c0eb3d9b85cba40aeca01dcbc6efb0f8d388cc5e7debabb2563cfc9b5a5aa00e3d00d306aed0f799fc642
DIST catalyst-2.0.18.tar.bz2 861398 SHA256 f3c2583fb8da425a9c57d3a00aac559e6bfde5951f1c7ef30ddf4fa00d6bedbd SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a WHIRLPOOL 73abb541bd9984e26e43dbeee3156ca84104aedfe16a027b97790274aaffa8678a29677da4ada908fe9c2184268eb9c266a8961a5e0681fccc463c47a6d83542
diff --git a/dev-util/catalyst/catalyst-2.0.16.ebuild b/dev-util/catalyst/catalyst-2.0.16.ebuild
deleted file mode 100644
index 0bd3e47..0000000
--- a/dev-util/catalyst/catalyst-2.0.16.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
- SRC_ECLASS="git-2"
- EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
- EGIT_MASTER="master"
- SRC_URI=""
- KEYWORDS=""
- S="${WORKDIR}/${PN}"
-else
- SRC_URI="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
- app-text/asciidoc
- ${PYTHON_DEPS}
-"
-RDEPEND="
- app-arch/lbzip2
- app-crypt/shash
- virtual/cdrtools
- amd64? ( >=sys-boot/syslinux-3.72 )
- ia64? ( sys-fs/dosfstools )
- x86? ( >=sys-boot/syslinux-3.72 )
- ccache? ( dev-util/ccache )
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
- ${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-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
-
- python-single-r1_pkg_setup
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/${PN}
- exeinto /usr/$(get_libdir)/${PN}
- doexe catalyst || die "copying catalyst"
-
- if [[ ${PV} == 3.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
-
- # Here is where we actually enable ccache
- use ccache && \
- sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
- files/catalyst.conf
-
- sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
- files/catalyst.conf
-
- 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 AUTHORS
- doman files/catalyst.1 files/catalyst-spec.5
-
- python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
- python_optimize "${ED}"
-}
-
-pkg_postinst() {
- einfo "You can find more information about catalyst by checking out the"
- einfo "catalyst project page at:"
- einfo "https://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-}
diff --git a/dev-util/catalyst/catalyst-2.0.17.ebuild b/dev-util/catalyst/catalyst-2.0.17.ebuild
deleted file mode 100644
index 0bd3e47..0000000
--- a/dev-util/catalyst/catalyst-2.0.17.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
- SRC_ECLASS="git-2"
- EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
- EGIT_MASTER="master"
- SRC_URI=""
- KEYWORDS=""
- S="${WORKDIR}/${PN}"
-else
- SRC_URI="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
- app-text/asciidoc
- ${PYTHON_DEPS}
-"
-RDEPEND="
- app-arch/lbzip2
- app-crypt/shash
- virtual/cdrtools
- amd64? ( >=sys-boot/syslinux-3.72 )
- ia64? ( sys-fs/dosfstools )
- x86? ( >=sys-boot/syslinux-3.72 )
- ccache? ( dev-util/ccache )
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
- ${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-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
-
- python-single-r1_pkg_setup
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/${PN}
- exeinto /usr/$(get_libdir)/${PN}
- doexe catalyst || die "copying catalyst"
-
- if [[ ${PV} == 3.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
-
- # Here is where we actually enable ccache
- use ccache && \
- sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
- files/catalyst.conf
-
- sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
- files/catalyst.conf
-
- 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 AUTHORS
- doman files/catalyst.1 files/catalyst-spec.5
-
- python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
- python_optimize "${ED}"
-}
-
-pkg_postinst() {
- einfo "You can find more information about catalyst by checking out the"
- einfo "catalyst project page at:"
- einfo "https://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-}
diff --git a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
index 7f7203d..8521851 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
@@ -8,8 +8,6 @@
SRC_ECLASS="git-2"
EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
EGIT_MASTER="master"
- SRC_URI=""
- KEYWORDS=""
S="${WORKDIR}/${PN}"
else
SRC_URI="mirror://gentoo/${P}.tar.bz2
@@ -38,6 +36,7 @@
RDEPEND="
app-arch/lbzip2
app-crypt/shash
+ app-arch/tar[xattr]
virtual/cdrtools
amd64? ( >=sys-boot/syslinux-3.72 )
ia64? ( sys-fs/dosfstools )
diff --git a/dev-util/catalyst/catalyst-2.0.18.ebuild b/dev-util/catalyst/catalyst-2.0.18.ebuild
deleted file mode 100644
index 0bd3e47..0000000
--- a/dev-util/catalyst/catalyst-2.0.18.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
- SRC_ECLASS="git-2"
- EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
- EGIT_MASTER="master"
- SRC_URI=""
- KEYWORDS=""
- S="${WORKDIR}/${PN}"
-else
- SRC_URI="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
- app-text/asciidoc
- ${PYTHON_DEPS}
-"
-RDEPEND="
- app-arch/lbzip2
- app-crypt/shash
- virtual/cdrtools
- amd64? ( >=sys-boot/syslinux-3.72 )
- ia64? ( sys-fs/dosfstools )
- x86? ( >=sys-boot/syslinux-3.72 )
- ccache? ( dev-util/ccache )
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
- ${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-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
-
- python-single-r1_pkg_setup
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/${PN}
- exeinto /usr/$(get_libdir)/${PN}
- doexe catalyst || die "copying catalyst"
-
- if [[ ${PV} == 3.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
-
- # Here is where we actually enable ccache
- use ccache && \
- sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
- files/catalyst.conf
-
- sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
- files/catalyst.conf
-
- 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 AUTHORS
- doman files/catalyst.1 files/catalyst-spec.5
-
- python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
- python_optimize "${ED}"
-}
-
-pkg_postinst() {
- einfo "You can find more information about catalyst by checking out the"
- einfo "catalyst project page at:"
- einfo "https://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-}
diff --git a/dev-util/catalyst/catalyst-2.0.9999.ebuild b/dev-util/catalyst/catalyst-2.0.9999.ebuild
index f67796d..89cb7b0 100644
--- a/dev-util/catalyst/catalyst-2.0.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.9999.ebuild
@@ -9,8 +9,6 @@
EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
EGIT_MASTER="master"
EGIT_BRANCH="2.X"
- SRC_URI=""
- KEYWORDS=""
S="${WORKDIR}/${PN}"
else
SRC_URI="mirror://gentoo/${P}.tar.bz2
@@ -37,6 +35,7 @@
RDEPEND="
app-arch/lbzip2
app-crypt/shash
+ app-arch/tar[xattr]
virtual/cdrtools
amd64? ( >=sys-boot/syslinux-3.72 )
ia64? ( sys-fs/dosfstools )
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index 0c6f8e3..3724762 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -9,8 +9,6 @@
EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
EGIT_MASTER="master"
EGIT_BRANCH="pending"
- SRC_URI=""
- KEYWORDS=""
S="${WORKDIR}/${PN}"
else
SRC_URI="mirror://gentoo/${P}.tar.bz2
@@ -38,6 +36,7 @@
=dev-python/pydecomp-9999
app-arch/lbzip2
app-crypt/shash
+ app-arch/tar[xattr]
virtual/cdrtools
amd64? ( >=sys-boot/syslinux-3.72 )
ia64? ( sys-fs/dosfstools )
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 525a3b1..116a803 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -8,8 +8,6 @@
SRC_ECLASS="git-2"
EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
EGIT_BRANCH="master"
- SRC_URI=""
- KEYWORDS=""
S="${WORKDIR}/${PN}"
else
SRC_URI="mirror://gentoo/${P}.tar.bz2
@@ -37,6 +35,7 @@
=dev-python/pydecomp-9999
app-arch/lbzip2
app-crypt/shash
+ app-arch/tar[xattr]
virtual/cdrtools
amd64? ( >=sys-boot/syslinux-3.72 )
ia64? ( sys-fs/dosfstools )
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index fd73d4b..5a894bc 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -4,3 +4,4 @@
DIST ccache-3.2.1.tar.xz 297868 SHA256 872af34e1d2cef18694001d29db7f167d644e7602ca32cd6c74b28d81458bd9d SHA512 ef0e56f2d1775fb0f401f48cca2a65eb415f4e2ccf0bcfd769045a9c08c3c2977db4edea12e06629f4cb5406cde23cd3ee0910e2e4d5eff9376227fa23c78a7a WHIRLPOOL f3d07cf142258d588a1c6cb9ba77d31d7b568cd18ae131ed3526595c809352b0fa30ae61b0bfcbfde3ea8d959c545119662c25af0cd03c97517be361315e1ffe
DIST ccache-3.2.2.tar.xz 300808 SHA256 4f0d99699f24d198494addca0f41a93b0150cdfd01491f15a5d7eb02c7c2a0ca SHA512 fc438f3b00baa41076eee3e5783ea53a208eb348343e587c6f729f7e98462cd20c720fe323fe08f271bc14dae48f7828cef769882f028f3772992989b87b075d WHIRLPOOL 095a125e869910644622b98b7720a01ccc235fbeb8c84ec52017fe52f82fe7b8122584c3e5fa4d39c1344e9c062517a1edb46c3e64fe649e845ed5c1fb455c5a
DIST ccache-3.2.3.tar.xz 301728 SHA256 ec0414fc435982ece8b8fca062f5836ff32c5d5148abd7f80768614ed776600e SHA512 27da2032fd8936253e29f0410fc2f8085967de78ebe300bd1efecf78c67ed5e060e543df96bb29bc1bea75ec4d5e108f89d58dc6d9573bf6fcc8384d00b951dd WHIRLPOOL 721e9e8dab552c40bfd77df3225e33d49553b2bee5ec990dc6f33ce8bdd9009f4f35b75d08d04ce51ee36e0772a5b403c4d8629627dd6d488b717e23b3d3657c
+DIST ccache-3.2.4.tar.xz 302548 SHA256 1c3da93f654e78a4ac71a54b0f63b19bc0fef9aa5522f4ebb9c201d4361cea5d SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7 WHIRLPOOL 3dc1de9d1cab8769b3776e48746a1967536e7a9d01e4eb23e1ddbaaf2858c16eba170a185312bfdb0a58951c77cd6c79ff30c7cf6ab366ade64c2b6997df7703
diff --git a/dev-util/ccache/ccache-3.2.4.ebuild b/dev-util/ccache/ccache-3.2.4.ebuild
new file mode 100644
index 0000000..a8d9ebd
--- /dev/null
+++ b/dev-util/ccache/ccache-3.2.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="http://ccache.samba.org/"
+SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+ sys-libs/zlib"
+RDEPEND="${DEPEND}
+ sys-apps/gentoo-functions"
+
+src_prepare() {
+ # make sure we always use system zlib
+ rm -rf zlib || die
+ epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
+ sed \
+ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+ "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_install() {
+ DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.txt )
+ default
+
+ dobin ccache-config
+
+ DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}usr/bin.
+Portage 2.0.46-r11+ will automatically take advantage of ccache with
+no additional steps. If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+ readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+ if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ "${EROOT}"/usr/bin/ccache-config --remove-links
+ "${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
+ fi
+}
+
+pkg_postinst() {
+ "${EROOT}"/usr/bin/ccache-config --install-links
+ "${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
+
+ # nuke broken symlinks from previous versions that shouldn't exist
+ rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die
+ rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+ readme.gentoo_print_elog
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 816cc84..c8f6ded 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,8 +1,5 @@
DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e SHA512 a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d WHIRLPOOL 3635651a59a93c661db4df8c248e35bfd8a9869eb74faa33fa6d56c12039ef7bb37756fd4c55fb107a9b7c38d2616dc43eb41acc0c565cfad4a24db99c361c29
-DIST cmake-3.0.2.tar.gz 5490501 SHA256 6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e SHA512 de267bd6c5b318e48fae64c28947de009fb2413bdc6b4454b5e4bbb7d50b78aaef5d7e9d9655cfb9299aa5704fd3e4bbabc6816d3f378f76856f56ab161efe02 WHIRLPOOL 4c2aa1c72edb700689a8a91bfdfe22977e46a87851d66eb0e187e1e35a1a928be12b477fc39455b877d55420bcb149be6430d6835e01e20f61b84d8d83c752d6
-DIST cmake-3.1.0.tar.gz 5955836 SHA256 8bdc3fa3f2da81bc10c772a6b64cc9052acc2901d42e1e1b2588b40df224aad9 SHA512 9e3288c793c01e0ce48af91c618dc7638623010dfb440fb293393d407b7882c181c9a0f4e3b0a14645b556007e69264e94488e832a421b5cfa96338e0808b030 WHIRLPOOL 99df3f9052fee303d02ef9f27ee0ce22a1db57c0963dc7177837dea95a114da7b5d2ea8fd7155df1c7c513dbfb469bba2e638fc84fc1f1a9783fa49cd0e1a061
DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b WHIRLPOOL 7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2
-DIST cmake-3.2.3.tar.gz 6438938 SHA256 a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297 SHA512 1fddea23c8e28cd6893879bd3bb349564ece815eaa5c68c3519dd62f0baa05eabbfc38168458ab91594cb0feeefd2ea761b6d292b679f8b9aa33e08a0b9d5b4c WHIRLPOOL 5268cc735cbd523a2027e479ab43499589b8653972a5bed7425c451a9b5ecc5d27c867cd218144a1eb6df2d3126301d7d494cafa7b1ac7455dbb40e66bad30c6
DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f
DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
DIST cmake-3.3.2.tar.gz 6578184 SHA256 e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 SHA512 01bc0e6ca52a6836ef57360fb38dd92a4575bfa37bfe9625645db77fefd0c170383cfb07b61c6283bde96738ce1a5e18cb7569e7e0b7c98d4b99e86305c50180 WHIRLPOOL 7951dc18d695ca4554b287f91becd8ecb05324e10f9e2c9e34427d26db0d664ee7ab8a226eabed87d93087e41635059f96b1aaea503480f46a555cf3baae3ce7
diff --git a/dev-util/cmake/cmake-2.8.12.2-r2.ebuild b/dev-util/cmake/cmake-2.8.12.2-r2.ebuild
deleted file mode 100644
index 95b4f8f..0000000
--- a/dev-util/cmake/cmake-2.8.12.2-r2.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 qt5"
-
-REQUIRED_USE="?? ( qt4 qt5 )"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
- "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
- "${FILESDIR}"/${PN}-2.8.10-desktop.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
- "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
- "${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch
- "${FILESDIR}"/${PN}-2.8.12.2-FindBoost-python.patch
- "${FILESDIR}"/${PN}-2.8.12.2-FindCurses.patch
- "${FILESDIR}"/${PN}-2.8.12.2-fbsd.patch
- "${FILESDIR}"/${PN}-2.8.12.2-python34.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:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${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.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-pkg_setup() {
- # bug 387227
- addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
- cmake-utils_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)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
- 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
-
- 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}/${PN}.vim"
-
- dobashcomp Docs/bash-completion/{${PN},ctest,cpack}
- rm -rf "${D}/usr/share/cmake/completions" || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-2.8.12.2.ebuild b/dev-util/cmake/cmake-2.8.12.2.ebuild
deleted file mode 100644
index c10fe92..0000000
--- a/dev-util/cmake/cmake-2.8.12.2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${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 arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 qt5"
-
-REQUIRED_USE="?? ( qt4 qt5 )"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
- "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
- "${FILESDIR}"/${PN}-2.8.10-desktop.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
- "${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch
- "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
- "${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.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:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${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.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-pkg_setup() {
- # bug 387227
- addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
- cmake-utils_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)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
- 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
-
- 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}/${PN}.vim"
-
- dobashcomp Docs/bash-completion/{${PN},ctest,cpack}
- rm -rf "${D}/usr/share/cmake/completions" || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-3.0.2.ebuild b/dev-util/cmake/cmake-3.0.2.ebuild
deleted file mode 100644
index f16a8b6..0000000
--- a/dev-util/cmake/cmake-3.0.2.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt4 qt5"
-
-REQUIRED_USE="?? ( qt4 qt5 )"
-
-RDEPEND="
- >=app-arch/libarchive-2.8.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.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:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${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.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_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() {
- 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}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -rf "${D}/usr/share/cmake/{completions,editors}" || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-3.1.0.ebuild b/dev-util/cmake/cmake-3.1.0.ebuild
deleted file mode 100644
index f06a686..0000000
--- a/dev-util/cmake/cmake-3.1.0.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt4 qt5"
-
-REQUIRED_USE="?? ( qt4 qt5 )"
-
-RDEPEND="
- >=app-arch/libarchive-2.8.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
- "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
- "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.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:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${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.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_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() {
- 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}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -rf "${D}/usr/share/cmake/{completions,editors}" || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-3.2.3-r1.ebuild b/dev-util/cmake/cmake-3.2.3-r1.ebuild
deleted file mode 100644
index 3159e64..0000000
--- a/dev-util/cmake/cmake-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz
- http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
-
-RDEPEND="
- >=app-arch/libarchive-3.0.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- # prefix
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
- "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
- # handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-
- # respect python eclasses
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-
- # upstream backports
- "${FILESDIR}"/${PN}-3.2.3-musl-missing-include.patch
- "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.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:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${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.
- # BundleUtilities: bundle creation broken
- # CTest.updatecvs: which fails to commit as root
- # Fortran: requires fortran
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_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() {
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-3.2.3.ebuild b/dev-util/cmake/cmake-3.2.3.ebuild
deleted file mode 100644
index 8760d4a..0000000
--- a/dev-util/cmake/cmake-3.2.3.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
-
-RDEPEND="
- >=app-arch/libarchive-3.0.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- # prefix
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
- "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
- # handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-
- # respect python eclasses
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-
- # upstream backports
- "${FILESDIR}"/${PN}-3.2.3-musl-missing-include.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:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${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.
- # BundleUtilities: bundle creation broken
- # CTest.updatecvs: which fails to commit as root
- # Fortran: requires fortran
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_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() {
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.3.1-r1.ebuild
index 3f32867..0ce3940 100644
--- a/dev-util/cmake/cmake-3.3.1-r1.ebuild
+++ b/dev-util/cmake/cmake-3.3.1-r1.ebuild
@@ -16,7 +16,7 @@
LICENSE="CMake"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
RDEPEND="
diff --git a/dev-util/cmake/cmake-3.3.2-r1.ebuild b/dev-util/cmake/cmake-3.3.2-r1.ebuild
new file mode 100644
index 0000000..417385c
--- /dev/null
+++ b/dev-util/cmake/cmake-3.3.2-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+MY_P="${P/_/-}"
+
+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
+ http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
+
+RDEPEND="
+ >=app-arch/libarchive-3.0.0:=
+ >=dev-libs/expat-2.0.1
+ >=net-misc/curl-7.20.0-r1[ssl]
+ sys-libs/zlib
+ virtual/pkgconfig
+ emacs? ( virtual/emacs )
+ ncurses? ( sys-libs/ncurses:0= )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+ # prefix
+ "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+ "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+ "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+ # handle gentoo packaging in find modules
+ "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+ "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+ "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+ "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+ "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch
+
+ # respect python eclasses
+ "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+ "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
+
+ # upstream fixes (can usually be removed with a version bump)
+ "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.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:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+ par_arg="--parallel=${par_arg}"
+ else
+ par_arg="--parallel=1"
+ fi
+
+ # execinfo.h on Solaris isn't quite what it is on Darwin
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+ fi
+
+ tc-export CC CXX LD
+
+ # bootstrap script isn't exactly /bin/sh compatible
+ ${CONFIG_SHELL:-sh} ./bootstrap \
+ --prefix="${T}/cmakestrap/" \
+ ${par_arg} \
+ || die "Bootstrap failed"
+}
+
+cmake_src_test() {
+ # fix OutDir and SelectLibraryConfigurations tests
+ # these are altered thanks to our eclass
+ sed -i -e 's:#IGNORE ::g' \
+ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+ || die
+
+ pushd "${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.
+ # BundleUtilities: bundle creation broken
+ # CTest.updatecvs: which fails to commit as root
+ # Fortran: requires fortran
+ # Qt4Deploy, which tries to break sandbox and ignores prefix
+ # TestUpload, which requires network access
+ "${BUILD_DIR}"/bin/ctest ${ctestargs} \
+ -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
+ || die "Tests failed"
+
+ popd > /dev/null
+}
+
+src_prepare() {
+ cmake-utils_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() {
+ local mycmakeargs=(
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+ -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+ -DCMAKE_DOC_DIR=/share/doc/${PF}
+ -DCMAKE_MAN_DIR=/share/man
+ -DCMAKE_DATA_DIR=/share/${PN}
+ -DSPHINX_MAN=$(usex doc)
+ -DSPHINX_HTML=$(usex doc)
+ $(cmake-utils_use_build ncurses CursesDialog)
+ )
+
+ if use qt4 || use qt5 ; then
+ mycmakeargs+=(
+ -DBUILD_QtDialog=ON
+ $(cmake-utils_use_find_package qt5 Qt5Widgets)
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+ VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use emacs; then
+ elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Auxiliary/cmake-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Auxiliary/cmake-indent.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${PN}.vim"
+
+ dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+ rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/cmake-3.3.2.ebuild b/dev-util/cmake/cmake-3.3.2.ebuild
deleted file mode 100644
index a1bdf00..0000000
--- a/dev-util/cmake/cmake-3.3.2.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_P="${P/_/-}"
-
-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
- http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
-
-RDEPEND="
- >=app-arch/libarchive-3.0.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- # prefix
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
- "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
- # handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-
- # respect python eclasses
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-
- # upstream fixes (can usually be removed with a version bump)
- "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.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:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${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.
- # BundleUtilities: bundle creation broken
- # CTest.updatecvs: which fails to commit as root
- # Fortran: requires fortran
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_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() {
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
deleted file mode 100644
index b00b4f7..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- Modules/FindBoost.cmake
-+++ Modules/FindBoost.cmake
-@@ -903,6 +903,11 @@
-
- set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
- set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ # Get version of Python.
-+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
-+ endif()
-+
-
- #
- # Find RELEASE libraries
-@@ -913,6 +918,14 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_RELEASE_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
-+ endif()
- if(_boost_STATIC_RUNTIME_WORKAROUND)
- set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
- list(APPEND _boost_RELEASE_NAMES
-@@ -920,6 +933,13 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_RELEASE_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+ endif()
- endif()
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
-@@ -945,6 +965,15 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
- ${Boost_LIB_PREFIX}boost_${COMPONENT} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_DEBUG_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
-+ endif()
- if(_boost_STATIC_RUNTIME_WORKAROUND)
- set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
- list(APPEND _boost_DEBUG_NAMES
-@@ -952,6 +981,13 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_DEBUG_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+ endif()
- endif()
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch b/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch
deleted file mode 100644
index ab27af2..0000000
--- a/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: KWSys Robot <kwrobot@kitware.com>
-Date: Tue, 15 Oct 2013 12:43:32 +0000 (-0400)
-Subject: KWSys 2013-10-15 (6eab64c3)
-X-Git-Tag: v3.0.0-rc1~178^2^2~5
-X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=c01e7445
-
-KWSys 2013-10-15 (6eab64c3)
-
-Extract upstream KWSys using the following shell commands.
-
-$ git archive --prefix=upstream-kwsys/ 6eab64c3 | tar x
-$ git shortlog --no-merges --abbrev=8 --format='%h %s' 96b2f6f4..6eab64c3
-Raphael Kubo da Costa (1):
- 6eab64c3 SystemInformation: Include backtrace-related headers on FreeBSD
-
-Change-Id: Ib0447aab3d6555ce278f0c1417af2c53e6f181a5
----
-
-diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
-index 7c31f3a..2672730 100644
---- a/Source/kwsys/SystemInformation.cxx
-+++ b/Source/kwsys/SystemInformation.cxx
-@@ -88,6 +88,15 @@ typedef int siginfo_t;
- # include <ifaddrs.h>
- # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
- # endif
-+# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
-+# include <execinfo.h>
-+# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
-+# include <cxxabi.h>
-+# endif
-+# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
-+# include <dlfcn.h>
-+# endif
-+# endif
- #endif
-
- #if defined(__OpenBSD__) || defined(__NetBSD__)
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-python34.patch b/dev-util/cmake/files/cmake-2.8.12.2-python34.patch
deleted file mode 100644
index f64e40c..0000000
--- a/dev-util/cmake/files/cmake-2.8.12.2-python34.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit ab6201ab647c13fee44c44822b8502e9848faaaf
-Author: Matt McCormick <matt.mccormick@kitware.com>
-Date: Wed Mar 5 17:41:47 2014 -0500
-
- FindPython{Interp,Libs}: Search for Python 3.4.
-
- Python 3.4.0rnc1 was released on 2014-02-20.
-
-diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
-index 8da848c..e23a58b 100644
---- a/Modules/FindPythonInterp.cmake
-+++ b/Modules/FindPythonInterp.cmake
-@@ -47,7 +47,7 @@ unset(_Python_NAMES)
-
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonInterp_FIND_VERSION)
- if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index 0749efc..1dbc967 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -51,7 +51,7 @@ CMAKE_FIND_FRAMEWORKS(Python)
-
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonLibs_FIND_VERSION)
- if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
diff --git a/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch b/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch
deleted file mode 100644
index 5e0efa9..0000000
--- a/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c775072ad5a93306183f83f4396268b1690bb392 Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king@kitware.com>
-Date: Wed, 22 Apr 2015 09:58:46 -0400
-Subject: [PATCH] cmGeneratorExpressionEvaluationFile: Add missing sys/types.h
- include
-
-This is needed for 'mode_t', and on mingw-w64 in particular. We added
-use of 'mode_t' in commit v3.2.0-rc1~421^2 (file(GENERATE): Use
-permissions of input file if present, 2014-07-22).
----
- Source/cmGeneratorExpressionEvaluationFile.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h
-index 4424bec..5d8b54c 100644
---- a/Source/cmGeneratorExpressionEvaluationFile.h
-+++ b/Source/cmGeneratorExpressionEvaluationFile.h
-@@ -13,6 +13,7 @@
- #define cmGeneratorExpressionEvaluationFile_h
-
- #include "cmStandardIncludes.h"
-+#include <sys/types.h>
- #include <cmsys/auto_ptr.hxx>
-
- #include "cmGeneratorExpression.h"
---
-1.7.10.4
-
diff --git a/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch b/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch
new file mode 100644
index 0000000..665c330
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch
@@ -0,0 +1,45 @@
+Ensure that the correct version of Qt is always used.
+
+With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
+/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
+
+There is no guarantee to which version of Qt these symlinks might point, so it
+is necessary to find the correct version explicitly.
+
+Once qmake is found, it is queried for the correct location of all other items.
+
+Gentoo-bug: 547222
+
+--- Modules/FindQt4.cmake
++++ Modules/FindQt4.cmake
+@@ -482,13 +482,23 @@
+
+ get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
+
+- find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
+- PATHS
+- ENV QTDIR
+- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
+- PATH_SUFFIXES bin
+- DOC "The qmake executable for the Qt installation to use"
+- )
++ if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
++ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
++ PATHS
++ /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
++ /usr/bin
++ NO_DEFAULT_PATH
++ DOC "The qmake executable for the Qt installation to use"
++ )
++ else()
++ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
++ PATHS
++ ENV QTDIR
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
++ PATH_SUFFIXES bin
++ DOC "The qmake executable for the Qt installation to use"
++ )
++ endif()
+
+ set(major 0)
+ if (QT_QMAKE_EXECUTABLE)
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index d096627..50815f4 100644
--- a/dev-util/cmdtest/Manifest
+++ b/dev-util/cmdtest/Manifest
@@ -1,2 +1,2 @@
DIST cmdtest_0.10.orig.tar.gz 34152 SHA256 d9a421ed916213c5c6660a1057a560afff6e5c7606fe0e1cba3a359f66f23068 SHA512 da3e042c1c7d4379316fb6e3bc642a2e57fa12004434296c30f77debc7662bed49726057eb280461d18308739e86082fd96efe1642d1c531321b1c10f06d3595 WHIRLPOOL eadb47185a977d74ff046654b9845be9e49b859a88d10001f6eb809b1de8cb7697f840942dca100007ef00c98faafc9d7f127c9359108148372fd7175b88c509
-DIST cmdtest_0.6.orig.tar.gz 18603 SHA256 7367d4c6db3b84f6c74209fed179749434ac84dfe6e039fc1a58dd99a5048802 SHA512 67ef446034890bd93e66b8577a5d1f70e490550e9e72204225eff0d91f15c8610c4d7b7167461c08b070ed108d8326e3c9ef87cfc339fbe320c17c2be87ed429 WHIRLPOOL ac57c94497b6da5740435f513112574bc41e152605ecce89e9cd5a788f656c49ec8a5a318eef536754bdd8ec5a9bc204032ed1b4ffb847462ffe52eeb1dca5a9
+DIST cmdtest_0.16.orig.tar.xz 32960 SHA256 3cd0e18f638b78a76f78e84d48996ee7436f598832fc3e28380ac03db35afec6 SHA512 5be73dc1d71706ccf220dc91944d353e4745cd214b54977f0a8093bd540114747a78cf9f65c9ed926bcc0749839e3d9252a23d1ff3c1d05fbe87eceb4915bc26 WHIRLPOOL 4028340a9be5177a5b7ea2c805ca3df009719582d414e175734e53327212b2d4eb32c33834dcc61a0a38ef239249a55ebb7206201ca1142b953c1390455c2b6b
diff --git a/dev-util/cmdtest/cmdtest-0.16.ebuild b/dev-util/cmdtest/cmdtest-0.16.ebuild
new file mode 100644
index 0000000..b4eba5a
--- /dev/null
+++ b/dev-util/cmdtest/cmdtest-0.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="black box tests Unix command line tools"
+HOMEPAGE="http://liw.fi/cmdtest/"
+SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ dev-python/cliapp
+ dev-python/ttystatus
+"
+
+src_compile() {
+ addwrite /proc/self/comm
+ distutils-r1_src_compile
+}
diff --git a/dev-util/cmdtest/cmdtest-0.6.ebuild b/dev-util/cmdtest/cmdtest-0.6.ebuild
deleted file mode 100644
index deceb8e..0000000
--- a/dev-util/cmdtest/cmdtest-0.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="black box tests Unix command line tools"
-HOMEPAGE="http://liw.fi/cmdtest/"
-SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
- ${PYTHON_DEPS}
- dev-python/cliapp
- dev-python/ttystatus
-"
-
-src_compile() {
- addwrite /proc/self/comm
- distutils-r1_src_compile
-}
diff --git a/dev-util/cmt/cmt-1.26.ebuild b/dev-util/cmt/cmt-1.26.ebuild
index 508853a..f2224b2 100644
--- a/dev-util/cmt/cmt-1.26.ebuild
+++ b/dev-util/cmt/cmt-1.26.ebuild
@@ -25,7 +25,7 @@
S="${WORKDIR}/CMT/${CMT_PV}"
src_configure() {
- cd "${S}"/mgr || die
+ cd "${S}"/mgr || die
./INSTALL || die
source setup.sh
}
diff --git a/dev-util/cucumber/cucumber-1.3.20-r1.ebuild b/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
new file mode 100644
index 0000000..97fbe19
--- /dev/null
+++ b/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/rspec-2.13.0
+ >=dev-ruby/nokogiri-1.5.2
+ >=dev-ruby/syntax-1.0.0
+ >=dev-util/aruba-0.5.2
+ >=dev-ruby/json-1.7
+ dev-ruby/bundler
+ >=dev-util/cucumber-1.3
+ dev-ruby/rubyzip:0
+ )"
+
+ruby_add_rdepend "
+ >=dev-ruby/builder-2.1.2:*
+ >=dev-ruby/diff-lcs-1.1.3
+ >=dev-ruby/gherkin-2.12.0:0
+ >=dev-ruby/multi_json-1.7.5
+ >=dev-ruby/multi_test-0.1.2
+"
+
+all_ruby_prepare() {
+ # Remove development dependencies from the gemspec that we don't
+ # need or can't satisfy.
+ sed -i -e '/\(spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Fix too-strict test dependencies
+ sed -e '/nokogiri/ s/~> 1.5.2/>= 1.5.2/' \
+ -e '/aruba/ s/= 0.5.2/~> 0.5/' \
+ -e '/rake/ s/10.2/10.5/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Make sure spork is run in the right interpreter
+ sed -i -e 's/#{Spork::BINARY}/-S #{Spork::BINARY}/' features/support/env.rb || die
+ rm features/drb_server_integration.feature || die
+
+ # Avoid json, they most likely fail due to multi_json weirdness.
+ rm features/json_formatter.feature || die
+ # Avoid features that break with newer rspec versions.
+ sed -i -e '369,398d' features/background.feature || die
+
+ # Avoid dependency on git
+ sed -i -e 's/git ls-files/find/' cucumber.gemspec || die
+}
+
+each_ruby_test() {
+ ruby-ng_rspec
+ RUBYLIB=lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ if use examples; then
+ cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+ fi
+}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index e33a182..a31708a 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -3,3 +3,5 @@
DIST debhelper_9.20150507.tar.xz 314408 SHA256 f3b51b3c1ad87cd936d4c443f1cebf8f194ece4b998dce6544e238ce5fd5dc39 SHA512 1a4ca17ccf9ebc874f5c5521320ec4421d3e128e83b1a07cbf53201c559d10473e3db92ab3119dfca778cdab0f2f8e66c77659410a9f3f8e50a03c654cc6b5f5 WHIRLPOOL d354f7adb9c1e059e53c4e6ebfa06f21bc9222152faa3461ab19e0efbf13cd6426e4f260ddff2880457093eafd83c4e40b5e301d3f8a304479d24aab41fc9d73
DIST debhelper_9.20150628.tar.xz 317804 SHA256 8fb59c2a03fa9f6061db8091e7ecaf68c5680495eec05d6c145e3f782b09d68f SHA512 bde93266e475c3ac7dd8cbf5ee0d2c435593eadbc0f33d1389f2705f7debc36b4da165ae65cfd202a1c871fd708cda1d1c57763bdad04748a1bbdab516b2905a WHIRLPOOL 4a56790c1a1629e83b6fd164cb74d9edace02318334bc968acc74f421db98b343bbd32dce56fc15a5ca4a4c7b4364bfea9bf1213864c2f3a8238dbc43ee2a33f
DIST debhelper_9.20150811.tar.xz 319992 SHA256 dc96fb0e8c34b0f239482088e85261bd8d858b0e5154990b52879893215d6d73 SHA512 37754b0b9fe8e73a9ec3ccbce972d3fddc8d63d11dafb90e6a3ba68a6e966ebab78e1ee564f80dc36b017ac4501b13efba66ccb32309ca040f753c2ec541ba49 WHIRLPOOL 9ed1ac69c48b4002deab5f412f086634ade1a30f8d9932d22ffa5fb93500c0fa1e15c5dd1b4c14b2c2c1ef5bee55434fe9922a19348bfa5da4c54179a1c046c2
+DIST debhelper_9.20151004.tar.xz 325348 SHA256 e8c32712db58ac0764e8c83a324a7a519a58a33a6c9ba86f1ca0ac171213f21f SHA512 15bb0beb1fa37b30ededffe160b660fc415dd8935db2f7f548128090d7719d2004fd721abefbd0c7f88b18edd476124ebd1f759f6ead9c341d6c1ebfe5ad0121 WHIRLPOOL 961e7150f28dfc11e4f9582bf92ded6dcd69c808b5179c4e97f36d17178414bb68d40c69fb38fef007cfa03933cf888bb1c4a5a55e15bf0bd9306c03ed258970
+DIST debhelper_9.20151005.tar.xz 325420 SHA256 232776ecf0e7955ea4154edc92eb6450f5d57343c7da0de1a698077efaa50958 SHA512 d5e967a0bfa5c7cdb89099ef26ab566cea49ec0e1dce9cea1f626f32ac2f1b39aa2fa85adfa7acb6473322f4796cbfa1e7dfaff860a116a13d8a06db647a1f9c WHIRLPOOL 002ff3786e6ed27548c32a1bda7750ac5ef018d2002b24db1321c0ece074250edd0d3f8c857d8183f24ddae9c59c1243c42169f323c314b1df47653371caa6a0
diff --git a/dev-util/debhelper/debhelper-9.20151004.ebuild b/dev-util/debhelper/debhelper-9.20151004.ebuild
new file mode 100644
index 0000000..9d5f195
--- /dev/null
+++ b/dev-util/debhelper/debhelper-9.20151004.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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://joeyh.name/code/debhelper/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+DH_LINGUAS=( de es fr )
+IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
+
+NLS_DEPEND=$(
+ printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
+)
+
+RDEPEND="
+ >=dev-lang/perl-5.10:=
+ >=app-arch/dpkg-1.17
+ dev-perl/TimeDate
+ virtual/perl-Getopt-Long
+"
+DEPEND="${RDEPEND}
+ ${NLS_DEPEND}
+ test? ( dev-perl/Test-Pod )
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+ tc-export CC
+
+ local LANGS="" USE_NLS=no lingua
+ for lingua in ${DH_LINGUAS[@]}; do
+ if use linguas_${lingua}; then
+ LANGS+=" ${lingua}"
+ USE_NLS=yes
+ fi
+ done
+
+ emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+ dodoc doc/* debian/changelog
+ docinto examples
+ dodoc examples/*
+ local lingua
+ for manfile in *.1 *.7 ; do
+ for lingua in ${DH_LINGUAS[@]}; do
+ case ${manfile} in
+ *.${lingua}.?)
+ use linguas_${lingua} \
+ && cp ${manfile} "${T}"/${manfile/.${lingua}/} \
+ && doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
+ ;;
+ *)
+ doman ${manfile}
+ ;;
+ esac
+ done
+ done
+}
diff --git a/dev-util/debhelper/debhelper-9.20151005.ebuild b/dev-util/debhelper/debhelper-9.20151005.ebuild
new file mode 100644
index 0000000..9d5f195
--- /dev/null
+++ b/dev-util/debhelper/debhelper-9.20151005.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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://joeyh.name/code/debhelper/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+DH_LINGUAS=( de es fr )
+IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
+
+NLS_DEPEND=$(
+ printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
+)
+
+RDEPEND="
+ >=dev-lang/perl-5.10:=
+ >=app-arch/dpkg-1.17
+ dev-perl/TimeDate
+ virtual/perl-Getopt-Long
+"
+DEPEND="${RDEPEND}
+ ${NLS_DEPEND}
+ test? ( dev-perl/Test-Pod )
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+ tc-export CC
+
+ local LANGS="" USE_NLS=no lingua
+ for lingua in ${DH_LINGUAS[@]}; do
+ if use linguas_${lingua}; then
+ LANGS+=" ${lingua}"
+ USE_NLS=yes
+ fi
+ done
+
+ emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+ dodoc doc/* debian/changelog
+ docinto examples
+ dodoc examples/*
+ local lingua
+ for manfile in *.1 *.7 ; do
+ for lingua in ${DH_LINGUAS[@]}; do
+ case ${manfile} in
+ *.${lingua}.?)
+ use linguas_${lingua} \
+ && cp ${manfile} "${T}"/${manfile/.${lingua}/} \
+ && doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
+ ;;
+ *)
+ doman ${manfile}
+ ;;
+ esac
+ done
+ done
+}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild
index 3728407..3e3d05a 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.5.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.5.ebuild
index 0b0da78..5af4b5e 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.5.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.5.ebuild
@@ -15,7 +15,7 @@
SLOT="0"
IUSE=""
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.43.4:2
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 449f1cb..bedc8b3 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,2 +1 @@
-DIST howdoi-1.1.6.tar.gz 6769 SHA256 29b06c588825fb007f111106cfd475fc88dbf4e1329758dcf42e903097872c83 SHA512 369bdbb30fc97b094fe8c1cb49b3dd696f16b1120cb980e6785dcf6c2da56698f3d103a983174d6e4a3cfa7b0bbb3d4109760f5cadaaa365480af9fae8323232 WHIRLPOOL db543d7f93c6bcb5ea3e44d5a8cc3ae15b7f180f2aac59d89b1beffbd1cf192b684d938fe8cad1cb0f1c642c7c894026f53880d79c8214422eac83b0a7fe27b6
DIST howdoi-1.1.7.tar.gz 7378 SHA256 df4e49a219872324875d588e7699a1a82174a267e8487505e86bfcb180aea9b7 SHA512 5f08a0ee341813ab8dde0528bb6d04e02965dddd30851b8cfa7f92900f60f6d83ff74aaa565e2fc5b7a336ec7cd35ed932bbfecc09064010268a4bdbc521902b WHIRLPOOL 93bf26d7553e05d99f6efbecbdc747301ee628d192c74369b492d5c2fb0def737d83b89baf80b8254701f8923927948610fd4f58c27c698f55843d416b00bf91
diff --git a/dev-util/howdoi/howdoi-1.1.6.ebuild b/dev-util/howdoi/howdoi-1.1.6.ebuild
deleted file mode 100644
index 4ae621c..0000000
--- a/dev-util/howdoi/howdoi-1.1.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.python.org/pypi/howdoi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pyquery[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/requests-cache[${PYTHON_USEDEP}]"
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index 67929ac..5d7a3d8 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,2 +1,2 @@
-DIST ideaIU-14.1.5.tar.gz 318054935 SHA256 6912902ec97a57f5553247367d6dd5b8e3041e99faf32c48b672cd31413dab73 SHA512 7ab3a45593c2324957455b254ae0257a36e8ecbc63014e18feba813413432dccb25d18971840f43cf22174c3338738eec44304091eb30c6ba2d0119b73cc6fa0 WHIRLPOOL 44a4bef99fdb638cf3cb0f24559b7765b7a4c7cb94aed5c3b8e503cbdf9fa1354f6d6026a9650fc58faec037b95482190891681f41219c61fc7d67a40e71f168
-DIST ideaIU-142.5047.6.tar.gz 382135319 SHA256 ef69f6892a45129eb1b4daa901f4b3efaf80633056453bbccce5dfa7b362685f SHA512 1984bfb9c1b67ee995b45609b4ebd85a56ad92f9c78cc0a1f2d833704f7f00bf3a814785751f8c2c9e04c77a4feb90352d536d60d47477b5c2c396ec918df546 WHIRLPOOL 25e21c39d9fbea194f941d047142361a4c52f4f3182062d9d95a2289dade27b9056d36a2d64a891e058cc1a190924c7dc209b72e22f89e851186c869d4be364d
+DIST idea-ultimate-14.1.5.141.2735.5.tar.gz 318054935 SHA256 6912902ec97a57f5553247367d6dd5b8e3041e99faf32c48b672cd31413dab73 SHA512 7ab3a45593c2324957455b254ae0257a36e8ecbc63014e18feba813413432dccb25d18971840f43cf22174c3338738eec44304091eb30c6ba2d0119b73cc6fa0 WHIRLPOOL 44a4bef99fdb638cf3cb0f24559b7765b7a4c7cb94aed5c3b8e503cbdf9fa1354f6d6026a9650fc58faec037b95482190891681f41219c61fc7d67a40e71f168
+DIST idea-ultimate-15.0.0.142.5239.7_pre.tar.gz 383822428 SHA256 6f3d963e05e241c04d7bf71530dd71b45f398a5fb906545b4d8a5c432beca59a SHA512 ef7788329b486c569cdf11ba4a9531463272e19b69f460f24d12c522cd7dd8bcd3465dc21a3ead70077adbb2af4e4adbdbf8ecedbe630c945c93667da2b5bb0e WHIRLPOOL 3b81c379a8ab5d5610794af0295eecb110c9933833522eea5befeda5977b5001956da421c2383780434b6edfbb19fbd7cf95ff89ae86f83c7fe8df707b4ae481
diff --git a/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.2735.5.ebuild b/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.2735.5.ebuild
index cbd9429..32d903e 100644
--- a/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.2735.5.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.2735.5.ebuild
@@ -12,7 +12,7 @@
DESCRIPTION="A complete toolset for web, mobile and enterprise development"
HOMEPAGE="http://www.jetbrains.com/idea"
-SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz"
+SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal"
IUSE=""
diff --git a/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.5047.6_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.5047.6_pre.ebuild
deleted file mode 100644
index f4a3b2e..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.5047.6_pre.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)" # Always name EAP-versions with '_pre' for clarity!
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="http://www.jetbrains.com/idea"
-SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
-
-LICENSE="IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal"
-IUSE=""
-KEYWORDS="~amd64 ~x86" # No keywords for EAP versions. Code quality sucks.
-
-DEPEND="!dev-util/${PN}:14
- !dev-util/${PN}:15"
-RDEPEND="${DEPEND}
- >=virtual/jdk-1.7"
-S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
-
-QA_TEXTRELS="opt/${PN}-${MY_PV}/bin/libbreakgen.so"
-QA_PRESTRIPPED="opt/${PN}-${MY_PV}/lib/libpty/linux/x86/libpty.so
- opt/${PN}-${MY_PV}/lib/libpty/linux/x86_64/libpty.so
- opt/${PN}-${MY_PV}/bin/libyjpagent-linux.so
- opt/${PN}-${MY_PV}/bin/libyjpagent-linux64.so"
-QA_WX_LOAD="
- opt/${PN}-${MY_PV}/bin/fsnotifier-arm
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_auth.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_console.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_filesystem.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_misc.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_synchronization.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_auth.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_console.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_filesystem.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_misc.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_synchronization.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_auth.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_console.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_filesystem.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_misc.so
- opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_synchronization.so"
-
-src_prepare() {
- if ! use amd64; then
- rm -rf plugins/tfsIntegration/lib/native/linux/x86_64
- fi
- if ! use arm; then
- rm bin/fsnotifier-arm
- rm -rf plugins/tfsIntegration/lib/native/linux/arm
- fi
- if ! use ppc; then
- rm -rf plugins/tfsIntegration/lib/native/linux/ppc
- fi
- if ! use x86; then
- rm -rf plugins/tfsIntegration/lib/native/linux/x86
- fi
- rm -rf plugins/tfsIntegration/lib/native/solaris
- rm -rf plugins/tfsIntegration/lib/native/hpux
-}
-
-src_install() {
- local dir="/opt/${PN}-${MY_PV}"
-
- insinto "${dir}"
- doins -r *
- fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
- make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/"
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf"
-}
-
-pkg_postinst() {
- if [[ "$(get_version_component_range 7)x" = "prex" ]]
- then
- ewarn "Be aware, this is a release from their EAP. According to JetBrains, the code"
- ewarn "quality of such releases may be considerably below of what you might usually"
- ewarn "be used to from beta releases."
- ewarn "Don't use it for critical tasks. You have been warned."
- fi
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.5239.7_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.5239.7_pre.ebuild
new file mode 100644
index 0000000..47ecfb4
--- /dev/null
+++ b/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.5239.7_pre.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+SLOT="0"
+PV_STRING="$(get_version_component_range 4-6)" # Always name EAP-versions with '_pre' for clarity!
+MY_PV="$(get_version_component_range 1-3)"
+MY_PN="idea"
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="http://www.jetbrains.com/idea"
+SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-15-PublicPreview.tar.gz -> ${P}.tar.gz"
+
+LICENSE="IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal"
+IUSE=""
+KEYWORDS="~amd64 ~x86" # No keywords for EAP versions. Code quality sucks.
+
+DEPEND="!dev-util/${PN}:14
+ !dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+ >=virtual/jdk-1.7"
+S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
+
+QA_TEXTRELS="opt/${PN}-${MY_PV}/bin/libbreakgen.so"
+QA_PRESTRIPPED="opt/${PN}-${MY_PV}/lib/libpty/linux/x86/libpty.so
+ opt/${PN}-${MY_PV}/lib/libpty/linux/x86_64/libpty.so
+ opt/${PN}-${MY_PV}/bin/libyjpagent-linux.so
+ opt/${PN}-${MY_PV}/bin/libyjpagent-linux64.so"
+QA_WX_LOAD="
+ opt/${PN}-${MY_PV}/bin/fsnotifier-arm
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_auth.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_console.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_filesystem.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_misc.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_synchronization.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_auth.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_console.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_filesystem.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_misc.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_synchronization.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_auth.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_console.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_filesystem.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_misc.so
+ opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_synchronization.so"
+
+src_prepare() {
+ if ! use amd64; then
+ rm -rf plugins/tfsIntegration/lib/native/linux/x86_64
+ fi
+ if ! use arm; then
+ rm bin/fsnotifier-arm
+ rm -rf plugins/tfsIntegration/lib/native/linux/arm
+ fi
+ if ! use ppc; then
+ rm -rf plugins/tfsIntegration/lib/native/linux/ppc
+ fi
+ if ! use x86; then
+ rm -rf plugins/tfsIntegration/lib/native/linux/x86
+ fi
+ rm -rf plugins/tfsIntegration/lib/native/solaris
+ rm -rf plugins/tfsIntegration/lib/native/hpux
+}
+
+src_install() {
+ local dir="/opt/${PN}-${MY_PV}"
+
+ insinto "${dir}"
+ doins -r *
+ fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
+
+ make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+
+ # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+ mkdir -p "${D}/etc/sysctl.d/"
+ echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf"
+}
+
+pkg_postinst() {
+ if [[ "$(get_version_component_range 7)x" = "prex" ]]
+ then
+ ewarn "Be aware, this is a release from their EAP. According to JetBrains, the code"
+ ewarn "quality of such releases may be considerably below of what you might usually"
+ ewarn "be used to from beta releases."
+ ewarn "Don't use it for critical tasks. You have been warned."
+ fi
+}
diff --git a/dev-util/lttng-ust/metadata.xml b/dev-util/lttng-ust/metadata.xml
index 1c98ff2..8cd43e9 100644
--- a/dev-util/lttng-ust/metadata.xml
+++ b/dev-util/lttng-ust/metadata.xml
@@ -7,6 +7,6 @@
</maintainer>
<longdescription>
- The userspace tracer is designed to provide detailed information about userspace activity. UST is a port of the LTTng kernel tracer to userspace. Like the LTTng kernel tracer, performance is the main goal. Tracing does not require system calls or traps. UST instrumentation points may be added in any userspace code including signal handlers and libraries.
+ The userspace tracer is designed to provide detailed information about userspace activity. UST is a port of the LTTng kernel tracer to userspace. Like the LTTng kernel tracer, performance is the main goal. Tracing does not require system calls or traps. UST instrumentation points may be added in any userspace code including signal handlers and libraries.
</longdescription>
</pkgmetadata>
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 868489a..b2199e9 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1,2 @@
-DIST meld-3.12.3.tar.xz 462856 SHA256 db3572c5c6905b09f4fc28415a7f6f223014391492dd2165ed1bc8512ac4e6fd SHA512 ea462ece2dcc1a6843ac6ce557aa0ed09c320078b1945d40f2436bbd9f953bf2d826043fc5ee18e4840210cb1da8dd6031f2922109f457400b292d044fd3d27e WHIRLPOOL e1a84aafc16b0cdf4f64f524abd4972b32a37504b9810252161e03feb27a975f29f6d3926d66a99cd9e005613fdb77dabb7367243a1d3d137585c8829e2ec28e
DIST meld-3.14.0.tar.xz 495168 SHA256 430e2936b787c90ffa0999d3c94611fcaa64ca1920933f31550d5b931b4f103c SHA512 3d64ad5e9c7b1a061b7ffd3b41343e521533a507aa90063499ab314339f541fc2099d17e570dd4c8f3d52e59a62d39e7b5e19c9a4d98dac5182c5080fbb43325 WHIRLPOOL 8cac08b5f3b8a577cb68148c0654d2e1dbd01a97f9768a5801e0e5ffc577af5535c3306972ada300d3dd7bb93e9528802e55dd0f11ae48490298b6e2efd63a6d
+DIST meld-3.14.1.tar.xz 496100 SHA256 f43f750ed00da7925ecc70d6c5fc398c46ccf5af2f9e14b42c9a8afc7fbc06a3 SHA512 dd32ff3012be14050f1c647fad2eb91b7018dbee1957b5609021283b8f769183e00ba8ef97f5ba6b9ace31e7344549075c9e4509d9140433e3fe8a6144a957cd WHIRLPOOL 41459e736ec817856724aa8d01e6d009bc132d7db156a74b6d7a79d489d93096fded213c5ff277e83dc8812832289e24ad6f86920c64babd7402cc6cbc08b775
diff --git a/dev-util/meld/meld-3.12.3.ebuild b/dev-util/meld/meld-3.12.3.ebuild
deleted file mode 100644
index bcd495f..0000000
--- a/dev-util/meld/meld-3.12.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=dev-libs/glib-2.36:2
- dev-python/dbus-python[${PYTHON_USEDEP}]
- >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
- gnome-base/gsettings-desktop-schemas
- >=x11-libs/gtk+-3.6:3[introspection]
- >=x11-libs/gtksourceview-3.6:3.0[introspection]
- x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
- dev-util/intltool
- dev-util/itstool
- sys-devel/gettext
-"
-
-python_compile_all() {
- mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}
diff --git a/dev-util/meld/meld-3.14.1.ebuild b/dev-util/meld/meld-3.14.1.ebuild
new file mode 100644
index 0000000..3ed56a0
--- /dev/null
+++ b/dev-util/meld/meld-3.14.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.36:2[dbus]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
+ gnome-base/gsettings-desktop-schemas
+ >=x11-libs/gtk+-3.12:3[introspection]
+ >=x11-libs/gtksourceview-3.10:3.0[introspection]
+ x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ dev-util/itstool
+ sys-devel/gettext
+"
+
+python_compile_all() {
+ mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}
diff --git a/dev-util/nemiver/Manifest b/dev-util/nemiver/Manifest
index a752215..70fb834 100644
--- a/dev-util/nemiver/Manifest
+++ b/dev-util/nemiver/Manifest
@@ -1 +1,2 @@
DIST nemiver-0.9.5.tar.xz 1396468 SHA256 33590e3964092cabb629a6ba8415786b054702063a944eca5fe4156048baf8d9 SHA512 c8aac934749320caab163d15520cb3eb9a981ca0311c0c9a8b29f31f6e57a7d50d0cdae663d635155f9ed3617462175949ddf2d776058880c0a243b419280b98 WHIRLPOOL 37a1e6077f8b784cfd982bf4df7cd0c9b02081f4dcfeefab15bca89fedbb1df9f8799d1c3336a5eb06b132d745a5d00700b33e8bec89e06bfd024692f1624680
+DIST nemiver-0.9.6.tar.xz 1427660 SHA256 85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2 SHA512 6fd941975af6e9ba98d7100daf8205f8b61f75ccde4aaf30145a4e2beafe1b96b14ab70d22db7c258aabc7c1a71d4787aa121bc4e943b3fc310e00c13feb4f21 WHIRLPOOL 4c0897901f54467ea9cd49167a528631500b97d590811c554346cac7a54e21bdc68fe671717cdfd8c28f41fa9d0fa2ef2b5e29de0066ec561439462eed35eef1
diff --git a/dev-util/nemiver/nemiver-0.9.6.ebuild b/dev-util/nemiver/nemiver-0.9.6.ebuild
new file mode 100644
index 0000000..1628a58
--- /dev/null
+++ b/dev-util/nemiver/nemiver-0.9.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="A gtkmm front end to the GNU Debugger (gdb)"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nemiver"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="memoryview"
+
+RDEPEND="
+ >=dev-libs/glib-2.16:2
+ >=dev-cpp/glibmm-2.30:2
+ >=dev-cpp/gtkmm-3:3.0
+ >=dev-cpp/gtksourceviewmm-3:3.0
+ >=gnome-base/gsettings-desktop-schemas-0.0.1
+ >=gnome-base/libgtop-2.19
+ x11-libs/vte:2.91
+ >=dev-db/sqlite-3:3
+ sys-devel/gdb
+ dev-libs/boost
+ memoryview? ( >=app-editors/ghex-2.90:2 )
+"
+# FIXME: dynamiclayout needs unreleased stable gdlmm:3
+# dynamiclayout? ( >=dev-cpp/gdlmm-3.0:3 )
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-util/intltool-0.40
+ dev-util/itstool
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-dynamiclayout \
+ --disable-static \
+ --disable-symsvis \
+ --enable-gsettings \
+ $(use_enable memoryview)
+}
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index 98d73d6b..c9fc55c 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -1,3 +1,3 @@
DIST cuda_6.5.14_linux_32.run 76788277 SHA256 63fa1fe5d013e9944d6c1a3a71768fa4dcb35d6a157c1b06765bb56198c205c5 SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc WHIRLPOOL c1094dd84883ef08d91c6eec3634a285496418db1e76b70f449f833dcb01069a620af504b6df7fe2752559688ed1f60f4adda8c97d849d648cba1be0f8196954
DIST cuda_6.5.14_linux_64.run 972320904 SHA256 f3e527f34f317314fe8fcd8c85f10560729069298c0f73105ba89225db69da48 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e WHIRLPOOL 0b890771dcca352168fed1b1df9b29504b03f8c29da59cec29914c541283998edf65f5ca6a41362143a2d5d7359822b036894f563c56b39583b1ac4c64e35180
-DIST cuda_7.5.18_linux.run 1195431560 SHA256 245ffb6c1e2b69d323f8ae3a1b63d3384fec3934222e56e9d801ecc0d6e919c5 SHA512 cb933512fde09376b1d6040c72d24c4f91dc44f73322ca87aa7d1f34156c9c87feea41f9a00f1a403cfb89645b5e7a6a5f2bfe4933703ba81f0cf94968d430fd WHIRLPOOL b1a06acba02043fabf496ba683fb984b1c90df2cd71396457f664beb8cb26b2e3074c8568ec6ce0cfe565721986670c7a40351a29a4856a7e03268c14d545247
+DIST cuda_7.5.18_linux.run 1195424633 SHA256 08411d536741075131a1858a68615b8b73c51988e616e83b835e4632eea75eec SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363 WHIRLPOOL 59d186f5e9176db25e5991e8088417ac778953c3ed2f0dcef034968f7ea695c5d4cfea81759ac0f7f1290c3842d9d0339b5b74d2d90ec8b333135aa1b986ca10
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
index 3b7b211..22e02d7 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
@@ -6,7 +6,7 @@
inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
+MYD=$(get_version_component_range 1-2)
DESCRIPTION="NVIDIA CUDA Software Development Kit"
HOMEPAGE="https://developer.nvidia.com/cuda-downloads"
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 1e418f1..285e089 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -2,4 +2,4 @@
DIST cuda_6.5.14_linux_64.run 972320904 SHA256 f3e527f34f317314fe8fcd8c85f10560729069298c0f73105ba89225db69da48 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e WHIRLPOOL 0b890771dcca352168fed1b1df9b29504b03f8c29da59cec29914c541283998edf65f5ca6a41362143a2d5d7359822b036894f563c56b39583b1ac4c64e35180
DIST cuda_6.5.19_linux_32.run 81882112 SHA256 9f767f38b84f52c097bec81669f99e4a6c4c9c09b5da1bc09fe49e0f804bc7a6 SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e WHIRLPOOL ac94b4e7f29811b4240623fb69b3c54214e7f0c60a286d899944dbab9da7fd3c122760199a3357667e33879bd48fbf352d5d39029acca6021e7caf21785557ed
DIST cuda_6.5.19_linux_64.run 982446238 SHA256 5279bc159b72b7445d8aae5f289d24bb4042c35422ef32da68049d8f666d3ff5 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797 WHIRLPOOL 6ae8e53719e12997de60ec3688167f3fe33b1145d01217182e39ac386c25b358c8ba6cee45ad6c80e33ef66fd9a511338dce4589f10a31635b8437b6e528fd7a
-DIST cuda_7.5.18_linux.run 1195431560 SHA256 245ffb6c1e2b69d323f8ae3a1b63d3384fec3934222e56e9d801ecc0d6e919c5 SHA512 cb933512fde09376b1d6040c72d24c4f91dc44f73322ca87aa7d1f34156c9c87feea41f9a00f1a403cfb89645b5e7a6a5f2bfe4933703ba81f0cf94968d430fd WHIRLPOOL b1a06acba02043fabf496ba683fb984b1c90df2cd71396457f664beb8cb26b2e3074c8568ec6ce0cfe565721986670c7a40351a29a4856a7e03268c14d545247
+DIST cuda_7.5.18_linux.run 1195424633 SHA256 08411d536741075131a1858a68615b8b73c51988e616e83b835e4632eea75eec SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363 WHIRLPOOL 59d186f5e9176db25e5991e8088417ac778953c3ed2f0dcef034968f7ea695c5d4cfea81759ac0f7f1290c3842d9d0339b5b74d2d90ec8b333135aa1b986ca10
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 7f295e9..978b7b7 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -5,9 +5,6 @@
<email>naota@gentoo.org</email>
</maintainer>
<use>
- <flag name="audit">
- Enable support for sys-process/audit.
- </flag>
<flag name="demangle">
Enable C++ symbol name demangling, using libbfd from
<pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
diff --git a/dev-util/pkgconf/pkgconf-0.9.11.ebuild b/dev-util/pkgconf/pkgconf-0.9.11.ebuild
index 1bced69..1b17993 100644
--- a/dev-util/pkgconf/pkgconf-0.9.11.ebuild
+++ b/dev-util/pkgconf/pkgconf-0.9.11.ebuild
@@ -10,7 +10,7 @@
else
inherit eutils multilib-minimal
SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
fi
DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index 3b5b02d..ff2b584 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,2 +1 @@
-DIST rosdep-0.11.2.tar.gz 106456 SHA256 89da05bdc082005815a9679dc34509a16647374d746a9e636c4238dd8f7aed9e SHA512 55057bb478dce1a7be3025d52fa6fb616b2de95017981ead934d7965282fa6ceb81780b7825d914531f87af492f3b5ce91ecf2607e6bddb65e13744e8a8d6743 WHIRLPOOL 37407d99d58f62c00a54b94a5820cab599c7700be355132e5d7b9d277faa220f89d68c9950cd386e984c64a1f0c493d53db15b31082f485d4786aff232f73d34
DIST rosdep-0.11.4.tar.gz 108842 SHA256 ded28bbf4821564feb8b62174f4ecac0031335c8357230e618a224b9ae1e8081 SHA512 0bffe2731e1039da63231bd57a98aa132a22fccfa6a8c3ed1553d51b0cf217d35eaaed524607f76132bd75332aae79187eb69d57ba1df8134159ede0a427953c WHIRLPOOL 4293a4d50d95882dd441e9d94eefc1c42ccb4195ba7faf1acb5081d7f7cae1ffde11842919ee45d7110e04f3a63b1ad4699fc9c768788aa1fe4afe35030c7192
diff --git a/dev-util/rosdep/rosdep-0.11.2.ebuild b/dev-util/rosdep/rosdep-0.11.2.ebuild
deleted file mode 100644
index 7e6194f..0000000
--- a/dev-util/rosdep/rosdep-0.11.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Command-line tool for installing ROS system dependencies"
-HOMEPAGE="http://wiki.ros.org/rosdep"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
- http://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
- "
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
- dev-python/catkin_pkg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-python/rosdistro[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- )
-"
-
-python_test() {
- nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
-}
-
-pkg_postrm() {
- if [ "${ROOT:-/}" = "/" ] ; then
- einfo "Removing rosdep default sources list."
- rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
- fi
-}
-
-pkg_postinst() {
- if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
- einfo "Initializing rosdep"
- rosdep init
- fi
-}
diff --git a/dev-util/rosdep/rosdep-0.11.4.ebuild b/dev-util/rosdep/rosdep-0.11.4.ebuild
index 7e6194f..e72467b 100644
--- a/dev-util/rosdep/rosdep-0.11.4.ebuild
+++ b/dev-util/rosdep/rosdep-0.11.4.ebuild
@@ -35,8 +35,8 @@
dev-python/rosdistro[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
test? (
- dev-python/nose[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
)
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index 7e6194f..e72467b 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -35,8 +35,8 @@
dev-python/rosdistro[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
test? (
- dev-python/nose[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
)
diff --git a/dev-util/stressapptest/files/stressapptest-1.0.6-autotools.patch b/dev-util/stressapptest/files/stressapptest-1.0.6-autotools.patch
index db5103d..01f7cb0 100644
--- a/dev-util/stressapptest/files/stressapptest-1.0.6-autotools.patch
+++ b/dev-util/stressapptest/files/stressapptest-1.0.6-autotools.patch
@@ -10,7 +10,7 @@
* Correctly use autoconf host rather than target.
* Use autoconf host_os.
* Warn rather than error on unknown configs.
-* Add --disable-default-optimizations to avoid forced flags.
+* Add --disable-default-optimizations to avoid forced flags.
* Fix manfile install
diff --git a/dev-vcs/bzr/bzr-2.6.0.ebuild b/dev-vcs/bzr/bzr-2.6.0.ebuild
index 8a7b39d..6fcb43c 100644
--- a/dev-vcs/bzr/bzr-2.6.0.ebuild
+++ b/dev-vcs/bzr/bzr-2.6.0.ebuild
@@ -6,19 +6,20 @@
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads,ssl,xml"
-inherit bash-completion-r1 distutils-r1 eutils flag-o-matic versionator
-
MY_P=${PN}-${PV}
-SERIES=$(get_version_component_range 1-2)
DESCRIPTION="Bazaar is a next generation distributed version control system"
HOMEPAGE="http://bazaar-vcs.org/"
-SRC_URI="https://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
IUSE="curl doc +sftp test"
+PLOCALES="ar ast bs ca cs de el en_AU en_GB es fa fo fr gl he id it ja ko ms my nb nl oc pl pt_BR ro ru sco si sk sr sv tr ug uk vi zh_CN"
+
+inherit bash-completion-r1 distutils-r1 eutils flag-o-matic versionator l10n
+SERIES=$(get_version_component_range 1-2)
+SRC_URI="https://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
RDEPEND="curl? ( dev-python/pycurl[${PYTHON_USEDEP}] )
sftp? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
@@ -37,6 +38,10 @@
RESTRICT="test"
python_configure_all() {
+ rm_loc() {
+ rm "${S}"/po/$1.po || die
+ }
+ l10n_for_each_disabled_locale_do rm_loc
# Generate the locales first to avoid a race condition.
esetup.py build_mo
}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index affb401..71dafc0 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -3,31 +3,43 @@
DIST git-2.0.5.tar.xz 3437996 SHA256 f5a63f5073c7f10d0676d0dabb46df48f2af77624fe24e1c6047b0e047af8ca1 SHA512 a2de101462cb7cf79ae596a5c7a77746fca430d6ae819731eb025a784b38b48b98964aca3db251e1a598ff17ff26b3711b044bd9c579d01346a8e1e77f7aa6de WHIRLPOOL b317f7b57a8a568b8a63ddbb44d6734dce01034c1b50491e3aedbb8a4ad2dc0f781b9edfad07e73ff050684f05734ee5f8b5483646967cbcd0a3cf7c600394eb
DIST git-2.1.4.tar.xz 3544804 SHA256 a04968b9b10cbcb31a7054aa3a0d11ac47c83556ecd270ddef1987df5d3d053e SHA512 17333eda9600287be1f366271f314619354f6bc9b7f867d59a9493441e71a963340cedf728b5954ac6311f5426a928a2beacfa7775e1a4d439b58e0dcf310a0b WHIRLPOOL fc20c64e0d494a13834c71ffa5c727018fc3940f4dc65ae4eda6ba14af2faf2864d779e706b503c69a16858ca051878e27bcfe1883c3c206dda6129a1bc5aceb
DIST git-2.2.3.tar.xz 3592292 SHA256 d56ba6a2b9ef51ec165b98b1894a36fbb635c6abb22674fd61ffc80603b967d9 SHA512 772466ccbbe06d83a03b244dd157c30f51e0fb06995a55070b262f8dd67ced454013fdc86690210c54db914252439be0bfccabbbfffddebb6bc047db946e9b92 WHIRLPOOL 2b60036db65cbcb1c2c2db68ec1747f6c309f9368c4f879c8b91964e16708c641e5a8b7d7b79431193b8d78d1c73e8e694ffe5f407701d7d7719f2d568bff180
+DIST git-2.3.10.tar.xz 3625052 SHA256 8d1eba6e4ad4ef57f87d25535956b5752c341f222407329025f8704537219ed8 SHA512 23cd192bf19be648377767c0b45e895e5284b5fc7558be566ce5f59516d94921212f4944daad5ab650c99c10a58628626bd3d8f23d3b4c9d0d3fa4ce17a8eb9f WHIRLPOOL f6ff0675e75ac0dad5af264f9bcb18d29b6e615d73b68ad97caf1efce353ddb96c51c8e3c6bb633e00a961b757e3bbf55a7a5e130f707696f81324ee8b16ba44
DIST git-2.3.8.tar.xz 3622512 SHA256 cb4d9228f63b7a9500d55383878bb4bbb60b80deb7ae1a5858c7103ba14de5a6 SHA512 bf693fbe7fc16a240470501af2a7736ebfdbf027c0cc8adbd601d2b1c98ec7d968959e06dd8a3d0e206dc351e83a161475191d59d76f9e2da3e13b4de8716fb4 WHIRLPOOL 93aa2d832e57181de25035952a566c9d3330105e277930f088eb10e2073120c296b6dd87375437c9e9b7880c9b56e2c0de0fda5f77f0da9d2f96840c2fe8eda8
DIST git-2.3.9.tar.xz 3622952 SHA256 90c2b4bc8cb081115d34269b2d061fb8c7961cf08406c345b278c43d7dcd25f7 SHA512 e02565b9b0176158418358a811735dde0e630adae1cc8401a3a578fdce69efb6d8893815ee749820ade8b8aa0f3b8b42ff85322bf98dad55de77298eeca50510 WHIRLPOOL 451717d03304ba38f964801be909f0265b03adef8cacd62dd1bb1af34e1c6cc4caef064f784e34984cdb9f1f8f7e3f9b93ab67c116f63a1c9486b96a5bde3e91
+DIST git-2.4.10.tar.xz 3695176 SHA256 b631b2b26f5593833a29cd833b8071b4eaf7b212fba180e587b526f51c2331df SHA512 08f7f63fd4820f155aec08373fd4f5abbe5a4c8f98a73a824897ba68901fb274b4cf47b8751cd2bea358cbb9c09934f7857aa440de69b46ee88a4bba852f5ced WHIRLPOOL 3ec53b7355f1895c95b91e1fa85f185801acdb0317384099e4d7914208c3d762d536ed83e099c96a168d696e37e3f8a491459de59c7dd59dce9c49fb75af836b
DIST git-2.4.6.tar.xz 3690432 SHA256 bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6 SHA512 2c95a00af81d6fbd8f4984e89d7cb23396caacadd684466aeb5a11f1b3acfbc625f832060cbef5aee0748e36c1fddcd88b3b9c26c4d7aec1d185e5f7311346ef WHIRLPOOL 1ae191666bf27a7e18686b910cbe610f85b5b7a43266232359615fa2a22b80bc659277b71b21394eab53df0c912d9ad911c7793c2a041cd6c7d768a5f0416f5b
DIST git-2.4.9.tar.xz 3692824 SHA256 0f5fba41639d3224fee02f40393e2053ee9468fa7b88d64c5b97f7e65667bd2b SHA512 d5df1f725d5af8449e091ee50f6c4371c2b1699d80d499321a751ecf6c61d75c6c3a286ea60661ae1608bf92c94e2c8977ad08731e153830bd5c5b4587d8ba82 WHIRLPOOL a670eeb5abbcf844324b2444d87ecc9eb8c2899d6f37da6aef9f27edbe53d90086907642aac14536396b61d4520cd4e7b77124f4d54cc7f9f9e5a769741e4d03
DIST git-2.5.3.tar.xz 3745096 SHA256 124d29d857a1282fd2111cf4a021f156e8bae917f455b4551b2aea87f0453a1a SHA512 ab73d67f76ec8a6350995c692eefa7ab60ae13590d5d7c2fbd3ec1105a8d435ec1b156106fd6c3d6b51080a27f3ebd66bbf0a85042b697bc835143d9f625474e WHIRLPOOL e0c0fde0b263fd4847c21353ec81449baf6f1d5631aed4fdaa41dab2665159b528d7c477dacaef4efb2786ecaf3c0bd44ef3a589765543eee9726e70c5207d66
+DIST git-2.5.4.tar.xz 3747552 SHA256 e08d2d384e1c8c474d336c3583ed5cd396c76455155a4e65bfa97699fc38472a SHA512 25964bc59301b11994c94bab618613bc87ef788d356af55a26c77861a939f2b67cf37be98199e81d5c2a63e8d9c043b4fc6fb481316cc4d8bb6a1f382eddf33e WHIRLPOOL e62efd86c5e0d1b040816978cc28a41d00a7c095513482b0df1d4addc87bd89ce20dbb1b77e3ec3d9bd0722de3237e451b05f687fdb6419fa419708921049222
DIST git-2.6.0.tar.xz 3808872 SHA256 211beb96ff41a83727e39704431ac388ecb1cebb5219cda067999bce4e1e15a6 SHA512 efcde5fa3ac56d577e25259e74f19026438ccf8888b79429eec2f141bb2a63bb83e73f65b1ea96bcc1f9f894fb90ec1b5ea81b9f0c1806d25352f6b266e7202a WHIRLPOOL de703ba5d4024a6205bb795330b1ed06c70b01fad311739c59d837e7b2c7cad27bfbcd7cae0ac18378a8baa9d0fc0a5341665c312d7749cbb488b14456745ad1
+DIST git-2.6.1.tar.xz 3811268 SHA256 fc7c727745d5eb0d796a16dc7c4b999c184830110e0aeb592c788597cc8e9ccd SHA512 55516aeaa73baf180135a0812bfcb35e26699db034688049a11b4ec98faa6c23582e78a1a72a87332116bb88a2d7e9565ccc7891de883b82ad7524ee2809a25e WHIRLPOOL d25217692cd428fa1d436fa16e8b7d8996377fe4af1a0b4ea29faf8ed85115c7a3fcfe359949ebfbfdac1630f5af43cb894d26d31f7e0984dfab422d6651a2ae
DIST git-htmldocs-1.8.5.6.tar.gz 2242475 SHA256 7c8e955d0798686fa030ba7b7b384a2eab2b74d5bd695d82faecac2e247bd211 SHA512 c9b2752bcdd7f8f817b14e99ab2743d153e3e7549bffb2aa98999e46d1e965d045850ec6a3e9f6bc83e6e4820ce20f281c33f946ebd2be16d275b85a5ddaee36 WHIRLPOOL 7db3fb74e6b51618890acfef8fb89ab09adf653d3196e82624671194bdb2b564b903429ffecf68b28faf96ce3ebb83b534459738d48ace048d873c158621d31c
DIST git-htmldocs-1.9.5.tar.gz 2262251 SHA256 4fa289e259d6b922a51d11a687203612aa1aad5696eb83b4e67c0de8a785700f SHA512 2df975c33d3411a97ab5a684b03998b7cd188d05bae6813c753fe2092b0acf463dec49a7a546d315f520fd9c71281da41998d0f36f64f48d4f95507a034a083b WHIRLPOOL edc252ce58b31f001c0d225f0b40b3689028bd34b1cbbdd889d645d37a2931e9039f76f12e5a0f918579a0b9c5dd1f3171af2bb58ee42972411ca33ec0ebe8f2
DIST git-htmldocs-2.0.5.tar.xz 944792 SHA256 90eaf745d6ee197718fdde9c98919918ad1e4e3576608e4522b84c612cd9ef2a SHA512 e9b3d92d466762c9c7e164e9c30ff0046b262bf4707ea057e3a682f7b15a4f8149a9aaf2630f117dc3b508744cd688c6c0087cc94ff3477e7f3b85513160d7f3 WHIRLPOOL 35970d099304a5ab174fc93f8496a0c651a259dcaa3d23a2dd0233f8db214ae94a26e28044a87460d4654e61440427d331ceeac290335d6ae3fcf0423175bba9
DIST git-htmldocs-2.1.4.tar.xz 959144 SHA256 7665daecd77c2f9be8b316eb69a1fda3f383f759e71d346a137c8cf39501d886 SHA512 7734d671ab6ca8374f54546b0987821d0c66d136d50f9cbb1ff7c06da25330e46a10ede41d10a60c80847afa68999298c2f90dfe99d51bd862590f02344e1cbd WHIRLPOOL 97326a00a1f613cf95dbeaf8938842855299d21e6963e2040b3bf9ee02a745c8156ea552e2b87248a98d5f0ecd6560a546a4a49b6635ca034ff2e92504bbb00a
DIST git-htmldocs-2.2.3.tar.xz 976124 SHA256 1e979c86d5447a4a4965de6a1a532e30ae6337e886a2d8fc61749806b2bf024d SHA512 3fe7f70b1ea4bbd60d64928802de1ea4eb35a305cbd243933876d89dfe05901cea71e3811bedb28e8ac0f0f1409afbf31884a78a8be0648b3666a0c7fcee8212 WHIRLPOOL b5348b121b9e3a11fe120ed8a379b99bba42711ea185aaf956c58d92fe3cb96969e0b60cb7c483cc5e39711a965b6a7eaa0b931477229faffff8e3326d5bf0aa
+DIST git-htmldocs-2.3.10.tar.xz 988072 SHA256 628ef79383039db857aab6ad4cb627573104e618461c2c6ee58fa39a3512d115 SHA512 cd8b050979cc13aab6e9b74d7a8042f33decaea639a1fc57ea4a5839563202fecfda95295e38404a825c05d393458aebf592bfd9b0c75eae44638a2bc9e33535 WHIRLPOOL a21430705753b533ba03696b80fb210fec4b8869821cbd940d3881c080f12816d161c05d8e483764d79c337ce7fe93f741b6a3b35afe2cc69bd9e4d7a1c8de51
DIST git-htmldocs-2.3.8.tar.xz 987840 SHA256 54b8d98e34bceeac906ffa8b7c93e8a2cd2cf3c7f4d0c0334e9d5e0c704ca23f SHA512 7aa72d55a6a2687a3ecb26f9db76f69e4003c87864b8239068b029a9d63f99a023bf76ec3ea60952ecf11608d2d684f4ad1b2ac76942cd44ec67bdf8f497330f WHIRLPOOL 60145b5a48a6780b0edb3a7ef50b3649193818e3aa8199de94dd9bf1cca110d7411902c8e7e3df881eec77aa59208780b60b946aeb5f13960de954af6fd88fbe
DIST git-htmldocs-2.3.9.tar.xz 987824 SHA256 bd2921280fafca0ef051baf407aa561f80c2bf51c69115aa3cfd48d4b50ef9f9 SHA512 c239cfbd1601ec38bc37a95834d5840fdb83362ea6ca2f8c0f48a5b3f0beed73aef47736e1b5e65a77a4fe1aec3e1b48807437a600fb36c7b2553194f4824daa WHIRLPOOL fef5ce4447d10d6f116bb425d678af53f9e8c8a3238153d241afd6109647f04045c0bc4782afda63e3d43df89cc864dc3d7d01cddbf9a71de566d7cbc1508e7e
+DIST git-htmldocs-2.4.10.tar.xz 996588 SHA256 f2c523ea114caac7c5cf51a20a420a215411762fabff2da9febfc2917af835ef SHA512 60fc5a2b6665ec7fc10680608b5689a24fa211fe7393f010a8099c6fb0a9582f20cebc7cad0653b62750677d79a80fcd6e8e96fb440acb3fc7c7c0ffc00779d3 WHIRLPOOL 30585753a7b08dfa812c74832d35168d3615d8bf71c3c853efb125348538b5fb7cc4b3f1cfef725082ade144b5362394991186967f6026cee8c91dd41e30290e
DIST git-htmldocs-2.4.6.tar.xz 994712 SHA256 5213e8b882293ec3cda247dabbc75c6ee5243b9d330a8fafec004952fae91a88 SHA512 782fbc38a611380c0af2631bd6123d568b02159fb46159c763d97d75bd84debe43105d83ac3f321cd8383e1334806857bce1a48563fd0c19b43f527fe18615a8 WHIRLPOOL 170e4ecc8255e6d5d562274e6e3fb75c2fc62e415586d61498b680a076c74248664fca35bb7c532009f7f22be4ad14d1fe047e14791991fa32373bd7053e0396
DIST git-htmldocs-2.4.9.tar.xz 995724 SHA256 6000eb00fee2adc4d5a8fd8ace857049e6fb623aa7ec9087d983c29953319cd6 SHA512 42905ae5383e5f0444ec868a1d742bada31cf25eac582b95ab6e6334a3dfefd05d2e08a1c2f7c0354a841703cbac2c6dc25437ca9f681a5bb0a121dc94d2d938 WHIRLPOOL 9791ab122cf680f060d274c6a7bcdd1aaf0660f83ed4e91073fed1dd2f2b16e96e938fcbf04e03373768b8036e3f8dd0be54639f8d24bce59501c970e4225d73
DIST git-htmldocs-2.5.3.tar.xz 1009248 SHA256 f87465b5f6d01ceccb314b3e0a3749d642bea1007b0bc78afba868d75413d85e SHA512 7e5bcb85c270c740aa619d3cedd81e4f9bab989a8785512faab70cbd5029c021972b0574083272bed85324bf9372bf52f7b52827030133e09618731bf927f36f WHIRLPOOL f17c063c5b6e2a3cb7d25810b26f909bd09e281963e56029290c754b8f38bf7dba446405e96e4c49244db0bb60176b34852ac3f9a5b1d61c886eb90c2391efd8
+DIST git-htmldocs-2.5.4.tar.xz 1009820 SHA256 cb36b3b7198a3fa49f2677bba83f1e57a1a40250a181d9e86232cb8febcc8053 SHA512 af833635632ba5c65524bfef00f291a41fd37ba7bd9ca4b65b4c0eb9329b888d2e8757fe29f33bd25a75e1841d67a20dff49f43d35a502ef3b29599d073dcd6a WHIRLPOOL e5f55c3dbdf69d946295c5c19b95a79168d34645ced8e6a837ec8b5dd948008487288159f63a2f81a36fbdf3f413d3fdefd008b0157785df37431ccb9127284e
DIST git-htmldocs-2.6.0.tar.xz 1016192 SHA256 0ba5d5d630e3235b74bcfb4ea2e9bbda8a3e619aaaf9e1f56e12dec5d8dc1d87 SHA512 11d17ee8fe6537efba323887ccb64fe9c905b293d3d06f4c0f0b3da4283a7ac5b5bf840055bb9f96d28121aecce074d86feebaa2a407291ec812246308aefa1e WHIRLPOOL 7e08864790a3e5c584e85acd6aca15bfddea846df9ca423c2dfe1332da2283b8fb9ee462639733f35e4842d27a895b59db0e29e3e4636d525131b47c2851b139
+DIST git-htmldocs-2.6.1.tar.xz 1016516 SHA256 791487ebd5a25456d41d8825ef450fdf3214898a328028d01acdb21a668052da SHA512 da0500da633deb185c59c45296ca9ffa631f0e1fc2e8bb5163b4c1913cc21610dc723aa415706e7433246b2604fa2e84222a25f97987f55a9d544d9c2ddac300 WHIRLPOOL 3f31ed5b0d7b78851fdc21c3e885ac34d2901381a9d845f534708b94040b3728ad58c47dae24d1a9ce8a5778d6cd9983815746f4a9c5eaca0ee4f2279da37cd6
DIST git-manpages-1.8.5.6.tar.gz 569061 SHA256 58ef7cb3121639b8d78e2e4c4f7f886bab57af9e9e137b10f372dfad573872c1 SHA512 a524a1c7e8bdc73ffe04bebb5c7050a18c8649b98714bf255c8e3c32a2443d8d5abf33e3ca2eb108d601f01e0bda50fed1e134ffdae87bcf6f551cbbd250c4ba WHIRLPOOL 2db62b96e972dbcbec1ac59d7244bf2c2ff7140c941d1d3c6b9062bd79b80541d7fa3982c5a3bc55a18fc9112ab3fa648966be5c3e1135ab7b5c89080bee82b6
DIST git-manpages-1.9.5.tar.gz 571625 SHA256 37cc735c4ced6574e8e93349d52d30372fc6f9fe3de3d6b9934a14857d6aade8 SHA512 e3df3e933fed6ff2845989a0146b28789452e9583bc19dd4a9ad335f64b15feffbdc4dd7cdb9d6b5216f7f85837318cf9b10df033f8022777f91c2b0894fb231 WHIRLPOOL e25d77fd8d9cacb92d45fd50640bc65189d02d7e23b276ccaf3b35ba1fe64ab0c49045d1fb8983b7b2b5bd996e767508446ac76506b074ded10feef1f9256918
DIST git-manpages-2.0.5.tar.xz 359000 SHA256 3cf1581da2a19c0651df445ee5f801e108619befe8965e01d61faa46ca57b642 SHA512 b3981565a34a203283801b86717386971ef53c2f5c47bdde290aa0df4d62045ecbcab1ff1b4d1d8ddf7d489e74d65b0208d87ace7ca8c8be9525be548e445425 WHIRLPOOL e8c78eb38cb3192455ccb991a4ce5cd3988d06f1f06cdf0722e4ce6fb1d4e57f618058cf07d312bcab4f5821a1b1dfc016c03626d4f3429d3e5ef089607a2801
DIST git-manpages-2.1.4.tar.xz 361252 SHA256 01070bc96e88231f6f279b031fed2919efea8b442fe724f37349ad951d010b04 SHA512 35fe0dd9e0fe9547362abc0e9c5b066abc13a4137b4ea62569fa5b1ae93831da0686e8783be946a9b87274fbc2322ef93425b9d3fc1257023176c772b21b79b2 WHIRLPOOL 9f199eb94657149b51cb20fb55878cb1cf83fa3741906ce37a66b0157df9ca4dae66754fe264019e6bd8e7d286040fec718b89ca4b40b803c059c46521a5cc61
DIST git-manpages-2.2.3.tar.xz 369884 SHA256 bf6a4b5ae1267a252b93079e9b7fec2dc6f0a179ac05b9d7f351d183d354164c SHA512 499493956b2a0634e3d5b4f3904a37b6dda1985ceb388eead4701365081605df6cc0c3db79e0aa0bf32d2fa201fd94201d66d5ee487fceaaa0fa4409a17eb6ad WHIRLPOOL 0abf61527dcf71ed0e6dfbccf67d77ecc674122765adca584e38aa70ba7103b8d6ac6173c0383c4c964acbd603391e687809457320640461bc29a336c4fe7932
+DIST git-manpages-2.3.10.tar.xz 371884 SHA256 dd7f92d9f23f6293c18a0859208b7f236e71e6fe09f041c98f8b4b9ee7f913ed SHA512 324d5541d331708f9e0407becc378f955a44423e526502b04ba665596c1803e966a65d60bad21ae43320fb5b9616d8150c3b23095f1f47dfaf94e8ce0e2ad31e WHIRLPOOL 41d6427b39b7c6e3c7e2d6d9997285806059ea746b81047083d3610ba661fbb51ebd100b68cb5ff2015b245a723a3f070e52ffb4bb38e2b9a132cee80ccebd3a
DIST git-manpages-2.3.8.tar.xz 371528 SHA256 4d38de9decf80864480fcd5cc58783e3bff4e22383b281193acd82ffa3751fe2 SHA512 8c6aaf60e4b6505ae6789fa658ff15534cf5dfa51c03fdf47a624723b75a8448d71faa9f4ee61c5c243b775c4047dd2ffffc664b37e7f38b60c90fc56252ed93 WHIRLPOOL c6068de21f53e20ec17cd724059d91781e81abf617c2169c1099997afdeac371a59927d9db0b98c1f64c66b3de016b351b08a2f37a43038a924137f6f139a72e
DIST git-manpages-2.3.9.tar.xz 371580 SHA256 132cd914bf57ab66d75a72001b6defa514181fab3f4555f8d6933a7efe987530 SHA512 76100ba16f2fb5dc2e85a49d46ba420c52920f38f7f1feb2589c2bdc76100929badd147324a0f563d0280724f06a95929caa8e85336987783493d3a02db0ed28 WHIRLPOOL 24f5279122b74da69f366e5aec35029b6322891b5c670067b2cfc76696257d1c9bc2e6d674f2b2d740d4a27a439b89c3186e8bc41cdc8912e29635c4b3575929
+DIST git-manpages-2.4.10.tar.xz 373968 SHA256 da712c07d84bb3da10be9fb56c15289c77828d3011179ab71f090e77e52a03d9 SHA512 d5a978109db70f3d50d02ad17c93229206f2d5a2dd3dd7e9fb266ca7b76b85ad92f63120df885b88b5a33fe1dce0686ae92fc50749cb3b6275cb48812eb031a9 WHIRLPOOL decb0b5bf81b25e4562f639e03c2b60b0c470338be0ac298f3d62deb54538de0961a81c6a8ced17ef5877df6de5c17b49fe96e77f00dd2038d2d1189c8f48e7c
DIST git-manpages-2.4.6.tar.xz 373408 SHA256 f32d267bdaab75812dbd116d2b329d6dc7287a974e929e380e8cbf96e3822b8e SHA512 fa0562b8cc3e0421f7b45940f8cd4b58a5e58a1eb8571e2de85babf8ffd932fd210baa82aefe3c6090cb7dc51f64f299143be51beaacb37be97832b4a8e2a869 WHIRLPOOL 595beed93c621ffd9b7e0b507fc2941156975190eca8b638826ac32b6ea761bbb08f05e152dc88a7a3dbd168ab083a0128d61e72fae51cd0e94a8c91a1adb3ee
DIST git-manpages-2.4.9.tar.xz 373644 SHA256 0adc425adb13d669fcc90fa28d5fff3e64d8c9feb49d0565ec031b7bddcc4e02 SHA512 0df6359b8119b023b2d375bba08539cad4c0718184c5027b99827490fc17bbcff5da227a9b13bbdb5a82a45567cb83984dab050faafea1b7939532397f6688a0 WHIRLPOOL 20b8e34bfa4c5c20cf92368676f3a98949ed8c12a9c5b90f7cd052387492afb0e1521bf328e4bff43c4e8aeff8784d88b79498e47bffd093bc751e49046034e9
DIST git-manpages-2.5.3.tar.xz 378000 SHA256 c5d8e9036be741924cf2614f0178a10f0c7d7b1d3efef96c1a08c751596cae3a SHA512 ed5a736b6ad22469ff7677434d046f331b0b4f7bbab8d14baa7a376bf44b384ffcc37ce1a99278d0fa69d8a058df21de1f8300a72cb2ad4b781543aac5100752 WHIRLPOOL f914d116e8aafd76a5decbfc945a6a3826814cda04d471716aeede4923eda79da61e809d888890b545b78811afd9b85c354540d9af06206e9402f1815c19e914
+DIST git-manpages-2.5.4.tar.xz 378296 SHA256 bdd8db3b8cd35d01b2631d1f3c1174e5bc1b62b3e0177ae1954d83743aa93ea9 SHA512 ccd675d8d9c117042083800fa4ae7a876a7873cf13844c92f731e46553d316a949d445c80e4b57824792a6b369623085053d25baeb4f8b79801b5849f06eb084 WHIRLPOOL a2149da3217826c1c4951aa0fa0900e388ea806511559d0e01c4e17a565470048e55e988b12e6da3d7b52b11d410d27b4da0cac4d2d88e3f6860f22664cd8ac9
DIST git-manpages-2.6.0.tar.xz 380940 SHA256 94c45cf2353f8e1bbb6b56b6f54289203319db4cc38d94f53fcfb8dc3b669615 SHA512 3173f77da6fab0f5ac5d46a206b18fe69083ee74288326af63bc3938fb359e16a0cf5490f71ea8b11ba54117871caff7b4022e698ecd328c028b27eebc711724 WHIRLPOOL c76454026f747a5e68c3a195b99471b2f012013ccd6b305a7ac4c396dd463476a8fff68017dc631198e2fc309c3f28a2373883b6b376166168e57ceff624dba5
+DIST git-manpages-2.6.1.tar.xz 381288 SHA256 e4cf64edcecd284d9ef4e6ca7fa0e8556d2414b5d9881a9abfe477f95b416391 SHA512 513a0692ef2b7db12c8eddcd69e6cb465d39138a5d7a6703458f262c8623fdf6324da64f434fef6f1bb7cf3705c9e17ed4555394a609aa4f8ae24c205dadc3a6 WHIRLPOOL 4a4058d6e0c6d0ccdf256b0e9faa31d49579a97f6268f7ae0cfcd0559152eb665e2d827295b3160f8e08c2a3240c3a0b2e51f6350a393a74ed64d3a4ebd473c8
diff --git a/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch b/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch
new file mode 100644
index 0000000..b5e3af1
--- /dev/null
+++ b/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch
@@ -0,0 +1,52 @@
+From: Renee Margaret McConahy <nepella@gmail.com>
+Subject: [PATCH v2] am: configure gpg at startup
+Newsgroups: gmane.comp.version-control.git
+Date: 2015-09-30 17:49:44 GMT (5 days, 14 hours and 45 minutes ago)
+The new builtin am ignores the user.signingkey variable: gpg is being
+called with the committer details as the key ID, which may not be
+correct. git_gpg_config is responsible for handling that variable and is
+expected to be called on initialization by any modules that use gpg.
+
+Perhaps git_gpg_config's functionality ought to be merged into
+git_default_config, but this is simpler and in keeping with the current
+practice.
+
+Signed-off-by: Renee Margaret McConahy <nepella@gmail.com>
+---
+
+ builtin/am.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/builtin/am.c b/builtin/am.c
+index 4f77e07..3bd4fd7 100644
+--- a/builtin/am.c
++++ b/builtin/am.c
+@@ -2208,6 +2208,17 @@ enum resume_mode {
+ RESUME_ABORT
+ };
+
++static int git_am_config(const char *k, const char *v, void *cb)
++{
++ int status;
++
++ status = git_gpg_config(k, v, NULL);
++ if (status)
++ return status;
++
++ return git_default_config(k, v, NULL);
++}
++
+ int cmd_am(int argc, const char **argv, const char *prefix)
+ {
+ struct am_state state;
+@@ -2308,7 +2319,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
+ OPT_END()
+ };
+
+- git_config(git_default_config, NULL);
++ git_config(git_am_config, NULL);
+
+ am_state_init(&state, git_path("rebase-apply"));
+
+--
+2.5.3
diff --git a/dev-vcs/git/git-2.3.10.ebuild b/dev-vcs/git/git-2.3.10.ebuild
new file mode 100644
index 0000000..552e959
--- /dev/null
+++ b/dev-vcs/git/git-2.3.10.ebuild
@@ -0,0 +1,636 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI_SUFFIX="xz"
+ SRC_URI_GOOG="https://git-core.googlecode.com/files"
+ SRC_URI_KORG="mirror://kernel/software/scm/git"
+ SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ doc? (
+ ${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 ~arm64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+ dev-libs/openssl:0=
+ sys-libs/zlib
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl:=[-build(-)] )
+ tk? ( dev-lang/tk:0= )
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ emacs? ( virtual/emacs )
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
+
+RDEPEND="${CDEPEND}
+ gpg? ( app-crypt/gnupg )
+ mediawiki? (
+ dev-perl/HTML-Tree
+ dev-perl/MediaWiki-API
+ )
+ perl? ( dev-perl/Error
+ dev-perl/Net-SMTP-SSL
+ dev-perl/Authen-SASL
+ cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
+ cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
+ subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+ )
+ python? ( gtk?
+ (
+ >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+ >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+ )
+ ${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ sys-apps/texinfo
+ app-text/xmlto
+ )
+ nls? ( sys-devel/gettext )
+ test? ( app-crypt/gnupg )"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ cgi? ( perl )
+ cvs? ( perl )
+ mediawiki? ( perl )
+ subversion? ( perl )
+ webdav? ( curl )
+ gtk? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+pkg_setup() {
+ if use subversion && has_version "dev-vcs/subversion[dso]"; then
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+ ewarn "have been warned."
+ fi
+ if use python ; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+ local myopts
+
+ if use blksha1 ; then
+ myopts+=" BLK_SHA1=YesPlease"
+ elif use ppcsha1 ; then
+ myopts+=" PPC_SHA1=YesPlease"
+ fi
+
+ if use curl ; then
+ use webdav || myopts+=" NO_EXPAT=YesPlease"
+ else
+ myopts+=" NO_CURL=YesPlease"
+ fi
+
+ # broken assumptions, because of broken build system ...
+ myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts+=" INSTALL=install TAR=tar"
+ myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts+=" SANE_TOOL_PATH="
+ myopts+=" OLD_ICONV="
+ myopts+=" NO_EXTERNAL_GREP="
+
+ # For svn-fe
+ extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+ # can't define this to null, since the entire makefile depends on it
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+ use iconv \
+ || myopts+=" NO_ICONV=YesPlease"
+ use nls \
+ || myopts+=" NO_GETTEXT=YesPlease"
+ use tk \
+ || myopts+=" NO_TCLTK=YesPlease"
+ use pcre \
+ && myopts+=" USE_LIBPCRE=yes" \
+ && extlibs+=" -lpcre"
+ use perl \
+ && myopts+=" INSTALLDIRS=vendor" \
+ || myopts+=" NO_PERL=YesPlease"
+ use python \
+ || myopts+=" NO_PYTHON=YesPlease"
+ use subversion \
+ || myopts+=" NO_SVN_TESTS=YesPlease"
+ use threads \
+ && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+ || myopts+=" NO_PTHREADS=YesPlease"
+ use cvs \
+ || myopts+=" NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+# if [[ ${CHOST} == *-mint* ]] ; then
+# myopts+=" NO_MMAP=YesPlease"
+# myopts+=" NO_IPV6=YesPlease"
+# myopts+=" NO_STRLCPY=YesPlease"
+# myopts+=" NO_MEMMEM=YesPlease"
+# myopts+=" NO_MKDTEMP=YesPlease"
+# myopts+=" NO_MKSTEMPS=YesPlease"
+# fi
+ if [[ ${CHOST} == ia64-*-hpux* ]]; then
+ myopts+=" NO_NSEC=YesPlease"
+ fi
+ if [[ ${CHOST} == *-*-aix* ]]; then
+ myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
+ fi
+ if [[ ${CHOST} == *-solaris* ]]; then
+ myopts+=" NEEDS_LIBICONV=YesPlease"
+ fi
+
+ has_version '>=app-text/asciidoc-8.0' \
+ && myopts+=" ASCIIDOC8=YesPlease"
+ myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+ # Bug 290465:
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+ [[ "${CHOST}" == *-uclibc* ]] && \
+ myopts+=" NO_NSEC=YesPlease"
+
+ export MY_MAKEOPTS="${myopts}"
+ export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ use doc && \
+ cd "${S}"/Documentation && \
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ else
+ git-2_src_unpack
+ cd "${S}"
+ #cp "${FILESDIR}"/GIT-VERSION-GEN .
+ fi
+
+}
+
+src_prepare() {
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+ # install mediawiki perl modules also in vendor_dir
+ # hack, needs better upstream solution
+ epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+ epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+ epatch_user
+
+ sed -i \
+ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+ -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+ -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+ # Never install the private copy of Error.pm (bug #296310)
+ sed -i \
+ -e '/private-Error.pm/s,^,#,' \
+ perl/Makefile.PL
+
+ # Fix docbook2texi command
+ sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+ Documentation/Makefile || die "sed failed"
+
+ # Fix git-subtree missing DESTDIR
+ sed -i \
+ -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+ -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
+ contrib/subtree/Makefile
+}
+
+git_emake() {
+ # bug #326625: PERL_PATH, PERL_MM_OPT
+ # bug #320647: PYTHON_PATH
+ PYTHON_PATH=""
+ use python && PYTHON_PATH="${PYTHON}"
+ emake ${MY_MAKEOPTS} \
+ DESTDIR="${D}" \
+ OPTCFLAGS="${CFLAGS}" \
+ OPTLDFLAGS="${LDFLAGS}" \
+ OPTCC="$(tc-getCC)" \
+ OPTAR="$(tc-getAR)" \
+ prefix="${EPREFIX}"/usr \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ sysconfdir="${EPREFIX}"/etc \
+ PYTHON_PATH="${PYTHON_PATH}" \
+ PERL_MM_OPT="" \
+ GIT_TEST_OPTS="--no-color" \
+ V=1 \
+ "$@"
+ # This is the fix for bug #326625, but it also causes breakage, see bug
+ # #352693.
+ # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+ exportmakeopts
+}
+
+src_compile() {
+ if use perl ; then
+ git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+ git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+ fi
+ git_emake || die "emake failed"
+
+ if use emacs ; then
+ elisp-compile contrib/emacs/git{,-blame}.el
+ fi
+
+ if use perl && use cgi ; then
+ git_emake \
+ gitweb/gitweb.cgi \
+ || die "emake gitweb/gitweb.cgi failed"
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+ git_emake || die "emake credential-osxkeychain"
+ fi
+
+ cd "${S}"/Documentation
+ if [[ ${PV} == *9999 ]] ; then
+ git_emake man \
+ || die "emake man failed"
+ if use doc ; then
+ git_emake info html \
+ || die "emake info html failed"
+ fi
+ else
+ if use doc ; then
+ git_emake info \
+ || die "emake info html failed"
+ fi
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ # by defining EXTLIBS we override the detection for libintl and
+ # libiconv, bug #516168
+ local nlsiconv=
+ use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+ use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+ if use doc ; then
+ git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+ fi
+ cd "${S}"
+ fi
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ git_emake || die "emake git-credential-gnome-keyring failed"
+ fi
+
+ cd "${S}"/contrib/subtree
+ git_emake
+ use doc && git_emake doc
+
+ if use mediawiki ; then
+ cd "${S}"/contrib/mw-to-git
+ git_emake
+ fi
+}
+
+src_install() {
+ git_emake \
+ install || \
+ die "make install failed"
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+ fi
+
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+ dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ use doc && dodir /usr/share/doc/${PF}/html
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ use doc && dohtml -p ${d} Documentation${d}*.html
+ done
+ docinto /
+ # Upstream does not ship this pre-built :-(
+ use doc && doinfo Documentation/{git,gitman}.info
+
+ newbashcomp contrib/completion/git-completion.bash ${PN}
+ bashcomp_alias git gitk
+ # Not really a bash-completion file (bug #477920)
+ # but still needed uncompressed (bug #507480)
+ insinto /usr/share/${PN}
+ doins contrib/completion/git-prompt.sh
+
+ if use emacs ; then
+ elisp-install ${PN} contrib/emacs/git.{el,elc}
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+ # don't add automatically to the load-path, so the sitefile
+ # can do a conditional loading
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ fi
+
+ if use python && use gtk ; then
+ python_doscript "${S}"/contrib/gitview/gitview
+ dodoc "${S}"/contrib/gitview/gitview.txt
+ fi
+
+ #dobin contrib/fast-import/git-p4 # Moved upstream
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream
+ newbin contrib/fast-import/import-tars.perl import-tars
+ exeinto /usr/libexec/git-core/
+ newexe contrib/git-resurrect.sh git-resurrect
+
+ # git-subtree
+ cd "${S}"/contrib/subtree
+ git_emake install || die "Failed to emake install git-subtree"
+ if use doc ; then
+ git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+ fi
+ newdoc README README.git-subtree
+ dodoc git-subtree.txt
+ cd "${S}"
+
+ if use mediawiki ; then
+ cd "${S}"/contrib/mw-to-git
+ git_emake install
+ cd "${S}"
+ fi
+
+ # diff-highlight
+ dobin contrib/diff-highlight/diff-highlight
+ newdoc contrib/diff-highlight/README README.diff-highlight
+
+ # git-jump
+ exeinto /usr/libexec/git-core/
+ doexe contrib/git-jump/git-jump
+ newdoc contrib/git-jump/README git-jump.txt
+
+ # git-contacts
+ exeinto /usr/libexec/git-core/
+ doexe contrib/contacts/git-contacts
+ dodoc contrib/contacts/git-contacts.txt
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ dobin git-credential-gnome-keyring
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ dobin svn-fe
+ dodoc svn-fe.txt
+ use doc && doman svn-fe.1 && dohtml svn-fe.html
+ cd "${S}"
+ fi
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # completion - installed above
+ # credential/gnome-keyring TODO
+ # diff-highlight - done above
+ # emacs - installed above
+ # examples - these are stuff that is not used in Git anymore actually
+ # git-jump - done above
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
+ # patches - stuff the Git guys made to go upstream to other places
+ # persistent-https - TODO
+ # mw-to-git - TODO
+ # subtree - build seperately
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ for i in \
+ buildsystems convert-objects fast-import \
+ hg-to-git hooks remotes2config.sh rerere-train.sh \
+ stats workdir \
+ ; do
+ cp -rf \
+ "${S}"/contrib/${i} \
+ "${ED}"/usr/share/${PN}/contrib \
+ || die "Failed contrib ${i}"
+ done
+
+ if use perl && use cgi ; then
+ # We used to install in /usr/share/${PN}/gitweb
+ # but upstream installs in /usr/share/gitweb
+ # so we will install a symlink and use their location for compat with other
+ # distros
+ dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+ # INSTALL discusses configuration issues, not just installation
+ docinto /
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
+ newdoc "${S}"/gitweb/README README.gitweb
+
+ find "${ED}"/usr/lib64/perl5/ \
+ -name .packlist \
+ -exec rm \{\} \;
+ else
+ rm -rf "${ED}"/usr/share/gitweb
+ fi
+
+ if ! use subversion ; then
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ if use !prefix ; then
+ newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+ systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+ systemd_dounit "${FILESDIR}/git-daemon.socket"
+ fi
+
+ perl_delete_localpod
+}
+
+src_test() {
+ local disabled="" #t7004-tag.sh" #520270
+ local tests_cvs="t9200-git-cvsexportcommit.sh \
+ t9400-git-cvsserver-server.sh \
+ t9401-git-cvsserver-crlf.sh \
+ t9402-git-cvsserver-refs.sh \
+ t9600-cvsimport.sh \
+ t9601-cvsimport-vendor-branch.sh \
+ t9602-cvsimport-branches-tags.sh \
+ t9603-cvsimport-patchsets.sh \
+ t9604-cvsimport-timestamps.sh"
+ local tests_perl="t3701-add-interactive.sh \
+ t5502-quickfetch.sh \
+ t5512-ls-remote.sh \
+ t5520-pull.sh \
+ t7106-reset-unborn-branch.sh \
+ t7501-commit.sh"
+ # Bug #225601 - t0004 is not suitable for root perm
+ # Bug #219839 - t1004 is not suitable for root perm
+ # t0001-init.sh - check for init notices EPERM* fails
+ local tests_nonroot="t0001-init.sh \
+ t0004-unwritable.sh \
+ t0070-fundamental.sh \
+ t1004-read-tree-m-u-wf.sh \
+ t3700-add.sh \
+ t7300-clean.sh"
+ # t9100 still fails with symlinks in SVN 1.7
+ local test_svn="t9100-git-svn-basic.sh"
+
+ # Unzip is used only for the testcase code, not by any normal parts of Git.
+ if ! has_version app-arch/unzip ; then
+ einfo "Disabling tar-tree tests"
+ disabled="${disabled} t5000-tar-tree.sh"
+ fi
+
+ cvs=0
+ use cvs && let cvs=$cvs+1
+ if [[ ${EUID} -eq 0 ]]; then
+ if [[ $cvs -eq 1 ]]; then
+ ewarn "Skipping CVS tests because CVS does not work as root!"
+ ewarn "You should retest with FEATURES=userpriv!"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ einfo "Skipping other tests that require being non-root"
+ disabled="${disabled} ${tests_nonroot}"
+ else
+ [[ $cvs -gt 0 ]] && \
+ has_version dev-vcs/cvs && \
+ let cvs=$cvs+1
+ [[ $cvs -gt 1 ]] && \
+ has_version "dev-vcs/cvs[server]" && \
+ let cvs=$cvs+1
+ if [[ $cvs -lt 3 ]]; then
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ fi
+
+ if ! use perl ; then
+ einfo "Disabling tests that need Perl"
+ disabled="${disabled} ${tests_perl}"
+ fi
+
+ einfo "Disabling tests that fail with SVN 1.7"
+ disabled="${disabled} ${test_svn}"
+
+ # Reset all previously disabled tests
+ cd "${S}/t"
+ for i in *.sh.DISABLED ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+ done
+ einfo "Disabled tests:"
+ for i in ${disabled} ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+ done
+
+ # Avoid the test system removing the results because we want them ourselves
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+ -i "${S}"/t/Makefile
+
+ # Clean old results first, must always run
+ cd "${S}/t"
+ nonfatal git_emake clean
+
+ # Now run the tests, keep going if we hit an error, and don't terminate on
+ # failure
+ cd "${S}"
+ einfo "Start test run"
+ #MAKEOPTS=-j1
+ nonfatal git_emake --keep-going test
+ rc=$?
+
+ # Display nice results, now print the results
+ cd "${S}/t"
+ nonfatal git_emake aggregate-results
+
+ # And bail if there was a problem
+ [ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+ local pkg=$1
+ shift
+ elog " $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+ einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+ einfo "Note that the prompt bash code is now in that separate script"
+ elog "These additional scripts need some dependencies:"
+ echo
+ showpkgdeps git-quiltimport "dev-util/quilt"
+ showpkgdeps git-instaweb \
+ "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+ echo
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-2.3.9.ebuild b/dev-vcs/git/git-2.3.9.ebuild
index 8398898..739ff76 100644
--- a/dev-vcs/git/git-2.3.9.ebuild
+++ b/dev-vcs/git/git-2.3.9.ebuild
@@ -33,7 +33,7 @@
${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 ~arm64 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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm ~arm64 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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.4.10.ebuild b/dev-vcs/git/git-2.4.10.ebuild
new file mode 100644
index 0000000..352b93a
--- /dev/null
+++ b/dev-vcs/git/git-2.4.10.ebuild
@@ -0,0 +1,636 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI_SUFFIX="xz"
+ SRC_URI_GOOG="https://git-core.googlecode.com/files"
+ SRC_URI_KORG="mirror://kernel/software/scm/git"
+ SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ doc? (
+ ${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 ~arm64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+ dev-libs/openssl:0=
+ sys-libs/zlib
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl:=[-build(-)] )
+ tk? ( dev-lang/tk:0= )
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ emacs? ( virtual/emacs )
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
+
+RDEPEND="${CDEPEND}
+ gpg? ( app-crypt/gnupg )
+ mediawiki? (
+ dev-perl/HTML-Tree
+ dev-perl/MediaWiki-API
+ )
+ perl? ( dev-perl/Error
+ dev-perl/Net-SMTP-SSL
+ dev-perl/Authen-SASL
+ cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
+ cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
+ subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+ )
+ python? ( gtk?
+ (
+ >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+ >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+ )
+ ${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ sys-apps/texinfo
+ app-text/xmlto
+ )
+ nls? ( sys-devel/gettext )
+ test? ( app-crypt/gnupg )"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ cgi? ( perl )
+ cvs? ( perl )
+ mediawiki? ( perl )
+ subversion? ( perl )
+ webdav? ( curl )
+ gtk? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+pkg_setup() {
+ if use subversion && has_version "dev-vcs/subversion[dso]"; then
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+ ewarn "have been warned."
+ fi
+ if use python ; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+ local myopts
+
+ if use blksha1 ; then
+ myopts+=" BLK_SHA1=YesPlease"
+ elif use ppcsha1 ; then
+ myopts+=" PPC_SHA1=YesPlease"
+ fi
+
+ if use curl ; then
+ use webdav || myopts+=" NO_EXPAT=YesPlease"
+ else
+ myopts+=" NO_CURL=YesPlease"
+ fi
+
+ # broken assumptions, because of broken build system ...
+ myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts+=" INSTALL=install TAR=tar"
+ myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts+=" SANE_TOOL_PATH="
+ myopts+=" OLD_ICONV="
+ myopts+=" NO_EXTERNAL_GREP="
+
+ # For svn-fe
+ extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+ # can't define this to null, since the entire makefile depends on it
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+ use iconv \
+ || myopts+=" NO_ICONV=YesPlease"
+ use nls \
+ || myopts+=" NO_GETTEXT=YesPlease"
+ use tk \
+ || myopts+=" NO_TCLTK=YesPlease"
+ use pcre \
+ && myopts+=" USE_LIBPCRE=yes" \
+ && extlibs+=" -lpcre"
+ use perl \
+ && myopts+=" INSTALLDIRS=vendor" \
+ || myopts+=" NO_PERL=YesPlease"
+ use python \
+ || myopts+=" NO_PYTHON=YesPlease"
+ use subversion \
+ || myopts+=" NO_SVN_TESTS=YesPlease"
+ use threads \
+ && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+ || myopts+=" NO_PTHREADS=YesPlease"
+ use cvs \
+ || myopts+=" NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+# if [[ ${CHOST} == *-mint* ]] ; then
+# myopts+=" NO_MMAP=YesPlease"
+# myopts+=" NO_IPV6=YesPlease"
+# myopts+=" NO_STRLCPY=YesPlease"
+# myopts+=" NO_MEMMEM=YesPlease"
+# myopts+=" NO_MKDTEMP=YesPlease"
+# myopts+=" NO_MKSTEMPS=YesPlease"
+# fi
+ if [[ ${CHOST} == ia64-*-hpux* ]]; then
+ myopts+=" NO_NSEC=YesPlease"
+ fi
+ if [[ ${CHOST} == *-*-aix* ]]; then
+ myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
+ fi
+ if [[ ${CHOST} == *-solaris* ]]; then
+ myopts+=" NEEDS_LIBICONV=YesPlease"
+ fi
+
+ has_version '>=app-text/asciidoc-8.0' \
+ && myopts+=" ASCIIDOC8=YesPlease"
+ myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+ # Bug 290465:
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+ [[ "${CHOST}" == *-uclibc* ]] && \
+ myopts+=" NO_NSEC=YesPlease"
+
+ export MY_MAKEOPTS="${myopts}"
+ export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ use doc && \
+ cd "${S}"/Documentation && \
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ else
+ git-2_src_unpack
+ cd "${S}"
+ #cp "${FILESDIR}"/GIT-VERSION-GEN .
+ fi
+
+}
+
+src_prepare() {
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+ # install mediawiki perl modules also in vendor_dir
+ # hack, needs better upstream solution
+ epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+ epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+ epatch_user
+
+ sed -i \
+ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+ -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+ -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+ # Never install the private copy of Error.pm (bug #296310)
+ sed -i \
+ -e '/private-Error.pm/s,^,#,' \
+ perl/Makefile.PL
+
+ # Fix docbook2texi command
+ sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+ Documentation/Makefile || die "sed failed"
+
+ # Fix git-subtree missing DESTDIR
+ sed -i \
+ -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+ -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
+ contrib/subtree/Makefile
+}
+
+git_emake() {
+ # bug #326625: PERL_PATH, PERL_MM_OPT
+ # bug #320647: PYTHON_PATH
+ PYTHON_PATH=""
+ use python && PYTHON_PATH="${PYTHON}"
+ emake ${MY_MAKEOPTS} \
+ DESTDIR="${D}" \
+ OPTCFLAGS="${CFLAGS}" \
+ OPTLDFLAGS="${LDFLAGS}" \
+ OPTCC="$(tc-getCC)" \
+ OPTAR="$(tc-getAR)" \
+ prefix="${EPREFIX}"/usr \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ sysconfdir="${EPREFIX}"/etc \
+ PYTHON_PATH="${PYTHON_PATH}" \
+ PERL_MM_OPT="" \
+ GIT_TEST_OPTS="--no-color" \
+ V=1 \
+ "$@"
+ # This is the fix for bug #326625, but it also causes breakage, see bug
+ # #352693.
+ # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+ exportmakeopts
+}
+
+src_compile() {
+ if use perl ; then
+ git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+ git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+ fi
+ git_emake || die "emake failed"
+
+ if use emacs ; then
+ elisp-compile contrib/emacs/git{,-blame}.el
+ fi
+
+ if use perl && use cgi ; then
+ git_emake \
+ gitweb \
+ || die "emake gitweb (cgi) failed"
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+ git_emake || die "emake credential-osxkeychain"
+ fi
+
+ cd "${S}"/Documentation
+ if [[ ${PV} == *9999 ]] ; then
+ git_emake man \
+ || die "emake man failed"
+ if use doc ; then
+ git_emake info html \
+ || die "emake info html failed"
+ fi
+ else
+ if use doc ; then
+ git_emake info \
+ || die "emake info html failed"
+ fi
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ # by defining EXTLIBS we override the detection for libintl and
+ # libiconv, bug #516168
+ local nlsiconv=
+ use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+ use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+ if use doc ; then
+ git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+ fi
+ cd "${S}"
+ fi
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ git_emake || die "emake git-credential-gnome-keyring failed"
+ fi
+
+ cd "${S}"/contrib/subtree
+ git_emake
+ use doc && git_emake doc
+
+ if use mediawiki ; then
+ cd "${S}"/contrib/mw-to-git
+ git_emake
+ fi
+}
+
+src_install() {
+ git_emake \
+ install || \
+ die "make install failed"
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+ fi
+
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+ dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ use doc && dodir /usr/share/doc/${PF}/html
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ use doc && dohtml -p ${d} Documentation${d}*.html
+ done
+ docinto /
+ # Upstream does not ship this pre-built :-(
+ use doc && doinfo Documentation/{git,gitman}.info
+
+ newbashcomp contrib/completion/git-completion.bash ${PN}
+ bashcomp_alias git gitk
+ # Not really a bash-completion file (bug #477920)
+ # but still needed uncompressed (bug #507480)
+ insinto /usr/share/${PN}
+ doins contrib/completion/git-prompt.sh
+
+ if use emacs ; then
+ elisp-install ${PN} contrib/emacs/git.{el,elc}
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+ # don't add automatically to the load-path, so the sitefile
+ # can do a conditional loading
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ fi
+
+ if use python && use gtk ; then
+ python_doscript "${S}"/contrib/gitview/gitview
+ dodoc "${S}"/contrib/gitview/gitview.txt
+ fi
+
+ #dobin contrib/fast-import/git-p4 # Moved upstream
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream
+ newbin contrib/fast-import/import-tars.perl import-tars
+ exeinto /usr/libexec/git-core/
+ newexe contrib/git-resurrect.sh git-resurrect
+
+ # git-subtree
+ cd "${S}"/contrib/subtree
+ git_emake install || die "Failed to emake install git-subtree"
+ if use doc ; then
+ git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+ fi
+ newdoc README README.git-subtree
+ dodoc git-subtree.txt
+ cd "${S}"
+
+ if use mediawiki ; then
+ cd "${S}"/contrib/mw-to-git
+ git_emake install
+ cd "${S}"
+ fi
+
+ # diff-highlight
+ dobin contrib/diff-highlight/diff-highlight
+ newdoc contrib/diff-highlight/README README.diff-highlight
+
+ # git-jump
+ exeinto /usr/libexec/git-core/
+ doexe contrib/git-jump/git-jump
+ newdoc contrib/git-jump/README git-jump.txt
+
+ # git-contacts
+ exeinto /usr/libexec/git-core/
+ doexe contrib/contacts/git-contacts
+ dodoc contrib/contacts/git-contacts.txt
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ dobin git-credential-gnome-keyring
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ dobin svn-fe
+ dodoc svn-fe.txt
+ use doc && doman svn-fe.1 && dohtml svn-fe.html
+ cd "${S}"
+ fi
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # completion - installed above
+ # credential/gnome-keyring TODO
+ # diff-highlight - done above
+ # emacs - installed above
+ # examples - these are stuff that is not used in Git anymore actually
+ # git-jump - done above
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
+ # patches - stuff the Git guys made to go upstream to other places
+ # persistent-https - TODO
+ # mw-to-git - TODO
+ # subtree - build seperately
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ for i in \
+ buildsystems convert-objects fast-import \
+ hg-to-git hooks remotes2config.sh rerere-train.sh \
+ stats workdir \
+ ; do
+ cp -rf \
+ "${S}"/contrib/${i} \
+ "${ED}"/usr/share/${PN}/contrib \
+ || die "Failed contrib ${i}"
+ done
+
+ if use perl && use cgi ; then
+ # We used to install in /usr/share/${PN}/gitweb
+ # but upstream installs in /usr/share/gitweb
+ # so we will install a symlink and use their location for compat with other
+ # distros
+ dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+ # INSTALL discusses configuration issues, not just installation
+ docinto /
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
+ newdoc "${S}"/gitweb/README README.gitweb
+
+ find "${ED}"/usr/lib64/perl5/ \
+ -name .packlist \
+ -exec rm \{\} \;
+ else
+ rm -rf "${ED}"/usr/share/gitweb
+ fi
+
+ if ! use subversion ; then
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ if use !prefix ; then
+ newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+ systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+ systemd_dounit "${FILESDIR}/git-daemon.socket"
+ fi
+
+ perl_delete_localpod
+}
+
+src_test() {
+ local disabled="" #t7004-tag.sh" #520270
+ local tests_cvs="t9200-git-cvsexportcommit.sh \
+ t9400-git-cvsserver-server.sh \
+ t9401-git-cvsserver-crlf.sh \
+ t9402-git-cvsserver-refs.sh \
+ t9600-cvsimport.sh \
+ t9601-cvsimport-vendor-branch.sh \
+ t9602-cvsimport-branches-tags.sh \
+ t9603-cvsimport-patchsets.sh \
+ t9604-cvsimport-timestamps.sh"
+ local tests_perl="t3701-add-interactive.sh \
+ t5502-quickfetch.sh \
+ t5512-ls-remote.sh \
+ t5520-pull.sh \
+ t7106-reset-unborn-branch.sh \
+ t7501-commit.sh"
+ # Bug #225601 - t0004 is not suitable for root perm
+ # Bug #219839 - t1004 is not suitable for root perm
+ # t0001-init.sh - check for init notices EPERM* fails
+ local tests_nonroot="t0001-init.sh \
+ t0004-unwritable.sh \
+ t0070-fundamental.sh \
+ t1004-read-tree-m-u-wf.sh \
+ t3700-add.sh \
+ t7300-clean.sh"
+ # t9100 still fails with symlinks in SVN 1.7
+ local test_svn="t9100-git-svn-basic.sh"
+
+ # Unzip is used only for the testcase code, not by any normal parts of Git.
+ if ! has_version app-arch/unzip ; then
+ einfo "Disabling tar-tree tests"
+ disabled="${disabled} t5000-tar-tree.sh"
+ fi
+
+ cvs=0
+ use cvs && let cvs=$cvs+1
+ if [[ ${EUID} -eq 0 ]]; then
+ if [[ $cvs -eq 1 ]]; then
+ ewarn "Skipping CVS tests because CVS does not work as root!"
+ ewarn "You should retest with FEATURES=userpriv!"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ einfo "Skipping other tests that require being non-root"
+ disabled="${disabled} ${tests_nonroot}"
+ else
+ [[ $cvs -gt 0 ]] && \
+ has_version dev-vcs/cvs && \
+ let cvs=$cvs+1
+ [[ $cvs -gt 1 ]] && \
+ has_version "dev-vcs/cvs[server]" && \
+ let cvs=$cvs+1
+ if [[ $cvs -lt 3 ]]; then
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ fi
+
+ if ! use perl ; then
+ einfo "Disabling tests that need Perl"
+ disabled="${disabled} ${tests_perl}"
+ fi
+
+ einfo "Disabling tests that fail with SVN 1.7"
+ disabled="${disabled} ${test_svn}"
+
+ # Reset all previously disabled tests
+ cd "${S}/t"
+ for i in *.sh.DISABLED ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+ done
+ einfo "Disabled tests:"
+ for i in ${disabled} ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+ done
+
+ # Avoid the test system removing the results because we want them ourselves
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+ -i "${S}"/t/Makefile
+
+ # Clean old results first, must always run
+ cd "${S}/t"
+ nonfatal git_emake clean
+
+ # Now run the tests, keep going if we hit an error, and don't terminate on
+ # failure
+ cd "${S}"
+ einfo "Start test run"
+ #MAKEOPTS=-j1
+ nonfatal git_emake --keep-going test
+ rc=$?
+
+ # Display nice results, now print the results
+ cd "${S}/t"
+ nonfatal git_emake aggregate-results
+
+ # And bail if there was a problem
+ [ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+ local pkg=$1
+ shift
+ elog " $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+ einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+ einfo "Note that the prompt bash code is now in that separate script"
+ elog "These additional scripts need some dependencies:"
+ echo
+ showpkgdeps git-quiltimport "dev-util/quilt"
+ showpkgdeps git-instaweb \
+ "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+ echo
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-2.4.9.ebuild b/dev-vcs/git/git-2.4.9.ebuild
index 4d2e41c..0c71a90 100644
--- a/dev-vcs/git/git-2.4.9.ebuild
+++ b/dev-vcs/git/git-2.4.9.ebuild
@@ -33,7 +33,7 @@
${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 ~arm64 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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm ~arm64 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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.6.0.ebuild b/dev-vcs/git/git-2.5.4.ebuild
similarity index 100%
rename from dev-vcs/git/git-2.6.0.ebuild
rename to dev-vcs/git/git-2.5.4.ebuild
diff --git a/dev-vcs/git/git-2.6.1-r2.ebuild b/dev-vcs/git/git-2.6.1-r2.ebuild
new file mode 100644
index 0000000..b7cc65b
--- /dev/null
+++ b/dev-vcs/git/git-2.6.1-r2.ebuild
@@ -0,0 +1,643 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI_SUFFIX="xz"
+ SRC_URI_GOOG="https://git-core.googlecode.com/files"
+ SRC_URI_KORG="mirror://kernel/software/scm/git"
+ SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ doc? (
+ ${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 ~arm64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ sys-libs/zlib
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl:=[-build(-)] )
+ tk? ( dev-lang/tk:0= )
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ emacs? ( virtual/emacs )
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
+
+RDEPEND="${CDEPEND}
+ gpg? ( app-crypt/gnupg )
+ mediawiki? (
+ dev-perl/HTML-Tree
+ dev-perl/MediaWiki-API
+ )
+ perl? ( dev-perl/Error
+ dev-perl/Net-SMTP-SSL
+ dev-perl/Authen-SASL
+ cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
+ cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
+ subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+ )
+ python? ( gtk?
+ (
+ >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+ >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+ )
+ ${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ sys-apps/texinfo
+ app-text/xmlto
+ )
+ nls? ( sys-devel/gettext )
+ test? ( app-crypt/gnupg )"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ cgi? ( perl )
+ cvs? ( perl )
+ mediawiki? ( perl )
+ subversion? ( perl )
+ webdav? ( curl )
+ gtk? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+pkg_setup() {
+ if use subversion && has_version "dev-vcs/subversion[dso]"; then
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+ ewarn "have been warned."
+ fi
+ if use python ; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+ local myopts
+
+ if use blksha1 ; then
+ myopts+=" BLK_SHA1=YesPlease"
+ elif use ppcsha1 ; then
+ myopts+=" PPC_SHA1=YesPlease"
+ fi
+
+ if use curl ; then
+ use webdav || myopts+=" NO_EXPAT=YesPlease"
+ else
+ myopts+=" NO_CURL=YesPlease"
+ fi
+
+ # broken assumptions, because of broken build system ...
+ myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts+=" INSTALL=install TAR=tar"
+ myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts+=" SANE_TOOL_PATH="
+ myopts+=" OLD_ICONV="
+ myopts+=" NO_EXTERNAL_GREP="
+
+ # For svn-fe
+ extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+ # can't define this to null, since the entire makefile depends on it
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+ use iconv \
+ || myopts+=" NO_ICONV=YesPlease"
+ use nls \
+ || myopts+=" NO_GETTEXT=YesPlease"
+ use tk \
+ || myopts+=" NO_TCLTK=YesPlease"
+ use pcre \
+ && myopts+=" USE_LIBPCRE=yes" \
+ && extlibs+=" -lpcre"
+ use perl \
+ && myopts+=" INSTALLDIRS=vendor" \
+ || myopts+=" NO_PERL=YesPlease"
+ use python \
+ || myopts+=" NO_PYTHON=YesPlease"
+ use subversion \
+ || myopts+=" NO_SVN_TESTS=YesPlease"
+ use threads \
+ && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+ || myopts+=" NO_PTHREADS=YesPlease"
+ use cvs \
+ || myopts+=" NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+# if [[ ${CHOST} == *-mint* ]] ; then
+# myopts+=" NO_MMAP=YesPlease"
+# myopts+=" NO_IPV6=YesPlease"
+# myopts+=" NO_STRLCPY=YesPlease"
+# myopts+=" NO_MEMMEM=YesPlease"
+# myopts+=" NO_MKDTEMP=YesPlease"
+# myopts+=" NO_MKSTEMPS=YesPlease"
+# fi
+ if [[ ${CHOST} == ia64-*-hpux* ]]; then
+ myopts+=" NO_NSEC=YesPlease"
+ fi
+ if [[ ${CHOST} == *-*-aix* ]]; then
+ myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
+ fi
+ if [[ ${CHOST} == *-solaris* ]]; then
+ myopts+=" NEEDS_LIBICONV=YesPlease"
+ fi
+
+ has_version '>=app-text/asciidoc-8.0' \
+ && myopts+=" ASCIIDOC8=YesPlease"
+ myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+ # Bug 290465:
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+ [[ "${CHOST}" == *-uclibc* ]] && \
+ myopts+=" NO_NSEC=YesPlease"
+
+ export MY_MAKEOPTS="${myopts}"
+ export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ use doc && \
+ cd "${S}"/Documentation && \
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ else
+ git-2_src_unpack
+ cd "${S}"
+ #cp "${FILESDIR}"/GIT-VERSION-GEN .
+ fi
+
+}
+
+src_prepare() {
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+ # install mediawiki perl modules also in vendor_dir
+ # hack, needs better upstream solution
+ epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+ epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+ # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+ epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+
+ epatch "${FILESDIR}"/${PN}-2.6.0-send-email_connection_closed_fix.patch
+ epatch "${FILESDIR}"/${PN}-2.6.0-am_configure_gpg_at_startup.patch #561796
+
+ epatch_user
+
+ sed -i \
+ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+ -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+ -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+ # Never install the private copy of Error.pm (bug #296310)
+ sed -i \
+ -e '/private-Error.pm/s,^,#,' \
+ perl/Makefile.PL
+
+ # Fix docbook2texi command
+ sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+ Documentation/Makefile || die "sed failed"
+
+ # Fix git-subtree missing DESTDIR
+ sed -i \
+ -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+ -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
+ contrib/subtree/Makefile
+}
+
+git_emake() {
+ # bug #326625: PERL_PATH, PERL_MM_OPT
+ # bug #320647: PYTHON_PATH
+ PYTHON_PATH=""
+ use python && PYTHON_PATH="${PYTHON}"
+ emake ${MY_MAKEOPTS} \
+ DESTDIR="${D}" \
+ OPTCFLAGS="${CFLAGS}" \
+ OPTLDFLAGS="${LDFLAGS}" \
+ OPTCC="$(tc-getCC)" \
+ OPTAR="$(tc-getAR)" \
+ prefix="${EPREFIX}"/usr \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ sysconfdir="${EPREFIX}"/etc \
+ PYTHON_PATH="${PYTHON_PATH}" \
+ PERL_MM_OPT="" \
+ GIT_TEST_OPTS="--no-color" \
+ V=1 \
+ "$@"
+ # This is the fix for bug #326625, but it also causes breakage, see bug
+ # #352693.
+ # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+ exportmakeopts
+}
+
+src_compile() {
+ if use perl ; then
+ git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+ git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+ fi
+ git_emake || die "emake failed"
+
+ if use emacs ; then
+ elisp-compile contrib/emacs/git{,-blame}.el
+ fi
+
+ if use perl && use cgi ; then
+ git_emake \
+ gitweb \
+ || die "emake gitweb (cgi) failed"
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+ git_emake || die "emake credential-osxkeychain"
+ fi
+
+ cd "${S}"/Documentation
+ if [[ ${PV} == *9999 ]] ; then
+ git_emake man \
+ || die "emake man failed"
+ if use doc ; then
+ git_emake info html \
+ || die "emake info html failed"
+ fi
+ else
+ if use doc ; then
+ git_emake info \
+ || die "emake info html failed"
+ fi
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ # by defining EXTLIBS we override the detection for libintl and
+ # libiconv, bug #516168
+ local nlsiconv=
+ use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+ use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+ if use doc ; then
+ git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+ fi
+ cd "${S}"
+ fi
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ git_emake || die "emake git-credential-gnome-keyring failed"
+ fi
+
+ cd "${S}"/contrib/subtree
+ git_emake
+ use doc && git_emake doc
+
+ if use mediawiki ; then
+ cd "${S}"/contrib/mw-to-git
+ git_emake
+ fi
+}
+
+src_install() {
+ git_emake \
+ install || \
+ die "make install failed"
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+ fi
+
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+ dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ use doc && dodir /usr/share/doc/${PF}/html
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ use doc && dohtml -p ${d} Documentation${d}*.html
+ done
+ docinto /
+ # Upstream does not ship this pre-built :-(
+ use doc && doinfo Documentation/{git,gitman}.info
+
+ newbashcomp contrib/completion/git-completion.bash ${PN}
+ bashcomp_alias git gitk
+ # Not really a bash-completion file (bug #477920)
+ # but still needed uncompressed (bug #507480)
+ insinto /usr/share/${PN}
+ doins contrib/completion/git-prompt.sh
+
+ if use emacs ; then
+ elisp-install ${PN} contrib/emacs/git.{el,elc}
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+ # don't add automatically to the load-path, so the sitefile
+ # can do a conditional loading
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ fi
+
+ if use python && use gtk ; then
+ python_doscript "${S}"/contrib/gitview/gitview
+ dodoc "${S}"/contrib/gitview/gitview.txt
+ fi
+
+ #dobin contrib/fast-import/git-p4 # Moved upstream
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream
+ newbin contrib/fast-import/import-tars.perl import-tars
+ exeinto /usr/libexec/git-core/
+ newexe contrib/git-resurrect.sh git-resurrect
+
+ # git-subtree
+ cd "${S}"/contrib/subtree
+ git_emake install || die "Failed to emake install git-subtree"
+ if use doc ; then
+ git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+ fi
+ newdoc README README.git-subtree
+ dodoc git-subtree.txt
+ cd "${S}"
+
+ if use mediawiki ; then
+ cd "${S}"/contrib/mw-to-git
+ git_emake install
+ cd "${S}"
+ fi
+
+ # diff-highlight
+ dobin contrib/diff-highlight/diff-highlight
+ newdoc contrib/diff-highlight/README README.diff-highlight
+
+ # git-jump
+ exeinto /usr/libexec/git-core/
+ doexe contrib/git-jump/git-jump
+ newdoc contrib/git-jump/README git-jump.txt
+
+ # git-contacts
+ exeinto /usr/libexec/git-core/
+ doexe contrib/contacts/git-contacts
+ dodoc contrib/contacts/git-contacts.txt
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ dobin git-credential-gnome-keyring
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ dobin svn-fe
+ dodoc svn-fe.txt
+ use doc && doman svn-fe.1 && dohtml svn-fe.html
+ cd "${S}"
+ fi
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # completion - installed above
+ # credential/gnome-keyring TODO
+ # diff-highlight - done above
+ # emacs - installed above
+ # examples - these are stuff that is not used in Git anymore actually
+ # git-jump - done above
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
+ # patches - stuff the Git guys made to go upstream to other places
+ # persistent-https - TODO
+ # mw-to-git - TODO
+ # subtree - build seperately
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ for i in \
+ buildsystems convert-objects fast-import \
+ hg-to-git hooks remotes2config.sh rerere-train.sh \
+ stats workdir \
+ ; do
+ cp -rf \
+ "${S}"/contrib/${i} \
+ "${ED}"/usr/share/${PN}/contrib \
+ || die "Failed contrib ${i}"
+ done
+
+ if use perl && use cgi ; then
+ # We used to install in /usr/share/${PN}/gitweb
+ # but upstream installs in /usr/share/gitweb
+ # so we will install a symlink and use their location for compat with other
+ # distros
+ dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+ # INSTALL discusses configuration issues, not just installation
+ docinto /
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
+ newdoc "${S}"/gitweb/README README.gitweb
+
+ find "${ED}"/usr/lib64/perl5/ \
+ -name .packlist \
+ -exec rm \{\} \;
+ else
+ rm -rf "${ED}"/usr/share/gitweb
+ fi
+
+ if ! use subversion ; then
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ if use !prefix ; then
+ newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+ systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+ systemd_dounit "${FILESDIR}/git-daemon.socket"
+ fi
+
+ perl_delete_localpod
+}
+
+src_test() {
+ local disabled="" #t7004-tag.sh" #520270
+ local tests_cvs="t9200-git-cvsexportcommit.sh \
+ t9400-git-cvsserver-server.sh \
+ t9401-git-cvsserver-crlf.sh \
+ t9402-git-cvsserver-refs.sh \
+ t9600-cvsimport.sh \
+ t9601-cvsimport-vendor-branch.sh \
+ t9602-cvsimport-branches-tags.sh \
+ t9603-cvsimport-patchsets.sh \
+ t9604-cvsimport-timestamps.sh"
+ local tests_perl="t3701-add-interactive.sh \
+ t5502-quickfetch.sh \
+ t5512-ls-remote.sh \
+ t5520-pull.sh \
+ t7106-reset-unborn-branch.sh \
+ t7501-commit.sh"
+ # Bug #225601 - t0004 is not suitable for root perm
+ # Bug #219839 - t1004 is not suitable for root perm
+ # t0001-init.sh - check for init notices EPERM* fails
+ local tests_nonroot="t0001-init.sh \
+ t0004-unwritable.sh \
+ t0070-fundamental.sh \
+ t1004-read-tree-m-u-wf.sh \
+ t3700-add.sh \
+ t7300-clean.sh"
+ # t9100 still fails with symlinks in SVN 1.7
+ local test_svn="t9100-git-svn-basic.sh"
+
+ # Unzip is used only for the testcase code, not by any normal parts of Git.
+ if ! has_version app-arch/unzip ; then
+ einfo "Disabling tar-tree tests"
+ disabled="${disabled} t5000-tar-tree.sh"
+ fi
+
+ cvs=0
+ use cvs && let cvs=$cvs+1
+ if [[ ${EUID} -eq 0 ]]; then
+ if [[ $cvs -eq 1 ]]; then
+ ewarn "Skipping CVS tests because CVS does not work as root!"
+ ewarn "You should retest with FEATURES=userpriv!"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ einfo "Skipping other tests that require being non-root"
+ disabled="${disabled} ${tests_nonroot}"
+ else
+ [[ $cvs -gt 0 ]] && \
+ has_version dev-vcs/cvs && \
+ let cvs=$cvs+1
+ [[ $cvs -gt 1 ]] && \
+ has_version "dev-vcs/cvs[server]" && \
+ let cvs=$cvs+1
+ if [[ $cvs -lt 3 ]]; then
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ fi
+
+ if ! use perl ; then
+ einfo "Disabling tests that need Perl"
+ disabled="${disabled} ${tests_perl}"
+ fi
+
+ einfo "Disabling tests that fail with SVN 1.7"
+ disabled="${disabled} ${test_svn}"
+
+ # Reset all previously disabled tests
+ cd "${S}/t"
+ for i in *.sh.DISABLED ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+ done
+ einfo "Disabled tests:"
+ for i in ${disabled} ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+ done
+
+ # Avoid the test system removing the results because we want them ourselves
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+ -i "${S}"/t/Makefile
+
+ # Clean old results first, must always run
+ cd "${S}/t"
+ nonfatal git_emake clean
+
+ # Now run the tests, keep going if we hit an error, and don't terminate on
+ # failure
+ cd "${S}"
+ einfo "Start test run"
+ #MAKEOPTS=-j1
+ nonfatal git_emake --keep-going test
+ rc=$?
+
+ # Display nice results, now print the results
+ cd "${S}/t"
+ nonfatal git_emake aggregate-results
+
+ # And bail if there was a problem
+ [ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+ local pkg=$1
+ shift
+ elog " $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+ einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+ einfo "Note that the prompt bash code is now in that separate script"
+ elog "These additional scripts need some dependencies:"
+ echo
+ showpkgdeps git-quiltimport "dev-util/quilt"
+ showpkgdeps git-instaweb \
+ "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+ echo
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/hgsubversion/Manifest b/dev-vcs/hgsubversion/Manifest
index fc79b5e..fc1511e 100644
--- a/dev-vcs/hgsubversion/Manifest
+++ b/dev-vcs/hgsubversion/Manifest
@@ -1,6 +1,3 @@
DIST hgsubversion-1.4.tar.gz 133564 SHA256 e3febee217ce321d316712c4c75236dcc2f2769c329c687114e2c37d303f1c0f SHA512 23305b210e2f51cbcd866a5d87caa23f8e5d405532b3139f5700572f13f5a52c1699d937e8c87a8580274ddc1240f51b773334083ced44da98fe7bf270f006fb WHIRLPOOL 5c7b4b9a5537ce4b65f806db23ab4e0ad920b394b44a015d8144c8da9456ad3ed8f3cc8911d539a2488fbd1e446aa7cb6ad5af0c195461ad580ee497cf793a91
-DIST hgsubversion-1.6.1.tar.gz 173184 SHA256 bb2787259a5f9716fe4ff4f6a4e6170fb8109c6f74550cbd92ec314d8d4278a0 SHA512 0f8e50a7445b85ad6a4984d22b976d55ebf6e15ade85aed2ae87aaf7914bcc9fbb4bd68347b1377ca2d0d307de31cbcc5e2b3691327ab9463401a1c5eee8a6f2 WHIRLPOOL c581de56a6ae5cf98ab78c8f61e1f1f1f7df895be582ccad94e05675965770aaee7e51371a14059dd2bbbc29407697dcfe1341c564cced8377283b75e0569752
-DIST hgsubversion-1.6.3.tar.gz 177625 SHA256 915f4415208f61ae7dc551da94a3c6269805af0558945a9f2736e60b0a6190c5 SHA512 b94c5febced30a6d199307ea7ff53b737e287055a97ddc539eb982efd357e8eac97bed52404099ec537ca84ff4a29a109ba88d658dfc0df38128ee1727cf3465 WHIRLPOOL 7a7970cbd223311629cb889389ffe6c48a76d54554c736fe66c025151fdad4f0083216b6465e3734319abfe0a0eb4823812652d8236ce58c20ce90baf5fa9299
-DIST hgsubversion-1.7.tar.gz 179852 SHA256 87ac8ad36dc4252202a3138a1a126710bb8f6783c9806ea408bcb8f467daf292 SHA512 a80884df901d8233ae1e59040dd272b904e6f52bcfa5a3b804e5e2b49dad75c253f1c9efe61f2dbd587f901dac0e0704e618297a975665eed8d6fc6042cd8e49 WHIRLPOOL cab9f0ce016bc1336096aa75f696664524afd391aedfded0455b006f92ed7e5b04d79b2056d3b1892fc6d02c1954edfb21495d5042296a5fe51556a0ec923494
DIST hgsubversion-1.8.2.tar.gz 179341 SHA256 1725a02f4334eceb4930cc0aee46556e11b38515e9b742be3ac3b7dcf9fbf699 SHA512 4e94e5daaf252ecbbda331e5d022be4cc24b6c6cd7ae49eb19e0acd57aa926e0a68bb9f1ef69b43b074af6dc5764ff56a4bc018c2036c2dd8fcbd8e264d78581 WHIRLPOOL 204c0f3e3a680fce42cb4b1d6ed2f394a76197279cf42042908dcf565c04419c4958f6fc7b9eba050bab791e6a2ef28c22364ceabed99650a9011aa408414da8
-DIST hgsubversion-1.8.tar.gz 179375 SHA256 f8e4d1b4fc8621b8ed782f74a6328c76dabec1385d4f732f2a15d4efd27201b1 SHA512 dd38722f771e9fa4b56e8921064c7b819bb9c0483aaef48de7414531c1cc1fa3802ef3870ef22c59526afa6aa10459c0ea9f8ef1b6e3f20b41c8457c644433f9 WHIRLPOOL f70c6061e1f6dda053b65e896a7fd8ac133f08a256d0b3b47910c5b477583f0a921e76efcb557019291c6fb810293d740f8f561b56800b41ac00c050cde9b0ef
+DIST hgsubversion-1.8.3.tar.gz 179464 SHA256 8a64bff00146bd7e03432f802f6b555cdf502d955a7f893c2e30f6b47079998d SHA512 dd712f39b2851b2466a6776cb986eddd92e32ad3b5be22e4429ab5f7a684982c4d2b3a6752fc16ac4211c4a2237f721b8672d8943bc297f591997345975ecd65 WHIRLPOOL 57848cfd343b7c9db41b0265bd05fb1bc7c5180a1704d45e51363d9e7586fb69d210302d3d7474dcbbd5ec3a611641c9c91a870edc5332fe777ad4932596206c
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.6.3.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.6.3.ebuild
deleted file mode 100644
index d256459..0000000
--- a/dev-vcs/hgsubversion/hgsubversion-1.6.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.python.org/pypi/hgsubversion"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-
-# although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
-RDEPEND=">=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
- dev-vcs/mercurial[${PYTHON_USEDEP}]
- || (
- >=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
- >=dev-vcs/subversion-1.5[python] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( README )
-
-#python_test() {
-# "${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
-#}
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.7.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.7.ebuild
deleted file mode 100644
index d256459..0000000
--- a/dev-vcs/hgsubversion/hgsubversion-1.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.python.org/pypi/hgsubversion"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-
-# although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
-RDEPEND=">=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
- dev-vcs/mercurial[${PYTHON_USEDEP}]
- || (
- >=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
- >=dev-vcs/subversion-1.5[python] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( README )
-
-#python_test() {
-# "${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
-#}
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.6.1.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.3.ebuild
similarity index 100%
rename from dev-vcs/hgsubversion/hgsubversion-1.6.1.ebuild
rename to dev-vcs/hgsubversion/hgsubversion-1.8.3.ebuild
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.ebuild
deleted file mode 100644
index 4be605f..0000000
--- a/dev-vcs/hgsubversion/hgsubversion-1.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.python.org/pypi/hgsubversion"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-
-# although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
-RDEPEND=">=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
- dev-vcs/mercurial[${PYTHON_USEDEP}]
- || (
- >=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
- >=dev-vcs/subversion-1.5[python] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( README )
-
-#python_test() {
-# "${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
-#}
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 3b58829..7435a3b 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -2,4 +2,4 @@
DIST tortoisehg-3.3.3.tar.gz 8230380 SHA256 a22ec794b0152b25b085447a253594dde27f71863149b9471ec70669687fb47f SHA512 ed15a2ce76647f6c2d9df2daebc62f983eec6a27ea15a808060d83968cfee2c22f643b2ed6fb48bf06dd5d7cb9f4178e756e539eec2ca43e74fe4c8cfc7da4cf WHIRLPOOL d069dbe4ca109aaf2ebf9dd73f2d87343c2c71a8d5a894a5b7278a5edc878aa7eda56f9d53dca8968d1e730eea94a9f814a5cd76fb4af522a506753a5342cb47
DIST tortoisehg-3.4.2.tar.gz 8205349 SHA256 d22692166dc6ff61c9d12bfe5ceb77fbf87e7dd52222c956976e7987d84145a1 SHA512 f771536508f1c72c15b1fe7fbf5b3ef6dafbb14314db45776632231dd2d74b46b862476fe78505a08b2271c2ce6419926e6090a2e0a6451da60314ba154fe9f4 WHIRLPOOL cfe0db33da10b2fcafff3e831937488a276924420cfff8a50396e0109c3edef7fb182036d38b72ff8fbf6aafae714eb1b6c4caf109938361babf04eed3addce4
DIST tortoisehg-3.5.1.tar.gz 7396361 SHA256 49ce7b492f38b54b0095d79b8122fb4f4d60947e2d5ac68072a70526ef0a6450 SHA512 24706bbc8eb92380b643488066b922b8c6fc460caedac447e9fb6803b22ffc4039e918a892052a0b2fcdc2d22e5b334d338728076f89a1d4fbc8699ac1f721eb WHIRLPOOL 523ae72ba483dc171f8b9de92500ca71d6e22c9e485aec0d33a3d710b7fad899a9b4342eab4938d2cb40e9b1350b42f7a5f8921444cc97a1225161bd6762e48f
-DIST tortoisehg-3.5.tar.gz 7395688 SHA256 b072180ad851c6c04b003a75ee995a6e1a6cbe7d7a26e86398fd0b32f55194de SHA512 83c6243cb186abec78a63787afb13005effde24f30b00e75cfa66103c5511b4491022916cc5765393f361643a1fbb5c810597b3b114be07a4fd5204736564486 WHIRLPOOL 4d2e61ab87ced1211f52a6ba8c342bd7bc0431c2494baab2e288520d2f9cdcaf8d04e27490c6425712a07516521087e753708ef87784d3a00b25490ace133c00
+DIST tortoisehg-3.5.2.tar.gz 7399407 SHA256 f5d36d8f19b508dd00a7ac720af3889defd40e99fcb60d907a0fefb9c867dd63 SHA512 43ab341b4b01b2b28a9ac4290c9902720a10094390d323ab0c4e0962276cd333def7bec818e59a8bbacac9390cb22fd310875eb58f7092573c1254c517ada310 WHIRLPOOL c49707205e06fe269be3c69330d78ca8194a54d709b9056bea502403b4e047a1da46f1cd73ca5d7b052aab6f0d4b3ae4aa93f0544b78f12a6a9ffd8459edfb37
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.5.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.5.2.ebuild
similarity index 100%
rename from dev-vcs/tortoisehg/tortoisehg-3.5.ebuild
rename to dev-vcs/tortoisehg/tortoisehg-3.5.2.ebuild
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 0b7293f..91d3193 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -1,8 +1,5 @@
-# Eclass for building dev-java/ant-* packages
-#
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Vlastimil Babka <caster@gentoo.org>
# $Id$
# @ECLASS: ant-tasks.eclass
diff --git a/eclass/games.eclass b/eclass/games.eclass
index 03421b3..7d231e1 100644
--- a/eclass/games.eclass
+++ b/eclass/games.eclass
@@ -247,14 +247,14 @@
find "${D}/${dir}" -type f -print0 | xargs -0 chmod $mode
# common trees should not be games owned #264872 #537580
- fowners root:root "${dir}"
+ fowners root:0 "${dir}"
fperms 755 "${dir}"
if [[ ${dir} == "${GAMES_PREFIX}" \
|| ${dir} == "${GAMES_PREFIX_OPT}" ]] ; then
for d in $(get_libdir) bin ; do
# check if dirs exist to avoid "nonfatal" option
if [[ -e ${D}/${dir}/${d} ]] ; then
- fowners root:root "${dir}/${d}"
+ fowners root:0 "${dir}/${d}"
fperms 755 "${dir}/${d}"
fi
done
diff --git a/eclass/gdesklets.eclass b/eclass/gdesklets.eclass
index 4b2bb88..378dd13 100644
--- a/eclass/gdesklets.eclass
+++ b/eclass/gdesklets.eclass
@@ -1,5 +1,5 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
# $Id$
# @ECLASS: gdesklets.eclass
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 476fb28..59ab586 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -15,7 +15,7 @@
# * GConf schemas management
# * scrollkeeper (old Gnome help system) management
-inherit multilib
+inherit eutils multilib
case "${EAPI:-0}" in
0|1|2|3|4|5) ;;
@@ -431,7 +431,7 @@
fi
ebegin "Updating gdk-pixbuf loader cache"
- local tmp_file=$(mktemp -t tmp.XXXXXXXXXX_gdkpixbuf)
+ local tmp_file=$(emktemp)
${updater} 1> "${tmp_file}" &&
chmod 0644 "${tmp_file}" &&
cp -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" &&
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index ea0f3e0..64dca0a 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -1,19 +1,5 @@
-# eclass for ant based Java packages
-#
-# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2004-2015, Gentoo Foundation
-# Changes:
-# May 2007:
-# Made bsfix make one pass for all things and add some glocal targets for
-# setting up the whole thing. Contributed by kiorky
-# (kiorky@cryptelium.net).
-# December 2006:
-# I pretty much rewrote the logic of the bsfix functions
-# and xml-rewrite.py because they were so slow
-# Petteri Räty (betelgeuse@gentoo.org)
-#
-# Licensed under the GNU General Public License, v2
-#
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
# $Id$
# @ECLASS: java-ant-2.eclass
diff --git a/eclass/java-mvn-src.eclass b/eclass/java-mvn-src.eclass
index da60cf8..c34034e 100644
--- a/eclass/java-mvn-src.eclass
+++ b/eclass/java-mvn-src.eclass
@@ -1,9 +1,5 @@
-# Eclass for Java packages from bare sources exported by Maven
-#
-# Copyright (c) 2004-2011, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
# $Id$
inherit java-pkg-simple
diff --git a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass
index 7e13ed2..46865fa 100644
--- a/eclass/java-osgi.eclass
+++ b/eclass/java-osgi.eclass
@@ -1,10 +1,5 @@
-# Base eclass for Java packages that needs to be OSGi compliant
-#
-# Copyright (c) 2007, Jean-Noël Rivasseau <elvanor@gmail.com>
-# Copyright (c) 2007-2011, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
+# Copyright 2007-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
# $Id$
# -----------------------------------------------------------------------------
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index a0028c8..6b77066 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -1,10 +1,5 @@
-# Eclass for Java packages
-#
-# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2004-2015, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
# $Id$
# @ECLASS: java-pkg-2.eclass
diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass
index 9902837..20c4cbc 100644
--- a/eclass/java-pkg-opt-2.eclass
+++ b/eclass/java-pkg-opt-2.eclass
@@ -1,15 +1,5 @@
-# Eclass for optional Java packages
-#
-# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2004-2011, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
-# Major changes:
-# 20070805:
-# Removed phase hooks because Portage does proper env saving now.
-# <betelgeuse@gentoo.org>
-#
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
# $Id$
# @ECLASS: java-pkg-opt-2.eclass
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index d5309bb..7abdb62 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -1,9 +1,5 @@
-# Eclass for simple bare-source Java packages
-#
-# Copyright (c) 2004-2015, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
# $Id$
inherit java-utils-2
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 6c28c46..302a82a 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -1,11 +1,5 @@
-# Base eclass for Java packages
-#
-# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
-# Copyright (c) 2004-2015, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
# $Id$
# @ECLASS: java-utils-2.eclass
@@ -2827,9 +2821,10 @@
# @FUNCTION: java-pkg_clean
# @DESCRIPTION:
-# java package cleaner function, will remove all *.class and *.jar files
-# removing any bundled dependencies
+# Java package cleaner function. This will remove all *.class and *.jar
+# files, removing any bundled dependencies.
java-pkg_clean() {
- [[ -n "${JAVA_PKG_NO_CLEAN}" ]] &&
+ if [[ -z "${JAVA_PKG_NO_CLEAN}" ]]; then
find "${@}" '(' -name '*.class' -o -name '*.jar' ')' -type f -delete -print || die
+ fi
}
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 94231ec..0f47b8c 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -798,10 +798,13 @@
# if we have USE=symlink, then force K_SYMLINK=1
use symlink && K_SYMLINK=1
- # if we're using a deblobbed kernel, it's not supported
- [[ $K_DEBLOB_AVAILABLE == 1 ]] && \
- use deblob && \
- K_SECURITY_UNSUPPORTED=deblob
+ # We do support security on a deblobbed kernel, bug #555878.
+ # If some particular kernel version doesn't have security
+ # supported because of USE=deblob or otherwise, one can still
+ # set K_SECURITY_UNSUPPORTED on a per ebuild basis.
+ #[[ $K_DEBLOB_AVAILABLE == 1 ]] && \
+ # use deblob && \
+ # K_SECURITY_UNSUPPORTED=deblob
# if we are to forcably symlink, delete it if it already exists first.
if [[ ${K_SYMLINK} > 0 ]]; then
diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass
index a7afb15..f9492a8 100644
--- a/eclass/office-ext-r1.eclass
+++ b/eclass/office-ext-r1.eclass
@@ -164,7 +164,7 @@
office-ext-r1_add_extension() {
debug-print-function ${FUNCNAME} "$@"
local ext=$1
- local tmpdir=$(mktemp -d --tmpdir="${T}")
+ local tmpdir=$(emktemp -d)
debug-print "${FUNCNAME}: ${UNOPKG_BINARY} add --shared \"${ext}\""
ebegin "Adding office extension: \"${ext}\""
diff --git a/eclass/pam.eclass b/eclass/pam.eclass
index a690e00..c5d9108 100644
--- a/eclass/pam.eclass
+++ b/eclass/pam.eclass
@@ -1,7 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
# $Id$
-#
# @ECLASS: pam.eclass
# @MAINTAINER:
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 974accb..a80bdf4 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -42,7 +42,7 @@
_PYTHON_ALL_IMPLS=(
jython2_5 jython2_7
pypy pypy3
- python3_3 python3_4
+ python3_3 python3_4 python3_5
python2_7
)
@@ -66,7 +66,7 @@
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- python2_7|python3_[34]|jython2_[57])
+ python2_7|python3_[345]|jython2_[57])
return 0
;;
pypy1_[89]|pypy2_0|python2_[56]|python3_[12])
@@ -1117,6 +1117,9 @@
python_export_utf8_locale() {
debug-print-function ${FUNCNAME} "${@}"
+ # If the locale program isn't available, just return.
+ type locale >/dev/null || return 0
+
if [[ $(locale charmap) != UTF-8 ]]; then
if [[ -n ${LC_ALL} ]]; then
ewarn "LC_ALL is set to a locale with a charmap other than UTF-8."
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index 41405b3..412ff66 100644
--- a/eclass/ros-catkin.eclass
+++ b/eclass/ros-catkin.eclass
@@ -63,7 +63,8 @@
DEPEND="${RDEPEND}"
if [ -n "${CATKIN_DO_PYTHON_MULTIBUILD}" ] ; then
- RDEPEND="${RDEPEND} dev-lang/python-exec:2"
+ RDEPEND="${RDEPEND} dev-lang/python-exec:2 ${PYTHON_DEPS}"
+ DEPEND="${DEPEND} ${PYTHON_DEPS}"
fi
# @ECLASS-VARIABLE: CATKIN_HAS_MESSAGES
@@ -124,7 +125,7 @@
S=${WORKDIR}/${P}/${ROS_SUBDIR}
else
SRC_URI="${ROS_REPO_URI}/archive/${VER_PREFIX}${PV%_*}${VER_SUFFIX}.tar.gz -> ${ROS_REPO_URI##*/}-${PV}.tar.gz"
- S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}/${ROS_SUBDIR}
+ S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}${VER_SUFFIX}/${ROS_SUBDIR}
fi
HOMEPAGE="http://wiki.ros.org/${PN}"
@@ -201,8 +202,8 @@
# Decorator around cmake-utils_src_test to ensure tests are built before running them.
ros-catkin_src_test_internal() {
cd "${BUILD_DIR}" || die
- if nonfatal emake tests -n &> /dev/null ; then
- emake VERBOSE=1 tests
+ if nonfatal cmake-utils_src_make tests -n &> /dev/null ; then
+ cmake-utils_src_make tests
fi
cmake-utils_src_test "${@}"
}
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index c370650..08024cc 100644
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -92,7 +92,7 @@
if version_is_at_least 2.19 ; then
IUSE+=" zlib"
fi
-if ! version_is_at_least 2.23.90 || [[ ${BTYPE} != "rel" ]] || is_cross || use multislot ; then
+if ! version_is_at_least 2.25 || [[ ${BTYPE} != "rel" ]] || is_cross || use multislot ; then
SLOT="${BVER}"
else
SLOT="0"
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index b6d1ab0..59c2861 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -725,6 +725,7 @@
# Eventually we'd like to get rid of this func completely #417451
case ${CTARGET:-${CHOST}} in
*-darwin*) ;;
+ *-android*) return 0 ;;
*linux*|*-freebsd*|*-openbsd*|*-netbsd*)
use prefix && return 0 ;;
*) return 0 ;;
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index b81dbb0..c08aa0c 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -160,8 +160,11 @@
# Support upgrade paths here or people get pissed
if ! tc_version_is_at_least 4.7 || is_crosscompile || use multislot || [[ ${GCC_PV} == *_alpha* ]] ; then
SLOT="${GCC_CONFIG_VER}"
-else
+elif ! tc_version_is_at_least 5.0 ; then
SLOT="${GCC_BRANCH_VER}"
+else
+ # Upstream changed versioning w/gcc-5+, so SLOT matches major only. #555164
+ SLOT="${GCCMAJOR}"
fi
#---->> DEPEND <<----
@@ -1957,7 +1960,7 @@
echo
ewarn "You might want to review the GCC upgrade guide when moving between"
ewarn "major versions (like 4.2 to 4.3):"
- ewarn "https://www.gentoo.org/doc/en/gcc-upgrading.xml"
+ ewarn "https://wiki.gentoo.org/wiki/Upgrading_GCC"
echo
# Clean up old paths
diff --git a/eclass/twisted-r1.eclass b/eclass/twisted-r1.eclass
index 2cb24e3..5b10491 100644
--- a/eclass/twisted-r1.eclass
+++ b/eclass/twisted-r1.eclass
@@ -1,5 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Distributed under the terms of the GNU General Public License v2
# $Id$
# @ECLASS: twisted-r1.eclass
diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index ebd2f36..dab06ac 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,2 +1,3 @@
DIST supertuxkart-0.8.1-src.tar.bz2 229944480 SHA256 335301ae61b0c177be68d5593c65e5b197dc807421f08a8a35740a254cacf8d6 SHA512 1d72230a2cfa6196c6ea6c5464f01d1a0064994c9dafbf5d47c04b5db87e82590fde57a88d5316f2cf6094dcebae5e115b81e5ecc964a29bd669bc83d527d13a WHIRLPOOL 5cf87e57cd5b5d12e4549bf49efb0596e4a1fafa7cba58e366c843e2ebf61c02e5c3471d1591f1231194021cbcb6082829e026616403680fc7ad05bd235b155e
+DIST supertuxkart-0.9-src.tar.xz 385780604 SHA256 c0eb24eb49e23ed6d03f4864feb43573e14971c8420bf60c3c654d4e05ff9aa6 SHA512 0876ad8bda49b3a26be82ee60742704608f4aca3e16fc038a06d9aa8dce9389b15fa69b547eca4b4a3c073cea495e7872924732a2e66802987c905348ff25ebb WHIRLPOOL 780c664d418de612fdfa2905dc86f0eddced5b2c0eef60b67931203afd34b418eb254d0270113846a1c51e149acd6a64157263895163fb1016a9a840384eeb51
DIST supertuxkart.png 4435 SHA256 99bc1801cb0514946cb0171d6d5a84484b6dc881edfa7f096b6eb5fea2f28828 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda WHIRLPOOL eef651802a927b451226fc06a682d7dea68b65b05195130ccfc7544165f26f65bda4fc9565e09d6487d02be3cf57880b0c6c257f26587c6bc6d30afc6aa5d3c2
diff --git a/games-action/supertuxkart/supertuxkart-0.9.ebuild b/games-action/supertuxkart/supertuxkart-0.9.ebuild
new file mode 100644
index 0000000..b070ae7
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-0.9.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils cmake-utils eutils games
+
+DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
+HOMEPAGE="http://supertuxkart.sourceforge.net/"
+SRC_URI="mirror://sourceforge/supertuxkart/SuperTuxKart/${PV}/${P}-src.tar.xz
+ mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug fribidi wiimote"
+
+# don't unbundle irrlicht and bullet
+# both are modified and system versions will break the game
+# http://sourceforge.net/tracker/?func=detail&aid=3454889&group_id=74339&atid=540679
+
+RDEPEND="media-libs/libpng:0
+ media-libs/libvorbis
+ media-libs/openal
+ net-misc/curl
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:62
+ virtual/libintl
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXxf86vm
+ fribidi? ( dev-libs/fribidi )
+ wiimote? ( net-wireless/bluez )"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+src_prepare() {
+ # inconsistent handling of debug definition
+ # avoid using Debug build type
+ if use debug ; then
+ sed -i \
+ -e 's/add_definitions(-DNDEBUG)/add_definitions(-DDEBUG)/' \
+ CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_use fribidi FRIBIDI)
+ $(cmake-utils_use_use wiimote WIIUSE)
+ -DSTK_INSTALL_BINARY_DIR="${GAMES_BINDIR}"
+ -DSTK_INSTALL_DATA_DIR="${GAMES_DATADIR}"/${PN}
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+ doicon -s 64 "${DISTDIR}"/${PN}.png
+ dodoc AUTHORS CHANGELOG.md README.md TODO.md
+ 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-action/swordandsworcery/swordandsworcery-1.02.ebuild b/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
index 5813b99..aae567b 100644
--- a/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
+++ b/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
@@ -26,7 +26,7 @@
RDEPEND="
virtual/opengl
amd64? (
- >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)]
+ >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)]
>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
>=virtual/glu-9.0-r1[abi_x86_32(-)]
>=virtual/opengl-7.0-r1[abi_x86_32(-)]
@@ -51,7 +51,7 @@
)
)
x86? (
- dev-libs/openssl
+ dev-libs/openssl:0=
media-libs/alsa-lib
media-libs/flac
media-libs/libogg
diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
index 4000ca3..3a342c8 100644
--- a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
+++ b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
@@ -1,5 +1,5 @@
---- openmortal-0.7/src/sge_tt_text.cpp.old 2014-04-04 21:35:37.275483286 +0300
-+++ openmortal-0.7/src/sge_tt_text.cpp 2014-04-04 21:36:08.065359870 +0300
+--- openmortal-0.7/src/sge_tt_text.cpp.old
++++ openmortal-0.7/src/sge_tt_text.cpp
@@ -37,9 +37,9 @@
#ifndef _SGE_NOTTF
@@ -7,9 +7,9 @@
-#include <freetype/freetype.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ttnameid.h>
-+#include <freetype.h>
-+#include <ftoutln.h>
-+#include <ttnameid.h>
++#include FT_FREETYPE_H
++#include FT_OUTLINE_H
++#include FT_TRUETYPE_IDS_H
/* The structure used to hold glyph information (cached) */
struct glyph {
diff --git a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
index fdba61c..1c10ce2 100644
--- a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
+++ b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
@@ -1,5 +1,5 @@
---- src/OnlineChat.cpp.old 2006-01-28 14:34:42.000000000 -0700
-+++ src/OnlineChat.cpp 2006-01-28 14:34:53.000000000 -0700
+--- src/OnlineChat.cpp.old
++++ src/OnlineChat.cpp
@@ -56,7 +56,7 @@
class CChallengeMenu: public Menu
{
diff --git a/games-arcade/openmortal/openmortal-0.7-r1.ebuild b/games-arcade/openmortal/openmortal-0.7-r1.ebuild
index c24d9f4..9dcc163 100644
--- a/games-arcade/openmortal/openmortal-0.7-r1.ebuild
+++ b/games-arcade/openmortal/openmortal-0.7-r1.ebuild
@@ -21,20 +21,20 @@
media-libs/sdl-net
>=media-libs/freetype-2.4.0
dev-lang/perl"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
src_prepare() {
epatch \
"${FILESDIR}/${P}"-gcc41.patch \
"${FILESDIR}/${P}"-freetype.patch
-
+ mv configure.{in,ac} || die
eautoreconf
}
src_install() {
- emake DESTDIR="${D}" install
+ DOCS="AUTHORS ChangeLog README TODO" \
+ default
newicon data/gfx/icon.png ${PN}.png
make_desktop_entry ${PN} OpenMortal
- dodoc AUTHORS ChangeLog README TODO
prepgamesdirs
}
diff --git a/games-board/gnubg/gnubg-1.05.000.ebuild b/games-board/gnubg/gnubg-1.05.000.ebuild
index 90c280a..1399aa9 100644
--- a/games-board/gnubg/gnubg-1.05.000.ebuild
+++ b/games-board/gnubg/gnubg-1.05.000.ebuild
@@ -55,6 +55,9 @@
-e '/^gnubgiconsdir / s#=.*#= /usr/share#' \
-e '/^gnubgpixmapsdir / s#=.*#= /usr/share/pixmaps#' \
pixmaps/Makefile.in || die
+ sed -i \
+ -e '1i#include <config.h>' \
+ copying.c || die #551896
}
src_configure() {
diff --git a/games-board/gnugo/files/gnugo-3.9.1-invalid-move.patch b/games-board/gnugo/files/gnugo-3.9.1-invalid-move.patch
index fc8fd8f..1da388a 100644
--- a/games-board/gnugo/files/gnugo-3.9.1-invalid-move.patch
+++ b/games-board/gnugo/files/gnugo-3.9.1-invalid-move.patch
@@ -1,5 +1,5 @@
From 84a32e9cee2a70c0ec6ef58c1be279fed84a9a53 Mon Sep 17 00:00:00 2001
-From: Gunnar Farnebäck <gunnar@lysator.liu.se>
+From: Gunnar Farnebäck <gunnar@lysator.liu.se>
Date: Thu, 13 Jun 2013 18:45:03 +0000
Subject: Avoid crashing due to registering an invalid loss move reason.
diff --git a/games-emulation/m64py/m64py-0.2.1.ebuild b/games-emulation/m64py/m64py-0.2.1.ebuild
deleted file mode 100644
index 38ffbbf..0000000
--- a/games-emulation/m64py/m64py-0.2.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 games
-
-DESCRIPTION="A frontend for Mupen64Plus"
-HOMEPAGE="http://m64py.sourceforge.net/"
-SRC_URI="mirror://sourceforge/m64py/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# SDL & libmupen64plus are through ctypes, so they rely on specific ABI
-RDEPEND="media-libs/libsdl:0/0[joystick]
- dev-python/PyQt4[opengl,${PYTHON_USEDEP}]
- games-emulation/mupen64plus-core:0/2"
-
-python_prepare_all() {
- # set the correct search path
- cat >> src/m64py/platform.py <<-_EOF_
- SEARCH_DIRS = ["$(games_get_libdir)/mupen64plus"]
-_EOF_
-
- # comment out SDL2 support since our mupen64plus uses SDL1
- sed -e '/from m64py\.SDL2/s:^:#:' \
- -e '/QT2SDL2\[/s:^:#:' \
- -e '/KEYCODE2SCANCODE\[/s:^:#:' \
- -e '/SCANCODE2KEYCODE\[/s:^:#:' \
- -i src/m64py/frontend/keymap.py || die
- sed -e '/--sdl2/d' \
- -e '/SDL2/s:=.*$:= False:' \
- -i src/m64py/opts.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install() {
- distutils-r1_python_install \
- --install-scripts="${GAMES_BINDIR}"
-}
-
-# games.eclass ABSOLUTELY MUST come last, so we need to clean up the mess
-src_prepare() { distutils-r1_src_prepare; }
-src_configure() { distutils-r1_src_configure; }
-src_compile() { distutils-r1_src_compile; }
-src_test() { distutils-r1_src_test; }
-
-src_install() {
- distutils-r1_src_install
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
-
- if ! type -P rar >/dev/null && ! type -P unrar >/dev/null; then
- elog
- elog "In order to gain RAR archive support, please install either app-arch/rar"
- elog "or app-arch/unrar."
- fi
-
- if ! type -P 7z >/dev/null \
- && ! has_version "dev-python/pylzma[${PYTHON_USEDEP}]"; then
- elog
- elog "In order to gain 7z archive support, please install either app-arch/p7zip"
- elog "or dev-python/pylzma."
- fi
-}
diff --git a/games-emulation/m64py/m64py-0.2.3-r1.ebuild b/games-emulation/m64py/m64py-0.2.3-r1.ebuild
new file mode 100644
index 0000000..6ba5a09
--- /dev/null
+++ b/games-emulation/m64py/m64py-0.2.3-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1 versionator
+
+DESCRIPTION="A frontend for Mupen64Plus"
+HOMEPAGE="http://m64py.sourceforge.net/"
+SRC_URI="mirror://sourceforge/m64py/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# SDL & libmupen64plus are through ctypes, so they rely on specific ABI
+RDEPEND="media-libs/libsdl2:0/0[joystick]
+ dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
+ >=games-emulation/mupen64plus-core-2.5:0/2-sdl2"
+
+python_prepare_all() {
+ # set the correct search path
+ cat >> src/m64py/platform.py <<-_EOF_
+ SEARCH_DIRS = ["/usr/$(get_libdir)/mupen64plus"]
+_EOF_
+
+ # force SDL2 support to match >=mupen64plus-2.5
+ sed -e '/--sdl2/d' \
+ -e '/SDL2/s:=.*$:= True:' \
+ -i src/m64py/opts.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+ local vr
+ for vr in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 0.2.1-r1 ${vr}; then
+ ewarn
+ ewarn "Starting with mupen64plus-2.0-r1, the plugin install path has changed."
+ ewarn "In order for m64py to find mupen64plus, you will either need to set"
+ ewarn "new paths in configuration dialog or remove your configuration file."
+ ewarn "The new paths are:"
+ ewarn
+ ewarn " Library file: /usr/$(get_libdir)/libmupen64plus.so.2.0.0"
+ ewarn " Plugins directory: /usr/$(get_libdir)/mupen64plus"
+ ewarn " Data directory: /usr/share/mupen64plus"
+ fi
+ done
+
+ if ! type -P rar >/dev/null && ! type -P unrar >/dev/null; then
+ elog
+ elog "In order to gain RAR archive support, please install either app-arch/rar"
+ elog "or app-arch/unrar."
+ fi
+
+ if ! type -P 7z >/dev/null \
+ && ! has_version "dev-python/pylzma[${PYTHON_USEDEP}]"; then
+ elog
+ elog "In order to gain 7z archive support, please install either app-arch/p7zip"
+ elog "or dev-python/pylzma."
+ fi
+}
diff --git a/games-emulation/m64py/m64py-0.2.3.ebuild b/games-emulation/m64py/m64py-0.2.3.ebuild
deleted file mode 100644
index 1837140..0000000
--- a/games-emulation/m64py/m64py-0.2.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A frontend for Mupen64Plus"
-HOMEPAGE="http://m64py.sourceforge.net/"
-SRC_URI="mirror://sourceforge/m64py/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# SDL & libmupen64plus are through ctypes, so they rely on specific ABI
-RDEPEND="media-libs/libsdl:0/0[joystick]
- dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
- >=games-emulation/mupen64plus-core-2.0-r1:0/2"
-
-python_prepare_all() {
- # set the correct search path
- cat >> src/m64py/platform.py <<-_EOF_
- SEARCH_DIRS = ["/usr/$(get_libdir)/mupen64plus"]
-_EOF_
-
- # comment out SDL2 support since our mupen64plus uses SDL1
- sed -e '/from m64py\.SDL2/s:^:#:' \
- -e '/QT2SDL2\[/s:^:#:' \
- -e '/KEYCODE2SCANCODE\[/s:^:#:' \
- -e '/SCANCODE2KEYCODE\[/s:^:#:' \
- -i src/m64py/frontend/keymap.py || die
- sed -e '/--sdl2/d' \
- -e '/SDL2/s:=.*$:= False:' \
- -i src/m64py/opts.py || die
-
- distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
- local vr
- for vr in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 0.2.1-r1 ${vr}; then
- ewarn
- ewarn "Starting with mupen64plus-2.0-r1, the plugin install path has changed."
- ewarn "In order for m64py to find mupen64plus, you will either need to set"
- ewarn "new paths in configuration dialog or remove your configuration file."
- ewarn "The new paths are:"
- ewarn
- ewarn " Library file: /usr/$(get_libdir)/libmupen64plus.so.2.0.0"
- ewarn " Plugins directory: /usr/$(get_libdir)/mupen64plus"
- ewarn " Data directory: /usr/share/mupen64plus"
- fi
- done
-
- if ! type -P rar >/dev/null && ! type -P unrar >/dev/null; then
- elog
- elog "In order to gain RAR archive support, please install either app-arch/rar"
- elog "or app-arch/unrar."
- fi
-
- if ! type -P 7z >/dev/null \
- && ! has_version "dev-python/pylzma[${PYTHON_USEDEP}]"; then
- elog
- elog "In order to gain 7z archive support, please install either app-arch/p7zip"
- elog "or dev-python/pylzma."
- fi
-}
diff --git a/games-emulation/mupen64plus-audio-sdl/Manifest b/games-emulation/mupen64plus-audio-sdl/Manifest
index 1def790..85aaa08 100644
--- a/games-emulation/mupen64plus-audio-sdl/Manifest
+++ b/games-emulation/mupen64plus-audio-sdl/Manifest
@@ -1 +1,2 @@
DIST mupen64plus-audio-sdl-src-2.0.tar.gz 26084 SHA256 943ffa6b6cdaf0cda2a24469dfa1d8e951c88c41472ded9e5c9ecbc111363286 SHA512 92ee4755c22da5a753374c7c6f5e074bf6c1ab06a0ab27d475566d50f8ed75b636b59ffe1a8c9d3d63558bf5783b999a600703951679f7bab346643c0c86871d WHIRLPOOL 82a56a49f0ffe620917dba92bf135593c7e66e2944ec0688b29cc2d5362221b81f76e162840e315476d959b445d38f3bc1bf05538fbf1fa9de96b616835b2198
+DIST mupen64plus-audio-sdl-src-2.5.tar.gz 26147 SHA256 1c59f8c2d70206350c0b9067a9722cf2dd67e5686994d5a55adbf51ee8812f59 SHA512 0c63e16449c40f15abdeed968383a218ed9876a92b2c15cbeb6554b20008d6d12996c0fd3bc1c502084791596b8535340596e95a11fe5d27576342740e76db6a WHIRLPOOL ad141c8dbe996590eecada88e943a7d8b0e2d9f4db3d02a17c8b4b1e198580b02ef28ef2b19f2267c77f3060396d068ab2fcbcd2da11ff2e6ecfa61af10bb30f
diff --git a/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0.ebuild b/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0.ebuild
deleted file mode 100644
index 5380f9d..0000000
--- a/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, SDL audio plugin"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libsamplerate oss speex"
-
-RDEPEND="games-emulation/mupen64plus-core:0=
- media-libs/libsdl:0=[sound]
- libsamplerate? ( media-libs/libsamplerate:0= )
- speex? ( media-libs/speex:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch_user
-
- # avoid implicitly appending CPU flags
- sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
- MAKEARGS=(
- # Note: please keep this in sync in all of mupen64plus-* packages
-
- -C projects/unix
-
- # this basically means: GNU userspace
- UNAME=Linux
-
- # verbose output
- V=1
-
- CROSS_COMPILE="${CHOST}-"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
- # so we can leave OPTFLAGS empty
- OPTFLAGS=
-
- # paths, some of them are used at compile time
- PREFIX=/usr
- LIBDIR="$(games_get_libdir)"
- PLUGINDIR="$(games_get_libdir)"/mupen64plus
- SHAREDIR="${GAMES_DATADIR}"/mupen64plus
-
- # disable unwanted magic
- LDCONFIG=:
- INSTALL_STRIP_FLAG=
-
- # Package-specific stuff
-
- # CROSS_COMPILE causes it to look for ${CHOST}-sdl-config...
- SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl)"
- SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl)"
-
- NO_SPEEX=$(usex speex 0 1)
- NO_SRC=$(usex libsamplerate 0 1)
- NO_OSS=$(usex oss 0 1)
- )
-
- use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
- use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
- emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
- emake "${MAKEARGS[@]}" DESTDIR="${D}" install
- einstalldocs
- prepgamesdirs
-}
diff --git a/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.ebuild b/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.ebuild
new file mode 100644
index 0000000..4c5fd3c
--- /dev/null
+++ b/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, SDL audio plugin"
+HOMEPAGE="http://www.mupen64plus.org/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libsamplerate oss speex"
+
+RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=
+ media-libs/libsdl2:0=[sound]
+ libsamplerate? ( media-libs/libsamplerate:0= )
+ speex? ( media-libs/speex:0= )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch_user
+
+ # avoid implicitly appending CPU flags
+ sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
+src_compile() {
+ MAKEARGS=(
+ # Note: please keep this in sync in all of mupen64plus-* packages
+
+ -C projects/unix
+
+ # this basically means: GNU userspace
+ UNAME=Linux
+
+ # verbose output
+ V=1
+
+ CROSS_COMPILE="${CHOST}-"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
+ # so we can leave OPTFLAGS empty
+ OPTFLAGS=
+
+ # paths, some of them are used at compile time
+ PREFIX=/usr
+ LIBDIR=/usr/$(get_libdir)
+
+ # disable unwanted magic
+ LDCONFIG=:
+ INSTALL_STRIP_FLAG=
+
+ # Package-specific stuff
+
+ # CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
+ SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
+ SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
+
+ NO_SPEEX=$(usex speex 0 1)
+ NO_SRC=$(usex libsamplerate 0 1)
+ NO_OSS=$(usex oss 0 1)
+ # not packaged (https://github.com/nemomobile/libaudioresource)
+ USE_AUDIORESOURCE=0
+ )
+
+ use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+ use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+ emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+ emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+ einstalldocs
+}
diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest
index 19006cc..4a2a712 100644
--- a/games-emulation/mupen64plus-core/Manifest
+++ b/games-emulation/mupen64plus-core/Manifest
@@ -1 +1,2 @@
DIST mupen64plus-core-src-2.0.tar.gz 1127862 SHA256 7e98795dbe4646b858919078f58a6ed94f7cfa30867df6cf44ef33da6aaa7a28 SHA512 6f7391536c23b465af737b3b64f3488bc0275c472e27f97f1d8be61e917c6772cad2c747db8ffa251ba88ba4f4c0d29de2451325f3ea4bcc6049534ef1dac41e WHIRLPOOL c32c97071d911696c9b24a931287ba7da1bdb29434300d984926a2a1b0541660022b6a811f616e8ed18de8d59fdafd168a571b248165c950d80f4e045e25aa53
+DIST mupen64plus-core-src-2.5.tar.gz 895890 SHA256 59e99a79e7f862517232e3115bd1f72377e3e34da795c118ba617c478c839578 SHA512 1bf643798de4f17e2ce4f2a67dfd242a8b24d873c413b49cbcb280e4264131222e3f3bc02c46111868102b0b5174d117ababceab66551cb38b76b22b3a94f697 WHIRLPOOL 3ea76e1bd914c9f8f2857976df7ab1ee6cc8d41e7b34f2fc832e0f4030b139b702b0295fca157f475b90245dbfe93aaab05ec5677cd676010b69af873b5f8840
diff --git a/games-emulation/mupen64plus-core/metadata.xml b/games-emulation/mupen64plus-core/metadata.xml
index c213473..8345dfe 100644
--- a/games-emulation/mupen64plus-core/metadata.xml
+++ b/games-emulation/mupen64plus-core/metadata.xml
@@ -10,6 +10,8 @@
<name>Christian Birchinger</name>
</maintainer>
<use>
+ <flag name="debugger">Build the debugger</flag>
+ <flag name="gles2">Use GLES2 instead of OpenGL</flag>
<flag name="new-dynarec">Enable new experimental dynamic recompiler implementation (only for x86 and arm)</flag>
<flag name="osd">Overlay emulator messages using on-screen-display</flag>
</use>
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild
deleted file mode 100644
index b9e95c0..0000000
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, core library"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-IUSE="lirc new-dynarec +osd cpu_flags_x86_sse"
-
-RDEPEND="media-libs/libpng:0=
- media-libs/libsdl:0=[joystick,opengl,video]
- sys-libs/zlib:0=[minizip]
- lirc? ( app-misc/lirc:0 )
- osd? (
- media-fonts/ttf-bitstream-vera
- media-libs/freetype:2=
- virtual/opengl:0=
- virtual/glu:0=
- )
- !<games-emulation/mupen64plus-2.0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch_user
-
- # avoid implicitly appending CPU flags
- sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
- MAKEARGS=(
- # Note: please keep this in sync in all of mupen64plus-* packages
-
- -C projects/unix
-
- # this basically means: GNU userspace
- UNAME=Linux
-
- # verbose output
- V=1
-
- CROSS_COMPILE="${CHOST}-"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
- # so we can leave OPTFLAGS empty
- OPTFLAGS=
-
- # paths, some of them are used at compile time
- PREFIX=/usr
- LIBDIR="$(games_get_libdir)"
- SHAREDIR="${GAMES_DATADIR}"/mupen64plus
-
- # disable unwanted magic
- LDCONFIG=:
- INSTALL_STRIP_FLAG=
-
- # Package-specific stuff
-
- # CROSS_COMPILE causes it to look for ${CHOST}-sdl-config...
- SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl)"
- SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl)"
-
- OSD=$(usex osd 1 0)
- NO_ASM=$(usex cpu_flags_x86_sse 0 1)
- LIRC=$(usex lirc 1 0)
- # (it does not build)
- # DEBUGGER=$(usex debug 1 0)
- NEW_DYNAREC=$(usex new-dynarec 1 0)
- )
-
- use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
- use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
- emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
- emake "${MAKEARGS[@]}" DESTDIR="${D}" install
- einstalldocs
- dodoc -r doc/{emuwiki-api-doc,new_dynarec.txt}
-
- # replace bundled font with a symlink
- # TODO: fix the code to not rely on it
- local font_path=${GAMES_DATADIR}/mupen64plus/font.ttf
- rm "${D%/}/${font_path}" || die
- if use osd; then
- dosym /usr/share/fonts/ttf-bitstream-vera/Vera.ttf "${font_path}"
- fi
- prepgamesdirs
-}
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
new file mode 100644
index 0000000..1954420
--- /dev/null
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, core library"
+HOMEPAGE="http://www.mupen64plus.org/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/2-sdl2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debugger gles2 lirc new-dynarec +osd cpu_flags_x86_sse"
+
+RDEPEND="media-libs/libpng:0=
+ media-libs/libsdl2:0=[joystick,opengl,video]
+ sys-libs/zlib:0=[minizip]
+ lirc? ( app-misc/lirc:0 )
+ osd? (
+ media-fonts/dejavu
+ media-libs/freetype:2=
+ virtual/opengl:0=
+ virtual/glu:0=
+ )
+ !<games-emulation/mupen64plus-2.0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+# block versions using SDL1
+RDEPEND="${RDEPEND}
+ !<games-emulation/m64py-0.2.3-r1
+ !<games-emulation/mupen64plus-audio-sdl-2.5
+ !<games-emulation/mupen64plus-input-sdl-2.5
+ !<games-emulation/mupen64plus-ui-console-2.5
+ !<games-emulation/mupen64plus-video-glide64mk2-2.5
+ !<games-emulation/mupen64plus-video-rice-2.5"
+
+REQUIRED_USE="gles2? ( !osd )"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch_user
+
+ # avoid implicitly appending CPU flags
+ sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
+src_compile() {
+ MAKEARGS=(
+ # Note: please keep this in sync in all of mupen64plus-* packages
+
+ -C projects/unix
+
+ # this basically means: GNU userspace
+ UNAME=Linux
+
+ # verbose output
+ V=1
+
+ CROSS_COMPILE="${CHOST}-"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
+ # so we can leave OPTFLAGS empty
+ OPTFLAGS=
+
+ # paths, some of them are used at compile time
+ PREFIX=/usr
+ LIBDIR=/usr/$(get_libdir)
+
+ # disable unwanted magic
+ LDCONFIG=:
+ INSTALL_STRIP_FLAG=
+
+ # Package-specific stuff
+
+ # CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
+ SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
+ SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
+
+ OSD=$(usex osd 1 0)
+ NO_ASM=$(usex cpu_flags_x86_sse 0 1)
+ LIRC=$(usex lirc 1 0)
+ DEBUGGER=$(usex debugger 1 0)
+ NEW_DYNAREC=$(usex new-dynarec 1 0)
+ USE_GLES=$(usex gles2 1 0)
+ )
+
+ use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+ use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+ emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+ emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+ einstalldocs
+ dodoc -r doc/{emuwiki-api-doc,new_dynarec.txt}
+
+ # replace bundled font with a symlink
+ # TODO: fix the code to not rely on it
+ local font_path=/usr/share/mupen64plus/font.ttf
+ rm "${D%/}/${font_path}" || die
+ if use osd; then
+ dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${font_path}"
+ fi
+}
diff --git a/games-emulation/mupen64plus-input-sdl/Manifest b/games-emulation/mupen64plus-input-sdl/Manifest
index f0bddf1..0b1fc1d 100644
--- a/games-emulation/mupen64plus-input-sdl/Manifest
+++ b/games-emulation/mupen64plus-input-sdl/Manifest
@@ -1 +1,2 @@
DIST mupen64plus-input-sdl-src-2.0.tar.gz 43553 SHA256 b6be48e978683cced8c208ad03e27828c17ac7b2da5e699d6c34945db63d95b6 SHA512 adbeb83e01721aa74e5e65c05e4bff2a250c7bf51835a8b2c020752e9bf0bdb0f0672914fc5285ad9da2e6fa44259780aea6415d77914bb34e521f30eecf6747 WHIRLPOOL 647ccef13620c863077ae2eefb6934d966eaa413fe70437a38560e5fa03f479428e4848f2c2f3f38163a122a29f8b118fb50f9f772bfd1df96ab2860044352d7
+DIST mupen64plus-input-sdl-src-2.5.tar.gz 50580 SHA256 65e528667b7f57a307b92abba37a3601ee17e9dd9d303ba7e4163b27f3ef771b SHA512 014a5e21feb88b14bcee44a74556a257393b799745308421a611eb3b6c11a390a589fdd393f07e69a128ca60426d4dcf8847bcbabed77b0d570be282550148d6 WHIRLPOOL a3d60880c17939785af93f9a2a9de6d9180ae754580d9a21efd5cfc7b0774b7883115f71dde35b1c448c8fc259e4229866e92c7ac51053055e9878fc90ae48b1
diff --git a/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.0.ebuild b/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.0.ebuild
deleted file mode 100644
index 8daf3df..0000000
--- a/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, SDL input plugin"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="games-emulation/mupen64plus-core:0=
- media-libs/libsdl:0=[joystick]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch_user
-
- # avoid implicitly appending CPU flags
- sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
- MAKEARGS=(
- # Note: please keep this in sync in all of mupen64plus-* packages
-
- -C projects/unix
-
- # this basically means: GNU userspace
- UNAME=Linux
-
- # verbose output
- V=1
-
- CROSS_COMPILE="${CHOST}-"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
- # so we can leave OPTFLAGS empty
- OPTFLAGS=
-
- # paths, some of them are used at compile time
- PREFIX=/usr
- LIBDIR="$(games_get_libdir)"
- PLUGINDIR="$(games_get_libdir)"/mupen64plus
- SHAREDIR="${GAMES_DATADIR}"/mupen64plus
-
- # disable unwanted magic
- LDCONFIG=:
- INSTALL_STRIP_FLAG=
-
- # Package-specific stuff
-
- # CROSS_COMPILE causes it to look for ${CHOST}-sdl-config...
- SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl)"
- SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl)"
- )
-
- use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
- use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
- emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
- emake "${MAKEARGS[@]}" DESTDIR="${D}" install
- einstalldocs
- prepgamesdirs
-}
diff --git a/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.5.ebuild b/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.5.ebuild
new file mode 100644
index 0000000..6c4856a
--- /dev/null
+++ b/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, SDL input plugin"
+HOMEPAGE="http://www.mupen64plus.org/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=
+ media-libs/libsdl2:0=[joystick]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch_user
+
+ # avoid implicitly appending CPU flags
+ sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
+src_compile() {
+ MAKEARGS=(
+ # Note: please keep this in sync in all of mupen64plus-* packages
+
+ -C projects/unix
+
+ # this basically means: GNU userspace
+ UNAME=Linux
+
+ # verbose output
+ V=1
+
+ CROSS_COMPILE="${CHOST}-"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
+ # so we can leave OPTFLAGS empty
+ OPTFLAGS=
+
+ # paths, some of them are used at compile time
+ PREFIX=/usr
+ LIBDIR=/usr/$(get_libdir)
+
+ # disable unwanted magic
+ LDCONFIG=:
+ INSTALL_STRIP_FLAG=
+
+ # Package-specific stuff
+
+ # CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
+ SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
+ SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
+ )
+
+ use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+ use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+ emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+ emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+ einstalldocs
+}
diff --git a/games-emulation/mupen64plus-rsp-hle/Manifest b/games-emulation/mupen64plus-rsp-hle/Manifest
index 0b5b6fd..2264dc3 100644
--- a/games-emulation/mupen64plus-rsp-hle/Manifest
+++ b/games-emulation/mupen64plus-rsp-hle/Manifest
@@ -1 +1,2 @@
DIST mupen64plus-rsp-hle-src-2.0.tar.gz 46291 SHA256 61c2bd163b3506d206957ba690dfd1b4d2921a6c8a3883ab6a8ef1204de7b736 SHA512 e1caa121d377be0856708fa5c13c234abc0bbb2cab90f40963983baf6230a1d4a4b7da9af0fa2ed6737538265b6392d8a43e9e537ccbd63bbb6ee44da8b29fdf WHIRLPOOL 9b3b1557bfc301390b5069892c4fabead82d7a6f1bf28da7a51ce8345fbbb12e611756d4818f423936517fbc51b0839eb25b3e9acf88160a9857ac7c7eb9ab35
+DIST mupen64plus-rsp-hle-src-2.5.tar.gz 46998 SHA256 4b2e11193746e0fbe4dfa78426c1214cf2e42779132eb2f668bf88f498517703 SHA512 564d96050890cc61df05163f99a0be8198e870f0d4071e87828bf58b283b2be8ca7de20ed03482ea8c45725bdd6f6baea618c068cced407892cf2add6ef373c6 WHIRLPOOL ea44abf46720879a0b781284c21dadbb776c12192f87ee362d8732d113cb8763e6a273a7aa7091866e58a01ace01581670440dcf81802346e1c61cdbc92a9670
diff --git a/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.0.ebuild b/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.0.ebuild
deleted file mode 100644
index 21b596e..0000000
--- a/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, HLE RSP plugin"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="games-emulation/mupen64plus-core:0="
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch_user
-
- # avoid implicitly appending CPU flags
- sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
- MAKEARGS=(
- # Note: please keep this in sync in all of mupen64plus-* packages
-
- -C projects/unix
-
- # this basically means: GNU userspace
- UNAME=Linux
-
- # verbose output
- V=1
-
- CROSS_COMPILE="${CHOST}-"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
- # so we can leave OPTFLAGS empty
- OPTFLAGS=
-
- # paths, some of them are used at compile time
- PREFIX=/usr
- LIBDIR="$(games_get_libdir)"
- PLUGINDIR="$(games_get_libdir)"/mupen64plus
-
- # disable unwanted magic
- LDCONFIG=:
- INSTALL_STRIP_FLAG=
- )
-
- use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
- use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
- emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
- emake "${MAKEARGS[@]}" DESTDIR="${D}" install
- einstalldocs
- prepgamesdirs
-}
diff --git a/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.5.ebuild b/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.5.ebuild
new file mode 100644
index 0000000..dac1892
--- /dev/null
+++ b/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, HLE RSP plugin"
+HOMEPAGE="http://www.mupen64plus.org/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=games-emulation/mupen64plus-core-2.0-r1:0="
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch_user
+
+ # avoid implicitly appending CPU flags
+ sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
+src_compile() {
+ MAKEARGS=(
+ # Note: please keep this in sync in all of mupen64plus-* packages
+
+ -C projects/unix
+
+ # this basically means: GNU userspace
+ UNAME=Linux
+
+ # verbose output
+ V=1
+
+ CROSS_COMPILE="${CHOST}-"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
+ # so we can leave OPTFLAGS empty
+ OPTFLAGS=
+
+ # paths, some of them are used at compile time
+ PREFIX=/usr
+ LIBDIR=/usr/$(get_libdir)
+
+ # disable unwanted magic
+ LDCONFIG=:
+ INSTALL_STRIP_FLAG=
+ )
+
+ use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+ use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+ emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+ emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+ einstalldocs
+}
diff --git a/games-emulation/mupen64plus-ui-console/Manifest b/games-emulation/mupen64plus-ui-console/Manifest
index 9af1c63..886522e 100644
--- a/games-emulation/mupen64plus-ui-console/Manifest
+++ b/games-emulation/mupen64plus-ui-console/Manifest
@@ -1 +1,2 @@
DIST mupen64plus-ui-console-src-2.0.tar.gz 37954 SHA256 87b9ac0a5ebbc835baa4e1fba0f50e7467e87da6469aa28fdb196e2040e54877 SHA512 7276e19772cfa047ea75c0c87930d7042a41d7d30912cae7f2c44e37ce6d446e8f5bf4e8ce89e69cabcb05185fe7b59a0ff5d12a7f7bbfa010404c2bedd94ea0 WHIRLPOOL 455a3fbb5eb0027ffbf52693e41f2fe8b5a098e32daa0d532b05f0841a35905beb0ffac9b942165d0b03f975468fff75f953cb9b9de02f8a5e49944e28dfccf8
+DIST mupen64plus-ui-console-src-2.5.tar.gz 47852 SHA256 71fee012678ff88f18130e339afd8c5467a2646b7e50da75ba2d5fa342b74a67 SHA512 70293a768c2bc5f80a2f71db229021d497d675536f5dc5eb098f91b62081f993f308d410adebce208a89880f57b037d5b42fa2f95c42ce94ffe2fca326a53046 WHIRLPOOL 4016d6b456d088b19dca2e44e615593bde6e611b36ff0837f9a8d821be87db028027b82daacfccc55488f61ea0110743efb5bed9703336187f88dd8668150e19
diff --git a/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.0.ebuild b/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.0.ebuild
deleted file mode 100644
index 272ae31..0000000
--- a/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, console UI"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="games-emulation/mupen64plus-core:0=
- media-libs/libsdl:0=
- !<games-emulation/mupen64plus-2.0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch_user
-
- # avoid implicitly appending CPU flags
- sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
- MAKEARGS=(
- # Note: please keep this in sync in all of mupen64plus-* packages
-
- -C projects/unix
-
- # this basically means: GNU userspace
- UNAME=Linux
-
- # verbose output
- V=1
-
- CROSS_COMPILE="${CHOST}-"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
- # so we can leave OPTFLAGS empty
- OPTFLAGS=
-
- # paths, some of them are used at compile time
- PREFIX=/usr
- BINDIR="${GAMES_BINDIR}"
- LIBDIR="$(games_get_libdir)"
- COREDIR="$(games_get_libdir)/"
- PLUGINDIR="$(games_get_libdir)"/mupen64plus
- SHAREDIR="${GAMES_DATADIR}"/mupen64plus
-
- # disable unwanted magic
- LDCONFIG=:
- INSTALL_STRIP_FLAG=
-
- # Package-specific stuff
-
- # CROSS_COMPILE causes it to look for ${CHOST}-sdl-config...
- SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl)"
- SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl)"
- )
-
- use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
- use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
- emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
- emake "${MAKEARGS[@]}" DESTDIR="${D}" install
- einstalldocs
- prepgamesdirs
-}
diff --git a/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.5.ebuild b/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.5.ebuild
new file mode 100644
index 0000000..e0a5e43
--- /dev/null
+++ b/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, console UI"
+HOMEPAGE="http://www.mupen64plus.org/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=games-emulation/mupen64plus-core-2.0-r1:0=
+ media-libs/libsdl2:0=
+ !<games-emulation/mupen64plus-2.0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch_user
+
+ # avoid implicitly appending CPU flags
+ sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
+src_compile() {
+ MAKEARGS=(
+ # Note: please keep this in sync in all of mupen64plus-* packages
+
+ -C projects/unix
+
+ # this basically means: GNU userspace
+ UNAME=Linux
+
+ # verbose output
+ V=1
+
+ CROSS_COMPILE="${CHOST}-"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
+ # so we can leave OPTFLAGS empty
+ OPTFLAGS=
+
+ # paths, some of them are used at compile time
+ PREFIX=/usr
+ LIBDIR=/usr/$(get_libdir)
+
+ # disable unwanted magic
+ LDCONFIG=:
+ INSTALL_STRIP_FLAG=
+
+ # Package-specific stuff
+
+ # CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
+ SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
+ SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
+ )
+
+ use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+ use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+ emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+ emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+ einstalldocs
+}
diff --git a/games-emulation/mupen64plus-video-glide64mk2/Manifest b/games-emulation/mupen64plus-video-glide64mk2/Manifest
index 891c395..36dbc5e 100644
--- a/games-emulation/mupen64plus-video-glide64mk2/Manifest
+++ b/games-emulation/mupen64plus-video-glide64mk2/Manifest
@@ -1 +1,2 @@
DIST mupen64plus-video-glide64mk2-src-2.0.tar.gz 445166 SHA256 7761594432e90aed2dd12a5f16b30674c65b1f1abad0d98ac6239c3b2c44a4d5 SHA512 043b84927219b574da3c489119007bd115c9fa0f3f476ea9e812c8321a7f1e9309af06bed0b975c00201bc35f925d3b85c3411aa02310fd1ea508191184afa9a WHIRLPOOL b55c7412139b5b31fc919947068a7ad06958b20e54b9ac350cac88af3fec0d03d4f36675c1b60ba330061e652d489113bd7b84f53e7677c3cc1f0039c2a135af
+DIST mupen64plus-video-glide64mk2-src-2.5.tar.gz 488988 SHA256 ef3dae0084e078d843605abdf5039eb8b5dd68ff1410b4fc12bdf19592a9fcb6 SHA512 b62620a364ca9e6bf729e5dd07fb84a73745c6533b95468d3f5411c0556824282f760efefea0968b0a9282f77c315bbed8b0b8a59d771893b7fd0f5f24ad725d WHIRLPOOL 63068d428d5a00a52911155e39cdd09ee79d1ca2d47b005799bf25e4438a476271aa786a3227d9f77e7cb80fe20b18906a70f7829947dbfb2f8d04ffd3da4e18
diff --git a/games-emulation/mupen64plus-video-glide64mk2/metadata.xml b/games-emulation/mupen64plus-video-glide64mk2/metadata.xml
index 7eb8e67..31c4712 100644
--- a/games-emulation/mupen64plus-video-glide64mk2/metadata.xml
+++ b/games-emulation/mupen64plus-video-glide64mk2/metadata.xml
@@ -10,6 +10,7 @@
<name>Christian Birchinger</name>
</maintainer>
<use>
+ <flag name="gles2">Use GLES2 instead of OpenGL</flag>
<flag name="hires">Support hi-resolution textures (requires <pkg>dev-libs/boost</pkg>)</flag>
</use>
<upstream>
diff --git a/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0.ebuild b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0.ebuild
deleted file mode 100644
index ab10a0e..0000000
--- a/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, glide64mk2 video plugin"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hires cpu_flags_x86_sse"
-
-RDEPEND="games-emulation/mupen64plus-core:0=
- media-libs/libpng:0=
- media-libs/libsdl:0=
- sys-libs/zlib:0=
- virtual/opengl:0=
- hires? ( dev-libs/boost:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch_user
-
- # avoid implicitly appending CPU flags
- sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
- MAKEARGS=(
- # Note: please keep this in sync in all of mupen64plus-* packages
-
- -C projects/unix
-
- # this basically means: GNU userspace
- UNAME=Linux
-
- # verbose output
- V=1
-
- CROSS_COMPILE="${CHOST}-"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
- # so we can leave OPTFLAGS empty
- OPTFLAGS=
-
- # paths, some of them are used at compile time
- PREFIX=/usr
- LIBDIR="$(games_get_libdir)"
- PLUGINDIR="$(games_get_libdir)"/mupen64plus
- SHAREDIR="${GAMES_DATADIR}"/mupen64plus
-
- # disable unwanted magic
- LDCONFIG=:
- INSTALL_STRIP_FLAG=
-
- # Package-specific stuff
-
- # CROSS_COMPILE causes it to look for ${CHOST}-sdl-config...
- SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl)"
- SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl)"
-
- NO_ASM=$(usex cpu_flags_x86_sse 0 1)
- HIRES=$(usex hires 1 0)
- )
-
- use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
- use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
- emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
- emake "${MAKEARGS[@]}" DESTDIR="${D}" install
- einstalldocs
- prepgamesdirs
-}
diff --git a/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.ebuild b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.ebuild
new file mode 100644
index 0000000..eb83f47
--- /dev/null
+++ b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, glide64mk2 video plugin"
+HOMEPAGE="http://www.mupen64plus.org/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gles2 hires cpu_flags_x86_sse"
+
+RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=[gles2=]
+ media-libs/libpng:0=
+ media-libs/libsdl2:0=
+ media-libs/libtxc_dxtn
+ sys-libs/zlib:0=
+ virtual/opengl:0=
+ hires? ( dev-libs/boost:0= )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch_user
+
+ # avoid implicitly appending CPU flags
+ sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
+src_compile() {
+ MAKEARGS=(
+ # Note: please keep this in sync in all of mupen64plus-* packages
+
+ -C projects/unix
+
+ # this basically means: GNU userspace
+ UNAME=Linux
+
+ # verbose output
+ V=1
+
+ CROSS_COMPILE="${CHOST}-"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
+ # so we can leave OPTFLAGS empty
+ OPTFLAGS=
+
+ # paths, some of them are used at compile time
+ PREFIX=/usr
+ LIBDIR=/usr/$(get_libdir)
+
+ # disable unwanted magic
+ LDCONFIG=:
+ INSTALL_STRIP_FLAG=
+
+ # Package-specific stuff
+
+ # CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
+ SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
+ SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
+
+ NOSSE=$(usex cpu_flags_x86_sse 0 1)
+ HIRES=$(usex hires 1 0)
+ USE_FRAMESKIPPER=1
+ USE_GLES=$(usex gles2 1 0)
+ # use external lib
+ TXCDXTN=1
+ )
+
+ use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+ use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+ emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+ emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+ einstalldocs
+}
diff --git a/games-emulation/mupen64plus-video-rice/Manifest b/games-emulation/mupen64plus-video-rice/Manifest
index 0ae3e56..26e5de8 100644
--- a/games-emulation/mupen64plus-video-rice/Manifest
+++ b/games-emulation/mupen64plus-video-rice/Manifest
@@ -1 +1,2 @@
DIST mupen64plus-video-rice-src-2.0.tar.gz 362013 SHA256 3eb076e7c38ab45c9ec752d30e00eca022a9e0c6ead1a22df13ad94902e08238 SHA512 bbab67be20b6d2ed6a246de8a2b955051489ac128ddecff0e3fc54782fc1d17ed8f9e1cded22d215b2c5c865b4b5fe831fffb28803247a2e494746565d23d764 WHIRLPOOL ab4399e0c70351e69995a5f40aa308b4d37489b7997d8a0eae97a183c62eea6976469c1e420c04cd24f9c32e9828d677264ce684e57af2500e7e57047bf98011
+DIST mupen64plus-video-rice-src-2.5.tar.gz 339012 SHA256 969f65b9f42f48bc7e840e4ed1342233e4371c2edca5aa8f36f69c4b20955828 SHA512 d3e9c3b3097ca9b9d896498bb34374a14ec1948fce8b795e755bb13a88f3066289fe2500666b4057e719bf3f1b38b840f8a60eaeccdcdddfab69b1986c953d61 WHIRLPOOL ff5f5fa9f74dc6110239998a2a0025b2fbf796dfd98a65f80d57ccb1197c4df7904890734445e073a2b89f90793da565527b6d7ab32a62e504d10fe6aaf9d6f5
diff --git a/games-emulation/mupen64plus-video-rice/metadata.xml b/games-emulation/mupen64plus-video-rice/metadata.xml
index 9af84f3..31d3b71 100644
--- a/games-emulation/mupen64plus-video-rice/metadata.xml
+++ b/games-emulation/mupen64plus-video-rice/metadata.xml
@@ -9,6 +9,9 @@
<email>joker@gentoo.org</email>
<name>Christian Birchinger</name>
</maintainer>
+ <use>
+ <flag name="gles2">Use GLES2 instead of OpenGL</flag>
+ </use>
<upstream>
<remote-id type="github">mupen64plus/mupen64plus-video-rice</remote-id>
</upstream>
diff --git a/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.0.ebuild b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.0.ebuild
deleted file mode 100644
index 6a0fba9..0000000
--- a/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, rice video plugin"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse"
-
-RDEPEND="games-emulation/mupen64plus-core:0=
- media-libs/libpng:0=
- media-libs/libsdl:0=[video]
- virtual/opengl:0="
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch_user
-
- # avoid implicitly appending CPU flags
- sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
- MAKEARGS=(
- # Note: please keep this in sync in all of mupen64plus-* packages
-
- -C projects/unix
-
- # this basically means: GNU userspace
- UNAME=Linux
-
- # verbose output
- V=1
-
- CROSS_COMPILE="${CHOST}-"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
- # so we can leave OPTFLAGS empty
- OPTFLAGS=
-
- # paths, some of them are used at compile time
- PREFIX=/usr
- LIBDIR="$(games_get_libdir)"
- PLUGINDIR="$(games_get_libdir)"/mupen64plus
- SHAREDIR="${GAMES_DATADIR}"/mupen64plus
-
- # disable unwanted magic
- LDCONFIG=:
- INSTALL_STRIP_FLAG=
-
- # Package-specific stuff
-
- # CROSS_COMPILE causes it to look for ${CHOST}-sdl-config...
- SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl)"
- SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl)"
-
- NO_ASM=$(usex cpu_flags_x86_sse 0 1)
- )
-
- use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
- use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
- emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
- emake "${MAKEARGS[@]}" DESTDIR="${D}" install
- einstalldocs
- prepgamesdirs
-}
diff --git a/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.ebuild b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.ebuild
new file mode 100644
index 0000000..73fa381
--- /dev/null
+++ b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, rice video plugin"
+HOMEPAGE="http://www.mupen64plus.org/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gles2 cpu_flags_x86_sse"
+
+RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=[gles2=]
+ media-libs/libpng:0=
+ media-libs/libsdl2:0=[video]
+ virtual/opengl:0="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch_user
+
+ # avoid implicitly appending CPU flags
+ sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
+src_compile() {
+ MAKEARGS=(
+ # Note: please keep this in sync in all of mupen64plus-* packages
+
+ -C projects/unix
+
+ # this basically means: GNU userspace
+ UNAME=Linux
+
+ # verbose output
+ V=1
+
+ CROSS_COMPILE="${CHOST}-"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
+ # so we can leave OPTFLAGS empty
+ OPTFLAGS=
+
+ # paths, some of them are used at compile time
+ PREFIX=/usr
+ LIBDIR=/usr/$(get_libdir)
+
+ # disable unwanted magic
+ LDCONFIG=:
+ INSTALL_STRIP_FLAG=
+
+ # Package-specific stuff
+
+ # CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
+ SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
+ SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
+
+ NO_ASM=$(usex cpu_flags_x86_sse 0 1)
+ USE_GLES=$(usex gles2 1 0)
+ )
+
+ use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+ use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+ emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+ emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+ einstalldocs
+}
diff --git a/games-emulation/mupen64plus/mupen64plus-2.5.ebuild b/games-emulation/mupen64plus/mupen64plus-2.5.ebuild
new file mode 100644
index 0000000..746a4d0
--- /dev/null
+++ b/games-emulation/mupen64plus/mupen64plus-2.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, meta-package"
+HOMEPAGE="http://www.mupen64plus.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+audio-sdl +input-sdl +rsp-hle +ui-console +ui-m64py +video-glide64mk2 +video-rice"
+
+RDEPEND=">=games-emulation/mupen64plus-core-2.5
+ audio-sdl? ( >=games-emulation/mupen64plus-audio-sdl-2.5 )
+ input-sdl? ( >=games-emulation/mupen64plus-input-sdl-2.5 )
+ rsp-hle? ( >=games-emulation/mupen64plus-rsp-hle-2.5 )
+ ui-console? ( >=games-emulation/mupen64plus-ui-console-2.5 )
+ ui-m64py? ( >=games-emulation/m64py-0.2.3-r1 )
+ video-glide64mk2? ( >=games-emulation/mupen64plus-video-glide64mk2-2.5 )
+ video-rice? ( >=games-emulation/mupen64plus-video-rice-2.5 )"
diff --git a/games-engines/love/files/love-0.8.0-freetype2.patch b/games-engines/love/files/love-0.8.0-freetype2.patch
index 64e42c5..07c655c 100644
--- a/games-engines/love/files/love-0.8.0-freetype2.patch
+++ b/games-engines/love/files/love-0.8.0-freetype2.patch
@@ -1,29 +1,5 @@
---- src/modules/font/freetype/TrueTypeRasterizer.h.old 2015-01-07 09:49:39.394000727 +0100
-+++ src/modules/font/freetype/TrueTypeRasterizer.h 2015-01-07 09:50:28.846065847 +0100
-@@ -27,10 +27,10 @@
-
- // TrueType2
- #include <ft2build.h>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
--#include <freetype/fttrigon.h>
-+#include <freetype.h>
-+#include <ftglyph.h>
-+#include <ftoutln.h>
-+#include <fttrigon.h>
-
- namespace love
- {
-@@ -67,4 +67,4 @@
- } // font
- } // love
-
--#endif // LOVE_FONT_FREETYPE_TRUE_TYPE_RASTERIZER_H
-\ No newline at end of file
-+#endif // LOVE_FONT_FREETYPE_TRUE_TYPE_RASTERIZER_H
---- src/modules/font/freetype/Font.h.old 2015-01-07 09:49:20.421359400 +0100
-+++ src/modules/font/freetype/Font.h 2015-01-07 09:50:02.076571918 +0100
+--- love-0.8.0/src/modules/font/freetype/Font.h
++++ love-0.8.0/src/modules/font/freetype/Font.h
@@ -30,10 +30,10 @@
#else
#include <ft2build.h>
@@ -32,17 +8,27 @@
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
-+#include <freetype.h>
-+#include <ftglyph.h>
-+#include <ftoutln.h>
-+#include <fttrigon.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TRIGONOMETRY_H
namespace love
{
-@@ -73,4 +73,4 @@
- } // font
- } // love
+--- love-0.8.0/src/modules/font/freetype/TrueTypeRasterizer.h
++++ love-0.8.0/src/modules/font/freetype/TrueTypeRasterizer.h
+@@ -27,10 +27,10 @@
--#endif // LOVE_FONT_FREETYPE_FONT_H
-\ No newline at end of file
-+#endif // LOVE_FONT_FREETYPE_FONT_H
+ // TrueType2
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttrigon.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TRIGONOMETRY_H
+
+ namespace love
+ {
diff --git a/games-fps/xonotic/Manifest b/games-fps/xonotic/Manifest
index 6a57f89..5dcf3af 100644
--- a/games-fps/xonotic/Manifest
+++ b/games-fps/xonotic/Manifest
@@ -1 +1,2 @@
DIST xonotic-0.8.0.zip 999151784 SHA256 0a87c808827a8b234f2324b468ecb643aa48a6fd43322a29e616610dca316370 SHA512 49ae728f9269ff642540ec8a7ab52fb9624f3d05cab2b07c5a1aa87d4103d3acffad4e2a1f266d3976cd457e742a3a7a1fd4a774cbcde934b123ae3baa747332 WHIRLPOOL 85e747bb2fb5ad5394896a08055028439a2f1a154305d7101be8cb5a44a1e50bdb9b36fac526ff12c9db93915a8b5253a40cf7dc654271f20240e1f92e0b4cb5
+DIST xonotic-0.8.1.zip 984854761 SHA256 be8bcc41e2993a2f26d4d04c65a7eab810443bd98b11b45e482ffdbbf284c46f SHA512 adfce546257bdc7cfebe94f53eaa9cc9b19eaa546c6405e31ed6af080e3948732c960a024126202e5853cb98b955daadeeb5a96c602a6d4d83e284d3540214a4 WHIRLPOOL 4359263c98352a8b5d169147d9bfecb4258628f212d9a965f0d1577d0a8b2469648ae1ce21d8dc0ff622d20e126ea52e1464363f69fcf514991aefad71c1bee7
diff --git a/games-fps/xonotic/xonotic-0.8.1.ebuild b/games-fps/xonotic/xonotic-0.8.1.ebuild
new file mode 100644
index 0000000..cea7356
--- /dev/null
+++ b/games-fps/xonotic/xonotic-0.8.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils check-reqs toolchain-funcs games
+
+MY_PN="${PN^}"
+DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine"
+HOMEPAGE="http://www.xonotic.org/"
+SRC_URI="http://dl.xonotic.org/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug dedicated doc ode sdl"
+
+UIRDEPEND="
+ media-libs/libogg
+ media-libs/libtheora
+ media-libs/libvorbis
+ media-libs/libmodplug
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXpm
+ x11-libs/libXext
+ x11-libs/libXdmcp
+ x11-libs/libXxf86dga
+ x11-libs/libXxf86vm
+ virtual/opengl
+ media-libs/freetype:2
+ alsa? ( media-libs/alsa-lib )
+ ode? ( dev-games/ode[double-precision] )
+ sdl? ( media-libs/libsdl[X,sound,joystick,opengl,video,alsa?] )"
+UIDEPEND="
+ x11-proto/xextproto
+ x11-proto/xf86dgaproto
+ x11-proto/xf86vidmodeproto
+ x11-proto/xproto"
+RDEPEND="
+ sys-libs/zlib
+ virtual/jpeg:62
+ media-libs/libpng:0
+ net-misc/curl
+ ~dev-libs/d0_blind_id-0.5
+ !dedicated? ( ${UIRDEPEND} )"
+DEPEND="${RDEPEND}
+ !dedicated? ( ${UIDEPEND} )"
+
+CHECKREQS_DISK_BUILD="1200M"
+CHECKREQS_DISK_USR="950M"
+
+S=${WORKDIR}/${MY_PN}
+
+pkg_pretend() {
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ check-reqs_pkg_setup
+ games_pkg_setup
+}
+
+src_prepare() {
+ sed -i \
+ -e "/^EXE_/s:darkplaces:${PN}:" \
+ -e "s:-O3:${CFLAGS}:" \
+ -e "/-lm/s:$: ${LDFLAGS}:" \
+ -e '/^STRIP/s/strip/true/' \
+ source/darkplaces/makefile.inc || die
+
+ if ! use alsa; then
+ sed -i \
+ -e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \
+ source/darkplaces/makefile || die
+ fi
+}
+
+src_compile() {
+ local t="$(use debug && echo debug || echo release)"
+ local i
+
+ tc-export CC CXX LD AR RANLIB
+
+ # use a for-loop wrt bug 473352
+ for i in sv-${t} $(use !dedicated && echo "cl-${t} $(use sdl && echo sdl-${t})") ; do
+ emake \
+ -C source/darkplaces \
+ DP_LINK_ODE=$(usex ode shared no) \
+ DP_FS_BASEDIR="${GAMES_DATADIR}/${PN}" \
+ ${i}
+ done
+}
+
+src_install() {
+ if ! use dedicated; then
+ dogamesbin source/darkplaces/${PN}-glx
+ newicon misc/logos/${PN}_icon.svg ${PN}.svg
+ make_desktop_entry ${PN}-glx "${MY_PN} (GLX)"
+
+ if use sdl; then
+ dogamesbin source/darkplaces/${PN}-sdl
+ make_desktop_entry ${PN}-sdl "${MY_PN} (SDL)"
+ fi
+ fi
+ dogamesbin source/darkplaces/${PN}-dedicated
+
+ dodoc Docs/*.txt
+ use doc && dohtml -r Docs
+
+ insinto "${GAMES_DATADIR}/${PN}"
+ doins -r key_0.d0pk server data
+ prepgamesdirs
+
+ elog "If you are using opensource drivers you should consider installing: "
+ elog " media-libs/libtxc_dxtn"
+}
diff --git a/games-mud/circlemud/circlemud-3.1.ebuild b/games-mud/circlemud/circlemud-3.1.ebuild
index 9af7a1f..2111a44 100644
--- a/games-mud/circlemud/circlemud-3.1.ebuild
+++ b/games-mud/circlemud/circlemud-3.1.ebuild
@@ -14,7 +14,8 @@
KEYWORDS="amd64 ppc x86"
IUSE=""
-DEPEND="dev-libs/openssl"
+DEPEND="dev-libs/openssl:0="
+RDEPEND=${DEPEND}
S=${WORKDIR}/circle-${PV}
diff --git a/games-mud/crystal/crystal-0.2.4.ebuild b/games-mud/crystal/crystal-0.2.4.ebuild
index 8d7b34c..d1ff69f 100644
--- a/games-mud/crystal/crystal-0.2.4.ebuild
+++ b/games-mud/crystal/crystal-0.2.4.ebuild
@@ -15,8 +15,8 @@
IUSE=""
RDEPEND="sys-libs/zlib
- sys-libs/ncurses
- dev-libs/openssl
+ sys-libs/ncurses:0=
+ dev-libs/openssl:0=
virtual/libiconv"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/games-mud/tf/tf-50_beta8-r1.ebuild b/games-mud/tf/tf-50_beta8-r1.ebuild
index 6395f60..4c07e6c 100644
--- a/games-mud/tf/tf-50_beta8-r1.ebuild
+++ b/games-mud/tf/tf-50_beta8-r1.ebuild
@@ -20,7 +20,7 @@
KEYWORDS="amd64 ~ppc ~sparc x86"
IUSE="+atcp debug doc +gmcp ipv6 +option102 ssl"
-RDEPEND="ssl? ( dev-libs/openssl )
+RDEPEND="ssl? ( dev-libs/openssl:0= )
dev-libs/libpcre"
DEPEND=${RDEPEND}
diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
index 5c5e912..8edd4f8 100644
--- a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
+++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
@@ -19,7 +19,7 @@
media-libs/sdl-ttf
media-libs/sdl-mixer[vorbis]
media-libs/sdl-image[png]
- dev-libs/openssl
+ dev-libs/openssl:0=
net-misc/curl
app-arch/libarchive
x11-libs/libX11
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 0260544..87dc3fd 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1 @@
-DIST freeciv-2.4.4.tar.bz2 38847925 SHA256 8307fc9d69571b031ccc465e8029d8a7ea3dbef4e3651f2de07356aba931e2a3 SHA512 3f2ff619b21c36748a98bda98c923ec9ea71faf18cac77d8b247e4a79c4a8f41c9b399e648a0a51fe54738de3276081c31ded98f769104812125d304716796a7 WHIRLPOOL 0eb8374ad2d7174dab8971c39c0ce7f14e72c1c7a64dfa8461a054a53d2b659af71197bad7c65e65e3e5da4fd5552bfb10aa2fa8b9870c9b1fbd7e03c58c9c00
-DIST freeciv-2.5.0.tar.bz2 40323793 SHA256 bd9f7523ea79b8d2806d0c1844a9f48506ccd18276330580319913c43051210b SHA512 f03bafdca47da0677ad81ed945afe79bbd01ae871b95e6bdaf6249acb8420e78e3210dd60f520d960ec127e1d443f45c11fcc484b49b6bb59cab5904e51fc651 WHIRLPOOL 1a9768837b40c6c19ff6138d07074d96d75d2cecdb671180659d9380beb7c996fcb0be2fb343166fe46e92cc2c2e7495be2683f62440540cea3072f34e928391
DIST freeciv-2.5.1.tar.bz2 40686265 SHA256 4e420a9ad91aa7966039ec3b63501725c8261a4ff734d56fe801414fae772696 SHA512 c0f5df3df7bab9ad8e9e7ce75ea90a539ca7e6aafb0af2b57a3d30b095e30f3b093e66bd8b92524e0e19919e0f5d4b822946219bf270e6071102db56290119b8 WHIRLPOOL 1773d56801316afae6ab470b1b1fdf71b42bd42ff0f7ede62b28c5ef7abcd0af36887401937a028b4a9a2e19f994389ef5f63c0395545ebcb367ff2089e2fd55
diff --git a/games-strategy/freeciv/freeciv-2.4.4.ebuild b/games-strategy/freeciv/freeciv-2.4.4.ebuild
deleted file mode 100644
index 96d07d3..0000000
--- a/games-strategy/freeciv/freeciv-2.4.4.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls postgres readline sdl +server +sound sqlite"
-
-RDEPEND="app-arch/bzip2
- app-arch/xz-utils
- dev-lang/lua
- net-misc/curl
- sys-libs/zlib
- auth? (
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
- sqlite? ( dev-db/sqlite:3 )
- !mysql? ( !postgres? ( !sqlite? ( virtual/mysql ) ) )
- )
- readline? ( sys-libs/readline:0 )
- dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
- !dedicated? (
- media-libs/libpng:0
- gtk? ( x11-libs/gtk+:2 )
- mapimg? ( media-gfx/imagemagick )
- modpack? ( x11-libs/gtk+:2 )
- nls? ( virtual/libintl )
- sdl? (
- media-libs/libsdl[video]
- media-libs/sdl-image[png]
- media-libs/freetype:2
- )
- server? ( aimodules? ( sys-devel/libtool:2 ) )
- sound? (
- media-libs/libsdl[sound]
- media-libs/sdl-mixer[vorbis]
- )
- !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- !dedicated? (
- x11-proto/xextproto
- nls? ( sys-devel/gettext )
- )"
-
-pkg_setup() {
- if use !dedicated && use !server ; then
- ewarn "Disabling server USE flag will make it impossible"
- ewarn "to start local games, but you will still be able to"
- ewarn "join multiplayer games."
- fi
- games_pkg_setup
-}
-
-src_prepare() {
-
- # install the .desktop in /usr/share/applications
- # install the icons in /usr/share/pixmaps
- sed -i \
- -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
- -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
- -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
- client/Makefile.in \
- server/Makefile.in \
- modinst/Makefile.in \
- data/Makefile.in \
- data/icons/Makefile.in || die
- sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
-}
-
-src_configure() {
- local myclient myopts mydatabase
-
- if use auth ; then
- if use !mysql && use !postgres && use !sqlite ; then
- einfo "No database backend chosen, defaulting"
- einfo "to mysql!"
- mydatabase=mysql
- else
- use mysql && mydatabase="${mydatabase} mysql"
- use postgres && mydatabase="${mydatabase} postgres"
- use sqlite && mydatabase="${mydatabase} sqlite3"
- fi
- else
- mydatabase=no
- fi
-
- if use dedicated ; then
- myclient="no"
- myopts="--enable-server"
- else
- if use !sdl && use !gtk ; then
- einfo "No client backend given, defaulting to"
- einfo "gtk2 client!"
- myclient="gtk2"
- else
- use sdl && myclient="${myclient} sdl"
- use gtk && myclient="${myclient} gtk2"
- fi
- myopts="$(use_enable server) --without-ggz-client"
- fi
-
- # disabling shared libs will break aimodules USE flag
- egamesconf \
- --docdir="/usr/share/doc/${P}" \
- --localedir=/usr/share/locale \
- $(use_enable ipv6) \
- $(use_enable mapimg) \
- --enable-aimodules="$(usex aimodules "yes" "no")" \
- --enable-shared \
- --enable-fcdb="${mydatabase}" \
- $(use_enable nls) \
- $(use_with readline) \
- $(use_enable sound sdl-mixer) \
- --enable-fcmp="$(usex modpack "gtk2" "no")" \
- --enable-sys-lua \
- ${myopts} \
- --enable-client="${myclient}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- if use dedicated ; then
- rm -rf "${D}/usr/share/pixmaps"
- rm -f "${D}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,sdl,xaw}*
- else
- if use server ; then
- # Create and install the html manual. It can't be done for dedicated
- # servers, because the 'freeciv-manual' tool is then not built. Also
- # delete freeciv-manual from the GAMES_BINDIR, because it's useless.
- # Note: to have it localized, it should be ran from _postinst, or
- # something like that, but then it's a PITA to avoid orphan files...
- ./manual/freeciv-manual || die
- dohtml manual*.html
- fi
- if use sdl ; then
- make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
- else
- rm -f "${D}"/usr/share/man/man6/freeciv-sdl*
- fi
- rm -f "${D}"/usr/share/man/man6/freeciv-xaw*
- fi
- find "${D}" -name "freeciv-manual*" -delete
-
- rm -f "${D}$(games_get_libdir)"/*.a
- prune_libtool_files
-
- 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-strategy/freeciv/freeciv-2.5.0.ebuild b/games-strategy/freeciv/freeciv-2.5.0.ebuild
deleted file mode 100644
index b569637..0000000
--- a/games-strategy/freeciv/freeciv-2.5.0.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
- app-arch/xz-utils
- net-misc/curl
- sys-libs/zlib
- auth? (
- mysql? ( virtual/mysql )
- sqlite? ( dev-db/sqlite:3 )
- !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
- )
- readline? ( sys-libs/readline:0 )
- dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
- !dedicated? (
- media-libs/libpng:0
- gtk? ( x11-libs/gtk+:2 )
- mapimg? ( media-gfx/imagemagick )
- modpack? ( x11-libs/gtk+:2 )
- nls? ( virtual/libintl )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- sdl? (
- media-libs/libsdl[video]
- media-libs/sdl-gfx
- media-libs/sdl-image[png]
- media-libs/sdl-ttf
- )
- server? ( aimodules? ( sys-devel/libtool:2 ) )
- sound? (
- media-libs/libsdl[sound]
- media-libs/sdl-mixer[vorbis]
- )
- !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
- )
- system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- !dedicated? (
- x11-proto/xextproto
- nls? ( sys-devel/gettext )
- )"
-
-pkg_setup() {
- if use !dedicated && use !server ; then
- ewarn "Disabling server USE flag will make it impossible"
- ewarn "to start local games, but you will still be able to"
- ewarn "join multiplayer games."
- fi
- games_pkg_setup
-}
-
-src_prepare() {
-
- # install the .desktop in /usr/share/applications
- # install the icons in /usr/share/pixmaps
- sed -i \
- -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
- -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
- -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
- client/Makefile.in \
- server/Makefile.in \
- tools/Makefile.in \
- data/icons/Makefile.in || die
- sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
-}
-
-src_configure() {
- local myclient myopts mydatabase
-
- if use auth ; then
- if use !mysql && use !sqlite ; then
- einfo "No database backend chosen, defaulting"
- einfo "to mysql!"
- mydatabase=mysql
- else
- use mysql && mydatabase="${mydatabase} mysql"
- use sqlite && mydatabase="${mydatabase} sqlite3"
- fi
- else
- mydatabase=no
- fi
-
- if use dedicated ; then
- myclient="no"
- myopts="--enable-server"
- else
- if use !sdl && use !gtk && ! use qt5 ; then
- einfo "No client backend given, defaulting to"
- einfo "gtk2 client!"
- myclient="gtk2"
- else
- use sdl && myclient+=" sdl"
- use gtk && myclient+=" gtk2"
- use qt5 && myclient+=" qt"
- fi
- myopts="$(use_enable server) --without-ggz-client"
- fi
-
- # disabling shared libs will break aimodules USE flag
- egamesconf \
- --docdir="/usr/share/doc/${P}" \
- --localedir=/usr/share/locale \
- $(use_enable ipv6) \
- $(use_enable mapimg) \
- --enable-aimodules="$(usex aimodules "yes" "no")" \
- --enable-shared \
- --enable-fcdb="${mydatabase}" \
- $(use_enable nls) \
- $(use_with readline) \
- $(use_enable sound sdl-mixer) \
- --enable-fcmp="$(usex modpack "gtk2" "no")" \
- $(use_enable system-lua sys-lua) \
- ${myopts} \
- --enable-client="${myclient}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- if use dedicated ; then
- rm -rf "${D}/usr/share/pixmaps"
- rm -f "${D}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
- else
- if use server ; then
- # Create and install the html manual. It can't be done for dedicated
- # servers, because the 'freeciv-manual' tool is then not built. Also
- # delete freeciv-manual from the GAMES_BINDIR, because it's useless.
- # Note: to have it localized, it should be ran from _postinst, or
- # something like that, but then it's a PITA to avoid orphan files...
- ./tools/freeciv-manual || die
- dohtml manual*.html
- fi
- if use sdl ; then
- make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
- else
- rm -f "${D}"/usr/share/man/man6/freeciv-sdl*
- fi
- rm -f "${D}"/usr/share/man/man6/freeciv-xaw*
- fi
- find "${D}" -name "freeciv-manual*" -delete
-
- rm -f "${D}$(games_get_libdir)"/*.a
- prune_libtool_files
-
- 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-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
new file mode 100644
index 0000000..112e734
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
@@ -0,0 +1,21 @@
+diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp
+index a5d4b92..cb8ceb4 100644
+--- a/source/shared_lib/sources/platform/posix/socket.cpp
++++ b/source/shared_lib/sources/platform/posix/socket.cpp
+@@ -2563,9 +2563,15 @@ int UPNP_Tools::upnp_init(void *param) {
+ const char *upnp_minissdpdsock = NULL;
+ int upnp_sameport = 0;
+ int upnp_ipv6 = 0;
++ unsigned char upnp_ttl = 2;
+ int upnp_error = 0;
+
+-#ifndef MINIUPNPC_VERSION_PRE1_6
++#if (MINIUPNPC_API_VERSION >= 14)
++ devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &upnp_error);
++
++ if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
++ if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP discover returned upnp_error = %d.\n",upnp_error);
++#elif (MINIUPNPC_API_VERSION >= 8)
+ devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
+
+ if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
diff --git a/games-strategy/megaglest/megaglest-3.11.1.ebuild b/games-strategy/megaglest/megaglest-3.11.1.ebuild
index 7776e56..a050264 100644
--- a/games-strategy/megaglest/megaglest-3.11.1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1.ebuild
@@ -71,7 +71,8 @@
fi
epatch "${FILESDIR}"/${P}-static-build.patch \
- "${FILESDIR}"/${P}-cmake.patch
+ "${FILESDIR}"/${P}-cmake.patch \
+ "${FILESDIR}"/${P}-miniupnpc.patch
}
src_configure() {
@@ -115,7 +116,9 @@
src_compile() {
if use editor || use model-viewer; then
- VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake
+ # work around parallel make issues - bug #561380
+ MAKEOPTS="-j1 ${MAKEOPTS}" \
+ VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake
else
cmake-utils_src_compile
fi
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch
new file mode 100644
index 0000000..4a1d11e
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch
@@ -0,0 +1,38 @@
+From 2b4f956263864cebb1b9c5ce120c7cd30f512bdb Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov@gmail.com>
+Date: Sat, 18 Jul 2015 19:03:05 +0300
+Subject: [PATCH] Fixed build of sdl drivers
+
+---
+ driver/audio/SDL/src/CMakeLists.txt | 1 +
+ driver/video/SDL/src/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/driver/audio/SDL/src/CMakeLists.txt b/driver/audio/SDL/src/CMakeLists.txt
+index 5ad3f02..5a91cd5 100644
+--- a/driver/audio/SDL/src/CMakeLists.txt
++++ b/driver/audio/SDL/src/CMakeLists.txt
+@@ -20,6 +20,7 @@ IF (SDL_FOUND)
+
+ ADD_LIBRARY(audioSDL SHARED SDL.cpp SDL.h main.h SoundSDL_Music.cpp SoundSDL_Music.h SoundSDL_Effect.cpp SoundSDL_Effect.h ${PROJECT_SOURCE_DIR}/build_version.cpp ../../../src/DriverInterface.cpp ../../../src/tempname.cpp ../../../src/tempname.h)
+
++ ADD_DEFINITIONS(-fPIC)
+ ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR})
+ ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR})
+
+diff --git a/driver/video/SDL/src/CMakeLists.txt b/driver/video/SDL/src/CMakeLists.txt
+index 83d10cf..ca67573 100644
+--- a/driver/video/SDL/src/CMakeLists.txt
++++ b/driver/video/SDL/src/CMakeLists.txt
+@@ -16,6 +16,7 @@ IF (SDL_FOUND)
+
+ ADD_LIBRARY(videoSDL SHARED SDL.cpp SDL.h main.h ../../../../build_version.cpp ../../../src/DriverInterface.cpp)
+
++ ADD_DEFINITIONS(-fPIC)
+ ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR})
+ ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR})
+
+--
+2.3.6
+
+
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1.ebuild
index 0643f3a..202ecbc 100644
--- a/games-strategy/s25rttr/s25rttr-0.8.1.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.8.1.ebuild
@@ -30,7 +30,8 @@
src_prepare() {
epatch "${FILESDIR}"/${P}-cmake.patch \
- "${FILESDIR}"/${P}-soundconverter.patch
+ "${FILESDIR}"/${P}-soundconverter.patch \
+ "${FILESDIR}"/${P}-fpic.patch
}
src_configure() {
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 3768444..5d7d734 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1 +1 @@
-DIST pyfa-1.12.0.tar.gz 5898063 SHA256 d22f725efee6cd48a30ccc16a04e913afa1a7e9e89a2004ef8ca12263663ae87 SHA512 c7cda257c0ebffee113df713b8e4a2578fc46ec4493a13341c3907cd8de99c19f4cb1dbae4fe4365134c9ebced618efee2614cb57889a50330d37cf5996ec602 WHIRLPOOL eaf0bc3907b0f32feb601319ca8630e18e8eababb8d3623e56ee3fdc45dfc30946c817e2040e10f0f0e13093672b4faf0e5893088a125bb056d14dd006d623f6
+DIST pyfa-1.15.0.tar.gz 6243527 SHA256 27ec6748b5f1083050d47a364a8699e521a614c5c643a639441c82168017123c SHA512 c966e3fd7627ef575247b00eacee7392f7f2d32b14485c2a7e5aa0c6f3fe6ad99c1a536bfcbfcc6de29fa4bdc177b6a12e0a571926c1b7b755ef9fc6f76f3bad WHIRLPOOL f6ba22d7f3899c4a3fd702a5d0145b39e06e70793da2682c6bb0df0b3772c02f250b59d05a4fee23f72d87010f02d916a944c0499852dc0be845e1ae56b61904
diff --git a/games-util/pyfa/files/configforced-1.15.1.py b/games-util/pyfa/files/configforced-1.15.1.py
new file mode 100644
index 0000000..51fcb95
--- /dev/null
+++ b/games-util/pyfa/files/configforced-1.15.1.py
@@ -0,0 +1,4 @@
+# Gentoo-specific settings
+pyfaPath = u'%%SITEDIR%%/pyfa'
+gameDB = u'%%EPREFIX%%/usr/share/pyfa/eve.db'
+imgsZIP = u'%%EPREFIX%%/usr/share/pyfa/imgs.zip'
diff --git a/games-util/pyfa/files/pyfa-1.15.1-import-pyfa.patch b/games-util/pyfa/files/pyfa-1.15.1-import-pyfa.patch
new file mode 100644
index 0000000..f29b75d
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.15.1-import-pyfa.patch
@@ -0,0 +1,27 @@
+From 6c7b6ab7d1aae47d3a3f72a7951c7de294be2917 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 6 Oct 2015 22:16:38 -0400
+Subject: [PATCH] Append $(python_get_sitedir)/pyfa to import path
+
+Ensures that pyfa's import statements continue to work for systemwide
+installation.
+---
+ pyfa.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/pyfa.py b/pyfa.py
+index 8189918..7b81f10 100755
+--- a/pyfa.py
++++ b/pyfa.py
+@@ -20,6 +20,8 @@
+
+ import sys
+ import re
++import os
++sys.path.append(os.path.join("%%SITEDIR%%", "pyfa"))
+ import config
+
+
+--
+2.6.0
+
diff --git a/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch b/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch
new file mode 100644
index 0000000..8b8fa91
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch
@@ -0,0 +1,61 @@
+From c7bb5210ce9feebb753734b5c581acca9f5c9d06 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 6 Oct 2015 21:37:44 -0400
+Subject: [PATCH] make gameDB and imgs.zip paths settable from configforced
+
+---
+ config.py | 10 +++++++++-
+ gui/bitmapLoader.py | 2 +-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/config.py b/config.py
+index 4072236..a9e71ee 100644
+--- a/config.py
++++ b/config.py
+@@ -28,6 +28,7 @@ pyfaPath = None
+ savePath = None
+ saveDB = None
+ gameDB = None
++imgsZIP = None
+
+
+ class StreamToLogger(object):
+@@ -66,6 +67,7 @@ def defPaths():
+ global savePath
+ global saveDB
+ global gameDB
++ global imgsZIP
+ global saveInRoot
+
+ if debug:
+@@ -117,7 +119,13 @@ def defPaths():
+ # The database where the static EVE data from the datadump is kept.
+ # This is not the standard sqlite datadump but a modified version created by eos
+ # maintenance script
+- gameDB = os.path.join(pyfaPath, "eve.db")
++ gameDB = getattr(configforced, "gameDB", None)
++ if gameDB is None:
++ gameDB = os.path.join(pyfaPath, "eve.db")
++
++ imgsZIP = getattr(configforced, "imgsZIP", None)
++ if imgsZIP is None:
++ imgsZIP = os.path.join(pyfaPath, "imgs.zip")
+
+ ## DON'T MODIFY ANYTHING BELOW ##
+ import eos.config
+diff --git a/gui/bitmapLoader.py b/gui/bitmapLoader.py
+index 45026be..02985c1 100644
+--- a/gui/bitmapLoader.py
++++ b/gui/bitmapLoader.py
+@@ -31,7 +31,7 @@ except ImportError:
+ class BitmapLoader():
+
+ try:
+- archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 'r')
++ archive = zipfile.ZipFile(config.imgsZIP, 'r')
+ except IOError:
+ archive = None
+
+--
+2.6.0
+
diff --git a/games-util/pyfa/pyfa-1.12.0.ebuild b/games-util/pyfa/pyfa-1.12.0.ebuild
deleted file mode 100644
index 8f22414..0000000
--- a/games-util/pyfa/pyfa-1.12.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit eutils gnome2-utils python-r1
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/DarkFenX/Pyfa"
-
-LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="https://github.com/DarkFenX/Pyfa.git"
- inherit git-2
- KEYWORDS=""
-else
- SRC_URI="https://github.com/DarkFenX/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-IUSE="+graph"
-
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/sqlalchemy[${PYTHON_USEDEP}]
- dev-python/wxpython:2.8[${PYTHON_USEDEP}]
- graph? (
- dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}] )
- ${PYTHON_DEPS}"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/Pyfa-${PV}
-
-src_prepare() {
- # get rid of CRLF line endings introduced in 1.1.10 so patches work
- edos2unix config.py pyfa.py service/settings.py
-
- # make staticPath settable from configforced again
- epatch "${FILESDIR}/${PN}-1.1.20-staticPath.patch"
-
- # do not try to save exported html to python sitedir
- epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"
-
- # fix import path in the main script for systemwide installation
- epatch "${FILESDIR}/${PN}-1.1.11-import-pyfa.patch"
- touch __init__.py
-
- pyfa_make_configforced() {
- mkdir -p "${BUILD_DIR}" || die
- sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
- -e "s:%%EPREFIX%%:${EPREFIX}:" \
- "${FILESDIR}/configforced.py" > "${BUILD_DIR}/configforced.py"
- sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
- pyfa.py > "${BUILD_DIR}/pyfa"
- }
- python_foreach_impl pyfa_make_configforced
-}
-
-src_install() {
- pyfa_py_install() {
- local packagedir=$(python_get_sitedir)/${PN}
- insinto "${packagedir}"
- doins -r eos gui icons service config*.py __init__.py gpl.txt
- [[ -e info.py ]] && doins info.py # only in zip releases
- doins "${BUILD_DIR}/configforced.py"
- python_doscript "${BUILD_DIR}/pyfa"
- python_optimize
- }
- python_foreach_impl pyfa_py_install
-
- insinto /usr/share/${PN}
- doins -r staticdata
- dodoc README.md
- insinto /usr/share/icons/hicolor/32x32/apps
- doins icons/pyfa.png
- insinto /usr/share/icons/hicolor/64x64/apps
- newins icons/pyfa64.png pyfa.png
- domenu "${FILESDIR}/${PN}.desktop"
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-util/pyfa/pyfa-1.15.0.ebuild b/games-util/pyfa/pyfa-1.15.0.ebuild
new file mode 100644
index 0000000..76dac88
--- /dev/null
+++ b/games-util/pyfa/pyfa-1.15.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit eutils gnome2-utils python-r1
+
+DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
+HOMEPAGE="https://github.com/DarkFenX/Pyfa"
+
+LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/DarkFenX/Pyfa.git"
+ inherit git-2
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/DarkFenX/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+IUSE="+graph"
+
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/sqlalchemy[${PYTHON_USEDEP}]
+ dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+ graph? (
+ dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}] )
+ ${PYTHON_DEPS}"
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/Pyfa-${PV}
+
+src_prepare() {
+ # get rid of CRLF line endings introduced in 1.1.10 so patches work
+ edos2unix config.py pyfa.py service/settings.py
+
+ # make staticPath settable from configforced again
+ epatch "${FILESDIR}/${PN}-1.1.20-staticPath.patch"
+
+ # do not try to save exported html to python sitedir
+ epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"
+
+ # fix import path in the main script for systemwide installation
+ epatch "${FILESDIR}/${PN}-1.1.11-import-pyfa.patch"
+ touch __init__.py
+
+ pyfa_make_configforced() {
+ mkdir -p "${BUILD_DIR}" || die
+ sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+ -e "s:%%EPREFIX%%:${EPREFIX}:" \
+ "${FILESDIR}/configforced.py" > "${BUILD_DIR}/configforced.py"
+ sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+ pyfa.py > "${BUILD_DIR}/pyfa"
+ }
+ python_foreach_impl pyfa_make_configforced
+}
+
+src_install() {
+ pyfa_py_install() {
+ local packagedir=$(python_get_sitedir)/${PN}
+ insinto "${packagedir}"
+ doins -r eos gui icons service utils config*.py __init__.py gpl.txt
+ [[ -e info.py ]] && doins info.py # only in zip releases
+ doins "${BUILD_DIR}/configforced.py"
+ python_doscript "${BUILD_DIR}/pyfa"
+ python_optimize
+ }
+ python_foreach_impl pyfa_py_install
+
+ insinto /usr/share/${PN}
+ doins -r staticdata
+ dodoc README.md
+ insinto /usr/share/icons/hicolor/32x32/apps
+ doins icons/pyfa.png
+ insinto /usr/share/icons/hicolor/64x64/apps
+ newins icons/pyfa64.png pyfa.png
+ domenu "${FILESDIR}/${PN}.desktop"
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
index 8f22414..5e11d00 100644
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -15,7 +15,7 @@
SLOT="0"
if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="https://github.com/DarkFenX/Pyfa.git"
- inherit git-2
+ inherit git-r3
KEYWORDS=""
else
SRC_URI="https://github.com/DarkFenX/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
@@ -25,34 +25,34 @@
RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/sqlalchemy[${PYTHON_USEDEP}]
- dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+ dev-python/wxpython:3.0[${PYTHON_USEDEP}]
graph? (
dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}] )
${PYTHON_DEPS}"
-DEPEND="app-arch/unzip"
+DEPEND="app-arch/zip"
-S=${WORKDIR}/Pyfa-${PV}
+[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV}
src_prepare() {
# get rid of CRLF line endings introduced in 1.1.10 so patches work
edos2unix config.py pyfa.py service/settings.py
- # make staticPath settable from configforced again
- epatch "${FILESDIR}/${PN}-1.1.20-staticPath.patch"
+ # load gameDB and images from separate staticdata directory
+ epatch "${FILESDIR}/${PN}-1.15.1-staticdata.patch"
# do not try to save exported html to python sitedir
epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"
# fix import path in the main script for systemwide installation
- epatch "${FILESDIR}/${PN}-1.1.11-import-pyfa.patch"
+ epatch "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch"
touch __init__.py
pyfa_make_configforced() {
mkdir -p "${BUILD_DIR}" || die
sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-e "s:%%EPREFIX%%:${EPREFIX}:" \
- "${FILESDIR}/configforced.py" > "${BUILD_DIR}/configforced.py"
+ "${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py"
sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
pyfa.py > "${BUILD_DIR}/pyfa"
}
@@ -63,7 +63,7 @@
pyfa_py_install() {
local packagedir=$(python_get_sitedir)/${PN}
insinto "${packagedir}"
- doins -r eos gui icons service config*.py __init__.py gpl.txt
+ doins -r eos gui service utils config*.py __init__.py
[[ -e info.py ]] && doins info.py # only in zip releases
doins "${BUILD_DIR}/configforced.py"
python_doscript "${BUILD_DIR}/pyfa"
@@ -72,12 +72,19 @@
python_foreach_impl pyfa_py_install
insinto /usr/share/${PN}
- doins -r staticdata
+ doins eve.db
+
+ einfo "Compressing images ..."
+ pushd imgs > /dev/null || die
+ zip -r imgs.zip * || die "zip failed"
+ doins imgs.zip
+ popd > /dev/null || die
+
dodoc README.md
insinto /usr/share/icons/hicolor/32x32/apps
- doins icons/pyfa.png
+ doins imgs/gui/pyfa.png
insinto /usr/share/icons/hicolor/64x64/apps
- newins icons/pyfa64.png pyfa.png
+ newins imgs/gui/pyfa64.png pyfa.png
domenu "${FILESDIR}/${PN}.desktop"
}
diff --git a/gnome-base/dconf-editor/dconf-editor-3.16.1.ebuild b/gnome-base/dconf-editor/dconf-editor-3.16.1.ebuild
index 0eac9b6..16de800 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.16.1.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.16.1.ebuild
@@ -13,7 +13,7 @@
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
COMMON_DEPEND="
>=dev-libs/glib-2.39.3:2
diff --git a/gnome-base/dconf/dconf-0.24.0.ebuild b/gnome-base/dconf/dconf-0.24.0.ebuild
index 1f03a67..d2a2f8f 100644
--- a/gnome-base/dconf/dconf-0.24.0.ebuild
+++ b/gnome-base/dconf/dconf-0.24.0.ebuild
@@ -16,7 +16,7 @@
# TODO: coverage ?
IUSE="test"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
RDEPEND="
>=dev-libs/glib-2.39.1:2
diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml
index 78fb7ea..b7d56fb 100644
--- a/gnome-base/gdm/metadata.xml
+++ b/gnome-base/gdm/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>gnome</herd>
<use>
- <flag name="audit">Enable support for <pkg>sys-process/audit</pkg></flag>
<flag name="fprint">Enables experimental fingerprint authentication using
<pkg>sys-auth/fprintd</pkg></flag>
<flag name="plymouth">Enable support for smooth transition from
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
index ecc7fbc..9dc198f 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
@@ -15,7 +15,7 @@
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+caps debug pam selinux +ssh-agent test"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
COMMON_DEPEND="
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
index a96a3bf..01fe8e1 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
@@ -14,7 +14,7 @@
LICENSE="GPL-2 LGPL-2"
SLOT="2"
-KEYWORDS="alpha ~amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="acl gnutls ipv6 kerberos samba ssl zeroconf"
RDEPEND="
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
new file mode 100644
index 0000000..48d052b
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="https://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
+
+RDEPEND="
+ >=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+ >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+ gnome-base/gnome-mime-data
+ >=x11-misc/shared-mime-info-0.14
+ >=dev-libs/dbus-glib-0.100.2[${MULTILIB_USEDEP}]
+ acl? (
+ >=sys-apps/acl-2.2.52-r1[${MULTILIB_USEDEP}]
+ >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+ ssl? (
+ gnutls? (
+ >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
+ !gnome-extra/gnome-vfs-sftp )
+ !gnutls? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ !gnome-extra/gnome-vfs-sftp ) )
+ zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ gnome-base/gnome-common
+ >=dev-util/intltool-0.40
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ >=dev-util/gtk-doc-am-1.13
+"
+
+src_prepare() {
+ # Allow the Trash on afs filesystems (#106118)
+ epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
+
+ # Fix compiling with headers missing
+ epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
+
+ # Fix for crashes running programs via sudo
+ epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
+
+ # Fix automagic dependencies, upstream bug #493475
+ epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
+ epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
+
+ # Fix to identify ${HOME} (#200897)
+ # thanks to debian folks
+ epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
+
+ # Configure with gnutls-2.7, bug #253729
+ # Fix building with gnutls-2.12, bug #388895
+ epatch "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
+
+ # Prevent duplicated volumes, bug #193083
+ epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
+
+ # Do not build tests with FEATURES="-test", bug #226221
+ epatch "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
+
+ # Disable broken test, bug #285706
+ epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
+
+ # Fix for automake-1.13 compatibility, #466944
+ epatch "${FILESDIR}"/${P}-automake-1.13.patch
+
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --disable-schemas-install
+ --disable-static
+ --disable-cdda
+ --disable-fam
+ --disable-hal
+ --disable-howl
+ $(use_enable acl)
+ $(use_enable gnutls)
+ $(use_enable ipv6)
+ $(use_enable kerberos krb5)
+ $(use_enable samba)
+ $(use_enable ssl openssl)
+ $(use_enable zeroconf avahi)
+ # Useless ? --enable-http-neon
+
+ # fix path to krb5-config
+ KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
+ )
+
+ # this works because of the order of configure parsing
+ # so should always be behind the use_enable options
+ # foser <foser@gentoo.org 19 Apr 2004
+ use gnutls && use ssl && myconf+=( --disable-openssl )
+
+ #bug #519060
+ #configure script is so messed up on res_init on Darwin
+ [[ ${CHOST} == *-darwin* ]] && export LIBS="${LIBS} -lresolv"
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure "${myconf[@]}"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/html doc/html || die
+ fi
+}
+
+multilib_src_test() {
+ unset DISPLAY
+ # Fix bug #285706
+ unset XAUTHORITY
+ Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+ einstalldocs
+}
diff --git a/gnome-base/librsvg/librsvg-2.40.10.ebuild b/gnome-base/librsvg/librsvg-2.40.10.ebuild
index 8b17fa1..0da9f23 100644
--- a/gnome-base/librsvg/librsvg-2.40.10.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.10.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2"
SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+introspection vala tools"
REQUIRED_USE="
diff --git a/gnome-base/orbit/orbit-2.14.19-r4.ebuild b/gnome-base/orbit/orbit-2.14.19-r4.ebuild
index c0ae2a1..56e4a7c 100644
--- a/gnome-base/orbit/orbit-2.14.19-r4.ebuild
+++ b/gnome-base/orbit/orbit-2.14.19-r4.ebuild
@@ -30,7 +30,7 @@
src_prepare() {
# Fix wrong process kill, bug #268142
sed "s:killall lt-timeout-server:killall timeout-server:" \
- -i test/timeout.sh || die "sed 1 failed"
+ -i test/timeout.sh || die "sed 1 failed"
# Do not mess with CFLAGS
sed 's/-ggdb -O0//' -i configure.in configure || die "sed 2 failed"
diff --git a/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild b/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild
index 8291dc6..b8d0933 100644
--- a/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild
@@ -14,7 +14,7 @@
LICENSE="GPL-3"
SLOT="2.90"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE="cjk +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-extra/libgsf/libgsf-1.14.34.ebuild b/gnome-extra/libgsf/libgsf-1.14.34.ebuild
index 2dbe5cf..0ffe1d3 100644
--- a/gnome-extra/libgsf/libgsf-1.14.34.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.34.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 gtk +introspection"
RDEPEND="
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.16.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.16.1.ebuild
index e2bcefa..98a0861 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.16.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.16.1.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
SLOT="0"
IUSE=""
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
RDEPEND="
>=dev-libs/libxml2-2.6.12:=
diff --git a/kde-apps/kde-wallpapers/files/kde-wallpapers-15.08.0-kf5-port.patch b/kde-apps/kde-wallpapers/files/kde-wallpapers-15.08.0-kf5-port.patch
new file mode 100644
index 0000000..502837c
--- /dev/null
+++ b/kde-apps/kde-wallpapers/files/kde-wallpapers-15.08.0-kf5-port.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt 2015-08-30 14:18:57.169314811 +0200
++++ b/CMakeLists.txt 2015-08-30 14:17:34.534347890 +0200
+@@ -1,5 +1,10 @@
+-find_package(KDE4 REQUIRED)
+-include(KDE4Defaults)
++cmake_minimum_required(VERSION 2.8.12)
++
++find_package(ECM 0.0.9 REQUIRED NO_MODULE)
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++include(KDEInstallDirs)
++include(KDECMakeSettings)
+
+ install(DIRECTORY Ariya DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
+
diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild
index 8e2328c..96e4903 100644
--- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild
+++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild
@@ -13,8 +13,11 @@
KEYWORDS="~amd64 ~x86"
IUSE=""
+DEPEND="$(add_frameworks_dep extra-cmake-modules)"
RDEPEND="!kde-apps/kde-wallpapers:4"
+PATCHES=( "${FILESDIR}/${PN}-15.08.0-kf5-port.patch" ) # bug 559156
+
src_configure() {
local mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild
index 8e2328c..96e4903 100644
--- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild
+++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild
@@ -13,8 +13,11 @@
KEYWORDS="~amd64 ~x86"
IUSE=""
+DEPEND="$(add_frameworks_dep extra-cmake-modules)"
RDEPEND="!kde-apps/kde-wallpapers:4"
+PATCHES=( "${FILESDIR}/${PN}-15.08.0-kf5-port.patch" ) # bug 559156
+
src_configure() {
local mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
diff --git a/kde-apps/kdebase-data/kdebase-data-4.14.3-r1.ebuild b/kde-apps/kdebase-data/kdebase-data-4.14.3-r1.ebuild
index 430f3bb..f61aaf8 100644
--- a/kde-apps/kdebase-data/kdebase-data-4.14.3-r1.ebuild
+++ b/kde-apps/kdebase-data/kdebase-data-4.14.3-r1.ebuild
@@ -10,7 +10,7 @@
DESCRIPTION="Icons, localization data and various .desktop files from kdebase"
IUSE="+wallpapers"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
RDEPEND="
wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
diff --git a/kde-apps/kopete/kopete-4.14.3-r1.ebuild b/kde-apps/kopete/kopete-4.14.3-r1.ebuild
index e974cfe..69238a1 100644
--- a/kde-apps/kopete/kopete-4.14.3-r1.ebuild
+++ b/kde-apps/kopete/kopete-4.14.3-r1.ebuild
@@ -9,7 +9,7 @@
DESCRIPTION="KDE multi-protocol IM client"
HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug ssl v4l"
# tests hang, last checked for 4.2.96
diff --git a/kde-apps/kstars/kstars-4.14.3-r1.ebuild b/kde-apps/kstars/kstars-4.14.3-r1.ebuild
index 40de021..9bb8691 100644
--- a/kde-apps/kstars/kstars-4.14.3-r1.ebuild
+++ b/kde-apps/kstars/kstars-4.14.3-r1.ebuild
@@ -9,7 +9,7 @@
DESCRIPTION="KDE Desktop Planetarium"
HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug fits indi"
REQUIRED_USE="indi? ( fits )"
diff --git a/kde-apps/ktp-l10n/ktp-l10n-15.08.1.ebuild b/kde-apps/ktp-l10n/ktp-l10n-15.08.1.ebuild
index 56ff757..318810e 100644
--- a/kde-apps/ktp-l10n/ktp-l10n-15.08.1.ebuild
+++ b/kde-apps/ktp-l10n/ktp-l10n-15.08.1.ebuild
@@ -80,6 +80,8 @@
# We only want messages
sed -e '/messages/!s/^add_subdirectory/# DONT/'\
-i "${SDIR}"/CMakeLists.txt || die
+ sed -e '/KF5DocTools/ s/^/#/'\
+ -i "${SDIR}"/CMakeLists.txt || die
# Remove everything except kdenetwork
if [[ -d "${SDIR}/messages" ]] ; then
diff --git a/kde-apps/step/step-4.14.3.ebuild b/kde-apps/step/step-4.14.3.ebuild
index 02d6c02..f529586 100644
--- a/kde-apps/step/step-4.14.3.ebuild
+++ b/kde-apps/step/step-4.14.3.ebuild
@@ -5,7 +5,7 @@
EAPI=5
KDE_HANDBOOK="optional"
-inherit kde4-base
+inherit flag-o-matic kde4-base
DESCRIPTION="The KDE physics simulator"
HOMEPAGE="https://edu.kde.org/step"
@@ -20,6 +20,9 @@
RDEPEND="${DEPEND}"
src_configure() {
+ # bug 560884
+ use ppc64 && append-flags -mno-altivec
+
local mycmakeargs=(
$(cmake-utils_use_with gsl)
$(cmake-utils_use_with qalculate)
diff --git a/kde-base/akonadiconsole/Manifest b/kde-base/akonadiconsole/Manifest
index eef052f..7269a34 100644
--- a/kde-base/akonadiconsole/Manifest
+++ b/kde-base/akonadiconsole/Manifest
@@ -1,3 +1,2 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.14.3.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.14.3.ebuild
deleted file mode 100644
index eac668b..0000000
--- a/kde-base/akonadiconsole/akonadiconsole-4.14.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Akonadi developer console"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- >=app-office/akonadi-server-1.12.90
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- akonadi_next/
- calendarsupport/
- messageviewer/
-"
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.14.8.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.14.8.ebuild
index e1a7829..6f8bdbe 100644
--- a/kde-base/akonadiconsole/akonadiconsole-4.14.8.ebuild
+++ b/kde-base/akonadiconsole/akonadiconsole-4.14.8.ebuild
@@ -9,7 +9,7 @@
inherit kde4-meta
DESCRIPTION="Akonadi developer console"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/akregator/Manifest b/kde-base/akregator/Manifest
index 9443459..6508138 100644
--- a/kde-base/akregator/Manifest
+++ b/kde-base/akregator/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/akregator/akregator-4.14.3.ebuild b/kde-base/akregator/akregator-4.14.3.ebuild
deleted file mode 100644
index f303771..0000000
--- a/kde-base/akregator/akregator-4.14.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE news feed aggregator"
-HOMEPAGE="https://www.kde.org/applications/internet/akregator"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/akregator/akregator-4.14.8.ebuild b/kde-base/akregator/akregator-4.14.8.ebuild
index 46b40b5..2418505 100644
--- a/kde-base/akregator/akregator-4.14.8.ebuild
+++ b/kde-base/akregator/akregator-4.14.8.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="KDE news feed aggregator"
HOMEPAGE="https://www.kde.org/applications/internet/akregator"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/blogilo/Manifest b/kde-base/blogilo/Manifest
index 9443459..6508138 100644
--- a/kde-base/blogilo/Manifest
+++ b/kde-base/blogilo/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/blogilo/blogilo-4.14.3.ebuild b/kde-base/blogilo/blogilo-4.14.3.ebuild
deleted file mode 100644
index ef4fbc2..0000000
--- a/kde-base/blogilo/blogilo-4.14.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE Blogging Client"
-HOMEPAGE="https://www.kde.org/applications/internet/blogilo"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepim-common-libs)
- $(add_kdebase_dep kdepimlibs)
- >=net-libs/libkgapi-2.2.0:4
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- composereditor-ng/
- pimcommon/
-"
diff --git a/kde-base/blogilo/blogilo-4.14.8.ebuild b/kde-base/blogilo/blogilo-4.14.8.ebuild
index 3c5cdd2..5e291c4 100644
--- a/kde-base/blogilo/blogilo-4.14.8.ebuild
+++ b/kde-base/blogilo/blogilo-4.14.8.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="KDE Blogging Client"
HOMEPAGE="https://www.kde.org/applications/internet/blogilo"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/calendarjanitor/Manifest b/kde-base/calendarjanitor/Manifest
index eef052f..7269a34 100644
--- a/kde-base/calendarjanitor/Manifest
+++ b/kde-base/calendarjanitor/Manifest
@@ -1,3 +1,2 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/calendarjanitor/calendarjanitor-4.14.3.ebuild b/kde-base/calendarjanitor/calendarjanitor-4.14.3.ebuild
deleted file mode 100644
index 82908d9..0000000
--- a/kde-base/calendarjanitor/calendarjanitor-4.14.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A tool to scan calendar data for buggy instances"
-HOMEPAGE="https://www.kde.org/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepim-common-libs)
- $(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- calendarsupport/
-"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/calendarjanitor/calendarjanitor-4.14.8.ebuild b/kde-base/calendarjanitor/calendarjanitor-4.14.8.ebuild
index 8070925..20ec747 100644
--- a/kde-base/calendarjanitor/calendarjanitor-4.14.8.ebuild
+++ b/kde-base/calendarjanitor/calendarjanitor-4.14.8.ebuild
@@ -12,7 +12,7 @@
DESCRIPTION="A tool to scan calendar data for buggy instances"
HOMEPAGE="https://www.kde.org/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/freespacenotifier/Manifest b/kde-base/freespacenotifier/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/freespacenotifier/Manifest
+++ b/kde-base/freespacenotifier/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/freespacenotifier/freespacenotifier-4.11.14.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.11.14.ebuild
deleted file mode 100644
index abf0126..0000000
--- a/kde-base/freespacenotifier/freespacenotifier-4.11.14.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A module that monitors free disk space on the home dir"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/freespacenotifier/freespacenotifier-4.11.19.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.11.19.ebuild
index eadcfc2..abf0126 100644
--- a/kde-base/freespacenotifier/freespacenotifier-4.11.19.ebuild
+++ b/kde-base/freespacenotifier/freespacenotifier-4.11.19.ebuild
@@ -8,5 +8,5 @@
inherit kde4-meta
DESCRIPTION="A module that monitors free disk space on the home dir"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
diff --git a/kde-base/kabcclient/Manifest b/kde-base/kabcclient/Manifest
index 9443459..6508138 100644
--- a/kde-base/kabcclient/Manifest
+++ b/kde-base/kabcclient/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kabcclient/kabcclient-4.14.3.ebuild b/kde-base/kabcclient/kabcclient-4.14.3.ebuild
deleted file mode 100644
index 7039bed..0000000
--- a/kde-base/kabcclient/kabcclient-4.14.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A command line client for accessing the KDE addressbook"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
- kde4-meta_src_install
-
- # work around NULL DT_RPATH in kabc2mutt
- dosym kabcclient ${PREFIX}/bin/kabc2mutt
-}
diff --git a/kde-base/kabcclient/kabcclient-4.14.8.ebuild b/kde-base/kabcclient/kabcclient-4.14.8.ebuild
index 888c30a..0eb1b8e 100644
--- a/kde-base/kabcclient/kabcclient-4.14.8.ebuild
+++ b/kde-base/kabcclient/kabcclient-4.14.8.ebuild
@@ -11,7 +11,7 @@
inherit kde4-meta
DESCRIPTION="A command line client for accessing the KDE addressbook"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index 9443459..6508138 100644
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-base/kaddressbook/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kaddressbook/kaddressbook-4.14.3.ebuild b/kde-base/kaddressbook/kaddressbook-4.14.3.ebuild
deleted file mode 100644
index 3519288..0000000
--- a/kde-base/kaddressbook/kaddressbook-4.14.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Address Book"
-HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- >=dev-libs/grantlee-0.2.0:0
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
- !kde-base/contactthemeeditor
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="
- grantleeeditor/contactthemeeditor
- plugins/kaddressbook/
- plugins/ktexteditor/
-"
-KMCOMPILEONLY="
- grantleetheme/
- kaddressbookgrantlee/
-"
-KMEXTRACTONLY="
- akonadi_next/
- calendarsupport/
- grantleeeditor/grantleethemeeditor/
- libkleo/
- pimcommon/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-pkg_postinst() {
- kde4-meta_pkg_postinst
-
- if ! has_version kde-base/kdepim-kresources:${SLOT}; then
- echo
- elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
- echo
- fi
-}
diff --git a/kde-base/kaddressbook/kaddressbook-4.14.8.ebuild b/kde-base/kaddressbook/kaddressbook-4.14.8.ebuild
index b3e2b55..65f981b 100644
--- a/kde-base/kaddressbook/kaddressbook-4.14.8.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.14.8.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="The KDE Address Book"
HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest
index 9443459..6508138 100644
--- a/kde-base/kalarm/Manifest
+++ b/kde-base/kalarm/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kalarm/kalarm-4.14.3.ebuild b/kde-base/kalarm/kalarm-4.14.3.ebuild
deleted file mode 100644
index 8f7414f..0000000
--- a/kde-base/kalarm/kalarm-4.14.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-HOMEPAGE+=" https://userbase.kde.org/KAlarm"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
- media-libs/phonon[qt4]
- x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-KMEXTRACTONLY="
- kmail/
-"
diff --git a/kde-base/kalarm/kalarm-4.14.8.ebuild b/kde-base/kalarm/kalarm-4.14.8.ebuild
index c710d43..f5d6aaf 100644
--- a/kde-base/kalarm/kalarm-4.14.8.ebuild
+++ b/kde-base/kalarm/kalarm-4.14.8.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
HOMEPAGE+=" https://userbase.kde.org/KAlarm"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND="
diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/kcheckpass/Manifest
+++ b/kde-base/kcheckpass/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kcheckpass/kcheckpass-4.11.14.ebuild b/kde-base/kcheckpass/kcheckpass-4.11.14.ebuild
deleted file mode 100644
index 02ff0dc..0000000
--- a/kde-base/kcheckpass/kcheckpass-4.11.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A simple password checker, used by any software in need of user authentication"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug pam"
-
-RDEPEND="
- pam? (
- >=kde-base/kdebase-pam-7
- virtual/pam
- )
-"
-
-src_prepare() {
- kde4-meta_src_prepare
-
- use pam && epatch "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with pam)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/kcheckpass/kcheckpass-4.11.19.ebuild b/kde-base/kcheckpass/kcheckpass-4.11.19.ebuild
index ff3952a..02ff0dc 100644
--- a/kde-base/kcheckpass/kcheckpass-4.11.19.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.11.19.ebuild
@@ -8,7 +8,7 @@
inherit kde4-meta
DESCRIPTION="A simple password checker, used by any software in need of user authentication"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug pam"
RDEPEND="
diff --git a/kde-base/kcminit/Manifest b/kde-base/kcminit/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/kcminit/Manifest
+++ b/kde-base/kcminit/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kcminit/kcminit-4.11.14.ebuild b/kde-base/kcminit/kcminit-4.11.14.ebuild
deleted file mode 100644
index 9079e06..0000000
--- a/kde-base/kcminit/kcminit-4.11.14.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KCMInit - runs startups initialization for Control Modules"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kcminit/kcminit-4.11.19.ebuild b/kde-base/kcminit/kcminit-4.11.19.ebuild
index b56cf88..9079e06 100644
--- a/kde-base/kcminit/kcminit-4.11.19.ebuild
+++ b/kde-base/kcminit/kcminit-4.11.19.ebuild
@@ -8,7 +8,7 @@
inherit kde4-meta
DESCRIPTION="KCMInit - runs startups initialization for Control Modules"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kdebase-cursors/Manifest b/kde-base/kdebase-cursors/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/kdebase-cursors/Manifest
+++ b/kde-base/kdebase-cursors/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.11.14.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.11.14.ebuild
deleted file mode 100644
index de20585..0000000
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.11.14.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="cursors"
-inherit kde4-meta
-
-DESCRIPTION="oxygen cursors from kdebase"
-IUSE=""
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.11.19.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.11.19.ebuild
index a5e787c..de20585 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.11.19.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-4.11.19.ebuild
@@ -10,4 +10,4 @@
DESCRIPTION="oxygen cursors from kdebase"
IUSE=""
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.14.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.14.ebuild
deleted file mode 100644
index dd32d36..0000000
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.14.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMNOMODULE="true"
-inherit kde4-meta prefix
-
-DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+wallpapers"
-
-# The KDE apps called from the startkde script.
-# These provide the most minimal KDE desktop.
-RDEPEND="
- $(add_kdebase_dep kcminit)
- $(add_kdeapps_dep kdebase-runtime-meta)
- wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
- $(add_kdeapps_dep kfmclient)
- $(add_kdeapps_dep knotify)
- $(add_kdeapps_dep kreadconfig)
- $(add_kdebase_dep krunner)
- $(add_kdebase_dep ksmserver)
- $(add_kdebase_dep ksplash)
- $(add_kdebase_dep kstartupconfig)
- $(add_kdebase_dep kwin)
- $(add_kdeapps_dep phonon-kde)
- $(add_kdeapps_dep plasma-apps)
- $(add_kdebase_dep plasma-workspace)
- $(add_kdebase_dep systemsettings)
- x11-apps/mkfontdir
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrandr
- x11-apps/xrdb
- x11-apps/xsetroot
- x11-apps/xset
-"
-
-KMEXTRACTONLY="
- ConfigureChecks.cmake
- kdm/
- startkde.cmake
-"
-
-PATCHES=(
- "${FILESDIR}/gentoo-startkde4-4.patch"
- "${FILESDIR}/${PN}-kscreen.patch"
-)
-
-src_prepare() {
- kde4-meta_src_prepare
-
- cp "${FILESDIR}/KDE-4" "${T}"
-
- # fix ${EPREFIX}
- eprefixify startkde.cmake "${T}/KDE-4"
-}
-
-src_install() {
- kde4-meta_src_install
-
- # startup and shutdown scripts
- insinto /etc/kde/startup
- doins "${FILESDIR}/agent-startup.sh"
-
- insinto /etc/kde/shutdown
- doins "${FILESDIR}/agent-shutdown.sh"
-
- # x11 session script
- exeinto /etc/X11/Sessions
- doexe "${T}/KDE-4"
-
- # freedesktop compliant session script
- sed -e "s:\${BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \
- "${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop"
- insinto /usr/share/xsessions
- doins "${T}/KDE-4.desktop"
-}
-
-pkg_postinst () {
- kde4-meta_pkg_postinst
-
- echo
- elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
- elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
- elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
- echo
- elog "The name of the session script has changed."
- elog "If you currently have XSESSION=\"kde-$(get_kde_version)\" in your"
- elog "configuration files, you will need to change it to"
- elog "XSESSION=\"KDE-4\""
-}
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.19.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.19.ebuild
index 3e8de63..dd32d36 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.19.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.19.ebuild
@@ -9,7 +9,7 @@
inherit kde4-meta prefix
DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="+wallpapers"
# The KDE apps called from the startkde script.
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
index 3785171..dab7cbe 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
@@ -17,7 +17,7 @@
RDEPEND="
$(add_kdebase_dep kcminit)
$(add_kdeapps_dep kdebase-runtime-meta)
- wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
+ wallpapers? ( || ( $(add_kdeapps_dep kde-wallpapers) kde-apps/kde-wallpapers:5 ) )
$(add_kdeapps_dep kfmclient)
$(add_kdeapps_dep knotify)
$(add_kdeapps_dep kreadconfig)
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 9c429df..6373821 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,5 +1,2 @@
-DIST kdelibs-4.14.10.tar.xz 11644204 SHA256 00f5a7bdb0b2bcb786ea630844c639ebe89c45eb1e88443dde421baa0895ca94 SHA512 051322f6ee24e09f7b705e17aa8cc755bc6728855afe5b310910e976737167d7902f01a6a8ca51b60b1f0904429522d35eeec1b09ac6cfbdcab97e0fdd5429df WHIRLPOOL 4d4b8d6c25af95e4074606f5ffa7f33134a6a625a22ba7912b1b1a5af3474702d9adc12e71da86cedf46ac150678e53dd7a8bafb444a3b687f1efb633af7ff2d
-DIST kdelibs-4.14.11.tar.xz 11631188 SHA256 981274f1e34c9a73593faf347bdb524b476391ddb1919c5ab39365d7f1aa573c SHA512 f0d634a7b4475d32c68f4b04cd032c45de200343349d2880ef625434ce6df17c6b6f040db6fcff29bbfd98df6f2d6540cd4d3e5d977490dbbe28f038a0ffa561 WHIRLPOOL 3865c46dde6da33ddd26765545d6919f69813330f38fe7ec50e6f2885191f45b224cc33abcebb2350df0ffbce7e252d83cfcb04c28742c351dbfbdfbeaf5fb70
DIST kdelibs-4.14.12.tar.xz 11633140 SHA256 2f17d34af6bc7383625df5562239418c808afd7df462073331bd82a84b1f97e8 SHA512 f04b69bffa67ab76457e56c784604e59270bab081694aa5d19d7b19cc190b9c49c25de2ac8f05c49b2dd09b6c47efc091976d2845c4f3eedecda15feffedb20d WHIRLPOOL 7b9474387bad9e1929cbde352c4b30368dca50d7d7d4862b47fb8b1452528655f3fa4461843dcc26c5b704f3a0d87f2637e4a167c1ae75a4d67833f36bc02115
-DIST kdelibs-4.14.3.tar.xz 11600500 SHA256 f8206da1106184ef0bd031b82701c4910b8dade331c4cdaf1cd9c6c5208cfd9e SHA512 7713cec4851fd4d7d5376afd905515902395ca469cefe1924c05ac0cd4499c28ab6a3c3e7bee10c4cfb3584f2fe93cfb6129d5b550d56d18217866f5fde748cf WHIRLPOOL 9b6d525136cee8e43b832dbbe7451494cc30e15cc58cc34eeab8c9040a9cbe893dc8ba794be50cdb3462e20279bfb41bee22385d3d106a353ef738da510f5c04
DIST kdelibs-4.14.8.tar.xz 11648060 SHA256 705fa8a9b3b3c962aa99d040eb32e68863ba4c2f567b82b9513379defbc39bbb SHA512 0cd5e8dd5cec7cf84bc66c6732f4967610211e521898da41601d24174f909043bafacbb9bd9775666cebb132747e2861c6c8ff07de61be708975f44dbbfb856e WHIRLPOOL 6405ee6b273899a26c39fa005c18be7270888113f93302990003b92ca96c52303ce853c5378c812f4ddf53f40c7b6ff9e2a958bc86a676d1e3abbfe4f3d96bd4
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.0-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.14.0-mimetypes.patch
deleted file mode 100644
index 5e54390..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.14.0-mimetypes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Remove fake MIME types that cause warnings.
-
-The offending MIME types are commented out rather than
-physically removed because doing so would cause the patch
-to be too large.
-
-diff --git a/mimetypes/kde.xml b/mimetypes/kde.xml
-index 76303db..23351c4 100644
---- a/mimetypes/kde.xml
-+++ b/mimetypes/kde.xml
-@@ -1783,8 +1783,8 @@ Notes:
- </magic>
- <glob pattern="*.abc"/>
- </mime-type>
--
-- <!-- all/ fake mime types -->
-+<!--
-+ all/ fake mime types
- <mime-type type="all/all">
- <comment>all files and folders</comment>
- <comment xml:lang="ar">كل الملفات و المجلدات</comment>
-@@ -1902,7 +1902,7 @@ Notes:
- <comment xml:lang="zh_TW">所有檔案</comment>
- </mime-type>
-
-- <!-- uri/ fake mime types -->
-+ uri/ fake mime types
- <mime-type type="uri/mms">
- <comment>mms: URIs</comment>
- <comment xml:lang="ar">mms: وصلات</comment>
-@@ -2245,7 +2245,7 @@ Notes:
- <comment xml:lang="zh_CN">rtspu: 地址</comment>
- <comment xml:lang="zh_TW">rtspu: 網址</comment>
- </mime-type>
--
-+-->
- <mime-type type="application/vnd.kde.fontspackage">
- <sub-class-of type="application/zip"/>
- <comment>fonts package</comment>
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.3-trim-crash.patch b/kde-base/kdelibs/files/kdelibs-4.14.3-trim-crash.patch
deleted file mode 100644
index 12c84dc..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.14.3-trim-crash.patch
+++ /dev/null
@@ -1,610 +0,0 @@
-From 570425a30c008297df09ef48b60486108fcf33e9 Mon Sep 17 00:00:00 2001
-From: Andrea Iacovitti <aiacovitti@libero.it>
-Date: Tue, 11 Nov 2014 07:54:28 +0100
-Subject: [PATCH] Introduce DOMString::trimSpaces(), useful for removing space
- characters from url string.
-
----
- khtml/css/css_valueimpl.cpp | 4 ++--
- khtml/css/cssparser.cpp | 4 ++--
- khtml/dom/dom_string.cpp | 32 ++++++++++++++++++++++++++++++++
- khtml/dom/dom_string.h | 7 +++++++
- khtml/dom/html_base.cpp | 8 ++++----
- khtml/dom/html_document.cpp | 2 +-
- khtml/dom/html_form.cpp | 4 ++--
- khtml/dom/html_head.cpp | 12 ++++++------
- khtml/dom/html_image.cpp | 8 ++++----
- khtml/dom/html_inline.cpp | 4 ++--
- khtml/ecma/kjs_html.cpp | 4 ++--
- khtml/ecma/xmlhttprequest.cpp | 3 ++-
- khtml/html/html_baseimpl.cpp | 6 +++---
- khtml/html/html_formimpl.cpp | 2 +-
- khtml/html/html_headimpl.cpp | 12 ++++++------
- khtml/html/html_imageimpl.cpp | 6 +++---
- khtml/html/html_inlineimpl.cpp | 2 +-
- khtml/html/html_objectimpl.cpp | 4 ++--
- khtml/html/html_tableimpl.cpp | 4 ++--
- khtml/html/htmlparser.cpp | 4 ++--
- khtml/html/htmlprospectivetokenizer.cpp | 4 ++--
- khtml/khtml_part.cpp | 4 ++--
- khtml/khtmlview.cpp | 2 +-
- khtml/rendering/render_image.cpp | 8 ++++----
- khtml/xml/dom_docimpl.cpp | 7 ++++---
- 25 files changed, 99 insertions(+), 58 deletions(-)
-
-diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp
-index 98f33e6..aa825b7 100644
---- a/khtml/css/css_valueimpl.cpp
-+++ b/khtml/css/css_valueimpl.cpp
-@@ -1383,9 +1383,9 @@ CSSImageValueImpl::CSSImageValueImpl(const DOMString &url, StyleBaseImpl* style)
- : CSSPrimitiveValueImpl(url, CSSPrimitiveValue::CSS_URI)
- {
- m_image = 0;
-- const QString imgUrl = url.string().trimmed();
-+ const DOMString imgUrl = url.trimSpaces();
- if (!imgUrl.isEmpty()) {
-- m_fullImageUrl = KUrl(style->baseURL(), imgUrl).url();
-+ m_fullImageUrl = KUrl(style->baseURL(), imgUrl.string()).url();
- } else {
- m_fullImageUrl.clear();
- }
-diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp
-index e8f8493..600d205 100644
---- a/khtml/css/cssparser.cpp
-+++ b/khtml/css/cssparser.cpp
-@@ -2309,8 +2309,8 @@ bool CSSParser::parseFontFaceSrc()
- while ((val = valueList->current())) {
- CSSFontFaceSrcValueImpl* parsedValue = 0;
- if (val->unit == CSSPrimitiveValue::CSS_URI && !expectComma && styleElement) {
-- const QString uri = qString(val->string).trimmed();
-- parsedValue = new CSSFontFaceSrcValueImpl(DOMString(KUrl(styleElement->baseURL(), uri).url()), false /*local*/);
-+ const DOMString uri = domString(val->string).trimSpaces();
-+ parsedValue = new CSSFontFaceSrcValueImpl(DOMString(KUrl(styleElement->baseURL(), uri.string()).url()), false /*local*/);
- uriValue = parsedValue;
- allowFormat = true;
- expectComma = true;
-diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp
-index d54d037..4a10221 100644
---- a/khtml/dom/dom_string.cpp
-+++ b/khtml/dom/dom_string.cpp
-@@ -290,6 +290,38 @@ bool DOMString::startsWith(const DOMString& str) const
- return impl->startsWith(str.implementation());
- }
-
-+static inline bool isSpaceCharacter(const ushort &c)
-+{
-+ // http://dev.w3.org/html5/spec-LC/common-microsyntaxes.html#space-character
-+ return ((c < 0x0021) &&
-+ (c == 0x0020 || c == 0x0009 || c == 0x000A || c == 0x000C || c == 0x000D));
-+}
-+
-+DOMString DOMString::trimSpaces() const
-+{
-+ if (!impl || !impl->l) {
-+ return *this;
-+ }
-+
-+ const QChar *s = impl->s;
-+ unsigned int start = 0;
-+ unsigned int end = impl->l - 1;
-+
-+ while ((start <= end) && isSpaceCharacter(s[start].unicode())) {
-+ ++start;
-+ }
-+
-+ if (start > end) {
-+ return DOMString("");
-+ }
-+
-+ while (end && isSpaceCharacter(s[end].unicode())) {
-+ --end;
-+ }
-+
-+ return new DOMStringImpl(s + start, end - start + 1);
-+}
-+
- // ------------------------------------------------------------------------
-
- bool DOM::strcasecmp( const DOMString &as, const DOMString &bs )
-diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h
-index 13b4265..84b1378 100644
---- a/khtml/dom/dom_string.h
-+++ b/khtml/dom/dom_string.h
-@@ -125,6 +125,13 @@ public:
- bool startsWith(const DOMString& str) const;
-
- /**
-+ * Returns a string with Space Characters removed from the start and the end.
-+ * Space Characters as defined in
-+ * http://dev.w3.org/html5/spec-LC/common-microsyntaxes.html#space-character
-+ */
-+ DOMString trimSpaces() const;
-+
-+ /**
- * @internal get a handle to the imlementation of the DOMString
- * Use at own risk!!!
- */
-diff --git a/khtml/dom/html_base.cpp b/khtml/dom/html_base.cpp
-index c5e9048..11ee331 100644
---- a/khtml/dom/html_base.cpp
-+++ b/khtml/dom/html_base.cpp
-@@ -231,8 +231,8 @@ void HTMLFrameElement::setScrolling( const DOMString &value )
- DOMString HTMLFrameElement::src() const
- {
- if(!impl) return DOMString();
-- const QString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).string().trimmed();
-- return !s.isNull() ? impl->document()->completeURL(s) : DOMString();
-+ const DOMString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).trimSpaces();
-+ return !s.isNull() ? impl->document()->completeURL(s.string()) : s;
- }
-
- void HTMLFrameElement::setSrc( const DOMString &value )
-@@ -367,8 +367,8 @@ void HTMLIFrameElement::setScrolling( const DOMString &value )
- DOMString HTMLIFrameElement::src() const
- {
- if(!impl) return DOMString();
-- const QString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).string().trimmed();
-- return !s.isNull() ? impl->document()->completeURL(s) : DOMString();
-+ const DOMString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).trimSpaces();
-+ return !s.isNull() ? impl->document()->completeURL(s.string()) : s;
- }
-
- void HTMLIFrameElement::setSrc( const DOMString &value )
-diff --git a/khtml/dom/html_document.cpp b/khtml/dom/html_document.cpp
-index 042bc5a..2acf683 100644
---- a/khtml/dom/html_document.cpp
-+++ b/khtml/dom/html_document.cpp
-@@ -100,7 +100,7 @@ DOMString HTMLDocument::referrer() const
- DOMString HTMLDocument::completeURL(const DOMString& str) const
- {
- if(!impl) return str;
-- return ((HTMLDocumentImpl *)impl)->completeURL(str.string().trimmed());
-+ return ((HTMLDocumentImpl *)impl)->completeURL(str.trimSpaces().string());
- }
-
- DOMString HTMLDocument::domain() const
-diff --git a/khtml/dom/html_form.cpp b/khtml/dom/html_form.cpp
-index 425cb3d..6d44261 100644
---- a/khtml/dom/html_form.cpp
-+++ b/khtml/dom/html_form.cpp
-@@ -504,8 +504,8 @@ void HTMLInputElement::setSize( long value )
- DOMString HTMLInputElement::src() const
- {
- if(!impl) return DOMString();
-- const QString s = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_SRC).string().trimmed();
-- return !s.isNull() ? impl->document()->completeURL(s) : DOMString();
-+ const DOMString s = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_SRC).trimSpaces();
-+ return !s.isNull() ? impl->document()->completeURL(s.string()) : s;
- }
-
- void HTMLInputElement::setSrc( const DOMString &value )
-diff --git a/khtml/dom/html_head.cpp b/khtml/dom/html_head.cpp
-index 4812631..23fe125 100644
---- a/khtml/dom/html_head.cpp
-+++ b/khtml/dom/html_head.cpp
-@@ -58,8 +58,8 @@ HTMLBaseElement::~HTMLBaseElement()
- DOMString HTMLBaseElement::href() const
- {
- if(!impl) return DOMString();
-- const QString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).string().trimmed();
-- return !href.isNull() ? impl->document()->completeURL(href) : DOMString();
-+ const DOMString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).trimSpaces();
-+ return !href.isNull() ? impl->document()->completeURL(href.string()) : href;
- }
-
- void HTMLBaseElement::setHref( const DOMString &value )
-@@ -134,8 +134,8 @@ void HTMLLinkElement::setCharset( const DOMString &value )
- DOMString HTMLLinkElement::href() const
- {
- if(!impl) return DOMString();
-- const QString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).string().trimmed();
-- return !href.isNull() ? impl->document()->completeURL(href) : DOMString();
-+ const DOMString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).trimSpaces();
-+ return !href.isNull() ? impl->document()->completeURL(href.string()) : href;
- }
-
- void HTMLLinkElement::setHref( const DOMString &value )
-@@ -379,8 +379,8 @@ void HTMLScriptElement::setDefer( bool _defer )
- DOMString HTMLScriptElement::src() const
- {
- if(!impl) return DOMString();
-- const QString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).string().trimmed();
-- return !s.isNull() ? impl->document()->completeURL(s) : DOMString();
-+ const DOMString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).trimSpaces();
-+ return !s.isNull() ? impl->document()->completeURL(s.string()) : s;
- }
-
- void HTMLScriptElement::setSrc( const DOMString &value )
-diff --git a/khtml/dom/html_image.cpp b/khtml/dom/html_image.cpp
-index db1f5ea..a8b4ae0 100644
---- a/khtml/dom/html_image.cpp
-+++ b/khtml/dom/html_image.cpp
-@@ -95,8 +95,8 @@ void HTMLAreaElement::setCoords( const DOMString &value )
- DOMString HTMLAreaElement::href() const
- {
- if(!impl) return DOMString();
-- const QString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).string().trimmed();
-- return !href.isNull() ? impl->document()->completeURL(href) : DOMString();
-+ const DOMString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).trimSpaces();
-+ return !href.isNull() ? impl->document()->completeURL(href.string()) : href;
- }
-
- void HTMLAreaElement::setHref( const DOMString &value )
-@@ -302,8 +302,8 @@ void HTMLImageElement::setLongDesc( const DOMString &value )
- DOMString HTMLImageElement::src() const
- {
- if(!impl) return DOMString();
-- const QString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).string().trimmed();
-- return !s.isNull() ? impl->document()->completeURL(s) : DOMString();
-+ const DOMString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).trimSpaces();
-+ return !s.isNull() ? impl->document()->completeURL(s.string()) : s;
- }
-
- void HTMLImageElement::setSrc( const DOMString &value )
-diff --git a/khtml/dom/html_inline.cpp b/khtml/dom/html_inline.cpp
-index c01f668..2f74713 100644
---- a/khtml/dom/html_inline.cpp
-+++ b/khtml/dom/html_inline.cpp
-@@ -95,8 +95,8 @@ void HTMLAnchorElement::setCoords( const DOMString &value )
- DOMString HTMLAnchorElement::href() const
- {
- if(!impl) return DOMString();
-- const QString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).string().trimmed();
-- return !href.isNull() ? impl->document()->completeURL(href) : DOMString();
-+ const DOMString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).trimSpaces();
-+ return !href.isNull() ? impl->document()->completeURL(href.string()) : href;
- }
-
- void HTMLAnchorElement::setHref( const DOMString &value )
-diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp
-index ea15929..d5693af 100644
---- a/khtml/ecma/kjs_html.cpp
-+++ b/khtml/ecma/kjs_html.cpp
-@@ -1587,8 +1587,8 @@ QHash<int, const HTMLElement::BoundPropInfo*>* HTMLElement::boundPropInfo()
-
- QString KJS::HTMLElement::getURLArg(unsigned id) const
- {
-- const QString rel = impl()->getAttribute(id).string().trimmed();
-- return !rel.isNull() ? impl()->document()->completeURL(rel) : rel;
-+ const DOMString rel = impl()->getAttribute(id).trimSpaces();
-+ return !rel.isNull() ? impl()->document()->completeURL(rel.string()) : QString();
- }
-
- DOM::HTMLElementImpl *toHTMLElement(JSValue *val) {
-diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp
-index f9fae5d..45c5a4b 100644
---- a/khtml/ecma/xmlhttprequest.cpp
-+++ b/khtml/ecma/xmlhttprequest.cpp
-@@ -906,7 +906,8 @@ JSValue *XMLHttpRequestProtoFunc::callAsFunction(ExecState *exec, JSObject *this
- return throwError(exec, SyntaxError, "Not enough arguments");
-
- QString method = args[0]->toString(exec).qstring();
-- KUrl url = KUrl(request->doc->completeURL(args[1]->toString(exec).qstring()));
-+ DOMString urlArg = args[1]->toString(exec).domString().trimSpaces();
-+ KUrl url = KUrl(request->doc->completeURL(urlArg.string()));
-
- bool async = true;
- if (args.size() >= 3) {
-diff --git a/khtml/html/html_baseimpl.cpp b/khtml/html/html_baseimpl.cpp
-index 5b4a77a..102b56e 100644
---- a/khtml/html/html_baseimpl.cpp
-+++ b/khtml/html/html_baseimpl.cpp
-@@ -71,7 +71,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr)
-
- case ATTR_BACKGROUND:
- {
-- QString url = attr->val()->string().trimmed();
-+ QString url = attr->value().trimSpaces().string();
- if (!url.isEmpty()) {
- url = document()->completeURL( url );
- addCSSProperty(CSS_PROP_BACKGROUND_IMAGE, DOMString("url('"+url+"')") );
-@@ -325,7 +325,7 @@ void HTMLFrameElementImpl::parseAttribute(AttributeImpl *attr)
- switch(attr->id())
- {
- case ATTR_SRC:
-- setLocation(attr->value().string().trimmed());
-+ setLocation(attr->value().trimSpaces().string());
- break;
- case ATTR_FRAMEBORDER:
- {
-@@ -755,7 +755,7 @@ void HTMLIFrameElementImpl::parseAttribute(AttributeImpl *attr )
- addHTMLAlignment( attr->value() );
- break;
- case ATTR_SRC:
-- url = attr->value().string().trimmed();
-+ url = attr->value().trimSpaces().string();
- setNeedComputeContent();
- // ### synchronously start the process?
- break;
-diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp
-index 134851a..d227481 100644
---- a/khtml/html/html_formimpl.cpp
-+++ b/khtml/html/html_formimpl.cpp
-@@ -679,7 +679,7 @@ void HTMLFormElementImpl::submit( )
- }
- #endif // KHTML_NO_WALLET
-
-- QString url = getAttribute(ATTR_ACTION).string().trimmed();
-+ QString url = getAttribute(ATTR_ACTION).trimSpaces().string();
- // ignore base url if 'action' attribute is empty.
- if (url.isEmpty())
- url = formUrl.url();
-diff --git a/khtml/html/html_headimpl.cpp b/khtml/html/html_headimpl.cpp
-index 0de904d..a265ae1 100644
---- a/khtml/html/html_headimpl.cpp
-+++ b/khtml/html/html_headimpl.cpp
-@@ -55,7 +55,7 @@ void HTMLBaseElementImpl::parseAttribute(AttributeImpl *attr)
- switch(attr->id())
- {
- case ATTR_HREF:
-- m_href = attr->value().string().trimmed();
-+ m_href = attr->value().trimSpaces().string();
- process();
- break;
- case ATTR_TARGET:
-@@ -116,9 +116,9 @@ void HTMLLinkElementImpl::parseAttribute(AttributeImpl *attr)
- switch (attr->id())
- {
- case ATTR_HREF: {
-- const QString hrefUrl = attr->val()->string().trimmed();
-+ const DOMString hrefUrl = attr->value().trimSpaces();
- if (!hrefUrl.isEmpty()) {
-- m_url = document()->completeURL(hrefUrl);
-+ m_url = document()->completeURL(hrefUrl.string());
- }
- process();
- break;
-@@ -385,7 +385,7 @@ void HTMLScriptElementImpl::parseAttribute(AttributeImpl *attr)
- // we'll only start doing things once we get insertedIntoDocument()
- if (m_evaluated || m_cachedScript || m_createdByParser || !inDocument())
- return;
-- QString url = attr->value().string().trimmed();
-+ const DOMString url = attr->value().trimSpaces();
- if (!url.isEmpty())
- loadFromUrl(url);
- break;
-@@ -490,7 +490,7 @@ void HTMLScriptElementImpl::insertedIntoDocument()
- if (m_createdByParser)
- return;
-
-- QString url = getAttribute(ATTR_SRC).string().trimmed();
-+ const DOMString url = getAttribute(ATTR_SRC).trimSpaces();
- if (!url.isEmpty()) {
- loadFromUrl(url);
- return;
-@@ -622,7 +622,7 @@ void HTMLScriptElementImpl::setDefer(bool defer)
-
- DOMString HTMLScriptElementImpl::src() const
- {
-- return document()->completeURL(getAttribute(ATTR_SRC).string().trimmed());
-+ return document()->completeURL(getAttribute(ATTR_SRC).trimSpaces().string());
- }
-
- void HTMLScriptElementImpl::setSrc(const DOMString &value)
-diff --git a/khtml/html/html_imageimpl.cpp b/khtml/html/html_imageimpl.cpp
-index 51695a8..15a8302 100644
---- a/khtml/html/html_imageimpl.cpp
-+++ b/khtml/html/html_imageimpl.cpp
-@@ -84,7 +84,7 @@ void HTMLImageElementImpl::parseAttribute(AttributeImpl *attr)
- setChanged();
-
- //Start loading the image already, to generate events
-- const QString imgSrcUrl = attr->value().string().trimmed();
-+ const DOMString imgSrcUrl = attr->value().trimSpaces();
- if (!imgSrcUrl.isEmpty()) { //### why do we not hide or something when setting this?
- CachedImage* newImage = document()->docLoader()->requestImage(imgSrcUrl);
- if (newImage && newImage != m_image) {
-@@ -151,7 +151,7 @@ void HTMLImageElementImpl::parseAttribute(AttributeImpl *attr)
- if ( attr->value()[0] == '#' )
- usemap = attr->value().lower();
- else {
-- QString url = document()->completeURL(attr->value().string().trimmed());
-+ QString url = document()->completeURL(attr->value().trimSpaces().string());
- // ### we remove the part before the anchor and hope
- // the map is on the same html page....
- usemap = url;
-@@ -438,7 +438,7 @@ void HTMLMapElementImpl::parseAttribute(AttributeImpl *attr)
- }
- else {
- // add name with full url:
-- const QString url = document()->completeURL(attr->value().string().trimmed());
-+ const QString url = document()->completeURL(attr->value().trimSpaces().string());
- if(document()->isHTMLDocument())
- static_cast<HTMLDocumentImpl*>(document())->mapMap[url] = this;
- }
-diff --git a/khtml/html/html_inlineimpl.cpp b/khtml/html/html_inlineimpl.cpp
-index fc2e6f6..6e9bdd8 100644
---- a/khtml/html/html_inlineimpl.cpp
-+++ b/khtml/html/html_inlineimpl.cpp
-@@ -81,7 +81,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
- if (k->qKeyEvent()) k->qKeyEvent()->accept();
- }
-
-- QString url = getAttribute(ATTR_HREF).string().trimmed();
-+ QString url = getAttribute(ATTR_HREF).trimSpaces().string();
- QString utarget = getAttribute(ATTR_TARGET).string();
-
- if ( e && e->button() == 1 )
-diff --git a/khtml/html/html_objectimpl.cpp b/khtml/html/html_objectimpl.cpp
-index 863afe6..f5aef26 100644
---- a/khtml/html/html_objectimpl.cpp
-+++ b/khtml/html/html_objectimpl.cpp
-@@ -695,7 +695,7 @@ void HTMLEmbedElementImpl::parseAttribute(AttributeImpl *attr)
- {
- case ATTR_CODE:
- case ATTR_SRC:
-- url = attr->val()->string().trimmed();
-+ url = attr->value().trimSpaces().string();
- setNeedComputeContent();
- break;
- case ATTR_BORDER:
-@@ -775,7 +775,7 @@ void HTMLObjectElementImpl::parseAttribute(AttributeImpl *attr)
- switch ( attr->id() )
- {
- case ATTR_DATA:
-- url = attr->val()->string().trimmed();
-+ url = attr->value().trimSpaces().string();
- setNeedComputeContent();
- break;
- case ATTR_CLASSID:
-diff --git a/khtml/html/html_tableimpl.cpp b/khtml/html/html_tableimpl.cpp
-index 8323093..c135545 100644
---- a/khtml/html/html_tableimpl.cpp
-+++ b/khtml/html/html_tableimpl.cpp
-@@ -495,7 +495,7 @@ void HTMLTableElementImpl::parseAttribute(AttributeImpl *attr)
- break;
- case ATTR_BACKGROUND:
- {
-- QString url = attr->val()->string().trimmed();
-+ QString url = attr->value().trimSpaces().string();
- if (!url.isEmpty()) {
- url = document()->completeURL( url );
- addCSSProperty(CSS_PROP_BACKGROUND_IMAGE, DOMString("url('"+url+"')") );
-@@ -638,7 +638,7 @@ void HTMLTablePartElementImpl::parseAttribute(AttributeImpl *attr)
- break;
- case ATTR_BACKGROUND:
- {
-- QString url = attr->val()->string().trimmed();
-+ QString url = attr->value().trimSpaces().string();
- if (!url.isEmpty()) {
- url = document()->completeURL( url );
- addCSSProperty(CSS_PROP_BACKGROUND_IMAGE, DOMString("url('"+url+"')") );
-diff --git a/khtml/html/htmlparser.cpp b/khtml/html/htmlparser.cpp
-index ce5be3e..49b8068 100644
---- a/khtml/html/htmlparser.cpp
-+++ b/khtml/html/htmlparser.cpp
-@@ -974,7 +974,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
- KHTMLGlobal::defaultHTMLSettings()->isHideAdsEnabled() &&
- !strcasecmp( t->attrs->getValue( ATTR_TYPE ), "image" ) )
- {
-- const QString url = doc()->completeURL(t->attrs->getValue(ATTR_SRC)->string().trimmed());
-+ const QString url = doc()->completeURL(DOMString(t->attrs->getValue(ATTR_SRC)).trimSpaces().string());
- if (KHTMLGlobal::defaultHTMLSettings()->isAdFiltered(url))
- return 0;
- }
-@@ -1104,7 +1104,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
- KHTMLGlobal::defaultHTMLSettings()->isAdFilterEnabled()&&
- KHTMLGlobal::defaultHTMLSettings()->isHideAdsEnabled())
- {
-- const QString url = doc()->completeURL(t->attrs->getValue(ATTR_SRC)->string().trimmed());
-+ const QString url = doc()->completeURL(DOMString(t->attrs->getValue(ATTR_SRC)).trimSpaces().string());
- if (KHTMLGlobal::defaultHTMLSettings()->isAdFiltered(url))
- return 0;
- }
-diff --git a/khtml/html/htmlprospectivetokenizer.cpp b/khtml/html/htmlprospectivetokenizer.cpp
-index 83c4c16..585a449 100644
---- a/khtml/html/htmlprospectivetokenizer.cpp
-+++ b/khtml/html/htmlprospectivetokenizer.cpp
-@@ -706,7 +706,7 @@ void ProspectiveTokenizer::processAttribute()
- LocalName attrLocal = LocalName::fromString(&attrDS, IDS_NormalizeLower);
- uint attribute = attrLocal.id();
- if (attribute == localNamePart(ATTR_SRC) && m_urlToLoad.isEmpty())
-- m_urlToLoad = DOMString(QString(m_attributeValue.data(), m_attributeValue.size()).trimmed());
-+ m_urlToLoad = DOMString(m_attributeValue.data(), m_attributeValue.size()).trimSpaces();
- break;
- }
- case ID_LINK:
-@@ -715,7 +715,7 @@ void ProspectiveTokenizer::processAttribute()
- LocalName attrLocal = LocalName::fromString(&attrDS, IDS_NormalizeLower);
- uint attribute = attrLocal.id();
- if (attribute == localNamePart(ATTR_HREF) && m_urlToLoad.isEmpty())
-- m_urlToLoad = DOMString(QString(m_attributeValue.data(), m_attributeValue.size()).trimmed());
-+ m_urlToLoad = DOMString(m_attributeValue.data(), m_attributeValue.size()).trimSpaces();
- else if (attribute == localNamePart(ATTR_REL)) {
- DOMStringImpl* lowerAttribute = DOMStringImpl(DOMStringImpl::ShallowCopy, m_attributeValue.data(), m_attributeValue.size()).lower();
- QString val = lowerAttribute->string();
-diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
-index 15ea3c9..6c4ed17 100644
---- a/khtml/khtml_part.cpp
-+++ b/khtml/khtml_part.cpp
-@@ -6420,7 +6420,7 @@ bool KHTMLPart::handleMouseMoveEventDrag(khtml::MouseMoveEvent *event)
- if (url.isEmpty() && innerNodeImpl && innerNodeImpl->id() == ID_IMG)
- {
- img = static_cast<HTMLImageElementImpl *>(innerNodeImpl);
-- u = completeURL(img->getAttribute(ATTR_SRC).string().trimmed());
-+ u = completeURL(img->getAttribute(ATTR_SRC).trimSpaces().string());
- pix = KIconLoader::global()->loadIcon("image-x-generic", KIconLoader::Desktop);
- }
- else
-@@ -6719,7 +6719,7 @@ void KHTMLPart::runAdFilter()
- node->id() == ID_IFRAME ||
- (node->id() == ID_INPUT && static_cast<HTMLInputElementImpl *>(node)->inputType() == HTMLInputElementImpl::IMAGE ))
- {
-- if (KHTMLGlobal::defaultHTMLSettings()->isAdFiltered(d->m_doc->completeURL(static_cast<ElementImpl *>(node)->getAttribute(ATTR_SRC).string().trimmed())))
-+ if (KHTMLGlobal::defaultHTMLSettings()->isAdFiltered(d->m_doc->completeURL(static_cast<ElementImpl *>(node)->getAttribute(ATTR_SRC).trimSpaces().string())))
- {
- // Since any kids of node will be deleted, too, fastforward nextNode
- // until we get outside of node.
-diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
-index 0c4e317..8078fdc 100644
---- a/khtml/khtmlview.cpp
-+++ b/khtml/khtmlview.cpp
-@@ -2780,7 +2780,7 @@ QMap< ElementImpl*, QChar > KHTMLView::buildFallbackAccessKeys() const
- bool text_before = false;
- switch( element->id()) {
- case ID_A:
-- url = element->getAttribute(ATTR_HREF).string().trimmed();
-+ url = element->getAttribute(ATTR_HREF).trimSpaces().string();
- if( url.isEmpty()) // doesn't have href, it's only an anchor
- continue;
- text = static_cast< HTMLElementImpl* >( element )->innerText().string().simplified();
-diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp
-index dee27ab..6741858 100644
---- a/khtml/rendering/render_image.cpp
-+++ b/khtml/rendering/render_image.cpp
-@@ -427,16 +427,16 @@ void RenderImage::updateFromElement()
- else if (element()->id() == ID_IMG)
- alt = static_cast<HTMLImageElementImpl*>(element())->altText();
-
-- const QString u = element()->id() == ID_OBJECT ?
-- element()->getAttribute(ATTR_DATA).string().trimmed() : element()->getAttribute(ATTR_SRC).string().trimmed();
-+ const DOMString u = element()->id() == ID_OBJECT ?
-+ element()->getAttribute(ATTR_DATA).trimSpaces() : element()->getAttribute(ATTR_SRC).trimSpaces();
-
- if (!u.isEmpty()) {
- // Need to compute completeURL, as 'u' can be relative
- // while m_cachedImage->url() is always full url
- DocumentImpl *docImpl = element()->document();
-- const QString fullUrl = docImpl->completeURL(u);
-+ const QString fullUrl = docImpl->completeURL(u.string());
- if (!m_cachedImage || m_cachedImage->url() != fullUrl) {
-- CachedImage *new_image = docImpl->docLoader()->requestImage(fullUrl);
-+ CachedImage *new_image = docImpl->docLoader()->requestImage(DOMString(fullUrl));
- if (new_image && new_image != m_cachedImage) {
- updateImage(new_image);
- }
-diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
-index 0a3e4ed..b8e5910 100644
---- a/khtml/xml/dom_docimpl.cpp
-+++ b/khtml/xml/dom_docimpl.cpp
-@@ -1979,7 +1979,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
- v->part()->scheduleRedirection(delay, v->part()->url().url() );
- } else {
- pos++;
-- while(pos < (int)str.length() && str[pos].isSpace()) pos++;
-+ while(pos < str.length() && str[pos].isSpace()) pos++;
- str = str.mid(pos);
- if(str.indexOf("url", 0, Qt::CaseInsensitive ) == 0) str = str.mid(3);
- str = str.trimmed();
-@@ -1987,7 +1987,8 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
- while (str.length() && (str[str.length()-1] == ';' || str[str.length()-1] == ',')) {
- str.resize(str.length()-1);
- }
-- QString newURL = document()->completeURL(str.trimmed());
-+ str = DOMString(str).trimSpaces().string();
-+ QString newURL = document()->completeURL(str);
- if ( ok )
- v->part()->scheduleRedirection(delay, newURL, delay < 2 || newURL == URL().url());
- }
-@@ -2047,7 +2048,7 @@ bool DocumentImpl::prepareMouseEvent( bool readonly, int _x, int _y, MouseEvent
- //qDebug("urlnode: %s (%d)", getTagName(renderInfo.URLElement()->id()).string().toLatin1().constData(), renderInfo.URLElement()->id());
-
- ElementImpl* e = static_cast<ElementImpl*>(renderInfo.URLElement());
-- const DOMString href = e->getAttribute(ATTR_HREF).string().trimmed();
-+ const DOMString href = e->getAttribute(ATTR_HREF).trimSpaces();
- const DOMString target = e->getAttribute(ATTR_TARGET);
-
- if (!target.isNull() && !href.isNull()) {
---
-2.0.4
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.2-armlinking.patch b/kde-base/kdelibs/files/kdelibs-4.6.2-armlinking.patch
deleted file mode 100644
index a207d10..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.2-armlinking.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN kdelibs-4.6.2.orig/cmake/modules/FindKDE4Internal.cmake kdelibs-4.6.2/cmake/modules/FindKDE4Internal.cmake
---- kdelibs-4.6.2.orig/cmake/modules/FindKDE4Internal.cmake 2011-04-01 15:56:18.000000000 +0200
-+++ kdelibs-4.6.2/cmake/modules/FindKDE4Internal.cmake 2011-04-11 23:53:19.067196607 +0200
-@@ -1092,8 +1092,8 @@
- if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
- if (CMAKE_COMPILER_IS_GNUCXX)
- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
-- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
-- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
-+ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
-+ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
-
- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}")
- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}")
diff --git a/kde-base/kdelibs/kdelibs-4.14.10.ebuild b/kde-base/kdelibs/kdelibs-4.14.10.ebuild
deleted file mode 100644
index e9eddd1..0000000
--- a/kde-base/kdelibs/kdelibs-4.14.10.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
-
-EGIT_BRANCH="KDE/4.14"
-
-DESCRIPTION="KDE libraries needed by all KDE programs"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
-kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse
-cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
-
-REQUIRED_USE="
- udisks? ( udev )
- upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
- >=app-misc/strigi-0.7.7
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xsl-stylesheets
- >=dev-libs/libattica-0.4.2
- >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
- dev-libs/libpcre[unicode]
- dev-libs/libxml2
- dev-libs/libxslt
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/giflib
- media-libs/libpng:0=
- media-libs/phonon[qt4]
- sys-libs/zlib
- virtual/jpeg:0
- >=x11-misc/shared-mime-info-0.60
- acl? ( virtual/acl )
- alsa? ( media-libs/alsa-lib )
- !aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXcursor
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- !kernel_SunOS? (
- || (
- sys-libs/libutempter
- >=sys-freebsd/freebsd-lib-9.0
- )
- )
- )
- bzip2? ( app-arch/bzip2 )
- crypt? ( app-crypt/qca:2[qt4(+)] )
- fam? ( virtual/fam )
- jpeg2k? ( media-libs/jasper )
- kerberos? ( virtual/krb5 )
- openexr? (
- media-libs/openexr:=
- media-libs/ilmbase:=
- )
- policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] )
- spell? ( app-text/enchant )
- ssl? ( dev-libs/openssl:0 )
- udev? ( virtual/udev )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
- doc? ( app-doc/doxygen )
- nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
- !dev-qt/qtphonon
- !<=kde-base/plasma-workspace-4.7.1:4
- !<=kde-base/kcontrol-4.4.50:4
- >=app-crypt/gnupg-2.0.11
- app-misc/ca-certificates
- $(add_kdebase_dep kde-env '' 4.14.3)
- sys-apps/dbus[X]
- !aqua? (
- udisks? ( sys-fs/udisks:2 )
- x11-apps/iceauth
- x11-apps/rgb
- >=x11-misc/xdg-utils-1.0.2-r3
- upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
- )
- udev? ( app-misc/media-player-info )
-"
-PDEPEND="
- $(add_kdebase_dep katepart '' 4.14.3)
- || (
- $(add_kdeapps_dep kfmclient '' 4.14.3)
- x11-misc/xdg-utils
- )
- handbook? (
- || (
- $(add_kdebase_dep khelpcenter '' 4.14.3)
- kde-plasma/khelpcenter:5[compat(+)]
- )
- )
- policykit? ( || (
- >=sys-auth/polkit-kde-agent-0.99
- kde-plasma/polkit-kde-agent
- ) )
-"
-
-PATCHES=(
- "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
- "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
- "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
- "${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
- "${FILESDIR}/${PN}-4.4.90-xslt.patch"
- "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
- "${FILESDIR}/${PN}-4.8.1-norpath.patch"
- "${FILESDIR}/${PN}-4.9.3-werror.patch"
- "${FILESDIR}/${PN}-4.10.0-udisks.patch"
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
- fi
-}
-
-src_prepare() {
- kde4-base_src_prepare
-
- # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
- sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
- -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
- if use aqua; then
- sed -i -e \
- "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
- cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
- #if [[ ${CHOST} == *-darwin8 ]]; then
- sed -i -e \
- "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
- cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
- #fi
-
- # solid/solid/backends/iokit doesn't properly link, so disable it.
- sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
- || die "disabling solid/solid/backends/iokit failed"
- sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
- || die "disabling solid/solid/backends/iokit failed"
-
- # There's no fdatasync on OSX and the check fails to detect that.
- sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
- || die "disabling fdatasync failed"
-
- # Fix nameser include to nameser8_compat
- sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
- || die "fixing nameser include failed"
- append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
- # Try to fix kkeyserver_mac
- epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_HSPELL=OFF
- -DWITH_ASPELL=OFF
- -DWITH_DNSSD=OFF
- -DKDE_DEFAULT_HOME=.kde4
- -DKAUTH_BACKEND=POLKITQT-1
- -DBUILD_libkactivities=OFF
- -DWITH_Soprano=OFF
- -DWITH_SharedDesktopOntologies=OFF
- $(cmake-utils_use_build handbook doc)
- $(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
- $(cmake-utils_use_has altivec PPC_ALTIVEC)
- $(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
- $(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
- $(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
- $(cmake-utils_use_with acl)
- $(cmake-utils_use_with alsa)
- $(cmake-utils_use_with bzip2 BZip2)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with fam)
- $(cmake-utils_use_with jpeg2k Jasper)
- $(cmake-utils_use_with kerberos GSSAPI)
- $(cmake-utils_use_with lzma LibLZMA)
- $(cmake-utils_use_with nls Libintl)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with policykit PolkitQt-1)
- $(cmake-utils_use_with spell ENCHANT)
- $(cmake-utils_use_with ssl OpenSSL)
- $(cmake-utils_use_with udev UDev)
- $(cmake-utils_use_with udisks SOLID_UDISKS2)
- $(cmake-utils_use_with zeroconf Avahi)
- )
- kde4-base_src_configure
-}
-
-src_compile() {
- kde4-base_src_compile
-
- # The building of apidox is not managed anymore by the build system
- if use doc; then
- einfo "Building API documentation"
- cd "${S}"/doc/api/
- ./doxygen.sh "${S}" || die "APIDOX generation failed"
- fi
-}
-
-src_install() {
- kde4-base_src_install
-
- # use system certificates
- rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
- dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
- if use doc; then
- einfo "Installing API documentation. This could take a bit of time."
- cd "${S}"/doc/api/
- docinto /HTML/en/kdelibs-apidox
- dohtml -r ${P}-apidocs/*
- fi
-
- if use aqua; then
- einfo "fixing ${PN} plugins"
-
- local _PV=${PV:0:3}.0
- local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
- install_name_tool -id \
- "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
- einfo "fixing ${PN} cmake detection files"
- #sed -i -e \
- # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
- echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
- "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
- || die "failed fixing FindXKB.cmake"
- fi
-
- einfo Installing environment file.
- # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
- echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
- echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
- doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
-
- if use zeroconf; then
- echo
- elog "To make zeroconf support available in KDE make sure that the avahi daemon"
- elog "is running."
- echo
- einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
- einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
- einfo "to include 'mdns', e.g.:"
- einfo " hosts: files mdns dns"
- echo
- fi
-
- kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
- # Remove ksycoca4 global database
- rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
- fdo-mime_mime_database_update
-
- kde4-base_pkg_postrm
-}
diff --git a/kde-base/kdelibs/kdelibs-4.14.11.ebuild b/kde-base/kdelibs/kdelibs-4.14.11.ebuild
deleted file mode 100644
index 959b7cc..0000000
--- a/kde-base/kdelibs/kdelibs-4.14.11.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_MIN_VERSION="3.3.1-r1"
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
-
-EGIT_BRANCH="KDE/4.14"
-
-DESCRIPTION="KDE libraries needed by all KDE programs"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
-kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse
-cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
-
-REQUIRED_USE="
- udisks? ( udev )
- upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
- >=app-misc/strigi-0.7.7
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xsl-stylesheets
- >=dev-libs/libattica-0.4.2
- >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
- dev-libs/libpcre[unicode]
- dev-libs/libxml2
- dev-libs/libxslt
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/giflib
- media-libs/libpng:0=
- media-libs/phonon[qt4]
- sys-libs/zlib
- virtual/jpeg:0
- >=x11-misc/shared-mime-info-0.60
- acl? ( virtual/acl )
- alsa? ( media-libs/alsa-lib )
- !aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXcursor
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- !kernel_SunOS? (
- || (
- sys-libs/libutempter
- >=sys-freebsd/freebsd-lib-9.0
- )
- )
- )
- bzip2? ( app-arch/bzip2 )
- crypt? ( app-crypt/qca:2[qt4(+)] )
- fam? ( virtual/fam )
- jpeg2k? ( media-libs/jasper )
- kerberos? ( virtual/krb5 )
- openexr? (
- media-libs/openexr:=
- media-libs/ilmbase:=
- )
- policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] )
- spell? ( app-text/enchant )
- ssl? ( dev-libs/openssl:0 )
- udev? ( virtual/udev )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
- doc? ( app-doc/doxygen )
- nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
- !dev-qt/qtphonon
- !<=kde-base/plasma-workspace-4.7.1:4
- !<=kde-base/kcontrol-4.4.50:4
- >=app-crypt/gnupg-2.0.11
- app-misc/ca-certificates
- $(add_kdebase_dep kde-env '' 4.14.3)
- sys-apps/dbus[X]
- !aqua? (
- udisks? ( sys-fs/udisks:2 )
- x11-apps/iceauth
- x11-apps/rgb
- >=x11-misc/xdg-utils-1.0.2-r3
- upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
- )
- udev? ( app-misc/media-player-info )
-"
-PDEPEND="
- $(add_kdebase_dep katepart '' 4.14.3)
- || (
- $(add_kdeapps_dep kfmclient '' 4.14.3)
- x11-misc/xdg-utils
- )
- handbook? (
- || (
- $(add_kdebase_dep khelpcenter '' 4.14.3)
- kde-plasma/khelpcenter:5[compat(+)]
- )
- )
- policykit? ( || (
- >=sys-auth/polkit-kde-agent-0.99
- kde-plasma/polkit-kde-agent
- ) )
-"
-
-PATCHES=(
- "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
- "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
- "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
- "${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
- "${FILESDIR}/${PN}-4.4.90-xslt.patch"
- "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
- "${FILESDIR}/${PN}-4.8.1-norpath.patch"
- "${FILESDIR}/${PN}-4.9.3-werror.patch"
- "${FILESDIR}/${PN}-4.10.0-udisks.patch"
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
- fi
-}
-
-src_prepare() {
- kde4-base_src_prepare
-
- # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
- sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
- -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
- if use aqua; then
- sed -i -e \
- "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
- cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
- #if [[ ${CHOST} == *-darwin8 ]]; then
- sed -i -e \
- "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
- cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
- #fi
-
- # solid/solid/backends/iokit doesn't properly link, so disable it.
- sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
- || die "disabling solid/solid/backends/iokit failed"
- sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
- || die "disabling solid/solid/backends/iokit failed"
-
- # There's no fdatasync on OSX and the check fails to detect that.
- sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
- || die "disabling fdatasync failed"
-
- # Fix nameser include to nameser8_compat
- sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
- || die "fixing nameser include failed"
- append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
- # Try to fix kkeyserver_mac
- epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_HSPELL=OFF
- -DWITH_ASPELL=OFF
- -DWITH_DNSSD=OFF
- -DKDE_DEFAULT_HOME=.kde4
- -DKAUTH_BACKEND=POLKITQT-1
- -DBUILD_libkactivities=OFF
- -DWITH_Soprano=OFF
- -DWITH_SharedDesktopOntologies=OFF
- $(cmake-utils_use_build handbook doc)
- $(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
- $(cmake-utils_use_has altivec PPC_ALTIVEC)
- $(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
- $(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
- $(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
- $(cmake-utils_use_with acl)
- $(cmake-utils_use_with alsa)
- $(cmake-utils_use_with bzip2 BZip2)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with fam)
- $(cmake-utils_use_with jpeg2k Jasper)
- $(cmake-utils_use_with kerberos GSSAPI)
- $(cmake-utils_use_with lzma LibLZMA)
- $(cmake-utils_use_with nls Libintl)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with policykit PolkitQt-1)
- $(cmake-utils_use_with spell ENCHANT)
- $(cmake-utils_use_with ssl OpenSSL)
- $(cmake-utils_use_with udev UDev)
- $(cmake-utils_use_with udisks SOLID_UDISKS2)
- $(cmake-utils_use_with zeroconf Avahi)
- )
- kde4-base_src_configure
-}
-
-src_compile() {
- kde4-base_src_compile
-
- # The building of apidox is not managed anymore by the build system
- if use doc; then
- einfo "Building API documentation"
- cd "${S}"/doc/api/
- ./doxygen.sh "${S}" || die "APIDOX generation failed"
- fi
-}
-
-src_install() {
- kde4-base_src_install
-
- # use system certificates
- rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
- dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
- if use doc; then
- einfo "Installing API documentation. This could take a bit of time."
- cd "${S}"/doc/api/
- docinto /HTML/en/kdelibs-apidox
- dohtml -r ${P}-apidocs/*
- fi
-
- if use aqua; then
- einfo "fixing ${PN} plugins"
-
- local _PV=${PV:0:3}.0
- local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
- install_name_tool -id \
- "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
- einfo "fixing ${PN} cmake detection files"
- #sed -i -e \
- # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
- echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
- "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
- || die "failed fixing FindXKB.cmake"
- fi
-
- einfo Installing environment file.
- # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
- echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
- echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
- doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
-
- if use zeroconf; then
- echo
- elog "To make zeroconf support available in KDE make sure that the avahi daemon"
- elog "is running."
- echo
- einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
- einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
- einfo "to include 'mdns', e.g.:"
- einfo " hosts: files mdns dns"
- echo
- fi
-
- kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
- # Remove ksycoca4 global database
- rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
- fdo-mime_mime_database_update
-
- kde4-base_pkg_postrm
-}
diff --git a/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild
deleted file mode 100644
index 71bd3eb..0000000
--- a/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
-
-EGIT_BRANCH="KDE/4.14"
-
-DESCRIPTION="KDE libraries needed by all KDE programs"
-
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
-kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse
-cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
-
-REQUIRED_USE="
- udisks? ( udev )
- upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
- >=app-misc/strigi-0.7.7
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xsl-stylesheets
- >=dev-libs/libattica-0.4.2
- >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
- dev-libs/libpcre[unicode]
- dev-libs/libxml2
- dev-libs/libxslt
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/giflib
- media-libs/libpng:0=
- media-libs/phonon[qt4]
- sys-libs/zlib
- virtual/jpeg:0
- >=x11-misc/shared-mime-info-0.60
- acl? ( virtual/acl )
- alsa? ( media-libs/alsa-lib )
- !aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXcursor
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- !kernel_SunOS? (
- || (
- sys-libs/libutempter
- >=sys-freebsd/freebsd-lib-9.0
- )
- )
- )
- bzip2? ( app-arch/bzip2 )
- crypt? ( app-crypt/qca:2[qt4(+)] )
- fam? ( virtual/fam )
- jpeg2k? ( media-libs/jasper )
- kerberos? ( virtual/krb5 )
- openexr? (
- media-libs/openexr:=
- media-libs/ilmbase:=
- )
- policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] )
- spell? ( app-text/enchant )
- ssl? ( dev-libs/openssl:0 )
- udev? ( virtual/udev )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
- doc? ( app-doc/doxygen )
- nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
- !dev-qt/qtphonon
- !<=kde-base/plasma-workspace-4.7.1:4
- !<=kde-base/kcontrol-4.4.50:4
- >=app-crypt/gnupg-2.0.11
- app-misc/ca-certificates
- $(add_kdebase_dep kde-env)
- sys-apps/dbus[X]
- !aqua? (
- udisks? ( sys-fs/udisks:2 )
- x11-apps/iceauth
- x11-apps/rgb
- >=x11-misc/xdg-utils-1.0.2-r3
- upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
- )
- udev? ( app-misc/media-player-info )
-"
-PDEPEND="
- $(add_kdebase_dep katepart)
- || (
- $(add_kdeapps_dep kfmclient)
- x11-misc/xdg-utils
- )
- handbook? (
- || (
- $(add_kdebase_dep khelpcenter)
- kde-plasma/khelpcenter:5[compat(+)]
- )
- )
- policykit? ( || (
- >=sys-auth/polkit-kde-agent-0.99
- kde-plasma/polkit-kde-agent
- ) )
-"
-
-PATCHES=(
- "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
- "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
- "${FILESDIR}/${PN}-4.14.0-mimetypes.patch"
- "${FILESDIR}/${PN}-4.4.90-xslt.patch"
- "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
- "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
- "${FILESDIR}/${PN}-4.8.1-norpath.patch"
- "${FILESDIR}/${PN}-4.9.3-werror.patch"
- "${FILESDIR}/${PN}-4.10.0-udisks.patch"
- "${FILESDIR}/${PN}-4.14.3-trim-crash.patch"
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
- fi
-}
-
-src_prepare() {
- kde4-base_src_prepare
-
- # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
- sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
- -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
- if use aqua; then
- sed -i -e \
- "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
- cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
- #if [[ ${CHOST} == *-darwin8 ]]; then
- sed -i -e \
- "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
- cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
- #fi
-
- # solid/solid/backends/iokit doesn't properly link, so disable it.
- sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
- || die "disabling solid/solid/backends/iokit failed"
- sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
- || die "disabling solid/solid/backends/iokit failed"
-
- # There's no fdatasync on OSX and the check fails to detect that.
- sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
- || die "disabling fdatasync failed"
-
- # Fix nameser include to nameser8_compat
- sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
- || die "fixing nameser include failed"
- append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
- # Try to fix kkeyserver_mac
- epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_HSPELL=OFF
- -DWITH_ASPELL=OFF
- -DWITH_DNSSD=OFF
- -DKDE_DEFAULT_HOME=.kde4
- -DKAUTH_BACKEND=POLKITQT-1
- -DBUILD_libkactivities=OFF
- -DWITH_Soprano=OFF
- -DWITH_SharedDesktopOntologies=OFF
- $(cmake-utils_use_build handbook doc)
- $(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
- $(cmake-utils_use_has altivec PPC_ALTIVEC)
- $(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
- $(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
- $(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
- $(cmake-utils_use_with acl)
- $(cmake-utils_use_with alsa)
- $(cmake-utils_use_with bzip2 BZip2)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with fam)
- $(cmake-utils_use_with jpeg2k Jasper)
- $(cmake-utils_use_with kerberos GSSAPI)
- $(cmake-utils_use_with lzma LibLZMA)
- $(cmake-utils_use_with nls Libintl)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with policykit PolkitQt-1)
- $(cmake-utils_use_with spell ENCHANT)
- $(cmake-utils_use_with ssl OpenSSL)
- $(cmake-utils_use_with udev UDev)
- $(cmake-utils_use_with udisks SOLID_UDISKS2)
- $(cmake-utils_use_with zeroconf Avahi)
- )
- kde4-base_src_configure
-}
-
-src_compile() {
- kde4-base_src_compile
-
- # The building of apidox is not managed anymore by the build system
- if use doc; then
- einfo "Building API documentation"
- cd "${S}"/doc/api/
- ./doxygen.sh "${S}" || die "APIDOX generation failed"
- fi
-}
-
-src_install() {
- kde4-base_src_install
-
- # use system certificates
- rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
- dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
- if use doc; then
- einfo "Installing API documentation. This could take a bit of time."
- cd "${S}"/doc/api/
- docinto /HTML/en/kdelibs-apidox
- dohtml -r ${P}-apidocs/*
- fi
-
- if use aqua; then
- einfo "fixing ${PN} plugins"
-
- local _PV=${PV:0:3}.0
- local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
- install_name_tool -id \
- "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
- einfo "fixing ${PN} cmake detection files"
- #sed -i -e \
- # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
- echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
- "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
- || die "failed fixing FindXKB.cmake"
- fi
-
- einfo Installing environment file.
- # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
- echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
- echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
- doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
-
- if use zeroconf; then
- echo
- elog "To make zeroconf support available in KDE make sure that the avahi daemon"
- elog "is running."
- echo
- einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
- einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
- einfo "to include 'mdns', e.g.:"
- einfo " hosts: files mdns dns"
- echo
- fi
-
- kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
- # Remove ksycoca4 global database
- rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
- fdo-mime_mime_database_update
-
- kde4-base_pkg_postrm
-}
diff --git a/kde-base/kdelibs/kdelibs-4.14.8.ebuild b/kde-base/kdelibs/kdelibs-4.14.8.ebuild
index 4c7391f..fa3753a 100644
--- a/kde-base/kdelibs/kdelibs-4.14.8.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.8.ebuild
@@ -14,7 +14,7 @@
DESCRIPTION="KDE libraries needed by all KDE programs"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
LICENSE="LGPL-2.1"
IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse
diff --git a/kde-base/kdepim-common-libs/Manifest b/kde-base/kdepim-common-libs/Manifest
index eef052f..7269a34 100644
--- a/kde-base/kdepim-common-libs/Manifest
+++ b/kde-base/kdepim-common-libs/Manifest
@@ -1,3 +1,2 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.3.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.3.ebuild
deleted file mode 100644
index f50ca96..0000000
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdepim"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="Common libraries for KDE PIM apps"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- app-crypt/gpgme
- >=app-office/akonadi-server-1.12.90
- dev-libs/grantlee:0
- $(add_kdebase_dep baloo)
- $(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}
- !kde-base/akonadi:4
- !kde-base/libkdepim:4
- !kde-base/libkleo:4
- !kde-base/libkpgp:4
- !<kde-base/kaddressbook-4.11.50:4
- !kde-base/kdepim-wizards:4
- !<kde-base/kmail-4.4.80:4
- !=kde-base/kmail-4.11*
- !=kde-base/kmail-4.12.0
- !=kde-base/kmail-4.12.1
- !<kde-base/kmail-4.13.60
- !<kde-base/korganizer-4.5.67:4
- app-crypt/gnupg
- $(add_kdebase_dep kdepim-runtime)
-"
-
-RESTRICT="test"
-# bug 393131
-
-KMEXTRA="
- agents/sendlateragent/
- akonadi_next/
- calendarsupport/
- calendarviews/
- composereditor-ng/
- grantleeeditor/grantleethemeeditor/
- grantleetheme/
- kaddressbookgrantlee/
- incidenceeditor-ng/
- libkdepim/
- libkdepimdbusinterfaces/
- libkleo/
- libkpgp/
- kdgantt2/
- messagecomposer/
- messagecore/
- messagelist/
- messageviewer/
- noteshared/
- pimcommon/
- templateparser/
-"
-KMEXTRACTONLY="
- kleopatra/
- kmail/
- knode/org.kde.knode.xml
- korgac/org.kde.korganizer.KOrgac.xml
- korganizer/org.kde.korganizer.Korganizer.xml
- mailcommon/
-"
-KMSAVELIBS="true"
-
-PATCHES=( "${FILESDIR}/install-composereditorng.patch" )
-
-src_prepare() {
- kde4-meta_src_prepare
- sed -e '/folderarchiveagent.desktop/d' \
- -i agents/CMakeLists.txt || die
-}
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.8.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.8.ebuild
index 38b750a..77c7cc9 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.8.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.8.ebuild
@@ -10,7 +10,7 @@
inherit kde4-meta
DESCRIPTION="Common libraries for KDE PIM apps"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kdepim-icons/Manifest b/kde-base/kdepim-icons/Manifest
index 9443459..6508138 100644
--- a/kde-base/kdepim-icons/Manifest
+++ b/kde-base/kdepim-icons/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.14.3.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.14.3.ebuild
deleted file mode 100644
index fb37556..0000000
--- a/kde-base/kdepim-icons/kdepim-icons-4.14.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdepim"
-KMMODULE="icons"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM icons"
-IUSE=""
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="$(add_kdebase_dep kdepimlibs)"
-RDEPEND=""
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.14.8.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.14.8.ebuild
index 45b98bc..d31b19c 100644
--- a/kde-base/kdepim-icons/kdepim-icons-4.14.8.ebuild
+++ b/kde-base/kdepim-icons/kdepim-icons-4.14.8.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="KDE PIM icons"
IUSE=""
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
DEPEND="$(add_kdebase_dep kdepimlibs)"
RDEPEND=""
diff --git a/kde-base/kdepim-kresources/Manifest b/kde-base/kdepim-kresources/Manifest
index 9443459..6508138 100644
--- a/kde-base/kdepim-kresources/Manifest
+++ b/kde-base/kdepim-kresources/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.14.3.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.14.3.ebuild
deleted file mode 100644
index b61c101..0000000
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.14.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdepim"
-KMMODULE="kresources"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM groupware plugin collection"
-IUSE="debug"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- kmail/
- knotes/
- korganizer/version.h
-"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.14.8.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.14.8.ebuild
index c83eb2c..964a91e 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.14.8.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.14.8.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="KDE PIM groupware plugin collection"
IUSE="debug"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
DEPEND="
$(add_kdebase_dep kdepimlibs)
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild
deleted file mode 100644
index e2f4ca1..0000000
--- a/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
-HOMEPAGE+=" https://community.kde.org/KDE_PIM"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-RDEPEND="
- $(add_kdebase_dep akonadiconsole)
- $(add_kdebase_dep akregator)
- $(add_kdebase_dep blogilo)
- $(add_kdebase_dep calendarjanitor)
- $(add_kdebase_dep kabcclient)
- $(add_kdebase_dep kaddressbook)
- $(add_kdebase_dep kalarm)
- $(add_kdebase_dep kdepim-icons)
- $(add_kdebase_dep kdepim-kresources)
- $(add_kdebase_dep kdepim-runtime)
- $(add_kdebase_dep kjots)
- $(add_kdebase_dep kleopatra)
- $(add_kdebase_dep kmail)
- $(add_kdebase_dep knode)
- $(add_kdebase_dep knotes)
- $(add_kdebase_dep konsolekalendar)
- $(add_kdebase_dep kontact)
- $(add_kdebase_dep korganizer)
- $(add_kdebase_dep ktimetracker)
- $(add_kdebase_dep ktnef)
- nls? (
- $(add_kdeapps_dep kde4-l10n '' 4.14.3)
- $(add_kdebase_dep kdepim-l10n '' 4.14.3)
- )
-"
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
index 4943a96..e2f4ca1 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
@@ -7,7 +7,7 @@
DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
HOMEPAGE+=" https://community.kde.org/KDE_PIM"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="nls"
RDEPEND="
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index bd18d26..ea60e1a 100644
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -1,3 +1,2 @@
DIST kdepim-runtime-4.14.10.tar.xz 1175432 SHA256 d68d1e3278646c3e82c7913dd443b5e10c887fb983fad7d24b26916ed4afcd52 SHA512 599cf08ee7c4bfcc2dcde7d146c5c889663a463e59e4e4773e6b1cee909d02914fce414afe473a127d484b5daa2fa9332dcef8092c3b953cdbebc87663e70577 WHIRLPOOL c40c44f266716f7136c253904e7ee65c6e40de40df458608cc4a1f7e02ada5b17febe4611e7693ef48c63201577ca21866b82005849bdd2409dfd1415d9ba251
-DIST kdepim-runtime-4.14.3.tar.xz 1168856 SHA256 2d8fe881c86b74015e3aa44df042110f8fc21156b5e596f93229435e58aab50f SHA512 1594c63d52111c5bcd923e733cf4e90e60791f332b5500454738df29a8dc6cd8ac3afea497471b5f81cbb9c290cc478d20815d2a38fdcf1b8319d7112385d849 WHIRLPOOL db8e25a40f835a5efa61730ceeace0913ccefed12754a06e36beb88b80bb0fef1465b89fb0a6b01b8f4af3cdedb5e3352246a8938f38501580c67a46b3073123
DIST kdepim-runtime-4.14.8.tar.xz 1173688 SHA256 1f4c82629947d7f1f796f1faf6333c861f908f1a02d9ae26a2adcfa698aa34b1 SHA512 378d59077493b9483ced85b7dd035ac792c1f5351f85a42459516f86028c8372f6304e6d36d6c4d33bb299847cc7650299e59afd7b100e755702943841f7f013 WHIRLPOOL e6554d278461e4324d28890c39ed083369eb89db64be9ac7270510e0e0f0c82a24ac7fd49a62567dae2168611a409f990bdd504e574493b90761378f3c1e7798
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.14.3.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.14.3.ebuild
deleted file mode 100644
index 8cb9b31..0000000
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.14.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdepim-runtime"
-inherit kde4-base
-
-DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug facebook google kolab"
-
-RESTRICT="test"
-# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
-
-DEPEND="
- >=app-office/akonadi-server-1.12.90
- dev-libs/boost:=
- dev-libs/libxml2:2
- dev-libs/libxslt
- $(add_kdebase_dep kdepimlibs)
- x11-misc/shared-mime-info
- facebook? ( net-libs/libkfbapi:4 )
- google? ( >=net-libs/libkgapi-2.0:4 )
- kolab? ( >=net-libs/libkolab-0.5 )
-"
-RDEPEND="${DEPEND}
- $(add_kdebase_dep kdepim-icons)
- !kde-misc/akonadi-google
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package facebook LibKFbAPI)
- $(cmake-utils_use_find_package google LibKGAPI2)
- $(cmake-utils_use_find_package kolab Libkolab)
- $(cmake-utils_use_find_package kolab Libkolabxml)
- )
-
- kde4-base_src_configure
-}
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild
index ab96a39..253899e 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild
@@ -9,7 +9,7 @@
inherit kde4-base
DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug facebook google kolab"
RESTRICT="test"
diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index b14e3b0..85b70cf 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -1,3 +1,2 @@
DIST kdepimlibs-4.14.10.tar.xz 2831160 SHA256 c8cc9694add6ecf121bda050235ffa68d8307a82c85fbdffe69a8eab5be584c2 SHA512 64f396957ae1f70a19ba689fabc0850aed04e4e4bce58a4bbc27af2b5cfa27b50472614b4096d8424ee6b4463faaed37d98e6cccfe36d208e9193ba20dc6766a WHIRLPOOL b9123e702f5d4f696cd09d3e7932dbc796f4d8e09feace56a49a96ddb64478bf8cd237bcac9c438d77491822cd655f3f44b76e657f6dbb09b8deb96ab90da52a
-DIST kdepimlibs-4.14.3.tar.xz 2790888 SHA256 65edb1bec191be1b6f8450dc71eadae734f4ab0585aab0a885207390399868d7 SHA512 0106f3b03cb7541f54fe568276ca3e5c5d14da244b8b1e73a9a34ca1b1f3b6d2ce3922cb499d79fca53f27429c84f1fcb1472fa3b9df80531cd1542825aa27d7 WHIRLPOOL 79a7b59aa67e06a94804dcbd9ee3807ce66ba5f1641620afa1d38cba453251189bd9cefe8efb26e33fdaa68a94af3b956527a47688783077f75165a3548ce13e
DIST kdepimlibs-4.14.8.tar.xz 2832092 SHA256 8208e7fcd9751c244b6454d29f93d41efc9f41dca9dcf350b029d537fc524214 SHA512 49bd845d085bbf1279dbaf25663f151ce10e82d0823e00d44643bf41ea678bbc9792969b6a165789984476a15cb215a95c25ac3e7d4cf3f76228c63a0766e81b WHIRLPOOL 495a828ebd34f529f8bfd07eb1dbbaa1a9fd7c7d2ffece4750edfc6f66f30f812bae17479dfbc03de993a7b61b8de9823fd0c7226a4e3319ead7448a41e3a0ed
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.14.3.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.14.3.ebuild
deleted file mode 100644
index b9bf686..0000000
--- a/kde-base/kdepimlibs/kdepimlibs-4.14.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-base
-
-DESCRIPTION="Common library for KDE PIM apps"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="debug ldap prison"
-
-# some akonadi tests timeout, that probaly needs more work as its ~700 tests
-RESTRICT="test"
-
-DEPEND="
- !kde-misc/akonadi-social-utils
- >=app-crypt/gpgme-1.1.6
- >=app-office/akonadi-server-1.12.90[qt4]
- >=dev-libs/boost-1.35.0-r5:=
- dev-libs/libgpg-error
- >=dev-libs/libical-0.48-r2:=
- dev-libs/cyrus-sasl
- >=dev-libs/qjson-0.8.1
- media-libs/phonon[qt4]
- x11-misc/shared-mime-info
- prison? ( media-libs/prison:4 )
- ldap? ( net-nds/openldap )
-"
-# boost is not linked to, but headers which include it are installed
-# bug #418071
-RDEPEND="${DEPEND}
- !=kde-base/kdepim-runtime-4.10*
- !=kde-base/kdepim-runtime-4.11*
- !<kde-base/kdepim-runtime-4.4.11.1-r2
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.9.1-boostincludes.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build handbook doc)
- $(cmake-utils_use_find_package ldap)
- $(cmake-utils_use_find_package prison)
- )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
- rm "${ED}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake #Collides with net-im/choqok
-}
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.14.8.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.14.8.ebuild
index 856e749..448b9e5 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.14.8.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.14.8.ebuild
@@ -10,7 +10,7 @@
inherit kde4-base
DESCRIPTION="Common library for KDE PIM apps"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
LICENSE="LGPL-2.1"
IUSE="debug ldap prison"
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
index aeee82b..113fc91 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit kde4-base
+inherit flag-o-matic kde4-base
DESCRIPTION="Extra Plasma applets and engines"
LICENSE="GPL-2 LGPL-2"
@@ -41,6 +41,8 @@
"
src_configure() {
+ # bug 560884
+ use ppc64 && append-flags -mno-altivec
local mycmakeargs=(
-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
-DWITH_Nepomuk=OFF
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kdm/kdm-4.11.14.ebuild b/kde-base/kdm/kdm-4.11.14.ebuild
deleted file mode 100644
index c3d1f7c..0000000
--- a/kde-base/kdm/kdm-4.11.14.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit systemd kde4-meta flag-o-matic user
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +consolekit kerberos pam systemd"
-
-REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
-
-DEPEND="
- $(add_kdebase_dep libkworkspace)
- media-libs/qimageblitz
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXtst
- consolekit? (
- >=sys-apps/dbus-1.0.2
- sys-auth/consolekit
- )
- kerberos? ( virtual/krb5 )
- pam? (
- $(add_kdebase_dep kcheckpass)
- virtual/pam
- )
- systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
- $(add_kdeapps_dep kdepasswd)
- >=x11-apps/xinit-1.0.5-r2
- x11-apps/xmessage
-"
-
-KMEXTRA="
- libs/kdm/
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
-)
-
-# bug #413811
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
- kde4-meta_pkg_setup
-
- # Create kdm:kdm user
- KDM_HOME=/var/lib/kdm
- enewgroup kdm
- enewuser kdm -1 -1 "${KDM_HOME}" kdm
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use kerberos KDE4_KRB5AUTH)
- $(cmake-utils_use_with pam)
- $(cmake-utils_use_with consolekit CkConnector)
- )
-
- kde4-meta_src_configure
-}
-
-src_install() {
- export GENKDMCONF_FLAGS="--no-old --no-backup"
-
- kde4-meta_src_install
-
- # an equivalent file is already installed by kde-base/startkde, bug 377151
- rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die
-
- # Customize the kdmrc configuration:
- # - SessionDirs set to /usr/share/xsessions
- # - increase server timeout to 30s
- # - TerminateServer=true to workaround X server regen bug, bug 278473
- # - DataDir set to /var/lib/kdm
- # - FaceDir set to /var/lib/kdm/faces
- sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
- -e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
- -e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
- -e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
- -e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \
- -i "${ED}"/usr/share/config/kdm/kdmrc \
- || die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
-
- # Don't install empty dir
- rmdir "${ED}"/usr/share/config/kdm/sessions
-
- # Set up permissions to kdm work directory
- keepdir "${KDM_HOME}"
- fowners root:kdm "${KDM_HOME}"
- fperms 1770 "${KDM_HOME}"
-
- # install logrotate file
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/kdm-logrotate kdm
-
- systemd_dounit "${FILESDIR}"/kdm.service
-}
-
-pkg_postinst() {
- kde4-meta_pkg_postinst
-
- local file src dest dir old_dirs=(
- /var/lib/kdm-live
- /var/lib/kdm-4.6
- /var/lib/kdm-4.5
- /var/lib/kdm-4.4
- /usr/share/apps/kdm
- /usr/kde/4.4/share/apps/kdm
- /usr/kde/4.3/share/apps/kdm
- /usr/kde/4.2/share/apps/kdm
- )
-
- mkdir -p "${EROOT}${KDM_HOME}/faces"
- # Set the default kdm face icon if it's not already set by the system admin
- # because this is user-overrideable in that way, it's not in src_install
- for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
- src=${file#*:}
- dest=${file%:*}
- if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
- for dir in "${old_dirs[@]}"; do
- if [[ -e ${EROOT}${dir}/${dest} ]]; then
- cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
- break 2
- fi
- done
- if [[ -n ${src} ]]; then
- cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \
- "${EROOT}${KDM_HOME}/${dest}"
- fi
- fi
- done
- for dir in "${old_dirs[@]}"; do
- if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
- echo
- elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
- elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
- echo
- elog "After doing so, you may delete the directory."
- echo
- fi
- done
-
- # Make sure permissions are correct -- old installations may have
- # gotten this wrong
- use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
- chmod 1770 "${EROOT}${KDM_HOME}"
-
- if use consolekit; then
- echo
- elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
- elog "make sure consolekit daemon is running and started at login time"
- elog
- elog "rc-update add consolekit default && /etc/init.d/consolekit start"
- echo
- fi
-}
diff --git a/kde-base/kdm/kdm-4.11.19.ebuild b/kde-base/kdm/kdm-4.11.19.ebuild
index 61f7231..f9a4dee 100644
--- a/kde-base/kdm/kdm-4.11.19.ebuild
+++ b/kde-base/kdm/kdm-4.11.19.ebuild
@@ -9,7 +9,7 @@
inherit systemd kde4-meta flag-o-matic user
DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug +consolekit kerberos pam systemd"
REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
diff --git a/kde-base/kephal/Manifest b/kde-base/kephal/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/kephal/Manifest
+++ b/kde-base/kephal/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kephal/kephal-4.11.14.ebuild b/kde-base/kephal/kephal-4.11.14.ebuild
deleted file mode 100644
index 8cf7c42..0000000
--- a/kde-base/kephal/kephal-4.11.14.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/kephal"
-inherit kde4-meta
-
-DESCRIPTION="Allows handling of multihead systems via the XRandR extension"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXrandr
-"
-DEPEND="${RDEPEND}
- x11-proto/randrproto
-"
-
-KMEXTRACTONLY+="
- kephal/kephal/screens.h
-"
diff --git a/kde-base/kephal/kephal-4.11.19.ebuild b/kde-base/kephal/kephal-4.11.19.ebuild
index 21b7425..8cf7c42 100644
--- a/kde-base/kephal/kephal-4.11.19.ebuild
+++ b/kde-base/kephal/kephal-4.11.19.ebuild
@@ -9,7 +9,7 @@
inherit kde4-meta
DESCRIPTION="Allows handling of multihead systems via the XRandR extension"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND="
diff --git a/kde-base/khotkeys/Manifest b/kde-base/khotkeys/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/khotkeys/Manifest
+++ b/kde-base/khotkeys/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/khotkeys/khotkeys-4.11.14.ebuild b/kde-base/khotkeys/khotkeys-4.11.14.ebuild
deleted file mode 100644
index 380e17a..0000000
--- a/kde-base/khotkeys/khotkeys-4.11.14.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep libkworkspace)
- x11-libs/libX11
- x11-libs/libXtst
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- libs/kworkspace/
-"
diff --git a/kde-base/khotkeys/khotkeys-4.11.19.ebuild b/kde-base/khotkeys/khotkeys-4.11.19.ebuild
index 2924c39..e5686e5 100644
--- a/kde-base/khotkeys/khotkeys-4.11.19.ebuild
+++ b/kde-base/khotkeys/khotkeys-4.11.19.ebuild
@@ -8,7 +8,7 @@
inherit kde4-meta
DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kinfocenter/Manifest b/kde-base/kinfocenter/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/kinfocenter/Manifest
+++ b/kde-base/kinfocenter/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kinfocenter/kinfocenter-4.11.14.ebuild b/kde-base/kinfocenter/kinfocenter-4.11.14.ebuild
deleted file mode 100644
index 7c82269..0000000
--- a/kde-base/kinfocenter/kinfocenter-4.11.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Info Center"
-HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug ieee1394"
-
-DEPEND="
- sys-apps/pciutils
- x11-libs/libX11
- ieee1394? ( sys-libs/libraw1394 )
- opengl? (
- virtual/glu
- virtual/opengl
- )
-"
-RDEPEND="${DEPEND}
- sys-apps/usbutils
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with ieee1394 RAW1394)
- $(cmake-utils_use_with opengl OpenGL)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/kinfocenter/kinfocenter-4.11.19.ebuild b/kde-base/kinfocenter/kinfocenter-4.11.19.ebuild
index 864f877..d5f238e 100644
--- a/kde-base/kinfocenter/kinfocenter-4.11.19.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.11.19.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="The KDE Info Center"
HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug ieee1394"
DEPEND="
diff --git a/kde-base/kjots/Manifest b/kde-base/kjots/Manifest
index 9443459..6508138 100644
--- a/kde-base/kjots/Manifest
+++ b/kde-base/kjots/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kjots/kjots-4.14.3.ebuild b/kde-base/kjots/kjots-4.14.3.ebuild
deleted file mode 100644
index e36acc6..0000000
--- a/kde-base/kjots/kjots-4.14.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE note taking utility"
-HOMEPAGE="https://www.kde.org/applications/utilities/kjots/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- >=dev-libs/grantlee-0.2.0:0
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- akonadi_next/
- noteshared/
-"
diff --git a/kde-base/kjots/kjots-4.14.8.ebuild b/kde-base/kjots/kjots-4.14.8.ebuild
index 1d0ff15..1ac3c51 100644
--- a/kde-base/kjots/kjots-4.14.8.ebuild
+++ b/kde-base/kjots/kjots-4.14.8.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="KDE note taking utility"
HOMEPAGE="https://www.kde.org/applications/utilities/kjots/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kleopatra/Manifest b/kde-base/kleopatra/Manifest
index 21921ca..69e0972 100644
--- a/kde-base/kleopatra/Manifest
+++ b/kde-base/kleopatra/Manifest
@@ -1,5 +1,4 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
DIST kleopatra-4.4.11.1-libassuan2.patch.bz2 9404 SHA256 83d6930917e59450690394ee948b30fe138d631928d4afffc8be25d1a41e75c2 SHA512 4f514e6dfbe89d777604485d3144ada9a600b1c3c031a732b34b0cb7533eadae545e67a2819e43fafd4b7ada84845c25e1f93b01b06fc169daf48734684893de WHIRLPOOL f749ee88b13a905138a0c63a5833c71470f77923125f6c93e09fd83d399edfd1497342112ef420c7823d570d8676666117b5f821f46ed0d1ad961c9497142252
diff --git a/kde-base/kleopatra/files/kleopatra-4.14.10-newer-boost-buildfix.patch b/kde-base/kleopatra/files/kleopatra-4.14.10-newer-boost-buildfix.patch
new file mode 100644
index 0000000..ae4f7a7
--- /dev/null
+++ b/kde-base/kleopatra/files/kleopatra-4.14.10-newer-boost-buildfix.patch
@@ -0,0 +1,1803 @@
+From: Michael Pyne <mpyne@kde.org>
+Date: Fri, 04 Sep 2015 01:59:01 +0000
+Subject: Build with recent Boost.
+X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=3c72e211dc4ee1420bf744312036dc2141238912
+---
+Build with recent Boost.
+
+The issue is that recent versions of Boost have widespread usage of a
+technique involving the generation of namespace names using a special
+macro, BOOST_JOIN. This macro breaks moc with Qt 4, leading to
+compilation failures unless Boost is downgraded.
+
+moc is fixed for Qt 5 but the change is too invasive to backport.
+Instead, we use the technique recommended by the Qt devs and tell moc to
+avoid scanning Boost headers wherever we use them. Some headers already
+had this fix applied; this patch completes the work.
+
+See also QTBUG-22829.
+
+REVIEW:124926
+---
+
+
+--- a/kleopatra/commands/certifycertificatecommand.cpp
++++ b/kleopatra/commands/certifycertificatecommand.cpp
+@@ -52,7 +52,9 @@
+ #include <KLocalizedString>
+ #include <kdebug.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/commands/deletecertificatescommand.cpp
++++ b/kleopatra/commands/deletecertificatescommand.cpp
+@@ -54,7 +54,9 @@
+ #include <QPointer>
+ #include <QAbstractItemView>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <algorithm>
+ #include <vector>
+
+--- a/kleopatra/commands/exportcertificatecommand.cpp
++++ b/kleopatra/commands/exportcertificatecommand.cpp
+@@ -53,7 +53,9 @@
+ #include <QMap>
+ #include <QPointer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+ #include <algorithm>
+ #include <vector>
+ #include <cassert>
+
+--- a/kleopatra/commands/importcertificatescommand.cpp
++++ b/kleopatra/commands/importcertificatescommand.cpp
+@@ -59,8 +59,10 @@
+ #include <QTreeView>
+ #include <QTextDocument> // for Qt::escape
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/mem_fn.hpp>
++#endif
+
+ #include <memory>
+ #include <algorithm>
+
+--- a/kleopatra/commands/lookupcertificatescommand.cpp
++++ b/kleopatra/commands/lookupcertificatescommand.cpp
+@@ -59,8 +59,10 @@
+
+ #include <QRegExp>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+ #include <map>
+
+--- a/kleopatra/commands/reloadkeyscommand.cpp
++++ b/kleopatra/commands/reloadkeyscommand.cpp
+@@ -41,7 +41,9 @@
+
+ #include <gpgme++/keylistresult.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace boost;
+
+--- a/kleopatra/commands/selftestcommand.cpp
++++ b/kleopatra/commands/selftestcommand.cpp
+@@ -57,8 +57,10 @@
+ #include <KSplashScreen>
+ #include <KSharedConfig>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/mem_fn.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/conf/appearanceconfigwidget.cpp
++++ b/kleopatra/conf/appearanceconfigwidget.cpp
+@@ -62,8 +62,10 @@
+ #include <QColorDialog>
+ #include <QFontDialog>
+
++#ifndef Q_MOC_RUN
+ #include <boost/range.hpp>
+ #include <boost/bind.hpp>
++#endif
+
+ #include <algorithm>
+ #include <cassert>
+
+--- a/kleopatra/conf/cryptooperationsconfigwidget.cpp
++++ b/kleopatra/conf/cryptooperationsconfigwidget.cpp
+@@ -47,7 +47,9 @@
+
+ #include <QLayout>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace Kleo::Config;
+
+--- a/kleopatra/crypto/certificateresolver.cpp
++++ b/kleopatra/crypto/certificateresolver.cpp
+@@ -45,7 +45,9 @@
+ #include <QHash>
+ #include <QSet>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <algorithm>
+ #include <iterator>
+
+--- a/kleopatra/crypto/controller.h
++++ b/kleopatra/crypto/controller.h
+@@ -40,7 +40,9 @@
+ #include <utils/pimpl_ptr.h>
+ #include <utils/types.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ class QDialog;
+
+
+--- a/kleopatra/crypto/createchecksumscontroller.cpp
++++ b/kleopatra/crypto/createchecksumscontroller.cpp
+@@ -62,8 +62,10 @@
+ #include <QDir>
+ #include <QProcess>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/function.hpp>
++#endif
+
+ #include <gpg-error.h>
+
+
+--- a/kleopatra/crypto/createchecksumscontroller.h
++++ b/kleopatra/crypto/createchecksumscontroller.h
+@@ -40,7 +40,9 @@
+ #include <gpgme++/global.h>
+ #include <kmime/kmime_header_parsing.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/crypto/decryptverifyemailcontroller.cpp
++++ b/kleopatra/crypto/decryptverifyemailcontroller.cpp
+@@ -58,7 +58,9 @@
+ #include <QPointer>
+ #include <QTimer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <memory>
+ #include <vector>
+
+--- a/kleopatra/crypto/decryptverifyemailcontroller.h
++++ b/kleopatra/crypto/decryptverifyemailcontroller.h
+@@ -41,7 +41,9 @@
+
+ #include <QMetaType>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/crypto/decryptverifyfilescontroller.cpp
++++ b/kleopatra/crypto/decryptverifyfilescontroller.cpp
+@@ -56,7 +56,9 @@
+ #include <QPointer>
+ #include <QTimer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <memory>
+ #include <vector>
+
+--- a/kleopatra/crypto/decryptverifytask.cpp
++++ b/kleopatra/crypto/decryptverifytask.cpp
+@@ -75,7 +75,9 @@
+ #include <QStringList>
+ #include <QTextDocument> // Qt::escape
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <algorithm>
+ #include <cassert>
+
+--- a/kleopatra/crypto/decryptverifytask.h
++++ b/kleopatra/crypto/decryptverifytask.h
+@@ -39,7 +39,9 @@
+
+ #include <gpgme++/verificationresult.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+
+ namespace KMime {
+
+--- a/kleopatra/crypto/encryptemailcontroller.cpp
++++ b/kleopatra/crypto/encryptemailcontroller.cpp
+@@ -58,8 +58,10 @@
+ #include <QPointer>
+ #include <QTimer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace Kleo::Crypto;
+
+--- a/kleopatra/crypto/encryptemailtask.cpp
++++ b/kleopatra/crypto/encryptemailtask.cpp
+@@ -52,7 +52,9 @@
+ #include <QPointer>
+ #include <QTextDocument> // for Qt::escape
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace Kleo::Crypto;
+
+--- a/kleopatra/crypto/encryptemailtask.h
++++ b/kleopatra/crypto/encryptemailtask.h
+@@ -39,7 +39,9 @@
+
+ #include <gpgme++/global.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/crypto/gui/decryptverifyfileswizard.cpp
++++ b/kleopatra/crypto/gui/decryptverifyfileswizard.cpp
+@@ -57,7 +57,9 @@
+ #include <QTimer>
+ #include <QTreeView>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <vector>
+ #include <cassert>
+
+--- a/kleopatra/crypto/gui/decryptverifyfileswizard.h
++++ b/kleopatra/crypto/gui/decryptverifyfileswizard.h
+@@ -37,7 +37,9 @@
+
+ #include <utils/pimpl_ptr.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ namespace Kleo {
+ namespace Crypto {
+
+--- a/kleopatra/crypto/gui/decryptverifyoperationwidget.cpp
++++ b/kleopatra/crypto/gui/decryptverifyoperationwidget.cpp
+@@ -45,7 +45,9 @@
+ #include <QStackedLayout>
+ #include <QComboBox>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace Kleo::Crypto::Gui;
+
+--- a/kleopatra/crypto/gui/newresultpage.cpp
++++ b/kleopatra/crypto/gui/newresultpage.cpp
+@@ -41,7 +41,9 @@
+
+ #include <kleo/stl_util.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/mem_fn.hpp>
++#endif
+
+ #include <KLocalizedString>
+
+
+--- a/kleopatra/crypto/gui/newsignencryptfileswizard.cpp
++++ b/kleopatra/crypto/gui/newsignencryptfileswizard.cpp
+@@ -73,8 +73,10 @@
+
+ #include <gpgme++/key.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/bind.hpp>
++#endif
+
+ using namespace GpgME;
+ using namespace boost;
+
+--- a/kleopatra/crypto/gui/resolverecipientspage.cpp
++++ b/kleopatra/crypto/gui/resolverecipientspage.cpp
+@@ -61,8 +61,10 @@
+ #include <QStringList>
+ #include <QVBoxLayout>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/crypto/gui/resolverecipientspage.h
++++ b/kleopatra/crypto/gui/resolverecipientspage.h
+@@ -39,7 +39,9 @@
+
+ #include <gpgme++/global.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/crypto/gui/resultitemwidget.h
++++ b/kleopatra/crypto/gui/resultitemwidget.h
+@@ -39,7 +39,9 @@
+
+ #include <utils/pimpl_ptr.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ class QString;
+
+
+--- a/kleopatra/crypto/gui/resultlistwidget.cpp
++++ b/kleopatra/crypto/gui/resultlistwidget.cpp
+@@ -50,8 +50,10 @@
+ #include <QLabel>
+ #include <QVBoxLayout>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/mem_fn.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/crypto/gui/resultlistwidget.h
++++ b/kleopatra/crypto/gui/resultlistwidget.h
+@@ -39,7 +39,9 @@
+
+ #include <utils/pimpl_ptr.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ class QString;
+
+
+--- a/kleopatra/crypto/gui/resultpage.h
++++ b/kleopatra/crypto/gui/resultpage.h
+@@ -39,7 +39,9 @@
+ #include <utils/pimpl_ptr.h>
+
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ namespace Kleo {
+ namespace Crypto {
+
+--- a/kleopatra/crypto/gui/signencryptemailconflictdialog.cpp
++++ b/kleopatra/crypto/gui/signencryptemailconflictdialog.cpp
+@@ -68,8 +68,10 @@
+ #include <QStyle>
+ #include <QPointer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/bind.hpp>
++#endif
+
+ #include <iterator>
+
+
+--- a/kleopatra/crypto/gui/signencryptwizard.cpp
++++ b/kleopatra/crypto/gui/signencryptwizard.cpp
+@@ -55,7 +55,9 @@
+ #include <QFileInfo>
+ #include <QTimer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace Kleo::Crypto;
+
+--- a/kleopatra/crypto/gui/signencryptwizard.h
++++ b/kleopatra/crypto/gui/signencryptwizard.h
+@@ -42,7 +42,9 @@
+ #include <gpgme++/global.h>
+ #include <kmime/kmime_header_parsing.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/crypto/gui/signerresolvepage.h
++++ b/kleopatra/crypto/gui/signerresolvepage.h
+@@ -40,7 +40,9 @@
+ #include <gpgme++/global.h>
+ #include <kmime/kmime_header_parsing.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/crypto/gui/signingcertificateselectionwidget.cpp
++++ b/kleopatra/crypto/gui/signingcertificateselectionwidget.cpp
+@@ -45,7 +45,9 @@
+ #include <QByteArray>
+ #include <QMap>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/crypto/gui/verifychecksumsdialog.cpp
++++ b/kleopatra/crypto/gui/verifychecksumsdialog.cpp
+@@ -53,7 +53,9 @@
+ #include <QPushButton>
+ #include <QHeaderView>
+
++#ifndef Q_MOC_RUN
+ #include <boost/static_assert.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/crypto/newsignencryptemailcontroller.cpp
++++ b/kleopatra/crypto/newsignencryptemailcontroller.cpp
+@@ -63,8 +63,10 @@
+ #include <QPointer>
+ #include <QTimer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace Kleo::Crypto;
+
+--- a/kleopatra/crypto/recipient.h
++++ b/kleopatra/crypto/recipient.h
+@@ -35,7 +35,9 @@
+
+ #include <gpgme++/global.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/crypto/sender.h
++++ b/kleopatra/crypto/sender.h
+@@ -35,7 +35,9 @@
+
+ #include <gpgme++/global.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/crypto/signemailcontroller.cpp
++++ b/kleopatra/crypto/signemailcontroller.cpp
+@@ -55,8 +55,10 @@
+ #include <QPointer>
+ #include <QTimer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace Kleo::Crypto;
+
+--- a/kleopatra/crypto/signemailtask.cpp
++++ b/kleopatra/crypto/signemailtask.cpp
+@@ -52,8 +52,10 @@
+ #include <QPointer>
+ #include <QTextDocument> // for Qt::escape
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/mem_fn.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace Kleo::Crypto;
+
+--- a/kleopatra/crypto/signemailtask.h
++++ b/kleopatra/crypto/signemailtask.h
+@@ -39,7 +39,9 @@
+
+ #include <gpgme++/global.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/crypto/signencryptfilescontroller.cpp
++++ b/kleopatra/crypto/signencryptfilescontroller.cpp
+@@ -58,7 +58,9 @@
+ #include <QTimer>
+ #include <QFileInfo>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace Kleo::Crypto;
+
+--- a/kleopatra/crypto/signencryptfilescontroller.h
++++ b/kleopatra/crypto/signencryptfilescontroller.h
+@@ -40,7 +40,9 @@
+ #include <gpgme++/global.h>
+ #include <kmime/kmime_header_parsing.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/crypto/signencryptfilestask.cpp
++++ b/kleopatra/crypto/signencryptfilestask.cpp
+@@ -60,7 +60,9 @@
+ #include <QPointer>
+ #include <QTextDocument> // for Qt::escape
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace Kleo::Crypto;
+
+--- a/kleopatra/crypto/task.cpp
++++ b/kleopatra/crypto/task.cpp
+@@ -50,7 +50,9 @@
+
+ #include <QString>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace Kleo::Crypto;
+
+--- a/kleopatra/crypto/task.h
++++ b/kleopatra/crypto/task.h
+@@ -40,7 +40,9 @@
+
+ #include <gpgme++/global.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ class QColor;
+ class QIcon;
+
+--- a/kleopatra/crypto/taskcollection.cpp
++++ b/kleopatra/crypto/taskcollection.cpp
+@@ -36,7 +36,9 @@
+
+ #include <crypto/task.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <algorithm>
+ #include <map>
+
+--- a/kleopatra/crypto/taskcollection.h
++++ b/kleopatra/crypto/taskcollection.h
+@@ -39,7 +39,9 @@
+
+ #include <utils/pimpl_ptr.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/crypto/verifychecksumscontroller.cpp
++++ b/kleopatra/crypto/verifychecksumscontroller.cpp
+@@ -57,8 +57,10 @@
+ #include <QDir>
+ #include <QProcess>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/function.hpp>
++#endif
+
+ #include <gpg-error.h>
+
+
+--- a/kleopatra/crypto/verifychecksumscontroller.h
++++ b/kleopatra/crypto/verifychecksumscontroller.h
+@@ -42,7 +42,9 @@
+ #include <gpgme++/global.h>
+ #include <kmime/kmime_header_parsing.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/dialogs/certificatedetailsdialog.cpp
++++ b/kleopatra/dialogs/certificatedetailsdialog.cpp
+@@ -66,7 +66,9 @@
+ #include <QPointer>
+ #include <QHeaderView>
+
++#ifndef Q_MOC_RUN
+ #include <boost/mem_fn.hpp>
++#endif
+
+ #include <algorithm>
+ #include <cassert>
+
+--- a/kleopatra/dialogs/certificateselectiondialog.cpp
++++ b/kleopatra/dialogs/certificateselectiondialog.cpp
+@@ -59,7 +59,9 @@
+ #include <QPointer>
+ #include <QVBoxLayout>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <algorithm>
+
+
+--- a/kleopatra/dialogs/certifycertificatedialog.cpp
++++ b/kleopatra/dialogs/certifycertificatedialog.cpp
+@@ -54,7 +54,9 @@
+
+ #include <QTextDocument> // Qt::escape
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <gpg-error.h>
+
+
+--- a/kleopatra/dialogs/deletecertificatesdialog.cpp
++++ b/kleopatra/dialogs/deletecertificatesdialog.cpp
+@@ -56,7 +56,9 @@
+
+ #include <gpgme++/key.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/mem_fn.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/dialogs/lookupcertificatesdialog.cpp
++++ b/kleopatra/dialogs/lookupcertificatesdialog.cpp
+@@ -50,7 +50,9 @@
+ #include <QPushButton>
+ #include <QHeaderView>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/dialogs/selftestdialog.cpp
++++ b/kleopatra/dialogs/selftestdialog.cpp
+@@ -44,7 +44,9 @@
+ #include <QHeaderView>
+ #include <QSortFilterProxyModel>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <cassert>
+ #include <vector>
+
+--- a/kleopatra/dialogs/setinitialpindialog.cpp
++++ b/kleopatra/dialogs/setinitialpindialog.cpp
+@@ -43,7 +43,9 @@
+
+ #include <gpgme++/error.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/static_assert.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/kleopatraapplication.cpp
++++ b/kleopatra/kleopatraapplication.cpp
+@@ -69,10 +69,12 @@
+ #include <QDir>
+ #include <QPointer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/range.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/mem_fn.hpp>
++#endif
+
+ #include <memory>
+
+
+--- a/kleopatra/libkleopatraclient/core/command.cpp
++++ b/kleopatra/libkleopatraclient/core/command.cpp
+@@ -44,8 +44,10 @@
+ #include <assuan.h>
+ #include <gpg-error.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/type_traits/remove_pointer.hpp>
++#endif
+
+ #include <algorithm>
+ #include <string>
+
+--- a/kleopatra/main.cpp
++++ b/kleopatra/main.cpp
+@@ -89,7 +89,9 @@
+ #include <gpgme++/global.h>
+ #include <gpgme++/error.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/mainwindow_desktop.cpp
++++ b/kleopatra/mainwindow_desktop.cpp
+@@ -89,8 +89,10 @@
+ #include <kleo/cryptoconfig.h>
+ #include <kleo/stl_util.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/mainwindow_mobile.cpp
++++ b/kleopatra/mainwindow_mobile.cpp
+@@ -93,8 +93,10 @@
+ #include <ui/cryptoconfigdialog.h>
+ #include <kleo/cryptoconfig.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/kleopatra/models/keycache.cpp
++++ b/kleopatra/models/keycache.cpp
+@@ -63,11 +63,13 @@
+ #include <QPointer>
+ #include <QTimer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/mem_fn.hpp>
+ #include <boost/range.hpp>
+ #include <boost/weak_ptr.hpp>
+ #include <boost/iterator/filter_iterator.hpp>
++#endif
+
+ #include <utility>
+ #include <algorithm>
+
+--- a/kleopatra/models/keycache.h
++++ b/kleopatra/models/keycache.h
+@@ -39,7 +39,9 @@
+
+ #include <gpgme++/global.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <string>
+ #include <vector>
+
+--- a/kleopatra/models/keylistsortfilterproxymodel.cpp
++++ b/kleopatra/models/keylistsortfilterproxymodel.cpp
+@@ -42,7 +42,9 @@
+
+ #include <kleo/stl_util.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/models/keylistsortfilterproxymodel.h
++++ b/kleopatra/models/keylistsortfilterproxymodel.h
+@@ -37,7 +37,9 @@
+ #include <models/keylistmodelinterface.h>
+
+ #include <utils/pimpl_ptr.h>
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ namespace GpgME {
+ class Key;
+
+--- a/kleopatra/models/predicates.h
++++ b/kleopatra/models/predicates.h
+@@ -39,7 +39,9 @@
+
+ #include <gpgme++/key.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <cstring>
+ #include <algorithm>
+
+--- a/kleopatra/models/subkeylistmodel.cpp
++++ b/kleopatra/models/subkeylistmodel.cpp
+@@ -43,7 +43,9 @@
+ #include <QVariant>
+ #include <QDate>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <algorithm>
+ #include <iterator>
+
+--- a/kleopatra/models/useridlistmodel.cpp
++++ b/kleopatra/models/useridlistmodel.cpp
+@@ -43,7 +43,9 @@
+ #include <QVariant>
+ #include <QDate>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <algorithm>
+ #include <iterator>
+
+--- a/kleopatra/newcertificatewizard/newcertificatewizard.cpp
++++ b/kleopatra/newcertificatewizard/newcertificatewizard.cpp
+@@ -78,7 +78,9 @@
+ #include <QUrl>
+ #include <QDesktopServices>
+
++#ifndef Q_MOC_RUN
+ #include <boost/range.hpp>
++#endif
+
+ #include <algorithm>
+
+
+--- a/kleopatra/selftest/enginecheck.cpp
++++ b/kleopatra/selftest/enginecheck.cpp
+@@ -48,8 +48,10 @@
+ #include <QFile>
+ #include <QRegExp>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/range.hpp>
++#endif
+
+ #include <algorithm>
+ #include <cassert>
+
+--- a/kleopatra/selftest/gpgagentcheck.cpp
++++ b/kleopatra/selftest/gpgagentcheck.cpp
+@@ -46,7 +46,9 @@
+
+ #include <KLocalizedString>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/selftest/gpgconfcheck.cpp
++++ b/kleopatra/selftest/gpgconfcheck.cpp
+@@ -45,7 +45,9 @@
+ #include <QProcess>
+ #include <QDir>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/selftest/libkleopatrarccheck.cpp
++++ b/kleopatra/selftest/libkleopatrarccheck.cpp
+@@ -43,7 +43,9 @@
+ #include <KLocalizedString>
+
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/selftest/registrycheck.cpp
++++ b/kleopatra/selftest/registrycheck.cpp
+@@ -41,7 +41,9 @@
+
+ #include <QSettings>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/selftest/uiservercheck.cpp
++++ b/kleopatra/selftest/uiservercheck.cpp
+@@ -45,7 +45,9 @@
+
+ #include <KLocalizedString>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/smartcard/readerstatus.cpp
++++ b/kleopatra/smartcard/readerstatus.cpp
+@@ -58,12 +58,14 @@
+ #include <QThread>
+ #include <QPointer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/algorithm/string/split.hpp>
+ #include <boost/algorithm/string/classification.hpp>
+ #include <boost/algorithm/string/case_conv.hpp>
+ #include <boost/static_assert.hpp>
+ #include <boost/range.hpp>
+ #include <boost/bind.hpp>
++#endif
+
+ #include <vector>
+ #include <set>
+
+--- a/kleopatra/systrayicon.cpp
++++ b/kleopatra/systrayicon.cpp
+@@ -64,8 +64,10 @@
+ #include <QClipboard>
+ #include <QPointer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/bind.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/kleopatra/uiserver/assuancommand.h
++++ b/kleopatra/uiserver/assuancommand.h
+@@ -47,8 +47,10 @@
+
+ #include <qwindowdefs.h> // for WId
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/enable_shared_from_this.hpp>
++#endif
+
+ #include <string>
+ #include <map>
+
+--- a/kleopatra/uiserver/assuanserverconnection.h
++++ b/kleopatra/uiserver/assuanserverconnection.h
+@@ -39,7 +39,9 @@
+
+ #include <utils/pimpl_ptr.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <string>
+ #include <vector>
+
+--- a/kleopatra/uiserver/selectcertificatecommand.cpp
++++ b/kleopatra/uiserver/selectcertificatecommand.cpp
+@@ -38,7 +38,9 @@
+
+ #include <models/keycache.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/mem_fn.hpp>
++#endif
+
+ #include <kleo/stl_util.h>
+ #include <kleo/exception.h>
+
+--- a/kleopatra/uiserver/sessiondata.cpp
++++ b/kleopatra/uiserver/sessiondata.cpp
+@@ -38,7 +38,9 @@
+
+ #include <QMutex>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace boost;
+
+--- a/kleopatra/uiserver/sessiondata.h
++++ b/kleopatra/uiserver/sessiondata.h
+@@ -39,7 +39,9 @@
+
+ #include <QTimer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <map>
+
+
+--- a/kleopatra/uiserver/uiserver.cpp
++++ b/kleopatra/uiserver/uiserver.cpp
+@@ -52,8 +52,10 @@
+ #include <QTimer>
+ #include <QFile>
+
++#ifndef Q_MOC_RUN
+ #include <boost/range/empty.hpp>
+ #include <boost/bind.hpp>
++#endif
+
+ #include <algorithm>
+ #include <cassert>
+
+--- a/kleopatra/uiserver/uiserver.h
++++ b/kleopatra/uiserver/uiserver.h
+@@ -37,7 +37,9 @@
+
+ #include <utils/pimpl_ptr.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <cstdio>
+
+
+--- a/kleopatra/uiserver/uiserver_p.h
++++ b/kleopatra/uiserver/uiserver_p.h
+@@ -44,7 +44,9 @@
+
+ #include <kleo-assuan.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <algorithm>
+ #include <vector>
+
+--- a/kleopatra/utils/archivedefinition.cpp
++++ b/kleopatra/utils/archivedefinition.cpp
+@@ -55,7 +55,9 @@
+ #include <QMutex>
+ #include <QCoreApplication>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ using namespace GpgME;
+ using namespace Kleo;
+
+--- a/kleopatra/utils/cached.h
++++ b/kleopatra/utils/cached.h
+@@ -33,7 +33,9 @@
+ #ifndef __KLEOPATRA_UTILS_CACHED_H__
+ #define __KLEOPATRA_UTILS_CACHED_H__
+
++#ifndef Q_MOC_RUN
+ #include <boost/call_traits.hpp>
++#endif
+
+ namespace Kleo {
+
+
+--- a/kleopatra/utils/classify.cpp
++++ b/kleopatra/utils/classify.cpp
+@@ -43,7 +43,9 @@
+ #include <QtAlgorithms>
+ #include <QByteArrayMatcher>
+
++#ifndef Q_MOC_RUN
+ #include <boost/range.hpp>
++#endif
+
+ #ifdef __GLIBCXX__
+ # include <ext/algorithm>
+
+--- a/kleopatra/utils/detail_p.h
++++ b/kleopatra/utils/detail_p.h
+@@ -35,7 +35,9 @@
+
+ #include <kleo-assuan.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QByteArray>
+
+
+--- a/kleopatra/utils/filesystemwatcher.cpp
++++ b/kleopatra/utils/filesystemwatcher.cpp
+@@ -44,7 +44,9 @@
+
+ #include <kleo/stl_util.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <set>
+ #include <cassert>
+
+--- a/kleopatra/utils/input.h
++++ b/kleopatra/utils/input.h
+@@ -35,7 +35,9 @@
+
+ #include <kleo-assuan.h> // for assuan_fd_t
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ class QIODevice;
+ class QString;
+
+--- a/kleopatra/utils/iodevicelogger.h
++++ b/kleopatra/utils/iodevicelogger.h
+@@ -37,7 +37,9 @@
+
+ #include <utils/pimpl_ptr.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ namespace Kleo {
+
+
+--- a/kleopatra/utils/kleo_assert.h
++++ b/kleopatra/utils/kleo_assert.h
+@@ -35,7 +35,9 @@
+
+ #include <kleo/exception.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/preprocessor/stringize.hpp>
++#endif
+
+ #include <assert.h>
+
+
+--- a/kleopatra/utils/log.cpp
++++ b/kleopatra/utils/log.cpp
+@@ -45,7 +45,9 @@
+ #include <QFile>
+ #include <QString>
+
++#ifndef Q_MOC_RUN
+ #include <boost/weak_ptr.hpp>
++#endif
+ #include <cassert>
+ #include <cstdio>
+
+
+--- a/kleopatra/utils/log.h
++++ b/kleopatra/utils/log.h
+@@ -36,7 +36,9 @@
+ #include <utils/pimpl_ptr.h>
+
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <cstdio>
+
+
+--- a/kleopatra/utils/multivalidator.cpp
++++ b/kleopatra/utils/multivalidator.cpp
+@@ -36,8 +36,10 @@
+
+ #include <kleo/stl_util.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/lambda/lambda.hpp>
+ #include <boost/lambda/bind.hpp>
++#endif
+
+ #include <vector>
+ #include <iterator>
+
+--- a/kleopatra/utils/output.h
++++ b/kleopatra/utils/output.h
+@@ -37,7 +37,9 @@
+
+ #include <utils/pimpl_ptr.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ class QIODevice;
+ class QString;
+
+--- a/kleopatra/utils/path-helper.cpp
++++ b/kleopatra/utils/path-helper.cpp
+@@ -46,7 +46,9 @@
+ #include <QFileInfo>
+ #include <QDir>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <algorithm>
+
+
+--- a/kleopatra/utils/types.cpp
++++ b/kleopatra/utils/types.cpp
+@@ -38,8 +38,10 @@
+ #include <QWidget>
+ #include <QVector>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/weak_ptr.hpp>
++#endif
+
+ #ifdef Q_OS_WIN
+ #include <windows.h>
+
+--- a/kleopatra/view/keylistcontroller.cpp
++++ b/kleopatra/view/keylistcontroller.cpp
+@@ -83,7 +83,9 @@
+ #include <QItemSelectionModel>
+ #include <QAction>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <algorithm>
+ #include <cassert>
+
+--- a/kleopatra/view/keytreeview.h
++++ b/kleopatra/view/keytreeview.h
+@@ -39,7 +39,9 @@
+
+ #include <gpgme++/key.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <vector>
+
+ class QTreeView;
+
+--- a/kleopatra/view/searchbar.h
++++ b/kleopatra/view/searchbar.h
+@@ -37,7 +37,9 @@
+
+ #include <utils/pimpl_ptr.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ class KLineEdit;
+
+
+--- a/kleopatra/view/tabwidget.h
++++ b/kleopatra/view/tabwidget.h
+@@ -39,7 +39,9 @@
+
+ #include <utils/pimpl_ptr.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ class QAbstractItemView;
+
+
+--- a/libkleo/backends/qgpgme/qgpgmedecryptjob.cpp
++++ b/libkleo/backends/qgpgme/qgpgmedecryptjob.cpp
+@@ -40,7 +40,9 @@
+
+ #include <QBuffer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/weak_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/libkleo/backends/qgpgme/qgpgmedecryptverifyjob.cpp
++++ b/libkleo/backends/qgpgme/qgpgmedecryptverifyjob.cpp
+@@ -43,7 +43,9 @@
+
+ #include <QBuffer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/weak_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/libkleo/backends/qgpgme/qgpgmedownloadjob.cpp
++++ b/libkleo/backends/qgpgme/qgpgmedownloadjob.cpp
+@@ -39,7 +39,9 @@
+
+ #include <QStringList>
+
++#ifndef Q_MOC_RUN
+ #include <boost/weak_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/libkleo/backends/qgpgme/qgpgmeencryptjob.cpp
++++ b/libkleo/backends/qgpgme/qgpgmeencryptjob.cpp
+@@ -42,7 +42,9 @@
+
+ #include <QBuffer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/weak_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/libkleo/backends/qgpgme/qgpgmenewcryptoconfig.cpp
++++ b/libkleo/backends/qgpgme/qgpgmenewcryptoconfig.cpp
+@@ -41,9 +41,11 @@
+ #include <gpgme++/global.h>
+ #include <gpgme++/error.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/foreach.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/mem_fn.hpp>
++#endif
+
+ #include <sstream>
+ #include <string>
+
+--- a/libkleo/backends/qgpgme/qgpgmenewcryptoconfig.h
++++ b/libkleo/backends/qgpgme/qgpgmenewcryptoconfig.h
+@@ -44,9 +44,11 @@
+
+ #include <gpgme++/configuration.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/weak_ptr.hpp>
+ #include <boost/enable_shared_from_this.hpp>
++#endif
+
+ #include <vector>
+ #include <utility>
+
+--- a/libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
++++ b/libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
+@@ -37,7 +37,9 @@
+
+ #include <QString>
+
++#ifndef Q_MOC_RUN
+ #include <boost/range.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/libkleo/backends/qgpgme/qgpgmesignencryptjob.cpp
++++ b/libkleo/backends/qgpgme/qgpgmesignencryptjob.cpp
+@@ -45,7 +45,9 @@
+
+ #include <QBuffer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/weak_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/libkleo/backends/qgpgme/qgpgmesignjob.cpp
++++ b/libkleo/backends/qgpgme/qgpgmesignjob.cpp
+@@ -42,7 +42,9 @@
+
+ #include <QBuffer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/weak_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/libkleo/backends/qgpgme/qgpgmeverifydetachedjob.cpp
++++ b/libkleo/backends/qgpgme/qgpgmeverifydetachedjob.cpp
+@@ -42,7 +42,9 @@
+
+ #include <cassert>
+
++#ifndef Q_MOC_RUN
+ #include <boost/weak_ptr.hpp>
++#endif
+
+ using namespace Kleo;
+ using namespace GpgME;
+
+--- a/libkleo/backends/qgpgme/qgpgmeverifyopaquejob.cpp
++++ b/libkleo/backends/qgpgme/qgpgmeverifyopaquejob.cpp
+@@ -40,7 +40,9 @@
+
+ #include <QBuffer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/weak_ptr.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/libkleo/backends/qgpgme/threadedjobmixin.cpp
++++ b/libkleo/backends/qgpgme/threadedjobmixin.cpp
+@@ -40,7 +40,9 @@
+ #include <QStringList>
+ #include <QByteArray>
+
++#ifndef Q_MOC_RUN
+ #include <boost/mem_fn.hpp>
++#endif
+
+ #include <algorithm>
+ #include <iterator>
+
+--- a/libkleo/backends/qgpgme/threadedjobmixin.h
++++ b/libkleo/backends/qgpgme/threadedjobmixin.h
+@@ -44,6 +44,7 @@
+ #include <gpgme++/context.h>
+ #include <gpgme++/interfaces/progressprovider.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/weak_ptr.hpp>
+ #include <boost/bind.hpp>
+@@ -51,6 +52,7 @@
+ #include <boost/tuple/tuple.hpp>
+ #include <boost/utility/enable_if.hpp>
+ #include <boost/type_traits/is_same.hpp>
++#endif
+
+ #include <cassert>
+
+
+--- a/libkleo/kleo/checksumdefinition.cpp
++++ b/libkleo/kleo/checksumdefinition.cpp
+@@ -51,7 +51,9 @@
+ #include <QMutex>
+ #include <QCoreApplication>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #ifdef stdin
+ # undef stdin // pah..
+
+--- a/libkleo/kleo/decryptjob.h
++++ b/libkleo/kleo/decryptjob.h
+@@ -35,7 +35,9 @@
+
+ #include "job.h"
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ class QByteArray;
+ class QIODevice;
+
+--- a/libkleo/kleo/decryptverifyjob.h
++++ b/libkleo/kleo/decryptverifyjob.h
+@@ -35,7 +35,9 @@
+
+ #include "job.h"
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ class QByteArray;
+ class QIODevice;
+
+--- a/libkleo/kleo/encryptjob.h
++++ b/libkleo/kleo/encryptjob.h
+@@ -35,7 +35,9 @@
+
+ #include "job.h"
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/libkleo/kleo/kconfigbasedkeyfilter.cpp
++++ b/libkleo/kleo/kconfigbasedkeyfilter.cpp
+@@ -37,7 +37,9 @@
+ #include <kconfiggroup.h>
+ #include <klocale.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/mem_fn.hpp>
++#endif
+ #include <algorithm>
+
+ using namespace Kleo;
+
+--- a/libkleo/kleo/keyfiltermanager.cpp
++++ b/libkleo/kleo/keyfiltermanager.cpp
+@@ -48,8 +48,10 @@
+ #include <QAbstractListModel>
+ #include <QModelIndex>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/iterator/filter_iterator.hpp>
++#endif
+
+ #include <algorithm>
+ #include <vector>
+
+--- a/libkleo/kleo/keyfiltermanager.h
++++ b/libkleo/kleo/keyfiltermanager.h
+@@ -36,7 +36,9 @@
+ #include "kleo/kleo_export.h"
+ #include <QtCore/QObject>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <kleo/keyfilter.h>
+
+
+--- a/libkleo/kleo/signencryptjob.h
++++ b/libkleo/kleo/signencryptjob.h
+@@ -37,7 +37,9 @@
+
+ #include <gpgme++/global.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+ #include <utility>
+
+--- a/libkleo/kleo/signjob.h
++++ b/libkleo/kleo/signjob.h
+@@ -37,7 +37,9 @@
+
+ #include <gpgme++/global.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <vector>
+
+
+--- a/libkleo/kleo/stl_util.h
++++ b/libkleo/kleo/stl_util.h
+@@ -22,11 +22,13 @@
+ #ifndef __KDTOOLSCORE_STL_UTIL_H__
+ #define __KDTOOLSCORE_STL_UTIL_H__
+
++#ifndef Q_MOC_RUN
+ #include <boost/range.hpp>
+ #include <boost/iterator/filter_iterator.hpp>
+ #include <boost/iterator/transform_iterator.hpp>
+ #include <boost/call_traits.hpp>
+ #include <boost/version.hpp>
++#endif
+
+ #include <algorithm>
+ #include <numeric>
+
+--- a/libkleo/kleo/verifydetachedjob.h
++++ b/libkleo/kleo/verifydetachedjob.h
+@@ -35,7 +35,9 @@
+
+ #include "job.h"
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ class QByteArray;
+ class QIODevice;
+
+--- a/libkleo/kleo/verifyopaquejob.h
++++ b/libkleo/kleo/verifyopaquejob.h
+@@ -35,7 +35,9 @@
+
+ #include "job.h"
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ class QByteArray;
+ class QIODevice;
+
+--- a/libkleo/ui/directoryserviceswidget.cpp
++++ b/libkleo/ui/directoryserviceswidget.cpp
+@@ -45,7 +45,9 @@
+ #include <QMenu>
+ #include <QAction>
+
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
++#endif
+
+ #include <vector>
+
+
+
diff --git a/kde-base/kleopatra/kleopatra-4.14.10.ebuild b/kde-base/kleopatra/kleopatra-4.14.10.ebuild
index f741b20..fdf67ef 100644
--- a/kde-base/kleopatra/kleopatra-4.14.10.ebuild
+++ b/kde-base/kleopatra/kleopatra-4.14.10.ebuild
@@ -30,7 +30,10 @@
libkleo/
"
-PATCHES=( "${FILESDIR}/${PN}-install-headers.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-install-headers.patch"
+ "${FILESDIR}/${P}-newer-boost-buildfix.patch"
+)
src_unpack() {
if use handbook; then
diff --git a/kde-base/kleopatra/kleopatra-4.14.3.ebuild b/kde-base/kleopatra/kleopatra-4.14.3.ebuild
deleted file mode 100644
index 9cb2b21..0000000
--- a/kde-base/kleopatra/kleopatra-4.14.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Kleopatra - KDE X.509 key manager"
-HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- >=app-crypt/gpgme-1.3.2
- dev-libs/boost:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}
- app-crypt/gnupg
-"
-
-KMEXTRACTONLY="
- libkleo/
-"
-
-src_unpack() {
- if use handbook; then
- KMEXTRA="
- doc/kwatchgnupg
- "
- fi
-
- kde4-meta_src_unpack
-}
diff --git a/kde-base/kleopatra/kleopatra-4.14.8.ebuild b/kde-base/kleopatra/kleopatra-4.14.8.ebuild
index f4bbcd2..0661dd4 100644
--- a/kde-base/kleopatra/kleopatra-4.14.8.ebuild
+++ b/kde-base/kleopatra/kleopatra-4.14.8.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="Kleopatra - KDE X.509 key manager"
HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/klipper/Manifest b/kde-base/klipper/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/klipper/Manifest
+++ b/kde-base/klipper/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/klipper/klipper-4.11.14.ebuild b/kde-base/klipper/klipper-4.11.14.ebuild
deleted file mode 100644
index c1f7c3f..0000000
--- a/kde-base/klipper/klipper-4.11.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Applet for KDE and X clipboard management"
-HOMEPAGE+=" https://userbase.kde.org/Klipper"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug prison"
-
-DEPEND="
- $(add_kdebase_dep libkworkspace)
- $(add_kdebase_dep libtaskmanager)
- sys-libs/zlib
- x11-libs/libX11
- prison? ( media-libs/prison:4 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with prison)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/klipper/klipper-4.11.19.ebuild b/kde-base/klipper/klipper-4.11.19.ebuild
index 140e930..c1f7c3f 100644
--- a/kde-base/klipper/klipper-4.11.19.ebuild
+++ b/kde-base/klipper/klipper-4.11.19.ebuild
@@ -10,7 +10,7 @@
DESCRIPTION="Applet for KDE and X clipboard management"
HOMEPAGE+=" https://userbase.kde.org/Klipper"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug prison"
DEPEND="
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 9443459..6508138 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kmail/kmail-4.14.3.ebuild b/kde-base/kmail/kmail-4.14.3.ebuild
deleted file mode 100644
index ceca5af..0000000
--- a/kde-base/kmail/kmail-4.14.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-VIRTUALX_REQUIRED=test
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE"
-HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep korganizer)
- $(add_kdebase_dep kdepim-common-libs "" 4.12.1-r2)
-"
-RDEPEND="
- ${DEPEND}
- !=kde-base/kdepim-common-libs-4.12.1-r1
-"
-
-RESTRICT="test"
-# bug 393147
-
-KMEXTRACTONLY="
- agents/folderarchiveagent.desktop
- agents/sendlateragent/
- akonadi_next/
- calendarsupport/
- calendarviews/
- grantleeeditor/grantleethemeeditor/
- korganizer/
- kresources/
- libkleo/
- libkpgp/
- libkdepimdbusinterfaces/
- kdgantt2/
-"
-KMCOMPILEONLY="
- grantleetheme/
- kaddressbookgrantlee/
- messagecomposer/
- messagecore/
- messagelist/
- messageviewer/
- pimcommon/
- templateparser/
- incidenceeditor-ng/
- calendarsupport/
- noteshared/
-"
-KMEXTRA="
- agents/archivemailagent/
- agents/followupreminderagent/
- agents/mailfilteragent/
- grantleeeditor/headerthemeeditor/
- kmailcvt/
- ksendemail/
- importwizard/
- libksieve/
- mailcommon/
- mailimporter/
- mboximporter/
- pimsettingexporter/
- plugins/messageviewer/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_configure() {
- # Bug 308903
- use ppc64 && append-flags -mminimal-toc
-
- kde4-meta_src_configure
-}
-
-src_compile() {
- kde4-meta_src_compile kmail_xml
- kde4-meta_src_compile
-}
-
-pkg_postinst() {
- kde4-meta_pkg_postinst
-
- if ! has_version kde-base/kdepim-kresources:${SLOT}; then
- echo
- elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
- echo
- fi
- if ! has_version kde-base/kleopatra:${SLOT}; then
- echo
- elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
- echo
- fi
-
- if has_version "app-office/akonadi-server[sqlite]"; then
- ewarn
- ewarn "We strongly recommend you set your Akonadi database backend to QMYSQL in your"
- ewarn "user configuration. This is the backend recommended by KDE upstream."
- ewarn "Reports indicate that kde-base/kmail-4.10 does not work properly with the sqlite"
- ewarn "backend anymore."
- if has_version "app-office/akonadi-server[-mysql]"; then
- ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD app-office/akonadi-server WITH mysql USEFLAG ENABLED."
- fi
- ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
- ewarn
- fi
-}
diff --git a/kde-base/kmail/kmail-4.14.8.ebuild b/kde-base/kmail/kmail-4.14.8.ebuild
index 2f679f3..cec2bcd 100644
--- a/kde-base/kmail/kmail-4.14.8.ebuild
+++ b/kde-base/kmail/kmail-4.14.8.ebuild
@@ -12,7 +12,7 @@
DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE"
HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kmenuedit/Manifest b/kde-base/kmenuedit/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/kmenuedit/Manifest
+++ b/kde-base/kmenuedit/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kmenuedit/kmenuedit-4.11.14.ebuild b/kde-base/kmenuedit/kmenuedit-4.11.14.ebuild
deleted file mode 100644
index 202f342..0000000
--- a/kde-base/kmenuedit/kmenuedit-4.11.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE menu editor"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- $(add_kdebase_dep khotkeys)
-"
-DEPEND=${RDEPEND}
-
-KMEXTRACTONLY="
- libs/kworkspace/
-"
-
-src_configure() {
- sed -i -e \
- "s:\${CMAKE_CURRENT_BINARY_DIR}/../khotkeys/app/org.kde.khotkeys.xml:${EPREFIX}/usr/share/dbus-1/interfaces/org.kde.khotkeys.xml:g" \
- kmenuedit/CMakeLists.txt \
- || die "sed failed"
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/kmenuedit/kmenuedit-4.11.19.ebuild b/kde-base/kmenuedit/kmenuedit-4.11.19.ebuild
index 9ae0914..202f342 100644
--- a/kde-base/kmenuedit/kmenuedit-4.11.19.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-4.11.19.ebuild
@@ -9,7 +9,7 @@
inherit kde4-meta
DESCRIPTION="KDE menu editor"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND="
diff --git a/kde-base/knode/Manifest b/kde-base/knode/Manifest
index 9443459..6508138 100644
--- a/kde-base/knode/Manifest
+++ b/kde-base/knode/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/knode/knode-4.14.3.ebuild b/kde-base/knode/knode-4.14.3.ebuild
deleted file mode 100644
index 3a89606..0000000
--- a/kde-base/knode/knode-4.14.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="A newsreader for KDE"
-HOMEPAGE="https://www.kde.org/applications/internet/knode/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# test fails, last checked for 4.2.96
-RESTRICT=test
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs "" 4.12.1-r1)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- agents/
- libkleo/
- libkpgp/
- messagecomposer/
- messageviewer/
- messagecore/
-"
-KMCOMPILEONLY="
- grantleetheme/
- kaddressbookgrantlee/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
- if use handbook; then
- KMEXTRA="
- doc/kioslave/news
- "
- fi
-
- kde4-meta_src_unpack
-}
diff --git a/kde-base/knode/knode-4.14.8.ebuild b/kde-base/knode/knode-4.14.8.ebuild
index c1840d6..7984574 100644
--- a/kde-base/knode/knode-4.14.8.ebuild
+++ b/kde-base/knode/knode-4.14.8.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="A newsreader for KDE"
HOMEPAGE="https://www.kde.org/applications/internet/knode/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
# test fails, last checked for 4.2.96
diff --git a/kde-base/knotes/Manifest b/kde-base/knotes/Manifest
index 9443459..6508138 100644
--- a/kde-base/knotes/Manifest
+++ b/kde-base/knotes/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/knotes/knotes-4.14.3.ebuild b/kde-base/knotes/knotes-4.14.3.ebuild
deleted file mode 100644
index d7e3614..0000000
--- a/kde-base/knotes/knotes-4.14.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE Notes application"
-HOMEPAGE="https://www.kde.org/applications/utilities/knotes/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMCOMPILEONLY="
- noteshared/
-"
-
-KMEXTRACTONLY="
- akonadi_next/
- pimcommon/
-"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/knotes/knotes-4.14.8.ebuild b/kde-base/knotes/knotes-4.14.8.ebuild
index cb9b423..fe45e46 100644
--- a/kde-base/knotes/knotes-4.14.8.ebuild
+++ b/kde-base/knotes/knotes-4.14.8.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="KDE Notes application"
HOMEPAGE="https://www.kde.org/applications/utilities/knotes/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/konsolekalendar/Manifest b/kde-base/konsolekalendar/Manifest
index 9443459..6508138 100644
--- a/kde-base/konsolekalendar/Manifest
+++ b/kde-base/konsolekalendar/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.14.3.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.14.3.ebuild
deleted file mode 100644
index 3e34ec5..0000000
--- a/kde-base/konsolekalendar/konsolekalendar-4.14.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMCOMPILEONLY="
- calendarsupport/
-"
-KMEXTRACTONLY="
- calendarviews/
- libkdepimdbusinterfaces/
-"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.14.8.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.14.8.ebuild
index 75dab92..47af89a 100644
--- a/kde-base/konsolekalendar/konsolekalendar-4.14.8.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-4.14.8.ebuild
@@ -12,7 +12,7 @@
DESCRIPTION="A command line interface to KDE calendars"
HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kontact/Manifest b/kde-base/kontact/Manifest
index 9443459..6508138 100644
--- a/kde-base/kontact/Manifest
+++ b/kde-base/kontact/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kontact/kontact-4.14.3.ebuild b/kde-base/kontact/kontact-4.14.3.ebuild
deleted file mode 100644
index cec1a2d..0000000
--- a/kde-base/kontact/kontact-4.14.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE personal information manager"
-HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
-KMSAVELIBS="true"
-
-# We remove plugins that are related to external kdepim programs. This way
-# kontact doesn't have to depend on all programs it has plugins for.
-# kcontactmanager gone from kdesvn
-#
-KMEXTRACTONLY="
- kontact/plugins/akregator/
- kontact/plugins/kaddressbook/
- kontact/plugins/kjots/
- kontact/plugins/kmail/
- kontact/plugins/knode/
- kontact/plugins/knotes/
- kontact/plugins/korganizer/
- kontact/plugins/ktimetracker/
- kontact/plugins/planner/
- kontact/plugins/specialdates/
- libkdepimdbusinterfaces/
-"
-
-src_unpack() {
- if use handbook; then
- KMEXTRA+="
- doc/kontact-admin/
- "
- fi
-
- kde4-meta_src_unpack
-}
diff --git a/kde-base/kontact/kontact-4.14.8.ebuild b/kde-base/kontact/kontact-4.14.8.ebuild
index 280aa19..50f29e1 100644
--- a/kde-base/kontact/kontact-4.14.8.ebuild
+++ b/kde-base/kontact/kontact-4.14.8.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="KDE personal information manager"
HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest
index 9443459..6508138 100644
--- a/kde-base/korganizer/Manifest
+++ b/kde-base/korganizer/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/korganizer/korganizer-4.14.3.ebuild b/kde-base/korganizer/korganizer-4.14.3.ebuild
deleted file mode 100644
index 1623cfa..0000000
--- a/kde-base/korganizer/korganizer-4.14.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="A Personal Organizer for KDE"
-HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}
- $(add_kdeapps_dep ktimezoned '' 4.14.3)
-"
-
-RESTRICT="test"
-# bug 393135
-
-KMLOADLIBS="kdepim-common-libs"
-
-KMEXTRA="
- korgac/
-"
-
-KMEXTRACTONLY="
- akonadi_next/
- calendarviews/
- kdgantt2/
- kmail/
- pimcommon/
- knode/org.kde.knode.xml
- libkdepimdbusinterfaces/
- korgac/org.kde.korganizer.KOrgac.xml
-"
-
-KMCOMPILEONLY="
- incidenceeditor-ng/
- calendarsupport/
-"
-
-src_unpack() {
- if use kontact; then
- KMEXTRA="${KMEXTRA}
- kontact/plugins/planner/
- kontact/plugins/specialdates/
- "
- fi
-
- kde4-meta_src_unpack
-}
-
-src_install() {
- kde4-meta_src_install
- # colliding with kdepim-common-libs
- rm -rf "${ED}"/usr/share/kde4/servicetypes/calendarplugin.desktop
- rm -rf "${ED}"/usr/share/kde4/servicetypes/calendardecoration.desktop
-}
-
-pkg_postinst() {
- kde4-meta_pkg_postinst
-
- if ! has_version kde-base/kdepim-kresources:${SLOT}; then
- echo
- elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
- echo
- fi
-}
diff --git a/kde-base/korganizer/korganizer-4.14.8.ebuild b/kde-base/korganizer/korganizer-4.14.8.ebuild
index cb8f217..44b47d2 100644
--- a/kde-base/korganizer/korganizer-4.14.8.ebuild
+++ b/kde-base/korganizer/korganizer-4.14.8.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="A Personal Organizer for KDE"
HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/krunner/Manifest b/kde-base/krunner/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/krunner/Manifest
+++ b/kde-base/krunner/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/krunner/krunner-4.11.14.ebuild b/kde-base/krunner/krunner-4.11.14.ebuild
deleted file mode 100644
index f355dcc..0000000
--- a/kde-base/krunner/krunner-4.11.14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE Command Runner"
-HOMEPAGE+=" https://userbase.kde.org/Plasma/Krunner"
-IUSE="debug"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
- $(add_kdebase_dep kcheckpass)
- $(add_kdebase_dep kephal)
- $(add_kdebase_dep ksmserver)
- $(add_kdebase_dep ksysguard)
- $(add_kdebase_dep libkworkspace)
- $(add_kdebase_dep libplasmagenericshell)
- !aqua? (
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- libs/kdm/
- libs/kephal/
- libs/ksysguard/
- libs/kworkspace/
- libs/plasmagenericshell/
- kcheckpass/
- ksmserver/org.kde.KSMServerInterface.xml
- ksysguard/
- plasma/screensaver/shell/org.kde.plasma-overlay.App.xml
-"
-
-KMLOADLIBS="libkworkspace"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with opengl OpenGL)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/krunner/krunner-4.11.19.ebuild b/kde-base/krunner/krunner-4.11.19.ebuild
index c2cfaed..f355dcc 100644
--- a/kde-base/krunner/krunner-4.11.19.ebuild
+++ b/kde-base/krunner/krunner-4.11.19.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="KDE Command Runner"
HOMEPAGE+=" https://userbase.kde.org/Plasma/Krunner"
IUSE="debug"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
DEPEND="
$(add_kdebase_dep kcheckpass)
diff --git a/kde-base/kscreensaver/Manifest b/kde-base/kscreensaver/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/kscreensaver/Manifest
+++ b/kde-base/kscreensaver/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kscreensaver/kscreensaver-4.11.14.ebuild b/kde-base/kscreensaver/kscreensaver-4.11.14.ebuild
deleted file mode 100644
index 029f7e6..0000000
--- a/kde-base/kscreensaver/kscreensaver-4.11.14.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE screensaver framework"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- $(add_kdebase_dep kcheckpass)
- x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.5.95-nsfw.patch"
-)
diff --git a/kde-base/kscreensaver/kscreensaver-4.11.19.ebuild b/kde-base/kscreensaver/kscreensaver-4.11.19.ebuild
index fd16f6a..029f7e6 100644
--- a/kde-base/kscreensaver/kscreensaver-4.11.19.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.11.19.ebuild
@@ -8,7 +8,7 @@
inherit kde4-meta
DESCRIPTION="KDE screensaver framework"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND="
diff --git a/kde-base/ksmserver/Manifest b/kde-base/ksmserver/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/ksmserver/Manifest
+++ b/kde-base/ksmserver/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/ksmserver/ksmserver-4.11.14.ebuild b/kde-base/ksmserver/ksmserver-4.11.14.ebuild
deleted file mode 100644
index 93b6621..0000000
--- a/kde-base/ksmserver/ksmserver-4.11.14.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KMNAME="kde-workspace"
-inherit kde4-meta pax-utils
-
-DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kcminit)
- $(add_kdebase_dep libkworkspace)
- media-libs/qimageblitz
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXrender
-"
-RDEPEND="${DEPEND}
- $(add_kdebase_dep kdm)
-"
-
-KMEXTRACTONLY="
- kcminit/main.h
- libs/kdm/kgreeterplugin.h
- kcheckpass/
- libs/kephal/
- libs/kworkspace/
-"
-
-KMLOADLIBS="libkworkspace"
-
-src_install() {
- kde4-meta_src_install
-
- # bug #483236
- pax-mark m "${ED}/usr/$(get_libdir)/kde4/libexec/kscreenlocker_greet"
-}
diff --git a/kde-base/ksmserver/ksmserver-4.11.19.ebuild b/kde-base/ksmserver/ksmserver-4.11.19.ebuild
index 6acafd8..4b5b65a 100644
--- a/kde-base/ksmserver/ksmserver-4.11.19.ebuild
+++ b/kde-base/ksmserver/ksmserver-4.11.19.ebuild
@@ -9,7 +9,7 @@
inherit kde4-meta pax-utils
DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/ksplash/Manifest b/kde-base/ksplash/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/ksplash/Manifest
+++ b/kde-base/ksplash/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/ksplash/ksplash-4.11.14.ebuild b/kde-base/ksplash/ksplash-4.11.14.ebuild
deleted file mode 100644
index 756d6d1..0000000
--- a/kde-base/ksplash/ksplash-4.11.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_3dnow altivec debug cpu_flags_x86_mmx cpu_flags_x86_sse
-cpu_flags_x86_sse2 xinerama"
-
-COMMONDEPEND="
- media-libs/libpng:0=
- virtual/jpeg:0
- x11-libs/libX11
- x11-libs/libXext
- xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
- xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
- $(cmake-utils_use_has altivec PPC_ALTIVEC)
- $(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
- $(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
- $(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
- $(cmake-utils_use_with xinerama)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/ksplash/ksplash-4.11.19.ebuild b/kde-base/ksplash/ksplash-4.11.19.ebuild
index 1052d93..756d6d1 100644
--- a/kde-base/ksplash/ksplash-4.11.19.ebuild
+++ b/kde-base/ksplash/ksplash-4.11.19.ebuild
@@ -9,7 +9,7 @@
inherit kde4-meta
DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="cpu_flags_x86_3dnow altivec debug cpu_flags_x86_mmx cpu_flags_x86_sse
cpu_flags_x86_sse2 xinerama"
diff --git a/kde-base/kstartupconfig/Manifest b/kde-base/kstartupconfig/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/kstartupconfig/Manifest
+++ b/kde-base/kstartupconfig/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kstartupconfig/kstartupconfig-4.11.14.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.11.14.ebuild
deleted file mode 100644
index d13af3d..0000000
--- a/kde-base/kstartupconfig/kstartupconfig-4.11.14.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstartupconfig/kstartupconfig-4.11.19.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.11.19.ebuild
index 145b3c2..d13af3d 100644
--- a/kde-base/kstartupconfig/kstartupconfig-4.11.19.ebuild
+++ b/kde-base/kstartupconfig/kstartupconfig-4.11.19.ebuild
@@ -8,5 +8,5 @@
inherit kde4-meta
DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
diff --git a/kde-base/kstyles/Manifest b/kde-base/kstyles/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/kstyles/Manifest
+++ b/kde-base/kstyles/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kstyles/kstyles-4.11.14.ebuild b/kde-base/kstyles/kstyles-4.11.14.ebuild
deleted file mode 100644
index feb60e5..0000000
--- a/kde-base/kstyles/kstyles-4.11.14.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A set of different KDE styles"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- kde-base/liboxygenstyle:4=
- x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- libs/oxygen
-"
diff --git a/kde-base/kstyles/kstyles-4.11.19.ebuild b/kde-base/kstyles/kstyles-4.11.19.ebuild
index e310987..75de509 100644
--- a/kde-base/kstyles/kstyles-4.11.19.ebuild
+++ b/kde-base/kstyles/kstyles-4.11.19.ebuild
@@ -8,7 +8,7 @@
inherit kde4-meta
DESCRIPTION="KDE: A set of different KDE styles"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/ksysguard/Manifest b/kde-base/ksysguard/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/ksysguard/Manifest
+++ b/kde-base/ksysguard/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/ksysguard/ksysguard-4.11.14.ebuild b/kde-base/ksysguard/ksysguard-4.11.14.ebuild
deleted file mode 100644
index a8511c0..0000000
--- a/kde-base/ksysguard/ksysguard-4.11.14.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-CPPUNIT_REQUIRED="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="KSysguard is a network enabled task manager and system monitor application"
-HOMEPAGE+=" https://userbase.kde.org/KSysGuard"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug lm_sensors test"
-
-DEPEND="
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXres
- lm_sensors? ( sys-apps/lm_sensors )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-# bug 393091
-
-KMEXTRA="
- libs/ksysguard/
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with lm_sensors Sensors)
- )
-
- kde4-meta_src_configure
-}
-
-pkg_postinst() {
- kde4-meta_pkg_postinst
- ewarn "Note that ksysguard has powerful features; one of these is the executing of arbitrary"
- ewarn "programs with elevated privileges (as data sources). So be careful opening worksheets"
- ewarn "from untrusted sources!"
-}
diff --git a/kde-base/ksysguard/ksysguard-4.11.19.ebuild b/kde-base/ksysguard/ksysguard-4.11.19.ebuild
index 072538c..a8511c0 100644
--- a/kde-base/ksysguard/ksysguard-4.11.19.ebuild
+++ b/kde-base/ksysguard/ksysguard-4.11.19.ebuild
@@ -12,7 +12,7 @@
DESCRIPTION="KSysguard is a network enabled task manager and system monitor application"
HOMEPAGE+=" https://userbase.kde.org/KSysGuard"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug lm_sensors test"
DEPEND="
diff --git a/kde-base/ksystraycmd/Manifest b/kde-base/ksystraycmd/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/ksystraycmd/Manifest
+++ b/kde-base/ksystraycmd/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/ksystraycmd/ksystraycmd-4.11.14.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.11.14.ebuild
deleted file mode 100644
index a3ea9f5..0000000
--- a/kde-base/ksystraycmd/ksystraycmd-4.11.14.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/ksystraycmd/ksystraycmd-4.11.19.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.11.19.ebuild
index 8fee01b..a3ea9f5 100644
--- a/kde-base/ksystraycmd/ksystraycmd-4.11.19.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-4.11.19.ebuild
@@ -8,7 +8,7 @@
inherit kde4-meta
DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="x11-libs/libX11"
diff --git a/kde-base/ktimetracker/Manifest b/kde-base/ktimetracker/Manifest
index 9443459..6508138 100644
--- a/kde-base/ktimetracker/Manifest
+++ b/kde-base/ktimetracker/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/ktimetracker/ktimetracker-4.14.3.ebuild b/kde-base/ktimetracker/ktimetracker-4.14.3.ebuild
deleted file mode 100644
index c02d010..0000000
--- a/kde-base/ktimetracker/ktimetracker-4.14.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KTimeTracker tracks time spent on various tasks"
-HOEMPAGE="https://www.kde.org/applications/utilities/ktimetracker/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- $(add_kdebase_dep kdepim-kresources)
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
- x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
- x11-proto/scrnsaverproto
-"
-
-KMEXTRACTONLY="
- kresources/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
- if use kontact; then
- KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
- fi
-
- kde4-meta_src_unpack
-}
diff --git a/kde-base/ktimetracker/ktimetracker-4.14.8.ebuild b/kde-base/ktimetracker/ktimetracker-4.14.8.ebuild
index ec11261..f5397b7 100644
--- a/kde-base/ktimetracker/ktimetracker-4.14.8.ebuild
+++ b/kde-base/ktimetracker/ktimetracker-4.14.8.ebuild
@@ -11,7 +11,7 @@
DESCRIPTION="KTimeTracker tracks time spent on various tasks"
HOEMPAGE="https://www.kde.org/applications/utilities/ktimetracker/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND="
diff --git a/kde-base/ktnef/Manifest b/kde-base/ktnef/Manifest
index eef052f..7269a34 100644
--- a/kde-base/ktnef/Manifest
+++ b/kde-base/ktnef/Manifest
@@ -1,3 +1,2 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/ktnef/ktnef-4.14.3.ebuild b/kde-base/ktnef/ktnef-4.14.3.ebuild
deleted file mode 100644
index be33392..0000000
--- a/kde-base/ktnef/ktnef-4.14.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="A viewer for TNEF attachments"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="debug"
-
-DEPEND="
- app-office/akonadi-server
- $(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- akonadi/
-"
diff --git a/kde-base/ktnef/ktnef-4.14.8.ebuild b/kde-base/ktnef/ktnef-4.14.8.ebuild
index de79b5f..cca81e5 100644
--- a/kde-base/ktnef/ktnef-4.14.8.ebuild
+++ b/kde-base/ktnef/ktnef-4.14.8.ebuild
@@ -10,7 +10,7 @@
inherit kde4-meta
DESCRIPTION="A viewer for TNEF attachments"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
LICENSE="LGPL-2.1"
IUSE="debug"
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kwin/kwin-4.11.14.ebuild b/kde-base/kwin/kwin-4.11.14.ebuild
deleted file mode 100644
index 404681d..0000000
--- a/kde-base/kwin/kwin-4.11.14.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="always"
-
-#VIRTUALX_REQUIRED=test
-RESTRICT=test
-# test 8: kwin-TestVirtualDesktops hangs even with virtualx
-
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KDE window manager"
-HOMEPAGE+=" https://userbase.kde.org/KWin"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug gles opengl wayland"
-
-COMMONDEPEND="
- $(add_kdebase_dep kactivities)
- $(add_kdebase_dep kdelibs opengl)
- $(add_kdebase_dep kephal)
- $(add_kdebase_dep libkworkspace)
- $(add_kdebase_dep liboxygenstyle)
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/libXrandr-1.2.1
- x11-libs/libXrender
- x11-libs/libXxf86vm
- opengl? ( >=media-libs/mesa-7.10 )
- gles? ( >=media-libs/mesa-7.12[egl(+),gles2] )
- wayland? ( >=media-libs/mesa-9.0[egl(+),wayland] )
-"
-DEPEND="${COMMONDEPEND}
- x11-libs/xcb-util-renderutil
- x11-proto/compositeproto
- x11-proto/damageproto
- x11-proto/fixesproto
- x11-proto/randrproto
- x11-proto/renderproto
-"
-RDEPEND="${COMMONDEPEND}
- x11-apps/scripts
-"
-
-KMEXTRACTONLY="
- ksmserver/
- libs/kephal/
- libs/oxygen/
-"
-
-# you need one of these
-REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl ) wayland? ( gles )"
-
-src_configure() {
- # FIXME Remove when activity API moved away from libkworkspace
- append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
-
- local mycmakeargs=(
- $(cmake-utils_use_with gles OpenGLES)
- $(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
- $(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with wayland Wayland)
- -DWITH_X11_Xcomposite=ON
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/kwin/kwin-4.11.19.ebuild b/kde-base/kwin/kwin-4.11.19.ebuild
index de641a9..404681d 100644
--- a/kde-base/kwin/kwin-4.11.19.ebuild
+++ b/kde-base/kwin/kwin-4.11.19.ebuild
@@ -16,7 +16,7 @@
DESCRIPTION="KDE window manager"
HOMEPAGE+=" https://userbase.kde.org/KWin"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug gles opengl wayland"
COMMONDEPEND="
diff --git a/kde-base/kwrited/Manifest b/kde-base/kwrited/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/kwrited/Manifest
+++ b/kde-base/kwrited/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kwrited/kwrited-4.11.14.ebuild b/kde-base/kwrited/kwrited-4.11.14.ebuild
deleted file mode 100644
index e80de96..0000000
--- a/kde-base/kwrited/kwrited-4.11.14.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE daemon listening for wall and write messages"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- || ( >=sys-libs/libutempter-1.1.5 >=sys-freebsd/freebsd-lib-9.0 )
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kwrited/kwrited-4.11.19.ebuild b/kde-base/kwrited/kwrited-4.11.19.ebuild
index a7a8f3e..e80de96 100644
--- a/kde-base/kwrited/kwrited-4.11.19.ebuild
+++ b/kde-base/kwrited/kwrited-4.11.19.ebuild
@@ -7,7 +7,7 @@
inherit kde4-meta
DESCRIPTION="KDE daemon listening for wall and write messages"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/libkgreeter/libkgreeter-4.11.19.ebuild b/kde-base/libkgreeter/libkgreeter-4.11.19.ebuild
index b8af065..5916b46 100644
--- a/kde-base/libkgreeter/libkgreeter-4.11.19.ebuild
+++ b/kde-base/libkgreeter/libkgreeter-4.11.19.ebuild
@@ -9,7 +9,7 @@
inherit kde4-meta
DESCRIPTION="Conversation widgets for KDM greeter"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/libkworkspace/Manifest b/kde-base/libkworkspace/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/libkworkspace/Manifest
+++ b/kde-base/libkworkspace/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/libkworkspace/libkworkspace-4.11.14.ebuild b/kde-base/libkworkspace/libkworkspace-4.11.14.ebuild
deleted file mode 100644
index 512c05f..0000000
--- a/kde-base/libkworkspace/libkworkspace-4.11.14.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/kworkspace"
-inherit kde4-meta
-
-DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMEXTRACTONLY="
- ksmserver/org.kde.KSMServerInterface.xml
- kwin/org.kde.KWin.xml
-"
-
-KMSAVELIBS="true"
-
-DEPEND="
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXau
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i -e 's/install( FILES kdisplaymanager.h/install( FILES kdisplaymanager.h screenpreviewwidget.h/' \
- libs/kworkspace/CMakeLists.txt || die "failed to provide screenpreviewwidget.h"
-
- kde4-meta_src_prepare
-}
diff --git a/kde-base/libkworkspace/libkworkspace-4.11.19.ebuild b/kde-base/libkworkspace/libkworkspace-4.11.19.ebuild
index 079e9d4..d3434d8 100644
--- a/kde-base/libkworkspace/libkworkspace-4.11.19.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-4.11.19.ebuild
@@ -9,7 +9,7 @@
inherit kde4-meta
DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
KMEXTRACTONLY="
diff --git a/kde-base/liboxygenstyle/Manifest b/kde-base/liboxygenstyle/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/liboxygenstyle/Manifest
+++ b/kde-base/liboxygenstyle/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.11.14.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.11.14.ebuild
deleted file mode 100644
index b99a6d7..0000000
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.11.14.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/oxygen"
-inherit kde4-meta
-
-DESCRIPTION="Library to support the Oxygen style in KDE"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-SLOT="4/${PV}"
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.11.19.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.11.19.ebuild
index 0f3ba6b..a9772af 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.11.19.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.11.19.ebuild
@@ -9,7 +9,7 @@
inherit kde4-meta
DESCRIPTION="Library to support the Oxygen style in KDE"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
SLOT="4/${PV}"
diff --git a/kde-base/libplasmaclock/Manifest b/kde-base/libplasmaclock/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/libplasmaclock/Manifest
+++ b/kde-base/libplasmaclock/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.11.14.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.11.14.ebuild
deleted file mode 100644
index 9834f5a..0000000
--- a/kde-base/libplasmaclock/libplasmaclock-4.11.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/plasmaclock"
-inherit kde4-meta
-
-DESCRIPTION="Libraries for KDE Plasma's clocks"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +kdepim"
-
-DEPEND="
- $(add_kdebase_dep kephal)
- kdepim? ( $(add_kdebase_dep kdepimlibs) )
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
- libs/kephal/
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with kdepim KdepimLibs)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.11.19.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.11.19.ebuild
index ecebba3..9834f5a 100644
--- a/kde-base/libplasmaclock/libplasmaclock-4.11.19.ebuild
+++ b/kde-base/libplasmaclock/libplasmaclock-4.11.19.ebuild
@@ -9,7 +9,7 @@
inherit kde4-meta
DESCRIPTION="Libraries for KDE Plasma's clocks"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug +kdepim"
DEPEND="
diff --git a/kde-base/libplasmagenericshell/Manifest b/kde-base/libplasmagenericshell/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/libplasmagenericshell/Manifest
+++ b/kde-base/libplasmagenericshell/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.14.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.14.ebuild
deleted file mode 100644
index 66a1cc0..0000000
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.14.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KMNAME="kde-workspace"
-KMMODULE="libs/plasmagenericshell"
-inherit kde4-meta
-
-DESCRIPTION="Libraries for the KDE Plasma shell"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug test"
-
-DEPEND="
- $(add_kdebase_dep kephal)
- $(add_kdebase_dep libkworkspace)
- x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
- libs/kephal/kephal/
- plasma/desktop/shell/data/
-"
diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.19.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.19.ebuild
index a4a9728..66a1cc0 100644
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.19.ebuild
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.19.ebuild
@@ -10,7 +10,7 @@
inherit kde4-meta
DESCRIPTION="Libraries for the KDE Plasma shell"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug test"
DEPEND="
diff --git a/kde-base/libtaskmanager/Manifest b/kde-base/libtaskmanager/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/libtaskmanager/Manifest
+++ b/kde-base/libtaskmanager/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/libtaskmanager/libtaskmanager-4.11.14.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.11.14.ebuild
deleted file mode 100644
index 71ed081..0000000
--- a/kde-base/libtaskmanager/libtaskmanager-4.11.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/taskmanager"
-inherit kde4-meta
-
-DESCRIPTION="A library that provides basic taskmanager functionality"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kactivities)
- $(add_kdebase_dep kephal)
- $(add_kdebase_dep ksysguard)
- $(add_kdebase_dep libkworkspace)
- x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
- libs/kephal/
- libs/kworkspace/
-"
-
-src_prepare() {
- kde4-meta_src_prepare
- sed -e 's:ksysguard/processcore/processes.h:ksysguard/processes.h:g' -i "${S}/libs/taskmanager/taskitem.cpp" || die
- sed -e 's:ksysguard/processcore/process.h:ksysguard/process.h:g' -i "${S}/libs/taskmanager/taskitem.cpp" || die
-}
diff --git a/kde-base/libtaskmanager/libtaskmanager-4.11.19.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.11.19.ebuild
index 113bdbd..71ed081 100644
--- a/kde-base/libtaskmanager/libtaskmanager-4.11.19.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-4.11.19.ebuild
@@ -9,7 +9,7 @@
inherit kde4-meta
DESCRIPTION="A library that provides basic taskmanager functionality"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.14.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.11.14.ebuild
deleted file mode 100644
index 883850a..0000000
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.14.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-KMMODULE="plasma"
-PYTHON_COMPAT=( python2_7 )
-OPENGL_REQUIRED="always"
-inherit python-single-r1 kde4-meta
-
-DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug gps json +kdepim python qalculate"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMONDEPEND="
- dev-libs/libdbusmenu-qt[qt4(+)]
- >=dev-qt/qtcore-4.8.4-r3:4
- !kde-misc/ktouchpadenabler
- $(add_kdebase_dep kactivities)
- $(add_kdebase_dep kdelibs 'crypt')
- $(add_kdebase_dep kephal)
- $(add_kdebase_dep ksysguard)
- $(add_kdebase_dep libkworkspace)
- $(add_kdebase_dep libplasmaclock 'kdepim?')
- $(add_kdebase_dep libplasmagenericshell)
- $(add_kdebase_dep libtaskmanager)
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrender
- gps? ( >=sci-geosciences/gpsd-2.37 )
- json? ( dev-libs/qjson )
- kdepim? ( $(add_kdebase_dep kdepimlibs) )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/PyQt4-4.4.0[X,${PYTHON_USEDEP}]
- $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
- )
- qalculate? ( sci-libs/libqalculate )
-"
-DEPEND="${COMMONDEPEND}
- dev-libs/boost
- x11-proto/compositeproto
- x11-proto/damageproto
- x11-proto/fixesproto
- x11-proto/renderproto
-"
-RDEPEND="${COMMONDEPEND}
- $(add_kdeapps_dep plasma-runtime)
-"
-
-KMEXTRA="
- appmenu/
- ktouchpadenabler/
- statusnotifierwatcher/
-"
-KMEXTRACTONLY="
- kcheckpass/
- krunner/dbus/org.freedesktop.ScreenSaver.xml
- krunner/dbus/org.kde.krunner.App.xml
- ksmserver/org.kde.KSMServerInterface.xml
- ksmserver/screenlocker/
- libs/kephal/
- libs/kworkspace/
- libs/taskmanager/
- libs/plasmagenericshell/
- libs/ksysguard/
- libs/kdm/kgreeterplugin.h
- ksysguard/
-"
-
-pkg_setup() {
- if use python ; then
- python-single-r1_pkg_setup
- fi
- kde4-meta_pkg_setup
-}
-
-src_unpack() {
- if use handbook; then
- KMEXTRA+=" doc/plasma-desktop"
- fi
-
- kde4-meta_src_unpack
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_NepomukCore=OFF
- -DWITH_Soprano=OFF
- -DWITH_Xmms=OFF
- $(cmake-utils_use_with gps libgps)
- $(cmake-utils_use_with json QJSON)
- $(cmake-utils_use_with kdepim Akonadi)
- $(cmake-utils_use_with kdepim KdepimLibs)
- $(cmake-utils_use_with python PythonLibrary)
- $(cmake-utils_use_with qalculate)
- )
-
- kde4-meta_src_configure
-}
-
-src_install() {
- kde4-meta_src_install
-
- if use python; then
- python_optimize "${ED}"
- fi
-}
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.19.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.11.19.ebuild
index 8989228..23c3ccf 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.19.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.11.19.ebuild
@@ -13,7 +13,7 @@
inherit python-single-r1 kde4-meta
DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug gps json +kdepim python qalculate"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-base/powerdevil/Manifest b/kde-base/powerdevil/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/powerdevil/Manifest
+++ b/kde-base/powerdevil/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/powerdevil/powerdevil-4.11.14.ebuild b/kde-base/powerdevil/powerdevil-4.11.14.ebuild
deleted file mode 100644
index c0fd528..0000000
--- a/kde-base/powerdevil/powerdevil-4.11.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement"
-HOMEPAGE="https://solid.kde.org"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +pm-utils"
-
-DEPEND="
- $(add_kdebase_dep kactivities)
- $(add_kdebase_dep libkworkspace)
- !aqua? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- )
-"
-RDEPEND="${DEPEND}
- pm-utils? ( sys-power/pm-utils )
-"
-
-KMEXTRACTONLY="
- krunner/
- ksmserver/org.kde.KSMServerInterface.xml
- ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml
-"
diff --git a/kde-base/powerdevil/powerdevil-4.11.19.ebuild b/kde-base/powerdevil/powerdevil-4.11.19.ebuild
index 8a001c3..c0fd528 100644
--- a/kde-base/powerdevil/powerdevil-4.11.19.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.11.19.ebuild
@@ -9,7 +9,7 @@
DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement"
HOMEPAGE="https://solid.kde.org"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug +pm-utils"
DEPEND="
diff --git a/kde-base/qguiplatformplugin_kde/Manifest b/kde-base/qguiplatformplugin_kde/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/qguiplatformplugin_kde/Manifest
+++ b/kde-base/qguiplatformplugin_kde/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.14.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.14.ebuild
deleted file mode 100644
index b6b120d..0000000
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.14.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.19.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.19.ebuild
index 47f8916..b6b120d 100644
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.19.ebuild
+++ b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.19.ebuild
@@ -8,5 +8,5 @@
inherit kde4-meta
DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
diff --git a/kde-base/solid-actions-kcm/Manifest b/kde-base/solid-actions-kcm/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/solid-actions-kcm/Manifest
+++ b/kde-base/solid-actions-kcm/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.14.ebuild b/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.14.ebuild
deleted file mode 100644
index 1782a67..0000000
--- a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.14.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-CPPUNIT_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="KDE control module for Solid actions"
-HOMEPAGE="https://solid.kde.org"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- $(add_kdeapps_dep solid-runtime)
- !kde-base/solid:4
-"
diff --git a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.19.ebuild b/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.19.ebuild
index 368f1e8..aacce34 100644
--- a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.19.ebuild
+++ b/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.19.ebuild
@@ -10,7 +10,7 @@
DESCRIPTION="KDE control module for Solid actions"
HOMEPAGE="https://solid.kde.org"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND="
diff --git a/kde-base/systemsettings/Manifest b/kde-base/systemsettings/Manifest
index cc64a3a..d02206e 100644
--- a/kde-base/systemsettings/Manifest
+++ b/kde-base/systemsettings/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/systemsettings/systemsettings-4.11.14.ebuild b/kde-base/systemsettings/systemsettings-4.11.14.ebuild
deleted file mode 100644
index f94ca46..0000000
--- a/kde-base/systemsettings/systemsettings-4.11.14.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-meta
-
-DESCRIPTION="System settings utility"
-HOMEPAGE+=" https://userbase.kde.org/System_Settings"
-IUSE="debug gtk +kscreen +usb"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
- app-misc/strigi
- dev-libs/glib:2
- $(add_kdebase_dep kwin)
- $(add_kdebase_dep libkworkspace)
- media-libs/fontconfig
- >=media-libs/freetype-2
- >=x11-libs/libxklavier-3.2
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXtst
- opengl? ( virtual/opengl )
- usb? ( virtual/libusb:0 )
-"
-DEPEND="${COMMONDEPEND}
- x11-proto/kbproto
- x11-proto/xextproto
-"
-RDEPEND="${COMMONDEPEND}
- sys-libs/timezone-data
- x11-apps/setxkbmap
- x11-misc/xkeyboard-config
- gtk? ( kde-misc/kde-gtk-config )
- kscreen? ( kde-misc/kscreen:4 )
-"
-
-KMEXTRA="
- kcontrol/
-"
-KMEXTRACTONLY="
- krunner/dbus/org.kde.krunner.App.xml
- krunner/dbus/org.kde.screensaver.xml
- ksmserver/screenlocker/dbus/org.kde.screensaver.xml
- kwin/
- libs/
- plasma/
-"
-# fails to connect to a kded instance
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-kcm-randr.patch" )
-
-src_unpack() {
- if use handbook; then
- KMEXTRA+="
- doc/kcontrol
- doc/kfontview
- "
- fi
-
- kde4-meta_src_unpack
-}
-
-src_prepare() {
- sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
- systemsettings/CMakeLists.txt \
- || die "Failed to fix systemsettingsrc install location"
-
- kde4-meta_src_prepare
-}
-
-# FIXME: is have_openglxvisual found without screensaver
-src_configure() {
- # Old keyboard-detection code is unmaintained,
- # so we force the new stuff, using libxklavier.
- local mycmakeargs=(
- -DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
- -DWITH_GLIB2=ON -DWITH_GObject=ON
- -DBUILD_KCM_RANDR=$(usex !kscreen)
- $(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with usb)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/systemsettings/systemsettings-4.11.19.ebuild b/kde-base/systemsettings/systemsettings-4.11.19.ebuild
index d904806..f41fcb5 100644
--- a/kde-base/systemsettings/systemsettings-4.11.19.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.11.19.ebuild
@@ -14,7 +14,7 @@
DESCRIPTION="System settings utility"
HOMEPAGE+=" https://userbase.kde.org/System_Settings"
IUSE="debug gtk +kscreen +usb"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
COMMONDEPEND="
app-misc/strigi
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 52c0770..5e13cb6 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1 +1,2 @@
DIST attica-5.14.0.tar.xz 60456 SHA256 5eba50b9f0d28163b8a4fbdc909b1b88ad72de60df6f5e850c51849082b3bf58 SHA512 5ec53549738287a673041deed51c3fbb08e75f9fc3ffdf88e1948bff6659b6a9c58a93cc210010fd1a925d4bc665d0c61acccb1e091c62075a15cf9c2735a91b WHIRLPOOL 9bb703438dfa283b7be3928ceea5a6e51df3a7314a74aef0b77faed59d9d2eafd92086022ef1d7887f4931cf1eabe9ae515ac31346a99748747d939293796d6d
+DIST attica-5.15.0.tar.xz 60476 SHA256 94c928b84a82c44c1331a1b4d585e894524c4a023f90e1906eaf5441d955ad3d SHA512 4cc05218c73f51557a9bbb1c74b401fcb9893ab4e853a5f88f618cc7a503ea845ecf4f04f8a57bcc75979dacaba172d719cb935f7879125a36f444f1c4a9dcf1 WHIRLPOOL 4c44226acd570a4a2c7fb3ab8bea578907cdf8ba6692a8939bac71c5180a23a03fcdaa18957d5076d769ce299a10f585290e870a00a7ee40f06113933529b794
diff --git a/kde-frameworks/attica/attica-5.15.0.ebuild b/kde-frameworks/attica/attica-5.15.0.ebuild
new file mode 100644
index 0000000..fa5c97a
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.15.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtnetwork:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 7175a14..e4f3116 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1 +1,2 @@
DIST baloo-5.14.0.tar.xz 152668 SHA256 ad082b1d830de72d2aaa2429ae9634d2a2508c4bd8085e531147a04c888ce260 SHA512 9d02de8a9b482da741d6ef7fdf215fece1d766131420750dd076c9f6e9abc3469e048c5952e2d6772c559f0a4b7c293f058ec78cfa0f9cc7cff25fddc1717f36 WHIRLPOOL 9b2bed92e4f8f788cc748f56ad6bff7e245ad5397fd6aff0888d9355c005960d6f2ea2d52386d4aefc4f52a35287cc0c7a578e28a63d7d0214a3f8ea49774139
+DIST baloo-5.15.0.tar.xz 169400 SHA256 7fdd56331e7fbf939d18a20d706e9e1299f929ae79b55ddd531c51f825ed1c83 SHA512 d547b156abb286a0ee93b932d7d428ab62585205e73c6cea27f7cf40dcb7a04b1d75dc63c8d789f97874bec675c383dce9069d14ed2f0114cf6a95d421d4a41b WHIRLPOOL 02f60065f9d3900ed75301ec0543bd74fee20baaba620522331eb4cc68e6ab94c1f5e2bbc94f8d9e0638a5f71911726460a34c52f10f66025f249cccf99c99c0
diff --git a/kde-frameworks/baloo/baloo-5.15.0.ebuild b/kde-frameworks/baloo/baloo-5.15.0.ebuild
new file mode 100644
index 0000000..ee8dc72
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Framework for searching and managing metadata"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kfilemetadata)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep solid)
+ dev-db/lmdb
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+ !kde-base/baloo:4[-minimal(-)]
+"
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index 31147b8..27c4412 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1 +1,2 @@
DIST bluez-qt-5.14.0.tar.xz 73164 SHA256 5fd2129c6858f6d1eba112ae7fef55a1606c6d001a8224e72d6886d40897d38c SHA512 b52c34b3dda6b4bdb444efd0d3f279355a0c50c754d1b4403c25e36ca1a13b828fda6b83362253b471126c3cd2c4bfda8bbdf8984ddb8d43d00737a43c6e81e7 WHIRLPOOL 49d6074764c71398923e68392d22fb4360891dc23ced23f4f01966d7d7ce785ecf4893a068c62dce862bd5a1376d2c7af0307fd809457462da8c21f951085091
+DIST bluez-qt-5.15.0.tar.xz 73348 SHA256 aeb8af820c0980ec93350c727018549b1d603f01059e0d1ef0ae0ee9a2206296 SHA512 e642150c3c556aebc334f979a661400a2e84d508f7994c9403926a2fbbec67432cf92e194d5d60edd23c914f0da508bc5102a20d35cbebaa18c229ecf4e56194 WHIRLPOOL 4ef37ed032dc4bb6b6d13d8d1681d8c07f3e2e794fa79970dd128ffc3725e04fb61d3bb227fddcbb9f18f1bc76dfa85734fe9fbdd4cadbdc00e26ffab019e8cd
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.15.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.15.0.ebuild
new file mode 100644
index 0000000..528fd60
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.15.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5 udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtnetwork:5
+"
+RDEPEND="${DEPEND}
+ !kde-plasma/bluez-qt
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index f33f28b..00d8e55 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1 +1,2 @@
DIST extra-cmake-modules-5.14.0.tar.xz 134436 SHA256 cfefdcada703b28de45ec64756ecae1dc23b305eeca506a477a648a477ceceb0 SHA512 4a4c73ee8ea30201bedd6ee9c81e1cca45b5f5899bb1695aa03d3e6eb56b108370d20d5b9df24794cc1327dae5fff1aa084b663ecb5268cc36fc8b5042d5de49 WHIRLPOOL 46ff0fa7a059636e8028ec7dda3593be101a73ffc4dcdb96ab64cc01b96715096339f4248dcbb6ac426e2d6352e41be23694850f28252b4fb5b0144500a3e806
+DIST extra-cmake-modules-5.15.0.tar.xz 135160 SHA256 8f3d4adadfa835c627852ca4a84e8c6be3c9ee68865598a71616e4d0176b02bc SHA512 ba6035e79cc7e49e9d7a1c0ba5133881378275c8ba5f6bfd5beb093c03180501b94e2aee6f3289fbaf11e44ee7f4de9844beffd364a97ab97b6ac95dacb25423 WHIRLPOOL 69f43334006457fb17c53bd4431c61cad4705202ac326bade995678c20044528201257b754e3950327c97e1e683eca156c4c872d48af4a1df5ad33aed772181f
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.15.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.15.0.ebuild
new file mode 100644
index 0000000..df3da72
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.15.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5 python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc"
+
+DEPEND="
+ >=dev-util/cmake-2.8.12
+ doc? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+ )
+"
+RDEPEND="
+ dev-qt/qtcore:5
+"
+
+python_check_deps() {
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_build doc HTML_DOCS)
+ $(cmake-utils_use_build doc MAN_DOCS)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 41b5450..7d7d958 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1 +1,2 @@
DIST frameworkintegration-5.14.0.tar.xz 1780396 SHA256 c8f7e49d3c2100716f2b87f94c6a779d7b541946208697cc46ac5db9e4829ba4 SHA512 b5f21ee008119a7e14f8a21df5a095795498272bfbc6b2a875bbf128c9495a9a020b0fb201775f6b0c9c73358a3133f9304d20e94e4ff7b8aabcccb8973498dc WHIRLPOOL 11be017f7a760f49faa6b4e9137f4901bc50425785f27a11ee0c8a9e8ce364d0c86319a3227f476b37e3ed7804db857ec0ddcec0e3e3c8c51b91fed9526bb0b7
+DIST frameworkintegration-5.15.0.tar.xz 1781464 SHA256 2a7a3d450c28d7f1ac19ddf02cb5e2badcd6903cf3981d82ce70bcd16d644a1b SHA512 7b526f2919f3fa2682a7b45c158b933c9e46a28467ac93c9fdd2a9266b6bee05157bb9dbb5f297a61e312381b9184440e3d935acc7de71c0475efd6f74bef44e WHIRLPOOL 654b5257ec6f5e013d2e1ef593b6e861fb3f81ee6c7f598cdb1d30ef4491a95e08a1b25135631a5d47c10ea5e05ad1ed4d42ff516b25d1f08a8988da26d097ba
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.15.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.15.0.ebuild
new file mode 100644
index 0000000..0c41d1b
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.15.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for integrating Qt applications with KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+ $(add_plasma_dep oxygen-fonts)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libxcb
+ x11-libs/libXcursor
+ )
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X XCB)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 57f73d8..4923e00 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1 +1,2 @@
DIST kactivities-5.14.0.tar.xz 172720 SHA256 e91b3a02df48f5fe81b67bc5c2d96cdb215b2af49b03d3918fe35d2fb101cc60 SHA512 c7214c70bb97a05001310aea3e567b11cf4ad7cef2d4a774dbbfa2976c2f66ef587313e72bedc21f742bbb1a6f6a93d8d0ef75a7e9e951770e2b766eb9314119 WHIRLPOOL 2896bdea0a81dd3a31917a71afdc75120de85ba63c5c3a97955d3f22a373fe0f010edd49246865bd10b8e5ce9c48db79755a61c84d5c49eac8728b850451e31a
+DIST kactivities-5.15.0.tar.xz 175680 SHA256 d8d2603b212081a7137b0647d4e0177f7f50034426c0dbb392e5978c1c3a2e41 SHA512 3d9eaf71e4699c9cf2a94859161ce0eb056615ddfcc51a96101af66fa57d1ff869b04ec4082b260c074fbba67b5aa7f31462c30467576bcb87b45cbaef2cd481 WHIRLPOOL 56e32abeb54b2cd79612261a8dca56568535e4abcb1c4813b3d00679c7d4bc053f580e5ee28027eb223e42dc28e43cca6c2f51a063b541ecee9587a666030197
diff --git a/kde-frameworks/kactivities/kactivities-5.15.0.ebuild b/kde-frameworks/kactivities/kactivities-5.15.0.ebuild
new file mode 100644
index 0000000..23368a1
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.15.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtsql:5
+ dev-qt/qtwidgets:5
+ !kde-base/kactivities:4[-minimal(-)]
+"
+DEPEND="${RDEPEND}
+ || ( >=dev-libs/boost-1.54 <dev-libs/boost-1.53 )
+"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index a0abdf7..0d76176 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1 +1,2 @@
DIST kapidox-5.14.0.tar.xz 132784 SHA256 d86cc54b18117f27ff9131b6e1e6ae49cff01cc8b0780f76c31a55a98a155191 SHA512 f3f94217518c8839cf530e34e95120c90cf053df21555e4b7024a172ef9577099bc68cab0138abf4b7ce6e4f628c3e1e153c3af7e9a2bdfceee3d4d26e391021 WHIRLPOOL 107fe29d8696b01674d499e7ca1e792dd73b6e7c87bfb3dec510973adc4628c4cf1b837bbce0621cd9820b23c20cdd2df64ac4fde43f3ff8a86d6b155501697a
+DIST kapidox-5.15.0.tar.xz 132792 SHA256 98ed6ce505f4e17264809ab0414d6305b0626280d45aa06df84ee554c891828c SHA512 de8bd6e4a72b644fa90002ea50380fb6a1fb3ae9eaa688b0845c4fa6678a945da4f5d3f8c1df2c44b5776b39a35a0ac7be48bac0090b1fe02e4762d3aa65cc6f WHIRLPOOL 901a363614640750dfae30be9e6ad6e980bda3a29495155841ff68349c956b6301b1a54166ebbd781e44857a43f80ae66ba8eb4bb00756be947d7b206aa9705a
diff --git a/kde-frameworks/kapidox/kapidox-5.15.0.ebuild b/kde-frameworks/kapidox/kapidox-5.15.0.ebuild
new file mode 100644
index 0000000..a347050
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.15.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_DEBUG="false"
+KDE_DOXYGEN="false"
+KDE_TEST="false"
+DISTUTILS_SINGLE_IMPL="true"
+PYTHON_COMPAT=( python2_7 )
+inherit kde5 distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ app-doc/doxygen
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ media-gfx/graphviz[python,${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ kde5_pkg_setup
+}
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 1342646..4d47b88 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1 +1,2 @@
DIST karchive-5.14.0.tar.xz 108180 SHA256 8473fc7e9735c50274a97bd1d9299d7f4873211d5f35cb5fde095c4e13f159e9 SHA512 a57e28c553d54c2cd097360abc5e8ede6ce476f3c7443083a21dbb1e1f3a1bdd6f4d08cc9742afb1c4f05e5128ce477c554ded87e7124e6f8e3253b63a488534 WHIRLPOOL cdd9905d96a5126524cf9c94e8cb00e93a709779be9317d469f4857ed9bc2c32a95c691316e2a0321825ed4c1023e476860bbae9ad04feb516fd27e456377347
+DIST karchive-5.15.0.tar.xz 108172 SHA256 d0b5dfaf6a98ad40e499c67ec6788247c285c97564e2840a4faff90de27bb5e8 SHA512 a19c9e1ba9db4669ed91c852fa1f34d4f0f8ec2bbf0fbd7d7970ea07f1fa6b3a45c1ce09ca7f493485b5dc0428c1acf3bf85b502762232138a73830f1a6adef3 WHIRLPOOL 821286e8dd7a25c752d2932b73b0f1c4725efcc0be7187171e4a4b5d7dc2eb9313f447bccf6beb957198b998567fce2ab862fed62d2c20741fa6d53135b813ae
diff --git a/kde-frameworks/karchive/karchive-5.15.0.ebuild b/kde-frameworks/karchive/karchive-5.15.0.ebuild
new file mode 100644
index 0000000..7d0a2a6
--- /dev/null
+++ b/kde-frameworks/karchive/karchive-5.15.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for easy reading, creation, and manipulation of various archive formats"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bzip2 +lzma"
+
+RDEPEND="
+ bzip2? ( app-arch/bzip2 )
+ lzma? ( app-arch/xz-utils )
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package bzip2 BZip2)
+ $(cmake-utils_use_find_package lzma LibLZMA)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 7c314f3..53c9567 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1 +1,2 @@
DIST kauth-5.14.0.tar.xz 82116 SHA256 1430e9f480c8fffdefe7281c4b6365472404e2d549647aeda73cf497a5b9d8cd SHA512 633722520c47184dcba726e5909b0a10224de43892cafce36f62796b6934c764da071eb6579fb51dc56eae1c0dc32431010678bb7d4c5c75b35deae607c93eef WHIRLPOOL 449c7566fd86fe9ca58ad1f3edf4be5614989df590c0121e7d56a0ccf2c069426f91d881995c7f6f0ae380bee762c3d9084f51f2d1169bc4c9aa8e74e59b6487
+DIST kauth-5.15.0.tar.xz 82088 SHA256 e2a91e1a4c40d5547c8963c74a805810b6bc192e3193245f52e855addc7219da SHA512 0be2173f33076f9ede4ae90561743686df618be255edf8eeafe934bc8f698b72771a02d019f4fd7a94f074718c25115565115271637a383b73d1705ab128479a WHIRLPOOL 84f40e08eb7581d82a46f15214572bb55fac43287e12733dddd5f661799046f69889fb52a8022bb8785253372487309edc7d66c474418f6a71d0c0456b0365ec
diff --git a/kde-frameworks/kauth/kauth-5.15.0.ebuild b/kde-frameworks/kauth/kauth-5.15.0.ebuild
new file mode 100644
index 0000000..0150400
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-5.15.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to let applications perform actions as a privileged user"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls +policykit"
+
+RDEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ policykit? ( sys-auth/polkit-qt[qt5] )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package policykit PolkitQt5-1)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 01bedb5..5b33345 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1 +1,2 @@
DIST kbookmarks-5.14.0.tar.xz 115004 SHA256 e31679916e7f60c9f7964b98f34329ad937a76b7a5241575ddb9683fbd307b8a SHA512 17aa2785351f74ebfc9c9297f99f70659e66c4ab9e3f5956bb30b0760a4449eeb68a7d146270d272eef69da5ddd76727ce884ca869daf702d5fe21bda8a98ae1 WHIRLPOOL 5a740391c9e746dc7630b67399e047018e9a1f510ee4d5ee3a6fb54b60371e248942bbcfd2edfd5cc62338800d7768dbcc0fae1bf55e843758bb4aa3a8e74d2f
+DIST kbookmarks-5.15.0.tar.xz 114968 SHA256 e80ff2b6dcb1690dd144adc3d351b84a2a5be641c66f011cbf9a9ea1d23141f8 SHA512 7b1f8b2e7810d11bab1a4ee0657dde72aee14b2da87aaee075796b8ffaf0d253945093ee663b6f859b0d6981e71c7aeb110e1c61c51ec4a10ac889b8f1c4fc40 WHIRLPOOL f9d037265dd20b5511f839b622a4b76e11af09d9ffff89dbe8e743508261fb25de4d1d5efc6b8f6e67982f803af6aa1dc3ca00e7398127c888be119d8c8c8f1d
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.15.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.15.0.ebuild
new file mode 100644
index 0000000..ffd7d1a
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.15.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kconfigwidgets)
+ nls? ( dev-qt/linguist-tools:5 )
+"
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 4cba3f5..2808223 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1 +1,2 @@
DIST kcmutils-5.14.0.tar.xz 234844 SHA256 aef4ab0c1877a9a87b9aa19c0537ac76bf8ccf07d69f3529da3828891f5ae130 SHA512 6b5a731bf4a724abf553d8f98699cc4604d64da91a08f0cf6be840a305207939017453c375417b828826c8c5ca551c0f6631e6d23351c9f5f9fadf7f8b8100c3 WHIRLPOOL 6a22a596460c05c3831451a7a10676fe1a7122c74c2fa30ce65c42a196ad1040de33ae8a5422fe97f551dac1c4848221d9ca0ffe9d136a5468af68793bbcd0d1
+DIST kcmutils-5.15.0.tar.xz 234908 SHA256 df584c8a4688b8716d77bdbb77a354ca8f609ea235b4829402e927b4c000d36b SHA512 8a79f4420db0c7601f2a707f1b5e7355a237850ae058b06b2bc8123649affc3200f12f9d19528882b16abbcd930dc578decbebea47e240656e4ab5fb202220ea WHIRLPOOL 98909416bfb02b44a432d0a36cc6316c1e6e43bff7db6b07ff8944136403af9dfcb781689eaad33e422680e4d4d667aa53f6ad790f7ee32d7cd3e6418ea4a967
diff --git a/kde-frameworks/kcmutils/kcmutils-5.15.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.15.0.ebuild
new file mode 100644
index 0000000..02a1414
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FRAMEWORK_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to work with KDE System Settings modules"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index eddc2cf..31772ef 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1 +1,2 @@
DIST kcodecs-5.14.0.tar.xz 215904 SHA256 fe80bf80c2a5816bac5bf4042cc8fb6ceacd8135d7cde1424004b6030791305f SHA512 0eb66bc76228573fa8bf633e67ba0685fea0a652789f7e13ba0ebe0789d48e791700c6cefa778dfbbed98eedf0031df93b72f1c6a43e389a3729d3bbfc292e4f WHIRLPOOL 329463758cb1ae038acf0ccb2917b82d62150653b234d57e519a2f2ca373fef1a24572a654a79eb395c0305afd973086a556ab0d896818ebc6c9df0ef340cec8
+DIST kcodecs-5.15.0.tar.xz 215880 SHA256 f71c51f064fdfde2b6eeb898aaf1f651c407e91844306359a7c07dbafadae8cf SHA512 334587aa5dac8b8187193442d8a395c3cb805f503d979f9428cd32f0b65016560a297c6627614ba7c550a1c1eb40f3e9935dc45bfdfecfd7c7778814412519a5 WHIRLPOOL 06db836d3138a2957a9bd9b3444561275d0cf346a3f45f20cd80eb851cf98ebb63118d970fb33dbd26f447e0fce1c7b73d4522d09f2cdbeca9023292675cc7fc
diff --git a/kde-frameworks/kcodecs/kcodecs-5.15.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.15.0.ebuild
new file mode 100644
index 0000000..4698328
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-5.15.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DEPEND="nls? ( dev-qt/linguist-tools:5 )"
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 929dfe8..3cc1507 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1 +1,2 @@
DIST kcompletion-5.14.0.tar.xz 115824 SHA256 db2430cfab40313532da600d63d2d7327d98a2cace20c6176e943856dd396a91 SHA512 4cd51c50fb7301d24e3aae95c0b7df412f5a51217e68993104f496eaf18af09fa2f4cfadfa9ae6b602c13406ee69ffd6206f1f15e056a39c2678c919ac039ded WHIRLPOOL 4536602a93b5ae80a948c6ef55f6cd287b0db3d49e8bc036e987af14d53150f5fe19eeed66b6a3ee193dc6a5493a90b8409cc20f38b88f6ac86f266866cfac4a
+DIST kcompletion-5.15.0.tar.xz 115808 SHA256 deb2c24d995b8b6aa57309980f45fad49739bef693b1286bebc383f11c0801d7 SHA512 4bb94258393fc473bfc1f8e88890f91eb74d429c65eebd1b8ad4563d7f62fdf4a9d261072ea5751010e1597d28eca994e5553da85c38a0c04a7d06665bedee5d WHIRLPOOL 28fc29039facd088ee4557a335694f0124d3066d0e2b911bf4c9b832312d3677f2dd4c0b1dc1a4064bbb4e8c2c19491c1f230efeffee20ec03e2863c5f24e6ff
diff --git a/kde-frameworks/kcompletion/kcompletion-5.15.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.15.0.ebuild
new file mode 100644
index 0000000..1a2fcb8
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-5.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 666b6dc..4c3dcba 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1 +1,2 @@
DIST kconfig-5.14.0.tar.xz 222388 SHA256 1d14146a5902d5d6115b87d23cf5867f07e6da6032e5e5d5acf9b047d7e059b0 SHA512 1ddd59811991e5ae4ec546032055b84ea1fcc99cad839fcdd1d2127c0fe28a46099c80379901f2be22cb08e68c971b330cffdf8b328cb596d785167371ba3fba WHIRLPOOL 8d58791deabf1258a04fc3bdd2978446d7b45466c8466ae7573cac0c2de172b95401139bbb7e26347d772271df1cc0e7861e6db323287c481ba5c58f871a3597
+DIST kconfig-5.15.0.tar.xz 222316 SHA256 764bc8af55482cf1c88817c85c12a0fdb3fde5726ab0386cbb1b2f5df2256f20 SHA512 9eeeb07f6da251480a9e9a359b239877fd0109625a1d5270900dac6e42ec76cc85ebecf9787abad8b8ccc022aab020847b126f0b37a40d8857a30d873df12e68 WHIRLPOOL 2d97fd7545212838c612cc78cba06ba0eb436ae5dd70d5e79a56a305ee7b33fbf9fb7c2dcc8abf5ebf89a469fd2fe6b5c6124f85de591b2e946cae130bd053bd
diff --git a/kde-frameworks/kconfig/kconfig-5.15.0.ebuild b/kde-frameworks/kconfig/kconfig-5.15.0.ebuild
new file mode 100644
index 0000000..88b2df9
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-5.15.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for reading and writing configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ test? ( dev-qt/qtconcurrent:5 )
+"
+
+DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 77934d7..5620c39 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1 +1,2 @@
DIST kconfigwidgets-5.14.0.tar.xz 359064 SHA256 4f36a259daeeef15b754e506340223a9c10d1afaf6fbe3f0f795b102da166c80 SHA512 47a825e4858c474be64daab603eb485a687bdd51422f7203ec5272b04a04aaef7c108a3f717578e327f99aa5e8b49d5538de7614faa9cc3068e78268b8755e78 WHIRLPOOL 6ed6358080219b75c36ae9401ddd1bebb1ca4cf9d5f24c0a0e1624749c4f3c2b564298d11e366084d17747a2e0ed74e0a860fa799f23875c18dd7795a3139e8f
+DIST kconfigwidgets-5.15.0.tar.xz 359080 SHA256 43664b4e2b4175401dba9da379c0cd98d86627e68cb87e7d31e838ff5c3c783e SHA512 aea70395db12bb2d2ee2ea20a38e9da0118b6c472918cc978943822cb996579c95ab1c0a154fed17ec009ad44b519e671d599908e49036264bfdb61f771aad16 WHIRLPOOL bbb952f32f73bfdc9dd6d73785116c51ced9984eddb2980f8d5003d9a1f0b901d732bf73674f76c4cc8e3f6d7cc68f80551f3125150a2bdcb8d878604ddb6df4
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.15.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.15.0.ebuild
new file mode 100644
index 0000000..a047df8
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.15.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ !<kde-frameworks/kdelibs4support-5.3.0:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+"
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index a31f869..9c0ae18 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1 +1,2 @@
DIST kcoreaddons-5.14.0.tar.xz 302456 SHA256 d8889a5ba47e270acd51c3441c7654f326c9d5fc683d143923c7e0bfdfb1a276 SHA512 fa7f875b0af6903b6f401ef70bc4fb7d5af3d80ea10eebe33f46a71d97ebbefddfeb6533ca6a36f754b2ab502c475af75b7f13b9bc302779ce37fec8de30f47b WHIRLPOOL 04dfdbd9dcd6671d034d6515fb98c5b783e02fd261191131b2c0385052922898087da5e27a96e972f0e50c482ff8f7047170a97c3efcee4b9b688c4f2fa4ed6d
+DIST kcoreaddons-5.15.0.tar.xz 302640 SHA256 b5dd4db06ed1d7b50047bade34520d433c6f30defd7cbd74929cf5dce95a06ec SHA512 e3b762ab4b03afefe5f6bf733819a1e19f5f0eb1bffe6ab773745c7025a13dfacbfea15b16a81f0f153656dd803a4189bf4912208a3f2918879193678d4dcb6d WHIRLPOOL 08461bfaf6c791b310e77334b342ec62339967f29df0b2276bfc0a1ed18b6f9bac8c0f4cb7f7f7e11fa19cfa7bf890d90f14d17cf56ab2dac0a98c92848ee850
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.15.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.15.0.ebuild
new file mode 100644
index 0000000..d896092
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.15.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime kde5
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="fam nls"
+
+RDEPEND="
+ dev-qt/qtcore:5[icu]
+ fam? ( virtual/fam )
+ !<kde-frameworks/kservice-5.2.0:5
+"
+DEPEND="${RDEPEND}
+ x11-misc/shared-mime-info
+ nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -D_KDE4_DEFAULT_HOME_POSTFIX=4
+ $(cmake-utils_use_find_package fam FAM)
+ )
+
+ kde5_src_configure
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ kde5_pkg_postinst
+ fdo-mime_mime_database_update
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 8ee8d35..1272cec 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1 +1,2 @@
DIST kcrash-5.14.0.tar.xz 19608 SHA256 443b0069f31efc7d75f9ecdae28029ced0afc8a0c48050415eae39ce09218ca1 SHA512 820282b3e3704e80ed085136e2933a893e77b88a0641a49544b735b0b70cfd0546b80ad5196220fa5589cb4b1be98501544add7788caa846fd268b954408e5e5 WHIRLPOOL 0084ae5b1ba1fd9cb854a83927ba713436e4e3608b539ac4cfe5338824fb2badc6dd9173c72819e505569aadcca14518b9d8d2f099391d56268b42ac4fe168e3
+DIST kcrash-5.15.0.tar.xz 19900 SHA256 7eac0e5ed260bf60c674a82981aaac81feea9ca5b6bb2a34256b95845ee56198 SHA512 d3da44c630ba2c64a4e56799551ef1b0961323d00be034b7ef71ebec4f434dfaf60fc63fd031c41f737407d5bfebae5a78794c59c40df6331c373aa8a838480c WHIRLPOOL 21759c701dd889a923860cb463f66cf665b8c05764d06a3e6e358913251097e423cf384c43cc2c0048e49dfe336d1ddbade9fc67a730d01cc8a93de306daefeb
diff --git a/kde-frameworks/kcrash/kcrash-5.15.0.ebuild b/kde-frameworks/kcrash/kcrash-5.15.0.ebuild
new file mode 100644
index 0000000..8cf2e08
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-5.15.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for intercepting and handling application crashes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls X"
+
+# requires running kde environment
+RESTRICT="test"
+
+RDEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtgui:5
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ test? ( dev-qt/qtwidgets:5 )
+ X? ( x11-proto/xproto )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index ee57d75..64ff612 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1 +1,2 @@
DIST kdbusaddons-5.14.0.tar.xz 33284 SHA256 1e7ba26008611977a21943e7e165028ad69122ffe6bf301cb1f6235532fd3901 SHA512 9cf3ce84517eddf4f10f0e8167ca18fdf0fc6d0f26c7cc7ce63a10cd59367c65302ac0bc72d6c9dccbb68794939b59a865c189aa0f784426a7a60d74bd6f3915 WHIRLPOOL 04a90220e43ee72b0dafdd2d10dd4aa57447f8fbed157e56704f9dd14c682432406e1722e072fc607f2b1560fc12d82363f929c7d9205bae741a3ea04a788905
+DIST kdbusaddons-5.15.0.tar.xz 33276 SHA256 dddd802bd03862eac02423fb24abce8017c372c6ae0d29a69862411789ca62f0 SHA512 46d2126e655a4513b9165460bdf3a72162d21cc04cf3d814984336bcf03d3e303a451db697ceafd1b5aa78a6b88e1cbea0cb276971836ab3d9382713a27ea70e WHIRLPOOL 5082dcd2b3043801235b215c9807492be90f36f5d4d365837f51ad7b53d04193d63608e11a15570c518a01beffea68c549a663b2dafb8b77ef5a507d0fb54490
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.15.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.15.0.ebuild
new file mode 100644
index 0000000..823ae74
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.15.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALDBUS_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework for registering services and applications according to freedesktop standards"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+ dev-qt/qtdbus:5
+ X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X Qt5X11Extras)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index a2d8c9b..cd8977b 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1 +1,2 @@
DIST kdeclarative-5.14.0.tar.xz 164156 SHA256 24efe52b31fff61efadd8bbe945913a005359a557876841ee024edcc8cd007b5 SHA512 51b361bd9d8de6891efbdbca8df642e396acd5b7d770a2efeb6e723e0c521bd0883a4f3eb06f0f8c6aad2f013cead19f9951b401f6c211b1146e17c7e03048e7 WHIRLPOOL 02ecd3430c0baea7b1d0dda003e118f312857933182491b3da3df8ca41dd11af0749d4b54e589b36a7a1f0e0b78fecc171c867f694343588b1b2f76a07a0783f
+DIST kdeclarative-5.15.0.tar.xz 165320 SHA256 627ce0d7f141c6fa11d0a86e7999ba7c549bf465839b5d164ef78bb24529bb1b SHA512 73573bd225af6025851f5ac711183279ce4f48a33885543685eae1c8874060abbb89551fd137ac98c80bf6c145377fc6f719c00a7da6b4b50d073bdbf4dd69fd WHIRLPOOL e280396541e9a6f5e3ca848bb658bc33cc90f2d375442469fafbb1c032ff612e4a78021712320a96816cdbb8e24bb9ad428a836271bc5bdcaf1e182e87079bb5
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.15.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.15.0.ebuild
new file mode 100644
index 0000000..25395f3
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ media-libs/libepoxy
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index c68d041..b0fb62e 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1 +1,2 @@
DIST kded-5.14.0.tar.xz 36336 SHA256 5835731de2839becc2b40c956b6f58cc891864a6492f03c2b3720f24f02d490f SHA512 988a2ca059c324959aabc6835af5c6c24dcf95e4c8ef7ad7aff36fd4cf3e5b72595b295245daa106db6c3016ae2cdf5ef0f23499ecc5ad1414ee96f2232ae05a WHIRLPOOL e8a3dd2e53fd5a079c0d34bc9e06b0d11b8081a67dbddbc2c65b73baebf58d04c5980a29a9d65017a084c7585c8c287126fb92b89cb765823f6ffe2c6c4c8028
+DIST kded-5.15.0.tar.xz 35812 SHA256 98330b8512dbc06f35b93edd85ac6777c84c960a9492dd38c670d567ba749490 SHA512 bed69b517454c4c9fb82e111ab6e93c920dcdcf2bf1511189142f1bf7f1aa5f303fdbbd92f5fa05d3283fe007b189f335351d09680341efeb4c4c659a57cabae WHIRLPOOL 62cc75d97d5c00c31689269930a808951f55a5f5639b126ce1f4c1da92a62a2f4922dfb1cc27d0eda1b4282727e3cf6c33b1c8f0853d7fbcb72eaa2338195a18
diff --git a/kde-frameworks/kded/kded-5.15.0.ebuild b/kde-frameworks/kded/kded-5.15.0.ebuild
new file mode 100644
index 0000000..a54c0aa
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.15.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Central daemon of KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kservice)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+"
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index d7920d0..e95fea5 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1 +1,2 @@
DIST kdelibs4support-5.14.0.tar.xz 3202432 SHA256 19d58071cde2a0c0c42410e9753b00e0202a15977ee07f015f831867a92abce1 SHA512 c9f412a3eb9bb79fda17e76145520f2c929d92bca62a79d1c864f86d6f7b9eed90f5e4b1876efb613a5eb4838cb6fbd580f31cc66bd3558f2a4052924e10df71 WHIRLPOOL 76ce2816b66594083afcac26c442223ab3327fccc9a44ff947443fc60f0c36f5a7f0869dc044429ee0409d178a39fc81968b8d13f6d23b2c5b4c3c9d61118cf1
+DIST kdelibs4support-5.15.0.tar.xz 3203140 SHA256 1e0bb3afeced27227a7a86626a5902a2d5cd7bddd6531a353003b39c07b32181 SHA512 30edffe95388aa051bfebbb3c6adf311ce35357036b9e947643b11d8fe1f8251fb10d77f69e1d20e3438a2d4b1b4ed53f602c16cede2a7a0e2e8d09a91cc007e WHIRLPOOL 9f93469e40fa3ee557f52c0644ae686163002952fb2b7e43b4e8aa7551186bc1ec2ee1d6ed00d7828a18935fd47d0176363ca4503ee0c7beaa05d581033a29b6
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.15.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.15.0.ebuild
new file mode 100644
index 0000000..1ed70f5
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.15.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework easing the development transition from KDE 4 to KF 5"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdesignerplugin)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kunitconversion)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ app-text/docbook-xml-dtd:4.2
+ dev-libs/openssl:0
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ virtual/libintl
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kdoctools)
+ $(add_frameworks_dep kemoticons)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kitemmodels)
+ dev-qt/qtxml:5
+ !<kde-apps/kcontrol-15.08.0[handbook]
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kdoctools)
+ dev-lang/perl
+ dev-perl/URI
+ dev-qt/designer:5
+ test? ( dev-qt/qtconcurrent:5 )
+ X? ( x11-proto/xproto )
+"
+
+RESTRICT="test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index b806ef2..c3dcabe 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1 +1,2 @@
DIST kdesignerplugin-5.14.0.tar.xz 86840 SHA256 e58cfac780f7cfbdac9ff15ce32a1431d965a3319ddcd327d39edee7bf4e67ad SHA512 890fd3f102c175b982c99fb7f7a4f73a44fcf06961de45f92b9e6364757a600c5fbd5929ea5a9e7713aae2ece975ea490dd703ba4848a90da6b2d19784b2fc7a WHIRLPOOL 5b0db29d732c06f0213e671d7c73c12cd8341275b71c5a54f32640e98ea132982bac2ae31be139eac07649a26609515193170a53d8a6291c9bf8868512d4f0b2
+DIST kdesignerplugin-5.15.0.tar.xz 86956 SHA256 98b7a439eaa0cc0c969286d2adab1086b9d8950b562a6a7e31b389d31de8c657 SHA512 17a0aa441cd82eb87b52caa57b194ee2ddde9598e7792b7ba1f1a200e5e23a44cd1321208ec013a49d9601b850721369e7eb433a9e199a54694e2a3cb3cbed8a WHIRLPOOL 18f80d7c2e63cf882e5876e60065c976c6f17b2c37655c7c55eb3f76d1c75d965705f9c60a71cbe0552cf956269327354deffd76d5b9e2ede643cee9ca27dc75
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.15.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.15.0.ebuild
new file mode 100644
index 0000000..f2ddfb7
--- /dev/null
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.15.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="designer nls webkit"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ designer? (
+ dev-qt/designer:5
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kplotting)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ )
+ webkit? (
+ dev-qt/designer:5
+ dev-qt/qtgui:5
+ $(add_frameworks_dep kdewebkit)
+ )
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package designer KF5IconThemes)
+ $(cmake-utils_use_find_package designer KF5ItemViews)
+ $(cmake-utils_use_find_package designer KF5KIO)
+ $(cmake-utils_use_find_package designer KF5Plotting)
+ $(cmake-utils_use_find_package designer KF5TextWidgets)
+ $(cmake-utils_use_find_package designer KF5WidgetsAddons)
+ $(cmake-utils_use_find_package webkit KF5WebKit)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index dcbadea..bde2c35 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1 +1,2 @@
DIST kdesu-5.14.0.tar.xz 43668 SHA256 d69a52f6263d3f03ab2bade946ed13d6304186061c07c17137eb7443a11443d0 SHA512 2af3f36db75d196baca997ae7ac07b8139aef1877ad4b8f69bee675adc486126e7529d716859b6cd32f108279c88b1de0c3063fc5f784937a5870ae329c4634d WHIRLPOOL 69d5b9de6c0fc5b506784c4999cb038cf69a6750f5bb2f4de4e77d941c97524c4bf516cd65e7035abf7479a1bf7c230a33ffa7c99dd096653380967ad99806a3
+DIST kdesu-5.15.0.tar.xz 43680 SHA256 3ee5aad2760e5b0793cfa177b41da37105e080cea603fa2cd6d8f7521f68d832 SHA512 812cecc5c123cda41fff0e35f4c854de35c597212aee56e2b9b51ff01e63f8a7474fefc4e14593f714ebb7559d40c2b025bede39ba035e9b3ae11126991f7b2f WHIRLPOOL 0b709aafb18c0ebf062c09562342a7329eec91fb23a43b1181c203fc79456845d76b1fa9df06ee4286433627cf6a3cfe526997c47c5e8c38fa0e110999df0347
diff --git a/kde-frameworks/kdesu/kdesu-5.15.0.ebuild b/kde-frameworks/kdesu/kdesu-5.15.0.ebuild
new file mode 100644
index 0000000..ffd4854
--- /dev/null
+++ b/kde-frameworks/kdesu/kdesu-5.15.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to handle super user actions"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kpty)
+ $(add_frameworks_dep kservice)
+ X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-proto/xproto )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index 0d1ec16..ca7bea8 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1 +1,2 @@
DIST kdewebkit-5.14.0.tar.xz 29336 SHA256 144d622720927505f7905eb5688504d429ce40375462d666a9e4b25707f9e05f SHA512 d828554840d6c2f1ee198ae1185b85491c7dab56a28e41dd7e81daaf979c5ff56e1d6c0f547a63ca30eef6d66ee6f6bb4157501461f20eee8eb17b062236040c WHIRLPOOL 143f262906ed4b4d8b41ec152a1452f1b345fe8debff6a9e1c742f4fe7abe12376122c99b2e56603f23e7cd5c0a704314ed93e4e9dc5c397547984cf3e697a82
+DIST kdewebkit-5.15.0.tar.xz 29344 SHA256 0acf37abcf87fe8a73d4b4519272638a6f2a1b04318afbd5f0e6996ccb82fcb1 SHA512 55d6a263a95a86b80ed0fb97937f20469dc97a53cf958926338cbf392edcb1892d148d4cc2f454eefa40277849abf405d905676f77fcbaeed260a648d89db424 WHIRLPOOL 6bc3472e119293536638aa35b901442db7f72ab90c180d6ccb25b52d2a28d2e9b2644820d30f534e55bb3fcd8a5b3b85131be9d508aa9e2e3e25df9b878cc983
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.15.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.15.0.ebuild
new file mode 100644
index 0000000..e79c7ac
--- /dev/null
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.15.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing KDE integration of QtWebKit"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwallet)
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ dev-qt/qtnetwork:5
+"
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 7a4e04f..9d4485e 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1 +1,2 @@
DIST kdnssd-5.14.0.tar.xz 56440 SHA256 612be6a9c1e2b32b8facad1b1748c2a09f89a0d92b9cddaad1805d627f538031 SHA512 80952e8c440aed7b7eeab061a57eb98dd950276ad07f8cf861e1e0dfad9040e2b56a61bd1978bbce3e54e038a0e79dcbff1827ffc66d1bcd1ab8e3b64b03d5d2 WHIRLPOOL 545191690acffa246019894c95434d86ae96b59213b9c30f7f70a3994cb6069fa0791dd508f13ffc947d884de4db1aa9adfefa2ed96f1379d79c8a56d0b222d1
+DIST kdnssd-5.15.0.tar.xz 56424 SHA256 13407b4d76cb5aeee808b9b88e6e76f2ba820a65b38cffc170752756af11adfc SHA512 be75f440ba9ceef2adb1130f799e830d8adaac3f252d58b446e95c84c38a93a55b7804759758413e47f033a3c6c72fb24789359a97dadf37e93c5167d9a82f1b WHIRLPOOL 086f715166de7ad4af2e54fb973bfd82be9ec9f62fab640b175fbe347bc0837e8272fe1d2c09078b664f65b6525cd9b3efb6be7afd4389e86bad64c3a3268dfb
diff --git a/kde-frameworks/kdnssd/kdnssd-5.15.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.15.0.ebuild
new file mode 100644
index 0000000..aeef081
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for network service discovery using Zeroconf"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls zeroconf"
+
+RDEPEND="
+ dev-qt/qtnetwork:5
+ zeroconf? (
+ dev-qt/qtdbus:5
+ net-dns/avahi[mdnsresponder-compat]
+ )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
+ $(cmake-utils_use_find_package zeroconf Avahi)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 2dfeab7..c21e5d4 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1 +1,2 @@
DIST kdoctools-5.14.0.tar.xz 407856 SHA256 7a3d249795f34610c1922da5a19dae21791f28cb6607861003245a0ee63d8718 SHA512 8c005a478ab993949374259dcba1a931879232509ca2a66d584e2d0e4307c8c6004f655e0ffffd88ca66f39d86059463a5c96cc01d1d15b3dc4a2f052cc5aefa WHIRLPOOL 4291b95747bd357e92b2f59a611a960d2ce4a84488ff05830d3d762a2a603778505d75dad9d05f7a153506a3e3008567ae4bab0543f488dca8efb4df5344f6ed
+DIST kdoctools-5.15.0.tar.xz 407836 SHA256 6ac31e6349420cd94a5353c8f608700e2c8adb7f29e57f3eeb9118aaf619916d SHA512 370a89c984493efa32c35c5dce183dff6ecd3516482384e65503b2333c4251134597533f9104b52d6181d992e6568dd8ed4cf21a26f9ff1c267c08c49aed7484 WHIRLPOOL 982ac4b73976d730801966cc1d80a6d7e2d938e2e35de4e065b6fe3f315f37423a872cf62eee7f3124d40464b00b7ef383843e99c3fd5633d0e1a9139968c45c
diff --git a/kde-frameworks/kdoctools/kdoctools-5.15.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.15.0.ebuild
new file mode 100644
index 0000000..0987492
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.15.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework providing tools to generate documentation in various formats from DocBook files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-perl/URI
+"
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index dd3d01e..4d8e421 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1 +1,2 @@
DIST kemoticons-5.14.0.tar.xz 94416 SHA256 f983d9579eb9503a53109a6c2f3d484b22af51b5aac4543f21966789174c59b7 SHA512 a45dc78c71118b9431aef4ea1993dd998d7393e56d6ddc41fea6a9f31ab0a2d0154410cea55ac0ab6db4b29f21fc96ed81dee992688252c1a5b31b94665a0963 WHIRLPOOL e85c99a2777e6b03418a9b3a1e571745e5b614096b0a77e69c5f7290dd9dca0eae6a7211050d29536eb7a5ff28147632d8542b7bc86d51d17f538d5862f1de12
+DIST kemoticons-5.15.0.tar.xz 94396 SHA256 2c710785e35c64ff5e24cc4204f92d30dbc4d3094f70b34cc367f0c10dfe7128 SHA512 c5d40f893193e020601cfeb5d53a30ca52c7cf4206dc39e65dc08e3e36f62414838bc63911b55872713d6ac9c74e285aa94479a51ff6de64b0a129eead7eafb8 WHIRLPOOL 7b42543d083b73a700ea5f6907b2bfdd37d036ab4fcd31cc0131c62372cef356678ad63e306e712bae53e648f4ee4a086305983217905a888a96fc791aa107ee
diff --git a/kde-frameworks/kemoticons/kemoticons-5.15.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.15.0.ebuild
new file mode 100644
index 0000000..3450cbc
--- /dev/null
+++ b/kde-frameworks/kemoticons/kemoticons-5.15.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for converting text emoticons to graphical representations"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kservice)
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT="test"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index bd599b3..e633db8 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1 +1,2 @@
DIST kfilemetadata-5.14.0.tar.xz 121596 SHA256 a269883f64dbef673b167f348b5970af84a7fb84fcc001ecb6431379982fb6c7 SHA512 bc12565fb00e43b9adcca24fa29ed342fc98c08149195f7bac4279cbb014955e194bcb933480461598f517690a526e188bafe5f46a17f0d88697fbf2f38cb4a3 WHIRLPOOL 226cf6f81f0e1c6a4d87850c1a6423f881560b965d8d2ce8f685b960fc713483eda88018025288ad14157a12d2b82975d9f787c742e92d551f74eebe4454e403
+DIST kfilemetadata-5.15.0.tar.xz 122728 SHA256 1667e428b35b5f98b711b4ed6f45b3d705a1e90baf721a1d17dcd623ea5720f9 SHA512 08f3dcebc81f2d7fbce73184dc5195d418b2300b488408bbaeed0defcb809c658180ec3077e259ebb465c193cff95da44d62b8b3122b0e3a6fb34b6407c66876 WHIRLPOOL 7c30283fbe864a9e0c3f41bdd060db2a24466d5695c4e59bc9616bf57586a8fe27c2c846932237a4511118ee986185530e24a76e1aa8e198b38fb5be32d8052f
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.15.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.15.0.ebuild
new file mode 100644
index 0000000..084ac18
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.15.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Library for extracting file metadata"
+KEYWORDS="~amd64 ~x86"
+IUSE="epub exif ffmpeg libav pdf taglib"
+
+# TODO: mobi? ( $(add_plasma_dep kdegraphics-mobipocket) ) NOTE: not integrated upstream
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep ki18n)
+ dev-qt/qtxml:5
+ epub? ( app-text/ebook-tools )
+ exif? ( media-gfx/exiv2:= )
+ ffmpeg? (
+ libav? ( media-video/libav:= )
+ !libav? ( media-video/ffmpeg:0= )
+ )
+ pdf? ( app-text/poppler[qt5] )
+ taglib? ( media-libs/taglib )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package epub EPub)
+ $(cmake-utils_use_find_package exif Exiv2)
+ $(cmake-utils_use_find_package ffmpeg FFmpeg)
+ $(cmake-utils_use_find_package pdf PopplerQt5)
+ $(cmake-utils_use_find_package taglib Taglib)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index d2682b7..6fb7796 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1 +1,2 @@
DIST kglobalaccel-5.14.0.tar.xz 81608 SHA256 8319dc5f97c8a824a6f1fa145ccc9dd67e36fb84352bd65623630e4bb4122633 SHA512 b6f264f95c1b0d74154ad9aa9990261945a5d4e13494e1e23d323cd35917d0b0f6fbce4faadadabfb61c196a82beb05aed7d4a2a46e02b35f70f8b3b4629de84 WHIRLPOOL 1de57b6a6c15206121323a1ab392bcffed09dbd67e427ebf9e56861108a69d87da094e032acede6fdc4598f83dfc7a35a9a8b5ad6a3eae9604969ef19aee27bf
+DIST kglobalaccel-5.15.0.tar.xz 81584 SHA256 5942afd96e8e5c6b1adf71666f1bcecd9ce8ac16cd9e5fa3fc680097435b27c6 SHA512 d6ff8b1015e237cc8481ecacff7422f497300269f51088f2e9987725945caaffc7f543af9a97dc50e395b707a0a1fad38515a6acdf362622f26d3919b2ddb452 WHIRLPOOL 760a59fbd5c32d5c0ac5b41379f754934629c01452cbc1d7c9159e026c8c77977778ea20fe610cd1894dece71acc10a0479e49c30ff511d9351350258552a308
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.15.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.15.0.ebuild
new file mode 100644
index 0000000..caf8e3b
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.15.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to handle global shortcuts"
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="nls"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kwindowsystem X)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ !<kde-plasma/plasma-workspace-5.2.0-r2
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index b713eee..9b6bcf5 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1 +1,2 @@
DIST kguiaddons-5.14.0.tar.xz 39180 SHA256 96591086680231eec09fc6aacc0262a83ca204d5aaceb48cfd3b954589b5a818 SHA512 6c201ffd1120d35b08539e5a9ee465bc0eb4a3ada6d325cafea42dd023db68ca4d2682486d070ab08e72bb1084abdf062bf1e81d6b2dc5ebafd66f974f53662f WHIRLPOOL 292f2fc4cef3433bde5f9ca2197d4bad19c2b9711466427e03e37eae86ee697c53af97116855e2bcd249de9fb87d401143d64ffec2a781c5383ef5d14137ac12
+DIST kguiaddons-5.15.0.tar.xz 39188 SHA256 081b18c79c37f9e050c87264563392625a7eb0b527fb27c6840f443382b6cc5d SHA512 aea38a6d17e2fdcc71c5b92a84711af1bd5570d9194b929de7188130b40b8fca7779cc1b4355cb996e43494f2129c710b3b6406c44fa9f52eed87783b023a7dd WHIRLPOOL 16f99456bbdb05ab7a0a4bb7282a9561d32deea3b73dac85af03baaaf4cbb8baf66196c72f37fd78bcf4313df4410bce2c543410271c6033cc8a739ef31fecb2
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.15.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.15.0.ebuild
new file mode 100644
index 0000000..ac79d65
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.15.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+ x11-libs/libxcb
+ x11-proto/xproto
+"
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index b73d0d9..0e3aed5 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1 +1,2 @@
DIST khtml-5.14.0.tar.xz 2070504 SHA256 4296c5875e91dd7489e1fdbdb22512e147108ae68770bdff7a4f4703b60144c2 SHA512 189f854a74f9539dd8ce43ea4c46088c4024f86e9decb8d0e6fa8d4c44fb5131513bd4321ec601aa7b81ec76af74eecd5f7471dc06034300d13b7487b1f8e058 WHIRLPOOL 14b34f1c22f9f937f20d8f66994fb0e7f46811bc6f620e4f7cee7c19a761a0830a50da67bd564e4f9f83df321ade51ee94c9821941bdc48e6f53de5fd35d972f
+DIST khtml-5.15.0.tar.xz 2070660 SHA256 e0287004d369a9cb0d5d7da2787e469fcaf17ce213d9d8ec877e43781a0efd05 SHA512 b967674e07f882a376f6c22479a844c173e4eda3e4064778d2cdf9c659933b6010796472a1762686d929cf7da4bc2c00bb431a3f779e05d28d60c67cbf9874d0 WHIRLPOOL ee8f7ee0b31be30bfe52b49c6d0e2e97ab0809344237bfcf7e135b30b15a9ef23d2abda74f697b0ced733ef12ce5186742943a0aaa1231d28f2ba99b1360a8ca
diff --git a/kde-frameworks/khtml/khtml-5.15.0.ebuild b/kde-frameworks/khtml/khtml-5.15.0.ebuild
new file mode 100644
index 0000000..6ad1309
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.15.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/giflib
+ media-libs/libpng:0=
+ media-libs/phonon[qt5]
+ sys-libs/zlib
+ virtual/jpeg:0
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ )
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-libs/openssl
+ test? ( dev-qt/qtx11extras:5 )
+ X? ( x11-proto/xproto )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index aaf27e0..0ed18c9 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1 +1,2 @@
DIST ki18n-5.14.0.tar.xz 593204 SHA256 1f07d8f2fd51cfaea09dfc319baf738eea50f34246aaffa535149e5954eb975f SHA512 9aec412ebff122275428074eb7051f5d2902597f4eb3e21f043af28d60f6b36d609514f39c686c97cb3839b3775d3ef5492c0587b7c90ec968c769c799909ea7 WHIRLPOOL e835b0d977c8c08ff7828e03967a08214dd6022d58a297ea8a6ae22a0ade9385b42a34b986b0aa12218e3fdbae50e5872c87b88d9be97f7a60fe997d57768796
+DIST ki18n-5.15.0.tar.xz 594400 SHA256 ade17464f9d794fb732aa77de3060a8fcbf4b6c91a750be5d47e49adc9b6c763 SHA512 3dedb1e32662d0f532a9b103f358fd3fcafde7c1acd7d0a724b5535dfb80cbc989650158352ca400bed6df3fd668243b2360a556161bb65bf16d11402c00946b WHIRLPOOL f30bcd7386ccc42f7aa424bb0dba85c5912e811b2d581b926e2a2be6ef345ebc3640144fccd85df2213d01f2743ba7770bfa2a05d3d6d9afe7e4055f14d4c960
diff --git a/kde-frameworks/ki18n/ki18n-5.15.0.ebuild b/kde-frameworks/ki18n/ki18n-5.15.0.ebuild
new file mode 100644
index 0000000..771af54
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtscript:5
+ sys-devel/gettext
+ virtual/libintl
+"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qtconcurrent:5 )
+"
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 0463c92..0c86028 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1 +1,2 @@
DIST kiconthemes-5.14.0.tar.xz 196176 SHA256 9937b46283fd64894dc2bcf9916d3da5078154d5428b750b14212cf5619b1e56 SHA512 add07f6dd1f60b22dba5be0592d66e763f3f88e8ee383f3462cc3af987a5dfa9ff9aeb4593414f52c6c57ab2c8428e144022e8d11c92ffc029ff03a854db0eee WHIRLPOOL ab6cec91e1b4a6991f8b0bdafd2cb4de94128a86fe7bf53c2ed396ba385c6189e272c0bbe624aa422e240e6cb678a6f70cc61b793387bf3f53c5c1c4d82a8026
+DIST kiconthemes-5.15.0.tar.xz 196128 SHA256 e2fdf07e04e9fd06a4515677a5bcaf31bfc309d0772578e5ff915039e28c6929 SHA512 48ce63158ae523f2809d8d13c31e89d020f18f09f75f995371ff9fa1e1343212584267fd9e2acf7b2d9c58c6689366327916aa5691e5290749ac629dabcd1488 WHIRLPOOL ed409f60fe3bf4128eb64927c443c94db58e41185676c91852e9a63f86e420e25fe6a0512e5d94cb047192dd335584e96c212d068e7470e0a3e52c97a2721855
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.15.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.15.0.ebuild
new file mode 100644
index 0000000..5030aa5
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.15.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index c571953..a3cd8ae 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1 +1,2 @@
DIST kidletime-5.14.0.tar.xz 26348 SHA256 282f47eb34163420ecc4d1c1f3e15dd6ee8e7af94cf309578bac07d0a8af101f SHA512 23e844373a431defd34a481f97cabbc67500238a2328b89e526b2548d3b23ea77dbf1972c3ce06cbcd1938dfda8db29ad5a1f1b2c0c88047aabe9b77b8efbb37 WHIRLPOOL 69b3d503dc32a10c2de0e0ab4ad501fb7930451235e81e68c3e3c44004d34f334683942fcae5b5ece18d2c627730b7da1dccbc5f7b3c4873f1e3bf9412208a30
+DIST kidletime-5.15.0.tar.xz 26352 SHA256 228a74c02dbc0787747a45d20f40d986a40063b1dcfeec3c09eb2765767ee63e SHA512 7d8645239f08e68d8b28a560ac0f2a5d3e2de326ee95b1346a5ec0a011e94ad6eee6acf9c635a523d0c4d95b10aa4f6a141dbd122573b5d7c52f82d4a26c68ea WHIRLPOOL f5b5403762a4e623f101e9c24066f068eb568c348ef1403ac5ee681e342f77caaabc9204a2ec3089cb38945e055e0719e6ef796d03b0b7ec8b236ff8094841e2
diff --git a/kde-frameworks/kidletime/kidletime-5.15.0.ebuild b/kde-frameworks/kidletime/kidletime-5.15.0.ebuild
new file mode 100644
index 0000000..f045d6b
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-5.15.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXext
+ x11-libs/libxcb
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 449683a..76109e8 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1 +1,2 @@
DIST kimageformats-5.14.0.tar.xz 85192 SHA256 de5f84a755a8d48ce9f367a33010086c4ece646617d0e4f65fab35d9fb2d428f SHA512 88047df741b5c3795648c217a1907c5b4fafca1a9ad4199b3c46c79638a600ab7f89b56a7ab44d7dcd0d736221598edb16a48707157bbdc33bd5f790bb267f2b WHIRLPOOL 40c17e7c8241f52a375d670e08fe522d13e1f925ee1e90f249585327b4b789b4908007dee23a396b1925f90a810ef906aa3e001a9df8bc3076cd13cbf4e2ea51
+DIST kimageformats-5.15.0.tar.xz 85192 SHA256 7bdf0592cbc7fef643d857b58359f116835c79ca65aa6f49579d483843e2c660 SHA512 7c92d7f62570bd4fa38e49e01446a8c38b42f30f274c80adac4fd88def5183f897e498f751695434376c3db1d684476572619d47d08c3f5c4ee515117bf003fc WHIRLPOOL 009e1b9010eebd390d9daf1d2fbf61e82adc70e7ee3fc4f5602bfd5d7af73b9c7c744664ba2e069838082d7b4351af09e9c2f08e8256825fdb5b3dc99e623059
diff --git a/kde-frameworks/kimageformats/kimageformats-5.15.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.15.0.ebuild
new file mode 100644
index 0000000..e5e05fe
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.15.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="eps openexr"
+
+RDEPEND="
+ dev-qt/qtgui:5
+ eps? ( dev-qt/qtprintsupport:5 )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr:=
+ )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package eps Qt5PrintSupport)
+ $(cmake-utils_use_find_package openexr OpenEXR)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 26bd6fa..cc36e35 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1 +1,2 @@
DIST kinit-5.14.0.tar.xz 117464 SHA256 ca7c21bf571777cbf7edee53e642528aaef0ac3ef08aae9c57b6fe79dadddcbc SHA512 c5f78f8bac23f7622d9bb0d7012aee78c0f9e2f5862143f05059014bea8c66c0effe0f421ea1d474446aab84adeaa077d36746e95eefb3d707cead9dbc96779c WHIRLPOOL 060730693e91be26b0f84716244bed6ee258eea0d216fdec968a46123a180734a556b564627387582af7094e2f515ee7e51d222b52758c3e8c5213b935f12979
+DIST kinit-5.15.0.tar.xz 117572 SHA256 ce17b952e0241c62f3a6e33a5aa1e7930b9a00d50e4482eb919d9c6a5e168e31 SHA512 89691ab931c1e251b365875f853eee09bef16d171071e44033a7dc089b1194448ba0fb6e23ffa34acae3db983fb34761483872552c9924cb7eb2521a31ce564f WHIRLPOOL 853421305bf4acae1f0ef56e636e3b7a128a9c57255ecb029e38a1724136c6e4a80f0f76d27d48f98d23b42662e2463a7f73d4cc2b682fda455aa3d0f733cc91
diff --git a/kde-frameworks/kinit/kinit-5.15.0.ebuild b/kde-frameworks/kinit/kinit-5.15.0.ebuild
new file mode 100644
index 0000000..ce8210c
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.15.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+caps"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ x11-libs/libX11
+ caps? ( sys-libs/libcap )
+"
+DEPEND="${RDEPEND}
+ x11-proto/xproto
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package caps Libcap)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index acfacec..72f329e 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1 +1,2 @@
DIST kio-5.14.0.tar.xz 2848028 SHA256 2aa35888d93e8f41d0c43c20b6566f918824905676e9d1bce708c239cacb31af SHA512 baae50f33b5bb0907380c1f02c036c076297f8978c19596e890f8bfdb85dd65c47dde0b7af2116d29cc12a4167552658ef048efe2e9718f8575bc442477b0a99 WHIRLPOOL a8085a99fdb2679f85d88a5b31c0736e466e280e46e5648eea4e9f41335a9d3e5dc45fa1212ff7d5104824ce28369c9520bae6f990295f35a472fa1ca343e7e0
+DIST kio-5.15.0.tar.xz 2847504 SHA256 0821731f1c1446a548be18f425de2f0077d31e3c6fc89f7e9c4557c9b232a551 SHA512 4941c5f470bf404b875bdc27b72187458d69fa0ea4103a5055d0e51dbe7d86af3d71a426d7bb2cc12e35525a9bb06b164ed687b5c3a65fdc4650c22532053545 WHIRLPOOL 9d9059e50c4346c10627b3d3da684b54ece5987f5ec62d76b598fb624cd746971ac09022a1f8697198501b786aa27db7a6a181d7ae0fb72150315458d5c31370
diff --git a/kde-frameworks/kio/kio-5.15.0.ebuild b/kde-frameworks/kio/kio-5.15.0.ebuild
new file mode 100644
index 0000000..2220a2d
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.15.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+KDE_PUNT_BOGUS_DEPS=true
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl kerberos X"
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-libs/libxml2
+ dev-libs/libxslt
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ kerberos? ( virtual/krb5 )
+ X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ dev-qt/qtconcurrent:5
+ test? ( sys-libs/zlib )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-proto/xproto
+ )
+"
+PDEPEND="
+ $(add_frameworks_dep kded)
+"
+
+# tests hang
+RESTRICT="test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package acl)
+ $(cmake-utils_use_find_package kerberos GSSAPI)
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index f93f976..c42b6b0 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1 +1,2 @@
DIST kitemmodels-5.14.0.tar.xz 383696 SHA256 0e23186d2cdee96c4ae76257515bddeecdc11f0af490f1ef8d3e5e878e100e5e SHA512 1e1ebd4003bccc075f7ec1bcc7d2b8538ddaf6e377c3b1a2c1ab86346c1d3c9609c872b88b92732034a9f6806536a3d56cd788ce6fa441ae46d5cf5f57456ac1 WHIRLPOOL a7e61715e83e449d040a0a2aa4790fa9b624d9c6b0d9b2338828aabe0abac8c208db1286d532bbee32decf5ebda9cb89058f06df4db1999a2f9e84460e92d100
+DIST kitemmodels-5.15.0.tar.xz 383756 SHA256 ea7987cecf377e4c456aef706e3e1527ad98a5f8d6ba7e213dfb2fd55b454a84 SHA512 f499442eeb7c4c27065782633aedfe26118fe808ca6334df4ba0034758452a6b49f6fb371309ba0e1e107fea1716460c0c252354ed3f795e5d8ac43c182f10f5 WHIRLPOOL 5246049df982a344e362a80aa3b33a4194460c6a56b7c40056d191dbc80c4d5098973e93b793022c4346eea4bf0bf48c08ac70d0bfd9c57f40d97f51e1f7792e
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.15.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.15.0.ebuild
new file mode 100644
index 0000000..8aabaeb
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.15.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing data models that help with tasks such as sorting and filtering"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="test? ( dev-qt/qtwidgets:5 )"
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index f314e91..bb745ca 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1 +1,2 @@
DIST kitemviews-5.14.0.tar.xz 74072 SHA256 81297d4d31a99872bc7cf3bd297d60c306eec67f9af3da0f6fe5139ead6c68fa SHA512 9a4127e61b244296e01bee87a7ec62058b331b47fbaa9286fb0a1682c6811c8c58823f6c118feecbece38312739cd78e2884af770e6fbf42d2a923349a2b72a3 WHIRLPOOL f56385072af841d7845fdd8e10606e2ae98d42c0950c715cf06b26aaafe932e14821941a6d92b316483205f497e06b5806d050fc989c69351b7ca63c474b1b3a
+DIST kitemviews-5.15.0.tar.xz 74072 SHA256 d1637a8ccbf1bf349e38682b0615785ab3610807328acc7ed47c73e0e8e92284 SHA512 e476340a9f18c394a428ad9bb183e83c6c32d779bc685a76d039abe6fcc6b2c9f418e5e578c918210df343295f2bad770839c013a960f31c009e5512734b8713 WHIRLPOOL ea7493d588c7da7300932b4d1261d6e9ae9efe97324c49579f96d5a5fc8ab004de5326659dcb738990d1a7279666c80648938d375ec9afa2646865ef608cebf8
diff --git a/kde-frameworks/kitemviews/kitemviews-5.15.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.15.0.ebuild
new file mode 100644
index 0000000..17785e0
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-5.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional widgets for item models"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 7b9bb01..f61c907 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1 +1,2 @@
DIST kjobwidgets-5.14.0.tar.xz 88964 SHA256 20fa92d5690d131b5852909821a53967da4ab803a0fc014c91689531205c7d45 SHA512 aeb4c3dd9d72fb30cce83147e7ea3cf5c7ba75e5c61f334ed9b91179b80d1004ea5d3280631b8c25020190fd6d6c861fb2a8edc94f86424c5808982f66e9d7a9 WHIRLPOOL 6144f470ea5dacefbc0ca672235bca8038ae3b7757ee02802be87a0a393661768d9b9c9364c4d7b4f6705ef8e4e5614503bdf5a959cd6350249bd9ee919f0e57
+DIST kjobwidgets-5.15.0.tar.xz 88916 SHA256 aa7db4d1440579d784709ecc1f2dda443ef9b22f8f3cdbc0914cd5cd5790238b SHA512 062b6cb778e555244114d45ee0aa12f416df49efa8d6be7434f6aff0002fc33c94fc59b24f8128c939f671eb19c3e463f2999b599181defba6615574632f0e53 WHIRLPOOL 7cf84a6f0ea738f3659683342ed40bc342b202acfcc126bf66ff5bbfa04cc1e32952e94e391660a32ee9b19ffa1080be5fd52a26cbd7132e0782f04a902ce74b
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.15.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.15.0.ebuild
new file mode 100644
index 0000000..0233c6d
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.15.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ X? (
+ x11-libs/libX11
+ x11-proto/xproto
+ )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 4104649..1282273 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1 +1,2 @@
DIST kjs-5.14.0.tar.xz 290696 SHA256 844b5af639f7bf0c1b34bf5e1e2c2606ace89c516d99a5728085cdcaaf4c97f7 SHA512 d4c1c4d177d6b6f4bda1fe886aa46b0198cce16825a9ac37f6c7cefd849e47f194c27e6b83676d0dcb23e6b58bfa2139b35bec40dd9a2b25d3c5d5762863f677 WHIRLPOOL 71201678bc794cecd0278d0466bcd864736993eace29d5a83f629b889433996c4b70d498694ef0e0d662967b130345695f911c328c84f803f97ebc3836ce6674
+DIST kjs-5.15.0.tar.xz 290620 SHA256 e3b91b6cc70aa683027daf17c6e5e4c4e314c40f594e76026e0be10400e249aa SHA512 3ab27a0d96273b2fddf692429f061962ec09baa385853d45fe5b84e19230dc08ed4ce747fdf0f91f2e0139188cb55e3771656a81d10d1fea60e531c10d5b1d39 WHIRLPOOL 6cb6208ab10494d23920f98cbe415877b4972650c9cd84e254ab9d3971460296392e70c4c854d47adae630028b31f3db1c86c663b7690badb50ca9df3d16aa1b
diff --git a/kde-frameworks/kjs/kjs-5.15.0.ebuild b/kde-frameworks/kjs/kjs-5.15.0.ebuild
new file mode 100644
index 0000000..46ac226
--- /dev/null
+++ b/kde-frameworks/kjs/kjs-5.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="ECMAScipt compatible parser and engine"
+LICENSE="BSD-2 LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/libpcre
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ dev-lang/perl
+"
+
+DOCS=( src/README )
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 52d8ee3..72e9a02 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1 +1,2 @@
DIST kjsembed-5.14.0.tar.xz 164260 SHA256 7483118b4bbe1b72bcc29db8140de39195a07a049cdbe3a30b1c7e0b9ac07427 SHA512 386fd23fa8a60bf16c12bd05c0c2b9b923174d338d13ee74899a8e4430a2c13b2006e0ec7dd9200b65dd34f6287b249f9394e3255d8afe1ed9c9f9c3dff82945 WHIRLPOOL dda6e666b9ebf64a3deeea14199cc22aac74a2860c46aad0467686df9bb4909428257f58f0e2cba86541ff1d748e132ad3591251b77507a61e0dc142b0e94b7f
+DIST kjsembed-5.15.0.tar.xz 164184 SHA256 4456808a6fbc595bd62235085e4aba2f18665e884220159b3cbe4653cd343525 SHA512 a4db3f221fe0cac22c7b7b9ccc8c1b672de5e6fdd7a2194e4858be8c333dc8625ccdc9d8126cbeffb994e274ee14c37fa415aa3568fb95a129ba7f4d4ab55cb6 WHIRLPOOL 2d741e03a58c6f2a5ce92dcd19e39a1d1d4f89eee255d7c61215b48b6a257832aadada232b54003e61ee56df06ca06de07b2345394d3d1b7b0741176a4937f45
diff --git a/kde-frameworks/kjsembed/kjsembed-5.15.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.15.0.ebuild
new file mode 100644
index 0000000..d627405
--- /dev/null
+++ b/kde-frameworks/kjsembed/kjsembed-5.15.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework binding JavaScript objects to QObjects"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kjs)
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ dev-qt/designer:5
+"
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index 596e5ff..25cc92b 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1 +1,2 @@
DIST kmediaplayer-5.14.0.tar.xz 9432 SHA256 f52b747b73fa5c322a420dd6e0a5807f88e2ba6261278d8d87dbd1f49ccb9bd5 SHA512 c04e0494d07d06228a65eae577d457f0371e13c58e1829ecc0ee61440de04a0077526e7a6e22585ff5308825f3de268aa3faf61047477319cb887ff1884b65ef WHIRLPOOL ed5d750ca74eec333d2025ba49c23521a102cc0c8deaac97435e45953609c1c40d6fb9b87909dca7ee2183d938f6bfc4886e9b6335c987acb90da928753e6726
+DIST kmediaplayer-5.15.0.tar.xz 9432 SHA256 b5e7279f0f62ed68b88e50efeccb3a0dc6be8fb28c1acb79adfcc74a274a91e6 SHA512 0884a871a5a01e13f057b45fa9b33a2070764d6440094dae326b175a061b686e4d9899c1af20c7fd8efcbcc10e4361dd2756085f18cd4fadd969fa2f7cd069b4 WHIRLPOOL 041f8348b12fc61afb99313adad489c296ddf53d68f83c7042b21421968c5ed560de89e0c80d02f7e21d4aa6c41e275b22575e5b6552ec1e1d22c109083172bf
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.15.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.15.0.ebuild
new file mode 100644
index 0000000..4e6faf7
--- /dev/null
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a common interface for KParts that can play media files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 99b0609..3581da8 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1 +1,2 @@
DIST knewstuff-5.14.0.tar.xz 852164 SHA256 465c89fee307c28fcbad34e107fd4fc26e2d763ab74c5a377bc0970752b1f97a SHA512 a6d3c4b6c121573b5ab3bda2d0afdd8813565f6708d8c6f46cbac3aa5d36cac22c9b9475fbbfcdfbb6ba1ffa658f04fa9c4ab843169801b12e6bb9512bd95e43 WHIRLPOOL cd87d4de3cf3540e00ce0eb233fc83a4d10f4ae085e05eaea678360119d621a947f1ad8aa13ff1a9360de05536b4163b088cda9046eca7150a59217b713a743f
+DIST knewstuff-5.15.0.tar.xz 852092 SHA256 dc4a375093bdc560e3882cf653d667b6e3a56b89b19632039e07008f31501069 SHA512 ec6f369002f86d6877b3b70db06ea4917eb178b10127ca53c9c84a03836b34c8d794f1f602c8bbffd8b7c66b8a88e999f217493ccbaecdf5a05abced0c419da6 WHIRLPOOL 5149b62aef4b1c7697287b25ab82a7db7e0ea15c8d86e25ff760ef7c17771fe261f94897f46a459fda5a2415c54901e1c0354f41360f5bc0ffdf3d459979d27e
diff --git a/kde-frameworks/knewstuff/knewstuff-5.15.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.15.0.ebuild
new file mode 100644
index 0000000..223f518
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.15.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep attica)
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index f780644..e734f40 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1 +1,2 @@
DIST knotifications-5.14.0.tar.xz 92808 SHA256 eb6dc5eb63a2eac45be54f0e374674aa89df1fdb0eb302ef8792df5f164f0b70 SHA512 4679d84ccc24fa837260fdf0c7bec6f23f7c4bfe00029d32a4fd16fb7c85f21f97de56b717015481ce8f1052526460b5ec0c7b3a60b8372ab9a4f8d46bcf93ed WHIRLPOOL 51ae52ee0a018f855adb56c0b9c1456e25ac2d8124d68e38a060745cffa4d2483fd599af1f65ef2cf38db1fd571aadf4f23c9bfd1b673687dd1733fba923cd06
+DIST knotifications-5.15.0.tar.xz 92904 SHA256 958d2c98563e3de0bf49490a931e95100efa06f91647eb1d1523c5a252ef0985 SHA512 ed4c9d5c3c3c1b8e605c24de991237dc7d680ca752e3951b8d55dfa9dd02ed39557bd3c6e7d88d2cad9d9678ac3ae09553a79b58ac8c0c4af2f996430be26954 WHIRLPOOL 817126cfa74124012e5f3aeb1b939b202facd4dc3fc9d132d963f7515c1b32375b424c2909030b9061084ca376fe51042ecc821ebbc8bb6bcb8975bb1ace589b
diff --git a/kde-frameworks/knotifications/knotifications-5.15.0.ebuild b/kde-frameworks/knotifications/knotifications-5.15.0.ebuild
new file mode 100644
index 0000000..5964030
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-5.15.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for notifying the user of an event, including feedback and persistant events"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus X nls"
+
+RDEPEND="
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ media-libs/phonon[qt5]
+ dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXtst
+ )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ X? ( x11-proto/xproto )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ $(cmake-utils_use_find_package dbus DBusMenuQt5)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index edb8ab9..ed45d6f 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1 +1,2 @@
DIST knotifyconfig-5.14.0.tar.xz 82716 SHA256 2b83c9f7d56782d041539486fb8bb79f9ef69b2daa036cd81cd2aeeb9f120711 SHA512 ce98fb11167945739e150fedbe4a10740afa86635e7bc913167d53782b6860d5bf373261d8e4ccabd2a95af4891eac7d8c9ee27a49732b4bce8a3cefe0355581 WHIRLPOOL f538d33268a90629cd511da74317e31530ec10aeaecfe082c7938a621d906ca32a28fa138570159f82242d10e6ee74e24cb3c86c39c5dd527f878e24d3507ba4
+DIST knotifyconfig-5.15.0.tar.xz 82860 SHA256 4aa31548a2cf5b828de60dadb82b8ac47aa4fb6812d0786d15123a8ec34f472c SHA512 cd670321b5dba3e253fba50bf71dae6c97865a6bea26cbe9513b23c57f5f42d03b7ee9d3287732d604a79773e19a2193a4cf9daae55df3099dd6e620355e52d7 WHIRLPOOL 93ce64d3e7e8012cfcd8e2ce92d6863a0d6ec2421c772d3346634acdccef777e173c67afc5be8edbe253b34df9f18273d68bfcb971d32339eef19e160dbfff11
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.15.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.15.0.ebuild
new file mode 100644
index 0000000..b6754af
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.15.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for configuring desktop notifications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="phonon"
+
+RDEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ phonon? ( media-libs/phonon[qt5] )
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index f9d6cfe..3db8d71 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1 +1,2 @@
DIST kpackage-5.14.0.tar.xz 98580 SHA256 a57968042d5df8d3d6547f18bf565875802af49e135d2f174763e648f94e7567 SHA512 f0e98135856ad28e68a53717133fe6ac51e75c3124433d64137d8eb1d22130b37671b5b100ee2993fb2cece6a488530ed3f3b42cb64205439bb6fb9845cea081 WHIRLPOOL dd7e61ae2dce17ee4a20b249363a8633428d12183e81ddaf3a56321079de1b73a6f4813913987747b51786fc5f4b966a0ba453890f1e0016fbef4e03e22e7332
+DIST kpackage-5.15.0.tar.xz 98728 SHA256 c3eeca1f1320ceed8bd87617c93b8bb847a915b0a9f6a4fe3d665de129b6ec0f SHA512 5ddd863bc9e3d65ad88a4d39ed84f8644fdf2808c34f3901556fa6364cc6b2c91326a0cffc3146c202fd2beb6d165a20fc5dcc4d26dd8c12a0723eb336e21d88 WHIRLPOOL 6c8f885f50f458a59b7d5fd4669aeb65c729eaae27e0a6d94c28944d38a6a4d115861818b91f1e181718b062c337dd262d5f6ac918f79355eb4108214749f73e
diff --git a/kde-frameworks/kpackage/kpackage-5.15.0.ebuild b/kde-frameworks/kpackage/kpackage-5.15.0.ebuild
new file mode 100644
index 0000000..fda2eb6
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-5.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+"
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 4e458ae..6d0ad1a 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1 +1,2 @@
DIST kparts-5.14.0.tar.xz 153996 SHA256 e5e7ace5cc0eb7b75559a126d23aba4b4198a3d10bcb5315e07bd14cd0643591 SHA512 0dec79204dcd3eb29aacf8c96a69ae1c38ff58befabeec5a50471cd4fa5152e66508ca32011c355e2f3c80d18cf5884e4131bacecea9e30a49550095c2d7f48c WHIRLPOOL 3f827ed72dc447784b7df9953b8771ac8754d239ee86772d6fc8695c73a47139f87e4f7485f8d8fbea681b90c2bbc60350f23ec4214f87fb36fc4bd4a0f81c55
+DIST kparts-5.15.0.tar.xz 153992 SHA256 bc8aa699fa803b2bd12baa464352874f0a255bafbf1376ecdef3a071d2aa4e5e SHA512 c8526a9c78c3b658224c258f17cf4fb939955dbc419299a8cca1aa4401d3e853c9e7d8ded4fd732f956d15cae44d0f2e46bb013798a57576a4f2ab15edbdf06d WHIRLPOOL 7529740e7c739343eb90e13d403ff298fa5409d5ffdb89bec4d5264569478cbe17c3f43d2f35c621431aa2ec52235996e9ec1a3a0c81e62668188ce2f6f48c3e
diff --git a/kde-frameworks/kparts/kparts-5.15.0.ebuild b/kde-frameworks/kparts/kparts-5.15.0.ebuild
new file mode 100644
index 0000000..ef8fec1
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing elaborate user-interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep ktextwidgets)
+"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index e679e28..0c3c5e1 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1 +1,2 @@
DIST kpeople-5.14.0.tar.xz 57384 SHA256 e51264ffbedb4ca73f3dee54d753f49460d8f8f994f993dfecc31dc9bdb57022 SHA512 98a85af0d47101883da5608fbd9d78417ebf393ae757b9a545d81b375f615387363efc3f5f5e01f0f9012275b806f205ed39b5ccbb68e8cf44203c1c8cf77393 WHIRLPOOL a25e6117d06d354d89fa40c578d460cf853e49cd5ae1e91436531ebbc69adcd6b9ce0460e946fcdc9648428ec32f216d0aaeb8b66f4c2eea9ff0ad935f9cce5b
+DIST kpeople-5.15.0.tar.xz 57368 SHA256 fa650023b92def431e2dca957dc46bf352c471e6992371715dc2e26cd4aad985 SHA512 0f1406822eb205a0fc3c3b66fb723013a3d1dccb80a4080fb8315893ae9d55ddb8f47dec14b333b886b1256959769901527778acf2b029773c9180046ee8fcb9 WHIRLPOOL 9fbbcfdb83f0aa899b99e9a45545921b5b8ce177be3dd484aafc511f2e09d4e96e7d0d301def4da09c35bf316b07caff631bcec9d7c8b364cf06715c916f41b1
diff --git a/kde-frameworks/kpeople/kpeople-5.15.0.ebuild b/kde-frameworks/kpeople/kpeople-5.15.0.ebuild
new file mode 100644
index 0000000..24581fb
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://projects.kde.org/projects/frameworks/kpeople"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtsql:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+ !net-libs/kpeople:5
+ !net-libs/libkpeople[-minimal(-)]
+"
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 37e8f55..5216692 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1 +1,2 @@
DIST kplotting-5.14.0.tar.xz 29484 SHA256 d73bc1b47fe85f20d32ed5585316163b355e72dae76262d09616c79f508c6eb4 SHA512 7e672bf2b80d7032ebc5e65efb7ac5d37fc5c26670f356e6cae75f2051f094dbd3a21450e51ccf2b0086e711cc609c6acdb4bc25a90d7b0ce5f69641bfa66274 WHIRLPOOL 173c7196bb2c3b14869633837c0ddb7c2cffa1e68dfad0a8579b9e8d7beee5cb13d797b32e40e5a29d6069dd2f70146d8477caf57b6e0d4fc9eeeef0f5c0ecae
+DIST kplotting-5.15.0.tar.xz 29488 SHA256 32cf01e2feca7ec11dd56891652958e57d5e3dd0d9bdd2d22da2390cd4a79873 SHA512 a144e7bae273e6f80c2a7a4f3fe8c4c135b133bd1a8bdb22554beeab7751bc15ca81f5a61c46f7e8aa09aadd91907ea2b938c3936da8076043737e92c9f6a4a8 WHIRLPOOL b67fcbb34751e8078dc71b4d79d39edc26f14d8bb82e5d36eed56e2d447654f00357e735f0fd832f3203beb87e7248a41f84158fc55e4e303ec5e0460b86df88
diff --git a/kde-frameworks/kplotting/kplotting-5.15.0.ebuild b/kde-frameworks/kplotting/kplotting-5.15.0.ebuild
new file mode 100644
index 0000000..ad4b313
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-5.15.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing easy data-plotting functions"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index d4ae6da..c4e4186 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1 +1,2 @@
DIST kpty-5.14.0.tar.xz 57180 SHA256 d2b447874cb09d4621b7c66c1db2a5aa6526449f91de9069b02e28f309f5ca53 SHA512 a7fb4f24e043f61d4f09a73bfd550a0299f13a7098e007b2b60f4fb63d90e500c4b3aad1da5dcf542e956a9476c71501e60800a04de1c6ff7c357d7197d31d09 WHIRLPOOL eaaca9b8e5a1b90f0fa6e8f46caf85e4c213318de10816b607ede788d50cacceb7306e6decc7ef1e3716f2c2d9b3f64e0edf68d3be7fb7904ee590a5538c6efe
+DIST kpty-5.15.0.tar.xz 57196 SHA256 603061da7ec31221ce0cc4dfd809ce5df15110f92571fe16b740550ef924d40f SHA512 02355a66f5bb22c9f98441963267df78fdcb571b3ac247692632688dd4c65664b638da15b815f82b236005bd74ddd168c25459c701d3022e0274bdfc613fe9bd WHIRLPOOL 61bc5ab43c626652e08d7bbb12125f91ae7cbacb4901afe6a86d255216cf4322127da42625156bfb9c5d2ecec891c5d0397f2303476e6f84e01fd204df64ad88
diff --git a/kde-frameworks/kpty/kpty-5.15.0.ebuild b/kde-frameworks/kpty/kpty-5.15.0.ebuild
new file mode 100644
index 0000000..85b5ba4
--- /dev/null
+++ b/kde-frameworks/kpty/kpty-5.15.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for pseudo terminal devices and running child processes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ sys-libs/libutempter
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index d5243e2..bf088c2 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1 +1,2 @@
DIST kross-5.14.0.tar.xz 135088 SHA256 9b3299d138d3e89ea47a7df98bfdb4ddec95111c1baa945ed7485add8f64f1e8 SHA512 95590d7677747c81c9d3ed705b84979664bf8369cab1b667b09bb2d258d7be1fe0c9ea366313668c4577783c59505c38380c87a5a3708afc20489c527aab94c3 WHIRLPOOL 6b941fca955845f2d27f031ace419b0245dcfc90a28e5f1747d7412ff5d554370d98a569af122764b59e03349333d795ac2e002bc8ae63a1b96e97725a483b4e
+DIST kross-5.15.0.tar.xz 135068 SHA256 006f0dc6989cdd4a126c6cdcd01ad318163eed781293856baef9d9a132d09bd6 SHA512 abb6bf32347f8e762ac666cfda1aaeabb035635c8514b76dcc5feeff42ca1fdf0c07fc91b4de9e005b515eb3defd7cfc3bd98c76dd95fc9a8dc58cdbeb1ef445 WHIRLPOOL a2deb1e8758a953cb4441c9def552da5fbe8a73921b82580ab2ebfb5acaddfd0c9e17263c5509961fc9e3ad9844cd1e31557cafad0e9faaf851cdccb0316cb19
diff --git a/kde-frameworks/kross/kross-5.15.0.ebuild b/kde-frameworks/kross/kross-5.15.0.ebuild
new file mode 100644
index 0000000..fc9ac23
--- /dev/null
+++ b/kde-frameworks/kross/kross-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for embedding scripting into applications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtgui:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ dev-qt/designer:5
+"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 2054c8b..a6e71d3 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1 +1,2 @@
DIST krunner-5.14.0.tar.xz 48132 SHA256 a38bf2db6a4cee985480b06b3b8ebdababef7dd10b31211f4bb84390c95bba53 SHA512 e3e8cf2932d7522b84300183b33243441165593b298d072c2d5c3c0cdaeff98a1a71b25b6dc611d59c4196e07932fca548e500a65c7e30555563a110370dac36 WHIRLPOOL 574dd5a239c51904a3d30fe91b5350ede471c749037d3499d487f4f5262ce89fea1730ea1bb4c3dcf59243077296d6876a6d12ad83930985b126d29b3c8ae8eb
+DIST krunner-5.15.0.tar.xz 48120 SHA256 1bd8bae2880c7c085f76f2b573409143bf18d5a1f51ed849d46915a2ca08cb4f SHA512 cd8a5ec3b8837fbdacc3760dced318074165fbf7641b33cb36c31b2999385db8a8114fcbfc6463d8845c0f1bbd971f0305531464977ae6db34b808471f5f1d0c WHIRLPOOL 7f3b7209e9270a020ed928f18427c6655ece52ea6dff4dbcc7f9aa4263c02a062d8c01553183e6ff42d76bb34fb9f69a2203f3ab4bd1ab13429c7e2a5649bc16
diff --git a/kde-frameworks/krunner/krunner-5.15.0.ebuild b/kde-frameworks/krunner/krunner-5.15.0.ebuild
new file mode 100644
index 0000000..7ec1818
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.15.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for providing different actions given a string query"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_frameworks_dep threadweaver)
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 31bb3c3..ae92b9a 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1 +1,2 @@
DIST kservice-5.14.3.tar.xz 267176 SHA256 e79dd26812ced5a09e37753de9bba3f48890eee26c8e3d60b3beef34f45f7474 SHA512 0d91999e2e2445b3f1a77f50b6a6c3260498df212da6692eeddd945125be71c61054251b8b185bc8591049dd2cfb028a4c8ff69f33b13b23d4489c24fd16fafb WHIRLPOOL ee580985c5bb711c1f857487fdb4f104d99085d70d75c07ff8d3e920d77b29ad305173a69e3893b52a53f5b4a0aa57336aeb9c2e853ebcf43493205e1c71ea98
+DIST kservice-5.15.0.tar.xz 267016 SHA256 a308681479b8d8549674b836889c6e2559356314c14a24af15fecca3537ace8f SHA512 b8ddded5cc3a5297019fec9fdf399e26b9333199cf8a4da893ee758c19c16495921b42f69c803dc86fac94f373c5830ecabb48a6e11cd7426b22933006a478b1 WHIRLPOOL 83d9d8f4e2fb8655f07cd1003cfe5aca9b67e4778148c1058b0eb6a55460d5d6fe65b01295784ec362df1682986e03abc65ef44e0a9b130d05349ffc12a9cbe5
diff --git a/kde-frameworks/kservice/kservice-5.15.0.ebuild b/kde-frameworks/kservice/kservice-5.15.0.ebuild
new file mode 100644
index 0000000..da82a52
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-5.15.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework providing advanced features for plugins, such as file type association and locating"
+LICENSE="LGPL-2 LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ dev-qt/qtdbus:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ test? ( dev-qt/qtconcurrent:5 )
+"
+
+# requires running kde environment
+RESTRICT="test"
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 6c85859..78f260d 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1 +1,2 @@
DIST ktexteditor-5.14.0.tar.xz 2851508 SHA256 3f3dab1f0d84972d50a7cd97f9641018954014605cff2f6240ffb86331d47fe4 SHA512 7204c7446a84d41f1ced9fe3b116cdbb30ecd8b834bfdd213867a1460d05237c64ac0f58f08c4fe71695062bb6a704bb60b5bfbd0af91877b498b1cbcef19121 WHIRLPOOL 2ccd0c26076581783a980f9756202a410c3206787d4100beca5421504db1cdf90cca7116da5c1477316e122ab91bc0a2f0170b68525cbeb3caa1a94578ba92e2
+DIST ktexteditor-5.15.0.tar.xz 2857676 SHA256 6855afac82e69214c7494e3f37dd5b4988d3297bbd126abcd69c82a8b49e3398 SHA512 740315ab41a3b796a3d43dd2bbdee74091cc288b8994c260f64761de6b05db476a8af094208493172ea93837f1fd78749fe2c36af5755ee907dc67c8713380ae WHIRLPOOL afe68c8c76a9885527d1375931ceef3870b83126145e2f5eb5904d966f1d8c339cb8292c5619e3d0a989e056dafc5cb455869d988c13e1030a13f61d196e6d0c
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.15.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.15.0.ebuild
new file mode 100644
index 0000000..dba7941
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.15.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="git"
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+ dev-qt/qtxmlpatterns:5
+ test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT="test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package git LibGit2)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 2a84594..afe91b5 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1 +1,2 @@
DIST ktextwidgets-5.14.0.tar.xz 305616 SHA256 995a1313865abd540c06f890e00cf97b00fa6b9fb7c1a11bae3c4bd1b192a65a SHA512 10305a4064289f44989780c2720bfb2aebbc8a4a2d881df2da6cc0af917a75d4ec1741d27f8277d2a2267bfe9c123fa6fe6c8479d4aabd15df2c287bb7760bb2 WHIRLPOOL 3abef0e03d13e48e3f7cf2b12efb0d2c2f09ec28e1d4988046aac0ed190b85352f589ed5e9c47c366e38135ae6646232f579f3b4b957b79af41254f604934304
+DIST ktextwidgets-5.15.0.tar.xz 305604 SHA256 888a1c5ba0601fba08e5d97f9badcaf3cfea84cc8b6b1b913fbb3c45a5cc2de5 SHA512 9ba0f967f9976a69d1311352d3df2c4b890ee6f6b1a9bc6be80646ff8b8ae54255ae06c712f9cdb419e7b54cbb09bb56af37d661ce73047532450fa517b30cd6 WHIRLPOOL 7295b897e614c0a7713598b17f7736dacb4561e003f3b20c868b429890b9087585518ae8ed5e9f230948e6899303bb35ba33f296b0b19380248fc4030a3b6997
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.15.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.15.0.ebuild
new file mode 100644
index 0000000..1ff3959
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.15.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep sonnet)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 89b7fef..5d67ae7 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1 +1,2 @@
DIST kunitconversion-5.14.0.tar.xz 619600 SHA256 1813bb9ccef2309b6e7383c5f39fad822c3ad5320b832d21a92dacf73a451e20 SHA512 97e62ec21b4177a7828b6ee2bd18f941f7f81e03c7bcdd46c0598c91cee51fde9530d1a67b7b929134895107877015da14822614a7bd0fb7da8018fc44a8a5c3 WHIRLPOOL 03556262cc4e83c0e6d3b39a7eaf44dc36e182466a41f568a7fc30d5070c9efc49c7d65bb534d5e0f67aaef586042c4a703d0d60e0d9db60031724970d1a6818
+DIST kunitconversion-5.15.0.tar.xz 619824 SHA256 aec7a2d9f3d8e5d4a9b73cb36d68aa9ab26f8adffc98844f3a22c6c18fd177e1 SHA512 fbdc8dbbcd4a4c6191c9c242afd458c762f953cfcfa65727626db046425ada05fb26348643c8456d987ff07d62237fb58da1790d814ff6d2c0b472315657068a WHIRLPOOL 7774de234d31f47f7da59b4fbc27966adfee1aae059da157287434426d705aaef4e9039f5983a8b0777ee36250eeccde702bd0f8eb8a4a8ba07dad1e68bf141d
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.15.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.15.0.ebuild
new file mode 100644
index 0000000..c055120
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.15.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for converting units"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep ki18n)
+ dev-qt/qtnetwork:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 94fa8a2..d494f00 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1 +1,2 @@
DIST kwallet-5.14.0.tar.xz 284616 SHA256 9eda8d24256d57caf8eb6bc30c02f6a7ef860b2157e09a4f7f9e9710abaa61ea SHA512 9efc0b767a9a4b714b0c649cf52652d2a284e126c53f15e308dd01d19109694dea8ffdb04aa93fad6572141c53c1fb9b604ef96e6638f0cdfd84277726c86cac WHIRLPOOL 33690717c13a75214093618eaaa27ef8f8d69dc7dc49aa4ff0fb6429f9639d4c10078aad53e845642b01058dfed3b5081d370d55de14380dc38e614b0e8e23a6
+DIST kwallet-5.15.0.tar.xz 285324 SHA256 220d997fdc87c42a1a836d8f39fffafeb384499df113e0aacc9f9ea636d927ad SHA512 824d1c49a78e147a4b75087452709f9d5ac0936feafbfb3f3922e302642e13848983caafbfddd6be17a535347db730e89fdeb9753852718710de61ea74376f17 WHIRLPOOL 8a2bdcf722ad17607779fe63f1dab3955d8e30bb0a8377cafb6c3646d8c4a871f9714dcda675bcd3ebbf32b78fc699f2aaeeec39889fc6bc223c09ee2022bd4d
diff --git a/kde-frameworks/kwallet/kwallet-5.15.0.ebuild b/kde-frameworks/kwallet/kwallet-5.15.0.ebuild
new file mode 100644
index 0000000..9af54c7
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.15.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="gpg"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-libs/libgcrypt:0=
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ gpg? (
+ $(add_kdeapps_dep gpgmepp)
+ app-crypt/gpgme
+ )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package gpg Gpgme)
+ $(cmake-utils_use_find_package gpg KF5Gpgmepp)
+ )
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index d03f136..8d3c9d2 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1 +1,2 @@
DIST kwidgetsaddons-5.14.0.tar.xz 2129068 SHA256 5bf08e2b4c8454a541be332334a1742dd2f79c8683c7a3a9141f9fe248f9196f SHA512 2dbddea641c9c60c8b8a4a49640065cce5b458dcbbac071bc8dc24abea760b651d6ef1ea588fc31c69ecd6e2ea6c2739cb1dcccff9b99e4408915b500159ea44 WHIRLPOOL 6975bf25f00008487fac2876a216ee4dc50417cfb344af72fcab7f824157b7ade7b2f1b0c60cffc81502f1bf52112ddb43777e04d126779e57a54db421a9af2e
+DIST kwidgetsaddons-5.15.0.tar.xz 2127512 SHA256 c3e0fed862a3053481a526f923e79cdef890cec93105fe95080e7cd78ad36fd9 SHA512 c7dde9890d4e6d97147f688e42dcac7bb3822e2ae557b891c6d12057d5dcb5978962faf179b0b2a83c905fe7afad5677c2aabfd1751cb1f1fa13b631f48faa17 WHIRLPOOL fd8dc60d1b6b907faa306b5bd407d4f038bdefc73977abd01e54f5cb11121f640859d016869ceaaa9df0dbb8bc342461a4b3c7a4dabb4721cd6b6b8f6344d2b0
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.15.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.15.0.ebuild
new file mode 100644
index 0000000..5381e94
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ test? ( dev-qt/designer:5 )
+"
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index a10be9c..1545101 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1 +1,2 @@
DIST kwindowsystem-5.14.0.tar.xz 163072 SHA256 016bc2f5aeda773095c5aa6f58907768a75dc0929b3316c2973a3e1b6a5ef839 SHA512 4994f70cfc751b57026581d761f6073104a17c8e7df52498a2f13a1b08150c7ffb51d4abcd51a343c9601d9f734f108ee8a743a8b2f9f6df4e0a111da81c7bde WHIRLPOOL 0b983133cd2d511ce718597888a8b47505f82cf3abc8199302849edf73503dbee29f24cfce18a27603fb3b6370aa4b3e4bc9c133b5a671261211ec232d302729
+DIST kwindowsystem-5.15.0.tar.xz 162948 SHA256 1db9fcc1a109556cc41896b17427a031bfa7bdaf6bab36b415f348e3d75317f5 SHA512 f0408ea95440801395397391975ff3582c58774a1eb4a672d2dfcd5468b10a4240fdbbece67f21ae84218cc1cc7736465c11482c2c904bb7888ad7e736273cb2 WHIRLPOOL 99778861a94248fb3f76238c917a9b6c31d2e067267d76f5b43d8a953b3937469c6b61ba7036f5d2a97343a5f4a022dfe5ce6053e790cdbc23dfc944ce4ae174
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.15.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.15.0.ebuild
new file mode 100644
index 0000000..3bf517e
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.15.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing access to certain properties and features of the window manager"
+LICENSE="LGPL-2+ MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXfixes
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ X? ( x11-proto/xproto )
+"
+
+RESTRICT="test"
+
+DOCS=( "docs/README.kstartupinfo" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index f0f1d89..477dc6c 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1 +1,2 @@
DIST kxmlgui-5.14.0.tar.xz 863108 SHA256 60b0acd3115697ac9185a1f9a102db98667b29a618d329f41a73766ae01975c8 SHA512 201da1b9886c6aeb0bf413d38b4c5d5c7b09c9fa9f32d686825bb2bc564e1b8727689fd344baeb95aaa63ff07afda9ac668e2cb7df67fea4ad07aa3ed5d59255 WHIRLPOOL 240cc5966163b292c0198a379c6dc3b2dc73d1008695d08302cfe12517c5985714c613217a6ccbe93a2772ae1978874c35472b9529111ae4582ef95c1ec7a4c2
+DIST kxmlgui-5.15.0.tar.xz 862992 SHA256 b57d2bcfc27f74556228dabcf914bb82e3bfea40ca1ce85ec222cd3f9da8b5b4 SHA512 244c18303beb4ec38760951af3c3aea5eb287b7868d234ca65f16bfb847f1d47fbe3123f0aaf92a4be5fc72b000546f31d6f78ce009279a4a205f5ff56844559 WHIRLPOOL 0bc784ee6778be2a1b0999ee0863be2e043410b612ce673246042cb7e9d6f8935198b70b4d83ede67ad073033d6cb89523f82ce57a24417e36f61ade6951eff7
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.15.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.15.0.ebuild
new file mode 100644
index 0000000..089dca8
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.15.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="attica"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ attica? ( $(add_frameworks_dep attica) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package attica KF5Attica)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index 77a5c20..44e23e7 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1 +1,2 @@
DIST kxmlrpcclient-5.14.0.tar.xz 28120 SHA256 1ae0518f82b45a0e391b47fd8439a900ef3b34fe3a9b5c60b4754aa9cfb5418f SHA512 3c3b53f5d5ee53f4f55759ab2f3e716f67ccb7befe314faaf0eadebf70c362a6464810d6257ed109d2c49789659afaab1417efcb7dc6be0a516db4a6e02600ae WHIRLPOOL f51c361c95a1553f73d6508a9606717528cba24546f900835f88fd617f4f5e54a44fc761df54d69f5d5c04f84e59c2b40efa9fa002ef9d335240a00554852399
+DIST kxmlrpcclient-5.15.0.tar.xz 28124 SHA256 63903b1b934f7234cb3bacedcdbb66368e211b9932bc342378fecb3686c5930d SHA512 3c5c12349299df32ee0ab9ddcd1dcbfe1e84871ce96f290e2dc40092102238b0e79a99e144363c4dd4deb34cf0be50afef29adf59fed46bd60383f654db7cb9b WHIRLPOOL 8c0baefa91c6e5f7056923d5143c5d81e7896a3c09977ae4267b3f165289786621c07c2eca2d6463029fa3762795fc8e2d200f19df900b598f264e78135fb1b1
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.15.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.15.0.ebuild
new file mode 100644
index 0000000..1cd3484
--- /dev/null
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.15.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_DOXYGEN="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ dev-qt/qtxml:5
+ !<kde-plasma/plasma-workspace-5.2.95
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index cde2ea3..3da5b6d 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1 +1,2 @@
DIST modemmanager-qt-5.14.0.tar.xz 98440 SHA256 9311ceb56534402ccf05530fac3b8a731ddecc23a4c5d30c0fcfc8faeb034fda SHA512 ef084afd3f306453ba6579359e01a2b7ad1884db34992abbb5faa5cdd95cfae2c4d38df2ee9ffc2e7f08188f0bd889d5dbb29a6f24f602e7e1bd5ad7c0addbc5 WHIRLPOOL 7d3e32f58790c98cffd0ca1c31a8d9744744b7ff0892bc2243b651be0cd49a1198d1905eff8a9b3e8698a0da1cdbd5d984b469795f0d115672f34e8566991a88
+DIST modemmanager-qt-5.15.0.tar.xz 98492 SHA256 29e7968ebaa0fe76f3b7430faff0784ee42dbdecfc74366d286d7cdda518b1eb SHA512 c8a733359a6d6bf96087a9577938e22fb480a2f4cfd509a12fdd0dc8f748c066c3f66e05c5a336ce6f6f311202dbca989544351f6929402d5fb1e6ba29b3ba86 WHIRLPOOL ed0a6725637af194229bf5430b77aa49a1b543d56239d9b369224a104606b461d83cfbed10e7ad5336a673238f21947c98b1ed3dafcb680310cacdcc6b883a06
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.15.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.15.0.ebuild
new file mode 100644
index 0000000..b969818
--- /dev/null
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="ModemManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtdbus:5
+ dev-qt/qtxml:5
+ net-misc/modemmanager
+ !kde-plasma/libmm-qt
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 83d23d4..ececf9b 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1 +1,2 @@
DIST networkmanager-qt-5.14.0.tar.xz 155372 SHA256 06690249ce6f3343c2109d9f89264c5f82994e92392c1fc1324d8a4ffecb5ac8 SHA512 8ee63ba73ce5999f137e387eb5ba6d4450f425a8599cfc537d0ec94ed1126375f21512f8899c5ee2de9504880bfdafc64b9fedb9b3d163ca6e23baa0b1040384 WHIRLPOOL 6a9484a359197e126952fa681bf9b45010c46258e0a211cb89f657736089d59233a40f8e555490987d7ab08aae88f3b4683c24946ce4ebbbfff9c5542c1a0eea
+DIST networkmanager-qt-5.15.0.tar.xz 155388 SHA256 178df9bc4d84cdc9e4d97e1435d42575530f38f2e78e01c36e9d3f9798490350 SHA512 04cd3c47e00ef181a24fcf0e8d9140b2a58400f1f05f13ae631c92a2ba1a3891c98c801d745d4a0cb3e67ec419ba52b38725363e4a9d9efcba28dca4b6c37ab0 WHIRLPOOL 8b995994d5d8a169b40ee375e8e5db34bfa5c29cc24bead5d3acec922c91e7945e32598236be001a77bb3433853d466953668b42ee4eb7c0298630889218769c
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.15.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.15.0.ebuild
new file mode 100644
index 0000000..9483ddd
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.15.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="NetworkManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="teamd"
+
+RDEPEND="
+ dev-qt/qtdbus:5
+ dev-qt/qtnetwork:5
+ || (
+ >=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
+ >=net-misc/networkmanager-0.9.10.0[systemd,teamd=]
+ )
+ !kde-frameworks/libnm-qt
+ !kde-plasma/libnm-qt
+ !net-libs/libnm-qt:5
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 321cf21..99c3067 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1 +1,2 @@
DIST plasma-framework-5.14.0.tar.xz 4012636 SHA256 b09a2587e2cd957cf77faf2ac180dda6c2ce40184a31cc9bbd2ad151c685cf9b SHA512 6df7bd6ab8c8498c3cddc7e8880b77dc965f9473d9db4f354619e7f1aa330a37eb1c4e1621cc2b6ca6c8e3406c2eb1b61e14cd5dfcbf1fff9dce6ba27181a16c WHIRLPOOL 73598960c6156621bdd6c9085ffbdbd47f6b336e4da647cbd2a8ec04f1eb5f70df8538c2b19938c0573e5b80ed9e4c10c14d635ef013992b0e9a6cc0585a8908
+DIST plasma-framework-5.15.0.tar.xz 4013292 SHA256 1a5dc97d3b8151cc49a4720ef4b63da59adad6a727106212a6c68e258989666c SHA512 0f47a3eb3fb9846bfcdfdeb70f88c07e1ea72d7fd78c1d30491f16be0a20b34f0af26c9d9a88636f4a4dd4fb2e2850c5607e485c44e846e145cb38f8bf64e7c6 WHIRLPOOL d309e5a055494dc2bd7af6dc305df7971800acd9612bdf911fe0ee0c0b31650a78e9793f50ff18781e370de4a489a7e306db9e227da438abab85acf8c219aeec
diff --git a/kde-frameworks/plasma/plasma-5.15.0.ebuild b/kde-frameworks/plasma/plasma-5.15.0.ebuild
new file mode 100644
index 0000000..22a2bd4
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.15.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="egl opengl X"
+
+RDEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtscript:5
+ dev-qt/qtsql:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ egl? ( media-libs/mesa[egl] )
+ opengl? (
+ dev-qt/qtgui:5[opengl(+),-gles2]
+ virtual/opengl
+ )
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ dev-qt/qtquick1:5
+ X? ( x11-proto/xproto )
+"
+
+RESTRICT="test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ $(cmake-utils_use_find_package X X11)
+ $(cmake-utils_use_find_package X XCB)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index d7359e5..395fbe2 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1 +1,2 @@
DIST solid-5.14.0.tar.xz 265616 SHA256 91e8c41ec86e220409340064f7ca09113a3da29a20f7a031635e649bf8add97e SHA512 36f1418674583a3140515ed1b6c895cd89fbc420eade6d9e070ee8a46bc57645197688e72506b739cc9de08032aebf18549b24f4583cb2b1139a04402673e9b4 WHIRLPOOL 66e984936bd581b76caef9da333710a5ac5833d44e3b5ca5effe45f360326ea728cdf46b1480ffe8872cb4c6b6b0068f134da0a598b68a4cfc975c3f3562d0c2
+DIST solid-5.15.0.tar.xz 265228 SHA256 ca715a7f23fe6477fce6cfefc3a63655cd7526406b493ac678fb31ecac5f2804 SHA512 370849c53face423e0feec5884998e0d95e0453a47272cf00d26f90dd0d3dbe9788b04cfc9e184d270749db816d99d9caee2e3088aa50aed0e55c0bce46e38b0 WHIRLPOOL 95fce66e6566c2fc1e38239e1636e4b2a4fddf277da2317b955f87c7f7e6bd9a44e19dba3533f25ee51809b94848dd4e06957f0d190a670b42a358d0de670bf3
diff --git a/kde-frameworks/solid/solid-5.15.0.ebuild b/kde-frameworks/solid/solid-5.15.0.ebuild
new file mode 100644
index 0000000..0fb737f
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.15.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing platform independent hardware discovery, abstraction, and management"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ sys-fs/udisks:2
+ virtual/udev
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ test? ( dev-qt/qtconcurrent:5 )
+"
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ if ! has_version "app-misc/media-player-info" ; then
+ einfo "For media player support, install app-misc/media-player-info"
+ fi
+}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index b983b3e..e45a2ce 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1 +1,2 @@
DIST sonnet-5.14.0.tar.xz 277648 SHA256 8993d7baed751f9e443c175168e3124c08e08257bb8cd7ae71fac8ddfb4fd61a SHA512 30b30a856518d1c2b3caa2fb193d68faf02f50eb561aa8b2696233a35f2685e329ea1050de40e271e7d708e72201ef7b11702484f0f80b952d82a4d92e270118 WHIRLPOOL 957d53d14051a4097705ef44a15458c26a8e7ed9196d35e4ad5be998afa1a426a4b785132271da2702e2712995280316d6fe5edb357ef42f47b900b7cac14b35
+DIST sonnet-5.15.0.tar.xz 279080 SHA256 a0be638acbed60a513e1aa086bc86a8e6876341e4f981617e55f6edfbe2e1aa3 SHA512 509fdc58d2cbd12d0207eb9f37cb1a358728c08eb00d284ab2ea1a872dc4693d4d7e43fe1d00989df344e90f868b5dc2d430afa55774dc41668653d11e4c7107 WHIRLPOOL 7a178efbc13082c7b5b17e725786a7d0b58ec1d5d9dfef6588b8ba72199a63547635b91bee0bce01026346924f1de207aa35e2b700c334750488a5b0eecafd6c
diff --git a/kde-frameworks/sonnet/sonnet-5.15.0.ebuild b/kde-frameworks/sonnet/sonnet-5.15.0.ebuild
new file mode 100644
index 0000000..167ffd7
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-5.15.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for providing spell-checking capabilities through abstraction of popular backends"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+aspell hunspell nls"
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ aspell? ( app-text/aspell )
+ hunspell? ( app-text/hunspell )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package aspell)
+ $(cmake-utils_use_find_package hunspell)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 44f7c64..ece74c3 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1 +1,2 @@
DIST threadweaver-5.14.0.tar.xz 1408632 SHA256 c302ca2d75ebec76c1d57afd040610267198caf0ef5daa6023e1caf228c46d07 SHA512 1624a01d11698445f5cd9bd673eaa927ada9d7b7b7794c60a58973170da261b28ded168d1b8764cc007ba93f2050e1e4186d9837cd09ef133eafa6e77a7f7ccc WHIRLPOOL c3a383009f2acc40ef104bb3b9412c15c652ecabec7a3ecec22a636a1dbe2caf70cef125477bb76185b054078945e6f1361a58f72c4fd2c315df55af37df7753
+DIST threadweaver-5.15.0.tar.xz 1408576 SHA256 f89ec571fe47249956e14d209cb2867d879401554ae60227e12355c94d4e0aa6 SHA512 7febb703766da251ca7db697e4bd636fef0f89db792e902dfe45524464bcd4b92711e0c11ebed1e31e9b5145ae5cc4f0318d1ce21bd9b9a769ec773f81527dcc WHIRLPOOL 14c55b6a4ddf217ab51224606e4fc13add01ce53a37263286e867cb7db391558a88ee8b97a84743e2da79d7f4964bef767a30fc8b924df368dbe9e51f51b30ca
diff --git a/kde-frameworks/threadweaver/threadweaver-5.15.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.15.0.ebuild
new file mode 100644
index 0000000..9e9bf73
--- /dev/null
+++ b/kde-frameworks/threadweaver/threadweaver-5.15.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+ comment_add_subdirectory benchmarks
+ kde5_src_prepare
+}
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index f728af1..21bfb50 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1 +1,2 @@
DIST bluedevil-5.4.1.tar.xz 127920 SHA256 d8c945d9d9ca96323f26685c6d7ea55cceebd01b28b43ebcac8257815dd8c3eb SHA512 1b9e14d1f10ed840a3beb0a909ec891cc54ed01315bf0e1aaa86f4fe317e8b86d9304e7a8c5dd848e9ac73a6ce78797557f2621ed9b1563d7673b2a96db6f275 WHIRLPOOL dd84b91847f88e005d378399291181a63820b52678ecc52acfeb9cf6c7d5db5c9a5f767a1dda415365a45f28685080862906dff908f40c9023959dade8b29af9
+DIST bluedevil-5.4.2.tar.xz 128492 SHA256 a0b5b46f4ffae99ff2b591703e3fc82f3af1f12d1929c7980c28367ddc2abdab SHA512 afe26bfad23e0243cda16539eb75165c60e77acc3db76b288e5bfd7c0bb20d3a8b1f6f0733b915b76909addc02b71c3e2186d3369dfaca095cc2c3be69024124 WHIRLPOOL 44f98744303086a2669014283e7005dd415e7fbf43a77e002484327f50ea1648dc161b140399bdf285f7c3b0da34ea69e634ae7c8db2b3140ce1166b8fc43d9c
diff --git a/kde-plasma/bluedevil/bluedevil-5.4.2.ebuild b/kde-plasma/bluedevil/bluedevil-5.4.2.ebuild
new file mode 100644
index 0000000..c8e6a54
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.4.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime kde5
+
+DESCRIPTION="Bluetooth stack for KDE"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ $(add_frameworks_dep bluez-qt)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kded)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep plasma)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${COMMON_DEPEND}
+ x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ !app-mobilephone/obexd
+ !app-mobilephone/obex-data-server
+ !net-wireless/bluedevil
+ !net-wireless/kbluetooth
+"
+
+pkg_postinst() {
+ kde5_pkg_postinst
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ kde5_pkg_postinst
+ fdo-mime_mime_database_update
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index ef44249..121edb1 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1 +1,2 @@
DIST breeze-5.4.1.tar.xz 36349416 SHA256 d03f6443cdf3e49fd651f22c92ccc4b56e25cad63aecba3acca4fae123a82a37 SHA512 03a03d90d9d79145110e4a3a9e4df38c6e46d758b32db92224312a8ddb1566cbff7931effdd45adf6df6755bdc67bcb996bb87e0849be41084875128b45e9118 WHIRLPOOL 3f564187dc3de19ad77854c75c5cfb5dfc48dd54292d26881e0e1761466ec4fb49c1e316638e613b7a208eb67907c0228f305378bf0aeb9f13f3360932a91442
+DIST breeze-5.4.2.tar.xz 36567028 SHA256 9d2861867f133006ac7e1644c9b932a0f8cdf79ba912898f565d301a362e859e SHA512 665e6cab47a80c8f5a2af958466ab414dbfd018f2f676814f0413e030b083a14fe78acd3d91b1b0735eb3b1e059264f134f8a7edd5f7ae5e03fac60a988aeb62 WHIRLPOOL 611fcf3022e27fcb626d40f09903110ac48586d49b58be4e75a64efbd69efcf33df98557b76f3c4e52509428a2547cc3dc4591fb9662344c2996f207cdad1571
diff --git a/kde-plasma/breeze/breeze-5.4.2.ebuild b/kde-plasma/breeze/breeze-5.4.2.ebuild
new file mode 100644
index 0000000..0fa9af1
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.4.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5 multibuild
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4"
+
+DEPEND="
+ $(add_frameworks_dep frameworkintegration)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_plasma_dep kdecoration)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libxcb
+ qt4? (
+ kde-base/kdelibs:4
+ x11-libs/libX11
+ )
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+"
+
+pkg_setup() {
+ kde5_pkg_setup
+ MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=()
+
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+ mycmakeargs+=( -DUSE_KDE4=true )
+ fi
+
+ kde5_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant kde5_src_compile
+}
+
+src_install() {
+ multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 9cf3c87..7880278 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1 +1,2 @@
DIST kde-cli-tools-5.4.1.tar.xz 485124 SHA256 815d316c1f75ee0f84d7ca083e7552087a15bc567693251508ba80df21e26609 SHA512 82b4d2abd30070836e62fb9ddb644070d4d6d1c70d94fa9859996a6ab3af79e0903ee5f1b822ed5e4ece1b91bb90a02356a886301c5de65c050a7f88e49cf11c WHIRLPOOL a0d47e8a96583f9f8dcfe577c23b1e5fc61ffbfd42c1981ef38dc2b92cec3ccd340001a8796dfc2ce3d78dc01cf4957157ef4dad334e338ba5eecc31b4f23f34
+DIST kde-cli-tools-5.4.2.tar.xz 484304 SHA256 626474b9890c789a7bde44bdd40c4c5999a45161cb1fa62eee7873a8250b8c41 SHA512 1dc050e959d84d18bede20a36abd443c4b20ca19d6143a60c4bf569b35acbc128b107f17a30ad32973d37957c8ea697748d13e25427e08821601c149fc4f1466 WHIRLPOOL 42ff5716ed2bfc10f4a1012fa65fa60582cd9c951cea3f7fdd8ef4adec00e2f6bb558923e4d292de1ce1f771252a8d76d3b1f395ff775550c6d722762d6bd159
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.2.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.2.ebuild
new file mode 100644
index 0000000..b606eda
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kdesu)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ )
+"
+RDEPEND="${DEPEND}
+ handbook? ( !kde-apps/kdesu[handbook] )
+"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X Qt5X11Extras)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index e13d381..deb9acf 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1 +1,2 @@
DIST kde-gtk-config-5.4.1.tar.xz 143912 SHA256 833191b74f130525f7b4e420acb9b7661b87ebb181bdc3d596ac527c8d8c063d SHA512 ff99bbfa03813e8f2674191208250600c68af55e3ebf2606adc048dd5d9ad23761d03995908eea534bc57b309e5753fb109784cffc33b5cabf26626fbdd0a437 WHIRLPOOL b086b05fdbda118fdec58c2d1629c6bcf3e68fa2335180115363a25523fec3fbf19d7b37bceca76c97c4b9186dde7c327f0c0af1c8a00d07ab6fd76a4ebbd368
+DIST kde-gtk-config-5.4.2.tar.xz 144516 SHA256 1d1c78a6b0aa28fc615d1fbfd0c267cfd5f381d39e810786863bef07bdb54340 SHA512 d2667bd34d6227173bb950383909a7408f9a25882b7766a8897052cae6b3b2fe8d17e5c58a9e8fc0642c1d16aa442cc9cee67744b1c04a3ed57885b10691bef0 WHIRLPOOL 785a7216bcce4c9c227aec18ddb1ce0a050bce4373e55e7cef15dc8170a82a0fd4d2b85deb5fbe36ad1d473728ed89650d473992e0caaa7109eb537722f36b31
diff --git a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.4.2-gtk3-optional.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.4.2-gtk3-optional.patch
new file mode 100644
index 0000000..e1e8de2
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.4.2-gtk3-optional.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists.txt 2015-10-02 22:36:55.186480671 +0200
++++ b/CMakeLists.txt 2015-10-02 22:38:40.048169719 +0200
+@@ -17,6 +17,7 @@
+ include(ECMSetupVersion)
+ include(ECMInstallIcons)
+ include(ECMMarkAsTest)
++include(ECMOptionalAddSubdirectory)
+ include(GenerateExportHeader)
+ include(FeatureSummary)
+ include(KDEInstallDirs)
+@@ -62,7 +63,7 @@
+ install(FILES kde-gtk-config.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+
+ add_subdirectory(gtkproxies)
+-add_subdirectory(gtk3proxies)
++ecm_optional_add_subdirectory(gtk3proxies)
+ add_subdirectory(icons)
+ add_subdirectory(tests)
+
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.2.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.2.ebuild
new file mode 100644
index 0000000..fc00913
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="KDE systemsettings kcm to set GTK application look&feel"
+HOMEPAGE="https://projects.kde.org/kde-gtk-config"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk3"
+
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-libs/glib:2
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ x11-libs/gtk+:2
+ gtk3? ( x11-libs/gtk+:3 )
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ !kde-base/kde-gtk-config:4
+ !kde-misc/kde-gtk-config
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+ -DBUILD_gtk3proxies=$(usex gtk3)
+ )
+
+ kde5_src_configure
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+ einfo
+ elog "If you notice missing icons in your GTK applications, you may have to install"
+ elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+ elog "for example."
+ einfo
+}
diff --git a/kde-plasma/kde-gtk-config/metadata.xml b/kde-plasma/kde-gtk-config/metadata.xml
index a23f444..b277fb6 100644
--- a/kde-plasma/kde-gtk-config/metadata.xml
+++ b/kde-plasma/kde-gtk-config/metadata.xml
@@ -2,4 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>kde</herd>
+ <use>
+ <flag name="gtk3">Add support for gtk+3-based applications.</flag>
+ </use>
</pkgmetadata>
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 14b6eee..e5d4053 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1 +1,2 @@
DIST kdecoration-5.4.1.tar.xz 33560 SHA256 db23b15a46356128fb68b8d44521c370e46cda17a71557348f1c96cec0025f12 SHA512 9722fc6606bc60a4c2b47df2a55774a977f4e0ae600eb9a4d03ac0fc514f4f10e7a456861939f3d37586f66471421e3fc9a47e5b83f56b44c22333eeda0feb6a WHIRLPOOL c18a7e4be19092e86ecb78288c3fd6b9d49a43c746d7c083328a0556e950c182af4e776970f4d86ffdae0ee89bec19a9e6f3f8ce17af90c765e62788fa63276f
+DIST kdecoration-5.4.2.tar.xz 33564 SHA256 7d70aee4e709771cb7ec09a5c1316b286c407ac44375078e7d5fd3df0103a050 SHA512 daab62c923f2834531ff4a14b2c04fd27ec92d95120520966c8716389ed7e0cabde2d076dbf439fc4bfd69e8703423fda313991514c80feb1b21a412582c64fd WHIRLPOOL 3347e0664b5332fc137444ca46ceb6f74df4ef9f2a9aa8308adcb28c8622b144712ca575da006698d0fbef4937cbceaa7f1135cb2d6c2c9420bd56dc0cd2608c
diff --git a/kde-plasma/kdecoration/kdecoration-5.4.2.ebuild b/kde-plasma/kdecoration/kdecoration-5.4.2.ebuild
new file mode 100644
index 0000000..fa967b5
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.4.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Plugin based library to create window decorations"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:5"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index ee36386..eb75ce5 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1 +1,2 @@
DIST kdeplasma-addons-5.4.1.tar.xz 2074568 SHA256 e16de089c668d910acfc41a4449c529e1376b1e7600913df033469586ef8c53a SHA512 e9b1fa8bd4498aa814348deca57970617432e504c57bd2a1918473583dfda622dbd86d8a18fb1b0efab0533235e0641f5dd2d7dd3bbde3841aa244dcb0a3c5a0 WHIRLPOOL f6c840b16f257c2aaace3310f72468101cbb06ea7d60445464c22e02a8a628913d60d12d1f1f29f3530ea11731c7b420470ff05e8b7f9f919cc1881ae125085c
+DIST kdeplasma-addons-5.4.2.tar.xz 2075364 SHA256 d3cdfc957bcdde52729efa9b2f4d44c4981b01461b1494a9086bf85e2023c344 SHA512 f1c4b656246d1e1258ed9574641eb44cbf44098e054377e22944ae4a9914abe27da2123f0009f8200b70f23aa4638a02a0ba80b477b38a1b91224d4dadae1bb8 WHIRLPOOL 57481619de0d88f42258ae6dad0b72073044899d94b4f7f43c2cd8352c5dd5acba0ccae7557e7c031d85b4d7adee836571ff35c633f59335525798afb9b69dfe
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.2.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.2.ebuild
new file mode 100644
index 0000000..e8d2ee7
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="ibus scim"
+
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kross)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kunitconversion)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep sonnet)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ ibus? (
+ app-i18n/ibus
+ dev-libs/glib:2
+ dev-qt/qtx11extras:5
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ )
+ scim? ( app-i18n/scim )
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep plasma-workspace 'systemmonitor')
+ !kde-base/kdeplasma-addons:4
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package ibus IBus)
+ $(cmake-utils_use_find_package scim)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index b6c19f3..1a3d00b 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1 +1,2 @@
DIST kgamma5-5.4.1.tar.xz 60332 SHA256 7be6dd9c99d4baca2bf85dbd881084b82334782a1d9a2f22fe54f644f9660290 SHA512 27d30c5adc6c4ed9b683262ea1f77fd6f0c77c5f1a9ea0cb5bcc3f08bfbae350226f79b12924363b75d255bfc296874544b0ea43cbcf820923add2c3b975cd66 WHIRLPOOL 489e65ce73c6214691f2504e21b5f575a64732a1ffcaab0a23dc1ae32f3160caf7508541ba6418fe1cbbb28e712e82e86e4d4b719dfaa21adce14f07c8d5c335
+DIST kgamma5-5.4.2.tar.xz 60308 SHA256 7e74220e7ef981105eaa869d4e84af5483d7354937e04ebe481fc1dc33a5e60b SHA512 7b5fc9458b881a59608011fc54fdef2e8c3016730c4a2bc7e813e518d109e7c625360520735e2c0e1676e8a4c342fd9732cd9ae832f11f29a4ea2a29be0a3b06 WHIRLPOOL aed85ba00c9f67b76e8e4e9e4560083bf5b552ccdf2060d26d8b62d0e0acee4f6e97bfc36958b3cdd26861aba3a11a587a883d2e8b792a2da54d50e979613a8c
diff --git a/kde-plasma/kgamma/kgamma-5.4.2.ebuild b/kde-plasma/kgamma/kgamma-5.4.2.ebuild
new file mode 100644
index 0000000..6f8afba
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.4.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KMNAME="${PN}5"
+inherit kde5
+
+DESCRIPTION="Screen gamma values kcontrol module"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+ x11-proto/xf86vidmodeproto
+ !<kde-apps/kde4-l10n-15.08.0
+ !kde-apps/kgamma:5
+"
diff --git a/kde-plasma/khelpcenter/Manifest b/kde-plasma/khelpcenter/Manifest
index 9903c46..67c6245 100644
--- a/kde-plasma/khelpcenter/Manifest
+++ b/kde-plasma/khelpcenter/Manifest
@@ -1 +1,2 @@
DIST khelpcenter-5.4.1.tar.xz 1800432 SHA256 a9a78071574151a1edac0e0c89a97b55e7394cf2ab88ec7cbb92070585fd5a85 SHA512 034577eb132fa6306065ed78b58c5a2bb773036065e51f3f823c114aa5f5c35cad73a15e609010e9269410656792a5a7fda774e4e7d9a6107063ad220029f889 WHIRLPOOL bd5248e13c317f7d44b9ed053ec66d3fba743fb7b2d631e68e3977566b02afff5a1581d69a0decb5c9e98265f83018fea33adcea15bb647ae75d9a4e6139b2b8
+DIST khelpcenter-5.4.2.tar.xz 1801664 SHA256 66173f221a02f1a1f3531a0864dbf2927170bdbb0205270721aa5ba84e12456c SHA512 257bee203bec9acc3008f1e4135bfa3b19450d209b1c6e529df32068aba57efddb890db0fc2d4debec76fd189c9d479222b2923c7719a0c10bca419f818a9c5d WHIRLPOOL e896f3f3c895f81e22821fe0c0853f69c850f0c1d224be57f2d4ac59806f59b2d13a63b017da7fa706e8eb7095982507e4af082c8cdd5ddb59e67b9cee33adcc
diff --git a/kde-plasma/khelpcenter/khelpcenter-5.4.2.ebuild b/kde-plasma/khelpcenter/khelpcenter-5.4.2.ebuild
new file mode 100644
index 0000000..55a182f
--- /dev/null
+++ b/kde-plasma/khelpcenter/khelpcenter-5.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="The KDE Help Center"
+HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep khtml)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ !kde-base/khelpcenter:4
+"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index d33c56a..24b2fae 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1 +1,2 @@
DIST khotkeys-5.4.1.tar.xz 606900 SHA256 a24ada4ad04c7b6ccbec5787c2a94bb7b938349fed74216c5388ac53c4719a1f SHA512 9a3091538496b1da5b3ad783b1d1ee86f1378e090956d2817dba1e4141efbdda1b25b73bb7d240a7a82d56f668a024b16a644724c7f0ca7d334c8900cece8d61 WHIRLPOOL 277c3330badec637347b225e3b02a7cb0d1fee2aa903d32ed379c114ebcbf76c98df6111d5bb4e9840f8e0a510c3eff2f14cc2f26b2c5c8f02af04fa26c92727
+DIST khotkeys-5.4.2.tar.xz 607164 SHA256 63ec301a2549a13cf382929d093ebbf673bc50f4cc1067ce15f28fef48ca44c3 SHA512 2be730f01aa2f68cdc8ea04e7f140e6645ec3bf51666b159dffe024ee345f0d7e8203a20d74feb9a2f8619c204e73b16395be70943379889fe7cfd67af2fc83f WHIRLPOOL 9f6d5332da6cedebbe90abcf8f5f1bee97a7571817a1c6139bb0cb1171ec1c727c7f613ba5b456b274f6fb90508c9929d62a8959f647ee802cd0787a7d292e76
diff --git a/kde-plasma/khotkeys/khotkeys-5.4.2.ebuild b/kde-plasma/khotkeys/khotkeys-5.4.2.ebuild
new file mode 100644
index 0000000..e1c0ff8
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.4.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE workspace hotkey module"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdelibs4support X)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_plasma_dep plasma-workspace)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_plasma_dep kde-cli-tools)
+ !kde-base/khotkeys:4
+ !kde-base/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+ x11-libs/libxcb
+ x11-libs/libXtst
+ x11-proto/xproto
+"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index a93ca6f..93c2f9b 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,2 +1,3 @@
DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb47dc3229505abbac0c6 SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 WHIRLPOOL e161bf40c5e16180fa65217cb49314fb230c45329f4c518d6014083bd71da82d4aa048811ee814fde7fa300105cef16c182688445164ae84d0d700e23641b342
DIST kinfocenter-5.4.1.tar.xz 1130900 SHA256 322f486586bc57b28aacc14db4bfd73aeeb484da0c1006d25964ab11f154479e SHA512 83f201c6fd94d2d9e7b17754c52bc03be75b192dbe3a01d580da8305558f00380e9106dfe7716c8a62a2688970c4236306d936a62889a2180679816cf9dcca7a WHIRLPOOL 4eee81d8b8c2aea88ae38953886694e5ec1d63325c044490cb8cc4a828551dd53bc7ef971c8a013d7b3f753c031addf7a3132c7a692d2bca71ac66efdc09802c
+DIST kinfocenter-5.4.2.tar.xz 1132136 SHA256 187eb50cd473a64e382d5b3e918219e31ed58043b3db6802e0e1870fb5de2bdd SHA512 10b06ee821fcc182b61f2e8ab55cedc0840fe7cb3fa2e5195ab3676b1e71441e30764acf6a71d537dd61401b71e40a065ec3caa4374aa9f373eada457f73a828 WHIRLPOOL f2561b7ce8aebb46d50994b8c7daff26ac0deabf2115640017112f80e8a312b64f423deec33c94d3dcb9872211d1bb6f52511204aab65364c38a3b9bea1c3207
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.4.2.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.4.2.ebuild
new file mode 100644
index 0000000..16df157
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.4.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="A utility that provides information about a computer system"
+HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+KEYWORDS="~amd64 ~x86"
+IUSE="egl gles ieee1394 +opengl +pci samba nfs wayland X"
+
+REQUIRED_USE="egl? ( || ( gles opengl ) )"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5[opengl(+)]
+ dev-qt/qtwidgets:5
+ gles? (
+ dev-qt/qtgui:5[gles2]
+ || (
+ media-libs/mesa[egl,gles1]
+ media-libs/mesa[egl,gles2]
+ )
+ )
+ ieee1394? ( sys-libs/libraw1394 )
+ nfs? ( net-fs/nfs-utils )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ pci? ( sys-apps/pciutils )
+ samba? ( net-fs/samba[server(+)] )
+ wayland? ( $(add_plasma_dep kwayland) )
+ X? ( x11-libs/libX11 )
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep plasma)
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ !kde-base/kcontrol:4
+ !kde-base/kinfocenter:4
+ !kde-misc/about-distro
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package gles OpenGLES)
+ $(cmake-utils_use_find_package ieee1394 RAW1394)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ $(cmake-utils_use_find_package pci PCIUTILS)
+ $(cmake-utils_use_find_package wayland KF5Wayland)
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ insinto /etc/xdg
+ doins "${FILESDIR}"/kcm-about-distrorc
+
+ insinto /usr/share/${PN}
+ doins "${DISTDIR}"/glogo-small.png
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 59490f7..8ec98bf 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1 +1,2 @@
DIST kmenuedit-5.4.1.tar.xz 441332 SHA256 b5581bf720ac11d533504ce7c51766a9225e39efbeece111aa7e70a7a7d91fc0 SHA512 9d4cfb4e47d399a224798f46160224906ef94c67ad5ba44cc2991a03bef1d35673592a2773cdfbbde439b34d4ebe93158597eb2ddbab4dfd4d910f1e37671532 WHIRLPOOL 2d4a510deb73601c803e4399a98075335e4e0d0e201968be0fe25c5f238ca2fbaa004083ef89d00b93d5d8c365cbb41faf57293e39f0fa5ac38a22fa734f22b5
+DIST kmenuedit-5.4.2.tar.xz 441384 SHA256 65279e8f552a605ec25215caebeeb70e9ecc7d901ca1069bc0019e1085f3624b SHA512 9302b2df1e7f319ec304a84004ac801c0231ab8c6cbf7334ba5971aa22624e802c469789957722fbbf0c24c8a6d1bc5e4d79053bbc1b6a430263959e9e168c80 WHIRLPOOL 578b883ece44d3e1f4fd19a4a11c8f844b8e59aa3ba2e83df3890c29e8cbfefefb15f58a422a6c2c6e178dbdfbe7b4d1a5423683726044d4a805c15da82fdb9b
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.4.2.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.4.2.ebuild
new file mode 100644
index 0000000..01c1c78
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.4.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE menu editor"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kmenuedit"
+KEYWORDS="~amd64 ~x86"
+IUSE="+hotkeys"
+
+DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ hotkeys? ( $(add_plasma_dep khotkeys) )
+"
+RDEPEND="${DEPEND}
+ !kde-base/kmenuedit:4
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index d5b015d..052d154 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1 +1,2 @@
DIST kscreen-5.4.1.tar.xz 99632 SHA256 9b49b754fadc5268529f2397f86b62484ad25cbd4e6e5df0a4130adcb20c6b02 SHA512 a24fd73c57adf61e5eb13328e6d96977e0981bc98b4b65b7a22c6447c4115f0c512525c7ad6bc0e98861bd8fcac44cca3f9fe742167ccb67ba77071d025277eb WHIRLPOOL d590ebe8b9fbca49a78d67cc6113f0aca8a81c7c11d83d41dce43c7e6a7bcdf593e6abd526988511964f62dfee2531dad2dd447fc58a35381cd5f05e3154d999
+DIST kscreen-5.4.2.tar.xz 100064 SHA256 97f216f19f36f96092276e06ae42c8c31d1464d10db88ee34e242e7bb18a3152 SHA512 07c29444b7e14a8b4ababa137b2a241da7d25316f4e6beaf918b84322a7f8c29221a09631f733df3687d8aad6ef3253d9c685108cb193e44fc98ae4091ffce22 WHIRLPOOL 65126b78b5a8751ee054635ac947903112f1333650ee84518a93ad8840d2580523add1dac23dcd4be0dceceebf8adcc948fb4fa0895966cb02b8c88b99437e77
diff --git a/kde-plasma/kscreen/kscreen-5.4.2.ebuild b/kde-plasma/kscreen/kscreen-5.4.2.ebuild
new file mode 100644
index 0000000..6e6cb29
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.4.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="KDE screen management"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_plasma_dep libkscreen)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5[widgets]
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ dev-qt/qtgraphicaleffects:5
+ !kde-misc/kscreen
+"
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 5a59451..195e947 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1 +1,2 @@
DIST ksshaskpass-5.4.1.tar.xz 19168 SHA256 a24840cdb02464268cf81b341f2daa3f9c8c3c45aad9a256a349954c2e3a57fa SHA512 3d3f5cab66d745535462602d7e3b25c0f993a17b7ffb56feb01d77486d48ba5cc78fd3a19226679ca75fbd60a0f7e2d04bd31348c383fea58d5bd73cdb1acb87 WHIRLPOOL 00af6edd0a78e3c64e8b8511d4b83943e66628f9a99fe76383d4aee092231769354e1abaea4dd9e7e0a91d1c1cf584fcf6b2b654ca4958067b758fbc8666d459
+DIST ksshaskpass-5.4.2.tar.xz 19384 SHA256 2bd7ad5d1f0fc9664a9c2b406d987ff9c77b423f982d837dda7f1d5a7a4baa8e SHA512 b202898b757ed38817cd6be6bb3d77253498b3845d4490408cf6467be2bf4d14438120876974496b743ad1a0b3687884e814cb2fc0c5e12b08020ef0010231f0 WHIRLPOOL 6cfad7aeb9c58bf508ebad91afbfb51279e57d97bde7933a23c08915bdcefbdc41b8222090d7fad5bfa91b131b24203ae32986a3556ed938da95c84bb021d0a7
diff --git a/kde-plasma/ksshaskpass/files/ksshaskpass.sh b/kde-plasma/ksshaskpass/files/ksshaskpass.sh
new file mode 100644
index 0000000..664c173
--- /dev/null
+++ b/kde-plasma/ksshaskpass/files/ksshaskpass.sh
@@ -0,0 +1 @@
+export SSH_ASKPASS="/usr/bin/ksshaskpass"
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.4.2.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.4.2.ebuild
new file mode 100644
index 0000000..137e1a5
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.4.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/ksshaskpass"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-qt/qtwidgets:5
+"
+RDEPEND="
+ ${DEPEND}
+ !net-misc/ksshaskpass
+"
+
+src_install() {
+ kde5_src_install
+
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/ksshaskpass.sh"
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ elog ""
+ elog "In order to have ssh-agent start at kde startup,"
+ elog "edit /etc/plasma/startup/agent-startup.sh and uncomment"
+ elog "the lines enabling ssh-agent."
+ elog
+ elog "If you do so, do not forget to uncomment the respective"
+ elog "lines in /etc/plasma/shutdown/agent-shutdown.sh to"
+ elog "properly kill the agent when the session ends."
+ elog
+ elog "${PN} has been installed as your default askpass application"
+ elog "for Plasma 5 sessions."
+ elog "If that's not desired, select the one you want to use in"
+ elog "/etc/plasma/startup/ksshaskpass.sh"
+ elog ""
+}
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index fe2ffd6..fe3de41 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1 +1,2 @@
DIST ksysguard-5.4.1.tar.xz 481028 SHA256 d25df668c256c84f466194e2ff5a75f656437d5bbc98d951b6dd44527a6b3ad9 SHA512 9c910d06d52a5ca3b508eef5f7d64dd372f5758be6e25f50cb99d91c0658a2127a05a03a8784dd0d1a5d1d5ccdc06a9a048b3726b57270a3b7cb17588278782b WHIRLPOOL cb01b34876753a8ad0285762cb1135c43f05b88a38a4081fa02d51c3c167840eb6600db3dbca34c6c30dc65cec47e77725ca9b62d8924fec11390f3479332367
+DIST ksysguard-5.4.2.tar.xz 481252 SHA256 d50dfc6f750404489b3759045ca727859678b65c085382c22907f0214ef9c7b3 SHA512 327302ec30d579be2ffa68e180c3cf6aef2ad3bbb39ae46f6366dbf7dfe61f525f75145d37d174500c9418437ca3d3b46bf729aa12dad486123ce48658b196a8 WHIRLPOOL 2220536117dd25a855e869d83c7d8472e6537e54fb0443fa4b37a8eacf37435d6023102e60e0b511dccc14d085d523ecf82aa6f84e6a962ebab1bca181124fd0
diff --git a/kde-plasma/ksysguard/ksysguard-5.4.2.ebuild b/kde-plasma/ksysguard/ksysguard-5.4.2.ebuild
new file mode 100644
index 0000000..29409db
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.4.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Network-enabled task manager and system monitor"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="lm_sensors"
+
+DEPEND="
+ $(add_plasma_dep libksysguard processui)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ lm_sensors? ( sys-apps/lm_sensors )
+"
+RDEPEND="${DEPEND}
+ !kde-base/ksysguard:4
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package lm_sensors Sensors)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index f9b2011..bde185f 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1 +1,2 @@
DIST kwallet-pam-5.4.1.tar.xz 15544 SHA256 6c2664c04baa52b5e6141b9514ee3367b904e24c52b08f5b7c48d6cb48162b79 SHA512 b9e0d14c9bc5de926731cd4b4856b02fe26a84c0722242e4f9878d6c07e867925f6a18f0302241806a1df40a0a5693fa0f1d6a4a9664318c0e06321ac57db2bc WHIRLPOOL a41858fa2ccbfa5d574a3031cd8ced7998d325ff0b93b0543c9b875de444c8386c133a46bb870e015ffda51c58c7eb29008b05d08b5a4d6cf486a4c63bae1067
+DIST kwallet-pam-5.4.2.tar.xz 15544 SHA256 14803fbacd84636a6e0d0e8f37bf8ea847b493653d452bbf633148614ba38969 SHA512 75708e4366bc0e6661258c709b9ff47747ccf6eb7fa399245a96903cb5cbfb7a3be42df6c47b8e557a41913dcc9592d4b3aa0c79a7a800cf8a219ff83f5b08ab WHIRLPOOL d8cbf0ebd2b28fc95db565c60f1a4403a540c2f21e20a74db31a156aaa8c22c93b448513d59026c3ac91af9f7694c6e11dae68237bdb7d60894bd58ec37eabc3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.4.2.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.4.2.ebuild
new file mode 100644
index 0000000..7b8f75e
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.4.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-libs/libgcrypt:0=
+ virtual/pam
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index ce89692..e3fb771 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1 +1,2 @@
DIST kwayland-integration-5.4.1.tar.xz 13996 SHA256 a7edfb16ea6363f5a3da8b7e3a448cb01eb9a984262b44e2caf9b0ffddb29bc1 SHA512 c72d19fe479dd374222c588d33cd1318a2a748761029773a7ea1b967c76d9c7c123e642ce22d74fadcf223fa4d845ce4237e034433735179b7994dcdd8df132e WHIRLPOOL 7c93a266303d403b4020076fbf9b4b172d8b647d5f54759caa68f0975dc98a8c27614b8f8e6fde0883b59f2e8c1bb2f5653e7df2c1a99092540cd21ff7703da5
+DIST kwayland-integration-5.4.2.tar.xz 14008 SHA256 c9c57d48e55cb5eb660d715d63d57337da8abd940288ad6807cee6624cdb1021 SHA512 5d4ab0a6942c91c4b49c7231ce0f8a1da76d1df2c74ab791eac08045e637dd41abeffef299928d4888c9d22d89c11e08326fe244831d6a46fc8da810cd4fbad4 WHIRLPOOL 104a2f667f45538c846d75b96e56b461a66a2de5516218f5d3f76298e9ef60ea2e6a9e673ef6fc6747a41605f84787a374f5703f5db13dda2b0abab4e1a7acea
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.4.2.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.4.2.ebuild
new file mode 100644
index 0000000..b36baaa
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.4.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland-integration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_plasma_dep kwayland)
+ dev-qt/qtgui:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwayland/Manifest b/kde-plasma/kwayland/Manifest
index dc39a4e..c8f068a 100644
--- a/kde-plasma/kwayland/Manifest
+++ b/kde-plasma/kwayland/Manifest
@@ -1 +1,2 @@
DIST kwayland-5.4.1.tar.xz 111640 SHA256 cf29f72f4d6b0f7c71a10e8b2f70929f1b37321784508a95148cd89d18323c47 SHA512 3f0e54ae20f0676f4becedec3b747d588eef0935875c78085e9243465dcba196550b6261f5865eb73956e89133a532ffe589f56cb2d245dc57ca83024b6a5eec WHIRLPOOL 1f48a11c94cbdafed2778f57151aa3a9cf142a34e108275187b0421f550e5bad70ec169d7c8862eb0d9690b353d751e5f013a392a1b326f68fb771723e2eb225
+DIST kwayland-5.4.2.tar.xz 111632 SHA256 97ebaec8c02923f645a72ffa88a9e4e50c80b2830af0d7bf741d82defef112c1 SHA512 f82078f9b31bbbc89bc5d8c045c27abfaf72362cd918eb71ddf8d076a192c4fc4705e99606c29b9ea1cfc7188745ce52acdefb9094e0cede684cf3888fdfa8c0 WHIRLPOOL bd727d4ee77014d66b9b842e0ea978ccdc2672628a5c6947d2b76f4ea98772413b78cb5f0a871a13c24cf32d9d5efb5916340fa2d52105ce7477ac85fe5fd36a
diff --git a/kde-plasma/kwayland/kwayland-5.4.2.ebuild b/kde-plasma/kwayland/kwayland-5.4.2.ebuild
new file mode 100644
index 0000000..c030e9d
--- /dev/null
+++ b/kde-plasma/kwayland/kwayland-5.4.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-libs/wayland-1.3.0
+ dev-qt/qtgui:5
+ media-libs/mesa[egl]
+"
+RDEPEND="${DEPEND}"
+
+# All failing, i guess we need a virtual wayland server
+RESTRICT="test"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index e911ce5..ad85b29 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1 +1,2 @@
DIST kwin-5.4.1.tar.xz 3783308 SHA256 9cbeffd3dd2abf8ab05a65d71f7596f2d536b882914973eb77f3f44df92da957 SHA512 d2d0fbe4e8e1855e31ef7ce74a613e8a6e6ccc9dd3ba0f40c70c6c0a36110ab42c082c49c1fa8c3b6abb7093c916af966555e737d09d722d1745b530a11da55a WHIRLPOOL 021fcbbfc825119ebfbe7c2b42270cb0cb992ca0e23384c6f5cfa6c261200935826a6dd42cee316d1f5773cff30f7f31394977aee173449cd2c76644f0ab5fe9
+DIST kwin-5.4.2.tar.xz 3787848 SHA256 204926490a95a060c66fa0367fc6d44e7d8dd582775d699f1616fc3a0c0d4191 SHA512 41179c95bbaa635479d43f11dcf3199a8c4983aa35b68bcc97ca41f46b7405966bcd4eb5159092f79f2eb227872c73ecbccbec92813385614f53a2639af9517d WHIRLPOOL 6ed4e190c9d7a3850375558eaf4657c8d870d281336ddacc0548a87fa334dfba5cf253cde1f3a7179025de9d8698c89c69bb30245dcdb4147f358a97d648ac63
diff --git a/kde-plasma/kwin/kwin-5.4.2.ebuild b/kde-plasma/kwin/kwin-5.4.2.ebuild
new file mode 100644
index 0000000..83d3836
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.4.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE window manager"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="gles2 gstreamer wayland"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem X)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep plasma)
+ $(add_plasma_dep kdecoration)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5[gles2=,opengl(+)]
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ media-libs/libepoxy
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=x11-libs/libxcb-1.10
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-keysyms
+ wayland? (
+ $(add_plasma_dep kwayland)
+ dev-qt/qtwayland:5
+ >=dev-libs/libinput-0.10
+ >=dev-libs/wayland-1.2
+ virtual/libudev:=
+ >=x11-libs/libxkbcommon-0.4.1
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
+ !kde-base/kwin:4
+ !kde-base/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ media-libs/mesa[egl,gles2?,wayland?]
+ x11-proto/xproto
+ test? ( x11-libs/xcb-util-wm )
+"
+
+src_prepare() {
+ kde5_src_prepare
+
+ use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package wayland)
+ $(cmake-utils_use_find_package wayland KF5Wayland)
+ $(cmake-utils_use_find_package wayland Libinput)
+ $(cmake-utils_use_find_package wayland UDev)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 7dadb9d..db45a8b 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1 +1,2 @@
DIST kwrited-5.4.1.tar.xz 19472 SHA256 3ab7a94c180bbe8e929cfc4b52202e48f7cb3a890c82ec7fade305e7357a2a78 SHA512 31dc15eefa8d1e24a67e3066330434deaab2e7287fafda586a95518131f288da5448436ede63e0ad425a04088d65d72e05232d09e69e07a0ed3173d1d0282326 WHIRLPOOL 8e07b3798e3ab419c747bd64976b3494b6c268a59f47f89145da1178d6a284e03f53a973bb51f4095df0f343aad8555c70c5c0237d80869be72e69301e92cc7b
+DIST kwrited-5.4.2.tar.xz 19468 SHA256 47a330429f9cd6e84cf489ec5f05e6052d7c1dc4892d1d9be04308c891d88842 SHA512 49ad49fb9f08a2ca5b524ed1e8ba9fc3ae54c88114bb97f03c34a4fb19a9e2032eed147f423deb1ce8ed8a8aeec5b306476801d1b3a8e4fc008c48d619b9742d WHIRLPOOL 2abe110bb25be5df711881a870fd79ebdb014603e8eccec7044709efc35add5866e5bb5e9fb0ede864fc620385c431b4a4281d5975823885137489e4fa6c1859
diff --git a/kde-plasma/kwrited/kwrited-5.4.2.ebuild b/kde-plasma/kwrited/kwrited-5.4.2.ebuild
new file mode 100644
index 0000000..6021b96
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE daemon listening for wall and write messages"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kpty)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+ !kde-base/kwrited:4
+"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 8688988..dbfeaca 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1 +1,2 @@
DIST libkscreen-5.4.1.tar.xz 72268 SHA256 f96cd275da7cc6b9b4c2be6b8b0ab3cfd81fa0aec8784675030e4ac52620a31e SHA512 adb34aade27d648cbc9830e825898a628062e46e8dffdc43ca2c25304f111b987acb62673f4ca5efbcc22c03c2375e069900edb47354414119447bed29f9e23a WHIRLPOOL 4e7cfffe488bece1be5dc1b9dd331d9dd0015ac037789fa67aa718f3c6f5393dd35c15ef4730bb053f18123bf8c2c535fc01ded4d10fcb623256c8de01da2fa5
+DIST libkscreen-5.4.2.tar.xz 72248 SHA256 da2311e9cd4aac24f6545372b6084ed7d80b4e1adfd36836999fba7ea4105f5c SHA512 d475d6f1a7022d004f4dc3ccecb4c98c0d6392e46cfafcb2f76c8b1b1cdb9e6b77bcb23d814a038dc0b1eea0f977ebc1799fa2d1a072293daa710c7e00953c25 WHIRLPOOL 19f195464b500701733c912de24835187399f8750f7873922ebc4f42d57aa0943deb1ef8fd376e7bad6438f52cbdcf7b2cdc934283593109b267db1e0531a43e
diff --git a/kde-plasma/libkscreen/libkscreen-5.4.2.ebuild b/kde-plasma/libkscreen/libkscreen-5.4.2.ebuild
new file mode 100644
index 0000000..d76eb9e
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE screen management library"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+ !x11-libs/libkscreen:5
+"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 8221160..1e701d0 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1 +1,2 @@
DIST libksysguard-5.4.1.tar.xz 561368 SHA256 97879f5bd72e195c4a6c78c78a739d68d94d33a1379f5ab736a2db25ac766e0f SHA512 94b52566a9445102b9ab28b05ca841601868fa2e5ee7eb709f8ce3442a4afb4030fb2219af02ebec624b23ad84e415d97d7d4b24be2617e183400bb4053e3165 WHIRLPOOL d58152592a205fcf9cc1e3006a1661f6bb68d8b2c8e7d826ce8fe0b2804b7643b7185c48ad02256ed8a301326d5dad835b6af91f303a9a5a17fcd220fba9a3cf
+DIST libksysguard-5.4.2.tar.xz 562104 SHA256 712376c169e7cb04237b77a5efcbdb26ae94ecfc7c8841836b79eaf8914ca90a SHA512 772e63e96fe9ebd12e2d8940db49c3d178f46a877e26bcb53fff03b29de735aceb8d8312c6f635950d92a585665a48bd9c9149a08bd18002a088ffe039bb657d WHIRLPOOL 89493c274fedeaa3b6dbb4fa0826c9327a35ec3ba4585ae023bc8d2163443a2787fb55927475e26a8246309bc081701ad3fece7584efe222272c36d7293a7db4
diff --git a/kde-plasma/libksysguard/libksysguard-5.4.2.ebuild b/kde-plasma/libksysguard/libksysguard-5.4.2.ebuild
new file mode 100644
index 0000000..3caea63
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.4.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+processui X"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ sys-libs/zlib
+ processui? ( dev-qt/qtwebkit:5 )
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXres
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-base/ksysguard:4
+ !kde-base/libksysguard:4
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep plasma)
+ X? ( x11-proto/xproto )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package processui Qt5WebKitWidgets)
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index d43b530..4e4ce3a 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1 +1,2 @@
DIST milou-5.4.1.tar.xz 51152 SHA256 dd633ee2e71fd0afe9d173490f96b1cc8a928d518a8f441fa848fd891a494c58 SHA512 3f9ac15bb189a34c87e7681889d51aed57104bdf583c15f1b6dd6589a94759afe57169a756fd3094710e6b4cc0b9c8f155dd2e9cd32bd292b6b0a716bfd36c59 WHIRLPOOL b4b3dbb39f1724c75ef13900808223e0ed07e5a109f3d02b602b1ca29fe42da55ba138ec8b1f3e03d9088f175c376806f5ed2ef48f528aebe1c733389b065ca7
+DIST milou-5.4.2.tar.xz 51128 SHA256 3f31cab3200c034fdfecd9c63a60b85d856514784e19dc64906fbbb7ae395316 SHA512 d07efa6d921cc91290756b12ff3e7241dae4f671c6a603a3b600692dbe8dcc4efbbe8f095b0d6ab6e9830ffcad57b9adc3039b33cad13057adb8fb96c7d1ed1a WHIRLPOOL f9f3f516548474a1bedc81f54b92a87eb76d3c2eb0934df2db89a4ef60a10b33c8bd696609aae93dc537fe2fcf1f55693db480790794889b5bb1c593560fc8b6
diff --git a/kde-plasma/milou/milou-5.4.2.ebuild b/kde-plasma/milou/milou-5.4.2.ebuild
new file mode 100644
index 0000000..d2b2feb
--- /dev/null
+++ b/kde-plasma/milou/milou-5.4.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/milou"
+
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep plasma)
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+ !kde-misc/milou:4
+"
diff --git a/kde-plasma/oxygen-fonts/Manifest b/kde-plasma/oxygen-fonts/Manifest
index 8d9504b..1d84643 100644
--- a/kde-plasma/oxygen-fonts/Manifest
+++ b/kde-plasma/oxygen-fonts/Manifest
@@ -1 +1,2 @@
DIST oxygen-fonts-5.4.1.tar.xz 161696 SHA256 db6ccaa7ceaf7e93fe24986d3794a74dccf255aff93ea131ad67ecf3317fcb63 SHA512 772499803cba8cdfed6dea7f95afcd6c5bae0fffd6fcbb5907d1c8625ef9b98224bf1f87e0b0adc72478e5942f8577fccd75f011a6a045c901684a017b567200 WHIRLPOOL bebb163d50764306e7e7f43818a239cb9d7cfa216748a5a8ec64a0ceced4244058d2e50fba826af89dbd186435aac3fe35e0556bd3e387d74c7f0fe395b24ac1
+DIST oxygen-fonts-5.4.2.tar.xz 161644 SHA256 74ce20431b825c7903a4a11825432c88a1a2537456314c260fca75fbf5a37db7 SHA512 40e3c59ce46e4353f7e3ecea02f406fa1df0e89d9baa9a3d66c17a6c01c247817d554b47b9d2a0d61318c6ef82ea60e25a4cf75bec015f6b7ecf7b5a7a066131 WHIRLPOOL 69b14e0d055a7ac634fdf9d420e1f537fd9f35c5b3bc92c9bc3cee99c213908b912385768f711f0e4f8ca4060401b32b57e01fdd9a70a0a1ea5fc529334bd6d3
diff --git a/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.2.ebuild b/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.2.ebuild
new file mode 100644
index 0000000..fd95230
--- /dev/null
+++ b/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5 font
+
+DESCRIPTION="Desktop/GUI font family for integrated use with the KDE desktop"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen-fonts"
+
+LICENSE="OFL-1.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep extra-cmake-modules)
+ media-gfx/fontforge
+"
+RDEPEND="!media-fonts/oxygen-fonts"
+
+DOCS=( README.md )
+
+src_configure() {
+ local mycmakeargs=(
+ -DOXYGEN_FONT_INSTALL_DIR="${FONTDIR}"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ font_src_install
+}
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 8dad602..c4fc43c 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1 +1,2 @@
DIST oxygen-5.4.1.tar.xz 4506548 SHA256 374cafa11066095c41e6e76b7a84cd0f4f61b34e8d6f042e668bea88aa040829 SHA512 bacd383be997b381c1ea2b359370b52f9f6976ea7b13ffc06ac711c1fcf54b4968b420631be54ea9049fab3d522bb794b2d58d3818b0e2abdca3d87b62266f3c WHIRLPOOL 0272cbee52e7b4f7dd458bc040d66458b5136dceb8009d0d8e940a0ecad145f99016534bbed2b7941b4ccc52df1033c6b2cc7f25c60cd4a626e109e068f532d8
+DIST oxygen-5.4.2.tar.xz 4507248 SHA256 66641df409c624bf12d4f40687906ccd80c8f25e834c7da431503fbb0de4223a SHA512 845bce0882ce64b8b57a42f16c3e914eddad52e70d8faa33cb4eac3bb353c1f8931334ab7b10a1def8051382790d6325b92bf02f7182ae2f1630836cb04409f2 WHIRLPOOL f168aaf71b37f4e56cc24f6fddd4644b782fc12db604969ec64eb102f91581f4d57a0cbf0c7cfb5fabbde9fdb18de651a13ccc73941676b0cde8813907c8f219
diff --git a/kde-plasma/oxygen/oxygen-5.4.2.ebuild b/kde-plasma/oxygen/oxygen-5.4.2.ebuild
new file mode 100644
index 0000000..9c3541d
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE window manager theme"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep frameworkintegration)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_plasma_dep kdecoration)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libxcb
+ !kde-base/kdebase-cursors:4
+ !kde-base/oxygen:4
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kservice)
+"
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 25accf1..4c917dc 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1 +1,2 @@
DIST plasma-desktop-5.4.1.tar.xz 6271644 SHA256 58321f79538442e5786ae1884abc66929aebf69cfc3397dcad5a84e92ba572a8 SHA512 e2f6df6ac899ec5c10c106b3d7a7eac0cfa45896371cbe0a832e4891d2218745b14a9e19c8f398cba261d304a66471eb23cfca7602338cd7b96d104780ae6582 WHIRLPOOL 5507542b2969f8067a9546b2c112af857ffb7ee2e6a1aa6d6f02a53c49e84dd4034d7eda8bf59d2a7fbb028db993ecc9ca6c523617006b8c7656993895508350
+DIST plasma-desktop-5.4.2.tar.xz 6263608 SHA256 0f83fbabac177c222f1e8d209af8a69e968e3df20961cf46805a0934ab37daa7 SHA512 04a657b00d63d29cc6e684d67e55d643f99c3d7a12e16dd56c1b5f221102ea1ece8cf78d341913038a32456981b5195d92d1b69cc4e521738c6a7e01bd0ea487 WHIRLPOOL 121768040b06eaa53216faeefe8e914c2d0049e6cae571659fbf5930b7180ad674a9f1764711427fefdd95917e60409f57798eca71ed69fbb6df7d964728b45f
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.4.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.4.2.ebuild
new file mode 100644
index 0000000..d488992
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.4.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE Plasma desktop"
+KEYWORDS="~amd64 ~x86"
+IUSE="+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad"
+
+COMMON_DEPEND="
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep plasma-workspace)
+ $(add_frameworks_dep attica)
+ $(add_frameworks_dep baloo)
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kded)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kemoticons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kpeople)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_frameworks_dep sonnet)
+ dev-qt/qtconcurrent:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsql:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
+ media-libs/phonon[qt5]
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxcb
+ x11-libs/libxkbfile
+ fontconfig? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ pulseaudio? (
+ dev-libs/glib:2
+ media-libs/libcanberra
+ media-sound/pulseaudio
+ )
+ touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_plasma_dep breeze)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep oxygen)
+ sys-apps/accountsservice
+ x11-apps/setxkbmap
+ legacy-systray? (
+ gtk2? ( dev-libs/libappindicator:2 )
+ gtk3? ( dev-libs/libappindicator:3 )
+ qt4? ( dev-libs/sni-qt )
+ )
+ pulseaudio? ( $(add_plasma_dep plasma-pa ) )
+ qt4? ( kde-base/qguiplatformplugin_kde )
+ !kde-apps/kcontrol
+ !kde-apps/kdepasswd
+ !kde-apps/knetattach[handbook]
+ !kde-base/plasma-desktop:4
+ !kde-base/plasma-workspace:4
+ !kde-base/solid-actions-kcm:4
+ !kde-base/systemsettings:4
+ !kde-misc/kcm_touchpad
+ !kde-misc/kcm-touchpad
+ !kde-plasma/kcm-touchpad
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ x11-proto/xproto
+ evdev? ( x11-drivers/xf86-input-evdev )
+ fontconfig? ( x11-libs/libXrender )
+"
+
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
+
+pkg_setup() {
+ if has_version net-im/skype && use legacy-systray && use amd64; then
+ einfo
+ elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
+ einfo
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package evdev)
+ $(cmake-utils_use_find_package fontconfig Fontconfig)
+ $(cmake-utils_use_find_package pulseaudio PulseAudio)
+ $(cmake-utils_use_find_package touchpad Synaptics)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/plasma-mediacenter/Manifest b/kde-plasma/plasma-mediacenter/Manifest
index 2ff2d05..20702cc 100644
--- a/kde-plasma/plasma-mediacenter/Manifest
+++ b/kde-plasma/plasma-mediacenter/Manifest
@@ -1 +1,2 @@
DIST plasma-mediacenter-5.4.1.tar.xz 157940 SHA256 fd2e54dc43fb436d6d823b8e171174397f0a9f20e02fdff5392c0e643d94d5e6 SHA512 cf481d06ff51ba6512c766955d4ada025c67081baceec9725f1cca02f39e76248ea1271e325592e2c0284b438be7abd6c91aa989859114874f5f32c3ac496b64 WHIRLPOOL 5bb68f8dab0dfeb0f35fc6f20e76d3cf29087cbf806a65ad460eae029d86fee55956d8a1ba2ec9edf420e567ae372a2e9c7032abe967c5c831dd2a39f38df751
+DIST plasma-mediacenter-5.4.2.tar.xz 158460 SHA256 2e027f20d584f31b90b829acfe13d6f0af21779165808fa14dae1d971c50235a SHA512 7b6e2dc40b8aae46010bc5cd16771b633535c5e57f9312b2e871960d16c60252aed4897a1bec429bed9c3db35109fd1786c679618aea88750410957d046c3ba5 WHIRLPOOL 7ef21e91b6e36538e4f93249c6107d41083883b6d54ea0aaac19af4295429f271e627d6f1a358b6580244dfc95d2527174a4fe2b88e99ffad23a90d989774d60
diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.2.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.2.ebuild
new file mode 100644
index 0000000..ba46755
--- /dev/null
+++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Unified media experience for any device capable of running KDE"
+KEYWORDS="~amd64 ~x86"
+IUSE="semantic-desktop"
+
+DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep plasma)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtxml:5
+ media-libs/taglib
+ semantic-desktop? (
+ $(add_frameworks_dep baloo)
+ $(add_frameworks_dep kfilemetadata)
+ )
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep plasma-workspace)
+ dev-qt/qtmultimedia:5[qml]
+ !media-video/plasma-mediacenter
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ $(cmake-utils_use_find_package semantic-desktop KF5FileMetadata)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.4.2.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.4.2.ebuild
new file mode 100644
index 0000000..115e484
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.4.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5-functions
+
+DESCRIPTION="Merge this to pull in all Plasma 5 packages"
+HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth +display-manager gtk mediacenter networkmanager pulseaudio +sddm sdk +wallpapers"
+
+RDEPEND="
+ $(add_plasma_dep breeze)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep kdecoration)
+ $(add_plasma_dep kdeplasma-addons)
+ $(add_plasma_dep kgamma)
+ $(add_plasma_dep khelpcenter)
+ $(add_plasma_dep khotkeys)
+ $(add_plasma_dep kinfocenter)
+ $(add_plasma_dep kmenuedit)
+ $(add_plasma_dep kscreen)
+ $(add_plasma_dep ksshaskpass)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep kwallet-pam)
+ $(add_plasma_dep kwayland)
+ $(add_plasma_dep kwayland-integration)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep kwrited)
+ $(add_plasma_dep libkscreen)
+ $(add_plasma_dep libksysguard)
+ $(add_plasma_dep milou)
+ $(add_plasma_dep oxygen)
+ $(add_plasma_dep oxygen-fonts)
+ $(add_plasma_dep plasma-desktop)
+ $(add_plasma_dep plasma-workspace)
+ $(add_plasma_dep polkit-kde-agent)
+ $(add_plasma_dep powerdevil)
+ $(add_plasma_dep systemsettings)
+ $(add_plasma_dep user-manager)
+ bluetooth? (
+ $(add_plasma_dep bluedevil)
+ )
+ display-manager? (
+ sddm? ( x11-misc/sddm )
+ !sddm? ( x11-misc/lightdm )
+ )
+ gtk? ( $(add_plasma_dep kde-gtk-config) )
+ mediacenter? ( $(add_plasma_dep plasma-mediacenter) )
+ networkmanager? ( $(add_plasma_dep plasma-nm) )
+ pulseaudio? ( $(add_plasma_dep plasma-pa) )
+ sddm? ( $(add_plasma_dep sddm-kcm) )
+ sdk? ( $(add_plasma_dep plasma-sdk) )
+ wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
+"
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 848ace6..0af2274 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1 +1,2 @@
DIST plasma-nm-5.4.1.tar.xz 547440 SHA256 91862c39285a8f149139229dfb0c717ff6d8eb48b35958a2c0d096e4dc303d0b SHA512 6f8105057a91e957c1b8ccb2ccfc072e9af0f8d706d49fb20bf2bb978ed04df7dcd1b3c6212a1e60893245f6c148f3ff150d580eaf54f2ac4a97844626a408e5 WHIRLPOOL 23cf17e30780e6cdff66425d898348f53a18417ac070b84c792aa19ac55774e234ce62793e4d309c406b5f604259542704cb4d62d0f06d8560a036348460a007
+DIST plasma-nm-5.4.2.tar.xz 547516 SHA256 c868ae9e307895eedcefca399a0976afb9bdaa53c6b7b1de39b19edca53eded2 SHA512 cfcbfcf26a76d321a60323b74939e0a0177016b0f3dca66716d3a056342a050436e7c629a5c1e843391d6789a3ee348e38a6fec1dc324a7ffc86339300afdaab WHIRLPOOL fde1af576df7e9a9962771c556bce99453ad6cdfd468107c294e0a3427030fbafba29e60aa83412b6cf356559d1970d16d830f68ebf2d2cb15d7126080c564cd
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.4.2.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.4.2.ebuild
new file mode 100644
index 0000000..badcd14
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.4.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="modemmanager openconnect teamd"
+
+DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep networkmanager-qt 'teamd=')
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ >=net-misc/networkmanager-0.9.10.0[teamd=]
+ modemmanager? (
+ $(add_frameworks_dep modemmanager-qt)
+ dev-qt/qtxml:5
+ net-misc/mobile-broadband-provider-info
+ )
+ openconnect? (
+ dev-qt/qtxml:5
+ net-misc/networkmanager-openconnect
+ net-misc/openconnect:=
+ )
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep plasma-workspace 'systemmonitor')
+ !kde-misc/plasma-nm
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package modemmanager ModemManager)
+ $(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
+ $(cmake-utils_use_find_package openconnect OpenConnect)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 39fd216..b922ea1 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1 +1,2 @@
DIST plasma-pa-5.4.1.tar.xz 42024 SHA256 d780bc24c498eed473bfc79167b8fb3755be8af601059bca086b5a8736fc1430 SHA512 a8ef4301ad0f23d53d4a063838202a1115db3d0b8e0793a8ca68426c27bc0516fcab1259c81810ac34102fb72d9f3a55c2bbe22136bb338a497ffe627e949b38 WHIRLPOOL d484e7653732f42e6ec63ad55c2d5df91e9b90ddd46faa2da9f1815d989955d4af5d1cb78f346a28b66666c54bb28778e48ab828a0e14abe1a3559d3e227ee85
+DIST plasma-pa-5.4.2.tar.xz 43120 SHA256 91e8c80372ae6374c8f6b6a9b9264cf0788c559de6f155304425be1981b03926 SHA512 1a550fe5a2fd65bb8acf784757d7f58f70b351da48df641d8d49febaeb82958a34adb2da868788c41e2d9da387ddc9eb9e98f8dea86152d3ef9c7b2ec0734334 WHIRLPOOL 9f5388cd6a378795a3b842f0cb87b7b3fc200e68c356bc603b23c7fb5663128cecb13b270911a7566f898ee95a45a2982bf5681cfe13390a764fb314fcfe45f8
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.4.2.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.4.2.ebuild
new file mode 100644
index 0000000..af5e1d6
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.4.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep plasma)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ media-sound/pulseaudio
+"
+
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 4e36288..36be26e 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1 +1,2 @@
DIST plasma-sdk-5.4.1.tar.xz 645612 SHA256 fa681fe6ca671897cfab50ec250206663f67b1c6e3ece3f442b9f411f1fc0a0f SHA512 7ccd53c0804b2ca22ca7d564837bebcd9f51f77d8cf5ba56e5197dec85553ad6f96afe7c86eb32791d620fff40ca58893183779c11e4915fc7ec25fa0ab90120 WHIRLPOOL aa52eb8239ff26c415a7ffc0c652abd006c5c9bd4b999f40ec69e65c212fc4af8c2d36119f48b7749dc07e3fbb7c1d9a20e92f49bf0adf71a9a94578de060e94
+DIST plasma-sdk-5.4.2.tar.xz 646748 SHA256 a01c5e5272f76b54271aecdb09761ae30c70d8c8aba2881bfbb35502689593e0 SHA512 01220a9b760c758b37eccbcbf5599cabed62a85ea443fb2dccf453f0f1b60df2f27bfa01bcbdcc9dd7ae00d20760638047f68e857c81dbd95f02b74e24ae89d9 WHIRLPOOL 14e43df36f08f4fbe2a9f19ae3ac70cb5452a52f01b986929b680100eb85b65b3b692d366803831eb291e16b5b7f4ec6838edd21efe2f963615880d326416acd
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.4.2.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.4.2.ebuild
new file mode 100644
index 0000000..b5b00a2
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.4.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Useful applications for Plasma development"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep plasma)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}
+ !dev-util/plasmate
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.3.2-remove-qtwebkit.patch" )
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index ff5bdd5..e2b34e9 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1 +1,2 @@
DIST plasma-workspace-wallpapers-5.4.1.tar.xz 50572108 SHA256 31f223834328bf242c63f443bc6f52ea1819314433bbc79795a8994adab8225d SHA512 50fafd592c0b8408d6355e60b22449ad3c9c78363511f34205ce7dda1c0ce1ea18438832bf96989515469526ce7cef48a29c23d9b6e9f05ac81e8b288b1fc642 WHIRLPOOL 65717ce2f42e1b77c60703a2a974da35ee85851094bad8dd3a15f4e0a8c4ffbf8b328007429b4cb9e967b07ce0836a2af02a4c30541c50b68b84292ab3e3d983
+DIST plasma-workspace-wallpapers-5.4.2.tar.xz 56469976 SHA256 5a82417c6904b0f97c50428d0540bd9895fe3332605b2fabbaebb15665d3efa1 SHA512 68646885624ef677559fd538868968e8f84876f022901bf79de6f5a675a9105a8a0c5d571f9b59e51f73fc31a846ab361f32d063497fb14a01c6829bdd8c23c2 WHIRLPOOL 81459191e6fd16a05ba6bae57006c6ac372fd7b85043440fe54add322ae1af0d873cb58d68fd34b6d590a068bf70b11af1dcdc2065899e88be9f7e4d2651ba9e
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.2.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.2.ebuild
new file mode 100644
index 0000000..42366be
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Additional wallpapers for the Plasma workspace"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep extra-cmake-modules)
+"
+RDEPEND=""
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index bbd761f..09a020b 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1 +1,2 @@
DIST plasma-workspace-5.4.1.tar.xz 6957164 SHA256 6084d5885d815301115dd18d65c739e8968c3feb854f5d052348b5062a381795 SHA512 83ecfa50a6508b76944f0bc334ac64ba88b80a83f543ee6308413259c1dac1a0e3617453c05057586a5ebdc1c80b67eb313edca3b6b33e843a773a197e64afaf WHIRLPOOL a7955bfb24c3e60ae78e6d13180c38c48420413c25a0620850d24e4924c3f4a2b2e99315e2518ee9a7b492f88755059266f2af032e4b8bf19021c024e63ac54a
+DIST plasma-workspace-5.4.2.tar.xz 6959316 SHA256 36c7b04b30533b9b14440b1286f1130222f2212bfa8f2f033a4ff928a923d22f SHA512 48028fea631a8368386768f0ff1acf7717e0cde04a0861109a629bdfa4ce145a4e8abcfeaf486d5176a42a194f688e1503ae37c91ce7dde44df9b325853a74c2 WHIRLPOOL 0420e1f56b54ac27dcea7e5dbad96850a1b0828dfa3977c076f740cd945bd6c9fa45d0adeec2e09f73159c7932029241598e7c8c45f46a215aabf20e1f747fdf
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index 8b5ce50..f81610b 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -4,6 +4,7 @@
<herd>kde</herd>
<use>
<flag name="drkonqi">Enables DrKonqi, the KDE crash handler</flag>
+ <flag name="geolocation">Enables dataengine providing location information</flag>
<flag name="prison">Enable support for barcodes/QRcodes</flag>
<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
<flag name="systemmonitor">Enables the system monitor dialog for the Plasma workspace</flag>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.2.ebuild
new file mode 100644
index 0000000..30668c4
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.2.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5 multilib pam
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus +drkonqi +geolocation gps prison qalculate +systemmonitor"
+
+COMMON_DEPEND="
+ $(add_plasma_dep kwayland)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libkscreen)
+ $(add_plasma_dep libksysguard)
+ $(add_frameworks_dep baloo)
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kdesu)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep kxmlrpcclient)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ dev-libs/wayland
+ dev-qt/qtconcurrent:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5[widgets]
+ dev-qt/qtgui:5[jpeg]
+ dev-qt/qtnetwork:5
+ dev-qt/qtscript:5
+ dev-qt/qtsql:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
+ media-libs/phonon[qt5]
+ sys-libs/pam
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/xcb-util-keysyms
+ dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+ drkonqi? (
+ $(add_frameworks_dep kdewebkit)
+ dev-qt/qtwebkit:5
+ )
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ gps? ( sci-geosciences/gpsd )
+ prison? ( media-libs/prison:5 )
+ qalculate? ( sci-libs/libqalculate )
+ systemmonitor? (
+ $(add_plasma_dep libksysguard processui)
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep milou)
+ dev-qt/qdbus:5
+ dev-qt/qtpaths:5
+ dev-qt/qtquickcontrols:5[widgets]
+ x11-apps/mkfontdir
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ systemmonitor? ( $(add_plasma_dep ksysguard) )
+ !kde-base/freespacenotifier:4
+ !kde-base/libtaskmanager:4
+ !kde-base/kcminit:4
+ !kde-base/kdebase-startkde:4
+ !kde-base/klipper:4
+ !kde-base/krunner:4
+ !kde-base/ksmserver:4
+ !kde-base/ksplash:4
+ !kde-base/plasma-workspace:4
+ !kde-plasma/kio-extras
+"
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.4-consolekit2.patch"
+)
+
+RESTRICT="test"
+
+src_prepare() {
+ # whole patch should be upstreamed, doesn't work in PATCHES
+ epatch "${FILESDIR}/${PN}-tests-optional.patch"
+
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i startkde/startkde.cmake || die
+
+ if ! use drkonqi; then
+ comment_add_subdirectory drkonqi
+ fi
+
+ if ! use geolocation; then
+ punt_bogus_dep KF5 NetworkManagerQt
+ pushd dataengines > /dev/null || die
+ comment_add_subdirectory geolocation
+ popd > /dev/null || die
+ fi
+
+ if ! use systemmonitor; then
+ comment_add_subdirectory systemmonitor
+ pushd applets > /dev/null || die
+ comment_add_subdirectory systemmonitor
+ popd > /dev/null || die
+ pushd dataengines > /dev/null || die
+ comment_add_subdirectory systemmonitor
+ popd > /dev/null || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package dbus dbusmenu-qt5)
+ $(cmake-utils_use_find_package gps libgps)
+ $(cmake-utils_use_find_package prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ newpamd "${FILESDIR}/kde.pam" kde
+ newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/plasma/startup/agent-startup.sh and"
+ elog "${EPREFIX}/etc/plasma/shutdown/agent-shutdown.sh"
+ echo
+}
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index a6ccc78..264f587 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1 +1,2 @@
DIST polkit-kde-agent-1-5.4.1.tar.xz 39496 SHA256 5128354ea066140e10b228b27de22ecfad09c39187cba81eb10c4f9e769b21bc SHA512 92d98794db7c13594d2ac3b618304c0cf155e9965517dcc4939ea9e2cfe9a60ca1481d02f81d068800a5c1ace926a6b67b6f63059377bc0a8338723bd2f46586 WHIRLPOOL 8a288014bebd2de7f4023acff059472ca522a98d1bbfb5595687cee426d4cebd855a70e50d644ace25133c326a6454b65c0016c78159982c5cac249f190cc8cf
+DIST polkit-kde-agent-1-5.4.2.tar.xz 39496 SHA256 b031c11a7a2219da0128137f59fe392ae8c3f916760490b3991be8eb66071f68 SHA512 af886663d1f91b510f9d3b5802798b40ce4d28aadf6696dee41e7bd0f3b80612aa3d2d585995f011a220bc40c869c5343c4feed9b1112ad5f4075dcaef4d748a WHIRLPOOL 8ec26d6d1791cfa0e27b1c33079db10deed258fb424e7a15d91dc44863a5e52da9235536a3b812d8456880ea241773e0cce73a3d68b8cc3c5ab43ed177956c45
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.2.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.2.ebuild
new file mode 100644
index 0000000..22b72fa
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="${PN}-1"
+inherit kde5
+
+DESCRIPTION="PolKit agent module for KDE"
+HOMEPAGE="https://www.kde.org"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ >=sys-auth/polkit-qt-0.112.0[qt5]
+"
+RDEPEND="${DEPEND}
+ !sys-auth/polkit-kde-agent:4[-minimal(-)]
+ !sys-auth/polkit-kde-agent:5
+"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index d249318..935d95b 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1 +1,2 @@
DIST powerdevil-5.4.1.tar.xz 346588 SHA256 709b34fd63455a0f6699c0d10b6d9390b47ce5ed1be95a3658061e0b653c86d0 SHA512 1026b62ce8288ec6f19d082fbeec22dfbb7f6a132e39d5ef4c38cce872390130292ddc4094ec76ab2ef14f9f0127cd5db07dba4a8b285b75723ce4a136f637e5 WHIRLPOOL a0f5c5c3e4bc52610045ae163c52d9a8bf6e2d90fa06689fc9ee841af6c548d41627b62ad43f3157ce43bcadbc8f16feeab8f40dd48094989cabb722ac637147
+DIST powerdevil-5.4.2.tar.xz 346520 SHA256 5caabfe1672fb0d1838eac2b06199465d8bf665c669a0f17d5c6cbed17a81a07 SHA512 5c3141462b320830da01952405d4906b2c2e7aa46c5612d83dd193318a4d4eea599b638b9fc90be58a9e0c4efbf0039431d5b7d05ad00b1150660ed36836483a WHIRLPOOL 2661c8a14a1b5a9aa6aac8b2fd747f135b6d9b9ee27097c53321fc36ce683261e08618e0eab8cb0ec5686275532ae4b634a345c6b6f0347d180a912f3d11bb0e
diff --git a/kde-plasma/powerdevil/powerdevil-5.4.2.ebuild b/kde-plasma/powerdevil/powerdevil-5.4.2.ebuild
new file mode 100644
index 0000000..615361e
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.4.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth policykit)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep libkscreen)
+ $(add_plasma_dep plasma-workspace)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ virtual/libudev:=
+ x11-libs/libxcb
+"
+
+RDEPEND="${DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 )
+ !systemd? ( sys-auth/polkit-pkla-compat )
+ !kde-base/powerdevil:4
+ !kde-base/systemsettings:4[handbook]
+"
+
+src_install() {
+ kde5_src_install
+
+ if ! use systemd ; then
+ insinto /etc/polkit-1/localauthority/10-vendor.d/
+ doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
+ doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
+ doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
+ fi
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ if ! has_version sys-power/upower-pm-utils && ! use systemd ; then
+ ewarn "Suspend and hibernate will not be available as it requires sys-power/upower-pm-utils"
+ ewarn "on non-systemd systems. Please install it if you require this functionality."
+ fi
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index d155ba8..23e9738 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1 +1,2 @@
DIST sddm-kcm-5.4.1.tar.xz 47212 SHA256 140d26d49a24a614a4891e79571f199c45ca59bb707bb147bfb87cb6fcb1fcee SHA512 8d832376c588344931ce15a59996c8b5f29c94d54da3473f938bb728d99f6bff22c845ab36f25ed3bfd3a6f5527eda14e5110895ec0a572839d7ad9d211964a5 WHIRLPOOL ff161c906f81374419fbea131a605f1534a3fd4cf60e1d9f478bea2fddb66e14afe1436f4baf37bd8d2a52fb29e7edc0db4edca69b46a3f653ab544dde0461d9
+DIST sddm-kcm-5.4.2.tar.xz 47496 SHA256 12e80c564b9a951c3f65ccec6174737973de5a6ada4572afcb7338efe915c674 SHA512 5a95626fc7bc4e0f831a0c191441f7389866cf3af9bbddc433301cfb18d8dc4349461f57651173fc0178fae604da32d893c7e96013898106e4a457ce0b155298 WHIRLPOOL 42510257c1b3b2542067c7a04c66cf87503185c98aa7a922ac105264b0ffe3f027b0c65c019fcf67cb5bc4971b2c3832939fe5e6f7ca61e99734d4b6b5ca1cd8
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.4.2.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.4.2.ebuild
new file mode 100644
index 0000000..98794a3
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.4.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE control module for SDDM"
+HOMEPAGE="https://projects.kde.org/projects/kdereview/sddm-kcm"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ dev-qt/qtdeclarative:5[widgets]
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXcursor
+"
+DEPEND="${COMMON_DEPEND}
+ x11-libs/libXfixes
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ x11-misc/sddm
+ !kde-misc/sddm-kcm
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 09e9658..252635a 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1 +1,2 @@
DIST systemsettings-5.4.1.tar.xz 157260 SHA256 b4cc50c424e86d2d34a8215ba5ae2b81fe0218bc1b9e213afa8a8dad1fc14d59 SHA512 d37059dac12c72d7e6437acb5db3c4367834e74f94217b27b995b7cd9749ee89597e8a36af8c5c99bd413e1e945c1afe8a68884c1c3c1cc69c8c78bd3a46c093 WHIRLPOOL 447515b41b6f7dd749ed6ca12642b95ac436f6d5907444bf8ab6e960b32699df4d995b5997c452389d4077f74fd26ff2ab4d7b50f73455c9ccd8dec06e10549c
+DIST systemsettings-5.4.2.tar.xz 157268 SHA256 7a31b58523fe6d9094644026bdd7eca279021b3887949e52f0131fade6580733 SHA512 5956c9ca402e7aeec2638301e334163c8380ac19c7e96f0dbd715782ffc9820df9aa5f33a4a1cb4b2102446e08c7ac7e85cc9a473c1d4d25298dbcf034b4fe58 WHIRLPOOL bcf3e90f2676035252843192a11ea0b2b76cbfd7f532ed02e73ab9128515b14a1b72c5879884c868fc9f0e8008411c752df2d6bfeb1f69a53c76d53560a32789
diff --git a/kde-plasma/systemsettings/systemsettings-5.4.2.ebuild b/kde-plasma/systemsettings/systemsettings-5.4.2.ebuild
new file mode 100644
index 0000000..ea615d7
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.4.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="System settings utility"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+DEPEND="
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep khtml)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+ gtk? ( $(add_plasma_dep kde-gtk-config) )
+ !kde-base/systemsettings:4
+"
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 1154457..586d04f 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1 +1,2 @@
DIST user-manager-5.4.1.tar.xz 55080 SHA256 977d2df4262b81f7aa405dc306cadde7ad4039590b2f29f31bc904da5b5a59a7 SHA512 070a6e560b5e6a72efb2564ec135ba5f695869c0a7fbb31efdd3a4ae1e3c61bb1d23f0e6f6df320919069911636ab06b8a62560e30776a6333958cd1455df875 WHIRLPOOL d2e93af0cb3a511e61f7f5fb4cf000bb1e1bd70150d353cca541ed335a51f78701f81820c0b6c40b39b75551b3b23f7dea0e5ec1f1143166d342da49e6313097
+DIST user-manager-5.4.2.tar.xz 55084 SHA256 f5d34359134eb0687a5ec60d8888246242e7d3fccbb78a90231239ea7c297dc6 SHA512 28bd727474e0b96cfda4ca3c8d79dd777d100ed4f0aa590686b4acf6dc0ff59ec9932090da6cffb23c4e90b0085bee6004f403456defcd156a49fff70d41eb04 WHIRLPOOL 48c68273b93008426dff43ccc5d63fc09ffa57df64a06757e7ca6bac2f7f890467267eb81502c6d466b3443ef6a544656d311e2f574d3ed48db1698a7878d3cd
diff --git a/kde-plasma/user-manager/user-manager-5.4.2.ebuild b/kde-plasma/user-manager/user-manager-5.4.2.ebuild
new file mode 100644
index 0000000..4c3aabd
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.4.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Simple system settings module to manage the users of your system"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-libs/libpwquality
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
diff --git a/licenses/Google-TOS b/licenses/Google-TOS
index c50b61c..694bffb 100644
--- a/licenses/Google-TOS
+++ b/licenses/Google-TOS
@@ -7,11 +7,11 @@
[3]Skip to content
- 1. [4]Overview
- 2. Terms of Service
+ 1. [4]Overview
+ 2. Terms of Service
- * Terms of Service
- * [5]Updates
+ * Terms of Service
+ * [5]Updates
Google Terms of Service
@@ -249,30 +249,30 @@
Good to Know
- * Our Good to Know site helps you stay safe and protect your family’s
+ * Our Good to Know site helps you stay safe and protect your family’s
information online. [11]Visit to learn more
Our legal policies
- * [12]Privacy Policy
- * Terms of Service
- * [13]FAQ
+ * [12]Privacy Policy
+ * Terms of Service
+ * [13]FAQ
Some technical details
- * [14]Technologies and Principles
- * [15]Advertising
- * [16]How Google uses cookies
- * [17]How Google uses pattern recognition
- * [18]Types of location data used by Google
- * [19]How Google Wallet uses credit card numbers
- * [20]How Google Voice works
+ * [14]Technologies and Principles
+ * [15]Advertising
+ * [16]How Google uses cookies
+ * [17]How Google uses pattern recognition
+ * [18]Types of location data used by Google
+ * [19]How Google Wallet uses credit card numbers
+ * [20]How Google Voice works
Change language: [[21]________________________]
- * [22]Google
- * [23]About Google
- * [24]Privacy & Terms
+ * [22]Google
+ * [23]About Google
+ * [24]Privacy & Terms
References
diff --git a/licenses/OAL-1.0.1 b/licenses/OAL-1.0.1
index 03f93ca..b9a2371 100644
--- a/licenses/OAL-1.0.1
+++ b/licenses/OAL-1.0.1
@@ -103,7 +103,7 @@
the identity of the Original Author; (3) the title of the work (at
Original Author's option); and (4) how the first listed Original
Author may be contacted (at Original Author's option).
-Ê
+
Where a common, widely-adopted method for attribution is available
(such as ID3 tagging for MP3 files), Original Author attribution
should be implemented using the common, widely-adopted method. In
diff --git a/licenses/RTCW-ETEULA b/licenses/RTCW-ETEULA
index 61d40eb..0d72c9f 100644
--- a/licenses/RTCW-ETEULA
+++ b/licenses/RTCW-ETEULA
@@ -20,7 +20,7 @@
f. in any other manner and through any medium whatsoever commercially exploit the Software, or use the Software for any commercial purpose, including, without limitation, giving away copies of the Software for free to promote or market any other material;
-g. disassemble, reverse engineer, decompile, modify, except as permitted by section 2 hereinabove, or alter the Software;
+g. disassemble, reverse engineer, decompile, modify, except as permitted by section 2 hereinabove, or alter the Software;
h. translate the Software;
@@ -34,9 +34,9 @@
4. Permitted Distribution and Copying. So long as this Agreement accompanies each copy you make of the Software and so long as you fully comply at all times with this Agreement, ID grants to you the non-exclusive and limited right to: (i) copy the Software from the download onto your computer hard drive; (ii) copy the Software from your computer hard drive into your computer RAM; (iii) copy on one (1) hard disk one (1) "back up" or archival copy of the Software; and (iv) copy the Software and distribute such copies as standalone copies on physical media or in electronic format of the Software free of charge for non-commercial purposes and not in connection with any other material. You shall not distribute copies of the Software as mounted on or attached to the covers or any other part of magazines or other printed material. You shall not copy or distribute the Software in any manner that infringes against, misappropriates or otherwise violates any third-party right or that is libelous, defamatory, obscene, false, misleading, or otherwise illegal or unlawful. You shall not receive any postage, shipping, handling or other charge, payment, fee, or other consideration, including items in trade, in exchange for or in connection with copies of Software you may distribute, even if only for reimbursement. You shall not receive any value or consideration in exchange for or in connection with copies of the Software you may distribute. You shall not distribute the Software bundled, co-packaged or together with any material. You shall not distribute the Software in connection with the promotion or marketing of any material. Except as such are included by ID within copies of the Software that you are permitted to make under this Agreement, you shall not reproduce, depict, display or copy the title of the Software, the ID name or any screen display or other element or part of the Software. In exercising your limited rights hereunder, you shall comply, at all times, with all applicable laws, regulations, ordinances and statutes. ID reserves all rights not granted in this Agreement. You shall not commercially distribute the Software unless you first enter into a separate contract with ID, on terms and conditions determined in ID's sole discretion, and only upon your receipt of a written agreement executed by an authorized officer of ID.
-5. Intellectual Property Rights. The Software and all copyrights, trademarks and all other conceivable intellectual property rights related to the Software are owned by ID and are protected by United States copyright laws, international treaty provisions and all applicable law, such as the Lanham Act. You must treat the Software like any other copyrighted material, as required by 17 U.S.C. § 101 et seq. and other applicable law. You agree to use your best efforts to see that any user of the Software licensed hereunder, or the New Creations, complies with this Agreement. You agree that you are receiving a copy of the Software by limited license only and not by sale and that the "first sale" doctrine of 17 U.S.C. § 109 does not apply to your receipt or use of the Software. This section shall survive the cancellation or termination of this Agreement.
+5. Intellectual Property Rights. The Software and all copyrights, trademarks and all other conceivable intellectual property rights related to the Software are owned by ID and are protected by United States copyright laws, international treaty provisions and all applicable law, such as the Lanham Act. You must treat the Software like any other copyrighted material, as required by 17 U.S.C. § 101 et seq. and other applicable law. You agree to use your best efforts to see that any user of the Software licensed hereunder, or the New Creations, complies with this Agreement. You agree that you are receiving a copy of the Software by limited license only and not by sale and that the "first sale" doctrine of 17 U.S.C. § 109 does not apply to your receipt or use of the Software. This section shall survive the cancellation or termination of this Agreement.
-6. NO ID WARRANTIES. ID DISCLAIMS , AND ITS LICENSEE'S (INCLUDING, WITHOUT LIMITATION, ACTIVISION INC. AND ITS AFFILIATES) DISCLAIM, ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY WARRANTY OF NON-INFRINGEMENT, WITH RESPECT TO THE SOFTWARE, THE SOFTWARE IMAGES AND OTHERWISE. THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY. ID DOES NOT (AND ITS LICENSEES DO NOT) WARRANT THAT THE SOFTWARE OR THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE WILL MEET YOUR SPECIFIC OR SPECIAL REQUIREMENTS. ADDITIONAL STATEMENTS, WHETHER ORAL OR WRITTEN, DO NOT CONSTITUTE WARRANTIES BY ID (OR ANY ID LICENSEE) AND SHOULD NOT BE RELIED UPON. THIS SECTION SHALL SURVIVE THE CANCELLATION OR TERMINATION OF THIS AGREEMENT.
+6. NO ID WARRANTIES. ID DISCLAIMS , AND ITS LICENSEE'S (INCLUDING, WITHOUT LIMITATION, ACTIVISION INC. AND ITS AFFILIATES) DISCLAIM, ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY WARRANTY OF NON-INFRINGEMENT, WITH RESPECT TO THE SOFTWARE, THE SOFTWARE IMAGES AND OTHERWISE. THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY. ID DOES NOT (AND ITS LICENSEES DO NOT) WARRANT THAT THE SOFTWARE OR THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE WILL MEET YOUR SPECIFIC OR SPECIAL REQUIREMENTS. ADDITIONAL STATEMENTS, WHETHER ORAL OR WRITTEN, DO NOT CONSTITUTE WARRANTIES BY ID (OR ANY ID LICENSEE) AND SHOULD NOT BE RELIED UPON. THIS SECTION SHALL SURVIVE THE CANCELLATION OR TERMINATION OF THIS AGREEMENT.
7. Governing Law, Venue, Indemnity and Liability Limitation. This Agreement shall be construed in accordance with and governed by the applicable laws of the State of Texas and applicable United States federal law. Exclusive venue for all litigation regarding this Agreement shall be in Dallas County, Texas, and you agree to submit to the jurisdiction of the federal and state courts in Dallas County, Texas, for any such litigation. You hereby agree to indemnify, defend and hold harmless ID and ID's officers, employees, directors, agents, licensees (excluding you), sub-licensees (excluding you), successors and assigns from and against all losses, lawsuits, damages, causes of action and claims relating to and/or arising from the New Creations or the distribution or other use of the New Creations or relating to and/or arising from your breach of this Agreement. You agree that your unauthorized use of the Software Images, or the Software, or any part thereof, immediately and irreparably will damage ID such that ID could not be compensated adequately solely by a monetary award, and upon such actual or threatened unauthorized use, at ID's option, that ID shall be entitled to an injunctive order, in addition to all other available remedies, including a monetary award, to prohibit such unauthorized use without the necessity of ID posting bond or other security. IN ANY CASE, ID, AND ID'S OFFICERS, EMPLOYEES, DIRECTORS, SHAREHOLDERS, REPRESENTATIVES, AGENTS, LICENSEES (EXCLUDING YOU), SUBLICENSEES (EXCLUDING YOU), SUCCESSORS AND ASSIGNS SHALL NOT BE LIABLE FOR ANY CLAIM BY ANY THIRD PARTY OR FOR ANY LOSS OF DATA, LOSS OF PROFITS, LOST SAVINGS, SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT OR PUNITIVE DAMAGES OR ANY OTHER DAMAGES ARISING FROM ANY ALLEGED CLAIM FOR BREACH OF WARRANTY, BREACH OF CONTRACT, NEGLIGENCE, STRICT PRODUCT LIABILITY, OR OTHER LEGAL THEORY EVEN IF ID OR ID'S REPRESENTATIVES HAVE BEEN ADVISED OF THE POSSIBILITY OF ANY SUCH DAMAGES, OR EVEN IF SUCH DAMAGES ARE FORESEEABLE. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so the above limitation or exclusion may not apply to you. This section shall survive the cancellation or termination of this Agreement.
diff --git a/licenses/WPS-EULA b/licenses/WPS-EULA
index b5fe974..aa9f473 100644
--- a/licenses/WPS-EULA
+++ b/licenses/WPS-EULA
@@ -6,7 +6,7 @@
The EULA is a legal agreement entered into between you and Kingsoft regarding the "Product". The "Product" includes computer software and any associated documents and printed materials. Before first using the "Product", you shall agree to all the terms of the EULA. If there is any disagreement, please uninstall the "Product" and do not use the "Product" in any way.
-The "Product" is protected by copyright laws, international copyright treaties and other related laws and treaties. The "Product" is licensed, not sold.
+The "Product" is protected by copyright laws, international copyright treaties and other related laws and treaties. The "Product" is licensed, not sold.
1. Kingsoft grants you a nonexclusive license to the "Product" in the territorial scope of the world. You are entitled to:
1) Install, use, display and run (collectively referred as to "run") a copy of the "Product" on one computer based on Linux system;
@@ -32,7 +32,7 @@
3. You may make a one-time permanent assignment of the "Product" accompanied by the EULA to a third party, provided that the following conditions shall be wholly satisfied:
1) The whole and complete "Product" (including but not limited to computer software and any associated documents and printed materials) are assigned.
2) Any assignment comprises all former editions of the "Product", if the "Product" is an upgraded edition.
-3) You retain no copies of the "Product" .
+3) You retain no copies of the "Product" .
4) Your license is terminated upon the assignment.
5) The third party receiving the "Product" agrees to all the terms of the EULA.
diff --git a/licenses/WebStorm_Academic b/licenses/WebStorm_Academic
index f2827d4..35ca7f3 100644
--- a/licenses/WebStorm_Academic
+++ b/licenses/WebStorm_Academic
@@ -65,7 +65,7 @@
8. UPGRADES
-(a) All generally available Upgrades to the Software will be free of charge to Licensee during the initial one (1) year period after purchase of the Software. If Licensee obtains a new License Key for upgrade, Licensee shall destroy a License Key obtained for the previous version of the Software.
+(a) All generally available Upgrades to the Software will be free of charge to Licensee during the initial one (1) year period after purchase of the Software. If Licensee obtains a new License Key for upgrade, Licensee shall destroy a License Key obtained for the previous version of the Software.
(b) If not agreed otherwise in writing between Licensor and Licensee, upon upgrading to new version of Software the relationship between parties shall be governed and amended (if applicable) by the terms and conditions of Licensee agreement related to Software available at www.jetbrains.com on the day of upgrade purchase.
diff --git a/licenses/abyss b/licenses/abyss
index 787bc86..8e9f366 100644
--- a/licenses/abyss
+++ b/licenses/abyss
@@ -98,7 +98,7 @@
acquired by or licensed to BCCA. You will take all reasonable
precautions necessary to safeguard the confidentiality of the
Product, and will not disclose any information about the Product to
- any other person without BCCA¡Çs prior written consent. You will
+ any other person without BCCA's prior written consent. You will
not allow the removal or defacement of any confidential or
proprietary notice placed on the Product. You acknowledge that any
breach of this Section 6 will cause irreparable harm to BCCA and
@@ -136,12 +136,12 @@
9. INDEMNITY: You will indemnify, defend and hold harmless BCCA, its
board of directors, staff and agents from and against any and all
liability, loss, damage, action, claim or expense (including
- attorney¡Çs fees and costs at trial and appellate levels) in
+ attorney's fees and costs at trial and appellate levels) in
connection with any claim, suit, action, demand or judgement
(collectively, "Claim") arising out of, connected with, resulting
from, or sustained as a result of Your use of the Product or the
downloading of the Product, including without limitation, any Claim
- relating to infringement of BCCA¡Çs intellectual property rights or
+ relating to infringement of BCCA's intellectual property rights or
the intellectual property rights of any third party.
10. SUPPORT AND MAINTENANCE: You acknowledge and agree that, unless
diff --git a/licenses/bea.ri.jsr173 b/licenses/bea.ri.jsr173
index 3da20e2..db026f5 100644
--- a/licenses/bea.ri.jsr173
+++ b/licenses/bea.ri.jsr173
@@ -26,12 +26,12 @@
1.8. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent for which the grantor has the right to grant a license.
-1.9. “Reference Implementation” means the prototype or “proof of concept” implementation of the Specification developed and made available for license by or on behalf of BEA.
+1.9. “Reference Implementation” means the prototype or “proof of concept” implementation of the Specification developed and made available for license by or on behalf of BEA.
1.10. "Source Code" means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated documentation, interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice.
1.11. “Specification” means the written specification for the Streaming API for XML , Java technology developed pursuant to the Java Community Process.
-1.12. "Technology Compatibility Kit" or “TCK” means the documentation, testing tools and test suites associated with the Specification as may be revised by BEA from time to time, that is provided so that an implementer of the Specification may determine if its implementation is compliant with the Specification.
+1.12. "Technology Compatibility Kit" or “TCK” means the documentation, testing tools and test suites associated with the Specification as may be revised by BEA from time to time, that is provided so that an implementer of the Specification may determine if its implementation is compliant with the Specification.
1.13. "You" (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this Agreement or a future version of this Agreement issued under Section 6.1. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
diff --git a/licenses/ipw2200-fw b/licenses/ipw2200-fw
index fa26c67..1e219ca 100644
--- a/licenses/ipw2200-fw
+++ b/licenses/ipw2200-fw
@@ -101,7 +101,7 @@
Intel. No failure or delay in exercising any right, power, or remedy under
this Agreement shall operate as a waiver of any such right, power or remedy.
Without limiting the foregoing, terms and conditions on any purchase orders or
-similar materials submitted by you to Intel, and any terms contained in Intels
+similar materials submitted by you to Intel, and any terms contained in Intel's
standard acknowledgment form that are in conflict with these terms, shall be of
no force or effect.
diff --git a/mail-client/alpine/alpine-2.00-r6.ebuild b/mail-client/alpine/alpine-2.00-r6.ebuild
new file mode 100644
index 0000000..d4855a9
--- /dev/null
+++ b/mail-client/alpine/alpine-2.00-r6.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils flag-o-matic autotools multilib toolchain-funcs
+
+CHAPPA_PL=115
+DESCRIPTION="alpine is an easy to use text-based based mail and news client"
+HOMEPAGE="http://www.washington.edu/alpine/ http://patches.freeiz.com/alpine/"
+SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2
+ chappa? ( http://patches.freeiz.com/alpine/patches/alpine-2.00/all.patch.gz
+ -> ${P}-chappa-${CHAPPA_PL}-all.patch.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads topal +chappa"
+
+DEPEND="virtual/pam
+ >=net-libs/c-client-2007f-r4[topal=,chappa=]
+ >=sys-libs/ncurses-5.1
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ ldap? ( net-nds/openldap )
+ kerberos? ( app-crypt/mit-krb5 )
+ spell? ( app-text/aspell )
+ topal? ( >=net-mail/topal-72 )"
+RDEPEND="${DEPEND}
+ app-misc/mime-types
+ !onlyalpine? ( !mail-client/pine )
+ !<=net-mail/uw-imap-2004g"
+
+pkg_setup() {
+ if use smime && use topal ; then
+ ewarn "You can not have USE='smime topal'. Assuming topal is more important."
+ fi
+}
+
+src_prepare() {
+ use chappa && epatch "${DISTDIR}/${P}-chappa-${CHAPPA_PL}-all.patch.gz"
+ use topal && epatch /usr/share/topal/patches/"${P}".patch-{1,2}
+
+ # do not use the bundled c-client
+ ebegin "Unbundling the c-client library"
+ rm -rf "${S}"/imap
+ local f
+ while read f ; do
+ sed -i -e \
+ 's~^#include[[:blank:]]".*/c-client/\(.*\)"~#include <imap/\1>~g' "$f"
+ done < <(find "${S}" -name "*.c" -o -name "*.h")
+ eend $?
+
+ epatch "${FILESDIR}"/2.00-lpam.patch
+ epatch "${FILESDIR}"/2.00-lcrypto.patch
+ epatch "${FILESDIR}"/2.00-c-client.patch
+ epatch "${FILESDIR}"/2.00-qa.patch
+ use chappa && epatch "${FILESDIR}/2.00-qa-chappa-${CHAPPA_PL}.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf="--without-tcl
+ --with-system-pinerc=/etc/pine.conf
+ --with-system-fixed-pinerc=/etc/pine.conf.fixed"
+ #--disable-debug"
+ # fixme
+ # --with-system-mail-directory=DIR?
+
+ if use ssl; then
+ myconf+=" --with-ssl
+ --with-ssl-include-dir=/usr
+ --with-ssl-lib-dir=/usr/$(get_libdir)
+ --with-ssl-certs-dir=/etc/ssl/certs"
+ else
+ myconf+="--without-ssl"
+ fi
+ econf \
+ $(use_with ldap) \
+ $(use_with passfile passfile .pinepwd) \
+ $(use_with kerberos krb5) \
+ $(use_with threads pthread) \
+ $(use_with spell interactive-spellcheck /usr/bin/aspell) \
+ $(use_enable nls) \
+ $(use_with ipv6) \
+ $(use topal || use_with smime) \
+ ${myconf}
+}
+
+src_compile() {
+ emake AR=$(tc-getAR)
+}
+
+src_install() {
+ if use onlyalpine ; then
+ dobin alpine/alpine
+ doman doc/alpine.1
+ else
+ emake DESTDIR="${D}" install
+ doman doc/rpdump.1 doc/rpload.1
+ fi
+
+ dodoc NOTICE README*
+
+ if use doc ; then
+ dodoc doc/brochure.txt doc/tech-notes.txt
+
+ docinto html/tech-notes
+ dohtml -r doc/tech-notes/
+ fi
+}
diff --git a/mail-client/balsa/balsa-2.5.2-r1.ebuild b/mail-client/balsa/balsa-2.5.2-r1.ebuild
new file mode 100644
index 0000000..97b19fd
--- /dev/null
+++ b/mail-client/balsa/balsa-2.5.2-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Email client for GNOME"
+HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
+SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE="crypt gnome gtkhtml gnome-keyring +gtkspell kerberos ldap libnotify libressl rubrica sqlite ssl webkit xface"
+REQUIRED_USE="gtkhtml? ( !webkit )"
+
+# TODO: esmtp can be optional, do we want it?
+RDEPEND="
+ >=dev-libs/glib-2.32:2
+ >=x11-libs/gtk+-3.4.0:3
+ dev-libs/gmime:2.6
+ >=net-libs/libesmtp-1.0.3:=
+ net-mail/mailbase
+ media-libs/libcanberra:=[gtk3]
+ x11-themes/hicolor-icon-theme
+ x11-themes/gnome-icon-theme
+ crypt? ( >=app-crypt/gpgme-1.0:= )
+ gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 )
+ gnome-keyring? ( app-crypt/libsecret )
+ gtkhtml? ( gnome-extra/gtkhtml:4.0 )
+ sqlite? ( >=dev-db/sqlite-2.8:= )
+ libnotify? ( >=x11-libs/libnotify-0.7:= )
+ gtkspell? ( >=app-text/gtkspell-3.0.3:3 )
+ !gtkspell? ( app-text/enchant )
+ kerberos? ( app-crypt/mit-krb5 )
+ ldap? ( net-nds/openldap )
+ rubrica? ( dev-libs/libxml2:2 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ webkit? ( net-libs/webkit-gtk:4 )
+ xface? ( >=media-libs/compface-1.5.1:= )
+"
+DEPEND="${RDEPEND}
+ app-text/yelp-tools
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext
+"
+
+src_prepare() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=750516
+ sed -i -e 's/@TOOLKIT_CATEGORIES@//' balsa-mailto-handler.desktop.in.in || die
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=750515
+ echo "src/balsa-print-object.c" >> po/POTFILES.in || die
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf
+
+ if use crypt ; then
+ myconf+=" --with-gpgme=gpgme-config"
+ else
+ myconf+=" --without-gpgme"
+ fi
+
+ if use webkit || use gtkhtml; then
+ if use gtkhtml ; then
+ myconf+=" --with-html-widget=gtkhtml4"
+ else
+ myconf+=" --with-html-widget=webkit2"
+ fi
+ else
+ myconf+=" --with-html-widget=no"
+ fi
+
+ gnome2_src_configure \
+ --disable-pcre \
+ --enable-gregex \
+ --enable-threads \
+ --with-gmime=2.6 \
+ --with-canberra \
+ $(use_with gnome) \
+ $(use_with gnome gtksourceview) \
+ $(use_with gnome-keyring libsecret) \
+ $(use_with gtkspell) \
+ $(use_with kerberos gss) \
+ $(use_with ldap) \
+ $(use_with libnotify) \
+ $(use_with rubrica) \
+ $(use_with sqlite) \
+ $(use_with ssl) \
+ $(use_with xface compface) \
+ ${myconf}
+}
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 9b6e304..8038f18 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,5 +1,6 @@
DIST claws-mail-3.10.1.tar.xz 6669376 SHA256 4cb7c42995b1a5d7567a0909ce2080c05eec74a4d966da7a7a872f5eba018459 SHA512 b001683522a9a2bb9b1680f8ff608172a3fe9c4f556c8aa818b4259801bc92f722093850218377aba3a5fe549f0f09164c2e7623042bca0dbf3fd1071436dc80 WHIRLPOOL 0bcf92138081cd6fe0bef18a85acc9939fe61ab87faafc27a0ded24e321b4a35c0a1f6736aee6b0eef7d2d451c037cddcb280fece1a1c38c2e8f20c45ef685f7
DIST claws-mail-3.11.1.tar.xz 6908772 SHA256 d72381b6c9f872638cae2c208925e19bd5d4a9476bb9049742f1ba27c3efd133 SHA512 ae4f0d4299647e201e94111a6eb26cce1d6a72045c317b879a07847cfcc75c35dfdf571f2826d365800586f5798131ce95985f746f7dbdd878f3766370ab3570 WHIRLPOOL 3ddf72a97990e087cd0c8a0417d6f57ee607e62bc5d644c6fb1892f349e9646a76664888a4540b6d22f5afe065e6e1e58d63188387cc829fda6fefe55ea4183d
DIST claws-mail-3.12.0.tar.xz 6615768 SHA256 272ad6aaa066a4f5e0f26ed151b23b836a65190e6b45c049479b5e7677e4d6ca SHA512 f6eb3eb9f252f93aab21305118eca34abab3a75abb6619a7ab4a79338a640de6012eeb9ffb4a1317cc3c1abfc830b8399e82a93b430aa72c131e14f9f630b321 WHIRLPOOL 202da4117b2678a55b06f97b83e2d267719f1dcadcac5d09c1f0224409c53e2a19b6a8c0eea4d5762348c1c9f206a657496c4efb72aa9bc363e25662f21a63ab
+DIST claws-mail-3.13.0.tar.xz 6582288 SHA256 365076806c63dd8a1d6f08ead6a863a01ba05819c1a860ea7bbee8fcda4bf93a SHA512 5682a5e4642870a69374dc304d446db9dfd427bf8bd6f924a1193366098e07ca63623caefa454d62b413b8bb614fc7f1c0853852a1c44908c8541e554f3439e2 WHIRLPOOL 09a1bdcd5ba34a8cc359ec9659e54b3958c59f939b1eca36489b1db3163cb9cedb70c478896e769563781cd2044aaa90ece3c00d6dc90f1ea3533f884ec5999f
DIST claws-mail-3.9.0.tar.bz2 7425870 SHA256 ed70975a5056b3ffc4fe6e977f0d9606febc1499763c090241b029a73ff24e65 SHA512 5cb17106fee4549464eca03c8630fa4c46ee7b236c51eefbeb00f8a3602937cbe6073617f47a94732983ec3bc8838bc80e567f2e55cce1b30db453f350f590e8 WHIRLPOOL 4f2bef9d2240037eb6fd9b62b48c7173fddbd4fcb7258d4c5e0ee0e322894d741532c2ad716fbac96e465f87fe428fa6e926a04e7e8de1beaf68b8cb0a12c9a4
DIST claws-mail-3.9.3.tar.bz2 9463943 SHA256 53aacceab45af6c3ee1f0668956a6e3328d21ac4efcfc0aa8dfd7d7552a62372 SHA512 b9e7a686650bfc496bf7e6b8ca196a890e3c5b2cbce486f7940245e42dc7a9fc53d81f688d88e298f310fd71e378ea4ea29a57c8510cccb6312d4ba1c79e3d42 WHIRLPOOL 58a7c431e214e82f6629e881eaf04b8f587f5aab1f5e990f9e20dff875821e1b0e8e7c0ab7ab47329f20a2e384dd203ea8b3afbe58175f3a48c963917311359e
diff --git a/mail-client/claws-mail/claws-mail-3.13.0.ebuild b/mail-client/claws-mail/claws-mail-3.13.0.ebuild
new file mode 100644
index 0000000..fc78b6d
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.13.0.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib gnome2-utils eutils python-single-r1
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org/"
+
+SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
+REQUIRED_USE="libcanberra? ( notification )
+ libindicate? ( notification )
+ libnotify? ( notification )
+ networkmanager? ( dbus )
+ smime? ( pgp )"
+
+# Plugins are all integrated or dropped since 3.9.1
+PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
+ !!mail-client/claws-mail-archive
+ !!mail-client/claws-mail-att-remover
+ !!mail-client/claws-mail-attachwarner
+ !!mail-client/claws-mail-clamd
+ !!mail-client/claws-mail-fancy
+ !!mail-client/claws-mail-fetchinfo
+ !mail-client/claws-mail-gdata
+ !!mail-client/claws-mail-geolocation
+ !!mail-client/claws-mail-gtkhtml
+ !!mail-client/claws-mail-mailmbox
+ !!mail-client/claws-mail-newmail
+ !!mail-client/claws-mail-notification
+ !!mail-client/claws-mail-perl
+ !!mail-client/claws-mail-python
+ !!mail-client/claws-mail-rssyl
+ !!mail-client/claws-mail-spam-report
+ !!mail-client/claws-mail-tnef-parse
+ !!mail-client/claws-mail-vcalendar
+ !!mail-client/claws-mail-address_keeper
+ !!mail-client/claws-mail-pdf-viewer"
+
+COMMONDEPEND=">=sys-devel/gettext-0.12.1
+ gdata? ( >=dev-libs/libgdata-0.17.1 )
+ gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( >=x11-libs/gtk+-2.20:2 )
+ pda? ( >=app-pda/jpilot-0.99 )
+ gnutls? ( >=net-libs/gnutls-2.2.0 )
+ ldap? ( >=net-nds/openldap-2.0.7 )
+ pgp? ( >=app-crypt/gpgme-0.4.5 )
+ valgrind? ( dev-util/valgrind )
+ dbus? ( >=dev-libs/dbus-glib-0.60 )
+ spell? ( >=app-text/enchant-1.0.0 )
+ imap? ( >=net-libs/libetpan-0.57 )
+ nntp? ( >=net-libs/libetpan-0.57 )
+ startup-notification? ( x11-libs/startup-notification )
+ session? ( x11-libs/libSM
+ x11-libs/libICE )
+ archive? ( app-arch/libarchive
+ >=net-misc/curl-7.9.7 )
+ bogofilter? ( mail-filter/bogofilter )
+ notification? (
+ libnotify? ( x11-libs/libnotify )
+ libcanberra? ( media-libs/libcanberra[gtk] )
+ libindicate? ( dev-libs/libindicate:3[gtk] )
+ dev-libs/glib:2
+ )
+ smime? ( >=app-crypt/gpgme-0.4.5 )
+ calendar? ( >=net-misc/curl-7.9.7 )
+ pdf? ( app-text/poppler:=[cairo] )
+ spam-report? ( >=net-misc/curl-7.9.7 )
+ webkit? ( >=net-libs/webkit-gtk-1.0:2
+ >=net-libs/libsoup-gnome-2.26:2.4 )
+"
+
+DEPEND="${PLUGINBLOCK}
+ ${COMMONDEPEND}
+ app-arch/xz-utils
+ xface? ( >=media-libs/compface-1.4 )
+ virtual/pkgconfig"
+
+RDEPEND="${COMMONDEPEND}
+ pdf? ( app-text/ghostscript-gpl )
+ clamav? ( app-antivirus/clamav )
+ networkmanager? ( net-misc/networkmanager )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS}
+ >=dev-python/pygtk-2.10.3 )
+ rss? ( net-misc/curl
+ dev-libs/libxml2 )
+ app-misc/mime-types
+ x11-misc/shared-mime-info"
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug crash-dialog)
+ $(use_enable valgrind valgrind)
+ $(use_enable doc manual)
+ $(use_enable gtk3)
+ $(use_enable ipv6)
+ $(use_enable ldap)
+ $(use_enable dbus dbus)
+ $(use_enable networkmanager)
+ $(use_enable pda jpilot)
+ $(use_enable session libsm)
+ $(use_enable spell enchant)
+ $(use_enable gnutls)
+ $(use_enable startup-notification)
+ $(use_enable xface compface)
+ $(use_enable archive archive-plugin)
+ $(use_enable bogofilter bogofilter-plugin)
+ $(use_enable calendar vcalendar-plugin)
+ $(use_enable clamav clamd-plugin)
+ $(use_enable gdata gdata-plugin)
+ $(use_enable notification notification-plugin)
+ $(use_enable pdf pdf_viewer-plugin)
+ $(use_enable perl perl-plugin)
+ $(use_enable pgp pgpmime-plugin)
+ $(use_enable pgp pgpinline-plugin)
+ $(use_enable pgp pgpcore-plugin)
+ $(use_enable python python-plugin)
+ $(use_enable rss rssyl-plugin)
+ $(use_enable spamassassin spamassassin-plugin)
+ $(use_enable sieve managesieve-plugin)
+ $(use_enable smime smime-plugin)
+ $(use_enable spam-report spam_report-plugin)
+ $(use_enable webkit fancy-plugin)
+ --enable-new-addrbook
+ --enable-nls
+ --enable-acpi_notifier-plugin
+ --enable-address_keeper-plugin
+ --enable-att_remover-plugin
+ --enable-attachwarner-plugin
+ --enable-fetchinfo-plugin
+ --enable-mailmbox-plugin
+ --enable-newmail-plugin
+ --enable-tnef_parse-plugin
+ --disable-generic-umpc
+ --disable-bsfilter-plugin
+ )
+
+ # libetpan is needed if user wants nntp or imap functionality
+ if use imap || use nntp; then
+ myeconfargs+=( --enable-libetpan )
+ else
+ myeconfargs+=( --disable-libetpan )
+ fi
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+ autotools-utils_src_install
+
+ # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+ # => also install it in /usr/share/pixmaps for other desktop envs
+ # => also install higher resolution icons in /usr/share/icons/hicolor/...
+ insinto /usr/share/pixmaps
+ doins ${PN}.png
+ local res resdir
+ for res in 64x64 128x128 ; do
+ resdir="/usr/share/icons/hicolor/${res}/apps"
+ insinto ${resdir}
+ newins ${PN}-${res}.png ${PN}.png
+ done
+
+ docinto tools
+ dodoc tools/README*
+
+ domenu ${PN}.desktop
+
+ einfo "Installing extra tools"
+ cd "${S}"/tools
+ exeinto /usr/$(get_libdir)/${PN}/tools
+ doexe *.pl *.py *.conf *.sh
+ doexe tb2claws-mail update-po uudec uuooffice
+
+ # kill useless files
+ rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+ ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+ ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+ ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/mail-client/mail-notification/mail-notification-5.4-r9.ebuild b/mail-client/mail-notification/mail-notification-5.4-r9.ebuild
new file mode 100644
index 0000000..6458da6
--- /dev/null
+++ b/mail-client/mail-notification/mail-notification-5.4-r9.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="Status icon informing about new mail"
+HOMEPAGE="http://www.nongnu.org/mailnotify/ https://github.com/epienbroek/mail-notification"
+
+GIT_REVISION="eab5c13" # Same as Fedora
+SRC_URI="https://github.com/epienbroek/${PN}/tarball/${GIT_REVISION} -> ${PN}-${GIT_REVISION}.tar.gz"
+S="${WORKDIR}/epienbroek-${PN}-${GIT_REVISION}"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-linux"
+SLOT="0"
+LICENSE="GPL-3"
+IUSE="+gnome-keyring libressl sasl +sound ssl sylpheed"
+
+LANGS="bg ca cs de es fr ja nl pl pt pt_BR ru sr sr@Latn sv"
+for lang in ${LANGS}; do
+ IUSE+=" linguas_${lang}"
+done
+
+# gmime is actually optional, but it's used by so much of the package
+# it's pointless making it optional. gnome-keyring is required for
+# several specific access methods, and thus linked to those USE flags
+# instead of adding a keyring USE flag.
+RDEPEND="
+ x11-libs/gtk+:3
+ >=dev-libs/glib-2.14:2
+ >=gnome-base/gconf-2.6
+ >=gnome-base/libgnomeui-2.14
+ dev-libs/dbus-glib
+ dev-libs/gmime:2.6
+ >=x11-libs/libnotify-0.4.1
+ gnome-keyring? ( gnome-base/libgnome-keyring )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ sound? ( media-libs/gstreamer:0.10 )
+ sylpheed? ( mail-client/sylpheed )
+"
+DEPEND="${RDEPEND}
+ app-text/scrollkeeper
+ dev-util/gob
+ sys-devel/gettext
+ virtual/pkgconfig
+ >=dev-util/intltool-0.35.0
+"
+# this now uses JB (the Jean-Yves Lefort's Build System) as a build system
+# instead of autotools, this is a little helper function that basically does
+# the same thing as use_enable
+use_var() {
+ echo "${2:-$1}=$(usex $1)"
+}
+
+src_prepare() {
+ sed -i -e '/jb_rule_set_install_message/d' \
+ -e '/jb_rule_add_install_command/d' \
+ jbsrc/jb.c || die
+
+ # Ensure we never append -Werror
+ sed -i -e 's/ -Werror//' jb jbsrc/jb.c || die
+
+ # We are not Ubuntu, and this could be the cause of #215281
+ epatch "${FILESDIR}/${P}-remove-ubuntu-special-case.patch"
+
+ # Apply Fedora patches
+ # Fix gcc warning
+ epatch "${FILESDIR}/${PN}-jb-gcc-format.patch"
+ # Support aarch64
+ epatch "${FILESDIR}/${PN}-aarch64.patch"
+ # Fix build with latest libc
+ epatch "${FILESDIR}/${PN}-dont-link-against-bsd-compat.patch"
+}
+
+src_configure() {
+ set -- \
+ ./jb configure destdir="${D}" prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" \
+ sysconfdir="${EPREFIX}/etc" localstatedir="${EPREFIX}/var" cc="$(tc-getCC)" \
+ cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
+ scrollkeeper-dir="${EPREFIX}/var/lib/scrollkeeper" \
+ $(use_var gnome-keyring gmail) \
+ $(use_var gnome-keyring imap) \
+ $(use_var gnome-keyring pop3) \
+ $(use_var sasl) \
+ $(use_var ssl) \
+ $(use_var sylpheed)
+ echo "$@"
+ "$@" || die
+}
+
+src_compile() {
+ ./jb build || die
+}
+
+src_install() {
+ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install || die
+ dodoc NEWS README AUTHORS TODO TRANSLATING
+ rm -rf "${ED}/var/lib/scrollkeeper"
+
+ einfo "Cleaning up locales..."
+ for lang in ${LANGS}; do
+ use "linguas_${lang}" && {
+ einfo "- keeping ${lang}"
+ continue
+ }
+ rm -Rf "${D}"/usr/share/locale/"${lang}" || die
+ done
+}
diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild
new file mode 100644
index 0000000..306d9b5
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.24-r2.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r1"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+ ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+ mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+ https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+ app-misc/mime-types
+ nls? ( virtual/libintl )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ !tokyocabinet? (
+ qdbm? ( dev-db/qdbm )
+ !qdbm? (
+ gdbm? ( sys-libs/gdbm )
+ !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+ )
+ )
+ imap? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ kerberos? ( virtual/krb5 )
+ pop? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ smtp? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ idn? ( net-dns/libidn )
+ gpg? ( >=app-crypt/gpgme-0.9.0 )
+ smime? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ slang? ( sys-libs/slang )
+ !slang? ( >=sys-libs/ncurses-5.2:0 )
+"
+DEPEND="${CDEPEND}
+ net-mail/mailbase
+ doc? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ || ( www-client/lynx www-client/w3m www-client/elinks )
+ )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-mutt )
+"
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
+
+src_prepare() {
+ # Post-release hot-fixes grabbed from HG, this is what all following
+ # patches are based on in my Mercurial patchqueue (mq).
+ # If you ever take over or need to modify patches here, just check
+ # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
+ # the patchqueue as it'll save you a lot of work.
+ # http://hg.code.sf.net/p/gentoomutt/code/
+ # http://hg.code.sf.net/p/gentoomuttpatches/code/
+ for rev in $(eval echo {0..${PR#r}}) ; do
+ local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+ [[ -e ${revpatch} ]] && \
+ epatch "${revpatch}"
+ done
+ # fix compilation with ncurses[tinfo], #459260
+ epatch "${PATCHDIR}"/ncurses-tinfo.patch
+
+ # this patch is non-generic and only works because we use a sysconfdir
+ # different from the one used by the mailbase ebuild
+ use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
+
+ # must have fixes to compile or behave correctly, upstream
+ # ignores, disagrees or simply doesn't respond/apply
+ epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
+ # same category, but functional bits
+ epatch "${PATCHDIR}"/dont-reveal-bbc.patch
+
+ # the big feature patches that upstream doesn't want to include, but
+ # nearly every distro has due to their usefulness
+ for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
+ epatch "${p}"
+ done
+
+ # we conditionalise this one, simply because it has considerable
+ # impact on the code
+ if use sidebar ; then
+ epatch "${PATCHDIR}"/sidebar-20140412.patch
+ epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+ epatch "${PATCHDIR}"/sidebar-counts.patch
+ fi
+
+ local upatches=
+ # allow user patches
+ epatch_user && upatches=" with user patches"
+
+ # patch version string for bug reports
+ sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}"')"/' \
+ muttlib.c || die "failed patching in Gentoo version"
+
+ # many patches touch the buildsystem, we always need this
+ AT_M4DIR="m4" eautoreconf
+
+ # the configure script contains some "cleverness" whether or not to setgid
+ # the dotlock program, resulting in bugs like #278332
+ sed -i -e 's/@DOTLOCK_GROUP@//' \
+ Makefile.in || die "sed failed"
+
+ # don't just build documentation (lengthy process, with big dependencies)
+ if use !doc ; then
+ sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+ fi
+}
+
+src_configure() {
+ local myconf="
+ $(use_enable crypt pgp) \
+ $(use_enable debug) \
+ $(use_enable gpg gpgme) \
+ $(use_enable imap) \
+ $(use_enable nls) \
+ $(use_enable nntp) \
+ $(use_enable pop) \
+ $(use_enable smime) \
+ $(use_enable smtp) \
+ $(use_with idn) \
+ $(use_with kerberos gss) \
+ $(use slang && echo --with-slang=${EPREFIX}/usr) \
+ $(use !slang && echo --with-curses=${EPREFIX}/usr) \
+ --enable-compressed \
+ --enable-external-dotlock \
+ --enable-nfs-fix \
+ --sysconfdir=${EPREFIX}/etc/${PN} \
+ --with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
+ --with-regex \
+ --with-exec-shell=${EPREFIX}/bin/sh"
+
+ case $CHOST in
+ *-solaris*)
+ # Solaris has no flock in the standard headers
+ myconf+=" --enable-fcntl --disable-flock"
+ # wchar_t depends on locale
+ myconf+=" --without-wc-funcs"
+ ;;
+ *)
+ myconf+=" --disable-fcntl --enable-flock"
+ ;;
+ esac
+
+ # mutt prioritizes gdbm over bdb, so we will too.
+ # hcache feature requires at least one database is in USE.
+ if use tokyocabinet; then
+ myconf="${myconf} --enable-hcache \
+ --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ elif use qdbm; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+ elif use gdbm ; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+ elif use berkdb; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+ else
+ myconf="${myconf} --disable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ fi
+
+ # there's no need for gnutls, ssl or sasl without socket support
+ if use pop || use imap || use smtp ; then
+ if use gnutls; then
+ myconf="${myconf} --with-gnutls"
+ elif use ssl; then
+ myconf="${myconf} --with-ssl"
+ fi
+ # not sure if this should be mutually exclusive with the other two
+ myconf="${myconf} $(use_with sasl)"
+ else
+ myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+ fi
+
+ if use mbox; then
+ myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+ else
+ myconf="${myconf} --with-homespool=Maildir"
+ fi
+
+ econf ${myconf} || die "configure failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "install failed"
+ if use mbox; then
+ insinto /etc/mutt
+ newins "${FILESDIR}"/Muttrc.mbox Muttrc
+ else
+ insinto /etc/mutt
+ doins "${FILESDIR}"/Muttrc
+ fi
+
+ # A newer file is provided by app-misc/mime-types. So we link it.
+ rm "${ED}"/etc/${PN}/mime.types
+ dosym /etc/mime.types /etc/${PN}/mime.types
+
+ # A man-page is always handy, so fake one
+ if use !doc; then
+ emake -C doc DESTDIR="${D}" muttrc.man || die
+ # make the fake slightly better, bug #413405
+ sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+ -e 's#in @docdir@,#at http://www.mutt.org/,#' \
+ -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+ -e "s#@bindir@#${EPREFIX}/usr/bin#" \
+ doc/mutt.man > mutt.1
+ cp doc/muttbug.man flea.1
+ cp doc/muttrc.man muttrc.5
+ doman mutt.1 flea.1 muttrc.5
+ else
+ # nuke manpages that should be provided by an MTA, bug #177605
+ rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+ || ewarn "failed to remove files, please file a bug"
+ fi
+
+ if use !prefix ; then
+ fowners root:mail /usr/bin/mutt_dotlock
+ fperms g+s /usr/bin/mutt_dotlock
+ fi
+
+ dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ echo
+ elog "If you are new to mutt you may want to take a look at"
+ elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+ elog " https://wiki.gentoo.org/wiki/Mutt"
+ echo
+ fi
+}
diff --git a/mail-client/nail/nail-12.4-r3.ebuild b/mail-client/nail/nail-12.4-r3.ebuild
new file mode 100644
index 0000000..98b25cd
--- /dev/null
+++ b/mail-client/nail/nail-12.4-r3.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+HOMEPAGE="http://heirloom.sourceforge.net/"
+DESCRIPTION="an enhanced mailx-compatible mail client"
+LICENSE="BSD"
+
+MY_PN="mailx"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="libressl ssl net kerberos"
+
+RDEPEND="
+ net? (
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ kerberos? ( virtual/krb5 )
+ )
+ !mail-client/mailx
+ !net-mail/mailutils
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+undef() {
+ sed -i -e "/$1/s:#define:#undef:" config.h || die
+}
+
+droplib() {
+ sed -i -e "/$1/s:^:#:" LIBS || die
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-debian.patch \
+ "${FILESDIR}"/${P}-openssl-1.patch
+ # Do not strip the binary
+ sed -i -e '/STRIP/d' Makefile
+}
+
+src_configure() {
+ # Build config.h and LIBS, neccesary to tweak the config
+ # use -j1 because it will produce bogus output otherwise
+ emake -j1 config.h LIBS || die
+
+ # Logic to 'configure' the package
+
+ if ! use ssl || ! use net ; then
+ undef 'USE_\(OPEN\)\?SSL'
+ droplib -lssl
+ fi
+
+ if ! use kerberos || ! use net ; then
+ undef 'USE_GSSAPI'
+ droplib -lgssapi_krb5
+ fi
+
+ if ! use net ; then
+ undef 'HAVE_SOCKETS'
+ fi
+}
+
+src_compile() {
+ # No configure script to check for and set this
+ tc-export CC
+
+ emake \
+ CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" \
+ PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
+ SENDMAIL="${EPREFIX}/usr/sbin/sendmail" \
+ MAILSPOOL='/var/spool/mail' \
+ || die "emake failed"
+}
+
+src_install () {
+ # Use /usr/sbin/sendmail by default and provide an example
+ cat <<- EOSMTP >> nail.rc
+
+ # Use the local sendmail (/usr/sbin/sendmail) binary by default.
+ # (Uncomment the following line to use a SMTP server)
+ #set smtp=localhost
+
+ # Ask for CC: list too.
+ set askcc
+ EOSMTP
+
+ emake DESTDIR="${D}" \
+ UCBINSTALL=$(type -p install) \
+ PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
+ || die
+
+ dodoc AUTHORS README || die
+
+ dodir /bin
+ dosym ../usr/bin/mailx /bin/mail || die
+ dosym mailx /usr/bin/mail || die
+ dosym mailx /usr/bin/Mail || die
+
+ dosym mailx.1 /usr/share/man/man1/mail.1 || die
+ dosym mailx.1 /usr/share/man/man1/Mail.1 || die
+}
diff --git a/mail-client/sylpheed/sylpheed-3.4.3-r1.ebuild b/mail-client/sylpheed/sylpheed-3.4.3-r1.ebuild
new file mode 100644
index 0000000..febe593
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-3.4.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A lightweight email client and newsreader"
+HOMEPAGE="http://sylpheed.sraoss.jp/"
+SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
+
+CDEPEND="x11-libs/gtk+:2
+ crypt? ( app-crypt/gpgme )
+ ldap? ( net-nds/openldap )
+ nls? ( sys-devel/gettext )
+ oniguruma? ( dev-libs/oniguruma )
+ pda? ( app-pda/jpilot )
+ spell? ( app-text/gtkspell:2 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+RDEPEND="${CDEPEND}
+ app-misc/mime-types
+ net-misc/curl"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ xface? ( media-libs/compface )"
+
+src_configure() {
+ local htmldir=/usr/share/doc/${PF}/html
+ econf \
+ $(use_enable crypt gpgme) \
+ $(use_enable ipv6) \
+ $(use_enable ldap) \
+ $(use_enable oniguruma) \
+ $(use_enable pda jpilot) \
+ $(use_enable spell gtkspell) \
+ $(use_enable ssl) \
+ $(use_enable xface compface) \
+ --with-manualdir=${htmldir}/manual \
+ --with-faqdir=${htmldir}/faq \
+ --disable-updatecheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog* NEWS* PLUGIN* README* TODO*
+
+ doicon *.png
+ domenu *.desktop
+
+ cd plugin/attachment_tool
+ docinto plugin/attachment_tool
+ emake DESTDIR="${D}" install-plugin
+ dodoc README
+}
diff --git a/mail-client/sylpheed/sylpheed-3.4.3.ebuild b/mail-client/sylpheed/sylpheed-3.4.3.ebuild
index 5bd6d38..1b53b30 100644
--- a/mail-client/sylpheed/sylpheed-3.4.3.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.4.3.ebuild
@@ -22,7 +22,7 @@
oniguruma? ( dev-libs/oniguruma )
pda? ( app-pda/jpilot )
spell? ( app-text/gtkspell:2 )
- ssl? ( dev-libs/openssl )"
+ ssl? ( dev-libs/openssl:0 )"
RDEPEND="${CDEPEND}
app-misc/mime-types
net-misc/curl"
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index bde4de1..9c90103 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -3,13 +3,12 @@
DIST enigmail-1.8.2.tar.gz 1604159 SHA256 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512 51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11 WHIRLPOOL e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c
DIST firefox-24.0-patches-0.9.tar.xz 6576 SHA256 615b47ed076ead8f6fe8a9cc8b51ae7615bb8fb404a3e7254190e73c6669479f SHA512 caf76c23e3ad4ae0fd9d240d4ee61c289bfc727ae8117a17c27396d32ab9e06512cfa53da86c99e6c2d941eca96e18c41775473f3c4a16cf8c91a2e8dbe144ad WHIRLPOOL c0104c84c20a28b945ce2fe5a22e00ccd412d00bc38e4d51583fb47765bd639808db1a1bb52be9b7515423437ae131e12dd5f837b35d8e2e50dfb86341446396
DIST firefox-31.0-patches-0.3.tar.xz 6004 SHA256 1ca282d9b58e611c395fcda508bf0ddfebfc91ea6a6132b59f1acf90566f663c SHA512 4469ccc3200955bb790a177352ebdbfa5c2299581bbbd0d83be4e2e0ccd5cb850c5023f3784dfbb3cd5d0dbed9bea4b533bdbe1627e42ba60437b4743a0e8fae WHIRLPOOL 86b2da659dcb11f34cbb6bc966d7f7ab79fb3f8f3584f929ea50f7893bf84b01ece435c4598c05b538d0719fb0426fca51a1cc9f9abdecd8b8e8beb5109cc899
-DIST firefox-38.0-patches-0.3.tar.xz 4796 SHA256 bfbef81748f76f5f80c3ce6e6b810b65f6266f71da02722b1e8c9fad865b02bd SHA512 a974e33759246153db7d83488f1326275efd12c44a6c8c539cbc35709b4dbd27e848bda32f302ac2baa5d8729ba20579ebc7f643419757f542972ca1a264d520 WHIRLPOOL 3549239db380c02a1575ff407ea684a14827f2250d991b5eb6c8a341ceebaca57cd2cc422e160f00dfab933385d677574cd84947da07bd282c68bb84c40fa42b
+DIST firefox-38.0-patches-04.tar.xz 5572 SHA256 501bd1cbd0ac7239674df4f7424e0dd57cab9ede47e18af0c99a8b8e04aa5ccc SHA512 311d494ba2a4219c88eea651e617aa776d6aa8ff68092302b76e9ff4e3e348c7197ec583923188e39973b7bd14f94df19756daf2495d9b0fe44aeaa3dcd19100 WHIRLPOOL 6605eaa0b80c97d2d5d23a23f7b8d92e7ed875787b932adf14622eb3fb5f5ccdebe8a094d78b3518d874b8819724af94100fd1728074ba4a5c426bbd91eeb722
DIST gdata-provider-1.0.3.tar.xz 55860 SHA256 2a6b8c1bed9c32dbb91bceadaf36986bffab4379ebf8ab1af83f9321b38f9cdd SHA512 d1a99e179f4bc57c98beef80c27c5f774dffdd177a0ee0adf27441aaea27f96d61e723e592f9fa813b943acb34f572d5769622e2dd45c5befec762e0cbe013fb WHIRLPOOL 2d896ae041ec8e6bd6f9474bf01ccc43925d89254cd6c719dfb70e1a5677f21fcc9536c2595f6b1b5823607d69248512d6dc9f5a1f208bd2e25a59f30a0c8c3f
DIST gdata-provider-1.9.tar.xz 80812 SHA256 8e60960999c752c49d6414d14c35c2d0cc474d4a199ec99e531453d4d60bc5a3 SHA512 b1411b0a8614eb5e9fbdc0a41eb5ed38e8d4c90832e2a356fd0412b554af46bde4b766b213d9da3cafd85206da44d333354c9f6b469c95ddb190fa04fe14a54a WHIRLPOOL df7451e55f937c604d92faed82a16bddd6ca87a7c03981324c5409ab5824ac1c631ec767f10eaedc6f7128cd1f9001eca599c848d39e116d9722f26811b01092
DIST gdata-provider-2.6.3.xpi 115020 SHA256 008a302410b152e956cf56fc0abe4f6cc191ae51ab367abb7e0467ee65d44093 SHA512 38d2a581842de0937a96b7498db06aca120b8cd6b9de96a0285e90f57c28118193a24f32c9fdbee72233db0675a35c7bc51fd3ba6ec41bcf4521adf48107624e WHIRLPOOL 70d87e73d355559879daf4a00c9ff45c24a455af5fb2f93e8034811b0c444799bd754cb00ef63c321c3f7d85e98a62148fd0e9524fcc07edccb5c02772d7b515
DIST lightning-2.6.5.xpi 3645840 SHA256 c4bc84f7e21148d6d06f4f61de70c7b4e331b53dce12979309e91294d4289b31 SHA512 880002e1c01a06b22ca20a120a5e4d893c364b058d7d52d12dddcdd3f4215652ae2c20332c3ca29fa6c5012df71330abda05bf3b862485043ddd481628ef801b WHIRLPOOL 5003a341a174cbe7da8b069d9f5d6ade0a7c0e8d842a0c25f74702e997942b3ea43be1e0eb6913d75bc78ef23fb2ee57551860d02b331db039cd6adbfcfa1f5c
DIST lightning-3.3.xpi 4226096 SHA256 eedaf565bc253a6bc21618dcc95eb2cef121745c249734514bf37ebd6abb3e5a SHA512 c0ae9d259ec28eb6d7335426cbaeaf2701b4a1230de203a5bcccb86937cadca6622031e7a7de11fa5a733631d20a2362fbdc04a1ab649a9383a2ae9114ab9c34 WHIRLPOOL abebc35ca3eaddd50e8660e647c6382943327237375e1c31c567d03b4a91ced37c55d3e5e41b88d252d5fa025c56147ecb53e20dba98c08a2134b38848ffe98a
-DIST lightning-4.0.1.xpi 6637522 SHA256 a93af3b8548a82e5709ed1c0d06d0a103e3fcdd5e554b1124e42166a814be3a6 SHA512 ed8ae62eb6b339a4108756934142dbc2aeb7e039d6fd856067bf3f24ce5a2450336e281dd018b5a14c359c5f58fc20668e5cad4b3929955572f44002be1a940c WHIRLPOOL caa23550eab6cc8f4b8ec63dd6c34282944cb9f150885ab2120d315db0910b640fab3fdb466d97cc7e15364e88bdc09c7041f107d11bf508f361979de1bf2722
DIST lightning-4.0.2.xpi 6637618 SHA256 d2d4985058dc2755243fb60a7869cf07e835f871fb098ccc2c7faa5d07f63ea6 SHA512 f73afe1e4ee0e822102226a39f657fdcc397dd4bdd3824d9b793f6fab667fc70eb5bbee48cf088a5c1efe229ac8d564bf36c8998c2e10210f70612d380b7e2c9 WHIRLPOOL 7488b49ba36f385552951eb34c36098af522161ec9784cc10db5659efe002d415e5df13ae11b9eba06a1fa329e85f75adb0a025b8cbc71814f3f7195e6b4ad77
DIST thunderbird-24.0-patches-0.1.tar.xz 1056 SHA256 2a4e128a6f5c35c865fbef77c006e6b24b98f89ceee5de6cfbf572e2c5fdca70 SHA512 aa411270fa4b6ffebbbb210a57a4b5c900ae5a696b7d6050dab2ee439365f3fc7e348c5c45b7632279d6f3c54009e7b29f1acb42501960489157875d79891361 WHIRLPOOL b7e7329d1eb78b222cc18c7b1750e737706e66f64b31ccd94ddf27733d0b8c651d001798d2319e544ac558affe76f69be71a225e246b99a36cee4fd0808dcf5f
DIST thunderbird-24.8.0-ar.xpi 457862 SHA256 e954ec8c64356b82006b01f3bb30d247994ce81f37a7e96de93c606b464c55cc SHA512 f8267f4ef885d900e15bc8609503ea6da37dde39b17362b0e35d384ec51416847c4c898a638708dcbc792bfb1a819bacc1b1f9f8bbff45623ea521c902929cce WHIRLPOOL 8116a679e37eae740e880fcadb48ade6d49cb96732a4f4212038f1ed03c15288219fc7be9a308709a658882872dc79aa794907643df7ab2c139358192635eb98
@@ -124,63 +123,6 @@
DIST thunderbird-31.8.0-zh-TW.xpi 463408 SHA256 2bfd0efd2a0695733bf59d0a8f2c184c4798cc1f3589672f3095a77217d9bbe5 SHA512 cd71d2e4a08ec157b95e70a2ff7acdd62c4c21ac93040b6183be55a14d6b3a4fdf5f9915078ce2487d544d3a2dde3954d5aed40ab3276f72615fb4462e4974a8 WHIRLPOOL 8939d94d9d5ca7ed72fe9e05ebbde37090410ed9b3d1d7d2a8f5495d718e2904f516a5bc123580c87d84baba01bde6c359c66ee371c003fbfc5f65a02111c6b1
DIST thunderbird-31.8.0.source.tar.bz2 171428094 SHA256 16731f49640e01b908d704e7477b4d9628cb2af9c2a492e5b996adf5218112df SHA512 a37133ca0764df44cde41429b5165e53496d58db1168529388d565c8169b2078492241bf9c95c864b76b226e7b2ec95ac1c121561bc0a87bd5faa8b94a1862d0 WHIRLPOOL 47a8fc9c9828a785e660dbf4e2313be46a6a53d290f489334b7cf2d9bb78129e6a7dd3b9f22f0a1bbbc3bc18145d78751a272190f3e0a503b40962ccee542b08
DIST thunderbird-38.0-patches-0.1.tar.xz 684 SHA256 cd2a347b72a104e72d38e56bb92df3464e8820485119b4114dbd0bbda131a808 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de WHIRLPOOL a378a0fa1b152f17681a5e389662fedfacd45a137b224f038d3c98ab4a024bcf9e753fb2fe018cdb7126fb710ee8baabdf7882540450ead2985070d0d1f12eb0
-DIST thunderbird-38.1.0-ar.xpi 475295 SHA256 8bc4384ede05efcb02e67a8888651a81f22cbaea3bbf6072e156d707e2a9ad49 SHA512 cb8fa60dd8531d6ae4c8015d41568dedab74a83eaa742ea714224f276a8a3d4d71e1cd84e6f4d4e17e4b09a6fcca8b94d2b885c4323776bdd037922b6b38ae31 WHIRLPOOL 37767cc83500f47b40f554cdbc298de10eca85887b80800678a4ac4cfe2afce7d026c52d3dbf45449b81300c407883f1aafc863c1dcc7a25cfbb8e1555c2ab96
-DIST thunderbird-38.1.0-ast.xpi 405893 SHA256 2a8b35fb65014cc2789e38a396a9c153b8726f5cc5c50ec042e29d9c7972b4fb SHA512 9de891efb22720b9c0b71d9290e4643528b269eb595e6f3d1ebcbebda05d061b6db4b49ba934c49039dcbb424db10dd72baf748469387fcbf7726f91b852cbd2 WHIRLPOOL 9782a065f54b748f259a9fd365b9b652b29c8d670552239d319981205a15ff911a7296eb24225bb93c2f987c05feac29fe06861313ae904887e469ff98a2c53a
-DIST thunderbird-38.1.0-be.xpi 442473 SHA256 0bd3e4dcc65e44d62127fb1832803f75a0bad4cd179135375460327363e81864 SHA512 3a51c25cd27432d64b5980378019f6c5e455c657f3c72a0b72b11fde8cd04d51d9a09f1199e6539c7531aaebc85bc1016fff4e11cd19c98c2810e07a00c38c3a WHIRLPOOL ce6386e21ac5eaf9c8b199699d9d44daaa04aaf142436070824d6b90625c5ac410cf36a99e6241f84f0da2592e3fe420ee920997ddcdc2dbf096495133d3acd4
-DIST thunderbird-38.1.0-bg.xpi 506149 SHA256 806a7f2d151db0f5334b2791dbd708b3f631b2ec214b2f6edfa7aa95abe0b59a SHA512 6fc098efa1c66d3b847ba30e92c41bbe386d83bb2f3d9506e0555aff4a226f082962c5d377074c470b31aee20b917567d0e4816bdf94093abd4754830efbde69 WHIRLPOOL 5d51780c129379203f6796a2054e7ff4ae1d81dfdc7f6234840024591028f98cdfac9df7398d67a66f521f9a7d1273fe2240f33df6ada62ef9e92c9ec4adbfda
-DIST thunderbird-38.1.0-bn-BD.xpi 560648 SHA256 5f16873ea47e84fb01a263f7ab59a90188ad6c5b57ab13b90c925b4a8d0bf06a SHA512 902bd6c4e55876ee2af76b8b4b60a1c4dae7a76a436e46bbfaf3cd9ead59a631871e6de561cc85e0c0e6953209f11719376a8aedb95bea911f89d0bcb48487f9 WHIRLPOOL 0bb2d627bdbe4566b3bcab6499fe3e0582a63060d0d9faaaa2545b0b1b7977744172af0b3ac8df4dc275ab5ae149ac0b0d733971c7fd76be74cd75afbebcb536
-DIST thunderbird-38.1.0-br.xpi 449788 SHA256 c976d2fdb520e178df568a5824f4416b043f9ebbe436ddbfb81ef5b5f972d6e9 SHA512 6f65a0df88c83068746a74a0730cc306c8679efc3aab8db17a7baae90b289022743134b08db3941fe62a0bc573f372e41ed24771dd88d957ee99f57278444f85 WHIRLPOOL bc673bd36d1925e5b7ecd176a74481ba1c3cb7ee2957c9920dfdee870977b420e7b179a05c02cb51942a3695857d674ba03e5593ffeb21ab2def602a4f67eb73
-DIST thunderbird-38.1.0-ca.xpi 450347 SHA256 82a2eef48fefe335f1f8d53d21861a45f7b73b4ad8b65c912f9820bf69273309 SHA512 914cc04784793762392010bde0a32228720a4ad76b9381e63717d32012b0b49b69cbd26b2616a14ba4cd057e1d70a9489890ee7f7e3f6bea85bb9874ddba4715 WHIRLPOOL 1cf1d2e27daa1fd9205e68bd7910c91fb0b999ca3aa3f515c8091b5cf038d935769a8b143e505efaca2f7d9cac2d673401fb94aedde31a9bb1c2c0c67ce61bfa
-DIST thunderbird-38.1.0-cs.xpi 448723 SHA256 a1e0b882b599705e1150a66139fee97dc009be2a8e64e6a7c2b1158373bfd3ca SHA512 268171ca2a3401ae13e711e5decf1bcd3e2c1b76eeee39390b155e73165a7b05f95910a65fc69005dc347abab3dca37177b067589cfad1e5928cc15aa45d17cb WHIRLPOOL 21f010619c319c46f988f01900969f48e6d7cc8e2be92803714644d23b4540a25f727f0bf866ba177400d16d5a614f9f91e580bed68c1abb84beaa7978d50b7e
-DIST thunderbird-38.1.0-cy.xpi 434848 SHA256 877cbe5d9dba3f90c2754788baaa137fb45bf9e2d071a50df69e970f341a6365 SHA512 acd4c4e811792d68e2a1f58517f9a9b07976354630f396ea994b9be43bca616bee05edf998347e87f542b85eadaf9a0dfe866a9e08a4f2854e29a8267a7a724d WHIRLPOOL aba90842e54b2636c7a5e8d599087b21672fcf4e8ea0e8123302ad8566e859fd8abd6afac258630938a08e0ca2e0d49c47bb52d535634e39f546aff1f6cc0928
-DIST thunderbird-38.1.0-da.xpi 425828 SHA256 fad0fc825311a1b546eb117c8cc838f542485ff87cb71c5a656c449366a71526 SHA512 ae0f931ca42143ea154b0a5c8442f3cc7ea7c2684f90ead32f8f61ba520367ace19293eba21c6eb2f17a7f600bd75262098a972356ef3efaada8a40180327831 WHIRLPOOL 3dffc0d259e0877c085bc34eeb827808dc7496f97283c6fd9c5d82f20ab7fff6d0916da528e999ac7d00d0c89fded72ab14c2d523bab6f9e4060daed3bf5c053
-DIST thunderbird-38.1.0-de.xpi 429876 SHA256 bc900b8f0f2db4c0e5527780db826789d61bf5b265ccf62033909fbb4f21e12e SHA512 9e6d9eb4f537d03627f5f9566a5c1c78b80e34706fac60ed7fdd32f071d574b9590df89751b1d0257fc8495fcea78682f11ced2130163151945014cab5a56568 WHIRLPOOL 2d19fcf7698e16588f929b54a9665f6cf71a7457d54dd331a8fcc5767aacbd0d6e0e7eed515362484fed2d1bbdb078be6928b6263242685b9b7cc1c6a20fe61d
-DIST thunderbird-38.1.0-el.xpi 493511 SHA256 d6df1e34d17723f2b52aecea1fab9af964bd936816f51e5dc0f335bbf59a9a6c SHA512 768a6ca1c5611a1cb712cced47f6678bf5c85182929a198a4885ad8cfa9359aa906d290b3de93e8dabaa2cfd1f809bff9601d12abcd3feece5b0c0e429a30f21 WHIRLPOOL caec8f093ff178aa212b8907ebc8f8e9cbeb66bab9e14e914ec5c81da9cfca6fc53f67a2ad6203ad49fc99e3e1ff62be8e4f2bef79e1d0ae9f9336b18c5584a2
-DIST thunderbird-38.1.0-en-GB.xpi 416571 SHA256 07e443159860c85c82f01dbc57e0c83904fa7788dd69fb234970ef0484afdc81 SHA512 b60b0b2410f0e61d491db9538530e6eca40f43801e33b75ee4fcc94808893b81186cd7d759549fbb0abfad38c5d03c38a358a2314c48558b43164d1b62b6687a WHIRLPOOL d0e6237a104ac78e85a20e0fed5109d3a36ae0d2920af72c01f457b5c13b8b4a457c727b00512bf73d87d96c68d645678097c3e99eb0790465795262431bd294
-DIST thunderbird-38.1.0-es-AR.xpi 442640 SHA256 c5b0d927e51ef06414cc14a64ab84d0d4e3b86f2833dd0bc1211a056507d425d SHA512 9110f799b42ef8fc629f15849588b60fc3cde6e58286cb61f17b26b0b5c7174bdd25ad324badc1909f6329000ef987dedbb485e2a7e42cdf9563229ef4a562fb WHIRLPOOL 37a08ffde4646e5e34b9e9d0de912271815ee85fefa7325db9df7cf7f40ac0856cf751534a8b6f25c45c06453f2cd188a75d5b0b32275120229e28f7fffd4de7
-DIST thunderbird-38.1.0-es-ES.xpi 376066 SHA256 79bb32e02108f6f8971c6504adc39ff45a202cb91b6e7daca286a3b0aaa6e1b0 SHA512 388f5b8d4713efd92cec581fded9a90a6bbf80958f77fc1b40e533851ecb2bb5d3c16a3ec74fe448d2a2db613d08bf5ffb42d150426dc846d34694208d274dff WHIRLPOOL ce5757a6dc4698cc5942da060b2d5dcfc73469a9a38a7d60890bf37a5c16f462ce3454599de88f1b6dbd82418cb0f5a7987eb3d24d3deaf787de08c96d1112c8
-DIST thunderbird-38.1.0-et.xpi 438262 SHA256 9fe401fa441232dd29fee49d26fcb65af34ccffc2666bf2fb09546a947d91e9d SHA512 56cf66e23983983535d86b1d772ba133b93b6d45e05768780ad0b471b9c284c9a0bee466dfc162fa8d53e83b87bcb86027e23b9bf4491df072d5b18e3d91c86c WHIRLPOOL 3211c433fe48be15600c60b6c9b9d186dd740c858d0204a647d16d17d6ab7942191bc7e33aa04ab8271b906048f8c5c0f9c648e4859f118282e01b744ab5a382
-DIST thunderbird-38.1.0-eu.xpi 434837 SHA256 0d54de9beec9e2f232a016d93d0b626bf8be86a1966ad6fb02c8d1cfe531a3f0 SHA512 55f2202ae4a3d52944a71c06a9faaa9c6be9ddddcffe6f8116dbc8283dfec24d5cf0f6dfc28f1c2af2381ddab5427bdb1e4a821356f13ae54268e35084bcee14 WHIRLPOOL fabcca0cc70d928a203af9498bde229ede4d75bea39020a3baed86595f59169a787659dde6aa9a8266c5ede06b4e4f93a2f3dfeb546dc5420a320b919bdf5f2c
-DIST thunderbird-38.1.0-fi.xpi 438889 SHA256 cc7bf6325bf7d4c914cb7958687c776db8e2444cd969ac16e91d6a67be0ab729 SHA512 5e7ea275f05dcec6e4786aa2861e6944f2e80ed6f36cfaeab42484ad11e218be620ba9e72fe1271f304b3c9bcc2eaf08b5e1f5ae9f64fc0440622f16fd139d61 WHIRLPOOL c8d5cc80a791828e8e1881dfc72633373742960874a0b63aae4504c2db35a1e172808077e8b295e001414707a43c3eb9590a23c64261e79ba68971f181b76c49
-DIST thunderbird-38.1.0-fr.xpi 448227 SHA256 56dbffbc5e1286f71eeb33961e209a6c6a9dd3916c4b3432733baf8f10c10e77 SHA512 7c38d209a3be6a49e0777df74e56107d149bb28a8071db146556c0aaf9f3dfa5dd34839cd64311d2db3f543706820cc3058d9c14e3ca216d9ed5339d147fd113 WHIRLPOOL 70ba05665af63341fb4ae510c5959bf861b9b146bd675a2d9ebe6b2e19fb3562f805df4281ac6de4a863ac2f1782d307a403012838ef3c77ddaf82e6de81b0cb
-DIST thunderbird-38.1.0-fy-NL.xpi 442161 SHA256 00ec21c0bab139981ab81902051d7c59a5fa3a6ae7865e9613ebd95c0fe1bf87 SHA512 2797c569cb1466e65b090975fd01db88065ea4631c740ea37cc2ca2aff3fe31fe746cc463738440618decd8899192839c3cfb8e826ae73b7a8d3ebedfca881b2 WHIRLPOOL d8d44b1b8c38da2cf336b3b3ef127d54c67295cd061be38a2443abac18594fa3cee668d62d044f720985e9ce96bd5ad8a69aa7fd4522d0f19ff0366737cc2a5d
-DIST thunderbird-38.1.0-ga-IE.xpi 457412 SHA256 76384620c71115c8ebb3afcc4b30de9de45d1230e44983b4bd3d1473bb9c144e SHA512 e4334a33f704de6e1e51a342b165b42c7a2c5fbbb1f74ed4532fba20098adc9b23a8b4e65f48bb995117d8e8c59a9b4938b83af4ec1683d2ddf471365eee7c26 WHIRLPOOL 0a3b1cfc1bed92403e37117944070972ec7732c7593239dfb8554ef779aed600dd0b7c0f1f276706d61659a31d63ab70be58a89a0c5a24570d6a894f1087467c
-DIST thunderbird-38.1.0-gd.xpi 456317 SHA256 1da8565cafbb009abb0b0424fc15e0dc2bcf2c3048e14f7e1cf5e62bb5618835 SHA512 37948f8d660f71f4bc8cfeee8fd57b8e904bf0d82844940389bdd92647743861c6b55b755d38be43c0e17a19c80963bcd19f66b7a924ec1e1482d654f392809e WHIRLPOOL 5bdacf218b791809ac28b936a5809cad9737873e325d63ed4eb4f6137fddd28912854bbfc802c9916d58304ad2d9c5c547fc9bef2886015138358fed846c29ac
-DIST thunderbird-38.1.0-gl.xpi 457860 SHA256 ff3d29d1a050b74e64e0a4450b65edb247a5eb36a1b8df6b57dc3851b1658fd3 SHA512 56bb87f1df17f25d5067c8c0c2d450066970d316d0cd67d3e8b51916f999c0b25e7fe5d15de506a01622095d724b1492d760d1d1c3259a0b16b59628019dc116 WHIRLPOOL 9395bdf33dd6c634bb9727442e13ffbfb41cb145ba17f04387798770ff561a04a5bcbd470dbc4830b07323d5a6c334240b8923db900746c1cd65a21517f72dc8
-DIST thunderbird-38.1.0-he.xpi 485888 SHA256 aab3240dca233f9e6ec9077be40a3d0033d75ccbd196a9ccce2726261c9d4c41 SHA512 9c42ac8fe730ec61adf3304281d49757a47dce6e9ffc9c233368d5c4187e9314e943f167435b5077285b1b4f647a2b13f4d1c691c738f74635b225c9d389a940 WHIRLPOOL 2ff8a0c59153cc288389ee777716afea3313402a2815dd18e8caaa9bbb0a8d48a6c6e911aa7d3b0bd298e6cabd9052fe067c507f1d1cc458f28b89a944b0c34c
-DIST thunderbird-38.1.0-hr.xpi 440419 SHA256 f368ccd53d7d405c07149b351f56d391142b40e8774d9d7fa623ff3318428b6a SHA512 193270f7567d3c44d27e04a9ae8aade37ddef7c38f26965bd2aedda8a6803f9f6d69a5899f8de7cefbc7ebd4ad1aa54a840df21ed51dc2485669e2c0339d6d2e WHIRLPOOL 530087456acef4d1f2d4d8174a826fe1533a8ac121377099993301f9c373a2b421fb9508ebe34de90b5594d81cc928a8f48bf04886180eaddf111aa396962837
-DIST thunderbird-38.1.0-hsb.xpi 456454 SHA256 f47a8a2ff662acef03541ead6caf3e900706ce348b7577cd656222e9dcc2c47a SHA512 734ce7c3e0bf0f030da540f5acb1ae586c27a41474c718ecb911b03449130c6753a0c37202b232b83c9b6943bcf49f1f8e57bb945e580b15c09ed50becc5157d WHIRLPOOL 8f712f5f7202991dd22262b4a5406d04b20f764d661552e30b43cb561c06217c2ceb4819574b7071c4b67f7ca53d22323064300a97152323415a2827bbb8d4d4
-DIST thunderbird-38.1.0-hu.xpi 457987 SHA256 c8393cb2f5c8aab62fec71e53f19791e7ce4d3acc37814a4796e7b390a4e1fcf SHA512 84743fc8e8f272eec14a9341f08688c07c36730813f832e27811e9cfa34b30b13c5bf197b1ac41005724ff71ef2c9d87384066de385a60c888f794859e8b0547 WHIRLPOOL 562822eb2fa08d3323a51c2da47f3756941f0b0851bd191c54ea50ea58058fee04ea331ab7bfdf8d32547f2b43498abdb5d8bc047247736ede03130c5c33040c
-DIST thunderbird-38.1.0-hy-AM.xpi 500379 SHA256 56454db77528fd2bc02abd4f4ecde69adbe278cbe807842e3e92d709d5df526c SHA512 57fcfe8abfa0d7e3c109bbbd54d6e7d87affbee17bff3e0c4054790a8d80400686f785b0bd02197b8845a12d71be59e03ca09ca9c0f6ad2228ca4cebb2ae2583 WHIRLPOOL 0ae42cc1d667776453b110c0d9e21f1e8c80af7cf1d0e4b9a9786d072d707cabea398223588eb120d9d6a0ddacead7586082cf26d3c26162eb365d0250b062b3
-DIST thunderbird-38.1.0-id.xpi 483209 SHA256 913db42b7530f55a8f3836d4dd493cf45df86509c77cfc64aca28c4bf60c6321 SHA512 921e941c2ba48f71d0051f64337dae777ece1b4c431c770ffb59dda77d3d6affdab5e1325d3735f185c2e6036a8bcf4654669dfb5e45223752b5182042293f96 WHIRLPOOL e93b6acd424ca87c91c3172b19e654a5bd97f0fc1502cd0cbe8baa4fec68a9933c0bff37e99d1090211bfa7da97aa21763b5374be6756ae8a2187c0ae7c9dc2a
-DIST thunderbird-38.1.0-is.xpi 443008 SHA256 0a0194046282ea36e3c48238f08bfa9ffff07531d473b9a800628b6fb22b4970 SHA512 ed917f0509eeec67a02c633551c1eb0480f6b4b9ce4448869bd99d9269979a52ac1c450bd8b8b27338f481c0a46dada125474e0b0d27f04c2ff0320488fb8e86 WHIRLPOOL 99f202a528e2aefbbfaf963448f846afab231c9bd1c9ab100f658636594633df5c344b0c5f6f106ea80d557588c640b661a054c6734f8456ea1864ea59de9656
-DIST thunderbird-38.1.0-it.xpi 369023 SHA256 2b7659c9a0c57e608d05f64bff90b3f6e631ce089ed1135465e89a133482fca7 SHA512 1ab2b5255fd9e5a5b8040d72a690ad7d3d92189f0f55ea175e0b6982dd4f14dc754129821c9f208979ee33286509fda1343e51474ad259fc078acedb3c91b246 WHIRLPOOL 49046c224a488b5f967aa4161d5a7c6aeaac42531ec4a6297cd37805de5288f8b6bad06522ebeaac4358fea5d6fc9533e223ba22a79920f27a2e1c587ab132d0
-DIST thunderbird-38.1.0-ja.xpi 492860 SHA256 c790816d9a735d0ff3e3d82516b6c10076a94c6e278fdea05f04d52615984257 SHA512 4b14e14e3be3d7d4839c52617200d7c2d9dac3f7e7f4e9e69657f51b42750a1e9aa1b23a47b361fdfe959f66e6adf5fee9fed73f3f80588de77c532376ca69ff WHIRLPOOL d6ae239e45c3646748315aecea853407f75bec6b155a0985d93236209167dfde2462d5aa8d7c3b113ae43a0119ee49da527f9423629a9ef720885c61ce8e6b53
-DIST thunderbird-38.1.0-ko.xpi 454852 SHA256 42a147ac06a0cd7995a78f014259464db2e51391aec4ea16a548e0d5f156d951 SHA512 f85cf05450159b0680463f64e0aef47fb1c257d96d7edf69bb30cb1085d4cb2791054ff1d3e8e1c457bdc495ab3400b1fb87441b632518fad2d75b96f6c9a479 WHIRLPOOL 2980c6214cafec7d72adfe415ffaa7073a50b3fd4cf850646476745a972ecea8921205ef5ec36442687b77a9b3066ae42fe9baf2830db7193627e8d3e1e0421d
-DIST thunderbird-38.1.0-lt.xpi 454571 SHA256 bbdb182ae21c8b8da1175b5a936e8563250838e538004a45b7847d27a0b192ad SHA512 48105894bab38f2172f8f2d0c827f602ec64c0bdba1b42d118605fc24f08e1389a19fd02bbfd5d87144a952622a4c1cbacad4e7ebeb7c4ee61e012981cb3fa55 WHIRLPOOL b2c300b0e4cbb4ad295862a385c14b7f650c2af612629fab7254010cb3fdbc8ea94e3bf7bf618ba3793e3dc97ce585f320e2dcd5ee9d3980a27454c51d6e0d1e
-DIST thunderbird-38.1.0-nb-NO.xpi 434340 SHA256 e4b10c9cfd80c6f9b683880e454cc3dcd2e9eb01acdc0090e73b6c6b6b71a7d3 SHA512 45cd2f27ed20fc4dd9524637b23dda1540436f6c1907593a542f534c5cbba0b550fbaa8fd392f253a43be9e1e7f44e5e4efe3173448c0c474993df99a05d0f34 WHIRLPOOL 51a7bbe055d4362ac957cc003e1fae5d695e2e1795b57b9d18ec370f174e183e3c49de12b459e6541f34f5552981a17883fca022655c0487c8e782dbab8ae980
-DIST thunderbird-38.1.0-nl.xpi 435107 SHA256 032f473e1fce313d8d9cdcc49cdaf390711c266069c45df4dbee2e9c81e19b0d SHA512 109d4350fffd9fd2f67785ca1714ca5f31059d1c123b58fac167f25326d360a7119b52acc5ad414d9b5d130437ee6410d3f114a2672d9be72e00829dac6d9b7a WHIRLPOOL 2e7d7f16c7ffe06e94b6c43db8861a166239b2900721167703a8091dea8960a6de9680c70590b8b22f4fc785d53e84bf067cc91aee0d5dd5fcd5725fa4c01995
-DIST thunderbird-38.1.0-nn-NO.xpi 436622 SHA256 361710679e3229b98aa5785b1cf36afa493e5ded84353a69574e4cbe7f5bbe29 SHA512 b76a3a779dcdc0239a4af5cf05edf522392a67824d756708dfe9d4e9e7def38ea07e4e2ec622bb7fd44c57bb91e88136c978e2c215f9e03d1babaa84d5203bec WHIRLPOOL 5d05d6c8bf9e2213994504720434e7781618da2904299d3e9b9ae45a897a67cba0a41e9577ddc0b9ae2dea1b5b3990e01596cdb5097bf34d754d1207cd030b61
-DIST thunderbird-38.1.0-pa-IN.xpi 530483 SHA256 53afb6a6ff09df13b97ffc88f95a527d860e751fd79e873a78be2e7bd977a15e SHA512 36d63c933d5d37a4108158a12a9010eb90f62c3c7f0dc3fe30c9e114ef6b8c858d0a72f5020f177d4c8b71391f419ddff67fc071c04a08cfbca2383f940fbbdf WHIRLPOOL 8c0e41dd39c0229a8ea70d256a176bc3bd31a79e071b6afd08ba7403627ba8b02ff47fcd7277a97bcc2a06990be6bbb6f785675944815360e9dd0a2715c295dc
-DIST thunderbird-38.1.0-pl.xpi 411508 SHA256 d9c770408d6b8cc52df4113ccfeb339fc7e34ca45a62df49ee5f24e70a5e3503 SHA512 0a1ab6513a3ab150d0a249e61027edca34bfb42c0c6ad3480f2c9b43493f37610f0ebf503d06e3d069207a491d42d9aca544afb54ca2f2f3fc78e48171b82979 WHIRLPOOL 59c4bda706c1bf5b9599c4567339bb5f95d461dccec4d51ac8be98ae8104e7962033c99018bfec375d7773ebacfe2d8c1fd6bbb7caeebe09b51fdc095a8ac2bd
-DIST thunderbird-38.1.0-pt-BR.xpi 443773 SHA256 8160379e9ff6319939e7a9e2d37c0a7f66f436796f16c0c3ef8a70f1a2e17ea0 SHA512 d36e43092058e352a0c6c3d605cd48c80d62266fe5ff6870a8032b3ae8aa7c5c779896a65db22a4c331adfe3b31669f160ed33602cd6d0e1635442580105f5b0 WHIRLPOOL a6439044cc8b936d32f113d93b305424c7c3a1e5fe6954291e08f932275d1afbfa9ebe9e7428971768d1294d51a69cd0e5db743316c70a6cc8a81a2b4048ddd8
-DIST thunderbird-38.1.0-pt-PT.xpi 442063 SHA256 d6354d745df58c48d15792c35aa8f4874d11bff0980df6b567de58f659357efe SHA512 451c6221d5a1acac6c2b68f2be0a833486904cc8236d1cf68000b4ef2c2e3bab1ddf623c21c67f6335bfd7003a92e1efc84f5961e452907ab39d934d4bdb0316 WHIRLPOOL c93e1c58e8ddbf7c3adcfc4d92037ecaee99f24ef3f32a35b51e4f9f59698f1865dfaff9290e613867ec391c5f46a6a84914722724f326529577b892ec1f2882
-DIST thunderbird-38.1.0-rm.xpi 442112 SHA256 fbc4bb3603cd5927c98e82ca83e830bd0c0807cc63ee0215f60e1cea66cc4400 SHA512 b5a9435a3de499154b5113f48b59c7caba6d216bd17d74d41abf9cd308f7262392cbdc9647d4df4958d9a8c770cc6a0325ee50b6f5a7a9c2bbfdac25cf414e10 WHIRLPOOL d3c671ad440b88bf6de4009bc86994ab959f5106629a13c071566fd79e748b2a63ac0add8789950545619bd29f5627f0bac2f57d7104d3c004e89c0cd727e245
-DIST thunderbird-38.1.0-ro.xpi 448347 SHA256 2e768e1a2e9ae04bafea1948c19b2b6e83f436f3a2841a94550f95bde7b30b42 SHA512 4c8d92655e25e3aa897d6ee82ab603867ce5ff94cfa3a9905752406b01c4e21f3555d3925398d36927bb03b409f963484303ae281f1865fd8c43a4dcc3943b68 WHIRLPOOL efc5fd7df29e3b76ccd17730dc5161c9f208d386e8e32fe2cbd7a6c07d51ce4ace8bf74d457feaa86a3a19899b0ae5338f0144981cb726ec96dfe06fcfdaf477
-DIST thunderbird-38.1.0-ru.xpi 437591 SHA256 85ab5454186b1a35c1268a8854b2407f1a260857a092de2cdc1c0fb84e278104 SHA512 0af66f2923376e8aa3d646923347538451ef8239933052a5f6b984e7b805e2d664881613ffb805b000d04b02c54f8e59ff7138f9f0d68f7c327ed5657df21805 WHIRLPOOL 6ef4ceab17f8ec824f38c7eb3b41bc5f998239928ec1aa4796f296d03639f2780927366ae715459b2d43ab30550f8a9f78e723dafa25f04654f423baca845b05
-DIST thunderbird-38.1.0-si.xpi 535362 SHA256 8df4c4ca6dbb901f419b69b37da8b0762483e080513b6cebe0d4424444f6ce25 SHA512 ceaaff93b4b55961d5d6a30aa801d16487193bde9c42b5b58a57cbbbd3476aee8c3955a90c353f30121480d738d2b8bf0ed40cb6132be3f5d0ddadb47bc088c0 WHIRLPOOL 3e65b4a10d0d948b3ccb1b8728c730c797486505b2a5557cbc14e0adb1fa8f60c8638161ad94bd5818db291190c06b4ceb3222445ff66360e7e502957bdb4fbe
-DIST thunderbird-38.1.0-sk.xpi 456606 SHA256 8b34d932a49e56cc47b9dae57f7a515b40bcc1ae4efa50f1dd275855abb30659 SHA512 d4078fe186924846b3f98b76518bb3aa1075b7ad023060ab42f680d0058a5f5496958b2e6038cb8f52174cefba7951d3608b40d806a978363bbd9a212e4d1327 WHIRLPOOL 27ade9ad8d1b9e6524b4dd5b6f5d354b28f1af4c72136569c1127a0edfcb256c6ccda33a2dd6fbc32350d1dd15e9e5843a45b67f82be81eab633ebd48332f446
-DIST thunderbird-38.1.0-sl.xpi 437847 SHA256 7d2bbe2b04052165bde61b4e24f2c928460f914a57c8bec36d3496de67d5dd66 SHA512 bf5f55c46957297d56d3c061552c18ef42e5c39376d2a69340e052a6cb4f9be1685a3631263102444317e3e3d74a83e16498619439a8bb2f79bc64187c84c683 WHIRLPOOL af214ee8d40ba59535047d6cebea0135f52df57ab3d28f17e2f7e665c22408b858f37d41579fbbb20b098da649a46ab687ffe087d8ab1e5197f12db961b95431
-DIST thunderbird-38.1.0-sq.xpi 446896 SHA256 0e41b9ab3ec7853e3c8d19ad6380598ccc4d04884426f64be577a045f876cdd6 SHA512 41daf3b6c0b30d171017d9ac929de4d31ad1e9966509f319a2ab998865e699c7c433f8a6158cedf93d06e376b78ccb4d20081d7de50023590670ff18e21d8f94 WHIRLPOOL a1c6a72faaa7d9be63cf0bb30ac131207f3d1af1f8c21c5d18662141a6b44d20a9046ad73a7dd8829aca9f89fd01ec56db55c8e55e04d29844728ed8410d5ace
-DIST thunderbird-38.1.0-sr.xpi 543336 SHA256 c2d6d4a751580f2107aaeec7f23584ca7a8803cd15289fbf863d124a1801ffee SHA512 bcea2e30e0cd9a2327913fb472537fbbbf40e179270859cb3739bebbb14bc91c15566de46d0dd3a2f867944c68fd06243f5d2530d7da1b70b1e14186db5e46ce WHIRLPOOL d3725d45a9d8e811c956f584603299819a719b371dfd5d69d7e4692d106379078b2f33d6581e37f61097196e52797639dba8a4b9d48becf114976765b27baf33
-DIST thunderbird-38.1.0-sv-SE.xpi 439633 SHA256 59cfe9b9ee411b92e288d0050ba3baddd5bc7bb779ed4fbff7681ae252053133 SHA512 455ac778423c502dc3b7512312c7838b03175fa46c541a28ef0228735a8e13fa4e3f0cdeb1d1b4fa5b147515d2789278d3f9504f86143d99fa444febcc90ed66 WHIRLPOOL a5399a91265c8bcd9042cff5884673bbbd0d1205b32e70e9f7d4efcaa55b08a1ce9053a177bade67ab30f0853172ebcc2c7d979756c752cdfbb2c669f953d19c
-DIST thunderbird-38.1.0-ta-LK.xpi 558759 SHA256 891b12e9f7722c570189c0c47a814e96ac3ef9e16b2d50625a4766085649d16f SHA512 eb9fce88f57b0b2ea2ff79968a502dadf757483688d498bdeeb64a2a1a5d5d33918adab3af5aef53dd15fbf9c18b4f6196a64580b089d8fe84f9d9180146ed92 WHIRLPOOL 494e95f5ebc90872c340b65bf6b65b7640863c6033dd36f5ef84fb729031ad485a7fa9b8b16b536800c959b80da024aa6563507c09c95daad5df6ffba407ede0
-DIST thunderbird-38.1.0-tr.xpi 447799 SHA256 5b42a203b0a6938a9967ce982fb800bd4db8ef0d2def1b9966e1352e843729fc SHA512 8be8b566c9c53f3bd3ab4f6121bc0b4f5c8c718d2ec52e4ed7bf673844668cfd35b44c99a7a96703fb7f7dc26c8eb26ed50cce5428fc4bbc2735d57709dbe8e0 WHIRLPOOL 5359fa06fa12527a9f718c6a35be88eb874f41206269ee4e71b2ff5d96285a62c030d041eb3284cd12e9d32bb1563277c36233c3fa46eeb18de5d8bde673b974
-DIST thunderbird-38.1.0-uk.xpi 509621 SHA256 e32214709147900c4336af83dce5445614b72d4059dad67b6f703a0853ec2ad1 SHA512 53ee0b14851faf57127bd84aa2a9113b05ada16a85b81f589786f264819e79c93e0e250ed46405cb94c2cc7b509a5b85ab92071fb8876fd03e3362cd613869ac WHIRLPOOL 78e834301e45df4940c1f1d9109fd629d32c1ed1120365297f709019c294d6e20cd75edbbce318e435ff7dcbd1fb1273cd318e25b8f05868adc64325dea916b4
-DIST thunderbird-38.1.0-vi.xpi 519864 SHA256 6d9b056f1d13e7dd95b79780c65e202c5c428f87e206370a5264644579a41626 SHA512 baf9551168ad25f6fe07be1798bf9256313211d3722a18e49ac8f6d4f266ea9379be1561ac5a4e798ac8c908cdd143e5423e3f81e57d7ad074577ec191df5c12 WHIRLPOOL 067a004abf19e12b6e17d1e2d7b54d19037ed53906e2c1fa655c5b10ba5474d71926d566a7254cf870a1cd2e3e8e6b286f176b09c971bee75ef493d26320a883
-DIST thunderbird-38.1.0-zh-CN.xpi 466411 SHA256 9d00bbc2f01c6974877923f9d770e16112b5e859788a728a7244052361f1ea7b SHA512 f6b42fc98b12bb821ac86c1e860e4191636d67b1647810fef45804fe4530131531a1b5e3a0212fa8a97d53c2d89611fa3f316517f3f1dcb12f8ebd4f52c3225d WHIRLPOOL d8e4e527a19883aa64fc19b55761fd2506464c3223f1ead63943c3564bf5228542d2639c52446a738ca538a13e913707ca0ade4500b4e5e500ab06f713182903
-DIST thunderbird-38.1.0-zh-TW.xpi 466660 SHA256 65dd33db3a18a4f8eeb54b953650a3a592a8821765e44888849f15531bcf88ca SHA512 9cc890a50c5ba199e0a1fea9b9245895b1bda8f9a73e38c60191536113a960f8eef9c0d9c46bbf6b06451109fe60dee4e88136520291581229b8b302dfaee4a8 WHIRLPOOL 9e47e59b80ab8e947e8ecf8f0a02e76a9b1b92916701582e9c2995bf1eba8063497f05abb2ea75df05cff7181970357db24908e43fcad003e19138aca7a5a939
-DIST thunderbird-38.1.0.source.tar.bz2 204161689 SHA256 ddf1fd6048f07370bb0375eac76e687c19d29100c19e9f86fc04bb88d4409787 SHA512 9b83873a06ac9d6c01222e9079b8c1b6dbd25594cd1c134b20ba44d06d209a764ff8a1549b5a6f2c53b27cb3779374dd95c6c8f51f415a07b45b7dcf5dfd576f WHIRLPOOL ecf40449657f91175316020dcc3d74f5e57350ad28fe50137872ea5671088110a0033b51a73fafb28f9c131193583688c03cae17ccd45e9628020648773757b0
DIST thunderbird-38.2.0-ar.xpi 475296 SHA256 9098f6665f740fc371a5bf4dcdd04f729f30a7d52354a210e691292d09c9c748 SHA512 108f023f773f6845bddae8ffaa5a7aecf5d46960d433567c5dc81ec7be308796c99848eedcec552471b1fb2c6a33ac6e0ef47087cc5ae0c823af9e6f4e94064a WHIRLPOOL b5b81f3b4df6f53594ac442f60a3cc0259b1719967b1d0b354b4e6e727143a22186c007502f192cb313565bfbe4ed486a77c53577563ee82529fef729737aab6
DIST thunderbird-38.2.0-ast.xpi 405894 SHA256 d84deb50ad04d47895ef48496da0c8f06442575b16500eec79a57e42cb470219 SHA512 dac004afbe52c34cdb5ff4937950c235c04c345295b713750b2ef28cfa6ce60c58025773aa522ea8fab28c793be715d7a6e4b672c781ba94a5f8260d85ceb29d WHIRLPOOL aa465a441d0cf752d14de33793135fd0310843340ce92935addf209dfe0673915b35c3c2bf5a1f47900856c4be86c7f92df3b46886a9e3b2bebe5f6433d22a51
DIST thunderbird-38.2.0-be.xpi 442474 SHA256 2144494aa25681d9dd6fe123615d5b2abf3c6aeb76e9885d2a3eb05557958a22 SHA512 a65919652c75879e1a9da19041b10b8066d37a757134f7ea66b171ce69e4b6005e7ea0ce605d40e793662fd0501ca6fd9dbc5010c6c917ffe6a85b0f66625716 WHIRLPOOL cd561f3ad87d14625e951c2ef691408c6a0a2bc61f0b2a9e3b75b2f7112f6cd69a4c6f3680a8552dd8768fc51e1bc70197ea35c4010f383f478188059418564d
diff --git a/mail-client/thunderbird/thunderbird-38.1.0.ebuild b/mail-client/thunderbird/thunderbird-38.1.0.ebuild
deleted file mode 100644
index f7dfc3a..0000000
--- a/mail-client/thunderbird/thunderbird-38.1.0.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="4.0.1"
-MOZ_LIGHTNING_GDATA_VER="1.9"
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
-nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
-uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
- MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-# Enigmail version
-EMVER="1.8.2"
-
-# Patches
-PATCH="thunderbird-38.0-patches-0.1"
-PATCHFF="firefox-38.0-patches-0.3"
-
-MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit flag-o-matic toolchain-funcs mozconfig-v6.38 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz )
-SRC_URI="${SRC_URI}
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
- ${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
- lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
- crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
- ${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-CDEPEND="
- >=dev-libs/nss-3.19.2
- >=dev-libs/nspr-4.10.8
- !x11-plugins/enigmail
- crypt? ( || (
- ( >=app-crypt/gnupg-2.0
- || (
- app-crypt/pinentry[gtk]
- app-crypt/pinentry[qt4]
- )
- )
- =app-crypt/gnupg-1.4*
- ) )"
-
-DEPEND="${CDEPEND}
- amd64? ( ${ASM_DEPEND}
- virtual/opengl )
- x86? ( ${ASM_DEPEND}
- virtual/opengl )"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-thunderbird )
-"
-
-if [[ ${PV} =~ beta ]]; then
- S="${WORKDIR}/comm-beta"
-else
- S="${WORKDIR}/comm-esr${PV%%.*}"
-fi
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-pkg_setup() {
- moz_pkgsetup
-
- export MOZILLA_DIR="${S}/mozilla"
-
- if ! use bindist ; then
- elog "You are enabling official branding. You may not redistribute this build"
- elog "to any users on your network or the internet. Doing so puts yourself into"
- elog "a legal problem with Mozilla Foundation"
- elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
- elog
- fi
-}
-
-pkg_pretend() {
- # Ensure we have enough disk space to compile
- CHECKREQS_DISK_BUILD="4G"
- check-reqs_pkg_setup
-
- if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
- ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
- ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
- ewarn "Please ensure you know what you are doing. If you don't, please consider"
- ewarn "emerging the package with USE=-jit"
- fi
-}
-
-src_unpack() {
- unpack ${A}
-
- # Unpack language packs
- mozlinguas_src_unpack
-
- xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
- # this version of gdata-provider is a .tar.xz , no xpi needed
- #use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
-}
-
-src_prepare() {
- # Apply our Thunderbird patchset
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/thunderbird"
-
- # Apply our patchset from firefox to thunderbird as well
- pushd "${S}"/mozilla &>/dev/null || die
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/firefox"
- popd &>/dev/null || die
-
- # Ensure that are plugins dir is enabled as default
- sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
- "${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
- sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
- "${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
- # Don't exit with error when some libs are missing which we have in
- # system.
- sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
- -i "${S}"/mail/installer/Makefile.in || die
-
- # Don't error out when there's no files to be removed:
- sed 's@\(xargs rm\)$@\1 -f@' \
- -i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
-
- # Shell scripts sometimes contain DOS line endings; bug 391889
- grep -rlZ --include="*.sh" $'\r$' . |
- while read -r -d $'\0' file ; do
- einfo edos2unix "${file}"
- edos2unix "${file}"
- done
-
- # Allow user to apply any additional patches without modifing ebuild
- epatch_user
-
- # Confirm the version of lightning being grabbed for langpacks is the same
- # as that used in thunderbird
- local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
- if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
- eqawarn "The version of lightning used for localization differs from the version"
- eqawarn "in thunderbird. Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
- eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
- fi
-
- eautoreconf
- # Ensure we run eautoreconf in mozilla to regenerate configure
- cd "${S}"/mozilla || die
- eautoconf
- cd "${S}"/mozilla/js/src || die
- eautoconf
-}
-
-src_configure() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- MEXTENSIONS="default"
-
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- mozconfig_config
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Add full relro support for hardened
- use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --disable-mailnews
- mozconfig_annotate '' --enable-calendar
-
- # Other tb-specific settings
- mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
- mozconfig_annotate '' --with-user-appdir=.thunderbird
-
- mozconfig_use_enable ldap
-
- mozlinguas_mozconfig
-
- # Bug #72667
- if use mozdom; then
- MEXTENSIONS="${MEXTENSIONS},inspector"
- fi
-
- # Use an objdir to keep things organized.
- echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
- # Finalize and report settings
- mozconfig_final
-
- ####################################
- #
- # Configure and build
- #
- ####################################
-
- # Disable no-print-directory
- MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-cxxflags -fno-stack-protector
- fi
-
- if use crypt; then
- pushd "${WORKDIR}"/enigmail &>/dev/null ||die
- econf
- popd &>/dev/null ||die
- fi
-}
-
-src_compile() {
- mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
- emake -f "${S}"/client.mk
-
- # Only build enigmail extension if crypt enabled.
- if use crypt ; then
- einfo "Building enigmail"
- pushd "${WORKDIR}"/enigmail &>/dev/null || die
- emake -j1
- emake -j1 xpi
- popd &>/dev/null || die
- fi
-}
-
-src_install() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
- declare emid
- cd "${BUILD_OBJ_DIR}" || die
-
- # Copy our preference before omnijar is created.
- cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
- "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
- || die
-
- # Set default path to search for dictionaries.
- echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
- >> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
- || die
-
- # Pax mark xpcshell for hardened support, only used for startupcache creation.
- pax-mark m "${BUILD_OBJ_DIR}"/mozilla/dist/bin/xpcshell
-
- MOZ_MAKE_FLAGS="${MAKEOPTS}" \
- emake DESTDIR="${D}" install
-
- # Install language packs
- mozlinguas_src_install
-
- if ! use bindist; then
- newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
- domenu "${FILESDIR}"/icon/${PN}.desktop
- else
- newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
- newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
- ${PN}.desktop
-
- sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
- "${ED}"/usr/share/applications/${PN}.desktop
- fi
-
- local emid
- # stage extra locales for lightning and install over existing
- mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
- "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
- emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
- mkdir -p "${T}/${emid}" || die
- cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
- insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
- doins -r "${T}/${emid}"
-
- if use lightning; then
- # move lightning out of distribution/extensions and into extensions for app-global install
- mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
- # stage extra locales for gdata-provider and install app-global
- mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
- "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
- emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
- mkdir -p "${T}/${emid}" || die
- cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
- insinto ${MOZILLA_FIVE_HOME}/extensions
- doins -r "${T}/${emid}"
- fi
-
- if use crypt ; then
- local enigmail_xpipath="${WORKDIR}/enigmail/build"
- cd "${T}" || die
- unzip "${enigmail_xpipath}"/enigmail*.xpi install.rdf || die
- emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
- dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
- cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
- unzip "${enigmail_xpipath}"/enigmail*.xpi || die
- fi
-
- # Required in order for jit to work on hardened, for mozilla-31 and above
- use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
-
- # Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
- # continue to work as expected.
- pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-
- if use minimal; then
- rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
- die "Failed to remove sdk and headers"
- fi
-}
-
-pkg_postinst() {
- if use crypt; then
- local peimpl=$(eselect --brief --colour=no pinentry show)
- case "${peimpl}" in
- *gtk*|*qt*) ;;
- *) ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
- ewarn "You may be prompted for your password in an inaccessible shell!!"
- ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
- ;;
- esac
- fi
- elog
- elog "If you experience problems with plugins please issue the"
- elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
- elog "then restart thunderbird"
- if ! use lightning; then
- elog
- elog "If calendar fails to show up in extensions please open config editor"
- elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
- elog "fails to show the calendar extension after restarting with above change"
- elog "please file a bug report."
- fi
-}
diff --git a/mail-client/thunderbird/thunderbird-38.2.0.ebuild b/mail-client/thunderbird/thunderbird-38.2.0.ebuild
index c7a4cf9..eeda8df 100644
--- a/mail-client/thunderbird/thunderbird-38.2.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.2.0.ebuild
@@ -27,7 +27,7 @@
# Patches
PATCH="thunderbird-38.0-patches-0.1"
-PATCHFF="firefox-38.0-patches-0.3"
+PATCHFF="firefox-38.0-patches-04"
MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
diff --git a/mail-client/thunderbird/thunderbird-38.3.0.ebuild b/mail-client/thunderbird/thunderbird-38.3.0.ebuild
index 3aba969..2935377 100644
--- a/mail-client/thunderbird/thunderbird-38.3.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.3.0.ebuild
@@ -27,7 +27,7 @@
# Patches
PATCH="thunderbird-38.0-patches-0.1"
-PATCHFF="firefox-38.0-patches-0.3"
+PATCHFF="firefox-38.0-patches-04"
MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
@@ -37,7 +37,7 @@
DESCRIPTION="Thunderbird Mail Client"
HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index fd22ebe..195ffe3 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -1,2 +1,3 @@
DIST dcc-1.3.140.tar.Z 1681539 SHA256 19060563d3d72b70578d8f16e6780458d36f1a1db18a6d1e533bc42d80c38f24 SHA512 1c36bb32ae36480ded8306ca6a460a3070758397075cd6a4cee9c01a0e306ad371336037adf7759c8ef96f46b36c408699b7ec43b01268ac8e7c289d1e31d2e1 WHIRLPOOL 9415bd94a74b6e0d22ec323a8cf5227c08f5026c24b1530c7708321d092d5f0c58d6f3d5e7beb03d0dca948ea8c75cf3220d34e1b077030ee0b9b85c80644b64
DIST dcc-1.3.154.tar.Z 1711292 SHA256 bc2e1496ec04914690c1d6d9d0f8be0954551b4165d731eb2d07dad307269399 SHA512 703bd3de44ccff3f318239dc2ca26a285f83ae0340a91391bcc5b719c298e77c8122d1502665350ddfc9fb14f12d9b6a56cba422ff8985db9cee6c91091fb987 WHIRLPOOL 7595b36066d3a89b1d2f4952334f6abe7cc70a1c03ff06ac6596b8901b8590329c944c9eeb132ed6253a4841150308378bef87dc5b2b74495c92a283110e0b14
+DIST dcc-1.3.158.tar.Z 1714175 SHA256 596bb4a02800a87501818215e61ac877e4d5a31ec0c8c227f23438f6b6b831c6 SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599 WHIRLPOOL ba625cc91c02d8b919a297ec99e28e64ca3720b2dba1bc657ad30df6d8abb0d58614254ad4e48870cb301a4d6339a934746f64542e1bc4a2bee8a8328f80ae96
diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild
new file mode 100644
index 0000000..8648467
--- /dev/null
+++ b/mail-filter/dcc/dcc-1.3.158.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Distributed Checksum Clearinghouse"
+HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/"
+SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
+
+LICENSE="DCC GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" # ~amd64-fbsd
+IUSE="cgi ipv6 rrdtool milter"
+
+RDEPEND="dev-lang/perl
+ rrdtool? ( net-analyzer/rrdtool )
+ || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp )
+ milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )"
+DEPEND="sys-apps/sed
+ sys-devel/gcc
+ ${RDEPEND}"
+
+dcc_cgibin=/var/www/localhost/cgi-bin/dcc
+dcc_homedir=/var/dcc
+dcc_libexec=/usr/sbin
+dcc_man=/usr/share/man
+dcc_rundir=/var/run/dcc
+
+PATCHES=( "${FILESDIR}"/dcc-1.3.140-freebsd.patch )
+
+src_configure() {
+ tc-export CC AR RANLIB
+ local myconf
+ myconf="${myconf} --homedir=${dcc_homedir}"
+ myconf="${myconf} --bindir=/usr/bin"
+ myconf="${myconf} --libexecdir=${dcc_libexec}"
+ myconf="${myconf} --mandir=/usr/share/man"
+ myconf="${myconf} --with-updatedcc_pfile=${dcc_homedir}/updatecc.pfile"
+ myconf="${myconf} --with-installroot=${D}"
+ # sigh. should be DCC-MD5 but see line 486 in the shipped configure script
+ myconf="${myconf} --with-DDC-MD5"
+ myconf="${myconf} --with-uid=root"
+ myconf="${myconf} --enable-server"
+ myconf="${myconf} --enable-dccifd"
+ myconf="${myconf} --with-rundir=${dcc_rundir}"
+ myconf="${myconf} --with-db-memory=64"
+ myconf="${myconf} --with-max-db-mem=128"
+ myconf="${myconf} --with-max-log-size=0"
+ myconf="${myconf} --with-make-cmd=${MAKE:-make}"
+ myconf="${myconf} $(use_enable ipv6 IPv6)"
+ myconf="${myconf} $(use_with cgi cgibin ${dcc_cgibin})"
+ myconf="${myconf} $(use_enable milter dccm)"
+ use milter && myconf="${myconf} --with-sendmail="
+
+ einfo "Using config: ${myconf}"
+
+ # This is NOT a normal configure script.
+ ./configure ${myconf} || die "configure failed!"
+}
+
+moveconf() {
+ local into=/etc/dcc/
+ for i in $@; do
+ mv "${D}${dcc_homedir}/${i}" "${D}${into}"
+ dosym "${into}${i}" "${dcc_homedir}/${i}"
+ done
+}
+
+src_install() {
+ # stolen from the RPM .spec and modified for gentoo
+ MANOWN=root MANGRP=$(id -g -n root) export MANOWN MANGRP
+ BINOWN="${MANOWN}" BINGRP="${MANGRP}" export BINOWN BINGRP
+ DCC_PROTO_HOMEDIR="${D}${dcc_homedir}" export DCC_PROTO_HOMEDIR
+ DCC_CGIBINDIR="${D}${dcc_cgibin}" export DCC_CGIBINDIR
+ DCC_SUID="${BINOWN}" DCC_OWN="${BINOWN}" DCC_GRP="${BINGRP}" export DCC_SUID DCC_OWN DCC_GRP
+
+ dodir /etc/cron.daily "${dcc_homedir}" /usr/bin /usr/sbin /usr/share/man/man{0,8} /etc/dcc
+ if use cgi ; then
+ dodir "${dcc_cgibin}"
+ fi
+ keepdir /var/log/dcc
+
+ # This package now takes "${D}" at compile-time!
+ # make DESTDIR="${D}" DCC_BINDIR="${D}"/usr/bin MANDIR="${D}"/usr/share/man/man DCC_HOMEDIR="${D}"${dcc_homedir} install || die
+ emake install
+
+ # branding and setting reasonable defaults
+ sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \
+ -e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \
+ -e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \
+ -e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \
+ -e "s/DCCM_ARGS=\$/DCCM_ARGS='-SHELO -Smail_host -SSender -SList-ID'/;" \
+ -e "s/DCCIFD_ARGS=\$/DCCIFD_ARGS=\"\$DCCM_ARGS\"/;" \
+ -e 's/DCCIFD_ENABLE=off/DCCIFD_ENABLE=on/' \
+ -e 's/DBCLEAN_LOGDAYS=14/DBCLEAN_LOGDAYS=1/' \
+ -i "${D}${dcc_homedir}/dcc_conf"
+
+ if use milter ; then
+ # enable milter
+ sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \
+ "${D}${dcc_homedir}"/dcc_conf
+ fi
+
+ # provide cronjob
+ mv "${D}"/usr/sbin/cron-dccd "${D}"/etc/cron.daily/dccd || die "mv failed"
+
+ # clean up
+ mv "${D}"/usr/sbin/logger "${D}"/usr/sbin/logger-dcc || die "mv failed"
+
+ statslist="${D}/usr/sbin/{dcc-stats-graph,dcc-stats-init,dcc-stats-collect}"
+ if ! use rrdtool; then
+ # remove rrdtool interface scripts
+ eval rm -f ${statslist} || die "Failed to clean up rrdtool scripts"
+ fi
+
+ # clean up
+ rm -f "${D}"/usr/sbin/{rcDCC,updatedcc}
+
+ # place configuration files into /etc instead of /var/dcc
+ moveconf dcc_conf flod grey_flod grey_whitelist ids map map.txt whiteclnt whitecommon whitelist
+
+ newinitd "${FILESDIR}"/dcc.initd-1.3.154 dcc
+ newconfd "${FILESDIR}"/dcc.confd dcc
+
+ rmdir "${D}"/var/dcc/log/
+
+ dodoc CHANGES RESTRICTIONS
+ dohtml *.html
+ doman *.{0,8}
+}
diff --git a/mail-filter/gld/gld-1.7-r3.ebuild b/mail-filter/gld/gld-1.7-r3.ebuild
new file mode 100644
index 0000000..cdcff43
--- /dev/null
+++ b/mail-filter/gld/gld-1.7-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A standalone anti-spam greylisting algorithm on top of Postfix"
+HOMEPAGE="http://www.gasmi.net/gld.html"
+SRC_URI="http://www.gasmi.net/down/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libressl postgres"
+# Not adding a mysql USE flag. The package defaults to it, so we will too.
+DEPEND="sys-libs/zlib
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ !postgres? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:*[server] )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i gld.conf \
+ -e 's:^LOOPBACKONLY=.*:LOOPBACKONLY=1:' \
+ -e 's:^#USER=.*:USER=nobody:' \
+ -e 's:^#GROUP=.*:GROUP=nobody:' \
+ || die "sed gld.conf failed"
+
+ sed -i Makefile.in \
+ -e '/ -c /{s|-O2|$(CFLAGS)|g}' \
+ -e '/ -o /{s|-O2|$(CFLAGS) $(LDFLAGS)|g}' \
+ -e '/strip/d' \
+ || die "sed Makefile.in failed"
+
+ sed -i tables.{my,pg}sql \
+ -e '/ip char/s/16/39/' \
+ || die "sed sql tables failed"
+}
+
+src_configure() {
+ tc-export CC
+ # It's kind of weird. $(use_with postgres pgsql) won't work if you don't
+ # use it...
+ if use postgres ; then
+ myconf="${myconf} --with-pgsql"
+ fi
+
+ econf ${myconf}
+}
+
+src_install() {
+ dobin gld
+
+ insinto /etc
+ newins gld.conf gld.conf.example
+
+ dodoc HISTORY README*
+
+ insinto /usr/share/${PN}/sql
+ doins *.pgsql *-whitelist.sql "${FILESDIR}"/tables.sql
+
+ newinitd "${FILESDIR}"/gld.rc gld
+}
+
+pkg_preinst() {
+ elog "Please read the README file in /usr/share/doc/${PF} for"
+ elog "details on how to setup gld."
+ elog
+ elog "The sql files have been installed to /usr/share/${PN}/sql."
+ if [[ $REPLACING_VERSIONS == "1.7-r1" ]]; then
+ elog "You might want to use the ALTER_TABLE command to change the"
+ elog "ip field width to 39 chars to accomodate ipv6 addresses."
+ elog "Please see your sql server documentation."
+ fi
+}
diff --git a/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild b/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
new file mode 100644
index 0000000..a91b2c8
--- /dev/null
+++ b/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="An IMAP mail filtering utility"
+HOMEPAGE="http://imapfilter.hellug.gr"
+SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="libressl"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ dev-libs/libpcre
+ dev-lang/lua:*"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README samples/*"
+
+src_prepare() {
+ sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
+ -e "/^MANDIR/s:man:share/man:" \
+ -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
+ -e "/^CFLAGS/s/-O//" \
+ src/Makefile || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ default
+ doman doc/imapfilter.1 doc/imapfilter_config.5
+}
diff --git a/mail-filter/imapfilter/imapfilter-2.5.7.ebuild b/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
index 0fafc17..90abab6 100644
--- a/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
@@ -14,9 +14,9 @@
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-RDEPEND="dev-libs/openssl
+RDEPEND="dev-libs/openssl:0
dev-libs/libpcre
- >=dev-lang/lua-5.1"
+ dev-lang/lua:*"
DEPEND="${RDEPEND}"
DOCS="AUTHORS NEWS README samples/*"
diff --git a/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild b/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild
new file mode 100644
index 0000000..4fac329
--- /dev/null
+++ b/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils eutils toolchain-funcs
+
+DESCRIPTION="DomainKeys Identified Mail library from Alt-N Inc"
+HOMEPAGE="http://libdkim.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="Apache-2.0 yahoo-patent-license-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl static-libs"
+
+DEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ app-arch/unzip"
+RDEPEND="
+ !mail-filter/libdkim-exim
+ dev-libs/openssl"
+
+S="${WORKDIR}/${PN}/src"
+
+src_prepare() {
+ ecvs_clean
+ cp "${FILESDIR}"/debianize/* "${S}"
+ epatch "${FILESDIR}"/patches/*.patch
+ epatch "${FILESDIR}"/libdkim-extra-options.patch
+
+ # Bug 476772
+ if ! use static-libs; then
+ sed -i \
+ -e '/^TARGETS/s/libdkim.a//' \
+ -e '/install -m 644 libdkim.a/d' \
+ Makefile.in || die 'sed on Makefile.in failed'
+ fi
+
+ # Bug 476770
+ tc-export AR
+
+ autotools-utils_src_prepare
+}
+
+src_install() {
+ autotools-utils_src_install
+ dodoc ../README
+}
diff --git a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.7.1-r1.ebuild b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.7.1-r1.ebuild
new file mode 100644
index 0000000..4249381
--- /dev/null
+++ b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.7.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Extra tables, filters, and various other addons for OpenSMTPD"
+HOMEPAGE="https://github.com/OpenSMTPD/OpenSMTPD-extras"
+SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz"
+
+LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+MY_COMPONENTS="
+ filter-clamav
+ filter-dkim-signer
+ filter-dnsbl
+ filter-lua
+ filter-monkey
+ filter-pause
+ filter-perl
+ filter-python
+ filter-regex
+ filter-spamassassin
+ filter-stub
+ filter-trace
+ filter-void
+
+ queue-null
+ queue-python
+ queue-ram
+ queue-stub
+
+ scheduler-python
+ scheduler-ram
+ scheduler-stub
+
+ table-ldap
+ table-mysql
+ table-passwd
+ table-postgres
+ table-python
+ table-redis
+ table-socketmap
+ table-sqlite
+ table-stub
+"
+IUSE="${MY_COMPONENTS} libressl luajit"
+
+# Deps:
+# mysql needs -lmysqlclient
+# sqlite needs -lsqlite3
+# redis needs -lhiredis
+# postgres requires -lpq
+# ldap uses internal library and requires no deps
+# spamassassin uses internal library and requires no deps
+# clamav uses internal library and requires no deps
+# dnsbl needs -lasr
+# python requires python, currently pegged at 2.7
+# lua requires any lua version
+
+DEPEND="mail-mta/opensmtpd
+ dev-libs/libevent
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ filter-python? ( dev-lang/python:2.7 )
+ filter-perl? ( dev-lang/perl )
+ filter-lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:* ) )
+ filter-dnsbl? ( net-libs/libasr )
+ table-sqlite? ( dev-db/sqlite:3 )
+ table-mysql? ( virtual/mysql )
+ table-postgres? ( dev-db/postgresql:* )
+ table-redis? ( dev-libs/hiredis )
+ table-python? ( dev-lang/python:2.7 )
+ scheduler-python? ( dev-lang/python:2.7 )
+ queue-python? ( dev-lang/python:2.7 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ eautoreconf
+}
+src_configure() {
+ econf \
+ --with-privsep-user=smtpd \
+ --with-privsep-path=/var/empty \
+ --sysconfdir=/etc/opensmtpd \
+ --with-lua-type=$(usex luajit luajit lua) \
+ $(for use in $MY_COMPONENTS; do use_with $use; done)
+}
diff --git a/mail-filter/policyd/policyd-1.82-r2.ebuild b/mail-filter/policyd/policyd-1.82-r2.ebuild
new file mode 100644
index 0000000..55092b8
--- /dev/null
+++ b/mail-filter/policyd/policyd-1.82-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Policy daemon for postfix and other MTAs"
+HOMEPAGE="http://policyd.sf.net/"
+
+# This is not available through SF mirrors
+SRC_URI="http://policyd.sourceforge.net/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="libressl"
+DEPEND="virtual/mysql
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-post182.patch"
+ epatch "${FILESDIR}/${PN}-makefile.patch"
+ sed -i -e "s/gcc/$(tc-getCC)/" Makefile
+
+ ebegin "Applying config patches"
+ sed -i -e s:UID=0:UID=65534:g \
+ -e s:GID=0:GID=65534:g \
+ -e s:DAEMON=0:DAEMON=1:g \
+ -e s:DEBUG=3:DEBUG=0:g \
+ -e s:DATABASE_KEEPALIVE=0:DATABASE_KEEPALIVE=1:g \
+ policyd.conf || die "sed failed"
+ eend
+}
+
+src_compile() {
+ emake build || die "emake build failed"
+}
+
+src_install() {
+ insopts -o root -g nobody -m 0750
+ mv cleanup policyd_cleanup
+ mv stats policyd_stats
+
+ dosbin policyd policyd_cleanup policyd_stats
+
+ insopts -o root -g nobody -m 0640
+ insinto /etc
+ doins policyd.conf
+
+ insopts -o root -g nobody -m 0700
+ exeinto /etc/cron.hourly
+ newexe "${FILESDIR}/${PN}-cleanup.cron" ${PN}-cleanup.cron
+
+ dodoc ChangeLog DATABASE.mysql README doc/support.txt
+
+ newinitd "${FILESDIR}/${PN}.rc" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
+
+pkg_postinst() {
+ elog "You will need to create the database using the script DATABASE.mysql"
+ elog "in /usr/share/doc/${PF}/"
+ elog "Read the mysql section of the README.txt for details."
+ elog
+ elog "To use policyd with postfix, update your /etc/postfix/main.cf file by adding"
+ elog " check_policy_service inet:127.0.0.1:10031"
+ elog "to your smtpd_recipient_restrictions line, or similar."
+ elog
+ elog "Also remember to start the daemon at boot:"
+ elog " rc-update add policyd default"
+ elog
+ elog "Read the documentation for more info."
+}
diff --git a/mail-filter/popfile/popfile-1.1.3-r1.ebuild b/mail-filter/popfile/popfile-1.1.3-r1.ebuild
new file mode 100644
index 0000000..ac4e44b
--- /dev/null
+++ b/mail-filter/popfile/popfile-1.1.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Anti-spam bayesian filter"
+HOMEPAGE="http://getpopfile.org"
+SRC_URI="http://getpopfile.org/downloads/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cjk ipv6 libressl mysql ssl xmlrpc"
+
+RDEPEND="virtual/perl-Digest-MD5
+ virtual/perl-MIME-Base64
+ dev-perl/DBD-SQLite
+ dev-perl/HTML-Tagset
+ dev-perl/HTML-Template
+ dev-perl/TimeDate
+ dev-perl/DBI
+ virtual/perl-Digest
+ cjk? ( dev-perl/Encode-compat
+ dev-perl/Text-Kakasi )
+ mysql? ( dev-perl/DBD-mysql )
+ ipv6? ( dev-perl/IO-Socket-INET6 )
+ ssl? ( !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ dev-perl/IO-Socket-SSL
+ dev-perl/Net-SSLeay )
+ xmlrpc? ( dev-perl/PlRPC )"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ local f
+ for f in `find ./ -type f`; do
+ edos2unix "${f}"
+ done
+}
+
+src_install() {
+ dodoc *.change*
+ rm -rf *.change* license
+
+ insinto /usr/share/${PN}
+ doins -r *
+
+ fperms 755 /usr/share/${PN}/{popfile,insert,pipe,bayes}.pl
+
+ dosbin "${FILESDIR}"/${PN}
+}
diff --git a/mail-filter/postfwd/files/postfwd.service b/mail-filter/postfwd/files/postfwd.service
new file mode 100644
index 0000000..376e8d2
--- /dev/null
+++ b/mail-filter/postfwd/files/postfwd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Postfix firewall daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/postfwd2 --shortlog --summary=600 --cache=600 --cache-rbl-timeout=3600 --cleanup-requests=1200 --cleanup-rbls=1800 --cleanup-rates=1200 --daemon --file=/etc/postfwd/postfwd.cf --interface=127.0.0.1 --port=10040 --pidfile=/var/run/postfwd.pid --user=postfwd --group=postfwd
+ExecStop=/usr/sbin/postfwd2 --file=/etc/postfwd/postfwd.cf --pidfile=/var/run/postfwd.pid --kill
+ExecReload=/usr/sbin/postfwd2 --file=/etc/postfwd/postfwd.cf --pidfile=/var/run/postfwd.pid --reload
+
+[Install]
+WantedBy=multi-user.target
diff --git a/mail-filter/postfwd/postfwd-1.35-r2.ebuild b/mail-filter/postfwd/postfwd-1.35-r2.ebuild
deleted file mode 100644
index 2886529..0000000
--- a/mail-filter/postfwd/postfwd-1.35-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Versatile Postfix policy server with a flexible ruleset based configuration"
-HOMEPAGE="http://www.postfwd.org/"
-SRC_URI="http://www.postfwd.org/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+tools"
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5.16.3
- virtual/perl-Sys-Syslog
- dev-perl/Net-DNS
- dev-perl/net-server
-"
-
-pkg_setup() {
- enewgroup postfwd
- enewuser postfwd -1 -1 -1 postfwd
-}
-
-src_install() {
- local BIN="postfwd2"
- # programs and tools
- dosbin "${S}"/sbin/${BIN}
-
- # man pages and documentation
- doman "${S}"/man/man8/${BIN}.8
- dodoc "${S}"/doc/{${BIN}.CHANGELOG,${BIN}.txt}
-
- # example configuration(s)
- insinto /usr/share/doc/${PF}/examples
- newins "${S}"/etc/${PN}.cf.sample ${PN}.cf.dist
-
- # plugins
- dodoc -r "${S}"/plugins
-
- # tools
- if use tools; then
- dodoc -r "${S}"/tools
- fi
-
- # init script and respective configuration file
- newinitd "${FILESDIR}"/${PN}.init ${PN}
- newconfd "${FILESDIR}"/${PN}.conf ${PN}
-}
-
-pkg_postinst() {
- einfo
- einfo "${PN} has no default configuration for safety reasons. Every"
- einfo "mail system is different, so you should craft a set of rules"
- einfo "that is suitable for your environment and save it to:"
- einfo " /etc/postfix/postfwd.cf"
- einfo "You can find example configurations in:"
- einfo " /usr/share/doc/${PF}/examples"
- einfo
- einfo "If you want ${PN} to start on system boot, you have to add it your"
- einfo "default run level:"
- einfo " # rc-update add postfwd default"
- einfo "Also remember to edit /etc/conf.d/${PN} to your liking."
- einfo
- einfo "A plugins sampe folder has been placed under:"
- einfo
- einfo " /usr/share/doc/${PF}/plugins"
-
- if use tools; then
- einfo
- einfo "You can find additional tools for testing ${PN} in:"
- einfo " /usr/share/doc/${PF}/tools"
- fi
-
- ewarn
- ewarn "Please read the documentation carefully and properly test new"
- ewarn "rulesets before putting them into production use. Otherwise you"
- ewarn "risk accidental mail loss or worse."
- ewarn
- ewarn "Visit http://www.postfwd.org/ for more information."
- ewarn
-}
diff --git a/mail-filter/postfwd/postfwd-1.35-r3.ebuild b/mail-filter/postfwd/postfwd-1.35-r3.ebuild
new file mode 100644
index 0000000..a35f890
--- /dev/null
+++ b/mail-filter/postfwd/postfwd-1.35-r3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user systemd
+
+DESCRIPTION="Versatile Postfix policy server with a flexible ruleset based configuration"
+HOMEPAGE="http://www.postfwd.org/"
+SRC_URI="http://www.postfwd.org/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+tools"
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.16.3
+ virtual/perl-Sys-Syslog
+ dev-perl/Net-DNS
+ dev-perl/net-server
+"
+
+pkg_setup() {
+ enewgroup postfwd
+ enewuser postfwd -1 -1 -1 postfwd
+}
+
+src_install() {
+ local BIN="postfwd2"
+ # programs and tools
+ dosbin "${S}"/sbin/${BIN}
+
+ # man pages and documentation
+ doman "${S}"/man/man8/${BIN}.8
+ dodoc "${S}"/doc/{${BIN}.CHANGELOG,${BIN}.txt}
+
+ # example configuration(s)
+ insinto /usr/share/doc/${PF}/examples
+ newins "${S}"/etc/${PN}.cf.sample ${PN}.cf.dist
+
+ # plugins
+ dodoc -r "${S}"/plugins
+
+ # tools
+ if use tools; then
+ dodoc -r "${S}"/tools
+ fi
+
+ # start scripts script and respective configuration file
+ newinitd "${FILESDIR}"/${PN}.init ${PN}
+ newconfd "${FILESDIR}"/${PN}.conf ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+ einfo
+ einfo "${PN} has no default configuration for safety reasons. Every"
+ einfo "mail system is different, so you should craft a set of rules"
+ einfo "that is suitable for your environment and save it to:"
+ einfo " /etc/postfix/postfwd.cf"
+ einfo "You can find example configurations in:"
+ einfo " /usr/share/doc/${PF}/examples"
+ einfo
+ einfo "If you want ${PN} to start on system boot, you have to add it your"
+ einfo "default run level:"
+ einfo " # rc-update add postfwd default"
+ einfo "Also remember to edit /etc/conf.d/${PN} to your liking."
+ einfo
+ einfo "A plugins sampe folder has been placed under:"
+ einfo
+ einfo " /usr/share/doc/${PF}/plugins"
+
+ if use tools; then
+ einfo
+ einfo "You can find additional tools for testing ${PN} in:"
+ einfo " /usr/share/doc/${PF}/tools"
+ fi
+
+ ewarn
+ ewarn "Please read the documentation carefully and properly test new"
+ ewarn "rulesets before putting them into production use. Otherwise you"
+ ewarn "risk accidental mail loss or worse."
+ ewarn
+ ewarn "Visit http://www.postfwd.org/ for more information."
+ ewarn
+}
diff --git a/mail-filter/postgrey/Manifest b/mail-filter/postgrey/Manifest
index f00f663..5515ab9 100644
--- a/mail-filter/postgrey/Manifest
+++ b/mail-filter/postgrey/Manifest
@@ -1,2 +1,3 @@
DIST postgrey-1.34.tar.gz 36399 SHA256 9a9ee2f4e3cbbf15642e47802407c810ac5c54f0ad1572ebec3f0f645eb35707 SHA512 df6cf0c3bf6835591aad00bde13330ee4030b965c90a01a27dfafb5eac1f008dcfb9001dbfcf70a6209b91af7a571b38392b69db2212f112d888a565e9b703cb WHIRLPOOL 92eade9af5ac0589ffd0c63b89b36ac8b64b5f862f601cbfa10c66137ea46624ff5af0b96cbcef2f004cb19028fd90c406f4ec164440e53f4f1122c3cdd427e3
DIST postgrey-1.35.tar.gz 36610 SHA256 f6a6956630803e6f79ebff6ad0cc0d46ba32046ed6cc260e38e6f591de7bbdcf SHA512 fa9844f6ca7395c02cbc1f234d0efbeafb80ebbebc763966d375bb32e7768d9c987d8c95d1e8dc9da933832feb9948b4086cf5a31f24d3764e9678333abe6c8f WHIRLPOOL c969bf93747cb197bd6efef4b4dd7d979f489663a235e7723dc015005c8b059b23d0bde7c8ba08a3ad1da7a5957e98da7170e4405019c633c91aadb3ed016c6c
+DIST postgrey-1.36.tar.gz 38797 SHA256 a22bf8c42518d802a32b070332b7ca3aed985ff4f9a59cd04028c56988585f26 SHA512 9b2502b873658c1ef8a86bff091d61b8dc8d66f7395bc0a869f9e6ec60b691a317c084ae326f49ce8dd926f0fa2620a58f3ad76c25e1b1c9606557d2802d1395 WHIRLPOOL 9b8e8e74422608acbf901fa32b69eedea6cb5a8053c1d84d8ecc08c03776ca0805c9b4188de5db5b2d707b48c80a42a9e3a9050305273f159ce2828c80dfe870
diff --git a/mail-filter/postgrey/metadata.xml b/mail-filter/postgrey/metadata.xml
index ccb3728..2d56b3e 100644
--- a/mail-filter/postgrey/metadata.xml
+++ b/mail-filter/postgrey/metadata.xml
@@ -11,6 +11,11 @@
<email>qnikst@gentoo.org</email>
<name>Alexander Vershilov</name>
</maintainer>
+ <maintainer>
+ <email>lists@xunil.at</email>
+ <name>Stefan Weichinger</name>
+ <description>Proxy maintainer under the proxy-maintainers herd</description>
+ </maintainer>
<longdescription>Postgrey is a Postfix policy server implementing greylisting developed by David Schweikert at the ISG.EE.</longdescription>
<use>
<flag name='targrey'>Enables the targrey patch</flag>
diff --git a/mail-filter/postgrey/postgrey-1.35-r1.ebuild b/mail-filter/postgrey/postgrey-1.35-r1.ebuild
deleted file mode 100644
index c5a9e3c..0000000
--- a/mail-filter/postgrey/postgrey-1.35-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting"
-HOMEPAGE="http://postgrey.schweikert.ch/"
-SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz
-http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="targrey"
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5.6.0
- dev-perl/net-server
- dev-perl/IO-Multiplex
- dev-perl/BerkeleyDB
- dev-perl/Net-DNS
- dev-perl/Parse-Syslog
- dev-perl/Net-RBLClient
- virtual/perl-Digest-SHA
- >=sys-libs/db-4.1"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_prepare() {
- if use targrey ; then
- epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch
- fi
- # bug 479400
- sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed"
-}
-
-src_install() {
- # postgrey data/DB in /var
- diropts -m0770 -o ${PN} -g ${PN}
- dodir /var/spool/postfix/${PN}
- keepdir /var/spool/postfix/${PN}
- fowners postgrey:postgrey /var/spool/postfix/${PN}
- fperms 0770 /var/spool/postfix/${PN}
-
- # postgrey binary
- dosbin ${PN}
- dosbin contrib/postgreyreport
-
- # policy-test script
- dosbin policy-test
-
- # postgrey data in /etc/postfix
- insinto /etc/postfix
- insopts -o root -g ${PN} -m 0640
- doins postgrey_whitelist_clients postgrey_whitelist_recipients
-
- # documentation
- dodoc Changes README README.exim
-
- # init.d + conf.d files
- insopts -o root -g root -m 755
- newinitd "${FILESDIR}"/${PN}-1.34-r3.rc.new ${PN}
- insopts -o root -g root -m 640
- newconfd "${FILESDIR}"/${PN}.conf.new ${PN}
-}
diff --git a/mail-filter/postgrey/postgrey-1.36.ebuild b/mail-filter/postgrey/postgrey-1.36.ebuild
new file mode 100644
index 0000000..d52c1f3
--- /dev/null
+++ b/mail-filter/postgrey/postgrey-1.36.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd user
+
+DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting"
+HOMEPAGE="http://postgrey.schweikert.ch/"
+SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz
+http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="targrey"
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.6.0
+ dev-perl/net-server
+ dev-perl/IO-Multiplex
+ dev-perl/BerkeleyDB
+ dev-perl/Net-DNS
+ dev-perl/Parse-Syslog
+ dev-perl/Net-RBLClient
+ virtual/perl-Digest-SHA
+ >=sys-libs/db-4.1"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_prepare() {
+ if use targrey ; then
+ epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch
+ fi
+ # bug 479400
+ sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed"
+}
+
+src_install() {
+ # postgrey data/DB in /var
+ diropts -m0770 -o ${PN} -g ${PN}
+ dodir /var/spool/postfix/${PN}
+ keepdir /var/spool/postfix/${PN}
+ fowners postgrey:postgrey /var/spool/postfix/${PN}
+ fperms 0770 /var/spool/postfix/${PN}
+
+ # postgrey binary
+ dosbin ${PN}
+ dosbin contrib/postgreyreport
+
+ # policy-test script
+ dosbin policy-test
+
+ # postgrey data in /etc/postfix
+ insinto /etc/postfix
+ insopts -o root -g ${PN} -m 0640
+ doins postgrey_whitelist_clients postgrey_whitelist_recipients
+
+ # documentation
+ dodoc Changes README README.exim
+
+ # init.d + conf.d files
+ insopts -o root -g root -m 755
+ newinitd "${FILESDIR}"/${PN}-1.34-r3.rc.new ${PN}
+ insopts -o root -g root -m 640
+ newconfd "${FILESDIR}"/${PN}.conf.new ${PN}
+ systemd_dounit "${FILESDIR}"/postgrey.service
+}
diff --git a/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild b/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild
new file mode 100644
index 0000000..c38bf17
--- /dev/null
+++ b/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="A milter-based application to provide Sender-ID verification service"
+HOMEPAGE="http://sourceforge.net/projects/sid-milter/"
+SRC_URI="mirror://sourceforge/sid-milter/${P}.tar.gz"
+
+LICENSE="Sendmail-Open-Source"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 libressl"
+
+DEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ >=sys-libs/db-3.2:*
+ || ( mail-filter/libmilter mail-mta/sendmail )"
+RDEPEND="${DEPEND}
+ sys-apps/openrc"
+
+pkg_setup() {
+ enewgroup milter
+ # mail-milter/spamass-milter creates milter user with this home directory
+ # For consistency reasons, milter user must be created here with this home directory
+ # even though this package doesn't need a home directory for this user (#280571)
+ enewuser milter -1 -1 /var/lib/milter milter
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-nopra_on_spf1.patch
+ epatch "${FILESDIR}"/${P}-as-needed.patch
+
+ local CC="$(tc-getCC)"
+ local ENVDEF=""
+ use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
+ sed -e "s:@@CC@@:${CC}:" \
+ -e "s:@@CFLAGS@@:${CFLAGS}:" \
+ -e "s:@@LDFLAGS@@:${LDFLAGS}:" \
+ -e "s:@@ENVDEF@@:${ENVDEF}:" \
+ "${FILESDIR}/gentoo-config.m4" > "${S}/devtools/Site/site.config.m4" \
+ || die "failed to generate site.config.m4"
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ dodir /usr/bin
+ emake -j1 DESTDIR="${D}" SUBDIRS=sid-filter \
+ SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
+ install
+
+ newinitd "${FILESDIR}/sid-filter.init-r1" sid-filter
+ newconfd "${FILESDIR}/sid-filter.conf" sid-filter
+
+ # man build is broken; do man page installation by hand
+ doman */*.8
+
+ # some people like docs
+ dodoc RELEASE_NOTES *.txt sid-filter/README
+}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r1.ebuild
new file mode 100644
index 0000000..a1641e7
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.4.1-r1.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit perl-module toolchain-funcs eutils systemd readme.gentoo
+
+MY_P=Mail-SpamAssassin-${PV//_/-}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="An extensible mail filter which can identify and tag spam"
+HOMEPAGE="http://spamassassin.apache.org/"
+SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="+bayes berkdb libressl qmail ssl doc ldap mysql postgres sqlite ipv6"
+
+# You can do without a database unless you need the Bayes features.
+REQUIRED_USE="bayes? ( || ( berkdb mysql postgres sqlite ) )"
+
+DEPEND=">=dev-lang/perl-5.8.8-r8
+ virtual/perl-MIME-Base64
+ >=virtual/perl-Pod-Parser-1.510.0-r2
+ virtual/perl-Storable
+ virtual/perl-Time-HiRes
+ >=dev-perl/HTML-Parser-3.43
+ >=dev-perl/Mail-DKIM-0.37
+ >=dev-perl/Net-DNS-0.53
+ dev-perl/Digest-SHA1
+ dev-perl/libwww-perl
+ >=virtual/perl-Archive-Tar-1.23
+ app-crypt/gnupg
+ >=virtual/perl-IO-Zlib-1.04
+ >=dev-util/re2c-0.12.0
+ dev-perl/Mail-SPF
+ >=dev-perl/NetAddr-IP-4.0.1
+ dev-perl/Geo-IP
+ dev-perl/Encode-Detect
+ dev-perl/Net-Patricia
+ ssl? (
+ dev-perl/IO-Socket-SSL
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ berkdb? (
+ virtual/perl-DB_File
+ )
+ ldap? ( dev-perl/perl-ldap )
+ mysql? (
+ dev-perl/DBI
+ dev-perl/DBD-mysql
+ )
+ postgres? (
+ dev-perl/DBI
+ dev-perl/DBD-Pg
+ )
+ sqlite? (
+ dev-perl/DBI
+ dev-perl/DBD-SQLite
+ )
+ ipv6? (
+ || ( dev-perl/IO-Socket-INET6
+ virtual/perl-IO-Socket-IP )
+ )"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"
+
+src_prepare() {
+ # Merged upstream
+ #epatch "${FILESDIR}/net-dns-0.76_compatibility.patch"
+ perl-module_src_prepare
+}
+
+src_configure() {
+ # - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
+ # (just to be sure, nobody knows how it could happen in the first place).
+ myconf="SYSCONFDIR=${EPREFIX}/etc"
+ myconf+=" DATADIR=${EPREFIX}/usr/share/spamassassin"
+
+ # If ssl is enabled, spamc can be built with ssl support.
+ if use ssl; then
+ myconf+=" ENABLE_SSL=yes"
+ else
+ myconf+=" ENABLE_SSL=no"
+ fi
+
+ # Set the path to the Perl executable explictly. This will be used to
+ # create the initial sharpbang line in the scripts and might cause
+ # a versioned app name end in there, see
+ # <https://bugs.gentoo.org/show_bug.cgi?id=62276>
+ myconf+=" PERL_BIN=${EPREFIX}/usr/bin/perl"
+
+ # Setting the following env var ensures that no questions are asked.
+ perl-module_src_configure
+ # Configure spamc
+ emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
+}
+
+src_compile() {
+ export PERL_MM_USE_DEFAULT=1
+
+ # Now compile all the stuff selected.
+ perl-module_src_compile
+
+ if use qmail; then
+ emake spamc/qmail-spamc
+ fi
+}
+
+src_install () {
+ perl-module_src_install
+
+ # Create the stub dir used by sa-update and friends
+ keepdir /var/lib/spamassassin
+
+ # Move spamd to sbin where it belongs.
+ dodir /usr/sbin
+ mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd || die "move spamd failed"
+
+ if use qmail; then
+ dobin spamc/qmail-spamc
+ fi
+
+ ln -s mail/spamassassin "${ED}"/etc/spamassassin || die
+
+ # Disable plugin by default
+ sed -i -e 's/^loadplugin/\#loadplugin/g' \
+ "${ED}"/etc/mail/spamassassin/init.pre \
+ || die "failed to disable plugins by default"
+
+ # Add the init and config scripts.
+ newinitd "${FILESDIR}"/3.3.1-spamd.init spamd
+ newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
+
+ systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+ systemd_install_serviced "${FILESDIR}"/${PN}.service.conf
+
+ if use postgres; then
+ sed -i -e 's:@USEPOSTGRES@::' "${ED}/etc/init.d/spamd" || die
+
+ dodoc sql/*_pg.sql
+ else
+ sed -i -e '/@USEPOSTGRES@/d' "${ED}/etc/init.d/spamd" || die
+ fi
+
+ if use mysql; then
+ sed -i -e 's:@USEMYSQL@::' "${ED}/etc/init.d/spamd" || die
+
+ dodoc sql/*_mysql.sql
+ else
+ sed -i -e '/@USEMYSQL@/d' "${ED}/etc/init.d/spamd" || die
+ fi
+
+ dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \
+ sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \
+ sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
+ spamd-apache2/README.apache
+
+ # Rename some docu files so they don't clash with others
+ newdoc spamd/README README.spamd
+ newdoc sql/README README.sql
+ newdoc ldap/README README.ldap
+
+ if use qmail; then
+ dodoc spamc/README.qmail
+ fi
+
+ insinto /etc/mail/spamassassin/
+ insopts -m0400
+ newins "${FILESDIR}"/secrets.cf secrets.cf.example
+
+ cat <<-EOF > "${T}/local.cf.example"
+ # Sensitive data, such as database connection info, should be stored in
+ # /etc/mail/spamassassin/secrets.cf with appropriate permissions
+EOF
+
+ insopts -m0644
+ doins "${T}/local.cf.example"
+}
+
+pkg_postinst() {
+ elog "If you plan on using the -u flag to spamd, please read the notes"
+ elog "in /etc/conf.d/spamd regarding the location of the pid file."
+ elog
+ elog "If you build ${PN} with optional dependancy support,"
+ elog "you can enable them in /etc/mail/spamassassin/init.pre"
+ elog
+ elog "You need to configure your database to be able to use Bayes filter"
+ elog "with database backend, otherwise it will still use (and need) the"
+ elog "Berkeley DB support."
+ elog "Look at the sql/README.bayes file in the documentation directory"
+ elog "for how to configure it."
+ elog
+ elog "If you plan to use Vipul's Razor, note that versions up to and"
+ elog "including version 2.82 include a bug that will slow down the entire"
+ elog "perl interpreter. Version 2.83 or later fixes this."
+ elog "If you do not plan to use this plugin, be sure to comment out"
+ elog "its loadplugin line in /etc/mail/spamassassin/v310.pre."
+ elog
+ elog "The DKIM plugin is now enabled by default for new installs,"
+ elog "if the perl module Mail::DKIM is installed."
+ elog "However, installation of SpamAssassin will not overwrite existing"
+ elog ".pre configuration files, so to use DKIM when upgrading from a"
+ elog "previous release that did not use DKIM, a directive:"
+ elog
+ elog "loadplugin Mail::SpamAssassin::Plugin::DKIM"
+ elog "will need to be uncommented in file 'v312.pre', or added"
+ elog "to some other .pre file, such as local.pre."
+ elog
+ ewarn "Rules are no longer included with SpamAssassin out of the box".
+ ewarn "You will need to immediately run sa-update, or download"
+ ewarn "the additional rules .tgz package and run sa-update --install"
+ ewarn "with it, to get a ruleset."
+ elog
+ elog "If you run sa-update and receive a GPG validation error."
+ elog "Then you need to import an updated sa-update key."
+ elog "sa-update --import /usr/share/spamassassin/sa-update-pubkey.txt"
+ elog
+}
diff --git a/mail-filter/spamdyke/metadata.xml b/mail-filter/spamdyke/metadata.xml
index 151d944..e8a572f 100644
--- a/mail-filter/spamdyke/metadata.xml
+++ b/mail-filter/spamdyke/metadata.xml
@@ -13,6 +13,6 @@
Best of all, using spamdyke does not require patching or recompiling qmail!
</longdescription>
<use>
- <flag name='tls'>Enables TLS protocol for spamdyke</flag>
+ <flag name='ssl'>Enables TLS protocol for spamdyke</flag>
</use>
</pkgmetadata>
diff --git a/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild
new file mode 100644
index 0000000..a37bc83
--- /dev/null
+++ b/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils autotools
+
+DESCRIPTION="A drop-in connection-time spam filter for qmail"
+HOMEPAGE="http://www.spamdyke.org/"
+SRC_URI="http://www.spamdyke.org/releases/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +ssl"
+
+DEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+RDEPEND="${DEPEND}
+ virtual/qmail"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc46.patch
+ echo "# Configuration option for ${PN}" > ${PN}.conf
+ if use ssl; then
+ echo "tls-certificate-file=/var/qmail/control/clientcert.pem" \
+ >> ${PN}.conf
+ fi
+ echo "graylist-level=always-create-dir" >> ${PN}.conf
+ echo "graylist-dir=/var/tmp/${PN}/graylist" >> ${PN}.conf
+ echo "reject-empty-rdns" >> ${PN}.conf
+ echo "reject-unresolvable-rdns" >> ${PN}.conf
+ echo "dns-blacklist-entry=zen.spamhaus.org" >> ${PN}.conf
+ echo "local-domains-file=/var/qmail/control/rcpthosts" >> ${PN}.conf
+ sed -i \
+ -e "/STRIP_CMD/d" \
+ Makefile.in || die "sed on Makefile.in failed"
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable ssl tls) || die "econf failed"
+ cd ../utils
+ econf || die "econf failed in utils"
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}" || die "emake failed"
+ cd ../utils
+ emake CFLAGS="${CFLAGS}" || die "emake in utils died"
+}
+
+src_install() {
+ dobin ${PN} || die "Installing ${PN} binary failed"
+ insinto /etc/${PN}
+ doins ${PN}.conf || die "Installing ${PN} configuration file failed"
+ dodir /var/tmp/${PN}/graylist
+ fowners -R qmaild /var/tmp/${PN}/graylist
+ cd ../utils
+ dobin domain2path || die "Installing domain2path binary failed"
+ cd ../documentation
+ dodoc {Changelog,INSTALL,UPGRADING}.txt
+ dohtml FAQ.html \
+ README.html \
+ README_ip_file_format.html \
+ README_rdns_directory_format.html \
+ README_rdns_file_format.html
+}
+
+pkg_postinst() {
+ elog "In /var/qmail/control/conf-smtpd insert the line:"
+ elog "QMAIL_SMTP_PRE=\"${QMAIL_SMTP_PRE} spamdyke -f /etc/${PN}/${PN}.conf\""
+ elog "Run spamdyke with the '-h' flag to see the available options and"
+ elog "update /etc/spamdyke/spamdyke.conf accordingly"
+}
diff --git a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
index e3491ca..18dbbc7 100644
--- a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
+++ b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="2"
+EAPI="5"
+
inherit eutils autotools
DESCRIPTION="A drop-in connection-time spam filter for qmail"
@@ -12,9 +13,9 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="+tls"
+IUSE="+ssl"
-DEPEND="tls? ( dev-libs/openssl )"
+DEPEND="ssl? ( dev-libs/openssl )"
RDEPEND="${DEPEND}
virtual/qmail"
@@ -23,7 +24,7 @@
src_prepare() {
epatch "${FILESDIR}"/${P}-gcc46.patch
echo "# Configuration option for ${PN}" > ${PN}.conf
- if use tls; then
+ if use ssl; then
echo "tls-certificate-file=/var/qmail/control/clientcert.pem" \
>> ${PN}.conf
fi
@@ -41,7 +42,7 @@
src_configure() {
econf \
- $(use_enable tls) || die "econf failed"
+ $(use_enable ssl tls) || die "econf failed"
cd ../utils
econf || die "econf failed in utils"
}
diff --git a/mail-mta/netqmail/netqmail-1.06-r3.ebuild b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
new file mode 100644
index 0000000..08dd2eb
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENQMAIL_PV=20080406
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20070417
+QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
+
+QMAIL_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+QMAIL_LARGE_DNS='qmail-103.patch'
+
+inherit eutils qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+HOMEPAGE="
+ http://netqmail.org
+ http://cr.yp.to/qmail.html
+ http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+ https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
+ http://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+ http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+ !vanilla? (
+ highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+ qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+ ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
+ )
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
+REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
+RESTRICT="test"
+
+DEPEND="
+ !mail-mta/qmail
+ net-mail/queue-repair
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ sys-apps/groff
+"
+RDEPEND="
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/mini-qmail
+ !mail-mta/msmtp[mta]
+ !mail-mta/nullmailer
+ !mail-mta/postfix
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !<mail-mta/ssmtp-2.64-r2
+ !>=mail-mta/ssmtp-2.64-r2[mta]
+ >=sys-apps/ucspi-tcp-0.88-r17
+ ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
+ virtual/daemontools
+ >=net-mail/dot-forward-0.71-r3
+ virtual/checkpassword
+ authcram? ( >=net-mail/cmd5checkpw-0.30 )
+ ${DEPEND}
+"
+
+pkg_setup() {
+ if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
+ eerror
+ eerror "The QMAIL_PATCH_DIR variable for custom patches"
+ eerror "has been removed from ${PN}. If you need custom patches"
+ eerror "you should create a copy of this ebuild in an overlay."
+ eerror
+ die "QMAIL_PATCH_DIR is not supported anymore"
+ fi
+
+ qmail_create_users
+}
+
+src_unpack() {
+ genqmail_src_unpack
+ use qmail-spp && qmail_spp_src_unpack
+
+ unpack ${P}.tar.gz
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PV}-exit.patch
+ epatch "${FILESDIR}"/${PV}-readwrite.patch
+ epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
+ epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
+
+ ht_fix_file Makefile*
+
+ if ! use vanilla; then
+ # This patch contains relative paths and needs to be cleaned up.
+ sed 's~^--- ../../~--- ~g' \
+ <"${DISTDIR}"/${QMAIL_TLS_F} \
+ >"${T}"/${QMAIL_TLS_F}
+ use ssl && epatch "${T}"/${QMAIL_TLS_F}
+ use ssl && epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+ use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
+
+ if use qmail-spp; then
+ if use ssl; then
+ epatch "${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
+ else
+ epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
+ fi
+ cd "${WORKDIR}"
+ epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
+ cd -
+ fi
+ fi
+
+ qmail_src_postunpack
+
+ # Fix bug #33818 but for netqmail (Bug 137015)
+ if ! use authcram; then
+ einfo "Disabled CRAM_MD5 support"
+ sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c
+ else
+ einfo "Enabled CRAM_MD5 support"
+ fi
+}
+
+src_compile() {
+ qmail_src_compile
+ use qmail-spp && qmail_spp_src_compile
+}
+
+src_install() {
+ qmail_src_install
+}
+
+pkg_postinst() {
+ qmail_queue_setup
+ qmail_rootmail_fixup
+ qmail_tcprules_build
+
+ qmail_config_notice
+ qmail_supervise_config_notice
+ elog
+ elog "If you are looking for documentation, check those links:"
+ elog "https://www.gentoo.org/doc/en/qmail-howto.xml"
+ elog " -- qmail/vpopmail Virtual Mail Hosting System Guide"
+ elog "http://www.lifewithqmail.com/"
+ elog " -- Life with qmail"
+ elog
+}
+
+pkg_preinst() {
+ qmail_tcprules_fixup
+}
+
+pkg_config() {
+ # avoid some weird locale problems
+ export LC_ALL=C
+
+ qmail_config_fast
+ qmail_tcprules_config
+ qmail_tcprules_build
+
+ use ssl && qmail_ssl_generate
+}
diff --git a/mail-mta/nullmailer/files/remotes.sample-1.13 b/mail-mta/nullmailer/files/remotes.sample-1.13
index 34cc234..d04aee2 100644
--- a/mail-mta/nullmailer/files/remotes.sample-1.13
+++ b/mail-mta/nullmailer/files/remotes.sample-1.13
@@ -1,7 +1,7 @@
# Format is: HOST PROTOCOL [OPTIONS]
# HOST = IP or DNS
# PROTOCOL = smtp | qmtp
-# OPTIONS = [--port=NUMBER] [--user] [--pass] [--starttls | --ssl [--insecure] ]
+# OPTIONS = [--port=NUMBER] [--user] [--pass] [--starttls | --ssl [--insecure] ]
#
# Examples:
# A standard SMTP server:
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 1e736f2..f33bba9 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -1 +1 @@
-DIST opensmtpd-5.7.2p1.tar.gz 708991 SHA256 daae044488d456b33aa9c84ebcc79aef2f9ab2d17ebe0c0f09e41e1f4b60d992 SHA512 ef9487ba38711fd2a4076022c8fef89c4daf0aac346a72814a9c17f20f830bcd3cba4d85da53867cbc726d2c10fd6773c907ae533e0e022165d7f4aa3bdf1260 WHIRLPOOL 3d5d3fff0f15b898219af62eb4152666120d60d528f3afa99d347be0fcdd58b9fe36694471cd4485d51041de53ee6249f4510e5a0af254794fe7465b8642cd44
+DIST opensmtpd-5.7.3p1.tar.gz 709178 SHA256 848a3c72dd22b216bb924b69dc356fc297e8b3671ec30856978950208cba74dd SHA512 e75ed2e148d25716df3af7b6746332c475eb671b91d3832b9a56b11a1e567749065f1332cd06d928cf6bd5122427cd33cc3e0f5f4e2bec0f2269db695be65b7e WHIRLPOOL 191fe5e30f71aa1076434f95b46c1ffbc893ef15d355c485bbb2df503d0af986af6602424ab04f984a9041ca6074cf975289e7708e1362fa483f423a6c1e0d51
diff --git a/mail-mta/opensmtpd/opensmtpd-5.7.3_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.7.3_p1-r1.ebuild
new file mode 100644
index 0000000..ef9a286
--- /dev/null
+++ b/mail-mta/opensmtpd/opensmtpd-5.7.3_p1-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
+
+DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
+HOMEPAGE="http://www.opensmtpd.org/"
+MY_P="${P}"
+if [ $(get_last_version_component_index) -eq 4 ]; then
+ MY_P="${PN}-$(get_version_component_range 4-)"
+fi
+SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
+
+LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl pam +mta"
+
+DEPEND="!libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ sys-libs/zlib
+ pam? ( virtual/pam )
+ sys-libs/db:=
+ dev-libs/libevent
+ app-misc/ca-certificates
+ net-mail/mailbase
+ net-libs/libasr
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/mini-qmail
+ !mail-mta/msmtp[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/postfix
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !mail-mta/ssmtp[mta]
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P/_}
+
+src_prepare() {
+ # Use /run instead of /var/run
+ sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
+
+ epatch_user
+ eautoreconf
+}
+
+src_configure() {
+ tc-export AR
+ AR="$(which "$AR")" econf \
+ --enable-table-db \
+ --with-privsep-user=smtpd \
+ --with-queue-user=smtpq \
+ --with-privsep-path=/var/empty \
+ --with-sock-dir=/run \
+ --sysconfdir=/etc/opensmtpd \
+ --with-ca-file=/etc/ssl/certs/ca-certificates.crt \
+ $(use_with pam)
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}"/smtpd.initd smtpd
+ systemd_dounit "${FILESDIR}"/smtpd.{service,socket}
+ use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
+ if use mta ; then
+ dodir /usr/sbin
+ dosym /usr/sbin/smtpctl /usr/sbin/sendmail
+ dosym /usr/sbin/smtpctl /usr/bin/sendmail
+ dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
+ fi
+}
+
+pkg_preinst() {
+ enewgroup smtpd 25
+ enewuser smtpd 25 -1 /var/empty smtpd
+ enewgroup smtpq 252
+ enewuser smtpq 252 -1 /var/empty smtpq
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"
+ einfo "Redis, and many other useful addons and filters are"
+ einfo "available in the mail-filter/opensmtpd-extras package."
+ einfo
+}
diff --git a/mail-mta/opensmtpd/opensmtpd-5.7.2_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.7.3_p1.ebuild
similarity index 100%
rename from mail-mta/opensmtpd/opensmtpd-5.7.2_p1.ebuild
rename to mail-mta/opensmtpd/opensmtpd-5.7.3_p1.ebuild
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index e109db0..c1bf414 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,7 +1,6 @@
-DIST postfix-2.10.8.tar.gz 3819748 SHA256 2fb5af2f1e0add13a9b20c58f8a84c0d76a7a3aa85719cb3e580617fc14d48e6 SHA512 72984e9cf9557f2f1050e12ca7033f9dadd15ae4e7d07b49df455eff8a9d3b8ebbc1cc56013bcf2918526f7764f6d3a7cc87c268041d157138d3e255c03fe5f1 WHIRLPOOL 35db7b5c090ab9e99c96634db821be5b3f1c7578281a1bd3efa4ff2427b5d6686a9eeea3d6db59ff8832fd5ab0af51c6c151e95810730943aa3cdd93134781cf
-DIST postfix-2.11.6.tar.gz 4030414 SHA256 77f35574c78cf5ac468061c38037c4f858ead7554e2314e7760c30328f08591e SHA512 8bb318b2e2e1611b764889f2c263e24fb81dc3cb324682a0debee0d7babb85560245962da9a528b69715425a5b5f8d0402e14652b32ad99b76f2860c0110064e WHIRLPOOL ac5ebabdfcc6af0dfb6b2c5aaee45626c254bcfc401bf4a84db1c536a9316434692d3884ab46019ea841120a7d0f66c1d3008d4b03d7053d2e94b9f7793de5fc
-DIST postfix-3.0.0.tar.gz 4239248 SHA256 c2f2f10aa3e6b7090ba979e9c515e42b3140c5c1c17a33d58787569df7ae0955 SHA512 ba5b67a8f03c6fe6bbb62e2aad981a6f3ba8266ea2fa93abfa5d31cdb20b2d5a47fc373f401b247ca2cb5a19e654f86b2a65fe906c102d729e472b6c5ff1cd7a WHIRLPOOL 1510a17f3376d77eb503b3adf47639f6466a38e20a06ebf7ae0ec6849dc2ea332377c82af816f298a2719bccc4917d14132ee9e11c14cbafa3ea53ec40056f50
-DIST postfix-3.0.1.tar.gz 4265677 SHA256 cd2bd6447fe3368bb1a39f482f8dd1eec87c63067a0eb75f9aec8e4eadd21328 SHA512 17916f6dc7113589b011dbf6a6bb54cb9f6d0d5f176fb3c877d4a5a09ac62c4faf088bf1eba0b41c6d2b9d55660fd4c52d4ba2a01f82db3679322756b6da6f37 WHIRLPOOL 3e0f28350a42428b7deae460d2312c90f84f82aaa7755207e1eba04ee7c3b276eaddbd8c8b705a38923ad29625a36aa06c80849ecc9201f4aa99e44811913790
+DIST postfix-2.10.9.tar.gz 3820525 SHA256 e47eb56db2d238b9c5a5147a516fa406ab6afb102cedb4bd08273e979ae95d82 SHA512 c77df7ccc051bd72271dc5298da0ca4e45397b1ba96fc8be31e095f5b15cd30ebc0b29cf638e76efc65503cb241efd937f2d64aaa97243402c35e2927b7a7b91 WHIRLPOOL 3a7acb90ae03366e2ed24dfbd2e07619f0694abe098a621c6f9202e4d43a968376b5a52f2a65223634cf921af0a7156b0272ca15ad188a1b61fe4fb9cc97cab7
+DIST postfix-2.11.7.tar.gz 4031689 SHA256 05828b5b846e48fdc80db67d85409066010614af521070df4733459fbf447e20 SHA512 a1e146db6d2d71abb1dd7c70cde24e6410b599458ffa8061a0161be9475452034d9dcc7ec3976042b379cd84f5ebdba2f9d8d829637ff376ccaf7e87bcabe7a3 WHIRLPOOL 990cf17bc8d0cb8c8de0aa42f16125b1393feb42ed2eca3cb66ddd4d0b5d9425f619ee22047745fdd2f0069dc321e942ecc326bfbb88519fccf4931f95b1c483
DIST postfix-3.0.2.tar.gz 4239235 SHA256 68256314202f5f0f24022d64f7ac664d28fa1394d07c84a37c3fc7a2d040be80 SHA512 b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4ce731a2ff6a632c3341ace43afe7f1600f2096592535cf9a300322f78c92000e752e0df7d3c39021 WHIRLPOOL 3fd230321577c0226926701a17803b038a281b46abe884899ca38ea18c5fd9c13ef90900e5fdd17db20ecf8dc63b373cb9f378f1402660be2908192900cba47a
-DIST postfix-3.1-20150924.tar.gz 4305500 SHA256 069f7e257c459babd3938ccd6e9422be89dab163edd6d5321e5fc5263b4f6e68 SHA512 8283137587703a82e58520e60b49f88052be6033df2b5daa61b221f8d2f41e76c51c4264353027df943c6575b801cba91282112fae53a15027f99f52e82c83aa WHIRLPOOL 7784635d33ed077de9b5c8d358086e5a8668561a145767b58fa9ac7ed8cd07ab5216cec249f11f05d80a171e6d2b35b3cf6a79ad295d4a83be7d35d77de84d58
+DIST postfix-3.0.3.tar.gz 4240588 SHA256 401e46ec3450569dcce60d1d8ca22a19ab1f7f817b0cc730cdf4875ba608ac02 SHA512 b6cd091a8cdda9678fa2979082e47a363dd086e4376effc0a427d1beb5eb35bd7dc28003ad28323c42318d7f630e0d8b105c56fd1a63bd5b5a20501db68ac524 WHIRLPOOL b013164f12e2adde464052f37584320687716f18c65cdd01344848bbcdd5a08be16c741234a063d717474a50be0d14d7b5574ccb69dc56e00f30b619d148c9f9
+DIST postfix-3.1-20151011.tar.gz 4306494 SHA256 afa2dcb6bcf6f6b101edb6a3cba3fd36742f18cd43bd069ac93febe1c95f988a SHA512 06718820d4b9db85a8d8596c89ba1cdc976f963e74d67e6056d70ef8f8bcf3372828d41f73759c6b5a07d2699ef410fc8273f3f45426c94c7b553beb682548d3 WHIRLPOOL fb49dc4ace947f22bfa8adfdde4c3412dbc3ad7ae14a2339627bd83049e2ecd2c09bc58c2b9efcdb58c088d2ba6c4f34d8b378750fc113cb87f8116887e94f61
DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
diff --git a/mail-mta/postfix/postfix-2.10.8.ebuild b/mail-mta/postfix/postfix-2.10.8.ebuild
deleted file mode 100644
index a18ee74..0000000
--- a/mail-mta/postfix/postfix-2.10.8.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator systemd
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
- vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="~mips ~s390"
-IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
- dev-lang/perl
- berkdb? ( >=sys-libs/db-3.2:* )
- cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
- ldap? ( net-nds/openldap )
- ldap-bind? ( net-nds/openldap[sasl] )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( >=dev-libs/openssl-0.9.6g:* )"
-
-RDEPEND="${DEPEND}
- dovecot-sasl? ( net-mail/dovecot )
- memcached? ( net-misc/memcached )
- net-mail/mailbase
- selinux? ( sec-policy/selinux-postfix )
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/opensmtpd
- !<mail-mta/ssmtp-2.64-r2
- !>=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/fastforward"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
- # Add postfix, postdrop user/group (bug #77565)
- enewgroup postfix 207
- enewgroup postdrop 208
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.11.1-db6.patch"
- if use vda; then
- epatch "${DISTDIR}"/${VDA_P}.patch
- fi
-
- sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
- src/util/sys_defs.h || die "sed failed"
-
- # change default paths to better comply with portage standard paths
- sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
- # Make sure LDFLAGS get passed down to the executables.
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread"
-
- use pam && mylibs="${mylibs} -lpam"
-
- if use ldap; then
- mycc="${mycc} -DHAS_LDAP"
- mylibs="${mylibs} -lldap -llber"
- fi
-
- if use mysql; then
- mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
- mylibs="${mylibs} $(mysql_config --libs)"
- fi
-
- if use postgres; then
- mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
- mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
- fi
-
- if use sqlite; then
- mycc="${mycc} -DHAS_SQLITE"
- mylibs="${mylibs} -lsqlite3"
- fi
-
- if use ssl; then
- mycc="${mycc} -DUSE_TLS"
- mylibs="${mylibs} -lssl -lcrypto"
- fi
-
- # broken. and "in other words, not supported" by upstream.
- # Use inet_protocols setting in main.cf
- #if ! use ipv6; then
- # mycc="${mycc} -DNO_IPV6"
- #fi
-
- if use sasl; then
- if use dovecot-sasl; then
- # Set dovecot as default.
- mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
- fi
- if use ldap-bind; then
- mycc="${mycc} -DUSE_LDAP_SASL"
- fi
- mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
- mylibs="${mylibs} -lsasl2"
- elif use dovecot-sasl; then
- mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- fi
-
- if ! use nis; then
- sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \
- src/util/sys_defs.h || die "sed failed"
- fi
-
- if ! use berkdb; then
- mycc="${mycc} -DNO_DB"
- if use cdb; then
- # change default hash format from Berkeley DB to cdb
- sed -i -e "s/hash/cdb/" src/util/sys_defs.h || die
- fi
- fi
-
- if use cdb; then
- mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
- CDB_LIBS=""
- # Tinycdb is preferred.
- if has_version dev-db/tinycdb ; then
- einfo "Building with dev-db/tinycdb"
- CDB_LIBS="-lcdb"
- else
- einfo "Building with dev-db/cdb"
- CDB_PATH="/usr/$(get_libdir)"
- for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
- CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
- done
- fi
- mylibs="${mylibs} ${CDB_LIBS}"
- fi
-
- # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
- # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
- mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
- filter-lfs-flags
-
- # Workaround for bug #76512
- if use hardened; then
- [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
- fi
-
- # Remove annoying C++ comment style warnings - bug #378099
- append-flags -Wno-comment
-
- sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
- sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
- emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
-}
-
-src_install () {
- local myconf
- use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
- html_directory=\"/usr/share/doc/${PF}/html\""
-
- /bin/sh postfix-install \
- -non-interactive \
- install_root="${D}" \
- config_directory="/etc/postfix" \
- manpage_directory="/usr/share/man" \
- command_directory="/usr/sbin" \
- mailq_path="/usr/bin/mailq" \
- newaliases_path="/usr/bin/newaliases" \
- sendmail_path="/usr/sbin/sendmail" \
- ${myconf} \
- || die "postfix-install failed"
-
- # Fix spool removal on upgrade
- rm -Rf "${D}"/var
- keepdir /var/spool/postfix
-
- # Install rmail for UUCP, closes bug #19127
- dobin auxiliary/rmail/rmail
-
- # Provide another link for legacy FSH
- dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
- # Install qshape tool
- dobin auxiliary/qshape/qshape.pl
- doman man/man1/qshape.1
-
- # Performance tuning tools and their manuals
- dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
- doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
- # Set proper permissions on required files/directories
- dodir /var/lib/postfix
- keepdir /var/lib/postfix
- fowners -R postfix:postfix /var/lib/postfix
- fperms 0750 /var/lib/postfix
- fowners root:postdrop /usr/sbin/post{drop,queue}
- fperms 02711 /usr/sbin/post{drop,queue}
-
- keepdir /etc/postfix
- if use mbox; then
- mypostconf="mail_spool_directory=/var/spool/mail"
- else
- mypostconf="home_mailbox=.maildir/"
- fi
- "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
- -e ${mypostconf} || die "postconf failed"
-
- insinto /etc/postfix
- newins "${FILESDIR}"/smtp.pass saslpass
- fperms 600 /etc/postfix/saslpass
-
- newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
- # do not start mysql/postgres unnecessarily - bug #359913
- use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
- use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
- dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
- use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
- pamd_mimic_system smtp auth account
-
- if use sasl; then
- insinto /etc/sasl2
- newins "${FILESDIR}"/smtp.sasl smtpd.conf
- fi
-
- # header files
- insinto /usr/include/postfix
- doins include/*.h
-
- # Remove unnecessary files
- rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
- rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
- # Postfix 2.9.
- # default for inet_protocols changed from ipv4 to all in postfix-2.9.
- # check inet_protocols setting in main.cf and modify if necessary to prevent
- # performance loss with useless DNS lookups and useless connection attempts.
- [[ -d ${ROOT}/etc/postfix ]] && {
- if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
- if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n inet_protocols)" ]];
- then
- ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
- ewarn "That will keep the same behaviour as previous postfix versions."
- ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
- else
- # delete inet_protocols setting. there is already one in /etc/postfix
- sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
- fi
- fi
- }
-}
-
-pkg_postinst() {
- # Do not install server.{key,pem) SSL certificates if they already exist
- if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
- && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
- install_cert /etc/ssl/postfix/server
- chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
- fi
-
- if [[ ! -e /etc/mail/aliases.db ]] ; then
- ewarn
- ewarn "You must edit /etc/mail/aliases to suit your needs"
- ewarn "and then run /usr/bin/newaliases. Postfix will not"
- ewarn "work correctly without it."
- ewarn
- fi
-
- if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 9 ]]; then
- elog "If you are using old style postfix instances by symlinking"
- elog "startup scripts in ${ROOT}etc/init.d, please consider"
- elog "upgrading your config for postmulti support. For more info:"
- elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
- if ! use berkdb; then
- ewarn "\nPostfix is installed without BerkeleyDB support."
- ewarn "Please turn on berkdb USE flag if you need hash or"
- ewarn "btree table lookups.\n"
- fi
- ewarn "Postfix daemons now live under /usr/libexec/postfix"
- ewarn "Please adjust your main.cf accordingly by running"
- ewarn "etc-update/dispatch-conf or similar and accepting the new"
- ewarn "daemon_directory setting."
- fi
-}
diff --git a/mail-mta/postfix/postfix-2.10.9.ebuild b/mail-mta/postfix/postfix-2.10.9.ebuild
new file mode 100644
index 0000000..a7d5a07
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.10.9.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator systemd
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.10.0"
+VDA_P="${PN}-vda-v13-${VDA_PV}"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
+ vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~mips ~s390"
+IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+DEPEND=">=dev-libs/libpcre-3.4
+ dev-lang/perl
+ berkdb? ( >=sys-libs/db-3.2:* )
+ cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
+ ldap? ( net-nds/openldap )
+ ldap-bind? ( net-nds/openldap[sasl] )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:* )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl:0 )"
+
+RDEPEND="${DEPEND}
+ dovecot-sasl? ( net-mail/dovecot )
+ memcached? ( net-misc/memcached )
+ net-mail/mailbase
+ selinux? ( sec-policy/selinux-postfix )
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/mini-qmail
+ !mail-mta/msmtp[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !mail-mta/opensmtpd
+ !<mail-mta/ssmtp-2.64-r2
+ !>=mail-mta/ssmtp-2.64-r2[mta]
+ !net-mail/fastforward"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+ # Add postfix, postdrop user/group (bug #77565)
+ enewgroup postfix 207
+ enewgroup postdrop 208
+ enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.11.1-db6.patch"
+ if use vda; then
+ epatch "${DISTDIR}"/${VDA_P}.patch
+ fi
+
+ sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+ src/util/sys_defs.h || die "sed failed"
+
+ # change default paths to better comply with portage standard paths
+ sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+ # Make sure LDFLAGS get passed down to the executables.
+ local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread"
+
+ use pam && mylibs="${mylibs} -lpam"
+
+ if use ldap; then
+ mycc="${mycc} -DHAS_LDAP"
+ mylibs="${mylibs} -lldap -llber"
+ fi
+
+ if use mysql; then
+ mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+ mylibs="${mylibs} $(mysql_config --libs)"
+ fi
+
+ if use postgres; then
+ mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+ mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
+ fi
+
+ if use sqlite; then
+ mycc="${mycc} -DHAS_SQLITE"
+ mylibs="${mylibs} -lsqlite3"
+ fi
+
+ if use ssl; then
+ mycc="${mycc} -DUSE_TLS"
+ mylibs="${mylibs} -lssl -lcrypto"
+ fi
+
+ # broken. and "in other words, not supported" by upstream.
+ # Use inet_protocols setting in main.cf
+ #if ! use ipv6; then
+ # mycc="${mycc} -DNO_IPV6"
+ #fi
+
+ if use sasl; then
+ if use dovecot-sasl; then
+ # Set dovecot as default.
+ mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+ fi
+ if use ldap-bind; then
+ mycc="${mycc} -DUSE_LDAP_SASL"
+ fi
+ mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+ mylibs="${mylibs} -lsasl2"
+ elif use dovecot-sasl; then
+ mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+ fi
+
+ if ! use nis; then
+ sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \
+ src/util/sys_defs.h || die "sed failed"
+ fi
+
+ if ! use berkdb; then
+ mycc="${mycc} -DNO_DB"
+ if use cdb; then
+ # change default hash format from Berkeley DB to cdb
+ sed -i -e "s/hash/cdb/" src/util/sys_defs.h || die
+ fi
+ fi
+
+ if use cdb; then
+ mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+ CDB_LIBS=""
+ # Tinycdb is preferred.
+ if has_version dev-db/tinycdb ; then
+ einfo "Building with dev-db/tinycdb"
+ CDB_LIBS="-lcdb"
+ else
+ einfo "Building with dev-db/cdb"
+ CDB_PATH="/usr/$(get_libdir)"
+ for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+ CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
+ done
+ fi
+ mylibs="${mylibs} ${CDB_LIBS}"
+ fi
+
+ # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+ # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+ mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ filter-lfs-flags
+
+ # Workaround for bug #76512
+ if use hardened; then
+ [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+ fi
+
+ # Remove annoying C++ comment style warnings - bug #378099
+ append-flags -Wno-comment
+
+ sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+ sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+ emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
+}
+
+src_install () {
+ local myconf
+ use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+ html_directory=\"/usr/share/doc/${PF}/html\""
+
+ /bin/sh postfix-install \
+ -non-interactive \
+ install_root="${D}" \
+ config_directory="/etc/postfix" \
+ manpage_directory="/usr/share/man" \
+ command_directory="/usr/sbin" \
+ mailq_path="/usr/bin/mailq" \
+ newaliases_path="/usr/bin/newaliases" \
+ sendmail_path="/usr/sbin/sendmail" \
+ ${myconf} \
+ || die "postfix-install failed"
+
+ # Fix spool removal on upgrade
+ rm -Rf "${D}"/var
+ keepdir /var/spool/postfix
+
+ # Install rmail for UUCP, closes bug #19127
+ dobin auxiliary/rmail/rmail
+
+ # Provide another link for legacy FSH
+ dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+ # Install qshape tool
+ dobin auxiliary/qshape/qshape.pl
+ doman man/man1/qshape.1
+
+ # Performance tuning tools and their manuals
+ dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+ doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+ # Set proper permissions on required files/directories
+ dodir /var/lib/postfix
+ keepdir /var/lib/postfix
+ fowners -R postfix:postfix /var/lib/postfix
+ fperms 0750 /var/lib/postfix
+ fowners root:postdrop /usr/sbin/post{drop,queue}
+ fperms 02711 /usr/sbin/post{drop,queue}
+
+ keepdir /etc/postfix
+ if use mbox; then
+ mypostconf="mail_spool_directory=/var/spool/mail"
+ else
+ mypostconf="home_mailbox=.maildir/"
+ fi
+ "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+ -e ${mypostconf} || die "postconf failed"
+
+ insinto /etc/postfix
+ newins "${FILESDIR}"/smtp.pass saslpass
+ fperms 600 /etc/postfix/saslpass
+
+ newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+ # do not start mysql/postgres unnecessarily - bug #359913
+ use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+ use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+ dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+ mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
+ use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+ pamd_mimic_system smtp auth account
+
+ if use sasl; then
+ insinto /etc/sasl2
+ newins "${FILESDIR}"/smtp.sasl smtpd.conf
+ fi
+
+ # header files
+ insinto /usr/include/postfix
+ doins include/*.h
+
+ # Remove unnecessary files
+ rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+ rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+ # Postfix 2.9.
+ # default for inet_protocols changed from ipv4 to all in postfix-2.9.
+ # check inet_protocols setting in main.cf and modify if necessary to prevent
+ # performance loss with useless DNS lookups and useless connection attempts.
+ [[ -d ${ROOT}/etc/postfix ]] && {
+ if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
+ if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n inet_protocols)" ]];
+ then
+ ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
+ ewarn "That will keep the same behaviour as previous postfix versions."
+ ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
+ else
+ # delete inet_protocols setting. there is already one in /etc/postfix
+ sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
+ fi
+ fi
+ }
+}
+
+pkg_postinst() {
+ # Do not install server.{key,pem) SSL certificates if they already exist
+ if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+ && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+ install_cert /etc/ssl/postfix/server
+ chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+ fi
+
+ if [[ ! -e /etc/mail/aliases.db ]] ; then
+ ewarn
+ ewarn "You must edit /etc/mail/aliases to suit your needs"
+ ewarn "and then run /usr/bin/newaliases. Postfix will not"
+ ewarn "work correctly without it."
+ ewarn
+ fi
+
+ if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 9 ]]; then
+ elog "If you are using old style postfix instances by symlinking"
+ elog "startup scripts in ${ROOT}etc/init.d, please consider"
+ elog "upgrading your config for postmulti support. For more info:"
+ elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
+ if ! use berkdb; then
+ ewarn "\nPostfix is installed without BerkeleyDB support."
+ ewarn "Please turn on berkdb USE flag if you need hash or"
+ ewarn "btree table lookups.\n"
+ fi
+ ewarn "Postfix daemons now live under /usr/libexec/postfix"
+ ewarn "Please adjust your main.cf accordingly by running"
+ ewarn "etc-update/dispatch-conf or similar and accepting the new"
+ ewarn "daemon_directory setting."
+ fi
+}
diff --git a/mail-mta/postfix/postfix-2.11.6.ebuild b/mail-mta/postfix/postfix-2.11.6.ebuild
deleted file mode 100644
index af0dc78..0000000
--- a/mail-mta/postfix/postfix-2.11.6.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
- vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
- dev-lang/perl
- berkdb? ( >=sys-libs/db-3.2:* )
- cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
- ldap? ( net-nds/openldap )
- ldap-bind? ( net-nds/openldap[sasl] )
- lmdb? ( >=dev-db/lmdb-0.9.11 )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( >=dev-libs/openssl-0.9.6g:* )"
-
-RDEPEND="${DEPEND}
- dovecot-sasl? ( net-mail/dovecot )
- memcached? ( net-misc/memcached )
- net-mail/mailbase
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/opensmtpd
- !<mail-mta/ssmtp-2.64-r2
- !>=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/fastforward
- selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
- # Add postfix, postdrop user/group (bug #77565)
- enewgroup postfix 207
- enewgroup postdrop 208
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.11.1-db6.patch"
- if use vda; then
- epatch "${DISTDIR}"/${VDA_P}.patch
- fi
-
- sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
- src/util/sys_defs.h || die "sed failed"
-
- # change default paths to better comply with portage standard paths
- sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-
- epatch_user
-}
-
-src_configure() {
- # Make sure LDFLAGS get passed down to the executables.
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread"
-
- use pam && mylibs="${mylibs} -lpam"
-
- if use ldap; then
- mycc="${mycc} -DHAS_LDAP"
- mylibs="${mylibs} -lldap -llber"
- fi
-
- if use mysql; then
- mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
- mylibs="${mylibs} $(mysql_config --libs)"
- fi
-
- if use postgres; then
- mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
- mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
- fi
-
- if use sqlite; then
- mycc="${mycc} -DHAS_SQLITE"
- mylibs="${mylibs} -lsqlite3"
- fi
-
- if use ssl; then
- mycc="${mycc} -DUSE_TLS"
- mylibs="${mylibs} -lssl -lcrypto"
- fi
-
- if use lmdb; then
- mycc="${mycc} -DHAS_LMDB"
- mylibs="${mylibs} -llmdb"
- fi
-
- # broken. and "in other words, not supported" by upstream.
- # Use inet_protocols setting in main.cf
- #if ! use ipv6; then
- # mycc="${mycc} -DNO_IPV6"
- #fi
-
- if use sasl; then
- if use dovecot-sasl; then
- # Set dovecot as default.
- mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
- fi
- if use ldap-bind; then
- mycc="${mycc} -DUSE_LDAP_SASL"
- fi
- mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
- mylibs="${mylibs} -lsasl2"
- elif use dovecot-sasl; then
- mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- fi
-
- if ! use nis; then
- mycc="${mycc} -DNO_NIS"
- fi
-
- if ! use berkdb; then
- mycc="${mycc} -DNO_DB"
- if use cdb; then
- # change default hash format from Berkeley DB to cdb
- mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
- fi
- fi
-
- if use cdb; then
- mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
- CDB_LIBS=""
- # Tinycdb is preferred.
- if has_version dev-db/tinycdb ; then
- einfo "Building with dev-db/tinycdb"
- CDB_LIBS="-lcdb"
- else
- einfo "Building with dev-db/cdb"
- CDB_PATH="/usr/$(get_libdir)"
- for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
- CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
- done
- fi
- mylibs="${mylibs} ${CDB_LIBS}"
- fi
-
- # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
- # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
- mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
- filter-lfs-flags
-
- # Workaround for bug #76512
- if use hardened; then
- [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
- fi
-
- # Remove annoying C++ comment style warnings - bug #378099
- append-flags -Wno-comment
-
- sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
- sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
- emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
-}
-
-src_install () {
- local myconf
- use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
- html_directory=\"/usr/share/doc/${PF}/html\""
-
- /bin/sh postfix-install \
- -non-interactive \
- install_root="${D}" \
- config_directory="/etc/postfix" \
- manpage_directory="/usr/share/man" \
- command_directory="/usr/sbin" \
- mailq_path="/usr/bin/mailq" \
- newaliases_path="/usr/bin/newaliases" \
- sendmail_path="/usr/sbin/sendmail" \
- ${myconf} \
- || die "postfix-install failed"
-
- # Fix spool removal on upgrade
- rm -Rf "${D}"/var
- keepdir /var/spool/postfix
-
- # Install rmail for UUCP, closes bug #19127
- dobin auxiliary/rmail/rmail
-
- # Provide another link for legacy FSH
- dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
- # Install qshape tool and posttls-finger
- dobin auxiliary/qshape/qshape.pl
- doman man/man1/qshape.1
- dobin bin/posttls-finger
- doman man/man1/posttls-finger.1
-
- # Performance tuning tools and their manuals
- dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
- doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
- # Set proper permissions on required files/directories
- dodir /var/lib/postfix
- keepdir /var/lib/postfix
- fowners -R postfix:postfix /var/lib/postfix
- fperms 0750 /var/lib/postfix
- fowners root:postdrop /usr/sbin/post{drop,queue}
- fperms 02711 /usr/sbin/post{drop,queue}
-
- keepdir /etc/postfix
- if use mbox; then
- mypostconf="mail_spool_directory=/var/spool/mail"
- else
- mypostconf="home_mailbox=.maildir/"
- fi
- "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
- -e ${mypostconf} || die "postconf failed"
-
- insinto /etc/postfix
- newins "${FILESDIR}"/smtp.pass saslpass
- fperms 600 /etc/postfix/saslpass
-
- newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
- # do not start mysql/postgres unnecessarily - bug #359913
- use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
- use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
- dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
- use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
- pamd_mimic_system smtp auth account
-
- if use sasl; then
- insinto /etc/sasl2
- newins "${FILESDIR}"/smtp.sasl smtpd.conf
- fi
-
- # header files
- insinto /usr/include/postfix
- doins include/*.h
-
- # Remove unnecessary files
- rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
- rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
- # Postfix 2.9.
- # default for inet_protocols changed from ipv4 to all in postfix-2.9.
- # check inet_protocols setting in main.cf and modify if necessary to prevent
- # performance loss with useless DNS lookups and useless connection attempts.
- [[ -d ${ROOT}/etc/postfix ]] && {
- if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
- if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n inet_protocols)" ]];
- then
- ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
- ewarn "That will keep the same behaviour as previous postfix versions."
- ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
- else
- # delete inet_protocols setting. there is already one in /etc/postfix
- sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
- fi
- fi
- }
-}
-
-pkg_postinst() {
- # Do not install server.{key,pem) SSL certificates if they already exist
- if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
- && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
- install_cert /etc/ssl/postfix/server
- chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
- fi
-
- if [[ ! -e /etc/mail/aliases.db ]] ; then
- ewarn
- ewarn "You must edit /etc/mail/aliases to suit your needs"
- ewarn "and then run /usr/bin/newaliases. Postfix will not"
- ewarn "work correctly without it."
- ewarn
- fi
-
- if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 9 ]]; then
- elog "If you are using old style postfix instances by symlinking"
- elog "startup scripts in ${ROOT}etc/init.d, please consider"
- elog "upgrading your config for postmulti support. For more info:"
- elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
- if ! use berkdb; then
- ewarn "\nPostfix is installed without BerkeleyDB support."
- ewarn "Please turn on berkdb USE flag if you need hash or"
- ewarn "btree table lookups.\n"
- fi
- ewarn "Postfix daemons now live under /usr/libexec/postfix"
- ewarn "Please adjust your main.cf accordingly by running"
- ewarn "etc-update/dispatch-conf or similar and accepting the new"
- ewarn "daemon_directory setting."
- fi
-}
diff --git a/mail-mta/postfix/postfix-2.11.7.ebuild b/mail-mta/postfix/postfix-2.11.7.ebuild
new file mode 100644
index 0000000..e2c0dab
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.11.7.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.10.0"
+VDA_P="${PN}-vda-v13-${VDA_PV}"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
+ vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+DEPEND=">=dev-libs/libpcre-3.4
+ dev-lang/perl
+ berkdb? ( >=sys-libs/db-3.2:* )
+ cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
+ ldap? ( net-nds/openldap )
+ ldap-bind? ( net-nds/openldap[sasl] )
+ lmdb? ( >=dev-db/lmdb-0.9.11 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:* )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl:0 )"
+
+RDEPEND="${DEPEND}
+ dovecot-sasl? ( net-mail/dovecot )
+ memcached? ( net-misc/memcached )
+ net-mail/mailbase
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/mini-qmail
+ !mail-mta/msmtp[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !mail-mta/opensmtpd
+ !<mail-mta/ssmtp-2.64-r2
+ !>=mail-mta/ssmtp-2.64-r2[mta]
+ !net-mail/fastforward
+ selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+ # Add postfix, postdrop user/group (bug #77565)
+ enewgroup postfix 207
+ enewgroup postdrop 208
+ enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.11.1-db6.patch"
+ if use vda; then
+ epatch "${DISTDIR}"/${VDA_P}.patch
+ fi
+
+ sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+ src/util/sys_defs.h || die "sed failed"
+
+ # change default paths to better comply with portage standard paths
+ sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+
+ epatch_user
+}
+
+src_configure() {
+ # Make sure LDFLAGS get passed down to the executables.
+ local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread"
+
+ use pam && mylibs="${mylibs} -lpam"
+
+ if use ldap; then
+ mycc="${mycc} -DHAS_LDAP"
+ mylibs="${mylibs} -lldap -llber"
+ fi
+
+ if use mysql; then
+ mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+ mylibs="${mylibs} $(mysql_config --libs)"
+ fi
+
+ if use postgres; then
+ mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+ mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
+ fi
+
+ if use sqlite; then
+ mycc="${mycc} -DHAS_SQLITE"
+ mylibs="${mylibs} -lsqlite3"
+ fi
+
+ if use ssl; then
+ mycc="${mycc} -DUSE_TLS"
+ mylibs="${mylibs} -lssl -lcrypto"
+ fi
+
+ if use lmdb; then
+ mycc="${mycc} -DHAS_LMDB"
+ mylibs="${mylibs} -llmdb"
+ fi
+
+ # broken. and "in other words, not supported" by upstream.
+ # Use inet_protocols setting in main.cf
+ #if ! use ipv6; then
+ # mycc="${mycc} -DNO_IPV6"
+ #fi
+
+ if use sasl; then
+ if use dovecot-sasl; then
+ # Set dovecot as default.
+ mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+ fi
+ if use ldap-bind; then
+ mycc="${mycc} -DUSE_LDAP_SASL"
+ fi
+ mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+ mylibs="${mylibs} -lsasl2"
+ elif use dovecot-sasl; then
+ mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+ fi
+
+ if ! use nis; then
+ mycc="${mycc} -DNO_NIS"
+ fi
+
+ if ! use berkdb; then
+ mycc="${mycc} -DNO_DB"
+ if use cdb; then
+ # change default hash format from Berkeley DB to cdb
+ mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+ fi
+ fi
+
+ if use cdb; then
+ mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+ CDB_LIBS=""
+ # Tinycdb is preferred.
+ if has_version dev-db/tinycdb ; then
+ einfo "Building with dev-db/tinycdb"
+ CDB_LIBS="-lcdb"
+ else
+ einfo "Building with dev-db/cdb"
+ CDB_PATH="/usr/$(get_libdir)"
+ for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+ CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
+ done
+ fi
+ mylibs="${mylibs} ${CDB_LIBS}"
+ fi
+
+ # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+ # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+ mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ filter-lfs-flags
+
+ # Workaround for bug #76512
+ if use hardened; then
+ [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+ fi
+
+ # Remove annoying C++ comment style warnings - bug #378099
+ append-flags -Wno-comment
+
+ sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+ sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+ emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
+}
+
+src_install () {
+ local myconf
+ use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+ html_directory=\"/usr/share/doc/${PF}/html\""
+
+ /bin/sh postfix-install \
+ -non-interactive \
+ install_root="${D}" \
+ config_directory="/etc/postfix" \
+ manpage_directory="/usr/share/man" \
+ command_directory="/usr/sbin" \
+ mailq_path="/usr/bin/mailq" \
+ newaliases_path="/usr/bin/newaliases" \
+ sendmail_path="/usr/sbin/sendmail" \
+ ${myconf} \
+ || die "postfix-install failed"
+
+ # Fix spool removal on upgrade
+ rm -Rf "${D}"/var
+ keepdir /var/spool/postfix
+
+ # Install rmail for UUCP, closes bug #19127
+ dobin auxiliary/rmail/rmail
+
+ # Provide another link for legacy FSH
+ dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+ # Install qshape tool and posttls-finger
+ dobin auxiliary/qshape/qshape.pl
+ doman man/man1/qshape.1
+ dobin bin/posttls-finger
+ doman man/man1/posttls-finger.1
+
+ # Performance tuning tools and their manuals
+ dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+ doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+ # Set proper permissions on required files/directories
+ dodir /var/lib/postfix
+ keepdir /var/lib/postfix
+ fowners -R postfix:postfix /var/lib/postfix
+ fperms 0750 /var/lib/postfix
+ fowners root:postdrop /usr/sbin/post{drop,queue}
+ fperms 02711 /usr/sbin/post{drop,queue}
+
+ keepdir /etc/postfix
+ if use mbox; then
+ mypostconf="mail_spool_directory=/var/spool/mail"
+ else
+ mypostconf="home_mailbox=.maildir/"
+ fi
+ "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+ -e ${mypostconf} || die "postconf failed"
+
+ insinto /etc/postfix
+ newins "${FILESDIR}"/smtp.pass saslpass
+ fperms 600 /etc/postfix/saslpass
+
+ newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+ # do not start mysql/postgres unnecessarily - bug #359913
+ use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+ use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+ dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+ mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
+ use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+ pamd_mimic_system smtp auth account
+
+ if use sasl; then
+ insinto /etc/sasl2
+ newins "${FILESDIR}"/smtp.sasl smtpd.conf
+ fi
+
+ # header files
+ insinto /usr/include/postfix
+ doins include/*.h
+
+ # Remove unnecessary files
+ rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+ rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+ # Postfix 2.9.
+ # default for inet_protocols changed from ipv4 to all in postfix-2.9.
+ # check inet_protocols setting in main.cf and modify if necessary to prevent
+ # performance loss with useless DNS lookups and useless connection attempts.
+ [[ -d ${ROOT}/etc/postfix ]] && {
+ if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
+ if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n inet_protocols)" ]];
+ then
+ ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
+ ewarn "That will keep the same behaviour as previous postfix versions."
+ ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
+ else
+ # delete inet_protocols setting. there is already one in /etc/postfix
+ sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
+ fi
+ fi
+ }
+}
+
+pkg_postinst() {
+ # Do not install server.{key,pem) SSL certificates if they already exist
+ if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+ && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+ install_cert /etc/ssl/postfix/server
+ chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+ fi
+
+ if [[ ! -e /etc/mail/aliases.db ]] ; then
+ ewarn
+ ewarn "You must edit /etc/mail/aliases to suit your needs"
+ ewarn "and then run /usr/bin/newaliases. Postfix will not"
+ ewarn "work correctly without it."
+ ewarn
+ fi
+
+ if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 9 ]]; then
+ elog "If you are using old style postfix instances by symlinking"
+ elog "startup scripts in ${ROOT}etc/init.d, please consider"
+ elog "upgrading your config for postmulti support. For more info:"
+ elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
+ if ! use berkdb; then
+ ewarn "\nPostfix is installed without BerkeleyDB support."
+ ewarn "Please turn on berkdb USE flag if you need hash or"
+ ewarn "btree table lookups.\n"
+ fi
+ ewarn "Postfix daemons now live under /usr/libexec/postfix"
+ ewarn "Please adjust your main.cf accordingly by running"
+ ewarn "etc-update/dispatch-conf or similar and accepting the new"
+ ewarn "daemon_directory setting."
+ fi
+}
diff --git a/mail-mta/postfix/postfix-3.0.0.ebuild b/mail-mta/postfix/postfix-3.0.0.ebuild
deleted file mode 100644
index 438bfc8..0000000
--- a/mail-mta/postfix/postfix-3.0.0.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
- vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
- dev-lang/perl
- berkdb? ( >=sys-libs/db-3.2:* )
- cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
- eai? ( dev-libs/icu:= )
- ldap? ( net-nds/openldap )
- ldap-bind? ( net-nds/openldap[sasl] )
- lmdb? ( >=dev-db/lmdb-0.9.11 )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( >=dev-libs/openssl-0.9.6g:* )"
-
-RDEPEND="${DEPEND}
- dovecot-sasl? ( net-mail/dovecot )
- memcached? ( net-misc/memcached )
- net-mail/mailbase
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/opensmtpd
- !<mail-mta/ssmtp-2.64-r2
- !>=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/fastforward
- selinux? ( sec-policy/selinux-postfix )"
-
-# No vda support for postfix-3.0
-REQUIRED_USE="ldap-bind? ( ldap sasl )
- !vda"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
- # Add postfix, postdrop user/group (bug #77565)
- enewgroup postfix 207
- enewgroup postdrop 208
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-linux4.patch"
- if use vda; then
- epatch "${DISTDIR}"/${VDA_P}.patch
- fi
-
- sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
- src/util/sys_defs.h || die "sed failed"
-
- # change default paths to better comply with portage standard paths
- sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-
- epatch_user
-}
-
-src_configure() {
- for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
- do
- local AUXLIBS_${name}=""
- done
-
- # Make sure LDFLAGS get passed down to the executables.
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
- AUXLIBS_PCRE="$(pcre-config --libs)"
-
- use pam && mylibs="${mylibs} -lpam"
-
- if use ldap; then
- mycc="${mycc} -DHAS_LDAP"
- AUXLIBS_LDAP="-lldap -llber"
- fi
-
- if use mysql; then
- mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
- AUXLIBS_MYSQL="$(mysql_config --libs)"
- fi
-
- if use postgres; then
- mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
- AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
- fi
-
- if use sqlite; then
- mycc="${mycc} -DHAS_SQLITE"
- AUXLIBS_SQLITE="-lsqlite3 -lpthread"
- fi
-
- if use ssl; then
- mycc="${mycc} -DUSE_TLS"
- mylibs="${mylibs} -lssl -lcrypto"
- fi
-
- if use lmdb; then
- mycc="${mycc} -DHAS_LMDB"
- AUXLIBS_LMDB="-llmdb -lpthread"
- fi
-
- if ! use eai; then
- mycc="${mycc} -DNO_EAI"
- fi
-
- # broken. and "in other words, not supported" by upstream.
- # Use inet_protocols setting in main.cf
- #if ! use ipv6; then
- # mycc="${mycc} -DNO_IPV6"
- #fi
-
- if use sasl; then
- if use dovecot-sasl; then
- # Set dovecot as default.
- mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
- fi
- if use ldap-bind; then
- mycc="${mycc} -DUSE_LDAP_SASL"
- fi
- mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
- mylibs="${mylibs} -lsasl2"
- elif use dovecot-sasl; then
- mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- fi
-
- if ! use nis; then
- mycc="${mycc} -DNO_NIS"
- fi
-
- if ! use berkdb; then
- mycc="${mycc} -DNO_DB"
- if use cdb; then
- # change default hash format from Berkeley DB to cdb
- mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
- fi
- fi
-
- if use cdb; then
- mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
- # Tinycdb is preferred.
- if has_version dev-db/tinycdb ; then
- einfo "Building with dev-db/tinycdb"
- AUXLIBS_CDB="-lcdb"
- else
- einfo "Building with dev-db/cdb"
- CDB_PATH="/usr/$(get_libdir)"
- for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
- AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
- done
- fi
- fi
-
- # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
- # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
- mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
- filter-lfs-flags
-
- # Workaround for bug #76512
- if use hardened; then
- [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
- fi
-
- # Remove annoying C++ comment style warnings - bug #378099
- append-flags -Wno-comment
-
- sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
- sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
- emake makefiles shared=yes dynamicmaps=no \
- shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
- DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
- AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
- AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
- AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
- AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install () {
- local myconf
- use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
- html_directory=\"/usr/share/doc/${PF}/html\""
-
- LD_LIBRARY_PATH="${S}/lib" \
- /bin/sh postfix-install \
- -non-interactive \
- install_root="${D}" \
- config_directory="/etc/postfix" \
- manpage_directory="/usr/share/man" \
- command_directory="/usr/sbin" \
- mailq_path="/usr/bin/mailq" \
- newaliases_path="/usr/bin/newaliases" \
- sendmail_path="/usr/sbin/sendmail" \
- ${myconf} \
- || die "postfix-install failed"
-
- # Fix spool removal on upgrade
- rm -Rf "${D}"/var
- keepdir /var/spool/postfix
-
- # Install rmail for UUCP, closes bug #19127
- dobin auxiliary/rmail/rmail
-
- # Provide another link for legacy FSH
- dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
- # Install qshape tool and posttls-finger
- dobin auxiliary/qshape/qshape.pl
- doman man/man1/qshape.1
- dobin bin/posttls-finger
- doman man/man1/posttls-finger.1
-
- # Performance tuning tools and their manuals
- dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
- doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
- # Set proper permissions on required files/directories
- dodir /var/lib/postfix
- keepdir /var/lib/postfix
- fowners -R postfix:postfix /var/lib/postfix
- fperms 0750 /var/lib/postfix
- fowners root:postdrop /usr/sbin/post{drop,queue}
- fperms 02711 /usr/sbin/post{drop,queue}
-
- keepdir /etc/postfix
- if use mbox; then
- mypostconf="mail_spool_directory=/var/spool/mail"
- else
- mypostconf="home_mailbox=.maildir/"
- fi
- LD_LIBRARY_PATH="${S}/lib" \
- "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
- -e ${mypostconf} || die "postconf failed"
-
- insinto /etc/postfix
- newins "${FILESDIR}"/smtp.pass saslpass
- fperms 600 /etc/postfix/saslpass
-
- newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
- # do not start mysql/postgres unnecessarily - bug #359913
- use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
- use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
- dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- mv "${D}"/etc/postfix/{*.default,makedefs.out,*.proto} "${D}"/usr/share/doc/${PF}/
- use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
- pamd_mimic_system smtp auth account
-
- if use sasl; then
- insinto /etc/sasl2
- newins "${FILESDIR}"/smtp.sasl smtpd.conf
- fi
-
- # header files
- insinto /usr/include/postfix
- doins include/*.h
-
- # Remove unnecessary files
- rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
- rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
- if has_version mail-mta/postfix; then
- # let the sysadmin decide when to change the compatibility_level
- sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
- fi
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
- # Do not install server.{key,pem) SSL certificates if they already exist
- if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
- && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
- install_cert /etc/ssl/postfix/server
- chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
- fi
-
- if [[ ! -e /etc/mail/aliases.db ]] ; then
- ewarn
- ewarn "You must edit /etc/mail/aliases to suit your needs"
- ewarn "and then run /usr/bin/newaliases. Postfix will not"
- ewarn "work correctly without it."
- ewarn
- fi
-}
diff --git a/mail-mta/postfix/postfix-3.0.1-r1.ebuild b/mail-mta/postfix/postfix-3.0.1-r1.ebuild
deleted file mode 100644
index 438bfc8..0000000
--- a/mail-mta/postfix/postfix-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
- vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
- dev-lang/perl
- berkdb? ( >=sys-libs/db-3.2:* )
- cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
- eai? ( dev-libs/icu:= )
- ldap? ( net-nds/openldap )
- ldap-bind? ( net-nds/openldap[sasl] )
- lmdb? ( >=dev-db/lmdb-0.9.11 )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( >=dev-libs/openssl-0.9.6g:* )"
-
-RDEPEND="${DEPEND}
- dovecot-sasl? ( net-mail/dovecot )
- memcached? ( net-misc/memcached )
- net-mail/mailbase
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/opensmtpd
- !<mail-mta/ssmtp-2.64-r2
- !>=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/fastforward
- selinux? ( sec-policy/selinux-postfix )"
-
-# No vda support for postfix-3.0
-REQUIRED_USE="ldap-bind? ( ldap sasl )
- !vda"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
- # Add postfix, postdrop user/group (bug #77565)
- enewgroup postfix 207
- enewgroup postdrop 208
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-linux4.patch"
- if use vda; then
- epatch "${DISTDIR}"/${VDA_P}.patch
- fi
-
- sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
- src/util/sys_defs.h || die "sed failed"
-
- # change default paths to better comply with portage standard paths
- sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-
- epatch_user
-}
-
-src_configure() {
- for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
- do
- local AUXLIBS_${name}=""
- done
-
- # Make sure LDFLAGS get passed down to the executables.
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
- AUXLIBS_PCRE="$(pcre-config --libs)"
-
- use pam && mylibs="${mylibs} -lpam"
-
- if use ldap; then
- mycc="${mycc} -DHAS_LDAP"
- AUXLIBS_LDAP="-lldap -llber"
- fi
-
- if use mysql; then
- mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
- AUXLIBS_MYSQL="$(mysql_config --libs)"
- fi
-
- if use postgres; then
- mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
- AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
- fi
-
- if use sqlite; then
- mycc="${mycc} -DHAS_SQLITE"
- AUXLIBS_SQLITE="-lsqlite3 -lpthread"
- fi
-
- if use ssl; then
- mycc="${mycc} -DUSE_TLS"
- mylibs="${mylibs} -lssl -lcrypto"
- fi
-
- if use lmdb; then
- mycc="${mycc} -DHAS_LMDB"
- AUXLIBS_LMDB="-llmdb -lpthread"
- fi
-
- if ! use eai; then
- mycc="${mycc} -DNO_EAI"
- fi
-
- # broken. and "in other words, not supported" by upstream.
- # Use inet_protocols setting in main.cf
- #if ! use ipv6; then
- # mycc="${mycc} -DNO_IPV6"
- #fi
-
- if use sasl; then
- if use dovecot-sasl; then
- # Set dovecot as default.
- mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
- fi
- if use ldap-bind; then
- mycc="${mycc} -DUSE_LDAP_SASL"
- fi
- mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
- mylibs="${mylibs} -lsasl2"
- elif use dovecot-sasl; then
- mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- fi
-
- if ! use nis; then
- mycc="${mycc} -DNO_NIS"
- fi
-
- if ! use berkdb; then
- mycc="${mycc} -DNO_DB"
- if use cdb; then
- # change default hash format from Berkeley DB to cdb
- mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
- fi
- fi
-
- if use cdb; then
- mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
- # Tinycdb is preferred.
- if has_version dev-db/tinycdb ; then
- einfo "Building with dev-db/tinycdb"
- AUXLIBS_CDB="-lcdb"
- else
- einfo "Building with dev-db/cdb"
- CDB_PATH="/usr/$(get_libdir)"
- for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
- AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
- done
- fi
- fi
-
- # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
- # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
- mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
- filter-lfs-flags
-
- # Workaround for bug #76512
- if use hardened; then
- [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
- fi
-
- # Remove annoying C++ comment style warnings - bug #378099
- append-flags -Wno-comment
-
- sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
- sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
- emake makefiles shared=yes dynamicmaps=no \
- shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
- DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
- AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
- AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
- AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
- AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install () {
- local myconf
- use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
- html_directory=\"/usr/share/doc/${PF}/html\""
-
- LD_LIBRARY_PATH="${S}/lib" \
- /bin/sh postfix-install \
- -non-interactive \
- install_root="${D}" \
- config_directory="/etc/postfix" \
- manpage_directory="/usr/share/man" \
- command_directory="/usr/sbin" \
- mailq_path="/usr/bin/mailq" \
- newaliases_path="/usr/bin/newaliases" \
- sendmail_path="/usr/sbin/sendmail" \
- ${myconf} \
- || die "postfix-install failed"
-
- # Fix spool removal on upgrade
- rm -Rf "${D}"/var
- keepdir /var/spool/postfix
-
- # Install rmail for UUCP, closes bug #19127
- dobin auxiliary/rmail/rmail
-
- # Provide another link for legacy FSH
- dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
- # Install qshape tool and posttls-finger
- dobin auxiliary/qshape/qshape.pl
- doman man/man1/qshape.1
- dobin bin/posttls-finger
- doman man/man1/posttls-finger.1
-
- # Performance tuning tools and their manuals
- dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
- doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
- # Set proper permissions on required files/directories
- dodir /var/lib/postfix
- keepdir /var/lib/postfix
- fowners -R postfix:postfix /var/lib/postfix
- fperms 0750 /var/lib/postfix
- fowners root:postdrop /usr/sbin/post{drop,queue}
- fperms 02711 /usr/sbin/post{drop,queue}
-
- keepdir /etc/postfix
- if use mbox; then
- mypostconf="mail_spool_directory=/var/spool/mail"
- else
- mypostconf="home_mailbox=.maildir/"
- fi
- LD_LIBRARY_PATH="${S}/lib" \
- "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
- -e ${mypostconf} || die "postconf failed"
-
- insinto /etc/postfix
- newins "${FILESDIR}"/smtp.pass saslpass
- fperms 600 /etc/postfix/saslpass
-
- newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
- # do not start mysql/postgres unnecessarily - bug #359913
- use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
- use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
- dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- mv "${D}"/etc/postfix/{*.default,makedefs.out,*.proto} "${D}"/usr/share/doc/${PF}/
- use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
- pamd_mimic_system smtp auth account
-
- if use sasl; then
- insinto /etc/sasl2
- newins "${FILESDIR}"/smtp.sasl smtpd.conf
- fi
-
- # header files
- insinto /usr/include/postfix
- doins include/*.h
-
- # Remove unnecessary files
- rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
- rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
- if has_version mail-mta/postfix; then
- # let the sysadmin decide when to change the compatibility_level
- sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
- fi
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
- # Do not install server.{key,pem) SSL certificates if they already exist
- if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
- && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
- install_cert /etc/ssl/postfix/server
- chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
- fi
-
- if [[ ! -e /etc/mail/aliases.db ]] ; then
- ewarn
- ewarn "You must edit /etc/mail/aliases to suit your needs"
- ewarn "and then run /usr/bin/newaliases. Postfix will not"
- ewarn "work correctly without it."
- ewarn
- fi
-}
diff --git a/mail-mta/postfix/postfix-3.0.2-r2.ebuild b/mail-mta/postfix/postfix-3.0.2-r2.ebuild
new file mode 100644
index 0000000..050a219
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.0.2-r2.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.10.0"
+VDA_P="${PN}-vda-v13-${VDA_PV}"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
+ vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+DEPEND=">=dev-libs/libpcre-3.4
+ dev-lang/perl
+ berkdb? ( >=sys-libs/db-3.2:* )
+ cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
+ eai? ( dev-libs/icu:= )
+ ldap? ( net-nds/openldap )
+ ldap-bind? ( net-nds/openldap[sasl] )
+ lmdb? ( >=dev-db/lmdb-0.9.11 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:* )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6g:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+
+RDEPEND="${DEPEND}
+ dovecot-sasl? ( net-mail/dovecot )
+ memcached? ( net-misc/memcached )
+ net-mail/mailbase
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/mini-qmail
+ !mail-mta/msmtp[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !mail-mta/opensmtpd
+ !<mail-mta/ssmtp-2.64-r2
+ !>=mail-mta/ssmtp-2.64-r2[mta]
+ !net-mail/fastforward
+ selinux? ( sec-policy/selinux-postfix )"
+
+# No vda support for postfix-3.0
+REQUIRED_USE="ldap-bind? ( ldap sasl )
+ !vda"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+ # Add postfix, postdrop user/group (bug #77565)
+ enewgroup postfix 207
+ enewgroup postdrop 208
+ enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+ if use vda; then
+ epatch "${DISTDIR}"/${VDA_P}.patch
+ fi
+
+ sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+ src/util/sys_defs.h || die "sed failed"
+
+ # change default paths to better comply with portage standard paths
+ sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+
+ sed -i -e "/readme_directory\/CONNECTION_CACHE_README/ i\
+ \$readme_directory\/COMPATIBILITY_README:f:root:-:644" conf/postfix-files
+ sed -i -e "/html_directory\/CONNECTION_CACHE_README/ i\
+ \$html_directory\/COMPATIBILITY_README.html:f:root:-:644" conf/postfix-files
+
+ epatch_user
+}
+
+src_configure() {
+ for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+ do
+ local AUXLIBS_${name}=""
+ done
+
+ # Make sure LDFLAGS get passed down to the executables.
+ local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+ AUXLIBS_PCRE="$(pcre-config --libs)"
+
+ use pam && mylibs="${mylibs} -lpam"
+
+ if use ldap; then
+ mycc="${mycc} -DHAS_LDAP"
+ AUXLIBS_LDAP="-lldap -llber"
+ fi
+
+ if use mysql; then
+ mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+ AUXLIBS_MYSQL="$(mysql_config --libs)"
+ fi
+
+ if use postgres; then
+ mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+ AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+ fi
+
+ if use sqlite; then
+ mycc="${mycc} -DHAS_SQLITE"
+ AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+ fi
+
+ if use ssl; then
+ mycc="${mycc} -DUSE_TLS"
+ mylibs="${mylibs} -lssl -lcrypto"
+ fi
+
+ if use lmdb; then
+ mycc="${mycc} -DHAS_LMDB"
+ AUXLIBS_LMDB="-llmdb -lpthread"
+ fi
+
+ if ! use eai; then
+ mycc="${mycc} -DNO_EAI"
+ fi
+
+ # broken. and "in other words, not supported" by upstream.
+ # Use inet_protocols setting in main.cf
+ #if ! use ipv6; then
+ # mycc="${mycc} -DNO_IPV6"
+ #fi
+
+ if use sasl; then
+ if use dovecot-sasl; then
+ # Set dovecot as default.
+ mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+ fi
+ if use ldap-bind; then
+ mycc="${mycc} -DUSE_LDAP_SASL"
+ fi
+ mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+ mylibs="${mylibs} -lsasl2"
+ elif use dovecot-sasl; then
+ mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+ fi
+
+ if ! use nis; then
+ mycc="${mycc} -DNO_NIS"
+ fi
+
+ if ! use berkdb; then
+ mycc="${mycc} -DNO_DB"
+ if use cdb; then
+ # change default hash format from Berkeley DB to cdb
+ mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+ fi
+ fi
+
+ if use cdb; then
+ mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+ # Tinycdb is preferred.
+ if has_version dev-db/tinycdb ; then
+ einfo "Building with dev-db/tinycdb"
+ AUXLIBS_CDB="-lcdb"
+ else
+ einfo "Building with dev-db/cdb"
+ CDB_PATH="/usr/$(get_libdir)"
+ for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+ AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+ done
+ fi
+ fi
+
+ # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+ # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+ mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ filter-lfs-flags
+
+ # Workaround for bug #76512
+ if use hardened; then
+ [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+ fi
+
+ # Remove annoying C++ comment style warnings - bug #378099
+ append-flags -Wno-comment
+
+ sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+ sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+ emake makefiles shared=yes dynamicmaps=no \
+ shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+ DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+ AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+ AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+ AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+ AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+ local myconf
+ use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+ html_directory=\"/usr/share/doc/${PF}/html\""
+
+ LD_LIBRARY_PATH="${S}/lib" \
+ /bin/sh postfix-install \
+ -non-interactive \
+ install_root="${D}" \
+ config_directory="/etc/postfix" \
+ manpage_directory="/usr/share/man" \
+ command_directory="/usr/sbin" \
+ mailq_path="/usr/bin/mailq" \
+ newaliases_path="/usr/bin/newaliases" \
+ sendmail_path="/usr/sbin/sendmail" \
+ ${myconf} \
+ || die "postfix-install failed"
+
+ # Fix spool removal on upgrade
+ rm -Rf "${D}"/var
+ keepdir /var/spool/postfix
+
+ # Install rmail for UUCP, closes bug #19127
+ dobin auxiliary/rmail/rmail
+
+ # Provide another link for legacy FSH
+ dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+ # Install qshape tool and posttls-finger
+ dobin auxiliary/qshape/qshape.pl
+ doman man/man1/qshape.1
+ dobin bin/posttls-finger
+ doman man/man1/posttls-finger.1
+
+ # Performance tuning tools and their manuals
+ dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+ doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+ # Set proper permissions on required files/directories
+ dodir /var/lib/postfix
+ keepdir /var/lib/postfix
+ fowners -R postfix:postfix /var/lib/postfix
+ fperms 0750 /var/lib/postfix
+ fowners root:postdrop /usr/sbin/post{drop,queue}
+ fperms 02711 /usr/sbin/post{drop,queue}
+
+ keepdir /etc/postfix
+ if use mbox; then
+ mypostconf="mail_spool_directory=/var/spool/mail"
+ else
+ mypostconf="home_mailbox=.maildir/"
+ fi
+ LD_LIBRARY_PATH="${S}/lib" \
+ "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+ -e ${mypostconf} || die "postconf failed"
+
+ insinto /etc/postfix
+ newins "${FILESDIR}"/smtp.pass saslpass
+ fperms 600 /etc/postfix/saslpass
+
+ newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+ # do not start mysql/postgres unnecessarily - bug #359913
+ use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+ use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+ dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+ use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+ pamd_mimic_system smtp auth account
+
+ if use sasl; then
+ insinto /etc/sasl2
+ newins "${FILESDIR}"/smtp.sasl smtpd.conf
+ fi
+
+ # header files
+ insinto /usr/include/postfix
+ doins include/*.h
+
+ # Remove unnecessary files
+ rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+ rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+ if has_version mail-mta/postfix; then
+ # let the sysadmin decide when to change the compatibility_level
+ sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+ fi
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+ # Do not install server.{key,pem) SSL certificates if they already exist
+ if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+ && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+ install_cert /etc/ssl/postfix/server
+ chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+ fi
+
+ if [[ ! -e /etc/mail/aliases.db ]] ; then
+ ewarn
+ ewarn "You must edit /etc/mail/aliases to suit your needs"
+ ewarn "and then run /usr/bin/newaliases. Postfix will not"
+ ewarn "work correctly without it."
+ ewarn
+ fi
+}
diff --git a/mail-mta/postfix/postfix-3.0.2.ebuild b/mail-mta/postfix/postfix-3.0.2.ebuild
index 0da984e..155a910 100644
--- a/mail-mta/postfix/postfix-3.0.2.ebuild
+++ b/mail-mta/postfix/postfix-3.0.2.ebuild
@@ -19,7 +19,7 @@
LICENSE="IBM"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
DEPEND=">=dev-libs/libpcre-3.4
diff --git a/mail-mta/postfix/postfix-3.0.3.ebuild b/mail-mta/postfix/postfix-3.0.3.ebuild
new file mode 100644
index 0000000..b66e09c
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.0.3.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.10.0"
+VDA_P="${PN}-vda-v13-${VDA_PV}"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
+ vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+DEPEND=">=dev-libs/libpcre-3.4
+ dev-lang/perl
+ berkdb? ( >=sys-libs/db-3.2:* )
+ cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
+ eai? ( dev-libs/icu:= )
+ ldap? ( net-nds/openldap )
+ ldap-bind? ( net-nds/openldap[sasl] )
+ lmdb? ( >=dev-db/lmdb-0.9.11 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:* )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+
+RDEPEND="${DEPEND}
+ dovecot-sasl? ( net-mail/dovecot )
+ memcached? ( net-misc/memcached )
+ net-mail/mailbase
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/mini-qmail
+ !mail-mta/msmtp[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !mail-mta/opensmtpd
+ !<mail-mta/ssmtp-2.64-r2
+ !>=mail-mta/ssmtp-2.64-r2[mta]
+ !net-mail/fastforward
+ selinux? ( sec-policy/selinux-postfix )"
+
+# No vda support for postfix-3.0
+REQUIRED_USE="ldap-bind? ( ldap sasl )
+ !vda"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+ # Add postfix, postdrop user/group (bug #77565)
+ enewgroup postfix 207
+ enewgroup postdrop 208
+ enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+ if use vda; then
+ epatch "${DISTDIR}"/${VDA_P}.patch
+ fi
+
+ sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+ src/util/sys_defs.h || die "sed failed"
+
+ # change default paths to better comply with portage standard paths
+ sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+
+ epatch_user
+}
+
+src_configure() {
+ for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+ do
+ local AUXLIBS_${name}=""
+ done
+
+ # Make sure LDFLAGS get passed down to the executables.
+ local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+ AUXLIBS_PCRE="$(pcre-config --libs)"
+
+ use pam && mylibs="${mylibs} -lpam"
+
+ if use ldap; then
+ mycc="${mycc} -DHAS_LDAP"
+ AUXLIBS_LDAP="-lldap -llber"
+ fi
+
+ if use mysql; then
+ mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+ AUXLIBS_MYSQL="$(mysql_config --libs)"
+ fi
+
+ if use postgres; then
+ mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+ AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+ fi
+
+ if use sqlite; then
+ mycc="${mycc} -DHAS_SQLITE"
+ AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+ fi
+
+ if use ssl; then
+ mycc="${mycc} -DUSE_TLS"
+ mylibs="${mylibs} -lssl -lcrypto"
+ fi
+
+ if use lmdb; then
+ mycc="${mycc} -DHAS_LMDB"
+ AUXLIBS_LMDB="-llmdb -lpthread"
+ fi
+
+ if ! use eai; then
+ mycc="${mycc} -DNO_EAI"
+ fi
+
+ # broken. and "in other words, not supported" by upstream.
+ # Use inet_protocols setting in main.cf
+ #if ! use ipv6; then
+ # mycc="${mycc} -DNO_IPV6"
+ #fi
+
+ if use sasl; then
+ if use dovecot-sasl; then
+ # Set dovecot as default.
+ mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+ fi
+ if use ldap-bind; then
+ mycc="${mycc} -DUSE_LDAP_SASL"
+ fi
+ mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+ mylibs="${mylibs} -lsasl2"
+ elif use dovecot-sasl; then
+ mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+ fi
+
+ if ! use nis; then
+ mycc="${mycc} -DNO_NIS"
+ fi
+
+ if ! use berkdb; then
+ mycc="${mycc} -DNO_DB"
+ if use cdb; then
+ # change default hash format from Berkeley DB to cdb
+ mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+ fi
+ fi
+
+ if use cdb; then
+ mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+ # Tinycdb is preferred.
+ if has_version dev-db/tinycdb ; then
+ einfo "Building with dev-db/tinycdb"
+ AUXLIBS_CDB="-lcdb"
+ else
+ einfo "Building with dev-db/cdb"
+ CDB_PATH="/usr/$(get_libdir)"
+ for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+ AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+ done
+ fi
+ fi
+
+ # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+ # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+ mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ filter-lfs-flags
+
+ # Workaround for bug #76512
+ if use hardened; then
+ [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+ fi
+
+ # Remove annoying C++ comment style warnings - bug #378099
+ append-flags -Wno-comment
+
+ sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+ sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+ emake makefiles shared=yes dynamicmaps=no pie=yes \
+ shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+ DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+ AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+ AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+ AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+ AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+ local myconf
+ use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+ html_directory=\"/usr/share/doc/${PF}/html\""
+
+ LD_LIBRARY_PATH="${S}/lib" \
+ /bin/sh postfix-install \
+ -non-interactive \
+ install_root="${D}" \
+ config_directory="/etc/postfix" \
+ manpage_directory="/usr/share/man" \
+ command_directory="/usr/sbin" \
+ mailq_path="/usr/bin/mailq" \
+ newaliases_path="/usr/bin/newaliases" \
+ sendmail_path="/usr/sbin/sendmail" \
+ ${myconf} \
+ || die "postfix-install failed"
+
+ # Fix spool removal on upgrade
+ rm -Rf "${D}"/var
+ keepdir /var/spool/postfix
+
+ # Install rmail for UUCP, closes bug #19127
+ dobin auxiliary/rmail/rmail
+
+ # Provide another link for legacy FSH
+ dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+ # Install qshape tool and posttls-finger
+ dobin auxiliary/qshape/qshape.pl
+ doman man/man1/qshape.1
+ dobin bin/posttls-finger
+ doman man/man1/posttls-finger.1
+
+ # Performance tuning tools and their manuals
+ dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+ doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+ # Set proper permissions on required files/directories
+ dodir /var/lib/postfix
+ keepdir /var/lib/postfix
+ fowners -R postfix:postfix /var/lib/postfix
+ fperms 0750 /var/lib/postfix
+ fowners root:postdrop /usr/sbin/post{drop,queue}
+ fperms 02711 /usr/sbin/post{drop,queue}
+
+ keepdir /etc/postfix
+ if use mbox; then
+ mypostconf="mail_spool_directory=/var/spool/mail"
+ else
+ mypostconf="home_mailbox=.maildir/"
+ fi
+ LD_LIBRARY_PATH="${S}/lib" \
+ "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+ -e ${mypostconf} || die "postconf failed"
+
+ insinto /etc/postfix
+ newins "${FILESDIR}"/smtp.pass saslpass
+ fperms 600 /etc/postfix/saslpass
+
+ newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+ # do not start mysql/postgres unnecessarily - bug #359913
+ use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+ use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+ dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+ use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+ pamd_mimic_system smtp auth account
+
+ if use sasl; then
+ insinto /etc/sasl2
+ newins "${FILESDIR}"/smtp.sasl smtpd.conf
+ fi
+
+ # header files
+ insinto /usr/include/postfix
+ doins include/*.h
+
+ # Remove unnecessary files
+ rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+ rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+ if has_version mail-mta/postfix; then
+ # let the sysadmin decide when to change the compatibility_level
+ sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+ fi
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+ # Do not install server.{key,pem) SSL certificates if they already exist
+ if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+ && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+ install_cert /etc/ssl/postfix/server
+ chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+ fi
+
+ if [[ ! -e /etc/mail/aliases.db ]] ; then
+ ewarn
+ ewarn "You must edit /etc/mail/aliases to suit your needs"
+ ewarn "and then run /usr/bin/newaliases. Postfix will not"
+ ewarn "work correctly without it."
+ ewarn
+ fi
+}
diff --git a/mail-mta/postfix/postfix-3.1_pre20150924.ebuild b/mail-mta/postfix/postfix-3.1_pre20150924.ebuild
deleted file mode 100644
index 14d5902..0000000
--- a/mail-mta/postfix/postfix-3.1_pre20150924.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
- vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
- dev-lang/perl
- berkdb? ( >=sys-libs/db-3.2:* )
- cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
- eai? ( dev-libs/icu:= )
- ldap? ( net-nds/openldap )
- ldap-bind? ( net-nds/openldap[sasl] )
- lmdb? ( >=dev-db/lmdb-0.9.11 )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( >=dev-libs/openssl-0.9.6g:* )"
-
-RDEPEND="${DEPEND}
- dovecot-sasl? ( net-mail/dovecot )
- memcached? ( net-misc/memcached )
- net-mail/mailbase
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/opensmtpd
- !<mail-mta/ssmtp-2.64-r2
- !>=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/fastforward
- selinux? ( sec-policy/selinux-postfix )"
-
-# No vda support for postfix-3.0
-REQUIRED_USE="ldap-bind? ( ldap sasl )
- !vda"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
- # Add postfix, postdrop user/group (bug #77565)
- enewgroup postfix 207
- enewgroup postdrop 208
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
- if use vda; then
- epatch "${DISTDIR}"/${VDA_P}.patch
- fi
-
- sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
- src/util/sys_defs.h || die "sed failed"
-
- # change default paths to better comply with portage standard paths
- sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-
- epatch_user
-}
-
-src_configure() {
- for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
- do
- local AUXLIBS_${name}=""
- done
-
- # Make sure LDFLAGS get passed down to the executables.
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
- AUXLIBS_PCRE="$(pcre-config --libs)"
-
- use pam && mylibs="${mylibs} -lpam"
-
- if use ldap; then
- mycc="${mycc} -DHAS_LDAP"
- AUXLIBS_LDAP="-lldap -llber"
- fi
-
- if use mysql; then
- mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
- AUXLIBS_MYSQL="$(mysql_config --libs)"
- fi
-
- if use postgres; then
- mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
- AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
- fi
-
- if use sqlite; then
- mycc="${mycc} -DHAS_SQLITE"
- AUXLIBS_SQLITE="-lsqlite3 -lpthread"
- fi
-
- if use ssl; then
- mycc="${mycc} -DUSE_TLS"
- mylibs="${mylibs} -lssl -lcrypto"
- fi
-
- if use lmdb; then
- mycc="${mycc} -DHAS_LMDB"
- AUXLIBS_LMDB="-llmdb -lpthread"
- fi
-
- if ! use eai; then
- mycc="${mycc} -DNO_EAI"
- fi
-
- # broken. and "in other words, not supported" by upstream.
- # Use inet_protocols setting in main.cf
- #if ! use ipv6; then
- # mycc="${mycc} -DNO_IPV6"
- #fi
-
- if use sasl; then
- if use dovecot-sasl; then
- # Set dovecot as default.
- mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
- fi
- if use ldap-bind; then
- mycc="${mycc} -DUSE_LDAP_SASL"
- fi
- mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
- mylibs="${mylibs} -lsasl2"
- elif use dovecot-sasl; then
- mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- fi
-
- if ! use nis; then
- mycc="${mycc} -DNO_NIS"
- fi
-
- if ! use berkdb; then
- mycc="${mycc} -DNO_DB"
- if use cdb; then
- # change default hash format from Berkeley DB to cdb
- mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
- fi
- fi
-
- if use cdb; then
- mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
- # Tinycdb is preferred.
- if has_version dev-db/tinycdb ; then
- einfo "Building with dev-db/tinycdb"
- AUXLIBS_CDB="-lcdb"
- else
- einfo "Building with dev-db/cdb"
- CDB_PATH="/usr/$(get_libdir)"
- for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
- AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
- done
- fi
- fi
-
- # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
- # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
- mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
- filter-lfs-flags
-
- # Workaround for bug #76512
- if use hardened; then
- [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
- fi
-
- # Remove annoying C++ comment style warnings - bug #378099
- append-flags -Wno-comment
-
- sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
- sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
- emake makefiles shared=yes dynamicmaps=no pie=yes \
- shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
- DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
- AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
- AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
- AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
- AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install () {
- local myconf
- use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
- html_directory=\"/usr/share/doc/${PF}/html\""
-
- LD_LIBRARY_PATH="${S}/lib" \
- /bin/sh postfix-install \
- -non-interactive \
- install_root="${D}" \
- config_directory="/etc/postfix" \
- manpage_directory="/usr/share/man" \
- command_directory="/usr/sbin" \
- mailq_path="/usr/bin/mailq" \
- newaliases_path="/usr/bin/newaliases" \
- sendmail_path="/usr/sbin/sendmail" \
- ${myconf} \
- || die "postfix-install failed"
-
- # Fix spool removal on upgrade
- rm -Rf "${D}"/var
- keepdir /var/spool/postfix
-
- # Install rmail for UUCP, closes bug #19127
- dobin auxiliary/rmail/rmail
-
- # Provide another link for legacy FSH
- dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
- # Install qshape tool and posttls-finger
- dobin auxiliary/qshape/qshape.pl
- doman man/man1/qshape.1
- dobin bin/posttls-finger
- doman man/man1/posttls-finger.1
-
- # Performance tuning tools and their manuals
- dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
- doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
- # Set proper permissions on required files/directories
- dodir /var/lib/postfix
- keepdir /var/lib/postfix
- fowners -R postfix:postfix /var/lib/postfix
- fperms 0750 /var/lib/postfix
- fowners root:postdrop /usr/sbin/post{drop,queue}
- fperms 02711 /usr/sbin/post{drop,queue}
-
- keepdir /etc/postfix
- if use mbox; then
- mypostconf="mail_spool_directory=/var/spool/mail"
- else
- mypostconf="home_mailbox=.maildir/"
- fi
- LD_LIBRARY_PATH="${S}/lib" \
- "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
- -e ${mypostconf} || die "postconf failed"
-
- insinto /etc/postfix
- newins "${FILESDIR}"/smtp.pass saslpass
- fperms 600 /etc/postfix/saslpass
-
- newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
- # do not start mysql/postgres unnecessarily - bug #359913
- use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
- use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
- dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
- pamd_mimic_system smtp auth account
-
- if use sasl; then
- insinto /etc/sasl2
- newins "${FILESDIR}"/smtp.sasl smtpd.conf
- fi
-
- # header files
- insinto /usr/include/postfix
- doins include/*.h
-
- # Remove unnecessary files
- rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
- rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
- if has_version mail-mta/postfix; then
- # let the sysadmin decide when to change the compatibility_level
- sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
- fi
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
- # Do not install server.{key,pem) SSL certificates if they already exist
- if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
- && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
- install_cert /etc/ssl/postfix/server
- chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
- fi
-
- if [[ ! -e /etc/mail/aliases.db ]] ; then
- ewarn
- ewarn "You must edit /etc/mail/aliases to suit your needs"
- ewarn "and then run /usr/bin/newaliases. Postfix will not"
- ewarn "work correctly without it."
- ewarn
- fi
-}
diff --git a/mail-mta/postfix/postfix-3.1_pre20151011.ebuild b/mail-mta/postfix/postfix-3.1_pre20151011.ebuild
new file mode 100644
index 0000000..72ad0b5
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.1_pre20151011.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+VDA_PV="2.10.0"
+VDA_P="${PN}-vda-v13-${VDA_PV}"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
+ vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+DEPEND=">=dev-libs/libpcre-3.4
+ dev-lang/perl
+ berkdb? ( >=sys-libs/db-3.2:* )
+ cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
+ eai? ( dev-libs/icu:= )
+ ldap? ( net-nds/openldap )
+ ldap-bind? ( net-nds/openldap[sasl] )
+ lmdb? ( >=dev-db/lmdb-0.9.11 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:* )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+
+RDEPEND="${DEPEND}
+ dovecot-sasl? ( net-mail/dovecot )
+ memcached? ( net-misc/memcached )
+ net-mail/mailbase
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/mini-qmail
+ !mail-mta/msmtp[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !mail-mta/opensmtpd
+ !<mail-mta/ssmtp-2.64-r2
+ !>=mail-mta/ssmtp-2.64-r2[mta]
+ !net-mail/fastforward
+ selinux? ( sec-policy/selinux-postfix )"
+
+# No vda support for postfix-3.0
+REQUIRED_USE="ldap-bind? ( ldap sasl )
+ !vda"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+ # Add postfix, postdrop user/group (bug #77565)
+ enewgroup postfix 207
+ enewgroup postdrop 208
+ enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+ if use vda; then
+ epatch "${DISTDIR}"/${VDA_P}.patch
+ fi
+
+ sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+ src/util/sys_defs.h || die "sed failed"
+
+ # change default paths to better comply with portage standard paths
+ sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+
+ epatch_user
+}
+
+src_configure() {
+ for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+ do
+ local AUXLIBS_${name}=""
+ done
+
+ # Make sure LDFLAGS get passed down to the executables.
+ local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+ AUXLIBS_PCRE="$(pcre-config --libs)"
+
+ use pam && mylibs="${mylibs} -lpam"
+
+ if use ldap; then
+ mycc="${mycc} -DHAS_LDAP"
+ AUXLIBS_LDAP="-lldap -llber"
+ fi
+
+ if use mysql; then
+ mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+ AUXLIBS_MYSQL="$(mysql_config --libs)"
+ fi
+
+ if use postgres; then
+ mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+ AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+ fi
+
+ if use sqlite; then
+ mycc="${mycc} -DHAS_SQLITE"
+ AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+ fi
+
+ if use ssl; then
+ mycc="${mycc} -DUSE_TLS"
+ mylibs="${mylibs} -lssl -lcrypto"
+ fi
+
+ if use lmdb; then
+ mycc="${mycc} -DHAS_LMDB"
+ AUXLIBS_LMDB="-llmdb -lpthread"
+ fi
+
+ if ! use eai; then
+ mycc="${mycc} -DNO_EAI"
+ fi
+
+ # broken. and "in other words, not supported" by upstream.
+ # Use inet_protocols setting in main.cf
+ #if ! use ipv6; then
+ # mycc="${mycc} -DNO_IPV6"
+ #fi
+
+ if use sasl; then
+ if use dovecot-sasl; then
+ # Set dovecot as default.
+ mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+ fi
+ if use ldap-bind; then
+ mycc="${mycc} -DUSE_LDAP_SASL"
+ fi
+ mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+ mylibs="${mylibs} -lsasl2"
+ elif use dovecot-sasl; then
+ mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+ fi
+
+ if ! use nis; then
+ mycc="${mycc} -DNO_NIS"
+ fi
+
+ if ! use berkdb; then
+ mycc="${mycc} -DNO_DB"
+ if use cdb; then
+ # change default hash format from Berkeley DB to cdb
+ mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+ fi
+ fi
+
+ if use cdb; then
+ mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+ # Tinycdb is preferred.
+ if has_version dev-db/tinycdb ; then
+ einfo "Building with dev-db/tinycdb"
+ AUXLIBS_CDB="-lcdb"
+ else
+ einfo "Building with dev-db/cdb"
+ CDB_PATH="/usr/$(get_libdir)"
+ for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+ AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+ done
+ fi
+ fi
+
+ # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+ # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+ mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ filter-lfs-flags
+
+ # Workaround for bug #76512
+ if use hardened; then
+ [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+ fi
+
+ # Remove annoying C++ comment style warnings - bug #378099
+ append-flags -Wno-comment
+
+ sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+ sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+ emake makefiles shared=yes dynamicmaps=no pie=yes \
+ shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+ DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+ AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+ AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+ AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+ AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+ local myconf
+ use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+ html_directory=\"/usr/share/doc/${PF}/html\""
+
+ LD_LIBRARY_PATH="${S}/lib" \
+ /bin/sh postfix-install \
+ -non-interactive \
+ install_root="${D}" \
+ config_directory="/etc/postfix" \
+ manpage_directory="/usr/share/man" \
+ command_directory="/usr/sbin" \
+ mailq_path="/usr/bin/mailq" \
+ newaliases_path="/usr/bin/newaliases" \
+ sendmail_path="/usr/sbin/sendmail" \
+ ${myconf} \
+ || die "postfix-install failed"
+
+ # Fix spool removal on upgrade
+ rm -Rf "${D}"/var
+ keepdir /var/spool/postfix
+
+ # Install rmail for UUCP, closes bug #19127
+ dobin auxiliary/rmail/rmail
+
+ # Provide another link for legacy FSH
+ dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+ # Install qshape tool and posttls-finger
+ dobin auxiliary/qshape/qshape.pl
+ doman man/man1/qshape.1
+ dobin bin/posttls-finger
+ doman man/man1/posttls-finger.1
+
+ # Performance tuning tools and their manuals
+ dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+ doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+ # Set proper permissions on required files/directories
+ dodir /var/lib/postfix
+ keepdir /var/lib/postfix
+ fowners -R postfix:postfix /var/lib/postfix
+ fperms 0750 /var/lib/postfix
+ fowners root:postdrop /usr/sbin/post{drop,queue}
+ fperms 02711 /usr/sbin/post{drop,queue}
+
+ keepdir /etc/postfix
+ if use mbox; then
+ mypostconf="mail_spool_directory=/var/spool/mail"
+ else
+ mypostconf="home_mailbox=.maildir/"
+ fi
+ LD_LIBRARY_PATH="${S}/lib" \
+ "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+ -e ${mypostconf} || die "postconf failed"
+
+ insinto /etc/postfix
+ newins "${FILESDIR}"/smtp.pass saslpass
+ fperms 600 /etc/postfix/saslpass
+
+ newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+ # do not start mysql/postgres unnecessarily - bug #359913
+ use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+ use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+ dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+ use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+ pamd_mimic_system smtp auth account
+
+ if use sasl; then
+ insinto /etc/sasl2
+ newins "${FILESDIR}"/smtp.sasl smtpd.conf
+ fi
+
+ # header files
+ insinto /usr/include/postfix
+ doins include/*.h
+
+ # Remove unnecessary files
+ rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+ rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+ if has_version mail-mta/postfix; then
+ # let the sysadmin decide when to change the compatibility_level
+ sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+ fi
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+ # Do not install server.{key,pem) SSL certificates if they already exist
+ if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+ && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+ install_cert /etc/ssl/postfix/server
+ chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+ fi
+
+ if [[ ! -e /etc/mail/aliases.db ]] ; then
+ ewarn
+ ewarn "You must edit /etc/mail/aliases to suit your needs"
+ ewarn "and then run /usr/bin/newaliases. Postfix will not"
+ ewarn "work correctly without it."
+ ewarn
+ fi
+}
diff --git a/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild b/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild
index 371f4b9..24cd31b 100644
--- a/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild
+++ b/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
S="${WORKDIR}"
@@ -20,5 +20,5 @@
FONT_SUFFIX="ttf"
src_unpack() {
- cp "${DISTDIR}/${A}" "${S}/${A//-${PV}}"
+ cp "${DISTDIR}/${A}" "${FONT_S}/${PN}.${FONT_SUFFIX}"
}
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index a0c6c87..61cc54e 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,2 +1,2 @@
-DIST cantarell-fonts-0.0.15.tar.xz 295596 SHA256 521cdcc8c9ad4a187816ad79736a8b428d5243b0569543966cf3d22cddffbc7e SHA512 bb7a7e394274ed43d12d490740287c3b2eb9682d0667244fe57df5a3267447376f197d10ce5c5895900bde799c8e2d9124e9a8f8dab79ed0f56a92fe73feea68 WHIRLPOOL 036faa509601597a51e977bafebd4e425cf48ef7ce4657396a90606cdc04266b869f1090fb7f37be926a53d89e7f4083d5eaef6c0d95d7340fe296b4f87c4923
DIST cantarell-fonts-0.0.16.tar.xz 291968 SHA256 15bf87555321556750bc68ace360f3df420359a8ab257e15c44fb69710152f1c SHA512 12936e56d1dd3eac3db5a02b854769ba7c8bd06bf4942c505d81ea20529ee450e07f0f347e3861a49212ef7291452716537c05375f74877246f49d186ad681b0 WHIRLPOOL ca79340c66cf4e4ed52e57f599ffa579bd207414b7e51507d4fb9c59b333b88b7d6b60783aff829ddc00686d0851f27c65c96452486951a1a997d4ad43e6f759
+DIST cantarell-fonts-0.0.17.tar.xz 266128 SHA256 96b36778b0a02854d832e8afa8439989d09b6f4c3e6d5f3a663f8418b82ba04f SHA512 9773b6e116df9c3ecd33183f011efa162bbac75b302fe91fba4d4b548cf8ceb0eafdcd576088b9291c855713c0dde1dcff2bde1525ae9b4835f7ea7fbe24d32b WHIRLPOOL f0b8812d67c3233685e7e0db7b25a4075d75809dccd7436f8279e0e3cf2b8950a26e2b2b24e5c37635da6bd9e8445a10e8ed3f6a9d35cb68b01f5e17513389f4
diff --git a/media-fonts/cantarell/cantarell-0.0.15.ebuild b/media-fonts/cantarell/cantarell-0.0.15.ebuild
deleted file mode 100644
index bfc3c0a..0000000
--- a/media-fonts/cantarell/cantarell-0.0.15.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME_ORG_MODULE="${PN}-fonts"
-
-inherit font gnome.org
-
-DESCRIPTION="Default fontset for GNOME Shell"
-HOMEPAGE="https://live.gnome.org/CantarellFonts"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/fontconfig"
-DEPEND="virtual/pkgconfig"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-# Font eclass settings
-FONT_CONF=("${S}/fontconfig/31-cantarell.conf")
-FONT_S="${S}/otf"
-FONT_SUFFIX="otf"
diff --git a/media-fonts/cantarell/cantarell-0.0.16.ebuild b/media-fonts/cantarell/cantarell-0.0.16.ebuild
index f3d1566..ca48273 100644
--- a/media-fonts/cantarell/cantarell-0.0.16.ebuild
+++ b/media-fonts/cantarell/cantarell-0.0.16.ebuild
@@ -12,7 +12,7 @@
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="media-libs/fontconfig"
diff --git a/media-fonts/cantarell/cantarell-0.0.17.ebuild b/media-fonts/cantarell/cantarell-0.0.17.ebuild
new file mode 100644
index 0000000..ef8eba8
--- /dev/null
+++ b/media-fonts/cantarell/cantarell-0.0.17.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="${PN}-fonts"
+
+inherit font gnome.org
+
+DESCRIPTION="Default fontset for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="media-libs/fontconfig"
+DEPEND="virtual/pkgconfig"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+# Font eclass settings
+FONT_CONF=("${S}/fontconfig/31-cantarell.conf")
+FONT_S="${S}/otf"
+FONT_SUFFIX="otf"
diff --git a/media-fonts/cantarell/metadata.xml b/media-fonts/cantarell/metadata.xml
index 6e0e2ec..da6fd63 100644
--- a/media-fonts/cantarell/metadata.xml
+++ b/media-fonts/cantarell/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+<herd>gnome</herd>
</pkgmetadata>
diff --git a/media-fonts/symbola/Manifest b/media-fonts/symbola/Manifest
index 06b5da7..0a4e021 100644
--- a/media-fonts/symbola/Manifest
+++ b/media-fonts/symbola/Manifest
@@ -1,3 +1,4 @@
DIST symbola-7.12.docx 220068 SHA256 84ad42f1839fbd03cc520399290ae71b97cdd258dbbd882c8066cd31e4c42b4e SHA512 68ed54d1a3c335016077eba90c91b530d95618f4bd241596083fbca82acba5a23c5ebfdf1c870c8183a357094635642aa3f17542cec946b3489a2f3b63ac6a29 WHIRLPOOL 35193049991b5c47f61b76025b5cd791eced8dc046c4a29da24856f99dc53e59a63783aebc7417017b53ffa1aca450336f0213b76d9f01a227b1f557345b1338
DIST symbola-7.12.pdf 2720033 SHA256 8a1183ade50a0ebd6a68ed8d7650f979cc11f956ebb192694aa8d60c112767d8 SHA512 eab7727c3ce5727c16aed62b115e4a864ec57ad60726e6ef98f7f8d3e24944e0837b59f801bbd371b465b5e1f8eee83f4c137d8d80743a08e84288f26a218851 WHIRLPOOL f24d281b5340b8abb3bc60df7683ff15ecdf568eba8ee35cc508a6c8dbf8134775718bc36da5552faff94e47ba12de7c2aa4b651d470717462eb83fde2f5b750
DIST symbola-7.12.ttf 2093772 SHA256 7acc058bd4e56cc986b2a46420520f59be402c3565c202b5dcebca7f3bfd8b5a SHA512 72d81c69cf723fd53460b977a6df99f789a950011dddbc27f60a09f3540d9e89bd524468033c9e8fe2fa14ccfe631b15aca26ade33c0a5ae461cadda958d036f WHIRLPOOL 56965f49ee774151073b7c34732fc42843b3eb6c180cf3a5d288b85087d5e3a7dea4d1581ba7315b1d9f318d79356d1b61f358a4397e5810fa57b1cdeda693a7
+DIST symbola-8.00.zip 4668110 SHA256 0d568882ca4f38a8e7d487367c75f4d8d7cb9f902b9675b7f6620c139014dad1 SHA512 f496be58660c5d07fd0a9422eef1dad3d0aa06e350e37f84a547496a6a9c6abf6fa4609e9051e40772e952cd4f71a7dd02ad0ba16cf3aa2b51f31fee09ef9b84 WHIRLPOOL 54f2bd82669be4a54dbb365eb083e241c8cf50f1f827319564875eefdf6d346245759857d87e1c393456d3e8bfd094a5a977f30d3a5e405b22f7d75f2f5ec766
diff --git a/media-fonts/symbola/symbola-8.00.ebuild b/media-fonts/symbola/symbola-8.00.ebuild
new file mode 100644
index 0000000..a3fce54
--- /dev/null
+++ b/media-fonts/symbola/symbola-8.00.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN/s/S}"
+
+inherit font
+
+DESCRIPTION="Unicode font for Basic Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks"
+HOMEPAGE="http://users.teilar.gr/~g1951d/"
+SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}.zip -> ${P}.zip"
+LICENSE="Unicode_Fonts_for_Ancient_Scripts"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
+
+src_prepare() {
+ if use doc; then
+ DOCS="${MY_PN}.docx ${MY_PN}.pdf"
+ fi
+}
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 1506024..776489e 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,3 +1,2 @@
-DIST eog-plugins-3.14.2.tar.xz 363836 SHA256 31a33b65cd6452ebeca3821f6eb45caefb83bd5d121dee7cf7e4c139ba065f89 SHA512 b29e0aa247ce7006a339ba4a4352e9dfe0150662f2a40fbdb10ac21daca95bb8c75b921cfad4a57ee783424befd98145a35f2a9b8a0083a9bff3928c157fa058 WHIRLPOOL ecc6d4e3a60b7e00f5bbb955040c2f43eb7e1d309970b2084bd50ac706fe149df50ae8e7ab7d595caca0b4853113bfb7073c5e785560b999c5b7db86bc277746
-DIST eog-plugins-3.16.0.tar.xz 367436 SHA256 6fab1c1e0705fc2b0e4a63caf3ba1c5b64b4eaa1301e4cbc04bb934428b68450 SHA512 f592aa08754a1f2d5f503239b5b68b4d9617aa0a1e5a0afd3b80d5bc11fcd312b219157607ff53d98927b9b63e088009c5bb5181dbbcc71466785780b3339fe9 WHIRLPOOL 564a3cf6f572a50fad2f9772138afb80d6ca5a3b3b5c178183d36a95f7fea23d7bd499751a27a40e449dd340e3fc626e8a0c64b3d7c056e3abec9ff62ae78727
DIST eog-plugins-3.16.1.tar.xz 368652 SHA256 c586b6708064dcd03612f9373a6160214b2fa4797bf8c07db530b18eda4074d9 SHA512 f7871cd99e54f65796c659d69bb1f741a706c243c2f0683c6efe38ae685a1a5b66a31a1dcb2bcea84a516b385a16c4d871ad78ebfa043dc8f895729d07758429 WHIRLPOOL 2a564c7e53eaf6daf283daa34845021eac3dbb30625dc307d749aab3a92f7e9cebed168af1d7d7f23bdeaa53ada957b448341fa97708ea57e5005dd024e4614c
+DIST eog-plugins-3.16.2.tar.xz 369252 SHA256 f33de3c78d6a7d8a89441daa9c3e49e043dcdc527b0b7d477f0bf2d3af08e534 SHA512 4791946a86880844b87a1e6dd0fe7755e1e4dc2558d18e3df2e9410a355224de9787efb0cea9fc8c843ec9c11a907f90d5902fddc093f1af671c9cee20d45fe5 WHIRLPOOL 3252ab0dadf2fb0bc7b161cf56018f51136dd2195aef2f2755218f9d614f7b13766c5002981d1562ec5d383afb9a125afa2a464569d2289cb996d26119e57c63
diff --git a/media-gfx/eog-plugins/eog-plugins-3.14.2.ebuild b/media-gfx/eog-plugins/eog-plugins-3.14.2.ebuild
deleted file mode 100644
index 1c379c7..0000000
--- a/media-gfx/eog-plugins/eog-plugins-3.14.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+exif +flickr map +picasa +python"
-REQUIRED_USE="
- map? ( exif )
- python? ( ^^ ( $(python_gen_useflags '*') ) )"
-
-RDEPEND="
- >=dev-libs/glib-2.32:2
- >=dev-libs/libpeas-0.7.4:=
- >=media-gfx/eog-3.11.4
- >=x11-libs/gtk+-3.3.8:3
- exif? ( >=media-libs/libexif-0.6.16 )
- flickr? ( media-gfx/postr )
- map? (
- media-libs/libchamplain:0.12[gtk]
- >=media-libs/clutter-1.9.4:1.0
- >=media-libs/clutter-gtk-1.1.2:1.0 )
- picasa? ( >=dev-libs/libgdata-0.9.1:= )
- python? (
- ${PYTHON_DEPS}
- >=dev-libs/glib-2.32:2[dbus]
- dev-libs/libpeas:=[gtk,python,${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- gnome-base/gsettings-desktop-schemas
- media-gfx/eog[introspection]
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection] )
-"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.50.1
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-pkg_setup() {
- use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_configure() {
- local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
- use exif && plugins="${plugins},exif-display"
- use flickr && plugins="${plugins},postr"
- use map && plugins="${plugins},map"
- use picasa && plugins="${plugins},postasa"
- use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder"
- gnome2_src_configure \
- $(use_enable python) \
- --with-plugins=${plugins}
-}
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.0.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.2.ebuild
similarity index 100%
rename from media-gfx/eog-plugins/eog-plugins-3.16.0.ebuild
rename to media-gfx/eog-plugins/eog-plugins-3.16.2.ebuild
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index f3ef648..5cd1ff1 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1 +1,2 @@
DIST exiv2-0.24.tar.gz 4635028 SHA256 f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e SHA512 e2d5d076c09a36d88472485c9d9d99b5a50aea1ab59b1e5c9301b1ce9fe2b2af02acae2662c9ff56b4c749a224688387ba58334d31b74f04f3d2d3d3c0e387e9 WHIRLPOOL b5b7eb544975d8e14739b39fc294279b58369944172684c0f881348ebf47ef0f9ccd18e8bc41113d9da3a72f8d6c048641f547a7071a7ca6d93d1d30ea2d7aed
+DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac
diff --git a/media-gfx/exiv2/exiv2-0.25-r1.ebuild b/media-gfx/exiv2/exiv2-0.25-r1.ebuild
new file mode 100644
index 0000000..bc2577b
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.25-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils cmake-multilib python-any-r1
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="http://www.exiv2.org/"
+SRC_URI="http://www.exiv2.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/14"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE_LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi"
+IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
+
+RDEPEND="
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ webready? (
+ net-libs/libssh[${MULTILIB_USEDEP}]
+ net-misc/curl[${MULTILIB_USEDEP}]
+ )
+ xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ dev-libs/libxslt
+ virtual/pkgconfig
+ media-gfx/graphviz
+ ${PYTHON_DEPS}
+ )
+ nls? ( sys-devel/gettext )
+"
+
+DOCS=( README doc/ChangeLog doc/cmd.txt )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.25-fix-docs.patch"
+ "${FILESDIR}/${PN}-0.25-fix-install-dirs.patch"
+ "${FILESDIR}/${PN}-0.25-tools-optional.patch"
+ "${FILESDIR}/${PN}-0.25-fix-without-zlib.patch"
+)
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ rm -r msvc* build || die "Failed to remove msvc dirs"
+
+ if [[ ${PV} != *9999 ]] ; then
+ if [[ -d po ]] ; then
+ pushd po > /dev/null || die
+ for lang in *.po; do
+ if ! has ${lang%.po} ${LINGUAS} ; then
+ rm -rf ${lang} || die
+ fi
+ done
+ popd > /dev/null || die
+ else
+ die "Failed to prepare LINGUAS - po directory moved?"
+ fi
+ fi
+
+ # convert docs to UTF-8
+ local i
+ for i in doc/cmd.txt; do
+ einfo "Converting "${i}" to UTF-8"
+ iconv -f LATIN1 -t UTF-8 "${i}" > "${i}.tmp" || die
+ mv -f "${i}.tmp" "${i}" || die
+ done
+
+ if use doc; then
+ einfo "Updating doxygen config"
+ doxygen &>/dev/null -u config/Doxyfile || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DEXIV2_ENABLE_BUILD_PO=YES
+ -DEXIV2_ENABLE_BUILD_SAMPLES=NO
+ -DEXIV2_ENABLE_CURL=$(usex webready)
+ -DEXIV2_ENABLE_NLS=$(usex nls)
+ -DEXIV2_ENABLE_PNG=$(usex png)
+ -DEXIV2_ENABLE_SSH=$(usex webready)
+ -DEXIV2_ENABLE_WEBREADY=$(usex webready)
+ -DEXIV2_ENABLE_XMP=$(usex xmp)
+ -DEXIV2_ENABLE_LIBXMP=NO
+ $(multilib_is_native_abi || \
+ echo -DEXIV2_ENABLE_TOOLS=NO)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+
+ if multilib_is_native_abi; then
+ use doc && emake -j1 doc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --all
+
+ use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
+ use doc && dodoc -r "${S}"/doc/html
+
+ if use examples; then
+ docinto examples
+ dodoc samples/*.cpp
+ fi
+}
diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch
new file mode 100644
index 0000000..e2bf677
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch
@@ -0,0 +1,71 @@
+--- a/CMakeLists.txt 2015-07-19 16:04:35.363628707 +0200
++++ b/CMakeLists.txt 2015-07-19 16:28:31.051680136 +0200
+@@ -216,9 +216,7 @@
+ ADD_SUBDIRECTORY( xmpsdk )
+ ADD_SUBDIRECTORY( src )
+
+-IF( EXIV2_ENABLE_BUILD_SAMPLES )
+- ADD_SUBDIRECTORY( samples )
+-ENDIF( EXIV2_ENABLE_BUILD_SAMPLES )
++ADD_SUBDIRECTORY( samples )
+
+ IF( EXIV2_ENABLE_BUILD_PO )
+ ADD_SUBDIRECTORY( po )
+--- a/samples/CMakeLists.txt 2015-07-19 16:04:35.360628744 +0200
++++ b/samples/CMakeLists.txt 2015-07-19 16:30:46.415987850 +0200
+@@ -20,7 +20,11 @@
+ endif()
+ include_directories("${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src")
+
+-SET( SAMPLES addmoddel.cpp
++SET( SAMPLES taglist.cpp )
++
++IF( EXIV2_ENABLE_BUILD_SAMPLES )
++ SET( SAMPLES ${SAMPLES}
++ addmoddel.cpp
+ convert-test.cpp
+ easyaccess-test.cpp
+ exifcomment.cpp
+@@ -38,7 +42,6 @@
+ mmap-test.cpp
+ prevtest.cpp
+ stringto-test.cpp
+- taglist.cpp
+ tiff-test.cpp
+ werror-test.cpp
+ write-test.cpp
+@@ -47,6 +50,7 @@
+ xmpparser-test.cpp
+ xmpsample.cpp
+ )
++ENDIF()
+
+ FOREACH(entry ${SAMPLES})
+ STRING( REPLACE ".cpp" "" target ${entry})
+@@ -63,6 +67,7 @@
+ SET( MC_SRC ${MC_SRC} ../src/getopt_win32.c )
+ ENDIF( MSVC )
+
++IF( EXIV2_ENABLE_BUILD_SAMPLES )
+ SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp )
+ ADD_EXECUTABLE( metacopy ${MC_SRC} )
+ TARGET_LINK_LIBRARIES( metacopy exiv2lib )
+@@ -79,6 +84,7 @@
+ SET_TARGET_PROPERTIES( exiv2json PROPERTIES OUTPUT_NAME exiv2json )
+ TARGET_LINK_LIBRARIES( exiv2json exiv2lib )
+ INSTALL( TARGETS exiv2json ${INSTALL_TARGET_STANDARD_ARGS} )
++ENDIF()
+
+ # That's all Folks!
+ ##
+--- a/doc/templates/Makefile 2015-07-19 16:50:50.589933604 +0200
++++ b/doc/templates/Makefile 2015-07-19 16:51:07.686719864 +0200
+@@ -143,7 +143,7 @@
+ xmp_mwg-rs \
+ xmp_mwg-kw
+
+-TAGLIST = ../../bin/taglist
++TAGLIST = ../../src/bin/taglist
+
+ # **********************************************************************
+ # ======================================================================
diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch
new file mode 100644
index 0000000..bca79dd
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch
@@ -0,0 +1,64 @@
+USE GNUInstallDirs to fix man page and multilib install
+
+See also: http://dev.exiv2.org/issues/1125
+Patch based on: http://pkgs.fedoraproject.org/cgit/exiv2.git/tree/exiv2-0.25-cmake_LIB_SUFFIX.patch
+
+--- b/config/CMakeChecks.txt 2015-07-19 14:23:11.606686135 +0200
++++ b/config/CMakeChecks.txt 2015-06-22 08:41:22.913094633 -0500
+@@ -37,6 +37,8 @@
+ INCLUDE( CheckCSourceCompiles )
+ INCLUDE( CheckCXXSourceCompiles )
+
++INCLUDE( GNUInstallDirs )
++
+ INCLUDE( FindIconv )
+
+ SET( STDC_HEADERS ON )
+@@ -289,9 +291,9 @@
+
+ IF( NOT MSVC )
+ CONFIGURE_FILE( config/exiv2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc @ONLY )
+- INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION lib/pkgconfig )
++ INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+ CONFIGURE_FILE( config/exiv2.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm)
+- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION lib/pkgconfig )
++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+ ENDIF( NOT MSVC )
+
+ # ******************************************************************************
+--- a/src/CMakeLists.txt 2015-07-19 14:06:54.104906589 +0200
++++ b/src/CMakeLists.txt 2015-07-19 14:12:37.982607526 +0200
+@@ -321,7 +321,7 @@
+
+ # ******************************************************************************
+ # Man page
+-INSTALL( FILES exiv2.1 DESTINATION man/man1 )
++INSTALL( FILES exiv2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
+
+ # That's all Folks!
+ ##
+--- a/CMakeLists.txt 2015-06-15 10:32:21.000000000 -0500
++++ b/CMakeLists.txt 2015-06-22 08:48:19.486245765 -0500
+@@ -25,7 +25,7 @@ if( POLICY CMP0042 )
+ else()
+ SET(CMAKE_MACOSX_RPATH 1)
+ endif()
+-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
++#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+
+
+ SET( PACKAGE_COPYRIGHT "Andreas Huggel" )
+@@ -156,10 +156,10 @@ INCLUDE( config/CMakeChecks.txt )
+
+ SET( INSTALL_TARGET_STANDARD_ARGS
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
++#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+
+ ##
+ # add sources from XMPSDK directory
diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch
new file mode 100644
index 0000000..c6d435d
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch
@@ -0,0 +1,22 @@
+Fix exiv2.hpp if built with PNG support disabled (--without-zlib)
+
+Fixed upstream in >=0.26
+
+See also: http://dev.exiv2.org/issues/1103
+Gentoo bug 1: https://bugs.gentoo.org/show_bug.cgi?id=552046
+Gentoo bug 2: https://bugs.gentoo.org/show_bug.cgi?id=535836
+
+Index: exiv2.hpp
+===================================================================
+--- a/include/exiv2/exiv2.hpp (revision 3887)
++++ b/include/exiv2/exiv2.hpp (revision 3888)
+@@ -52,7 +52,9 @@
+ #include "mrwimage.hpp"
+ #include "orfimage.hpp"
+ #include "pgfimage.hpp"
++#ifdef EXV_HAVE_LIBZ
+ #include "pngimage.hpp"
++#endif
+ #include "preview.hpp"
+ #include "properties.hpp"
+ #include "psdimage.hpp"
diff --git a/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch
new file mode 100644
index 0000000..2bb030a
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch
@@ -0,0 +1,27 @@
+--- a/CMakeLists.txt 2015-06-15 17:32:21.000000000 +0200
++++ b/CMakeLists.txt 2015-10-04 14:37:05.319679836 +0200
+@@ -55,6 +55,7 @@
+ OPTION( EXIV2_ENABLE_WEBREADY "Build webready support into library" OFF )
+ OPTION( EXIV2_ENABLE_CURL "USE Libcurl for HttpIo" ON )
+ OPTION( EXIV2_ENABLE_SSH "USE Libssh for SshIo" ON )
++OPTION( EXIV2_ENABLE_TOOLS "Build exiv2 executable" ON )
+
+ IF( MINGW OR UNIX )
+ IF ( CMAKE_CXX_COMPILER STREQUAL "g++" OR CMAKE_C_COMPILER STREQUAL "gcc" )
+--- a/src/CMakeLists.txt 2015-06-14 11:12:19.000000000 +0200
++++ b/src/CMakeLists.txt 2015-10-04 14:33:27.784399402 +0200
+@@ -296,9 +296,11 @@
+
+ # ******************************************************************************
+ # exiv2 application
+-ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} )
+-TARGET_LINK_LIBRARIES( exiv2 exiv2lib )
+-INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
++IF( EXIV2_ENABLE_TOOLS )
++ ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} )
++ TARGET_LINK_LIBRARIES( exiv2 exiv2lib )
++ INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
++ENDIF( EXIV2_ENABLE_TOOLS )
+
+ # ******************************************************************************
+ # connection test application
diff --git a/media-gfx/exiv2/metadata.xml b/media-gfx/exiv2/metadata.xml
index 0bb7de6..795480e 100644
--- a/media-gfx/exiv2/metadata.xml
+++ b/media-gfx/exiv2/metadata.xml
@@ -4,12 +4,11 @@
<herd>graphics</herd>
<herd>kde</herd>
<longdescription lang="en">
- Exiv2 is a C++ library and a command line utility to read and
- write EXIF and IPTC image metadata.
+ Exiv2 is a C++ library and command line utility to read and
+ write EXIF, IPTC and XMP image metadata.
</longdescription>
<use>
- <flag name='contrib'>
- Build additional contrib components
- </flag>
+ <flag name='contrib'>Build additional contrib components</flag>
+ <flag name='webready'>Support reading metadata over the internet</flag>
</use>
</pkgmetadata>
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index d9d7747..3a80460 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -3,4 +3,5 @@
DIST feh-2.12.1.tar.bz2 2116784 SHA256 9026ece01d79560e1eff9715fa1765eef82e22c766da5994ee787984a6f466a1 SHA512 4afde8ed5e5bc3e44f1989aeafd26d10042e2064f1bf6edd9a01f075a42cfcdd83d6fa5f5698a2e43138b9a3c553a5604748b6b807eba25f83971f645269d993 WHIRLPOOL 1b380bff5f92c843337cde85c567df45c913f9e84dfbdcfb34f46e2e667fb4fef2705b2d3ebbcd80effe44a337bfa9df0426cbfb7d7d32ce13112f9ec45b6c1c
DIST feh-2.12.tar.bz2 2090538 SHA256 60e07a0f545f6fb7af7b6c0d2ce1ba6bacfa65380e83cbbc2c54e8aa6b8b7032 SHA512 4d24c293ef062eb91dfd009b45f5362bccae26ebb93519f6e324b9c34b3fba4ec1ffda6c01ee71dca4f55e08d6f5101f0f9c3cbf577814eedca956790e745872 WHIRLPOOL b0b647e6785124fdaf4a36615bae081ffcc1b349739da750c6c8c1be2442050344e1bc5b65d3edfd2c6f220ae356321c9a346f5c8e9e4ecb0083fe65de24f359
DIST feh-2.13.1.tar.bz2 2117354 SHA256 865088d0481f6862d79d7c08d7b6cf1d25058a74a5784e511a1422fea8aba980 SHA512 60f2d691c24495fc126f868d3a4b3e43c7a41d0a3ff9ecfcec66a26b62012ef68bbbab897398c1d054d8eaa747baa180c8a41ed77e750071fde4e57a058b179b WHIRLPOOL 2259b2a2b704dcc27ddb0dd8d879be1445151fc5d0b6d0155df7dd0d1376f54f7a8766f08c68fcffabb10826d8f359a092376e51b316713ff9ff31c9d055afcd
+DIST feh-2.14.tar.bz2 2118007 SHA256 3829cd8995ec7cc08095a2b22a6c98d1e2638bd87c8b4f0e85a059c6f0edbc48 SHA512 6a50ff787d4eecbfa830da7d7c6eec6feffbe883d48fb52b2a08471c8e1b5f0952e5c316ae67aad2b4feaa517bcb16ab8d5a19bd02832f33933dfd78f3a16243 WHIRLPOOL 0e3ed2614ac1a311a6fe73f9cf6e27b99d4c7ef17f69e9ff72cdf8d31bd8fa66308ebd954c6226415fd5103bd4405b49bb07038008a7ea44f724c83723374e35
DIST feh-2.9.3.tar.bz2 2082188 SHA256 b4e8d603033af12afa77ae8020bcf4ff51c6950b9a6880a0fe32b04fdf7290f2 SHA512 9a0194d43037b1f1b1bd19dc4a9a1c6073504622283c466de1d1952798f37db21b5f2f61c14eeb732c49cc22707a5b47c7009fdaec6141eb3e1b936e2b7b038d WHIRLPOOL e77bd586e26b6ad1e2fb4189fdd33a19e7b45347417223ed65669955903b4ee5efbfa9fd52763b0724efc3bd9f490fa62c77323b5ee3f89445a0338e5fb2eed5
diff --git a/media-gfx/feh/feh-2.14.ebuild b/media-gfx/feh/feh-2.14.ebuild
new file mode 100644
index 0000000..e5b2f3f
--- /dev/null
+++ b/media-gfx/feh/feh-2.14.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="http://feh.finalrewind.org/"
+SRC_URI="http://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+ >=media-libs/libpng-1.2:0=
+ x11-libs/libX11
+ curl? ( net-misc/curl )
+ exif? ( media-libs/libexif )
+ xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+ virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+ x11-libs/libXt
+ x11-proto/xproto
+ test? (
+ >=dev-lang/perl-5.10
+ dev-perl/Test-Command
+ )"
+
+pkg_setup() {
+ use_feh() { usex $1 1 0; }
+
+ fehopts=(
+ DESTDIR="${D}"
+ PREFIX=/usr
+ doc_dir='${main_dir}'/share/doc/${PF}
+ example_dir='${main_dir}'/share/doc/${PF}/examples
+ curl=$(use_feh curl)
+ debug=$(use_feh debug)
+ xinerama=$(use_feh xinerama)
+ exif=$(use_feh exif)
+ )
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch
+ # fix desktop file
+ sed -i -e "s:^Icon=.*:Icon=/usr/share/feh/images/logo.svg:" \
+ share/applications/${PN}.pre || die
+}
+
+src_compile() {
+ tc-export CC
+ emake "${fehopts[@]}"
+}
+
+src_install() {
+ emake "${fehopts[@]}" install
+}
diff --git a/media-gfx/geeqie/geeqie-1.2.2.ebuild b/media-gfx/geeqie/geeqie-1.2.2.ebuild
index 045e981..46fb374 100644
--- a/media-gfx/geeqie/geeqie-1.2.2.ebuild
+++ b/media-gfx/geeqie/geeqie-1.2.2.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit eutils
+inherit autotools eutils
DESCRIPTION="A lightweight GTK image viewer forked from GQview"
HOMEPAGE="http://www.geeqie.org"
@@ -32,6 +32,8 @@
src_prepare() {
epatch_user
+
+ eautoreconf
}
src_configure() {
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 0d3b41f..c42f116 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,5 +1,2 @@
DIST graphviz-2.26.3.tar.gz 17092429 SHA256 f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1 SHA512 6225141752318af0b50714d70d31dd1ef1bc414d134d22f066f159843991194215bb9bc4e8df38a194e1de67ebbf137d371e875948fa6a6eebfca9df1a414a6d WHIRLPOOL ca35d0ed9cb3751ae968e1c6d425efe42e8b681685eb66f975c0ff1b73e245fc3db6418ec69300331c94275fe3bfcdcd168b931b880c280f3dd63f1f03c4d4db
-DIST graphviz-2.28.0.tar.gz 19620087 SHA256 d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76 SHA512 d6dbcd99487e382f9ca83ef63a3ff3fbe9208f6d3969cf03d15b8944dfb58c7fefe1bf96939e3e69019ae9a562619c6d64ad24e390c408b7271caade443233e0 WHIRLPOOL f0274567661f16993a107f45685f0716e64ea493e064efd2e72a4680120cbee8989fb0eab6429d432d18106d42bfc37d4113816efb14e7888d00014b83dea72a
-DIST graphviz-2.34.0.tar.gz 23921350 SHA256 d94abca5745aa4c5808ab56cd3d0ec9ed14fb76a5a88d39e1f234fa84d22d764 SHA512 73dc8c25bc5747fda717d6d2162a8b37bf883544a13b487354a6000d528816a69a021f33cbeec0f6e718a7e9905ab2a04ee63f787ca7f79226055b2da21f4832 WHIRLPOOL 0fe3bf7420eccef9de51789ae9a8d8cab55b6fae7382e557604fb974e04eaa1e0610392dc7f6d5fa85a0b83a3cc955a4ff08d594bf8805c7f06625c7d9ac9007
-DIST graphviz-2.36.0.tar.gz 23846318 SHA256 37fd66d8def158575c75c4f6dbf536839e4ee468aa59314eb472d1aecb076361 SHA512 cca1339cea8d36acbae647a78ff6743a4f77bfa208e74fef615a99dc7d380d2a0a0f0b3fc00de09a9f67c3fad16dc3837ef3aefbfce5a8a3d0f974ed5afbbab5 WHIRLPOOL c9f25f28869afef943121a24b580518d822eb76f30b4c874554f2f1dd4f16ffaf2683644c59746f4295aa574c4b5541f1205787870eed5567cd4bd5c755e5f8b
DIST graphviz-2.38.0.tar.gz 25848858 SHA256 81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e SHA512 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531 WHIRLPOOL b59bb517c4aa690ffd23e1b4d448d5dbaae5594eb1059d574e0cb3bf2091beb9ed867bd4fa7e8ca0259863f24849c96d4d1da056091922bf33ace7da43c8b5d4
diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch b/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch
deleted file mode 100644
index 095354f..0000000
--- a/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- configure.ac.old 2011-05-07 05:25:24.000000000 +0200
-+++ configure.ac 2011-06-24 13:24:49.000000000 +0200
-@@ -1924,6 +1924,10 @@
- # so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM
- #
-
-+AC_ARG_WITH(lefty,
-+ [AS_HELP_STRING([--with-lefty=yes],[build lefty])],
-+ [],[with_xaw=yes])
-+
- AC_ARG_WITH(Xpmincludedir,
- [AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])],
- [XPM_INCLUDES="-I$withval"])
-@@ -1931,6 +1935,17 @@
- [AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])],
- [XPM_LIBS="-L$withval"])
-
-+AC_ARG_WITH(Xawincludedir,
-+ [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
-+ [XAW_INCLUDES="-I$withval"])
-+AC_ARG_WITH(Xawlibdir,
-+ [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
-+ [XAW_LIBS="-L$withval"])
-+
-+if test "x$with_xaw" != "xyes"; then
-+ use_lefty="No (disabled)"
-+else
-+
- save_CPPFLAGS=$CPPFLAGS
- save_LDFLAGS=$LDFLAGS
- CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS"
-@@ -1941,18 +1956,10 @@
- AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS])
- LDFLAGS=$save_LDFLAGS
- CPPFLAGS=$save_CPPFLAGS
--AC_SUBST(XPM_INCLUDES)
--AC_SUBST(XPM_LIBS)
-
- dnl -----------------------------------
- dnl INCLUDES and LIBS for XAW
-
--AC_ARG_WITH(Xawincludedir,
-- [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
-- [XAW_INCLUDES="-I$withval"])
--AC_ARG_WITH(Xawlibdir,
-- [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
-- [XAW_LIBS="-L$withval"])
- save_CPPFLAGS=$CPPFLAGS
- save_LDFLAGS=$LDFLAGS
- CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS"
-@@ -1978,12 +1985,17 @@
- fi
- LDFLAGS=$save_LDFLAGS
- CPPFLAGS=$save_CPPFLAGS
-+
-+fi
-+
-+AC_SUBST(XPM_INCLUDES)
-+AC_SUBST(XPM_LIBS)
- AC_SUBST(XAW_INCLUDES)
- AC_SUBST(XAW_LIBS)
--AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"])
--if test "x$with_xaw" = "xno"; then
-+AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" = "xyes"])
-+if test "x$with_xaw" != "xyes"; then
- if test "x$no_x" != "xyes"; then
-- AC_MSG_WARN(Lefty cannot be built)
-+ AC_MSG_WARN(Lefty will not be built)
- fi
- fi
-
diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch b/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch
deleted file mode 100644
index 7b279fc..0000000
--- a/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Install dir ( buiding with media-libs/ming ):
- /usr/$(get_libdir)/graphviz/Bitstream_Vera_Serif.fdb
- /usr/$(get_libdir)/graphviz/Bitstream_Vera_Sans.fdb
- /usr/include/graphviz/gv.cpp
- /usr/include/graphviz/gv.i
-
-Due to the following change, {pkglib,pkginclude}_DATA is invalid:
- http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
-
----
---- a/plugin/ming/Makefile.am
-+++ b/plugin/ming/Makefile.am
-@@ -17,7 +17,8 @@ lib_LTLIBRARIES = libgvplugin_ming.la
- else
- pkglib_LTLIBRARIES = libgvplugin_ming.la
- endif
--pkglib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
-+fdblibdir = $(libdir)/@PACKAGE@
-+fdblib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
- endif
-
- libgvplugin_ming_C_la_SOURCES = \
---- a/tclpkg/gv/Makefile.am
-+++ b/tclpkg/gv/Makefile.am
-@@ -257,7 +257,7 @@ $(TCL_data): gv_tcl.cpp
- gv_tcl.cpp: gv.i
- $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
-
--pkginclude_DATA = gv.i gv.cpp
-+pkginclude_HEADERS = gv.i gv.cpp
- pkglib_LTLIBRARIES =
- man_MANS =
- DEVTSTS =
diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-dot-pangocairo-link.patch b/media-gfx/graphviz/files/graphviz-2.28.0-dot-pangocairo-link.patch
deleted file mode 100644
index cf1715c..0000000
--- a/media-gfx/graphviz/files/graphviz-2.28.0-dot-pangocairo-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmd/dot/Makefile.am 2012-05-29 01:00:08.965321443 +0200
-+++ cmd/dot/Makefile.am 2012-05-29 01:01:57.471964924 +0200
-@@ -115,8 +115,8 @@
- endif
-
- if WITH_PANGOCAIRO
--dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS)
--dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS)
-+dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
-+dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
- endif
-
- EXTRA_DIST = Makefile.old dot.1 dot.1.pdf osage.1 osage.1.pdf patchwork.1 patchwork.1.pdf dot.vcproj
diff --git a/media-gfx/graphviz/files/graphviz-2.38-fix-backslashes.patch b/media-gfx/graphviz/files/graphviz-2.38-fix-backslashes.patch
deleted file mode 100644
index b4e911d..0000000
--- a/media-gfx/graphviz/files/graphviz-2.38-fix-backslashes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-User reported a regression between 2.26 and 2.36
-when trying to .dot the following graph:
-
- digraph g {
- 1 -> 2 [label="\\"]
- }
-
-2.26 shows it as '\' while 2.36 fails as:
- $ dot -Tpng a.dot -o a.png
- Warning: 1.dot: syntax error in line 2 near ''
-
-Thanks to Ulya Trofimovich who found and bisected
-the problem down to this commit, which fixes problem
-only in git version.
-
-commit 386e47c14b3a8e83bdf3ec8772963213095a7294
-Author: Emden R. Gansner <erg@alum.mit.edu>
-Date: Thu Jan 30 08:45:06 2014 -0500
-
- Remove change made in d19b672a3c06f0ae95b1da38b63b068f71eb266f until we can
- remember why this change was made.
-
-diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l
-index 0a31f0c..5bb30b7 100644
---- a/lib/cgraph/scan.l
-+++ b/lib/cgraph/scan.l
-@@ -199,6 +199,7 @@ ID ({NAME}|{NUMBER})
- ["] BEGIN(qstring); beginstr();
- <qstring>["] BEGIN(INITIAL); endstr(); return (T_qatom);
- <qstring>[\\]["] addstr ("\"");
-+<qstring>[\\][\\] addstr ("\\\\");
- <qstring>[\\][\n] line_num++; /* ignore escaped newlines */
- <qstring>([^"\\]*|[\\]) addstr(yytext);
- [<] BEGIN(hstring); html_nest = 1; beginstr();
diff --git a/media-gfx/graphviz/graphviz-2.28.0.ebuild b/media-gfx/graphviz/graphviz-2.28.0.ebuild
deleted file mode 100644
index b702ab3..0000000
--- a/media-gfx/graphviz/graphviz-2.28.0.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic multilib python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-#original KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gtk gts java lasi nls perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
- sys-libs/zlib
- >=dev-libs/expat-2
- >=dev-libs/glib-2.11.1
- >=media-libs/fontconfig-2.3.95
- >=media-libs/freetype-2.1.10
- >=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
- >=media-libs/libpng-1.2:0
- !<=sci-chemistry/cluster-1.3.081231
- virtual/jpeg:0
- virtual/libiconv
- X? (
- x11-libs/libXaw
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- )
- cairo? (
- >=x11-libs/pango-1.12
- >=x11-libs/cairo-1.1.10[svg]
- )
- devil? ( media-libs/devil[png,jpeg] )
- postscript? ( app-text/ghostscript-gpl )
- gtk? ( x11-libs/gtk+:2 )
- gts? ( sci-libs/gts )
- lasi? ( media-libs/lasi )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- ruby? ( dev-lang/ruby )
- svg? ( gnome-base/librsvg )
- tcl? ( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- java? ( dev-lang/swig )
- nls? ( >=sys-devel/gettext-0.14.5 )
- perl? ( dev-lang/swig )
- python? (
- dev-lang/swig
- ${PYTHON_DEPS}
- )
- ruby? ( dev-lang/swig )
- tcl? ( dev-lang/swig )"
-REQUIRED_USE="
- !cairo? ( !X !gtk !postscript !lasi )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-# the ones which are always compiled in, depend on zlib, gd
-# - gtk
-# Directly depends on gtk-2.
-# needs 'pangocairo' enabled in graphviz configuration
-# gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-# Disabled, GTK-1 junk.
-# - glitz
-# Disabled, no particular reason
-# needs 'pangocairo' enabled in graphviz configuration
-# - ming
-# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-# incomplete.
-# - cairo/pango:
-# Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-# needs cairo+pango,
-# can make use of gnomeui and inotify support (??? unsure),
-# needs libXaw for UI
-# UI also links directly against libX11, libXmu, and libXt
-# and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... broken on ~x86
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-# sci-libs/gts can be used for some of these
-# - lefty:
-# needs Xaw and X to build
-# - gvedit (via 'qt4'):
-# based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-# currently disabled -- it segfaults a lot
-# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png'
-# with flags enabled at configure time
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-Xaw-configure.patch \
- "${FILESDIR}"/${P}-automake-1.11.2.patch \
- "${FILESDIR}"/${P}-dot-pangocairo-link.patch
-
- # ToDo: Do the same thing for examples and/or
- # write a patch for a configuration-option
- # and send it to upstream
- # note - the longer sed expression removes multi-line assignments that are extended via '\'
- if ! use doc ; then
- find . -iname Makefile.am \
- | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
- -e '/^\(html\|pdf\)_DATA/d' || die
- fi
-
- # This is an old version of libtool
- # use the ./configure option to exclude its use, and
- # delete the dir since we don't need to eautoreconf it
- rm -rf libltdl
-
- # no nls, no gettext, no iconv macro, so disable it
- use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
-
- # Nuke the dead symlinks for the bindings
- sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
-
- # replace the whitespace with tabs
- sed -i -e 's: :\t:g' doc/info/Makefile.am || die
-
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
- eautoreconf
-}
-
-src_configure() {
- # libtool file collision, bug 276609
- local myconf="--without-included-ltdl --disable-ltdl-install"
-
- myconf="${myconf}
- $(use_with cairo pangocairo)
- $(use_with devil)
- $(use_with gtk)
- $(use_with gts)
- $(use_with qt4)
- $(use_with lasi)
- $(use_with svg rsvg)
- $(use_with X x)
- $(use_with X xaw)
- $(use_with X lefty)
- --with-digcola
- --with-fontconfig
- --with-freetype2
- --with-ipsepcola
- --with-libgd
- --with-sfdp
- --without-gdk-pixbuf
- --without-ming"
-
- # new/experimental features, to be tested, disable for now
- myconf="${myconf}
- --without-cgraph
- --without-glitz
- --without-ipsepcola
- --without-smyrna
- --without-visio"
-
- # Bindings:
- myconf="${myconf}
- --disable-guile
- --disable-io
- $(use_enable java)
- --disable-lua
- --disable-ocaml
- $(use_enable perl)
- --disable-php
- $(use_enable python)
- --disable-r
- $(use_enable ruby)
- --disable-sharp
- $(use_enable tcl)"
-
- econf \
- --enable-ltdl \
- --disable-silent-rules \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_install() {
- sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
- emake DESTDIR="${D}" \
- txtdir="${EPREFIX}"/usr/share/doc/${PF} \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
- pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
- pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
- install
-
- use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
- use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
- dodoc AUTHORS ChangeLog NEWS README
-
- use python && python_optimize \
- "${D}$(python_get_sitedir)" \
- "${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
- # This actually works if --enable-ltdl is passed
- # to configure
- dot -c
-}
diff --git a/media-gfx/graphviz/graphviz-2.34.0.ebuild b/media-gfx/graphviz/graphviz-2.34.0.ebuild
deleted file mode 100644
index 5844049..0000000
--- a/media-gfx/graphviz/graphviz-2.34.0.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-#original KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
- sys-libs/zlib
- >=dev-libs/expat-2
- >=dev-libs/glib-2.11.1
- >=media-libs/fontconfig-2.3.95
- >=media-libs/freetype-2.1.10
- >=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
- >=media-libs/libpng-1.2:0
- !<=sci-chemistry/cluster-1.3.081231
- virtual/jpeg:0
- virtual/libiconv
- X? (
- x11-libs/libXaw
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- )
- cairo? (
- >=x11-libs/pango-1.12
- >=x11-libs/cairo-1.1.10[svg]
- )
- devil? ( media-libs/devil[png,jpeg] )
- postscript? ( app-text/ghostscript-gpl )
- gtk? ( x11-libs/gtk+:2 )
- gts? ( sci-libs/gts )
- lasi? ( media-libs/lasi )
- pdf? ( app-text/poppler )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- ruby? ( dev-lang/ruby )
- svg? ( gnome-base/librsvg )
- tcl? ( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- guile? ( dev-scheme/guile dev-lang/swig )
- java? ( >=virtual/jdk-1.5 dev-lang/swig )
- nls? ( >=sys-devel/gettext-0.14.5 )
- perl? ( dev-lang/swig )
- python? (
- dev-lang/swig
- ${PYTHON_DEPS}
- )
- ruby? ( dev-lang/swig )
- tcl? ( dev-lang/swig )"
-REQUIRED_USE="
- !cairo? ( !X !gtk !postscript !lasi )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-# the ones which are always compiled in, depend on zlib, gd
-# - gtk
-# Directly depends on gtk-2.
-# needs 'pangocairo' enabled in graphviz configuration
-# gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-# Disabled, GTK-1 junk.
-# - glitz
-# Disabled, no particular reason
-# needs 'pangocairo' enabled in graphviz configuration
-# - ming
-# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-# incomplete.
-# - cairo/pango:
-# Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-# needs cairo+pango,
-# can make use of gnomeui and inotify support (??? unsure),
-# needs libXaw for UI
-# UI also links directly against libX11, libXmu, and libXt
-# and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-# sci-libs/gts can be used for some of these
-# - lefty:
-# needs Xaw and X to build
-# - gvedit (via 'qt4'):
-# based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-# currently disabled -- it segfaults a lot
-# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png'
-# with flags enabled at configure time
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-Xaw-configure.patch \
- "${FILESDIR}"/${P}-dot-pangocairo-link.patch
-
- # ToDo: Do the same thing for examples and/or
- # write a patch for a configuration-option
- # and send it to upstream
- # note - the longer sed expression removes multi-line assignments that are extended via '\'
- if ! use doc ; then
- find . -iname Makefile.am \
- | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
- -e '/^\(html\|pdf\)_DATA/d' || die
- fi
-
- # This is an old version of libtool
- # use the ./configure option to exclude its use, and
- # delete the dir since we don't need to eautoreconf it
- rm -rf libltdl
-
- # no nls, no gettext, no iconv macro, so disable it
- use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
-
- # Nuke the dead symlinks for the bindings
- sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
-
- # replace the whitespace with tabs
- sed -i -e 's: :\t:g' doc/info/Makefile.am || die
-
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
- use java && append-cppflags $(java-pkg_get-jni-cflags)
-
- eautoreconf
-}
-
-src_configure() {
- # libtool file collision, bug 276609
- local myconf="--without-included-ltdl --disable-ltdl-install"
-
- myconf="${myconf}
- $(use_with cairo pangocairo)
- $(use_with devil)
- $(use_with gtk)
- $(use_with gts)
- $(use_with qt4)
- $(use_with lasi)
- $(use_with svg rsvg)
- $(use_with X x)
- $(use_with X xaw)
- $(use_with X lefty)
- --with-digcola
- --with-fontconfig
- --with-freetype2
- --with-ipsepcola
- --with-libgd
- --with-sfdp
- $(use_enable gdk-pixbuf)
- --without-ming"
-
- # new/experimental features, to be tested, disable for now
- myconf="${myconf}
- --with-cgraph
- --without-glitz
- --without-ipsepcola
- --without-smyrna
- --without-visio"
-
- # Bindings:
- myconf="${myconf}
- $(use_enable guile)
- --disable-io
- $(use_enable java)
- --disable-lua
- --disable-ocaml
- $(use_enable perl)
- --disable-php
- $(use_enable python)
- --disable-r
- $(use_enable ruby)
- --disable-sharp
- $(use_enable tcl)"
-
- econf \
- --enable-ltdl \
- --disable-silent-rules \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_install() {
- sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
- emake DESTDIR="${D}" \
- txtdir="${EPREFIX}"/usr/share/doc/${PF} \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
- pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
- pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
- install
-
- use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
- use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
- dodoc AUTHORS ChangeLog NEWS README
-
- use python && python_optimize \
- "${D}$(python_get_sitedir)" \
- "${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
- # This actually works if --enable-ltdl is passed
- # to configure
- dot -c
-}
diff --git a/media-gfx/graphviz/graphviz-2.36.0-r1.ebuild b/media-gfx/graphviz/graphviz-2.36.0-r1.ebuild
deleted file mode 100644
index b29219c..0000000
--- a/media-gfx/graphviz/graphviz-2.36.0-r1.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
- sys-libs/zlib
- >=dev-libs/expat-2
- >=dev-libs/glib-2.11.1
- >=media-libs/fontconfig-2.3.95
- >=media-libs/freetype-2.1.10
- >=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
- >=media-libs/libpng-1.2:0
- !<=sci-chemistry/cluster-1.3.081231
- sys-devel/libtool
- virtual/jpeg:0
- virtual/libiconv
- X? (
- x11-libs/libXaw
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- )
- cairo? (
- >=x11-libs/pango-1.12
- >=x11-libs/cairo-1.1.10[svg]
- )
- devil? ( media-libs/devil[png,jpeg] )
- postscript? ( app-text/ghostscript-gpl )
- gtk? ( x11-libs/gtk+:2 )
- gts? ( sci-libs/gts )
- lasi? ( media-libs/lasi )
- pdf? ( app-text/poppler )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- ruby? ( dev-lang/ruby )
- svg? ( gnome-base/librsvg )
- tcl? ( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- guile? ( dev-scheme/guile dev-lang/swig )
- java? ( >=virtual/jdk-1.5 dev-lang/swig )
- nls? ( >=sys-devel/gettext-0.14.5 )
- perl? ( dev-lang/swig )
- python? ( dev-lang/swig )
- ruby? ( dev-lang/swig )
- tcl? ( dev-lang/swig )"
-REQUIRED_USE="
- !cairo? ( !X !gtk !postscript !lasi )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-# the ones which are always compiled in, depend on zlib, gd
-# - gtk
-# Directly depends on gtk-2.
-# needs 'pangocairo' enabled in graphviz configuration
-# gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-# Disabled, GTK-1 junk.
-# - glitz
-# Disabled, no particular reason
-# needs 'pangocairo' enabled in graphviz configuration
-# - ming
-# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-# incomplete.
-# - cairo/pango:
-# Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-# needs cairo+pango,
-# can make use of gnomeui and inotify support (??? unsure),
-# needs libXaw for UI
-# UI also links directly against libX11, libXmu, and libXt
-# and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-# sci-libs/gts can be used for some of these
-# - lefty:
-# needs Xaw and X to build
-# - gvedit (via 'qt4'):
-# based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-# currently disabled -- it segfaults a lot
-# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png'
-# with flags enabled at configure time
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
- "${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch
-
- epatch \
- "${FILESDIR}"/${PN}-2.38-fix-backslashes.patch
-
- # ToDo: Do the same thing for examples and/or
- # write a patch for a configuration-option
- # and send it to upstream
- # note - the longer sed expression removes multi-line assignments that are extended via '\'
- if ! use doc ; then
- find . -iname Makefile.am \
- | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
- -e '/^\(html\|pdf\)_DATA/d' || die
- fi
-
- # This is an old version of libtool
- # use the ./configure option to exclude its use, and
- # delete the dir since we don't need to eautoreconf it
- rm -rf libltdl
-
- # no nls, no gettext, no iconv macro, so disable it
- use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
-
- # Nuke the dead symlinks for the bindings
- sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
-
- # replace the whitespace with tabs
- sed -i -e 's: :\t:g' doc/info/Makefile.am || die
-
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
- use java && append-cppflags $(java-pkg_get-jni-cflags)
-
- eautoreconf
-}
-
-src_configure() {
- # libtool file collision, bug 276609
- local myconf="--without-included-ltdl --disable-ltdl-install"
-
- myconf="${myconf}
- $(use_with cairo pangocairo)
- $(use_with devil)
- $(use_with gtk)
- $(use_with gts)
- $(use_with qt4)
- $(use_with lasi)
- $(use_with svg rsvg)
- $(use_with X x)
- $(use_with X xaw)
- $(use_with X lefty)
- --with-digcola
- --with-fontconfig
- --with-freetype2
- --with-ipsepcola
- --with-libgd
- --with-sfdp
- $(use_enable gdk-pixbuf)
- --without-ming"
-
- # new/experimental features, to be tested, disable for now
- myconf="${myconf}
- --with-cgraph
- --without-glitz
- --without-ipsepcola
- --without-smyrna
- --without-visio"
-
- # Bindings:
- myconf="${myconf}
- $(use_enable guile)
- --disable-io
- $(use_enable java)
- --disable-lua
- --disable-ocaml
- $(use_enable perl)
- --disable-php
- $(use_enable python)
- --disable-r
- $(use_enable ruby)
- --disable-sharp
- $(use_enable tcl)"
-
- econf \
- --enable-ltdl \
- --disable-silent-rules \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_install() {
- sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
- emake DESTDIR="${D}" \
- txtdir="${EPREFIX}"/usr/share/doc/${PF} \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
- pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
- pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
- install
-
- use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
- use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
- dodoc AUTHORS ChangeLog NEWS README
-
- use python && python_optimize \
- "${D}$(python_get_sitedir)" \
- "${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
- # This actually works if --enable-ltdl is passed
- # to configure
- dot -c
-}
diff --git a/media-gfx/graphviz/graphviz-2.36.0.ebuild b/media-gfx/graphviz/graphviz-2.36.0.ebuild
deleted file mode 100644
index 19ce277..0000000
--- a/media-gfx/graphviz/graphviz-2.36.0.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
- sys-libs/zlib
- >=dev-libs/expat-2
- >=dev-libs/glib-2.11.1
- >=media-libs/fontconfig-2.3.95
- >=media-libs/freetype-2.1.10
- >=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
- >=media-libs/libpng-1.2:0
- !<=sci-chemistry/cluster-1.3.081231
- sys-devel/libtool
- virtual/jpeg:0
- virtual/libiconv
- X? (
- x11-libs/libXaw
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- )
- cairo? (
- >=x11-libs/pango-1.12
- >=x11-libs/cairo-1.1.10[svg]
- )
- devil? ( media-libs/devil[png,jpeg] )
- postscript? ( app-text/ghostscript-gpl )
- gtk? ( x11-libs/gtk+:2 )
- gts? ( sci-libs/gts )
- lasi? ( media-libs/lasi )
- pdf? ( app-text/poppler )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- ruby? ( dev-lang/ruby )
- svg? ( gnome-base/librsvg )
- tcl? ( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- guile? ( dev-scheme/guile dev-lang/swig )
- java? ( >=virtual/jdk-1.5 dev-lang/swig )
- nls? ( >=sys-devel/gettext-0.14.5 )
- perl? ( dev-lang/swig )
- python? ( dev-lang/swig )
- ruby? ( dev-lang/swig )
- tcl? ( dev-lang/swig )"
-REQUIRED_USE="
- !cairo? ( !X !gtk !postscript !lasi )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-# the ones which are always compiled in, depend on zlib, gd
-# - gtk
-# Directly depends on gtk-2.
-# needs 'pangocairo' enabled in graphviz configuration
-# gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-# Disabled, GTK-1 junk.
-# - glitz
-# Disabled, no particular reason
-# needs 'pangocairo' enabled in graphviz configuration
-# - ming
-# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-# incomplete.
-# - cairo/pango:
-# Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-# needs cairo+pango,
-# can make use of gnomeui and inotify support (??? unsure),
-# needs libXaw for UI
-# UI also links directly against libX11, libXmu, and libXt
-# and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-# sci-libs/gts can be used for some of these
-# - lefty:
-# needs Xaw and X to build
-# - gvedit (via 'qt4'):
-# based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-# currently disabled -- it segfaults a lot
-# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png'
-# with flags enabled at configure time
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
- "${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch
-
- # ToDo: Do the same thing for examples and/or
- # write a patch for a configuration-option
- # and send it to upstream
- # note - the longer sed expression removes multi-line assignments that are extended via '\'
- if ! use doc ; then
- find . -iname Makefile.am \
- | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
- -e '/^\(html\|pdf\)_DATA/d' || die
- fi
-
- # This is an old version of libtool
- # use the ./configure option to exclude its use, and
- # delete the dir since we don't need to eautoreconf it
- rm -rf libltdl
-
- # no nls, no gettext, no iconv macro, so disable it
- use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
-
- # Nuke the dead symlinks for the bindings
- sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
-
- # replace the whitespace with tabs
- sed -i -e 's: :\t:g' doc/info/Makefile.am || die
-
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
- use java && append-cppflags $(java-pkg_get-jni-cflags)
-
- eautoreconf
-}
-
-src_configure() {
- # libtool file collision, bug 276609
- local myconf="--without-included-ltdl --disable-ltdl-install"
-
- myconf="${myconf}
- $(use_with cairo pangocairo)
- $(use_with devil)
- $(use_with gtk)
- $(use_with gts)
- $(use_with qt4)
- $(use_with lasi)
- $(use_with svg rsvg)
- $(use_with X x)
- $(use_with X xaw)
- $(use_with X lefty)
- --with-digcola
- --with-fontconfig
- --with-freetype2
- --with-ipsepcola
- --with-libgd
- --with-sfdp
- $(use_enable gdk-pixbuf)
- --without-ming"
-
- # new/experimental features, to be tested, disable for now
- myconf="${myconf}
- --with-cgraph
- --without-glitz
- --without-ipsepcola
- --without-smyrna
- --without-visio"
-
- # Bindings:
- myconf="${myconf}
- $(use_enable guile)
- --disable-io
- $(use_enable java)
- --disable-lua
- --disable-ocaml
- $(use_enable perl)
- --disable-php
- $(use_enable python)
- --disable-r
- $(use_enable ruby)
- --disable-sharp
- $(use_enable tcl)"
-
- econf \
- --enable-ltdl \
- --disable-silent-rules \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_install() {
- sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
- emake DESTDIR="${D}" \
- txtdir="${EPREFIX}"/usr/share/doc/${PF} \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
- pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
- pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
- install
-
- use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
- use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
- dodoc AUTHORS ChangeLog NEWS README
-
- use python && python_optimize \
- "${D}$(python_get_sitedir)" \
- "${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
- # This actually works if --enable-ltdl is passed
- # to configure
- dot -c
-}
diff --git a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
new file mode 100644
index 0000000..5d2ed4d
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="http://www.graphviz.org/"
+SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
+
+# Requires ksh
+RESTRICT="test"
+
+RDEPEND="
+ sys-libs/zlib
+ >=dev-libs/expat-2
+ >=dev-libs/glib-2.11.1:2
+ dev-libs/libltdl:0
+ >=media-libs/fontconfig-2.3.95
+ >=media-libs/freetype-2.1.10
+ >=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
+ >=media-libs/libpng-1.2:0
+ !<=sci-chemistry/cluster-1.3.081231
+ virtual/jpeg:0
+ virtual/libiconv
+ X? (
+ x11-libs/libXaw
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXt
+ )
+ cairo? (
+ >=x11-libs/pango-1.12
+ >=x11-libs/cairo-1.1.10[svg]
+ )
+ devil? ( media-libs/devil[png,jpeg] )
+ postscript? ( app-text/ghostscript-gpl )
+ gtk? ( x11-libs/gtk+:2 )
+ gts? ( sci-libs/gts )
+ lasi? ( media-libs/lasi )
+ pdf? ( app-text/poppler )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ )
+ ruby? ( dev-lang/ruby:* )
+ svg? ( gnome-base/librsvg )
+ tcl? ( >=dev-lang/tcl-8.3:0= )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/libtool
+ guile? ( dev-scheme/guile dev-lang/swig )
+ java? ( >=virtual/jdk-1.5 dev-lang/swig )
+ nls? ( >=sys-devel/gettext-0.14.5 )
+ perl? ( dev-lang/swig )
+ python? ( dev-lang/swig )
+ ruby? ( dev-lang/swig )
+ tcl? ( dev-lang/swig )"
+REQUIRED_USE="
+ !cairo? ( !X !gtk !postscript !lasi )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Dependency description / Maintainer-Info:
+
+# Rendering is done via the following plugins (/plugins):
+# - core, dot_layout, neato_layout, gd , dot
+# the ones which are always compiled in, depend on zlib, gd
+# - gtk
+# Directly depends on gtk-2.
+# needs 'pangocairo' enabled in graphviz configuration
+# gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+# Disabled, GTK-1 junk.
+# - glitz
+# Disabled, no particular reason
+# needs 'pangocairo' enabled in graphviz configuration
+# - ming
+# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+# incomplete.
+# - cairo/pango:
+# Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib:
+# needs cairo+pango,
+# can make use of gnomeui and inotify support (??? unsure),
+# needs libXaw for UI
+# UI also links directly against libX11, libXmu, and libXt
+# and uses libXpm if available so we make sure it always is
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... no longer broken on ~x86
+# - io (disabled)
+# - java (enabled via java) *2
+# - lua (enabled via lua)
+# - ocaml (enabled via ocaml)
+# - perl (enabled via perl) *1
+# - php (enabled via php) *2
+# - python (enabled via python) *1
+# - ruby (enabled via ruby) *1
+# - tcl (enabled via tcl)
+# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
+# *2 = Those bindings don't build because the paths for the headers/libs aren't
+# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
+
+# There are several other tools in /tclpkg:
+# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
+# tkspline, tkstubs ; enabled with: --with-tk
+
+# And the commands (/cmd):
+# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
+# sci-libs/gts can be used for some of these
+# - lefty:
+# needs Xaw and X to build
+# - gvedit (via 'qt4'):
+# based on ./configure it needs qt-core and qt-gui only
+# - smyrna : experimental opengl front-end (via 'smyrna')
+# currently disabled -- it segfaults a lot
+# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
+# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png'
+# with flags enabled at configure time
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
+ "${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch
+
+ # ToDo: Do the same thing for examples and/or
+ # write a patch for a configuration-option
+ # and send it to upstream
+ # note - the longer sed expression removes multi-line assignments that are extended via '\'
+ if ! use doc ; then
+ find . -iname Makefile.am \
+ | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
+ -e '/^\(html\|pdf\)_DATA/d' || die
+ fi
+
+ # This is an old version of libtool
+ # use the ./configure option to exclude its use, and
+ # delete the dir since we don't need to eautoreconf it
+ rm -rf libltdl
+
+ # no nls, no gettext, no iconv macro, so disable it
+ use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
+
+ # Nuke the dead symlinks for the bindings
+ sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
+
+ # replace the whitespace with tabs
+ sed -i -e 's: :\t:g' doc/info/Makefile.am || die
+
+ # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
+ use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
+
+ use java && append-cppflags $(java-pkg_get-jni-cflags)
+
+ eautoreconf
+}
+
+src_configure() {
+ # libtool file collision, bug 276609
+ local myconf="--without-included-ltdl --disable-ltdl-install"
+
+ myconf="${myconf}
+ $(use_with cairo pangocairo)
+ $(use_with devil)
+ $(use_with gtk)
+ $(use_with gts)
+ $(use_with qt4 qt)
+ $(use_with lasi)
+ $(use_with pdf poppler)
+ $(use_with postscript ghostscript)
+ $(use_with svg rsvg)
+ $(use_with X x)
+ $(use_with X xaw)
+ $(use_with X lefty)
+ --with-digcola
+ --with-fontconfig
+ --with-freetype2
+ --with-ipsepcola
+ --with-libgd
+ --with-sfdp
+ $(use_enable gdk-pixbuf)
+ --without-ming"
+
+ # new/experimental features, to be tested, disable for now
+ myconf="${myconf}
+ --with-cgraph
+ --without-glitz
+ --without-ipsepcola
+ --without-smyrna
+ --without-visio"
+
+ # Bindings:
+ myconf="${myconf}
+ $(use_enable guile)
+ --disable-io
+ $(use_enable java)
+ --disable-lua
+ --disable-ocaml
+ $(use_enable perl)
+ --disable-php
+ $(use_enable python)
+ --disable-r
+ $(use_enable ruby)
+ --disable-sharp
+ $(use_enable tcl)"
+
+ econf \
+ --enable-ltdl \
+ --disable-silent-rules \
+ $(use_enable static-libs static) \
+ ${myconf}
+}
+
+src_install() {
+ sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
+
+ emake DESTDIR="${D}" \
+ txtdir="${EPREFIX}"/usr/share/doc/${PF} \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
+ pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
+ pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
+ install
+
+ use examples || rm -rf "${ED}"/usr/share/graphviz/demo
+
+ use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+
+ dodoc AUTHORS ChangeLog NEWS README
+
+ use python && python_optimize \
+ "${D}$(python_get_sitedir)" \
+ "${D}/usr/$(get_libdir)/graphviz/python"
+}
+
+pkg_postinst() {
+ # This actually works if --enable-ltdl is passed
+ # to configure
+ dot -c
+}
+
+pkg_postrm() {
+ # Remove cruft, bug #547344
+ rm -f "${EROOT}usr/lib/graphviz/config{,6}"
+}
diff --git a/media-gfx/graphviz/graphviz-2.38.0.ebuild b/media-gfx/graphviz/graphviz-2.38.0.ebuild
deleted file mode 100644
index 19ce277..0000000
--- a/media-gfx/graphviz/graphviz-2.38.0.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
- sys-libs/zlib
- >=dev-libs/expat-2
- >=dev-libs/glib-2.11.1
- >=media-libs/fontconfig-2.3.95
- >=media-libs/freetype-2.1.10
- >=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
- >=media-libs/libpng-1.2:0
- !<=sci-chemistry/cluster-1.3.081231
- sys-devel/libtool
- virtual/jpeg:0
- virtual/libiconv
- X? (
- x11-libs/libXaw
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- )
- cairo? (
- >=x11-libs/pango-1.12
- >=x11-libs/cairo-1.1.10[svg]
- )
- devil? ( media-libs/devil[png,jpeg] )
- postscript? ( app-text/ghostscript-gpl )
- gtk? ( x11-libs/gtk+:2 )
- gts? ( sci-libs/gts )
- lasi? ( media-libs/lasi )
- pdf? ( app-text/poppler )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- ruby? ( dev-lang/ruby )
- svg? ( gnome-base/librsvg )
- tcl? ( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- guile? ( dev-scheme/guile dev-lang/swig )
- java? ( >=virtual/jdk-1.5 dev-lang/swig )
- nls? ( >=sys-devel/gettext-0.14.5 )
- perl? ( dev-lang/swig )
- python? ( dev-lang/swig )
- ruby? ( dev-lang/swig )
- tcl? ( dev-lang/swig )"
-REQUIRED_USE="
- !cairo? ( !X !gtk !postscript !lasi )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-# the ones which are always compiled in, depend on zlib, gd
-# - gtk
-# Directly depends on gtk-2.
-# needs 'pangocairo' enabled in graphviz configuration
-# gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-# Disabled, GTK-1 junk.
-# - glitz
-# Disabled, no particular reason
-# needs 'pangocairo' enabled in graphviz configuration
-# - ming
-# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-# incomplete.
-# - cairo/pango:
-# Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-# needs cairo+pango,
-# can make use of gnomeui and inotify support (??? unsure),
-# needs libXaw for UI
-# UI also links directly against libX11, libXmu, and libXt
-# and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-# sci-libs/gts can be used for some of these
-# - lefty:
-# needs Xaw and X to build
-# - gvedit (via 'qt4'):
-# based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-# currently disabled -- it segfaults a lot
-# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png'
-# with flags enabled at configure time
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
- "${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch
-
- # ToDo: Do the same thing for examples and/or
- # write a patch for a configuration-option
- # and send it to upstream
- # note - the longer sed expression removes multi-line assignments that are extended via '\'
- if ! use doc ; then
- find . -iname Makefile.am \
- | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
- -e '/^\(html\|pdf\)_DATA/d' || die
- fi
-
- # This is an old version of libtool
- # use the ./configure option to exclude its use, and
- # delete the dir since we don't need to eautoreconf it
- rm -rf libltdl
-
- # no nls, no gettext, no iconv macro, so disable it
- use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
-
- # Nuke the dead symlinks for the bindings
- sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
-
- # replace the whitespace with tabs
- sed -i -e 's: :\t:g' doc/info/Makefile.am || die
-
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
- use java && append-cppflags $(java-pkg_get-jni-cflags)
-
- eautoreconf
-}
-
-src_configure() {
- # libtool file collision, bug 276609
- local myconf="--without-included-ltdl --disable-ltdl-install"
-
- myconf="${myconf}
- $(use_with cairo pangocairo)
- $(use_with devil)
- $(use_with gtk)
- $(use_with gts)
- $(use_with qt4)
- $(use_with lasi)
- $(use_with svg rsvg)
- $(use_with X x)
- $(use_with X xaw)
- $(use_with X lefty)
- --with-digcola
- --with-fontconfig
- --with-freetype2
- --with-ipsepcola
- --with-libgd
- --with-sfdp
- $(use_enable gdk-pixbuf)
- --without-ming"
-
- # new/experimental features, to be tested, disable for now
- myconf="${myconf}
- --with-cgraph
- --without-glitz
- --without-ipsepcola
- --without-smyrna
- --without-visio"
-
- # Bindings:
- myconf="${myconf}
- $(use_enable guile)
- --disable-io
- $(use_enable java)
- --disable-lua
- --disable-ocaml
- $(use_enable perl)
- --disable-php
- $(use_enable python)
- --disable-r
- $(use_enable ruby)
- --disable-sharp
- $(use_enable tcl)"
-
- econf \
- --enable-ltdl \
- --disable-silent-rules \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_install() {
- sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
- emake DESTDIR="${D}" \
- txtdir="${EPREFIX}"/usr/share/doc/${PF} \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
- pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
- pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
- install
-
- use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
- use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
- dodoc AUTHORS ChangeLog NEWS README
-
- use python && python_optimize \
- "${D}$(python_get_sitedir)" \
- "${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
- # This actually works if --enable-ltdl is passed
- # to configure
- dot -c
-}
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 95be494..b7816fd 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,2 +1,2 @@
-DIST gthumb-3.2.9.1.tar.xz 5969180 SHA256 eda012f410fc3c45aafab727a81d484857d83e51f69febdfe76a44d2b5965f01 SHA512 68ab839153d258ca726b558f3b5245f0f3568465859086a57b12a72569257a6e76a3d32f1efdbec708ba9df542b2d726eb91422a2a646c5e18b98d66954236e1 WHIRLPOOL a4a2020f0b4f394841912132038cb5ce26bb8c8eee60a35b40b16689f8395d6b75820b4eb9ff3032ddcb96ee1e34d0e38b7036745089311e33a458d1f4264fe5
DIST gthumb-3.4.0.tar.xz 3366284 SHA256 abd1afe457c65289af31c6db7037452faa3838356480857d8cdc19f0ecde4933 SHA512 04b962ada75ab46a6be2ad192dfc9b34bd5f7b0189d970e688d0ec89130a766ab7e5a23d34b305829092c3b8756baad83d0367f4a972e384dac16fcff0255d85 WHIRLPOOL 7b4a9cdc46473e8fb7731b276741bdfc32f0791bb3ce9197fbef79bf30eef4694cf7d5a53c28d98c150d48652b25a662185c6a67252666637c04707928c2e0d7
+DIST gthumb-3.4.1.tar.xz 3407712 SHA256 1ec2cf49f499ed06eda851a3bd5c28a1768839a6ff06bc4efc5fbde46cabc857 SHA512 3aeb2b107f7d9636713a8b532e0a652bb88349ad3699c4677e51a813500e974996d9ab0e1c10ee27219d021e5e35a9c70bbabb74fe69ec015e2c6a897e3571ca WHIRLPOOL 3d9a60164774a15c99752b57746815f4648b0f938d3127b21d61c652754ff5c73d598cb8c7d9b0e70c1e84fc12a3f4485a4eb23f3099c549be45cd65d1686667
diff --git a/media-gfx/gthumb/gthumb-3.2.9.1.ebuild b/media-gfx/gthumb/gthumb-3.2.9.1.ebuild
deleted file mode 100644
index 035293e..0000000
--- a/media-gfx/gthumb/gthumb-3.2.9.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cdr exif gstreamer http jpeg json libsecret raw slideshow svg tiff test webkit webp"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.34.0:2
- >=x11-libs/gtk+-3.4.0:3
-
- media-libs/libpng:0=
- sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
-
- cdr? ( >=app-cdr/brasero-3.2 )
- exif? ( >=media-gfx/exiv2-0.21:= )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0 )
- http? ( >=net-libs/libsoup-gnome-2.36:2.4 )
- jpeg? ( virtual/jpeg:0= )
- json? ( >=dev-libs/json-glib-0.15.0 )
- libsecret? ( >=app-crypt/libsecret-0.11 )
- slideshow? (
- >=media-libs/clutter-1:1.0
- >=media-libs/clutter-gtk-1:1.0 )
- svg? ( >=gnome-base/librsvg-2.34 )
- tiff? ( media-libs/tiff:= )
- raw? ( >=media-libs/libopenraw-0.0.8:= )
- !raw? ( media-gfx/dcraw )
- webkit? ( >=net-libs/webkit-gtk-1.10.0:3 )
- webp? ( >=media-libs/libwebp-0.2.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- >=gnome-base/gsettings-desktop-schemas-0.1.4
-"
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools
- app-text/scrollkeeper
- >=dev-util/intltool-0.35
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- test? ( ~app-text/docbook-xml-dtd-4.1.2 )
-"
-# eautoreconf needs:
-# gnome-base/gnome-common
-
-src_prepare() {
- # Remove unwanted CFLAGS added with USE=debug
- sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \
- -i configure.ac -i configure || die
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # Upstream says in configure help that libchamplain support
- # crashes frequently
- gnome2_src_configure \
- --disable-static \
- --disable-libchamplain \
- $(use_enable cdr libbrasero) \
- $(use_enable exif exiv2) \
- $(use_enable gstreamer) \
- $(use_enable http libsoup) \
- $(use_enable jpeg) \
- $(use_enable json libjson-glib) \
- $(use_enable libsecret) \
- $(use_enable raw libopenraw) \
- $(use_enable slideshow clutter) \
- $(use_enable svg librsvg) \
- $(use_enable test test-suite) \
- $(use_enable tiff) \
- $(use_enable webkit webkit2) \
- $(use_enable webp libwebp)
-}
diff --git a/media-gfx/gthumb/gthumb-3.4.1.ebuild b/media-gfx/gthumb/gthumb-3.4.1.ebuild
new file mode 100644
index 0000000..ead252e
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-3.4.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cdr exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.36.0:2[dbus]
+ >=x11-libs/gtk+-3.10.0:3
+
+ media-libs/libpng:0=
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+
+ cdr? ( >=app-cdr/brasero-3.2 )
+ exif? ( >=media-gfx/exiv2-0.21:= )
+ gnome-keyring? ( >=app-crypt/libsecret-0.11 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0 )
+ http? ( >=net-libs/libsoup-2.42.0:2.4 )
+ jpeg? ( virtual/jpeg:0= )
+ json? ( >=dev-libs/json-glib-0.15.0 )
+ lcms? ( >=media-libs/lcms-2.6:2 )
+ slideshow? (
+ >=media-libs/clutter-1.12.0:1.0
+ >=media-libs/clutter-gtk-1:1.0 )
+ svg? ( >=gnome-base/librsvg-2.34 )
+ tiff? ( media-libs/tiff:= )
+ raw? ( >=media-libs/libraw-0.14:= )
+ !raw? ( media-gfx/dcraw )
+ webkit? ( net-libs/webkit-gtk:4 )
+ webp? ( >=media-libs/libwebp-0.2.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=gnome-base/gsettings-desktop-schemas-0.1.4
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/yelp-tools
+ >=dev-util/intltool-0.35
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ test? ( ~app-text/docbook-xml-dtd-4.1.2 )
+"
+# eautoreconf needs:
+# gnome-base/gnome-common
+
+src_prepare() {
+ # Remove unwanted CFLAGS added with USE=debug
+ sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \
+ -i configure.ac -i configure || die
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Upstream says in configure help that libchamplain support
+ # crashes frequently
+ gnome2_src_configure \
+ --disable-static \
+ --disable-libchamplain \
+ $(use_enable cdr libbrasero) \
+ $(use_enable exif exiv2) \
+ $(use_enable gnome-keyring libsecret) \
+ $(use_enable gstreamer) \
+ $(use_enable http libsoup) \
+ $(use_enable jpeg) \
+ $(use_enable json libjson-glib) \
+ $(use_enable lcms lcms2) \
+ $(use_enable raw libraw) \
+ $(use_enable slideshow clutter) \
+ $(use_enable svg librsvg) \
+ $(use_enable test test-suite) \
+ $(use_enable tiff) \
+ $(use_enable webkit webkit2) \
+ $(use_enable webp libwebp)
+}
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 8925a44..acc003c 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,2 +1,3 @@
DIST nomacs-2.4.2-source.tar.bz2 1443270 SHA256 b0f52b919025a48a0e0300ea15c90b40d6ad892b055088fca02a8137e229bc3a SHA512 e3fae11ae8c385f9548bda32b2364967a457e9645fa4375da9d1cf85dc8fb150a56a19c3eab12ddef90d58f20a57d02a8720ddb8fef22c569ab6c28d54654f02 WHIRLPOOL ac21dd3afe3b45324daa6e07030203611c9f2de4ad1427ce4bb388d84ade5e38a686b42e0d757adbaa3a91fbb658d94f9f47de61e9ccf4ccc339af4ce1c4fd8d
DIST nomacs-2.4.4-source.tar.bz2 1448716 SHA256 01b0cb48936ca0214c120a126069c50a9b8fe7ecbdb69bb4e5fe283d6b198257 SHA512 76cd5efaba09584757843e895b5b8293adcdab7df68a7d5bdcf38e9e5df04e38382944cf64293c9820815b9e6328793dd8e46afef5ffeaa80ddc4f7d43290fc2 WHIRLPOOL d858887f66cbbed858c1985313107839a8162052bfb825bc48f344516444a1e184e839c9a067283d7503b98a6993126ade3f39c0a85b50ca534f963335c85513
+DIST nomacs-2.4.6-source.tar.bz2 1457529 SHA256 b846e335c768593e9f36cdee1a5c186e7794c76770ea3cadc87cf264153e8960 SHA512 9389df46635e619e198388e8b161a840d15227dd902cf04c250e71211098a10fd808d710ebab71f3e9a437bdca9451f966c46d22c2ce2379b94b678e79e92d71 WHIRLPOOL 97ccd02cbeabda62888ed25065cd24ce9a297b7bae3f9343e903d0223e8107cab601834fbc6dcf31a0b7f8d9e93052ba5a1a08e9c5e006027994c27bdb6f3940
diff --git a/media-gfx/nomacs/nomacs-2.4.6.ebuild b/media-gfx/nomacs/nomacs-2.4.6.ebuild
new file mode 100644
index 0000000..01cf47a
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-2.4.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils fdo-mime
+
+DESCRIPTION="Qt-based image viewer"
+HOMEPAGE="http://www.nomacs.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="opencv qt5 raw tiff webp zip"
+
+REQUIRED_USE="
+ raw? ( opencv )
+ tiff? ( opencv )
+"
+
+RDEPEND="
+ >=media-gfx/exiv2-0.25:=
+ qt5? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ opencv? ( media-libs/opencv:=[qt5] )
+ zip? ( dev-libs/quazip[qt5] )
+ )
+ !qt5? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ opencv? ( >=media-libs/opencv-2.4:=[qt4] )
+ zip? ( dev-libs/quazip[qt4] )
+ )
+ raw? ( >=media-libs/libraw-0.14:= )
+ tiff? ( media-libs/tiff:0 )
+ webp? ( >=media-libs/libwebp-0.3.1:= )
+"
+DEPEND="${RDEPEND}
+ qt5? ( dev-qt/linguist-tools:5 )
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable opencv)
+ $(cmake-utils_use_enable qt5)
+ $(cmake-utils_use_enable raw)
+ $(cmake-utils_use_enable tiff)
+ $(cmake-utils_use_enable webp)
+ $(cmake-utils_use_enable zip QUAZIP)
+ -DUSE_SYSTEM_WEBP=ON
+ -DUSE_SYSTEM_QUAZIP=ON
+ )
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/optipng/files/optipng-0.7.5-gifread.patch b/media-gfx/optipng/files/optipng-0.7.5-gifread.patch
new file mode 100644
index 0000000..14b3719
--- /dev/null
+++ b/media-gfx/optipng/files/optipng-0.7.5-gifread.patch
@@ -0,0 +1,12 @@
+diff --git a/src/gifread/gifread.c b/src/gifread/gifread.c
+index b24aa6e..2896493 100644
+--- a/src/gifread/gifread.c
++++ b/src/gifread/gifread.c
+@@ -357,6 +357,7 @@ static int LZWGetCode(int code_size, int init_flag, FILE *stream)
+ {
+ curbit = 0;
+ lastbit = 0;
++ last_byte = 2;
+ done = LZW_FALSE;
+ return 0;
+ }
diff --git a/media-gfx/optipng/optipng-0.7.5-r1.ebuild b/media-gfx/optipng/optipng-0.7.5-r1.ebuild
new file mode 100644
index 0000000..b3b4528
--- /dev/null
+++ b/media-gfx/optipng/optipng-0.7.5-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Compress PNG files without affecting image quality"
+HOMEPAGE="http://optipng.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+ media-libs/libpng:0"
+DEPEND="${RDEPEND}
+ sys-apps/findutils"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gifread.patch # bug #561882
+ epatch "${FILESDIR}"/${P}-estonian.patch
+
+ rm -R src/{libpng,zlib} || die
+ find . -type d -name build -exec rm -R {} + || die
+
+ # next release is almost a complete rewrite, so plug this compilation
+ # problem in anticipation of the much (c)leaner(?) rewrite
+ sed -i \
+ -e 's/^#ifdef AT_FDCWD/#if defined(AT_FDCWD) \&\& !(defined (__SVR4) \&\& defined (__sun))/' \
+ src/optipng/osys.c || die
+
+ tc-export CC AR RANLIB
+ export LD=$(tc-getCC)
+}
+
+src_configure() {
+ ./configure \
+ -with-system-libpng \
+ -with-system-zlib \
+ || die "configure failed"
+}
+
+src_compile() {
+ emake -C src/optipng
+}
+
+src_install() {
+ dodoc README.txt doc/*.txt
+ dohtml doc/*.html
+ doman src/${PN}/man/${PN}.1
+
+ dobin src/${PN}/${PN}
+}
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 2057b17..43dbbb2 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,5 +1 @@
-DIST photo-0.8.tar.gz 241142 SHA256 123f8cfa8e86dd131147b58e1c94a138bb9d3e5873f29b550cc960e83b2c4f5f SHA512 b5b8700a4f15e4ce880c5558247cc0e96e59df21c0674f57e202b5d6474e1ef0a251d5be391e795b230c4959251e194ec4a1c87e75075ee9ae501d3e18c4e32f WHIRLPOOL c6ff5a3a41cdfac0c54593dfbabb35bcb903b592809f698cf7d7c56bce05b1a29c31d8db7031392819481188f563bcf67e997cec24acd0a0842a311efaa76529
-DIST photoqt-1.0.tar.gz 709752 SHA256 e7f866540a03e95463dacdf2769a954f601ac3cd1507655793f9f231ab8689ce SHA512 2badf4e6e6694460fb8d1c8a9f8cb73fdcbcc20868588beec7da01e86ee906f81ed4f5154050960cb5000c40ef1efc03684872c35b352fe4246a880e03ee1bd7 WHIRLPOOL c33eae430c34e0e1c9dbf3d7721fa52af44dbc825060e804b42eeeec64bfc8c59bcf056e3f79227c4cd4a03823efc8716b9f5d172cb6a552165131f2600cdf2a
-DIST photoqt-1.1.0.1.tar.gz 1201723 SHA256 3727ec58a243586d367dc609793ad043cc78d4e67d9e7d3454f7cad782f6a9f8 SHA512 024c4fa1212d773b53b0bd7dd0a15bda961c33bd01ed9b8199f555e94339f97bb2d56a2928f68440f3de7f3ebaf539585be044cd5ba9f6e6b0f284d0c744ff6a WHIRLPOOL be35177b1b8587130f8728be6f44d5dc657b4d188dc947a514bcac344700fcec58db99e36c85163ddb22460331b64b2c1d3f7dab643d1c42beea5e5a58542655
-DIST photoqt-1.2.tar.gz 1452897 SHA256 4a293136c82c075c2f87bb1d8c6be384e8e8ca00f3d32e1783271439a090d6b6 SHA512 13b34a5511bebe9e2845b4fb9949472af2a75e358d836d05521f3efd848c8cc36f0d977a1c1a5ed16df9e0333ce8082f1b4fa4984a3318b4cb1012c44c6237e4 WHIRLPOOL 2fa599a5d1ff550253607a13a05bf67e5c3fc81152238be4a208f1d6bcd3939d1eaf4af398818cea728fb778955e3a6d5a3ef6191b757b5cb0b134b65b7b5220
DIST photoqt-1.3.tar.gz 1382474 SHA256 81baba387538f62a24af1e69ec26b2a62aafd9b4c1841dd952a9ddb25cdf5348 SHA512 6fdc0c00449519304e0e0da09cabee6f096100ce8054213ca48f5093629328b5f2b6d45215edbbf5419e34189b456eac1389b561840077b3b8320461a1591762 WHIRLPOOL 7989d53468e5f94a4ae5d160feb928c11790d381c5395e97eea2e5e715f76a7c95bfff34f3879cfc5bed2a5d29a3140cd8c978c3a08757cd5efd933363fc9489
diff --git a/media-gfx/photoqt/files/photo-0.7.1.1-install-desktop.patch b/media-gfx/photoqt/files/photo-0.7.1.1-install-desktop.patch
deleted file mode 100644
index 4814a41..0000000
--- a/media-gfx/photoqt/files/photo-0.7.1.1-install-desktop.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -burN photo-0.7.1.1-orig/CMakeLists.txt photo-0.7.1.1/CMakeLists.txt
---- photo-0.7.1.1-orig/CMakeLists.txt 2012-04-29 20:38:49.374650243 +0800
-+++ photo-0.7.1.1/CMakeLists.txt 2012-04-29 21:00:03.237838770 +0800
-@@ -28,7 +28,7 @@
- if(UNIX)
-
- # find xdg-desktop-menu and xdg-mime
-- find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
-+ #find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
-
- # Set the install prefix to /usr/
- SET(PRODUCT_INSTALL_PREFIX /usr)
-@@ -41,7 +41,8 @@
-
- # Install desktop file
- INSTALL(
-- CODE "execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/photo.desktop)"
-+ FILES photo.desktop
-+ DESTINATION share/applications/
- )
-
- # And install all the icons
diff --git a/media-gfx/photoqt/photoqt-0.8-r1.ebuild b/media-gfx/photoqt/photoqt-0.8-r1.ebuild
deleted file mode 100644
index 0328224..0000000
--- a/media-gfx/photoqt/photoqt-0.8-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="http://photoqt.org/"
-SRC_URI="http://photoqt.org/oldRel/photo-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsql:4
- media-gfx/exiv2:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/photo-0.7.1.1-install-desktop.patch"
-)
-
-S=${WORKDIR}/photo-${PV}
diff --git a/media-gfx/photoqt/photoqt-1.0.ebuild b/media-gfx/photoqt/photoqt-1.0.ebuild
deleted file mode 100644
index 2f1eb8c..0000000
--- a/media-gfx/photoqt/photoqt-1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="http://photoqt.org/"
-SRC_URI="http://photoqt.org/oldRel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="exiv2 graphicsmagick" # phonon"
-
-DEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsql:4
- exiv2? ( media-gfx/exiv2:= )
- graphicsmagick? ( media-gfx/graphicsmagick:= )"
-# phonon? ( || ( media-libs/phonon dev-qt/qtphonon ) )" # fails to compile
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # make desktop file validate; needs more work
- echo ';' >> "${S}"/${PN}.desktop || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use exiv2 EXIV2)
- $(cmake-utils_use graphicsmagick GM)
- -DPHONON=OFF
- )
- cmake-utils_src_configure
-}
diff --git a/media-gfx/photoqt/photoqt-1.1.0.1.ebuild b/media-gfx/photoqt/photoqt-1.1.0.1.ebuild
deleted file mode 100644
index 2b2336e..0000000
--- a/media-gfx/photoqt/photoqt-1.1.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="http://photoqt.org/"
-SRC_URI="http://photoqt.org/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphicsmagick exiv2"
-
-RDEPEND="dev-qt/qtgui:5
- dev-qt/qtimageformats:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- exiv2? ( media-gfx/exiv2:= )
- graphicsmagick? ( media-gfx/graphicsmagick )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use graphicsmagick GM)
- $(cmake-utils_use exiv2 EXIV2)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- MAKEOPTS+=" -j1" cmake-utils_src_compile
-}
diff --git a/media-gfx/photoqt/photoqt-1.2.ebuild b/media-gfx/photoqt/photoqt-1.2.ebuild
deleted file mode 100644
index a24f72d..0000000
--- a/media-gfx/photoqt/photoqt-1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="http://photoqt.org/"
-SRC_URI="http://photoqt.org/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphicsmagick exiv2"
-
-RDEPEND="dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtimageformats:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- exiv2? ( media-gfx/exiv2:= )
- graphicsmagick? ( media-gfx/graphicsmagick )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use graphicsmagick GM)
- $(cmake-utils_use exiv2 EXIV2)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- MAKEOPTS+=" -j1" cmake-utils_src_compile
-}
diff --git a/media-gfx/shotwell/shotwell-0.22.0-r1.ebuild b/media-gfx/shotwell/shotwell-0.22.0-r1.ebuild
new file mode 100644
index 0000000..8d0369b
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.22.0-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="0.26"
+
+inherit eutils gnome2 multilib toolchain-funcs vala versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+SRC_URI="
+ mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz
+ http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell.1
+ http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell-icons.tar.bz2
+ "
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+CORE_SUPPORTED_LANGUAGES="
+ af ar as ast bg bn bn_IN bs ca cs da de el en_GB eo es et eu fi fr gd gl gu
+ he hi hr hu ia id it ja kk km kn ko ky lt lv mk ml mr nb nl nn or pa pl pt
+ pt_BR ro ru sk sl sr sr@latin sv ta te th tr uk vi zh_CN zh_HK zh_TW"
+
+for x in ${CORE_SUPPORTED_LANGUAGES}; do
+ IUSE+="linguas_${x} "
+done
+
+RDEPEND="
+ app-text/gnome-doc-utils
+ >=dev-db/sqlite-3.5.9:3
+ >=dev-libs/dbus-glib-0.80
+ >=dev-libs/glib-2.30.0:2
+ >=dev-libs/json-glib-0.7.6
+ >=dev-libs/libgee-0.8.5:0.8
+ >=dev-libs/libxml2-2.6.32:2
+ >=dev-util/desktop-file-utils-0.13
+ gnome-base/dconf
+ >=media-libs/gexiv2-0.4.90
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0
+ media-libs/gstreamer:1.0
+ media-libs/lcms:2
+ >=media-libs/libexif-0.6.16:=
+ >=media-libs/libgphoto2-2.4.2:=
+ >=media-libs/libraw-0.13.2:=
+ >=net-libs/libsoup-2.26.0:2.4
+ >=net-libs/rest-0.7:0.7
+ >=net-libs/webkit-gtk-1.4:3
+ virtual/libgudev:=[introspection]
+ >=x11-libs/gtk+-3.12.2:3[X]"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ >=sys-devel/m4-1.4.13"
+
+DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )
+
+# This probably comes from libraries that
+# shotwell-video-thumbnailer links to.
+# Nothing we can do at the moment. #435048
+QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
+
+pkg_setup() {
+ tc-export CC
+ G2CONF="${G2CONF}
+ --disable-schemas-compile
+ --disable-desktop-update
+ --disable-icon-update
+ --prefix=/usr
+ --lib=$(get_libdir)"
+}
+
+src_prepare() {
+ local x
+ local linguas="en_GB ${LINGUAS}"
+ vala_src_prepare
+ sed \
+ -e 's|CFLAGS :|CFLAGS +|g' \
+ -i plugins/Makefile.plugin.mk || die
+ epatch \
+ "${FILESDIR}"/${PN}-0.13.1-ldflags.patch
+
+ # remove disabled lenguages from build
+ for x in ${CORE_SUPPORTED_LANGUAGES}; do
+ if ! has ${x} ${linguas}; then
+ sed -i "/^${x}$/d" "${S}"/po/LINGUAS || die
+ fi
+ done
+}
+
+src_configure() {
+ ./configure \
+ ${G2CONF} \
+ || die
+}
+
+src_compile() {
+ local valaver="$(vala_best_api_version)"
+ emake VALAC="$(type -p valac-${valaver})"
+}
+
+src_install() {
+ local res
+ gnome2_src_install
+
+ doman "${DISTDIR}"/${PN}.1
+ for res in 16 22 24 32 48 256; do
+ doicon -s ${res} "${WORKDIR}"/${res}x${res}/*
+ done
+}
diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
index e658f29..0439331 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
@@ -8,8 +8,7 @@
inherit distutils-r1
-DESCRIPTION="svg2rlg is a python tool to convert SVG files to reportlab
-graphics"
+DESCRIPTION="python tool to convert SVG files to reportlab graphics"
HOMEPAGE="https://code.google.com/p/svg2rlg/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
@@ -22,19 +21,18 @@
RDEPEND="${DEPEND}
dev-python/reportlab[${PYTHON_USEDEP}]"
-PATCHES=( "${FILESDIR}/${PN}-issue-3.patch" "${FILESDIR}/${PN}-issue-6.patch"
- "${FILESDIR}/${PN}-issue-7.patch")
+PATCHES=(
+ "${FILESDIR}/${PN}-issue-3.patch"
+ "${FILESDIR}/${PN}-issue-6.patch"
+ "${FILESDIR}/${PN}-issue-7.patch"
+)
python_test() {
${EPYTHON} test_svg2rlg.py
}
python_prepare_all() {
- tmp=`mktemp` || die "mktemp failed"
- for i in `find -name '*.py'`; do
- tr -d '\r' < $i >$tmp || die "tr failed"
- mv $tmp $i || die "mv failed"
- done
+ find -name '*.py' -exec sed -i 's:\r::' {} + || die
distutils-r1_python_prepare_all
}
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild
index 288a03f..4e127b0 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild
@@ -34,6 +34,7 @@
src_prepare() {
find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+ epatch "${FILESDIR}"/${P}-cross-compile.patch
# https://bugs.gentoo.org/509886
use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
epatch_user
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch
new file mode 100644
index 0000000..11fd99a
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch
@@ -0,0 +1,46 @@
+fix from upstream
+
+From c82417650a1ea4446c19dd82bfab9d8e6cd5a969 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 15 Sep 2015 18:48:02 +0300
+Subject: [PATCH] build: Do not try to detect cross-compiler
+
+cross compilers are passed via path may not be a gcc based cross
+compiler in such cases this check fails and try's to force gcc based
+cross compiler detection, This code is a convenience that limits the
+build system
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ configure.ac | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a482b3e..a14e52d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,20 +27,6 @@ AC_PREFIX_DEFAULT(/usr)
+
+ dnl Checks for programs.
+
+-dnl try to gues cross-compiler if not set
+-if test "x$host" != "x$build" -a -z "`echo $CC | grep -e '-gcc'`";
+-then
+- AC_MSG_CHECKING(for cross-compiler)
+-
+- which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc
+- which ${host_cpu}-${host_os}-gcc >/dev/null 2>&1 \
+- && CC=${host_cpu}-${host_os}-gcc
+- which ${host_cpu}-${host_vendor}-${host_os}-gcc >/dev/null 2>&1 \
+- && CC=${host_cpu}-${host_vendor}-${host_os}-gcc
+-
+- AC_MSG_RESULT($CC)
+-fi
+-
+ CFLAGS="$CFLAGS -D_GNU_SOURCE"
+
+
+--
+2.5.2
+
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index c1bc6e8..12c6522 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,3 +1,3 @@
DIST clutter-gst-2.0.16.tar.xz 357380 SHA256 a944f84186937021aba6329c23954f6015d33bf151ba8994e13c59cefd742039 SHA512 ace0eceb8f99ad78190f6ebb9caf45ccc5597fff2e4dfda4e3bf539e87f41d3d60f66637219244bd28fe32f374460e3456c8dc5d0c60ac057cc73f2f1d60c764 WHIRLPOOL dd60f5722381f8e7678cd9e47b191a1e80c313c138d3cd5cb0acb1131d13ca565dd4f9e8117eda7ed1c81ae0b0bb9cca44530403615f3545ba44c012c12b70eb
DIST clutter-gst-3.0.10.tar.xz 391424 SHA256 2dbdbc3292e92684bbdbf1694c61f6b781f5810e4d79a415dfdee2f7ee42148c SHA512 e1ab8e57bade63c076c1426ed3b87d20034ff8fb54146c754ec4b990ec6d2102c4d87a1b1c3c9def17abe6985e2a59e44253cae1053f64a779dc8ef71a2951e7 WHIRLPOOL 5f8fba3a49c268650cdfee6d0959202a19288042f09acebdc3457f138193fae27fd0074a478032d8773446e05df3f0214e2038ea77feb90a6ea6046d7e361c86
-DIST clutter-gst-3.0.8.tar.xz 390628 SHA256 582e85b88482e16f7ec719363e38fadf84fab4d4baaa21e5227a454b824f135c SHA512 37960b676d440f879fbda8b14b0d3d6974527354abc1368fa2353793eff2ef4c6b4f50b6259b0016b22ae787d022c371aa512ad4441f6217e54ee35089be8b3a WHIRLPOOL 485d00ba7fcea8c7f92aaf7c56aaaa4e022c790b6941ec317314195b2f64766ded8a7acc1673951d871e1523ccccb4fe9761b50a432eeaaf25afffb2d7abf8a8
+DIST clutter-gst-3.0.12.tar.xz 390880 SHA256 cd2b2f8db9c21d6295ed0b2811d4c3036fac5796be71d7affdb2b8746f12066c SHA512 4ad92dfcc7c3d0b83c90a7a216267b86899f2206c8e4405f57ecb08b66e4380c3154d289954c6f60093f47f1a8aa44a2269f41b3e666cf19684fa2d92afdc0c9 WHIRLPOOL ceb2870e52f277812de53d65dbef354b9652fd719184cb8ba25e4ccdea0acd448a76bb2b3a406a93b14b3bb57ac65ffbe3461e00a35c6bb12300c04954a4304a
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.12.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.12.ebuild
new file mode 100644
index 0000000..31518c7
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-3.0.12.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1
+
+HOMEPAGE="https://blogs.gnome.org/clutter/"
+DESCRIPTION="GStreamer integration library for Clutter"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples +introspection"
+
+# >=cogl-1.18 provides cogl-2.0-experimental
+# FIXME:
+# - udev is automagic
+# - provide a USE flag for HW decode support (--enable-gl-texture-upload)
+COMMON_DEPEND="
+ >=dev-libs/glib-2.20:2
+ >=media-libs/clutter-1.20:1.0=[introspection?]
+ >=media-libs/cogl-1.18:1.0=[introspection?]
+ >=media-libs/gstreamer-1.4:1.0[introspection?]
+ >=media-libs/gst-plugins-bad-1.4:1.0
+ >=media-libs/gst-plugins-base-1.4:1.0[introspection?]
+ virtual/libgudev
+ introspection? ( >=dev-libs/gobject-introspection-0.6.8:= )
+"
+# uses goom from gst-plugins-good
+RDEPEND="${COMMON_DEPEND}
+ >=media-libs/gst-plugins-good-1.4:1.0
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ >=dev-util/gtk-doc-am-1.11
+ virtual/pkgconfig
+"
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-maintainer-flags \
+ $(use_enable introspection)
+}
+
+src_compile() {
+ # Clutter tries to access dri without userpriv, upstream bug #661873
+ # Massive failure of a hack, see bug 360219, bug 360073, bug 363917
+ unset DISPLAY
+ gnome2_src_compile
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use examples; then
+ insinto /usr/share/doc/"${PF}"/examples
+ doins examples/{*.c,*.png,README}
+ fi
+}
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.8.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.8.ebuild
deleted file mode 100644
index 22cc272..0000000
--- a/media-libs/clutter-gst/clutter-gst-3.0.8.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1
-
-HOMEPAGE="http://www.clutter-project.org/"
-DESCRIPTION="GStreamer integration library for Clutter"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples +introspection"
-
-# >=cogl-1.18 provides cogl-2.0-experimental
-# FIXME:
-# - udev is automagic
-# - provide a USE flag for HW decode support (--enable-gl-texture-upload)
-COMMON_DEPEND="
- >=dev-libs/glib-2.20:2
- >=media-libs/clutter-1.20:1.0=[introspection?]
- >=media-libs/cogl-1.18:1.0=[introspection?]
- >=media-libs/gstreamer-1.4:1.0[introspection?]
- >=media-libs/gst-plugins-bad-1.4:1.0
- >=media-libs/gst-plugins-base-1.4:1.0[introspection?]
- virtual/libgudev
- introspection? ( >=dev-libs/gobject-introspection-0.6.8:= )
-"
-# uses goom from gst-plugins-good
-RDEPEND="${COMMON_DEPEND}
- >=media-libs/gst-plugins-good-1.4:1.0
-"
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- >=dev-util/gtk-doc-am-1.11
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure \
- --disable-maintainer-flags \
- $(use_enable introspection)
-}
-
-src_compile() {
- # Clutter tries to access dri without userpriv, upstream bug #661873
- # Massive failure of a hack, see bug 360219, bug 360073, bug 363917
- unset DISPLAY
- gnome2_src_compile
-}
-
-src_install() {
- gnome2_src_install
-
- if use examples; then
- insinto /usr/share/doc/"${PF}"/examples
- doins examples/{*.c,*.png,README}
- fi
-}
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
index 8be0281..43a592e 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -13,7 +13,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
IUSE="allegro gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static-libs tiff xpm X"
RDEPEND="allegro? ( media-libs/allegro:0 )
@@ -38,7 +38,7 @@
X? ( x11-proto/xextproto )"
src_prepare() {
- epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict}.patch
+ epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict,fix-test}.patch
eautoreconf
}
diff --git a/media-libs/devil/files/devil-1.7.8-fix-test.patch b/media-libs/devil/files/devil-1.7.8-fix-test.patch
new file mode 100644
index 0000000..44af2fc
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-fix-test.patch
@@ -0,0 +1,10 @@
+--- a/devil-1.7.8/test/Makefile.am
++++ b/devil-1.7.8/test/Makefile.am
+@@ -12,5 +12,6 @@ else
+ testil_LDADD += ../lib/libIL.la
+ endif
+
+-TESTS_ENVIRONMENT = /bin/bash
++TESTS_ENVIRONMENT =
+ TESTS = $(check_SCRIPTS)
++LOG_COMPILER = $(SHELL)
diff --git a/media-libs/elementary/Manifest b/media-libs/elementary/Manifest
index 29e1798..d6eb64b 100644
--- a/media-libs/elementary/Manifest
+++ b/media-libs/elementary/Manifest
@@ -2,3 +2,4 @@
DIST elementary-1.13.1.tar.xz 16120080 SHA256 11595b6c5f511150a26e970bf8e590f96a6ce9e33e5dd8419407013844b2b74f SHA512 b8d4e3ff2447a80a98119753012e6ef0666ca569e4d401e66477a51667b6e940eb9c02d87f37b289b257db2855fc35486f0229e8861e74b6c48366aac30caa9f WHIRLPOOL 5400f9a11f2997fde9ee7b170ccf6b8833ad0fdecf229fc2dcbb9eea731e40958922672b47fa539df533006b29f7a197473cb3b24b8bac51a4159fc9f249ec46
DIST elementary-1.15.0.tar.xz 18430880 SHA256 2be3180acbb9fa2fc0e9351b5508318925eb38733a6d54e1b3fc75e58368f1b0 SHA512 5441ebc012cf76aad074d25394cbb855decabcefa5a8b5feb2909a4fbc470fad32b1660fbc0bd47f6c11267d11cb21fe9df283718d4ccf68ffe44319de229781 WHIRLPOOL 29aa20103a56bd527754f14841216f0c6198e2663836455cc8b6391a88ca558c632f15868b948059616e659fd7c43f797526a472cba26ba38bc5195f562fbb3c
DIST elementary-1.15.1.tar.xz 18514596 SHA256 ab22a40a5108f7f988a34b0a791d202d2c6c538ea8508919c264bdbdce11ab04 SHA512 1622eb3e54f716b84642c9fe2164c882749fe402cf516e070a47c6d0cff898d043e231e3f557984e6d2fff90bf218249431b148d209bc1ed1aacb35211364ba6 WHIRLPOOL 4b224a54a11d5e8907b53f8d71ef541ff93fa92a1a7e24ec567312d6fb3c7c0c31358a1ace2b66c227447ffef3c94f7b373da78c694e09d9d3f67f888d641f96
+DIST elementary-1.15.2.tar.xz 18514048 SHA256 523c3073210b611817d0f56aa8348962ec757282f9f7dfde93825afa164a0f3f SHA512 7ee796898aee7667e0ae6e8e7d1a604287fc9b009a7a3f4ab75c15b10160e0a38975dfbf6586c20ad2fdc8075dd867287d4d5617ad6b6be2e522c74beb03ce38 WHIRLPOOL 6d42e6063c8d697d237b003781f33e6b3bf562c2785458cd3cf1cf84319325ac1ff39704e33bae641610b1ff669b2fe115135a5f939eca0314a25ee7a6a6bf0a
diff --git a/media-libs/elementary/elementary-1.15.2.ebuild b/media-libs/elementary/elementary-1.15.2.ebuild
new file mode 100644
index 0000000..7cef5b0
--- /dev/null
+++ b/media-libs/elementary/elementary-1.15.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+ EGIT_SUB_PROJECT="core"
+ EGIT_URI_APPEND="${PN}"
+else
+ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
+ EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Basic widget set, based on EFL for mobile touch-screen devices"
+HOMEPAGE="https://trac.enlightenment.org/e/wiki/Elementary"
+
+LICENSE="LGPL-2.1"
+IUSE="debug examples fbcon quicklaunch sdl wayland X static-libs"
+
+DEPEND=">=dev-libs/efl-${PV}[fbcon?,sdl?,png,wayland?,X?]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ E_ECONF=(
+ $(use_enable debug)
+ $(use_enable doc)
+ --disable-ecore-cocoa
+ --disable-ecore-psl1ght
+ --disable-ecore-win32
+ --disable-elocation
+ --disable-emap
+ --disable-eweather
+ # broken: make[4]: *** No rule to make target 'prefs_example_01.epb', needed by 'all-am'. Stop
+ #$(use_enable examples build-examples)
+ $(use_enable examples install-examples)
+ $(use_enable fbcon ecore-fb)
+ $(use_enable sdl ecore-sdl)
+ $(use_enable wayland ecore-wayland)
+ $(use_enable X ecore-x)
+ $(use_enable quicklaunch quick-launch)
+ )
+
+ enlightenment_src_configure
+}
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index bd0b270..e7ce7fb 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,8 +1,12 @@
+DIST 03-infinality-2.6-2015.10.04.patch.xz 24444 SHA256 0c28892e9b6bc27afe9149da04fc9733c9323817dd81802f2f40c680a7f887a8 SHA512 8733a7c7c118dee7fd2303435fc9c10d66aba49bd16f1215fe069b5cf16242776f2701c02fa17bca772195f0fc569e35cff11f73fc5f77519d4858737d511db3 WHIRLPOOL 5e7fbbea273df890efe8a101106430bba54cf3ce52228cb3eb272302189397bc25b4451a9bfb4e8ba56413c39c9cd21bc1df9896f0232dd1825aad51fabc045d
DIST freetype-2.5.5-infinality-patches.tar.xz 24380 SHA256 6b7bc373b068c71feca2e19c3741993ee0ff787984aa0653ca66814e05ef195f SHA512 8831e3337214cc57a0381c56ef6750f85b11f1b6358adaa3dda34d449f234335bede124be9d23df817ae8c06f80c8e3ce63ed3fc32eb05586b8c8e43ce52e575 WHIRLPOOL 27b945e9524e984ef57f96415a86095d91dea8fa8e402a3eb6a3d7c38a7636d53d5e47fc37b734ca88f41a499f3398ab9d7bd147e1424c19b09f41e17f2cbe8d
DIST freetype-2.5.5.tar.bz2 1714529 SHA256 387bcc4b780b12484aa2ec9f7db1a55d8286eb5639f45fbc0fbba7a4e5a1afb9 SHA512 1fc72d24da1744a6a5faf3338e49912c81ce83f30def1e80a2a15b50e7f83893a4fe24a70ef88b65ecc217bed1c15d85804c364eba221b35e25531c727fe8559 WHIRLPOOL 57cf0f020cda6a66cfe8e2a30e1e997c0fd7f97bdaed38da65cce0b360fcc60cfdf1ba0724c1745668ae3f80743052e135edb8356dff4c90365caa6262d59158
DIST freetype-2.6-infinality-patches.tar.xz 24356 SHA256 95bd7f6bd191063e4691e000b1f59aa776a6c0afb5501e19a88d7b72ec47831e SHA512 87e206ffe78b9411753c0491da9ef6bbea4f9dde45cba539f0d51e9c5c4461c94b75af8fc8b96b9b9d5c7d7c63ac1ec88c227e93db197c56e02ead60b502d9a0 WHIRLPOOL 3d671e637ed4f1b7adfa862be684f8513d58e7071ce7ef1e26ca3a4311c0ec5e1817409299f0266129fe0b2c2bd330fdf6e6894e05ef937ba94c95b6e860dcd0
+DIST freetype-2.6.1.tar.bz2 1744692 SHA256 2f6e9a7de3ae8e85bdd2fe237e27d868d3ba7a27495e65906455c27722dd1a17 SHA512 cbc003e8f353d47ddcc2110aa8ecfdc1df53e61698e1ed68ed60afd5fd1d10d921c9719a505196c95865a68482822f9cccf5d131ec36d64c0230def774e7bb4b WHIRLPOOL 6319c8764f8d29669b241f0152338d356761d65a75235544c0c831aa03700e8b663b40b501519e57f09968c98bc8d56d1005ad069c9ee066c679b3400e20779a
DIST freetype-2.6.tar.bz2 1726219 SHA256 8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e SHA512 0242c832dcac3d9dc5d434b7f5145e63f2289d5df32f16e1c7afc1e31c3c92f0dd374e20dfef79a9ecb26b14419f42b0d897c7154f249f629c35ee7af0aa5297 WHIRLPOOL bf7f105b74348a1ca0e95e21091670a5d73793e8aea8aa8e0dad515086885a182f3bced713c2cf76704c7814031f308a642d6db45a0c065627d0e7bdcaedffd6
DIST freetype-doc-2.5.5.tar.bz2 108133 SHA256 68becbae3578a8101e9f3c55f10e435fb75535011d3f7a523719371e86e368e7 SHA512 0e2455433f72766ec88275d2e53e49630457579a83ca491697bb5ce12196ee964618d1af86956651557d34e8ea1d57f75f69e0d60ef90e943509bc571370fb64 WHIRLPOOL 28d13ae3ce9bc3fb278df9a963cef3622672fa288fc0fd654e874054bedccd8510a3dcf7636ea2ec107b5299984742607d2a9436d5e473202856e27bf262655f
+DIST freetype-doc-2.6.1.tar.bz2 477313 SHA256 69b1102c9f4e7d75ad2701618f7e5c084d819264755ecbf11893e3cc6de0e0f5 SHA512 8353c5324166004f8e65c92bbe9be567c7ed2681b0c125758df8be098cd51983016a1387d58b147c2d57c984fcd0a615fe580e38d6e0ed445c5781e28c7c77b3 WHIRLPOOL c1f9f27db8975d89f91c8fff4ed523536525747bf57d116d5dd220986370287e8b05a4678fe31cbb0c08461cd9a49cbd6d9d05769d22a03220227c40baed2359
DIST freetype-doc-2.6.tar.bz2 477177 SHA256 4868ec0b2b6890a1db296b00ce302ebf311b93b08aabd7ffca902e9c16b3e470 SHA512 ca8e5c44ac912c939e891b1e3386852d1771806f1f5684429964a6bac284d5cb51e80645a4b492067ad8c46e0e91d1651e8f593b3d5c03c5bceeaec1c51b6b15 WHIRLPOOL e02cb2b4382aabfd0ed48a8e652467bc11dee0a7b7591a5d3755012f903218c5ed3030ee3eb9888393cc9bad52585687e7794f82883fdf1d64835a87c27c2cd2
DIST ft2demos-2.5.5.tar.bz2 182006 SHA256 b87c7deb5d9b1fddb8520c091a5491cc63ecac4de25139e1da38aebee82195ea SHA512 c6e1855f2315665e39a894ecfcb65f8546de435c1dada0ea0a6665a1e3ef22331d6949cd9261dfb6b68e653631d4c2e74f8ea31b53b40e46f44ab4dae38e368b WHIRLPOOL 55d6add5e3fac008a39231e3805e151a5a9b7cafb6ef970e546d96d3fa338a6a4a744aeb59ea04804312164aedd5e5a21e19773dbf5c42a1acfc42d283d90930
+DIST ft2demos-2.6.1.tar.bz2 190308 SHA256 369d27ae65ba04c2e3e74cf948ebcc5aa51abd47cd2e1d7d5cad0bc1f82da2aa SHA512 9740e1ae7fa4f8a932de3766dc8512c22a847d606b99aaff568865a68e059b3970ca9708d6c17f4d171f6f9bb63194f2c3498adf5461e3233b3b3206c57c6d7e WHIRLPOOL 84d59e27300085e4551f622374d0080184f0180d4b3c9447492af906612c7da3cfb3bf66e8f038c3fa008c2d590d7956fc4a2d347190d45b028c729949182b69
DIST ft2demos-2.6.tar.bz2 190240 SHA256 f8f4bc2a2e76e0dbe61838e452c5a7daf1d4bd9dfa44691940bf308f776d32b6 SHA512 f9b8dfe40266ffdd2927e0d2cfe641b9028de07935d0abcd0a2dadcf0359700c296cd2a9b0c4114f47c0cd1489db287224a31b7dbcb1f6b937b1bdfcda3c1db8 WHIRLPOOL 400796659c523f4c2c16c8c523161cbf34505be5a08d1eb601312362cf0eb226fa86561d199d34f0e1a9e83bd76525663e9a040865f456bfa3ed49b64d51720d
diff --git a/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch b/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch
new file mode 100644
index 0000000..c361baf
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch
@@ -0,0 +1,50 @@
+taken from upstream
+
+http://savannah.nongnu.org/bugs/?func=detailitem&item_id=46118
+
+From 30fe5e762e062612fdf4b56b50d813525a5aa311 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl@gnu.org>
+Date: Sun, 4 Oct 2015 13:08:08 +0200
+Subject: [PATCH] [base] Replace left shifts with multiplication (#46118).
+
+* src/base/ftglyph.c (ft_bitmap_glyph_bbox, FT_Get_Glyph): Do it.
+---
+ ChangeLog | 6 ++++++
+ src/base/ftglyph.c | 14 +++++++-------
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
+index cb7fc37..2778743 100644
+--- a/src/base/ftglyph.c
++++ b/src/base/ftglyph.c
+@@ -125,10 +125,10 @@
+ FT_BitmapGlyph glyph = (FT_BitmapGlyph)bitmap_glyph;
+
+
+- cbox->xMin = glyph->left << 6;
+- cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width << 6 );
+- cbox->yMax = glyph->top << 6;
+- cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows << 6 );
++ cbox->xMin = glyph->left * 64;
++ cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width * 64 );
++ cbox->yMax = glyph->top * 64;
++ cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows * 64 );
+ }
+
+
+@@ -403,9 +403,9 @@
+ if ( error )
+ goto Exit;
+
+- /* copy advance while converting it to 16.16 format */
+- glyph->advance.x = slot->advance.x << 10;
+- glyph->advance.y = slot->advance.y << 10;
++ /* copy advance while converting 26.6 to 16.16 format */
++ glyph->advance.x = slot->advance.x * 1024;
++ glyph->advance.y = slot->advance.y * 1024;
+
+ /* now import the image from the glyph slot */
+ error = clazz->glyph_init( glyph, slot );
+--
+2.5.2
+
diff --git a/media-libs/freetype/freetype-2.6.1-r1.ebuild b/media-libs/freetype/freetype-2.6.1-r1.ebuild
new file mode 100644
index 0000000..de89f39
--- /dev/null
+++ b/media-libs/freetype/freetype-2.6.1-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-multilib flag-o-matic multilib toolchain-funcs
+
+INFINALITY_PATCH="03-infinality-2.6-2015.10.04.patch"
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="http://www.freetype.org/"
+SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+ mirror://nongnu/freetype/${P/_/}.tar.bz2
+ utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
+ mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
+ doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
+ mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )
+ infinality? ( https://dev.gentoo.org/~polynomial-c/${INFINALITY_PATCH}.xz )"
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="X +adobe-cff bindist bzip2 debug doc fontforge harfbuzz
+ infinality png static-libs utils"
+RESTRICT="!bindist? ( bindist )" # bug 541408
+
+CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
+ png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
+ utils? (
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+ )
+ )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+
+src_prepare() {
+ enable_option() {
+ sed -i -e "/#define $1/a #define $1" \
+ include/${PN}/config/ftoption.h \
+ || die "unable to enable option $1"
+ }
+
+ disable_option() {
+ sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
+ include/${PN}/config/ftoption.h \
+ || die "unable to disable option $1"
+ }
+
+ # This is the same as the 01 patch from infinality
+ epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
+
+ if use infinality; then
+ epatch "${WORKDIR}/${INFINALITY_PATCH}"
+
+ # FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11
+ enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING
+ fi
+
+ if ! use bindist; then
+ # See http://freetype.org/patents.html
+ # ClearType is covered by several Microsoft patents in the US
+ enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+ fi
+
+ if ! use adobe-cff; then
+ enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+ fi
+
+ if use debug; then
+ enable_option FT_DEBUG_LEVEL_TRACE
+ enable_option FT_DEBUG_MEMORY
+ fi
+
+ epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+ epatch "${FILESDIR}"/${PN}-2.6.1-bad-shift.patch
+
+ if use utils; then
+ cd "${WORKDIR}/ft2demos-${PV}" || die
+ # Disable tests needing X11 when USE="-X". (bug #177597)
+ if ! use X; then
+ sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+ fi
+ cd "${S}" || die
+ fi
+
+ # we need non-/bin/sh to run configure
+ if [[ -n ${CONFIG_SHELL} ]] ; then
+ sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
+ "${S}"/builds/unix/configure || die
+ fi
+
+ autotools-utils_src_prepare
+}
+
+multilib_src_configure() {
+ append-flags -fno-strict-aliasing
+ type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+ local myeconfargs=(
+ --enable-biarch-config
+ $(use_with bzip2)
+ $(use_with harfbuzz)
+ $(use_with png)
+
+ # avoid using libpng-config
+ LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+ LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+ )
+
+ autotools-utils_src_configure
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi && use utils; then
+ einfo "Building utils"
+ # fix for Prefix, bug #339334
+ emake \
+ X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+ FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi && use utils; then
+ einfo "Installing utils"
+ rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
+ local ft2demo
+ for ft2demo in ../ft2demos-${PV}/bin/*; do
+ ./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+ "${ED}"/usr/bin || die
+ done
+ fi
+}
+
+multilib_src_install_all() {
+ if use fontforge; then
+ # Probably fontforge needs less but this way makes things simplier...
+ einfo "Installing internal headers required for fontforge"
+ local header
+ find src/truetype include/internal -name '*.h' | \
+ while read header; do
+ mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+ cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+ done
+ fi
+
+ dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+ use doc && dohtml -r docs/*
+
+ prune_libtool_files --all
+}
diff --git a/media-libs/freetype/freetype-2.6.1.ebuild b/media-libs/freetype/freetype-2.6.1.ebuild
new file mode 100644
index 0000000..d971b51
--- /dev/null
+++ b/media-libs/freetype/freetype-2.6.1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-multilib flag-o-matic multilib toolchain-funcs
+
+INFINALITY_PATCH="03-infinality-2.6-2015.10.04.patch"
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="http://www.freetype.org/"
+SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+ mirror://nongnu/freetype/${P/_/}.tar.bz2
+ utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
+ mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
+ doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
+ mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )
+ infinality? ( https://dev.gentoo.org/~polynomial-c/${INFINALITY_PATCH}.xz )"
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="X +adobe-cff bindist bzip2 debug doc fontforge harfbuzz
+ infinality png static-libs utils"
+RESTRICT="!bindist? ( bindist )" # bug 541408
+
+CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
+ png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
+ utils? (
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+ )
+ )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+
+src_prepare() {
+ enable_option() {
+ sed -i -e "/#define $1/a #define $1" \
+ include/${PN}/config/ftoption.h \
+ || die "unable to enable option $1"
+ }
+
+ disable_option() {
+ sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
+ include/${PN}/config/ftoption.h \
+ || die "unable to disable option $1"
+ }
+
+ # This is the same as the 01 patch from infinality
+ epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
+
+ if use infinality; then
+ epatch "${WORKDIR}/${INFINALITY_PATCH}"
+
+ # FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11
+ enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING
+ fi
+
+ if ! use bindist; then
+ # See http://freetype.org/patents.html
+ # ClearType is covered by several Microsoft patents in the US
+ enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+ fi
+
+ if ! use adobe-cff; then
+ enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+ fi
+
+ if use debug; then
+ enable_option FT_DEBUG_LEVEL_TRACE
+ enable_option FT_DEBUG_MEMORY
+ fi
+
+ epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+
+ if use utils; then
+ cd "${WORKDIR}/ft2demos-${PV}" || die
+ # Disable tests needing X11 when USE="-X". (bug #177597)
+ if ! use X; then
+ sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+ fi
+ cd "${S}" || die
+ fi
+
+ # we need non-/bin/sh to run configure
+ if [[ -n ${CONFIG_SHELL} ]] ; then
+ sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
+ "${S}"/builds/unix/configure || die
+ fi
+
+ autotools-utils_src_prepare
+}
+
+multilib_src_configure() {
+ append-flags -fno-strict-aliasing
+ type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+ local myeconfargs=(
+ --enable-biarch-config
+ $(use_with bzip2)
+ $(use_with harfbuzz)
+ $(use_with png)
+
+ # avoid using libpng-config
+ LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+ LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+ )
+
+ autotools-utils_src_configure
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi && use utils; then
+ einfo "Building utils"
+ # fix for Prefix, bug #339334
+ emake \
+ X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+ FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi && use utils; then
+ einfo "Installing utils"
+ rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
+ local ft2demo
+ for ft2demo in ../ft2demos-${PV}/bin/*; do
+ ./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+ "${ED}"/usr/bin || die
+ done
+ fi
+}
+
+multilib_src_install_all() {
+ if use fontforge; then
+ # Probably fontforge needs less but this way makes things simplier...
+ einfo "Installing internal headers required for fontforge"
+ local header
+ find src/truetype include/internal -name '*.h' | \
+ while read header; do
+ mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+ cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+ done
+ fi
+
+ dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+ use doc && dohtml -r docs/*
+
+ prune_libtool_files --all
+}
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index ed6ed08..d93cdef 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -20,6 +20,7 @@
<flag name="adobe-cff">Use Adobe CFF as default font-renderer</flag>
<flag name="auto-hinter">Use the unpatented auto-hinter instead
of the (recommended) TrueType bytecode interpreter</flag>
+ <flag name="bindist">Disable ClearType support (see http://freetype.org/patents.html)</flag>
<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
<flag name="fontforge">Install internal headers required for TrueType
debugger in <pkg>media-gfx/fontforge</pkg> (built with
diff --git a/media-libs/gavl/files/1.4.0-x32.diff b/media-libs/gavl/files/1.4.0-x32.diff
new file mode 100644
index 0000000..4b510a5
--- /dev/null
+++ b/media-libs/gavl/files/1.4.0-x32.diff
@@ -0,0 +1,29 @@
+------------------------------------------------------------------------
+r4209 | gmerlin | 2014-06-02 16:38:33 +0200 (Mon, 02 Jun 2014) | 2 lines
+
+* Compilation fix
+
+
+Index: gavl/cputest.c
+===================================================================
+--- gavl/cputest.c (revision 4208)
++++ gavl/cputest.c (revision 4209)
+@@ -69,6 +69,8 @@
+ int rval = 0;
+ int eax, ebx, ecx, edx;
+ int max_std_level, max_ext_level, std_caps=0, ext_caps=0;
++
++#ifndef ARCH_X86_64
+ long a, c;
+
+ __asm__ __volatile__ (
+@@ -94,6 +96,7 @@
+
+ if (a == c)
+ return 0; /* CPUID not supported */
++#endif // !ARCH_X86_64
+
+ cpuid(0, max_std_level, ebx, ecx, edx);
+
+
+------------------------------------------------------------------------
diff --git a/media-libs/gavl/gavl-1.4.0-r1.ebuild b/media-libs/gavl/gavl-1.4.0-r1.ebuild
index a6674fa..ba89158 100644
--- a/media-libs/gavl/gavl-1.4.0-r1.ebuild
+++ b/media-libs/gavl/gavl-1.4.0-r1.ebuild
@@ -23,6 +23,8 @@
DOCS=( AUTHORS README TODO )
src_prepare() {
+ epatch "${FILESDIR}/${PV}-x32.diff"
+
# AC_CONFIG_HEADERS, bug #467736
sed -i \
-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild
index e1cc44b..c063f7d 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild
@@ -40,6 +40,7 @@
orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
!<media-libs/gst-plugins-good-1.1:${SLOT}
+ x11-libs/libSM[${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.12
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
index da4da7c..0c98c00 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
@@ -18,7 +18,7 @@
LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
[[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/jasper/jasper-1.900.1-r9.ebuild b/media-libs/jasper/jasper-1.900.1-r9.ebuild
index f7a4d56..8e9129e 100644
--- a/media-libs/jasper/jasper-1.900.1-r9.ebuild
+++ b/media-libs/jasper/jasper-1.900.1-r9.ebuild
@@ -45,6 +45,11 @@
DOCS=( NEWS README doc/. )
+src_prepare() {
+ chmod -R o-w "${S}" || die
+ autotools-multilib_src_prepare
+}
+
src_configure() {
local myeconfargs=(
$(use_enable jpeg libjpeg)
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 3f59e6d..1642a54 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,9 +1,3 @@
-DIST libass-0.10.1.tar.xz 257792 SHA256 fbf287ac6d0dbdf015783b7354280ad8371c106326ad3f77a99471bc5aa18210 SHA512 3990886b9e708bf29f48921f65f99cee85031e299065860bce4f3e626970f82e60130b7525c1aaaf40e02c7b49d7003378724dbcf72db5894ab79768776694cf WHIRLPOOL 7278b893a047f8d0709e0b644495e2f42e4a10aea3174a91eea055501d66ad70f3bc7e924c49aaa9f8de3ddadc564aefbb6f35a0158ed714bf1486e275e1706b
-DIST libass-0.10.2.tar.xz 278244 SHA256 f02afcc6410b800f0007dc7c282e897dab64f817c23b37d171fd6ff7fc4ca1d8 SHA512 50e77a488bc47d03a8cfca49cd7d26b702f88f649640cc63b40eb288c0f2771a6db5656e77fb8ab072a2a0b10dadf4a21e375ed831605c6de37466003f36bfd7 WHIRLPOOL d0884a663a86c33696f0909b1be09fad213ed972ec908d5dfc25fa13ed85fa48a6d4fabfe99efbf03939d5af7d0323969e06ee185c762914594e3b4ee78f0b03
-DIST libass-0.11.1.tar.xz 297016 SHA256 9d773a2880114ae4edc4b7686ed67219348d932c24e322ffd7d4c1d97e8813ac SHA512 16b047f688c9d9804d402e7a30377bc98ddadb5d464d621e6e035521532b9ff1e86d0e144e7c5089782afc6ac42ab934b03d75c1c4972fbaea7d8949f732ff62 WHIRLPOOL d89e1eea227cccf09f5267dcd853d07c5981359d8714aa541c3bd03a4e1b438fec4162c0a5fd0fe14cde9d8774f12a0473e24f62e3100fd880259c9248b04055
DIST libass-0.11.2.tar.xz 297172 SHA256 499dbaf14d7743e5899c9ca918988e81a9894f674b22d4682922f2e5d095ff9e SHA512 93e7b9ce328fc8ac7555c49015baf89c2f07957e501e3ea9ee5a2a7750c1454891a202a92f1348aef27c877bf01674bb7958b7e500c59538b67fe68a89315540 WHIRLPOOL 9c0e0b869efc815e9ecd0e0dfa0488b9643404bd8fc33fe4be2cbf7c026989b27ee7eeb6d8f11218d903881629d864b52bdb0f3a7433325f03b0a6c5a21d1d23
-DIST libass-0.12.0.tar.xz 310412 SHA256 0f34e9b4d1badbe85f2865e308d191b311f12266f9612a0fbf995ea8436bae29 SHA512 329727064ac1c90f1bfe449548a2b4d9e5b02346eb43c69b4e9623227efc19e91690950540fac7465aa44bd351103f17fa075f71836a1aa3400ee0647995a197 WHIRLPOOL 51aa187e10916c9d21902dbc1cd3418209f3df181b99392a2cd5271cc3d1eead09321240b3edd2e1a45c5658b6333afca2a8b9dba97c8bb32ea62d903920e764
-DIST libass-0.12.1.tar.xz 312020 SHA256 87864517e482e94130864ad9e4217c3925119e8cc0c1509133989997a61592d7 SHA512 ace022b214cdbd0f043037a6be25c2b58e12630717fe839f3a896462e3c7b0ccbb1e33c0128a09bbd416ec6e1e30230d514341a5c5c9190058fdedcf95082c91 WHIRLPOOL b351344437c1d3c780b84dd98c02c786216226019879186c3da659e690e27e23a49be38fb8e302551978fa5e02dcfed13c3ff057ce778757ee04af5433f06f4e
-DIST libass-0.12.2.tar.xz 313208 SHA256 673c1b15bde182168b17e17ee1c8d9e01173f20af352134216135b5bf15bf1e3 SHA512 7cdbb6514c17eafebcc5e558d96ac06f301fa2d7658275379b8598b71b1e10c5dee4d91ebce5181ee3f16f4fe4e1afa9bb9942fa81c38babdcad7de05b59d35f WHIRLPOOL 7990731baa4ee55060dc86fd8fb240ae5fe4a7305aebdab3d434846fda7ed616b7247283b3f65de6db56e102965eb7cd21c9cee59c94f6b5b6a53068d01e11f3
DIST libass-0.12.3.tar.xz 313852 SHA256 a67c54ebaf5ec19ae72e86259ee6ab6adfe2e64ed9f9149db03dc863360ea38c SHA512 84931e89f02487ff01bfe24be3d90b1db8599ab2a5ec2277824b4330cd9219189a54f19d2d83f223d2d6f973b5e7474f2691905091749a776147669b72754be2 WHIRLPOOL 7187d678dfec621d5736ecb4d9dbf6559c74d6c1b4dfcdd7bc4f78313e8f10f73d3cefd33bfa9a1ceed87cb00767e4235b95e144c527e74746e680b6bb12c719
-DIST libass-0.9.13.tar.xz 250536 SHA256 eef55595355cd4dd14b88b61d4e34c7bcfb6060a6b28f5a9ebc7dd5a72b69cc8 SHA512 82c1a280b5cff9dd09f015562db420295a465ce7e80ad51b2f879e347c3a675ea05ac2beaa106c178aa57a390a19eb1ffb90771689e76e2b0619e75673631e0d WHIRLPOOL b1769d3a5b9a14d43447ddaa8c459b5fda4c857abdee270d022cced3d5db93a25059ef4291c0fe27cf235c20507f6c77fdc9c3037d032bad57e1971eaa8436c9
+DIST libass-0.13.0.tar.xz 336128 SHA256 e0071a3b2e95411c8d474014678368e3f0b852f7d663e0564b344e7335eb0671 SHA512 0253d0cd306603b2721bd128ad6eb050c74f1ee415145f238f3a10c4041b054bf94857f4c0043a6578c4fd0865e809e25fa9f61071631ba647c731c13418627f WHIRLPOOL 7ccf4df975a07e94cdc85b4436b08eae1a6ce60d027d0db21855bbdfd21e4770a5e21cae90ce7646b477094241df3b36c247f043f347f2f1494f3d6a02e91f28
diff --git a/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch b/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch
new file mode 100644
index 0000000..3688aad
--- /dev/null
+++ b/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch
@@ -0,0 +1,26 @@
+From 4778001b673c73133d7d1dd48a385d0ca424ccfc Mon Sep 17 00:00:00 2001
+From: Luke Dashjr <luke-jr+git@utopios.org>
+Date: Sat, 10 Oct 2015 08:11:38 +0000
+Subject: [PATCH] configure: Set the correct x32 machine option for yasm
+
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 117b23b..d6fbe34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,6 +56,12 @@ AS_IF([test x$enable_asm != xno], [
+ X86=true
+ BITS=32
+ ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -m x86" ],
++ [x86_64-*-gnux32|amd64-*-gnux32], [
++ AS=yasm
++ INTEL=true
++ X64=true
++ BITS=64
++ ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -m x32" ],
+ [x86_64-*|amd64-*], [
+ AS=yasm
+ INTEL=true
diff --git a/media-libs/libass/libass-0.10.1.ebuild b/media-libs/libass/libass-0.10.1.ebuild
deleted file mode 100644
index e6036f2..0000000
--- a/media-libs/libass/libass-0.10.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="https://code.google.com/p/libass/"
-SRC_URI="https://libass.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+enca +fontconfig +harfbuzz static-libs"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.4.2 )
- >=media-libs/freetype-2.4:2
- virtual/libiconv
- >=dev-libs/fribidi-0.19.0
- harfbuzz? ( >=media-libs/harfbuzz-0.9.11 )
- enca? ( app-i18n/enca )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS="Changelog"
-
-src_configure() {
- econf \
- $(use_enable enca) \
- $(use_enable fontconfig) \
- $(use_enable harfbuzz) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/libass/libass-0.10.2.ebuild b/media-libs/libass/libass-0.10.2.ebuild
deleted file mode 100644
index 834b664..0000000
--- a/media-libs/libass/libass-0.10.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="https://code.google.com/p/libass/"
-SRC_URI="https://libass.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/5" # subslot = libass soname version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+enca +fontconfig +harfbuzz static-libs"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.4.2 )
- >=media-libs/freetype-2.4:2
- virtual/libiconv
- >=dev-libs/fribidi-0.19.0
- harfbuzz? ( >=media-libs/harfbuzz-0.9.11[truetype] )
- enca? ( app-i18n/enca )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS="Changelog"
-
-src_configure() {
- econf \
- $(use_enable enca) \
- $(use_enable fontconfig) \
- $(use_enable harfbuzz) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/media-libs/libass/libass-0.11.1.ebuild b/media-libs/libass/libass-0.11.1.ebuild
deleted file mode 100644
index db78473..0000000
--- a/media-libs/libass/libass-0.11.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="https://github.com/libass/libass"
-SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/5" # subslot = libass soname version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+enca +fontconfig +harfbuzz static-libs"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
- harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )
- enca? ( >=app-i18n/enca-1.14-r1[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-X86_CPU_OPTS="abi_x86_32 abi_x86_64"
-for i in ${X86_CPU_OPTS} ; do
- DEPEND="${DEPEND}
- ${i}? ( dev-lang/yasm )"
-done
-
-DOCS="Changelog"
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(use_enable enca) \
- $(use_enable fontconfig) \
- $(use_enable harfbuzz) \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/media-libs/libass/libass-0.12.0.ebuild b/media-libs/libass/libass-0.12.0.ebuild
deleted file mode 100644
index db78473..0000000
--- a/media-libs/libass/libass-0.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="https://github.com/libass/libass"
-SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/5" # subslot = libass soname version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+enca +fontconfig +harfbuzz static-libs"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
- harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )
- enca? ( >=app-i18n/enca-1.14-r1[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-X86_CPU_OPTS="abi_x86_32 abi_x86_64"
-for i in ${X86_CPU_OPTS} ; do
- DEPEND="${DEPEND}
- ${i}? ( dev-lang/yasm )"
-done
-
-DOCS="Changelog"
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(use_enable enca) \
- $(use_enable fontconfig) \
- $(use_enable harfbuzz) \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/media-libs/libass/libass-0.12.1.ebuild b/media-libs/libass/libass-0.12.1.ebuild
deleted file mode 100644
index de9132e..0000000
--- a/media-libs/libass/libass-0.12.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="https://github.com/libass/libass"
-SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/5" # subslot = libass soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+enca +fontconfig +harfbuzz static-libs"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
- harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )
- enca? ( >=app-i18n/enca-1.14-r1[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-X86_CPU_OPTS="abi_x86_32 abi_x86_64"
-for i in ${X86_CPU_OPTS} ; do
- DEPEND="${DEPEND}
- ${i}? ( dev-lang/yasm )"
-done
-
-DOCS="Changelog"
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(use_enable enca) \
- $(use_enable fontconfig) \
- $(use_enable harfbuzz) \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/media-libs/libass/libass-0.12.2.ebuild b/media-libs/libass/libass-0.12.2.ebuild
deleted file mode 100644
index de9132e..0000000
--- a/media-libs/libass/libass-0.12.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="https://github.com/libass/libass"
-SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/5" # subslot = libass soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+enca +fontconfig +harfbuzz static-libs"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
- harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )
- enca? ( >=app-i18n/enca-1.14-r1[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-X86_CPU_OPTS="abi_x86_32 abi_x86_64"
-for i in ${X86_CPU_OPTS} ; do
- DEPEND="${DEPEND}
- ${i}? ( dev-lang/yasm )"
-done
-
-DOCS="Changelog"
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(use_enable enca) \
- $(use_enable fontconfig) \
- $(use_enable harfbuzz) \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/media-libs/libass/libass-0.13.0.ebuild b/media-libs/libass/libass-0.13.0.ebuild
new file mode 100644
index 0000000..3646359
--- /dev/null
+++ b/media-libs/libass/libass-0.13.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="Library for SSA/ASS subtitles rendering"
+HOMEPAGE="https://github.com/libass/libass"
+SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0/5" # subslot = libass soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+fontconfig +harfbuzz static-libs"
+
+RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+ >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+X86_CPU_OPTS="abi_x86_32 abi_x86_64"
+for i in ${X86_CPU_OPTS} ; do
+ DEPEND="${DEPEND}
+ ${i}? ( dev-lang/yasm )"
+done
+
+DOCS="Changelog"
+
+src_prepare() {
+ # bug #509460
+ epatch "${FILESDIR}/${PV}-configure-Set-the-correct-x32-machine-option-for-yas.patch"
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable fontconfig) \
+ $(use_enable harfbuzz) \
+ $(use_enable static-libs static) \
+ --disable-require-system-font-provider
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/media-libs/libass/libass-0.9.13.ebuild b/media-libs/libass/libass-0.9.13.ebuild
deleted file mode 100644
index 01c4f96..0000000
--- a/media-libs/libass/libass-0.9.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="https://code.google.com/p/libass/"
-SRC_URI="https://libass.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+enca +fontconfig static-libs"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.4.2 )
- >=media-libs/freetype-2.2.1:2
- virtual/libiconv
- enca? ( app-i18n/enca )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS="Changelog"
-
-src_configure() {
- econf \
- $(use_enable enca) \
- $(use_enable fontconfig) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index b9ab7ee..5fad57f 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,6 +1,3 @@
-DIST libbluray-0.5.0.tar.bz2 559639 SHA256 19213e193e1abc5ed2de65edfb539deda1dbf6cc64dfef03e405524c9c6f7216 SHA512 bd709a01689bbb03ac291a2544eee93b47d72e065c8ccf825f9fb568ddb339a75a18c721b3c59fd4a8214a0f9b652cbd845bccd9de08248dd4cf61616a77e1dd WHIRLPOOL ab6b422889e6469053f567a489afe6c4cbf79cc1e56461ccad3eec948be819748da7760377686430db212a249b450da8fe5a9c914828f13354135dcf2e314add
-DIST libbluray-0.6.1.tar.bz2 586646 SHA256 bf51c4fb65f4d8b02e9b2708017ecd829c8d0dfa9239bca011e67a2a6e368b3f SHA512 f32f5ce238955efd8d9f34d488d89ca1f52b4dd1f63334ade92dc8e053b15e180549fc5f83f4b7d532c145acb1b8ddfca2230df65451bfb0f77bf6aa2c3806ec WHIRLPOOL bed882bef96effc81241eab736b6be4caa098fdb1e9e2c50bdb70ebfdf0ee53490aed6697bc298c5a8271547113e9c0de151b95198ca2db90733ea70adc4ad44
DIST libbluray-0.6.2.tar.bz2 582227 SHA256 8ca410c8a4a1e2e8344014a67e2c908182cff3e04ece4e3b9ef196cf6bca5cd0 SHA512 20fbc5f34d7d025efaac1b6398c18b94b603a52bfb6dd0f021059d3bd4c3cf785e715698cd09e5d1c97a7ed11bbd146b29aa363650620eef1efca08053fc033a WHIRLPOOL 5e69fe4042d709677635fdc6569a2b14a34ff93ef672b3138bffde3a492ca5b38d960ed3bec814444b5dc4b4491f108ed50d64c2c8d956164dfedd0a43b8f506
-DIST libbluray-0.7.0.tar.bz2 597266 SHA256 f79beb9fbb24117cbb1264c919e686ae9e6349c0ad08b48c4b6233b2887eb68d SHA512 2bf73398003e5a6b12ffdf44ec5716c18da4a176328b4eac52adb3337d09fcb4e5b553362cb67d70506fb0b2cd60e2e59ccc398104630554f41f0b095fc4703f WHIRLPOOL 28f9422704230cfe2fea3c84d0c7c3ae06495b07fdc22c33937d2cb4a0087be4af4364d219ab38e0ee94cf5c14826f7f2a1750da6d5c8f7e71178dbdfb1fc1e5
-DIST libbluray-0.8.0.tar.bz2 621606 SHA256 7b80208b2af54313fedbb49f54b7e13ff7f86f1843a81dddd5e17aa9575bfd08 SHA512 1928ed86a39f3846014f3c5083e78aaf87366fb4589a48a1a87ad053fc32edafe6e89d382c44cffc5f27610d4d3ccf17bf2ef79982e3e39a0ada6895defe5bfe WHIRLPOOL d72b50920e8f0b994cc543d3efbc6b7e4849a1dcda1774e1eda85e527a36a8382c3e273fb45309776c696bb7b215271cfb822f04c02a4133c5ee5687ea8805f5
DIST libbluray-0.8.1.tar.bz2 623402 SHA256 cdbec680c5bbc2251de6ccd109cf5f798ea51db6fcb938df39283be1799efb8f SHA512 6618e01a567f0dc5d21302fc771d4155589c81703028b76f6090a2d12ef1c7e9d08d9c79312a7c8b2ca0d6c63ce980195f0866509a4f8f05f64ed6650c7f78dc WHIRLPOOL 899ffe320997d245ed76987993d7d7e1697fcea61474ad7fb664c0c519d2c6578344986e22a9fe7d23d7c458525f6effff68718619334916fbe42cccb6c5c801
+DIST libbluray-0.9.0.tar.bz2 624614 SHA256 84b61da9202fa724a76ac885af69df16a5583eb11d43e940dc201833bbfd694d SHA512 12db8b9ace0629158c1ce0e5447fc154609e9f78c55ff7d830c7ee38ccafa9824bfcdbe622d7e13e8c6d74205ae648ccf2e7c7b756692acc27e48fe9e2cc95ec WHIRLPOOL 7b8191bf0adcd1c612662a9bf66d2f94ba43bda1bd5a23425aee85b486aced4c0edf0f720a17361640f7982e5794bd531bfc9efa45e883495be4acd9ae42b8cc
diff --git a/media-libs/libbluray/libbluray-0.5.0-r1.ebuild b/media-libs/libbluray/libbluray-0.5.0-r1.ebuild
deleted file mode 100644
index 357e82f..0000000
--- a/media-libs/libbluray/libbluray-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal
-
-DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="aacs java static-libs +truetype utils +xml"
-
-COMMON_DEPEND="
- xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jre-1.6 )
-"
-DEPEND="
- ${COMMON_DEPEND}
- java? (
- >=virtual/jdk-1.6
- dev-java/ant-core
- )
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README.txt )
-
-src_prepare() {
- if use java ; then
- export JDK_HOME="$(java-config -g JAVA_HOME)"
-
- # don't install a duplicate jar file
- sed -i '/^jar_DATA/d' src/Makefile.am || die
-
- eautoreconf
-
- java-pkg-opt-2_src_prepare
- fi
-}
-
-multilib_src_configure() {
- local myconf
- if multilib_is_native_abi && use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- append-cflags "$(java-pkg_get-jni-cflags)"
- myconf="--enable-bdjava"
- else
- myconf="--disable-bdjava"
- fi
-
- ECONF_SOURCE="${S}" econf \
- --disable-optimizations \
- $(multilib_native_use_enable utils examples) \
- $(use_with truetype freetype) \
- $(use_enable static-libs static) \
- $(use_with xml libxml2) \
- ${myconf}
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use utils; then
- cd src
- dobin index_dump mobj_dump mpls_dump
- cd .libs/
- dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
- if use java; then
- dobin bdj_test
- fi
- fi
-
- if multilib_is_native_abi && use java; then
- java-pkg_dojar "${BUILD_DIR}"/src/.libs/${PN}.jar
- doenvd "${FILESDIR}"/90${PN}
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/media-libs/libbluray/libbluray-0.5.0.ebuild b/media-libs/libbluray/libbluray-0.5.0.ebuild
deleted file mode 100644
index 5527be3..0000000
--- a/media-libs/libbluray/libbluray-0.5.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools java-pkg-opt-2 flag-o-matic eutils
-
-DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="aacs java static-libs +truetype utils +xml"
-
-COMMON_DEPEND="
- xml? ( dev-libs/libxml2 )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- aacs? ( media-libs/libaacs )
- java? (
- truetype? ( media-libs/freetype:2 )
- >=virtual/jre-1.6
- )
-"
-DEPEND="
- ${COMMON_DEPEND}
- java? (
- truetype? ( media-libs/freetype:2 )
- >=virtual/jdk-1.6
- dev-java/ant-core
- )
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README.txt )
-
-src_prepare() {
- if use java ; then
- export JDK_HOME="$(java-config -g JAVA_HOME)"
-
- # don't install a duplicate jar file
- sed -i '/^jar_DATA/d' src/Makefile.am || die
-
- eautoreconf
-
- java-pkg-opt-2_src_prepare
- fi
-}
-
-src_configure() {
- local myconf
- if use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- append-cflags "$(java-pkg_get-jni-cflags)"
- myconf="$(use_with truetype freetype)"
- fi
-
- econf \
- --disable-optimizations \
- $(use_enable utils examples) \
- $(use_enable java bdjava) \
- $(use_enable static-libs static) \
- $(use_with xml libxml2) \
- ${myconf}
-}
-
-src_install() {
- default
-
- if use utils; then
- cd src
- dobin index_dump mobj_dump mpls_dump
- cd .libs/
- dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
- if use java; then
- dobin bdj_test
- fi
- fi
-
- if use java; then
- java-pkg_dojar "${S}"/src/.libs/${PN}.jar
- doenvd "${FILESDIR}"/90${PN}
- fi
-
- prune_libtool_files
-}
diff --git a/media-libs/libbluray/libbluray-0.6.1.ebuild b/media-libs/libbluray/libbluray-0.6.1.ebuild
deleted file mode 100644
index 54985a2..0000000
--- a/media-libs/libbluray/libbluray-0.6.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal
-
-DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="aacs java static-libs +truetype utils +xml"
-
-COMMON_DEPEND="
- xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jre-1.6 )
-"
-DEPEND="
- ${COMMON_DEPEND}
- java? (
- >=virtual/jdk-1.6
- dev-java/ant-core
- )
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README.txt )
-
-src_prepare() {
- if use java ; then
- export JDK_HOME="$(java-config -g JAVA_HOME)"
-
- # don't install a duplicate jar file
- sed -i '/^jar_DATA/d' src/Makefile.am || die
-
- java-pkg-opt-2_src_prepare
- fi
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
- if multilib_is_native_abi && use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- append-cflags "$(java-pkg_get-jni-cflags)"
- myconf="--enable-bdjava"
- else
- myconf="--disable-bdjava"
- fi
-
- ECONF_SOURCE="${S}" econf \
- --disable-optimizations \
- $(multilib_native_use_enable utils examples) \
- $(use_with truetype freetype) \
- $(use_enable static-libs static) \
- $(use_with xml libxml2) \
- ${myconf}
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use utils; then
- cd src
- dobin index_dump mobj_dump mpls_dump
- cd .libs/
- dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
- if use java; then
- dobin bdj_test
- fi
- fi
-
- if multilib_is_native_abi && use java; then
- java-pkg_dojar "${BUILD_DIR}"/src/.libs/${PN}-j2se-${PV}.jar
- doenvd "${FILESDIR}"/90${PN}
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/media-libs/libbluray/libbluray-0.7.0.ebuild b/media-libs/libbluray/libbluray-0.7.0.ebuild
deleted file mode 100644
index 0d583a8..0000000
--- a/media-libs/libbluray/libbluray-0.7.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal
-
-DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
-
-COMMON_DEPEND="
- xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
- fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
- bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jre-1.6 )
-"
-DEPEND="
- ${COMMON_DEPEND}
- java? (
- >=virtual/jdk-1.6
- dev-java/ant-core
- )
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README.txt )
-
-src_prepare() {
- if use java ; then
- export JDK_HOME="$(java-config -g JAVA_HOME)"
-
- # don't install a duplicate jar file
- sed -i '/^jar_DATA/d' src/Makefile.am || die
-
- java-pkg-opt-2_src_prepare
- fi
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
- if multilib_is_native_abi && use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- append-cflags "$(java-pkg_get-jni-cflags)"
- myconf="--enable-bdjava"
- else
- myconf="--disable-bdjava"
- fi
-
- ECONF_SOURCE="${S}" econf \
- --disable-optimizations \
- $(multilib_native_use_enable utils examples) \
- $(use_with fontconfig) \
- $(use_with truetype freetype) \
- $(use_enable static-libs static) \
- $(use_with xml libxml2) \
- ${myconf}
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use utils; then
- cd src
- dobin index_dump mobj_dump mpls_dump
- cd .libs/
- dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
- if use java; then
- dobin bdj_test
- fi
- fi
-
- if multilib_is_native_abi && use java; then
- java-pkg_dojar "${BUILD_DIR}"/src/.libs/${PN}-j2se-${PV}.jar
- doenvd "${FILESDIR}"/90${PN}
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/media-libs/libbluray/libbluray-0.8.0.ebuild b/media-libs/libbluray/libbluray-0.9.0.ebuild
similarity index 100%
rename from media-libs/libbluray/libbluray-0.8.0.ebuild
rename to media-libs/libbluray/libbluray-0.9.0.ebuild
diff --git a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild b/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
index a462ec9..066cbb9 100644
--- a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
@@ -12,10 +12,10 @@
if [[ ${PV} = 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="git://git.videolan.org/libdvdnav.git"
- KEYWORDS="alpha hppa ia64 ppc ppc64 sparc"
+ KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
else
SRC_URI="http://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
- KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index dd91fe8..bd41654 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,6 +1,6 @@
DIST libjpeg-turbo-1.3.0.tar.gz 1361603 SHA256 2657008cfc08aadbaca065bd9f8964b8a2c0abd03e73da5b5f09c1216be31234 SHA512 4d34c3c5f2cdd70b2a3d1b55eeb4ce59cb3d4b8d22bb6d43c2ec844b7eb5685b55a9b1b46ad2bc5f2756b5f5535ccad032791c3b932af9c1efc502aa5e701053 WHIRLPOOL 13c1366b9bef87cab42c88f75d1ff7eddb4ea745e0056154f1f3fb27deedee077d662395bada3bd5c18d6f8bf744d0b1f3d465967d33b453ea2acc327a6f166f
DIST libjpeg-turbo-1.3.1.tar.gz 1390282 SHA256 c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9 SHA512 6b02dc617e291b357230ef3e8cfcd27f9acc8c3e9f1c869ab0a08e9e13711b87156c6cd1aaa1a6406a873fc6732f44c8a7d94a5d6688d24b14ac63a96ee52081 WHIRLPOOL f978b24d0a4e63a421822c2114c0cfc87cbc1dedd648ddc2e97e24ee19dc5584433b1da7d41a64f0ae37b50799a273165aaec6f1377ed35a7971dbe8a0b6a8d5
-DIST libjpeg-turbo-1.4.0.tar.gz 1524645 SHA256 d93ad8546b510244f863b39b4c0da0fa4c0d53a77b61a8a3880f258c232bbbee SHA512 60d038413acee43a23bb81d18309eed16e771d48b839b7aea52f582bbf9f99f04b3cc991e13cafc3d5df1441b726ea0792e7ad593ce4e52c96792c3b1df42c09 WHIRLPOOL 5f6c15bee87d9f9b82013801a8c6cd42c725ba4d65c0d60f990d4d0aec3c0b9334a5be832b34ae71d8606c801fc621de965c17b8b3067f7eef061f0155cbaa19
DIST libjpeg-turbo-1.4.1.tar.gz 1529614 SHA256 4bf5bad4ce85625bffbbd9912211e06790e00fb982b77724af7211034efafb08 SHA512 81197fdac40c55cb9820b832c55dab9dd5aa19427a22feb6027510a4dc9c45aeea6a37203447600481f5162a0a2ca972324997cc89fc7e51b51808260df0598d WHIRLPOOL b1c2a225720216b602dfda04a3ecf52d2251ea775c44d2cd872e9c33f43f4275ca2fbfaccba8d493c12ece4023f0c4e0c3c029837bdaff577bc401ee46a14433
+DIST libjpeg-turbo-1.4.2.tar.gz 1569306 SHA256 521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e SHA512 9bd27c917c29125c425469eb0fdf99b802f25095f187fb416bd7c05e4af95a32404bbb0d06b77343d35d3461029500decf3481337b2eade9e57b58dea69719ee WHIRLPOOL 4a6dfefee5d50b19474a5b0a8b2e3c06a403538985b9cf369a51d3cb2a9e2a0bbb6ac314e1e85d4432a44a8a381472c4e8be1286de909f3f47407692a583a01b
DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
DIST libjpeg8_8d-2.debian.tar.gz 14764 SHA256 9b36468b2aba24d63d3c87625de89f31834ac429e6dec7d68d86a52b5110219c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 WHIRLPOOL bda41c37f3f57733fcd86969126f6dbede2fbf633b0168265a7fe353fb7f3cd995a94e7987bac472957ec6fb0b2dc34d5dd646f0de79e06bc94e59d7cf440939
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.0.ebuild
deleted file mode 100644
index 537318b8..0000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-COMMON_DEPEND="!media-libs/jpeg:0
- !media-libs/jpeg:62
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.5 )"
-DEPEND="${COMMON_DEPEND}
- amd64? ( ${ASM_DEPEND} )
- x86? ( ${ASM_DEPEND} )
- amd64-fbsd? ( ${ASM_DEPEND} )
- x86-fbsd? ( ${ASM_DEPEND} )
- amd64-linux? ( ${ASM_DEPEND} )
- x86-linux? ( ${ASM_DEPEND} )
- x64-macos? ( ${ASM_DEPEND} )
- java? ( >=virtual/jdk-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
-
- # generate a new ./configure compatible with non-bash shells, #533902
- eautoreconf
-
- java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=()
- if multilib_is_native_abi; then
- myconf+=( $(use_with java) )
- if use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
- fi
- else
- myconf+=( --without-java )
- fi
- [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
-
- ECONF_SOURCE=${S} \
- econf \
- $(use_enable static-libs static) \
- --with-mem-srcdst \
- "${myconf[@]}"
-}
-
-multilib_src_compile() {
- local _java_makeopts
- use java && _java_makeopts="-j1"
- emake ${_java_makeopts}
-
- if multilib_is_native_abi; then
- pushd ../debian/extra >/dev/null
- emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
- popd >/dev/null
- fi
-}
-
-multilib_src_test() {
- emake test
-}
-
-multilib_src_install() {
- emake \
- DESTDIR="${D}" \
- docdir="${EPREFIX}"/usr/share/doc/${PF} \
- exampledir="${EPREFIX}"/usr/share/doc/${PF} \
- install
-
- if multilib_is_native_abi; then
- pushd "${WORKDIR}"/debian/extra >/dev/null
- emake \
- DESTDIR="${D}" prefix="${EPREFIX}"/usr \
- INSTALL="install -m755" INSTALLDIR="install -d -m755" \
- install
- popd >/dev/null
-
- if use java; then
- rm -rf "${ED}"/usr/classes
- java-pkg_dojar java/turbojpeg.jar
- fi
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files
-
- insinto /usr/share/doc/${PF}/html
- doins -r "${S}"/doc/html/*
- newdoc "${WORKDIR}"/debian/changelog changelog.debian
- if use java; then
- insinto /usr/share/doc/${PF}/html/java
- doins -r "${S}"/java/doc/*
- newdoc "${S}"/java/README README.java
- fi
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild
new file mode 100644
index 0000000..d473c17
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit libtool eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+COMMON_DEPEND="!media-libs/jpeg:0
+ !media-libs/jpeg:62
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.5 )"
+DEPEND="${COMMON_DEPEND}
+ amd64? ( ${ASM_DEPEND} )
+ x86? ( ${ASM_DEPEND} )
+ amd64-fbsd? ( ${ASM_DEPEND} )
+ x86-fbsd? ( ${ASM_DEPEND} )
+ amd64-linux? ( ${ASM_DEPEND} )
+ x86-linux? ( ${ASM_DEPEND} )
+ x64-macos? ( ${ASM_DEPEND} )
+ java? ( >=virtual/jdk-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
+
+ elibtoolize
+
+ java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=()
+ if multilib_is_native_abi; then
+ myconf+=( $(use_with java) )
+ if use java; then
+ export JAVACFLAGS="$(java-pkg_javac-args)"
+ export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+ fi
+ else
+ myconf+=( --without-java )
+ fi
+ [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
+
+ # Force /bin/bash until upstream generates a new version. #533902
+ CONFIG_SHELL=/bin/bash \
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable static-libs static) \
+ --with-mem-srcdst \
+ "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ local _java_makeopts
+ use java && _java_makeopts="-j1"
+ emake ${_java_makeopts}
+
+ if multilib_is_native_abi; then
+ pushd ../debian/extra >/dev/null
+ emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+ popd >/dev/null
+ fi
+}
+
+multilib_src_test() {
+ emake test
+}
+
+multilib_src_install() {
+ emake \
+ DESTDIR="${D}" \
+ docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ exampledir="${EPREFIX}"/usr/share/doc/${PF} \
+ install
+
+ if multilib_is_native_abi; then
+ pushd "${WORKDIR}"/debian/extra >/dev/null
+ emake \
+ DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+ INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+ install
+ popd >/dev/null
+
+ if use java; then
+ rm -rf "${ED}"/usr/classes
+ java-pkg_dojar java/turbojpeg.jar
+ fi
+ fi
+}
+
+multilib_src_install_all() {
+ prune_libtool_files
+
+ insinto /usr/share/doc/${PF}/html
+ doins -r "${S}"/doc/html/*
+ newdoc "${WORKDIR}"/debian/changelog changelog.debian
+ if use java; then
+ insinto /usr/share/doc/${PF}/html/java
+ doins -r "${S}"/java/doc/*
+ newdoc "${S}"/java/README README.java
+ fi
+}
diff --git a/media-libs/liblrdf/liblrdf-0.5.0-r1.ebuild b/media-libs/liblrdf/liblrdf-0.5.0-r1.ebuild
new file mode 100644
index 0000000..1758259
--- /dev/null
+++ b/media-libs/liblrdf/liblrdf-0.5.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools
+
+DESCRIPTION="A library for the manipulation of RDF file in LADSPA plugins"
+HOMEPAGE="https://github.com/swh/LRDF"
+SRC_URI="https://github.com/swh/LRDF/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="libressl static-libs"
+
+RDEPEND="
+ !libressl? ( >=dev-libs/openssl-1:0 )
+ libressl? ( dev-libs/libressl )
+ media-libs/raptor:2
+ >=media-libs/ladspa-sdk-1.12"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_unpack() {
+ unpack ${A}
+ mv *-LRDF-* "${S}"
+}
+
+src_prepare() {
+ sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c || die #392221
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_test() {
+ has_version media-plugins/swh-plugins && default #392221
+}
+
+src_install() {
+ default
+ rm -f "${ED}"usr/lib*/liblrdf.la
+}
diff --git a/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch b/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch
index a6ccdb8..b70ede8 100644
--- a/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch
+++ b/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch
@@ -5,7 +5,7 @@
* Refresh the patch against libmikmod 3.2.0 release since it didn't make it upstream
$ wget http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
$ tar -vzxf SDL_mixer-1.2.12.tar.gz (or "tar xf" with GNU tar)
- $ unzip libmikmod-3.1.12.zip
+ $ unzip libmikmod-3.1.12.zip
$ ls -l libmikmod-3.1.12-loopingvolume-fix.diff
--- playercode/mplayer.c
diff --git a/media-libs/libpng/libpng-1.6.18.ebuild b/media-libs/libpng/libpng-1.6.18.ebuild
index a51a016..1b0c3ce 100644
--- a/media-libs/libpng/libpng-1.6.18.ebuild
+++ b/media-libs/libpng/libpng-1.6.18.ebuild
@@ -13,7 +13,7 @@
LICENSE="libpng"
SLOT="0/16"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng neon static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libraw/libraw-0.16.2.ebuild b/media-libs/libraw/libraw-0.16.2.ebuild
index b233eda..c5337c5 100644
--- a/media-libs/libraw/libraw-0.16.2.ebuild
+++ b/media-libs/libraw/libraw-0.16.2.ebuild
@@ -23,7 +23,7 @@
# http://www.libraw.org/data/LICENSE.LibRaw.pdf
LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3"
SLOT="0/10" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libsoundio/Manifest b/media-libs/libsoundio/Manifest
index a0b6df8..2b8ea8b 100644
--- a/media-libs/libsoundio/Manifest
+++ b/media-libs/libsoundio/Manifest
@@ -1 +1,2 @@
DIST libsoundio-1.0.0.tar.gz 112139 SHA256 f05d87916266b6b32020c3e13b78ce9f3a758c43c8f8c8bbaf37578d99e1d3e2 SHA512 d0a0eda701d99ef658ee2858dbf4be2ec872d74bc1c9d05ed5484adcc17e774530c150fcd86cd1213a8dceb6373dfd3319a2c97c506ada0cdfe0f02551c0ddd0 WHIRLPOOL 1720e8eb64dc407a17dfbc9ccc8406184e0fa8c5bcc799553e5af181c9faebc0d0ba75fab0c8d9f6332fec6db1711ae9d6afe4be0e970fd5e9b526511b0a8965
+DIST libsoundio-1.0.2.tar.gz 114311 SHA256 821fc5b94880f09f57178ea7b474216e7dd0d698c8cac98e366d28d3b4f3ac4d SHA512 9110c6dd2f2ee8ed9f4a454b92aea5292b1b222aebe6851d247e964a6aa80f1d95d490e2d3da5d06cbd6853407c4002f02d163fac5631f51e110d57a9b58faa3 WHIRLPOOL 1e82ddf04c42e64e1bc19519ab07265ebd0f56ac2f32bb83ab4710e61cdfaa392ee5103c2a9a23c3a8f71be93cb713b2a4356b07ba03e1e5957f0b7e3b517dff
diff --git a/media-libs/libsoundio/libsoundio-1.0.2.ebuild b/media-libs/libsoundio/libsoundio-1.0.2.ebuild
new file mode 100644
index 0000000..87bbaaf
--- /dev/null
+++ b/media-libs/libsoundio/libsoundio-1.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib
+
+DESCRIPTION="C99 library providing cross-platform audio input and output"
+HOMEPAGE="http://libsound.io/"
+SRC_URI="http://libsound.io/release/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64"
+IUSE="alsa coreaudio examples pulseaudio static-libs"
+
+DEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+# ENABLE_JACK does not support the current version of jack1
+# See https://github.com/andrewrk/libsoundio/issues/11
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DENABLE_ALSA=$(usex alsa)
+ -DENABLE_COREAUDIO=$(usex coreaudio)
+ -DENABLE_JACK=no
+ -DENABLE_PULSEAUDIO=$(usex pulseaudio)
+ -DENABLE_WASAPI=no
+ -DBUILD_STATIC_LIBS=$(usex static-libs)
+ -DBUILD_EXAMPLE_PROGRAMS=$(multilib_native_usex examples)
+ -DBUILD_TESTS=no
+ )
+ cmake-utils_src_configure
+}
diff --git a/media-libs/libvisio/files/libvisio-0.1.3-boost-1.59.patch b/media-libs/libvisio/files/libvisio-0.1.3-boost-1.59.patch
new file mode 100644
index 0000000..a0102e8
--- /dev/null
+++ b/media-libs/libvisio/files/libvisio-0.1.3-boost-1.59.patch
@@ -0,0 +1,22 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sun, 30 Aug 2015 11:59:23 +0000 (+0200)
+Subject: fix build with boost 1.59
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libvisio.git;a=commitdiff_plain;h=2968c3dff8572b4734cb42c7bd5b00222f7fb288;hp=4b03893826bcc5f859b0ac3bea6a98269499d99f
+
+fix build with boost 1.59
+
+Change-Id: I21eebdfa99d379e57949bfe4bf7eb83aec16f916
+---
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index dc0f8fd..6946b0a 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -22,6 +22,7 @@ generated_files = \
+ $(top_builddir)/src/lib/tokens.h \
+ $(top_builddir)/src/lib/tokenhash.h
+
++libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
+ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LIBADD = $(LIBVISIO_LIBS) @LIBVISIO_WIN32_RESOURCE@
+ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_DEPENDENCIES = @LIBVISIO_WIN32_RESOURCE@
+ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
diff --git a/media-libs/libvisio/files/libvisio-0.1.3-fix-tests.patch b/media-libs/libvisio/files/libvisio-0.1.3-fix-tests.patch
new file mode 100644
index 0000000..19104a1
--- /dev/null
+++ b/media-libs/libvisio/files/libvisio-0.1.3-fix-tests.patch
@@ -0,0 +1,49 @@
+From 75a02c586f6ec49d4316f79004834250ef42b0e0 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 25 Jul 2015 15:11:19 +0200
+Subject: [PATCH] fix test
+
+The previous version only worked with libxml2 < 2.9.2, because of a bug
+in handling nested elements of the same name.
+
+Change-Id: I1368cedf5845895154806d4ecf427bfbed19165f
+---
+ configure.ac | 4 ++++
+ src/test/importtest.cpp | 6 +++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1611dcb..a075e73 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -128,6 +128,10 @@ AS_IF([test "x$enable_tools" = "xyes"], [
+ PKG_CHECK_MODULES([REVENGE_STREAM],[
+ librevenge-stream-0.0
+ ])
++ PKG_CHECK_EXISTS([libxml-2.0 >= 2.9.2],
++ [],
++ [AC_MSG_ERROR([libxml2 >= 2.9.2 is needed to run tests])]
++ )
+ ])
+ AC_SUBST([REVENGE_GENERATORS_CFLAGS])
+ AC_SUBST([REVENGE_GENERATORS_LIBS])
+diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
+index 8554309..0296380 100644
+--- a/src/test/importtest.cpp
++++ b/src/test/importtest.cpp
+@@ -272,9 +272,9 @@ void ImportTest::testVsdxImportBgColorFromTheme()
+ void ImportTest::testVsdxCharBgColor()
+ {
+ m_doc = parse("bgcolor.vsdx", m_buffer);
+- assertXPathNoAttribute(m_doc, "/document/page/layer/textObject/paragraph/span", "background-color");
+- assertXPath(m_doc, "/document/page/layer/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61");
+- assertXPath(m_doc, "/document/page/layer/layer[2]/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61");
++ assertXPathNoAttribute(m_doc, "/document/page/layer[1]/textObject/paragraph/span", "background-color");
++ assertXPath(m_doc, "/document/page/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61");
++ assertXPath(m_doc, "/document/page/layer[3]/textObject/paragraph/span", "background-color", "#9dbb61");
+ }
+
+ CPPUNIT_TEST_SUITE_REGISTRATION(ImportTest);
+--
+1.7.9.5
+
diff --git a/media-libs/libvisio/libvisio-0.1.3-r1.ebuild b/media-libs/libvisio/libvisio-0.1.3-r1.ebuild
new file mode 100644
index 0000000..0770f0f
--- /dev/null
+++ b/media-libs/libvisio/libvisio-0.1.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
+inherit base eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing the visio documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+IUSE="doc static-libs test tools"
+
+RDEPEND="
+ dev-libs/icu:=
+ dev-libs/librevenge
+ dev-libs/libxml2
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.46
+ dev-util/gperf
+ sys-devel/libtool
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-fix-tests.patch" \
+ "${FILESDIR}/${P}-boost-1.59.patch"
+ [[ -d m4 ]] || mkdir "m4"
+ base_src_prepare
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable static-libs static) \
+ --disable-werror \
+ $(use_with doc docs) \
+ $(use_enable test tests) \
+ $(use_enable tools)
+}
+
+src_install() {
+ default
+ prune_libtool_files --all
+}
diff --git a/media-libs/libwebp/libwebp-0.3.1.ebuild b/media-libs/libwebp/libwebp-0.3.1.ebuild
index 9d5e95d..360e507 100644
--- a/media-libs/libwebp/libwebp-0.3.1.ebuild
+++ b/media-libs/libwebp/libwebp-0.3.1.ebuild
@@ -30,7 +30,7 @@
src_prepare() {
# This is conflicting with `usex` later on, upstream is using ac_cv_ wrong
# If modifying configure.ac, eautoreconf is required because of "Maintainer mode"
- sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die
+ sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die
}
multilib_src_configure() {
diff --git a/media-libs/libwebp/libwebp-0.4.0.ebuild b/media-libs/libwebp/libwebp-0.4.0.ebuild
index 1003915..48c4994 100644
--- a/media-libs/libwebp/libwebp-0.4.0.ebuild
+++ b/media-libs/libwebp/libwebp-0.4.0.ebuild
@@ -30,7 +30,7 @@
src_prepare() {
# This is conflicting with `usex` later on, upstream is using ac_cv_ wrong
# If modifying configure.ac, eautoreconf is required because of "Maintainer mode"
- sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die
+ sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die
# Fix libtool relinking, bug 499270.
elibtoolize
diff --git a/media-libs/libwebp/libwebp-0.4.2.ebuild b/media-libs/libwebp/libwebp-0.4.2.ebuild
index 6c9ebc2..6740c47 100644
--- a/media-libs/libwebp/libwebp-0.4.2.ebuild
+++ b/media-libs/libwebp/libwebp-0.4.2.ebuild
@@ -30,7 +30,7 @@
src_prepare() {
# This is conflicting with `usex` later on, upstream is using ac_cv_ wrong
# If modifying configure.ac, eautoreconf is required because of "Maintainer mode"
- sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die
+ sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die
# Fix libtool relinking, bug 499270.
elibtoolize
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 1d16822..0bc5c95 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,8 +3,6 @@
DIST MesaLib-10.4.6.tar.bz2 7520024 SHA256 d8baedd20e79ccd98a5a7b05e23d59a30892e68de1fcc057ca6873dafca02735 SHA512 1a379de8471f9154aa1348c15d24a56788e42b666094d63aa5dc8bffd1ed87c1ab50fb95adac010a92d832be4ec1be60b712179ad1ec99869ee653ccb576f50e WHIRLPOOL 45ff4f46a9c165c2cd3f49696f9d972216fdbc27051287d4eea4210f25631fb1faca517a714cc50229c463be1628dfbf71ba689d02ed3b3d52bfc71683fe667e
DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
DIST mesa-10.5.8.tar.xz 6993084 SHA256 2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663da2b54 SHA512 d7fc441b4cdad8a2905f03091af26ca7b01573bf4d0d928e950270981e4c6e7d20dba6aa97a60500b9a335a3c5cabc7f388a5338d43d391eed3f09dea60b77b2 WHIRLPOOL 68cc3d8490da9759b9d790053c70429be4c529c63b114f65f411112f76cd4daccc3490120a85a84d01cdcb989c0a0e58016b4d80f2238f2320b1caff797f3390
-DIST mesa-10.6.6.tar.xz 7040744 SHA256 570f2154b7340ff5db61ff103bc6e85165b8958798b78a50fa2df488e98e5778 SHA512 a251dc258ccf2fbeccbff3447a23c0f417722244322c8887fe4a50b0013d3da3705ffbfe412b61717d2c3370cb6a88bec51b91e1b77a5b987d6fbf0fdbfe4a5e WHIRLPOOL 6f441a5b19b496d14b659b1ba3b70d2ead685ab1eb7d77b77c24d69127bd69ce6453feed1e042840bdb6cf47f68caa61c73c07ec2259a697acc3393e42111be6
-DIST mesa-10.6.8.tar.xz 7042260 SHA256 e36ee5ceeadb3966fb5ce5b4cf18322dbb76a4f075558ae49c3bba94f57d58fd SHA512 ebb2daff1afcc5f6808c5c9948814014c0570b18fb91481c9d09b2c28776ce6e4fd8bba650e559ac5d87d30fe06b38032c78828c13b95d5f9a0338d44b75f61e WHIRLPOOL e94395c0954875c9b1eaa6692385593a24242c3915012dcf8fcfa7b0d16cff33fc80421234dccdfafa4ecb9b82a176f177cf7ec622f6b80eac6de4cfcb5c7552
-DIST mesa-11.0.0.tar.xz 7257112 SHA256 e095a3eb2eca9dfde7efca8946527c8ae20a0cc938a8c78debc7f158ad44af32 SHA512 9938010f3d5e72bb8dea371e3502622e2ff6eae14e0265011df8fc81ec915d632abda9be7e772828adb8f0c7c12c830d89dce42e196ca18489fb1386a766220f WHIRLPOOL 454466396fac029450b619c842fa1e34906e5c529a67a575e9096f9e9b1584ad5b00f9ada2656e0469d5cf6d94e966709d4e0253484eb03d32f93e3e7d521f78
-DIST mesa-11.0.2.tar.xz 7263112 SHA256 fce11fb27eb87adf1e620a76455d635c6136dfa49ae58c53b34ef8d0c7b7eae4 SHA512 5b388c7464a97259b43f0c95114ddb6ea8d748a53a495202a01aa757baf5784c66c57e1f462a909bb9b3bf1239aa4fcbefbfc9fad2376a8288493304a2988ec4 WHIRLPOOL b4dd696c6135dd5f9711727ab57d042941a8b949010192544138f184086d90f1e9da1408ea937c95e831788c0797317d938e40948ae25226928ea14f77503859
+DIST mesa-10.6.9.tar.xz 7041588 SHA256 b04c4de6280b863babc2929573da17218d92e9e4ba6272d548d135415723e8c3 SHA512 32abcf167312dea06482e46da6f15b1c6902696a7dff759561f099eb12a6748673a5d6bb084c12ef57e6f13d3ec1b456541611a710519da87b11fd622f453344 WHIRLPOOL d3bf4627bdf7a576343bd2701948d5872e5d05a43b2980ce4e4915e8d95bd85eadb563cb3588918c55307769132a0cc8592361b4c9fbdf4831c181604d79028b
+DIST mesa-11.0.3.tar.xz 7264824 SHA256 ab2992eece21adc23c398720ef8c6933cb69ea42e1b2611dc09d031e17e033d6 SHA512 7cec13749a600e589794c4b7c082bcbe47d708d3e4a670160a09b07a0c5afc301b984ac4e26519ed3acda6171f936f700eb62c0977cc392343822603ff6c7c15 WHIRLPOOL edcef9df038384cace1b650efbd0245dc6b7ecdd6e22d35a57590d919b1bceb73ff5b531b441b06da806ff1efe357872d1f16d3d0364fbd85000a2d7b406391f
DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
diff --git a/media-libs/mesa/mesa-10.6.6.ebuild b/media-libs/mesa/mesa-10.6.6.ebuild
deleted file mode 100644
index 4386f87..0000000
--- a/media-libs/mesa/mesa-10.6.6.ebuild
+++ /dev/null
@@ -1,463 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999* ]]; then
- SRC_URI=""
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
- wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_ilo? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium llvm )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vmware? ( gallium )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.60"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.3.0
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- llvm? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- )
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-
-DEPEND="${RDEPEND}
- llvm? (
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == "9999" ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- ${PYTHON_DEPS}
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- )
-)"
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # fix for hardened pax_kernel, bug 240956
- [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm gallium-llvm)
- $(use_enable openmax omx)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_ilo ilo
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if use pax_kernel; then
- myconf+="
- $(use_enable x86 glx-rts)
- "
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable osmesa) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-10.6.8.ebuild b/media-libs/mesa/mesa-10.6.8.ebuild
deleted file mode 100644
index 4386f87..0000000
--- a/media-libs/mesa/mesa-10.6.8.ebuild
+++ /dev/null
@@ -1,463 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999* ]]; then
- SRC_URI=""
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
- wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_ilo? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium llvm )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vmware? ( gallium )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.60"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.3.0
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- llvm? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- )
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-
-DEPEND="${RDEPEND}
- llvm? (
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == "9999" ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- ${PYTHON_DEPS}
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- )
-)"
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # fix for hardened pax_kernel, bug 240956
- [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm gallium-llvm)
- $(use_enable openmax omx)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_ilo ilo
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if use pax_kernel; then
- myconf+="
- $(use_enable x86 glx-rts)
- "
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable osmesa) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-10.6.9.ebuild b/media-libs/mesa/mesa-10.6.9.ebuild
new file mode 100644
index 0000000..0baae14
--- /dev/null
+++ b/media-libs/mesa/mesa-10.6.9.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+ GIT_ECLASS="git-r3"
+ EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+FOLDER="${PV/_rc*/}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+if [[ $PV == 9999* ]]; then
+ SRC_URI=""
+else
+ SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+RESTRICT="!bindist? ( bindist )"
+
+INTEL_CARDS="i915 i965 ilo intel"
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+ +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
+ wayland xvmc xa kernel_FreeBSD"
+
+REQUIRED_USE="
+ d3d9? ( dri3 gallium )
+ llvm? ( gallium )
+ opencl? ( gallium llvm )
+ openmax? ( gallium )
+ gles1? ( egl )
+ gles2? ( egl )
+ vaapi? ( gallium )
+ vdpau? ( gallium )
+ wayland? ( egl gbm )
+ xa? ( gallium )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_ilo? ( gallium )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_radeon? ( || ( classic gallium ) )
+ video_cards_r100? ( classic )
+ video_cards_r200? ( classic )
+ video_cards_r300? ( gallium llvm )
+ video_cards_r600? ( gallium )
+ video_cards_radeonsi? ( gallium llvm )
+ video_cards_vmware? ( gallium )
+ ${PYTHON_REQUIRED_USE}
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.60"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+ !<x11-base/xorg-server-1.7
+ !<=x11-proto/xf86driproto-2.0.3
+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+ classic? ( app-eselect/eselect-mesa )
+ gallium? ( app-eselect/eselect-mesa )
+ >=app-eselect/eselect-opengl-1.3.0
+ udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
+ >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+ gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
+ dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
+ >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ llvm? (
+ video_cards_radeonsi? ( || (
+ >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+ >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+ ) )
+ !video_cards_r600? (
+ video_cards_radeon? ( || (
+ >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+ >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+ ) )
+ )
+ >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
+ )
+ opencl? (
+ app-eselect/eselect-opencl
+ dev-libs/libclc
+ || (
+ >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+ >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+ )
+ )
+ openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+ vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
+"
+for card in ${INTEL_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ "
+done
+
+for card in ${RADEON_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+ "
+done
+
+DEPEND="${RDEPEND}
+ llvm? (
+ video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+ )
+ opencl? (
+ >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
+ >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/gettext
+ virtual/pkgconfig
+ >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+ dri3? (
+ >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+ >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+ )
+ >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+"
+[[ ${PV} == "9999" ]] && DEPEND+="
+ sys-devel/bison
+ sys-devel/flex
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+ !pic? (
+ usr/lib*/libglapi.so.0.0.0
+ usr/lib*/libGLESv1_CM.so.1.1.0
+ usr/lib*/libGLESv2.so.2.0.0
+ usr/lib*/libGL.so.1.2.0
+ usr/lib*/libOSMesa.so.8.0.0
+ )
+)"
+
+pkg_setup() {
+ # warning message for bug 459306
+ if use llvm && has_version sys-devel/llvm[!debug=]; then
+ ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+ ewarn "detected! This can cause problems. For details, see bug 459306."
+ fi
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf
+
+ if use classic; then
+ # Configurable DRI drivers
+ driver_enable swrast
+
+ # Intel code
+ driver_enable video_cards_i915 i915
+ driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ driver_enable video_cards_r100 radeon
+ driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ driver_enable video_cards_radeon radeon r200
+ fi
+ fi
+
+ if use egl; then
+ myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
+ fi
+
+ if use gallium; then
+ myconf+="
+ $(use_enable d3d9 nine)
+ $(use_enable llvm gallium-llvm)
+ $(use_enable openmax omx)
+ $(use_enable vaapi va)
+ $(use_enable vdpau)
+ $(use_enable xa)
+ $(use_enable xvmc)
+ "
+ use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+ gallium_enable swrast
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+ gallium_enable video_cards_i915 i915
+ gallium_enable video_cards_ilo ilo
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+
+ gallium_enable video_cards_r300 r300
+ gallium_enable video_cards_r600 r600
+ gallium_enable video_cards_radeonsi radeonsi
+ if ! use video_cards_r300 && \
+ ! use video_cards_r600; then
+ gallium_enable video_cards_radeon r300 r600
+ fi
+
+ gallium_enable video_cards_freedreno freedreno
+ # opencl stuff
+ if use opencl; then
+ myconf+="
+ $(use_enable opencl)
+ --with-clang-libdir="${EPREFIX}/usr/lib"
+ "
+ fi
+ fi
+
+ # x86 hardened pax_kernel needs glx-read-only-text, bug 240956
+ if [[ ${ABI} == x86 ]]; then
+ myconf+="$(use_enable pax_kernel glx-read-only-text)"
+ fi
+
+ # on abi_x86_32 hardened we need to have asm disable
+ if [[ ${ABI} == x86* ]] && use pic; then
+ myconf+=" --disable-asm"
+ fi
+
+ # build fails with BSD indent, bug #428112
+ use userland_GNU || export INDENT=cat
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ --enable-dri \
+ --enable-glx \
+ --enable-shared-glapi \
+ $(use_enable !bindist texture-float) \
+ $(use_enable d3d9 nine) \
+ $(use_enable debug) \
+ $(use_enable dri3) \
+ $(use_enable egl) \
+ $(use_enable gbm) \
+ $(use_enable gles1) \
+ $(use_enable gles2) \
+ $(use_enable nptl glx-tls) \
+ $(use_enable osmesa) \
+ $(use_enable !udev sysfs) \
+ --enable-llvm-shared-libs \
+ --with-dri-drivers=${DRI_DRIVERS} \
+ --with-gallium-drivers=${GALLIUM_DRIVERS} \
+ PYTHON2="${PYTHON}" \
+ ${myconf}
+}
+
+multilib_src_install() {
+ emake install DESTDIR="${D}"
+
+ if use classic || use gallium; then
+ ebegin "Moving DRI/Gallium drivers for dynamic switching"
+ local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+ keepdir /usr/$(get_libdir)/dri
+ dodir /usr/$(get_libdir)/mesa
+ for x in ${gallium_drivers[@]}; do
+ if [ -f "$(get_libdir)/gallium/${x}" ]; then
+ mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+ || die "Failed to move ${x}"
+ fi
+ done
+ if use classic; then
+ emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+ fi
+ for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+ if [ -f ${x} -o -L ${x} ]; then
+ mv -f "${x}" "${x/dri/mesa}" \
+ || die "Failed to move ${x}"
+ fi
+ done
+ pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+ ln -s ../mesa/*.so . || die "Creating symlink failed"
+ # remove symlinks to drivers known to eselect
+ for x in ${gallium_drivers[@]}; do
+ if [ -f ${x} -o -L ${x} ]; then
+ rm "${x}" || die "Failed to remove ${x}"
+ fi
+ done
+ popd
+ eend $?
+ fi
+ if use opencl; then
+ ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+ local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+ dodir ${cl_dir}/{lib,include}
+ if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+ mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+ "${ED}"${cl_dir}
+ fi
+ if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+ mv -f "${ED}"/usr/include/CL \
+ "${ED}"${cl_dir}/include
+ fi
+ eend $?
+ fi
+
+ if use openmax; then
+ echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+ doenvd "${T}"/99mesaxdgomx
+ keepdir /usr/share/mesa/xdg
+ fi
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --all
+ einstalldocs
+
+ if use !bindist; then
+ dodoc docs/patents.txt
+ fi
+
+ # Install config file for eselect mesa
+ insinto /usr/share/mesa
+ newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+ if use llvm; then
+ local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+ pushd src/gallium/drivers/llvmpipe >/dev/null || die
+ emake ${llvm_tests}
+ pax-mark m ${llvm_tests}
+ popd >/dev/null || die
+ fi
+ emake check
+}
+
+pkg_postinst() {
+ # Switch to the xorg implementation.
+ echo
+ eselect opengl set --use-old ${OPENGL_DIR}
+
+ # Select classic/gallium drivers
+ if use classic || use gallium; then
+ eselect mesa set --auto
+ fi
+
+ # Switch to mesa opencl
+ if use opencl; then
+ eselect opencl set --use-old ${PN}
+ fi
+
+ # run omxregister-bellagio to make the OpenMAX drivers known system-wide
+ if use openmax; then
+ ebegin "Registering OpenMAX drivers"
+ BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+ OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+ omxregister-bellagio
+ eend $?
+ fi
+
+ # warn about patent encumbered texture-float
+ if use !bindist; then
+ elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+ elog "enabled. Please see patents.txt for an explanation."
+ fi
+
+ if ! has_version media-libs/libtxc_dxtn; then
+ elog "Note that in order to have full S3TC support, it is necessary to install"
+ elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
+ elog "textures in some apps, and some others even require this to run."
+ fi
+}
+
+pkg_prerm() {
+ if use openmax; then
+ rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+ fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+ case $# in
+ # for enabling unconditionally
+ 1)
+ DRI_DRIVERS+=",$1"
+ ;;
+ *)
+ if use $1; then
+ shift
+ for i in $@; do
+ DRI_DRIVERS+=",${i}"
+ done
+ fi
+ ;;
+ esac
+}
+
+gallium_enable() {
+ case $# in
+ # for enabling unconditionally
+ 1)
+ GALLIUM_DRIVERS+=",$1"
+ ;;
+ *)
+ if use $1; then
+ shift
+ for i in $@; do
+ GALLIUM_DRIVERS+=",${i}"
+ done
+ fi
+ ;;
+ esac
+}
diff --git a/media-libs/mesa/mesa-11.0.0.ebuild b/media-libs/mesa/mesa-11.0.0.ebuild
deleted file mode 100644
index 309e882..0000000
--- a/media-libs/mesa/mesa-11.0.0.ebuild
+++ /dev/null
@@ -1,466 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999* ]]; then
- SRC_URI=""
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
- wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_ilo? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium llvm )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vmware? ( gallium )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.3.0
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- llvm? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- )
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
- llvm? (
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == "9999" ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- ${PYTHON_DEPS}
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- )
-)"
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # fix for hardened pax_kernel, bug 240956
- [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm gallium-llvm)
- $(use_enable openmax omx)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_ilo ilo
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if use pax_kernel; then
- myconf+="
- $(use_enable x86 glx-rts)
- "
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable osmesa) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-11.0.2.ebuild b/media-libs/mesa/mesa-11.0.3.ebuild
similarity index 100%
rename from media-libs/mesa/mesa-11.0.2.ebuild
rename to media-libs/mesa/mesa-11.0.3.ebuild
diff --git a/media-libs/mlt/mlt-0.9.8.ebuild b/media-libs/mlt/mlt-0.9.8.ebuild
index a65afee..021bf91 100644
--- a/media-libs/mlt/mlt-0.9.8.ebuild
+++ b/media-libs/mlt/mlt-0.9.8.ebuild
@@ -13,7 +13,7 @@
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="compressed-lumas debug ffmpeg fftw frei0r gtk jack kde kdenlive libav libsamplerate melt opengl
cpu_flags_x86_mmx qt4 rtaudio sdl cpu_flags_x86_sse cpu_flags_x86_sse2 xine xml lua python ruby vdpau" # java perl php tcl
IUSE="${IUSE} kernel_linux"
diff --git a/media-libs/opusfile/opusfile-0.6-r1.ebuild b/media-libs/opusfile/opusfile-0.6-r1.ebuild
new file mode 100644
index 0000000..719011d
--- /dev/null
+++ b/media-libs/opusfile/opusfile-0.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A high-level decoding and seeking API for .opus files"
+HOMEPAGE="http://www.opus-codec.org/"
+SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc fixed-point +float +http libressl static-libs"
+
+RDEPEND="media-libs/libogg
+ media-libs/opus
+ http? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="^^ ( fixed-point float )"
+
+src_configure() {
+ econf \
+ --docdir=/usr/share/doc/${PF} \
+ $(use_enable doc) \
+ $(use_enable fixed-point)\
+ $(use_enable float) \
+ $(use_enable http) \
+ $(use_enable static-libs static)
+}
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 0dc2a5a..c8c49eb 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,8 +1,3 @@
-DIST x264-snapshot-20111220-2245.tar.bz2 532402 SHA256 c360b0320cc72a77c5f2ececbd100bbbdd0461227f7c4bc06212e86f5aa0fb8a SHA512 d6801f326f9848672f889cb9fe43da865b2351143b8f31f17341c62b89ac01f430cdc56c12d8bf9cf9f041e8381494915a84508eaf41898ef87631385ee6f3c2 WHIRLPOOL 6aed824854947435819d157c2c371ca358ce05d518adcfea9ec6c47a74bdd97d9c527e989b9eb0a6d2f00060c45186d3a3ade22af21d450c9e2c25be9aa46b34
-DIST x264-snapshot-20120327-2245.tar.bz2 551101 SHA256 065ffdbd7c9f9dcc7194bd6a4943b0d4b2e99b5dd68979fb3634644c725c2cbe SHA512 915e2933596f4809a7cba25a6eb7f8a555daaeeb3a5a95a314cb947940d562e12d164f52ab6b94d7abd52e66ee986d3414c54685390a619357eef22ba0cd6a6a WHIRLPOOL e61b779d9eba7cad48899bc7eb88e9b5e140013d016792ddd4d2c149f7447d8bbf528615b751c095813519218bc7e3072ded407c386043dff8270d2c43a7ecb9
-DIST x264-snapshot-20120707-2245.tar.bz2 554243 SHA256 52fdc8b558fa7dcb6419fef73fb07e771cdc2544f7652cde42968d640139eedb SHA512 5e263dfe4b4defd66a8a855467692473723ada9c34ab8da7042f2d10327f944914d0c8103f22edd4dc7a1c4664db5bfbf42052652c9f57b392db32f4ab77081b WHIRLPOOL 1a9061e5940e22071390b579abf859fec49f8da51f31e241b65513566eda66178c46b4b4c20318bb981230a16511e84b89e6174bc7f9ccbd48915a909cef3b5b
-DIST x264-snapshot-20130506-2245.tar.bz2 608013 SHA256 da7055a457d19b97ff35a2830e7caae665ea06d22ddc28393168983d1cd21f61 SHA512 6ba35f6b39fefbda6990dc0fd674efbe403b0616f2f02d71ae3e7bbc6ce2bab8878a963dd5f306f8a2b3b9a74c5c0b4dbf9dfb9dc0e602b807f726cf072905b5 WHIRLPOOL bfb4b7dd0e865cd9305ac177f5c544555004039209dda695fcc932aab647b87c96f0bae4fa040276bd3dbee64dcf982f3c2447efdbc01c1d42f040c9d5d0af85
-DIST x264-snapshot-20130731-2245.tar.bz2 625052 SHA256 caa39660f2ddc9dc53033af709452a21479c7b7c715c5f9d744d0d452c2d9e67 SHA512 2abcab4013dee9ac58779afd89fc558a8286cf33affda037e95a7e10cf00387cee1ad461ac59c5020fd9b72d303170f16d4e4b5593ec21528a33b0f530878d9d WHIRLPOOL 6f7fcc1c05c47a0d31578fbd0268b84ba458a968b087fb7d1050f67739bec140a1c3ded288cd0000180b5be921b469357ec9cdc363fc1eec82d82bd795557b56
-DIST x264-snapshot-20130912-2245.tar.bz2 628862 SHA256 87142cf15b7d7052f2e046a4b80adc3176fd6421889ab3bae83afc10d57ec648 SHA512 3e2223ca465b1ac214a421c512477524309694f321baabcd62b84bc341de34ecf196c8c91a931bbda0d7538dc138b924dc22ed7f242e135e4b53b387638b40c0 WHIRLPOOL b795a91511994761e9cf6e3a279708e4536ebc281b9ca1d18f0bceb93c89c062608d2e5c779a0f924d2dc005f90921223b42b22e409eaaca8a0041aae354213f
DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
DIST x264-snapshot-20150820-2245.tar.bz2 718209 SHA256 0ea86849d1a9b0a5b88fe6e0281359d7f5675c68fb83f6397b3e02896ccd77e3 SHA512 6b85f96f7cc85e1e938dad06c01b777aaf866796fb1763a02b4b7fa9c44f70bf15fc1bef123f7b24bb2c58b23f7276d4eb2b8f99b2e4fef3c716ed7f66d66e44 WHIRLPOOL daf5a63dbe2cb77a496a3eec1b1687ef6c4a008328064c46bd0e90139d328a6ff4e7dbd17b8dad57c357717c0b665293c86883213b483e85d25a06ec93c81024
+DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
diff --git a/media-libs/x264/files/x264-0.0.20120707-gcc48.patch b/media-libs/x264/files/x264-0.0.20120707-gcc48.patch
deleted file mode 100644
index 16cb4bf..0000000
--- a/media-libs/x264/files/x264-0.0.20120707-gcc48.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 6129dbe86484393a2ea520be94ef9b550b0bd113 Mon Sep 17 00:00:00 2001
-From: Jason Garrett-Glaser <jason@x264.com>
-Date: Wed, 27 Feb 2013 13:30:22 -0800
-Subject: [PATCH] Fix array overreads that caused miscompilation in gcc 4.8
-
----
- common/common.h | 1 +
- common/set.c | 78 +++++++++++++++++++++++++++++++-------------------------
- tools/checkasm.c | 2 +-
- 3 files changed, 45 insertions(+), 36 deletions(-)
-
-diff --git a/common/common.h b/common/common.h
-index 39ad5cb..0da1d43 100644
---- a/common/common.h
-+++ b/common/common.h
-@@ -40,6 +40,7 @@
- #define IS_DISPOSABLE(type) ( type == X264_TYPE_B )
- #define FIX8(f) ((int)(f*(1<<8)+.5))
- #define ALIGN(x,a) (((x)+((a)-1))&~((a)-1))
-+#define ARRAY_ELEMS(a) ((sizeof(a))/(sizeof(a[0])))
-
- #define CHECKED_MALLOC( var, size )\
- do {\
-diff --git a/common/set.c b/common/set.c
-index 4c72125..fa8b158 100644
---- a/common/set.c
-+++ b/common/set.c
-@@ -85,44 +85,49 @@ int x264_cqm_init( x264_t *h )
- int max_qp_err = -1;
- int max_chroma_qp_err = -1;
- int min_qp_err = QP_MAX+1;
-- int num_8x8_lists = h->sps->i_chroma_format_idc == CHROMA_444 ? 4 : 2; /* Checkasm may segfault if optimized out by --chroma-format */
-+ int num_8x8_lists = h->sps->i_chroma_format_idc == CHROMA_444 ? 4
-+ : h->param.analyse.b_transform_8x8 ? 2 : 0; /* Checkasm may segfault if optimized out by --chroma-format */
-
-- for( int i = 0; i < 4 + num_8x8_lists; i++ )
-- {
-- int size = i<4 ? 16 : 64;
-- int j;
-- for( j = (i<4 ? 0 : 4); j < i; j++ )
-- if( !memcmp( h->pps->scaling_list[i], h->pps->scaling_list[j], size*sizeof(uint8_t) ) )
-- break;
-- if( j < i )
-- {
-- h-> quant4_mf[i] = h-> quant4_mf[j];
-- h->dequant4_mf[i] = h->dequant4_mf[j];
-- h->unquant4_mf[i] = h->unquant4_mf[j];
-- }
-- else
-- {
-- CHECKED_MALLOC( h-> quant4_mf[i], (QP_MAX+1)*size*sizeof(udctcoef) );
-- CHECKED_MALLOC( h->dequant4_mf[i], 6*size*sizeof(int) );
-- CHECKED_MALLOC( h->unquant4_mf[i], (QP_MAX+1)*size*sizeof(int) );
-- }
--
-- for( j = (i<4 ? 0 : 4); j < i; j++ )
-- if( deadzone[j&3] == deadzone[i&3] &&
-- !memcmp( h->pps->scaling_list[i], h->pps->scaling_list[j], size*sizeof(uint8_t) ) )
-- break;
-- if( j < i )
-- {
-- h->quant4_bias[i] = h->quant4_bias[j];
-- h->quant4_bias0[i] = h->quant4_bias0[j];
-- }
-- else
-- {
-- CHECKED_MALLOC( h->quant4_bias[i], (QP_MAX+1)*size*sizeof(udctcoef) );
-- CHECKED_MALLOC( h->quant4_bias0[i], (QP_MAX+1)*size*sizeof(udctcoef) );
-- }
-+#define CQM_ALLOC( w, count )\
-+ for( int i = 0; i < count; i++ )\
-+ {\
-+ int size = w*w;\
-+ int start = w == 8 ? 4 : 0;\
-+ int j;\
-+ for( j = 0; j < i; j++ )\
-+ if( !memcmp( h->pps->scaling_list[i+start], h->pps->scaling_list[j+start], size*sizeof(uint8_t) ) )\
-+ break;\
-+ if( j < i )\
-+ {\
-+ h-> quant##w##_mf[i] = h-> quant##w##_mf[j];\
-+ h->dequant##w##_mf[i] = h->dequant##w##_mf[j];\
-+ h->unquant##w##_mf[i] = h->unquant##w##_mf[j];\
-+ }\
-+ else\
-+ {\
-+ CHECKED_MALLOC( h-> quant##w##_mf[i], (QP_MAX+1)*size*sizeof(udctcoef) );\
-+ CHECKED_MALLOC( h->dequant##w##_mf[i], 6*size*sizeof(int) );\
-+ CHECKED_MALLOC( h->unquant##w##_mf[i], (QP_MAX+1)*size*sizeof(int) );\
-+ }\
-+ for( j = 0; j < i; j++ )\
-+ if( deadzone[j] == deadzone[i] &&\
-+ !memcmp( h->pps->scaling_list[i+start], h->pps->scaling_list[j+start], size*sizeof(uint8_t) ) )\
-+ break;\
-+ if( j < i )\
-+ {\
-+ h->quant##w##_bias[i] = h->quant##w##_bias[j];\
-+ h->quant##w##_bias0[i] = h->quant##w##_bias0[j];\
-+ }\
-+ else\
-+ {\
-+ CHECKED_MALLOC( h->quant##w##_bias[i], (QP_MAX+1)*size*sizeof(udctcoef) );\
-+ CHECKED_MALLOC( h->quant##w##_bias0[i], (QP_MAX+1)*size*sizeof(udctcoef) );\
-+ }\
- }
-
-+ CQM_ALLOC( 4, 4 )
-+ CQM_ALLOC( 8, num_8x8_lists )
-+
- for( int q = 0; q < 6; q++ )
- {
- for( int i = 0; i < 16; i++ )
-@@ -204,6 +209,9 @@ int x264_cqm_init( x264_t *h )
- for( int cat = 0; cat < 3 + CHROMA444; cat++ )
- {
- int dct8x8 = cat&1;
-+ if( !h->param.analyse.b_transform_8x8 && dct8x8 )
-+ continue;
-+
- int size = dct8x8 ? 64 : 16;
- udctcoef *nr_offset = h->nr_offset_emergency[q][cat];
- /* Denoise chroma first (due to h264's chroma QP offset), then luma, then DC. */
-diff --git a/tools/checkasm.c b/tools/checkasm.c
-index 9135b70..441687b 100644
---- a/tools/checkasm.c
-+++ b/tools/checkasm.c
-@@ -309,7 +309,7 @@ static int check_pixel( int cpu_ref, int cpu_new )
-
- #define TEST_PIXEL( name, align ) \
- ok = 1, used_asm = 0; \
-- for( int i = 0; i < 8; i++ ) \
-+ for( int i = 0; i < ARRAY_ELEMS(pixel_c.name); i++ ) \
- { \
- int res_c, res_asm; \
- if( pixel_asm.name[i] != pixel_ref.name[i] ) \
---
-1.8.1.5
-
diff --git a/media-libs/x264/files/x264-0.0.20130731-cflags.patch b/media-libs/x264/files/x264-0.0.20130731-cflags.patch
deleted file mode 100644
index 3014b47..0000000
--- a/media-libs/x264/files/x264-0.0.20130731-cflags.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/420241 for x32 stuff
-initial x32 support -- no asm code, just pure C
-
-avoid messing too much with CFLAGS.
-https://bugs.gentoo.org/show_bug.cgi?id=351219
-https://bugs.gentoo.org/show_bug.cgi?id=413661
-
-
-Index: x264-9999/configure
-===================================================================
---- x264-9999.orig/configure
-+++ x264-9999/configure
-@@ -553,11 +553,6 @@ case $host_cpu in
- if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
- CFLAGS="$CFLAGS -march=i686"
- fi
-- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
-- CFLAGS="$CFLAGS -mfpmath=sse -msse"
-- fi
-- CFLAGS="-m32 $CFLAGS"
-- LDFLAGS="-m32 $LDFLAGS"
- else
- # icc on linux has various degrees of mod16 stack support
- if [ $SYS = LINUX ]; then
-@@ -588,13 +583,8 @@ case $host_cpu in
- x86_64)
- ARCH="X86_64"
- AS="yasm"
-- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
- if [ "$SYS" = MACOSX ]; then
- ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX"
-- if cc_check '' "-arch x86_64"; then
-- CFLAGS="$CFLAGS -arch x86_64"
-- LDFLAGS="$LDFLAGS -arch x86_64"
-- fi
- elif [ "$SYS" = WINDOWS ]; then
- ASFLAGS="$ASFLAGS -f win32 -m amd64"
- # only the GNU toolchain is inconsistent in prefixing function names with _
-@@ -602,7 +592,11 @@ case $host_cpu in
- [ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat -Wl,--dynamicbase"
- [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS"
- else
-- ASFLAGS="$ASFLAGS -f elf -m amd64"
-+ if cpp_check "" "" "__ILP32__" ; then
-+ ASFLAGS="$ASFLAGS -f elf -m x32"
-+ else
-+ ASFLAGS="$ASFLAGS -f elf -m amd64"
-+ fi
- fi
- ;;
- powerpc|powerpc64)
-@@ -964,10 +958,6 @@ if [ "$pic" = "yes" ] ; then
- [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
- fi
-
--if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
-- CFLAGS="$CFLAGS -fomit-frame-pointer"
--fi
--
- if [ "$strip" = "yes" ]; then
- CFLAGS="$CFLAGS -s"
- LDFLAGS="$LDFLAGS -s"
diff --git a/media-libs/x264/files/x264-0.0.20151011-cflags.patch b/media-libs/x264/files/x264-0.0.20151011-cflags.patch
new file mode 100644
index 0000000..851e3f0
--- /dev/null
+++ b/media-libs/x264/files/x264-0.0.20151011-cflags.patch
@@ -0,0 +1,51 @@
+Index: x264-snapshot-20151011-2245/configure
+===================================================================
+--- x264-snapshot-20151011-2245.orig/configure
++++ x264-snapshot-20151011-2245/configure
+@@ -672,11 +672,6 @@ case $host_cpu in
+ if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
+ CFLAGS="$CFLAGS -march=i686"
+ fi
+- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
+- CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
+- fi
+- CFLAGS="-m32 $CFLAGS"
+- LDFLAGS="-m32 $LDFLAGS"
+ fi
+ if [ "$SYS" = MACOSX ]; then
+ ASFLAGS="$ASFLAGS -f macho32 -DPREFIX"
+@@ -695,13 +690,8 @@ case $host_cpu in
+ AS_EXT=".asm"
+ ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
+ stack_alignment=16
+- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
+ if [ "$SYS" = MACOSX ]; then
+ ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX"
+- if cc_check '' "-arch x86_64"; then
+- CFLAGS="$CFLAGS -arch x86_64"
+- LDFLAGS="$LDFLAGS -arch x86_64"
+- fi
+ elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
+ ASFLAGS="$ASFLAGS -f win64"
+ # only the GNU toolchain is inconsistent in prefixing function names with _
+@@ -1148,20 +1138,10 @@ if [ "$pic" = "yes" ] ; then
+ [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
+ fi
+
+-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
+- CFLAGS="$CFLAGS -fomit-frame-pointer"
+-fi
+-
+ if [ "$strip" = "yes" ]; then
+ LDFLAGS="$LDFLAGS -s"
+ fi
+
+-if [ "$debug" = "yes" ]; then
+- CFLAGS="-O1 -g $CFLAGS"
+-else
+- CFLAGS="-O3 -ffast-math $CFLAGS"
+-fi
+-
+ if cc_check '' -fno-tree-vectorize ; then
+ CFLAGS="$CFLAGS -fno-tree-vectorize"
+ fi
diff --git a/media-libs/x264/files/x264-nostrip.patch b/media-libs/x264/files/x264-nostrip.patch
deleted file mode 100644
index b4e2689..0000000
--- a/media-libs/x264/files/x264-nostrip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: x264-svn/configure
-===================================================================
---- x264-svn.orig/configure
-+++ x264-svn/configure
-@@ -374,11 +374,6 @@ if [ "$pic" = "yes" ] ; then
- ASFLAGS="$ASFLAGS -D__PIC__"
- fi
-
--if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
-- CFLAGS="$CFLAGS -s -fomit-frame-pointer"
-- LDFLAGS="$LDFLAGS -s"
--fi
--
- if [ "$debug" = "yes" ]; then
- CFLAGS="-O1 -g $CFLAGS"
- else
diff --git a/media-libs/x264/files/x264-onlylib-20110425.patch b/media-libs/x264/files/x264-onlylib-20110425.patch
deleted file mode 100644
index 6f216b9..0000000
--- a/media-libs/x264/files/x264-onlylib-20110425.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: x264-snapshot-20110425-2245/Makefile
-===================================================================
---- x264-snapshot-20110425-2245.orig/Makefile
-+++ x264-snapshot-20110425-2245/Makefile
-@@ -137,7 +137,7 @@ DEP = depend
-
- .PHONY: all default fprofiled clean distclean install uninstall dox test testclean
-
--default: $(DEP) x264$(EXE)
-+default: $(DEP)
-
- $(LIBX264): .depend $(OBJS) $(OBJASM)
- $(AR)$@ $(OBJS) $(OBJASM)
-@@ -207,7 +207,7 @@ distclean: clean
- rm -f config.mak x264_config.h config.h config.log x264.pc x264.def
- rm -rf test/
-
--install: x264$(EXE) $(SONAME)
-+install: $(LIBX264) $(SONAME)
- install -d $(DESTDIR)$(bindir)
- install -d $(DESTDIR)$(includedir)
- install -d $(DESTDIR)$(libdir)
-@@ -216,7 +216,6 @@ install: x264$(EXE) $(SONAME)
- install -m 644 x264_config.h $(DESTDIR)$(includedir)
- install -m 644 $(LIBX264) $(DESTDIR)$(libdir)
- install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
-- install x264$(EXE) $(DESTDIR)$(bindir)
- $(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264))
- ifeq ($(SYS),WINDOWS)
- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
diff --git a/media-libs/x264/files/x264-x32.patch b/media-libs/x264/files/x264-x32.patch
deleted file mode 100644
index 7af4405..0000000
--- a/media-libs/x264/files/x264-x32.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/420241
-
-initial x32 support -- no asm code, just pure C
-
---- a/configure
-+++ b/configure
-@@ -567,7 +567,13 @@ case $host_cpu in
- x86_64)
- ARCH="X86_64"
- AS="yasm"
-- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
-+ if [ $compiler = GNU ]; then
-+ if cpp_check "" "" "__ILP32__" ; then
-+ CFLAGS="-mx32 $CFLAGS" && LDFLAGS="-mx32 $LDFLAGS"
-+ else
-+ CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
-+ fi
-+ fi
- if [ "$SYS" = MACOSX ]; then
- ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX"
- if cc_check '' "-arch x86_64"; then
-@@ -580,7 +586,11 @@ case $host_cpu in
- [ $compiler = GNU ] && cc_check "" "-S" && grep -q "_main:" conftest && ASFLAGS="$ASFLAGS -DPREFIX"
- [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS"
- else
-- ASFLAGS="$ASFLAGS -f elf -m amd64"
-+ if cpp_check "" "" "__ILP32__" ; then
-+ AS="${cross_prefix}as"
-+ else
-+ ASFLAGS="$ASFLAGS -f elf -m amd64"
-+ fi
- fi
- ;;
- powerpc|powerpc64)
diff --git a/media-libs/x264/x264-0.0.20111220.ebuild b/media-libs/x264/x264-0.0.20111220.ebuild
deleted file mode 100644
index a54e600..0000000
--- a/media-libs/x264/x264-0.0.20111220.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- V_ECLASS="git-2"
-else
- V_ECLASS="versionator"
-fi
-
-inherit multilib toolchain-funcs flag-o-matic ${V_ECLASS}
-
-if [ "${PV#9999}" = "${PV}" ]; then
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-fi
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [ "${PV#9999}" != "${PV}" ] ; then
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SRC_URI=""
-else
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-fi
-IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads"
-
-RDEPEND=""
-DEPEND="amd64? ( >=dev-lang/yasm-1 )
- x86? ( >=dev-lang/yasm-1 )
- x86-fbsd? ( >=dev-lang/yasm-1 )"
-
-if [ "${PV#9999}" = "${PV}" ]; then
- S="${WORKDIR}/${MY_P}"
-fi
-
-DOCS="AUTHORS doc/*.txt"
-
-src_configure() {
- tc-export CC
-
- local myconf=""
- use 10bit && myconf+=" --bit-depth=10"
- use debug && myconf+=" --enable-debug"
- use interlaced || myconf+=" --disable-interlaced"
- use static-libs && myconf+=" --enable-static"
- use threads || myconf+=" --disable-thread"
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- if use x86 && use pic; then
- myconf+=" --disable-asm"
- fi
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- ${myconf} || die
-
- # this is a nasty workaround for bug #376925 as upstream doesn't like us
- # fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
diff --git a/media-libs/x264/x264-0.0.20120327.ebuild b/media-libs/x264/x264-0.0.20120327.ebuild
deleted file mode 100644
index 4c099ce..0000000
--- a/media-libs/x264/x264-0.0.20120327.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- V_ECLASS="git-2"
-else
- V_ECLASS="versionator"
-fi
-
-inherit multilib toolchain-funcs flag-o-matic ${V_ECLASS}
-
-if [ "${PV#9999}" = "${PV}" ]; then
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-fi
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [ "${PV#9999}" != "${PV}" ] ; then
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SRC_URI=""
-else
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads"
-
-RDEPEND=""
-DEPEND="amd64? ( >=dev-lang/yasm-1 )
- x86? ( >=dev-lang/yasm-1 )
- x86-fbsd? ( >=dev-lang/yasm-1 )"
-
-if [ "${PV#9999}" = "${PV}" ]; then
- S="${WORKDIR}/${MY_P}"
-fi
-
-DOCS="AUTHORS doc/*.txt"
-
-src_configure() {
- tc-export CC
-
- local myconf=""
- use 10bit && myconf+=" --bit-depth=10"
- use debug && myconf+=" --enable-debug"
- use interlaced || myconf+=" --disable-interlaced"
- use static-libs && myconf+=" --enable-static"
- use threads || myconf+=" --disable-thread"
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- if use x86 && use pic; then
- myconf+=" --disable-asm"
- fi
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- ${myconf} || die
-
- # this is a nasty workaround for bug #376925 as upstream doesn't like us
- # fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
diff --git a/media-libs/x264/x264-0.0.20120707.ebuild b/media-libs/x264/x264-0.0.20120707.ebuild
deleted file mode 100644
index 49c91fb..0000000
--- a/media-libs/x264/x264-0.0.20120707.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- V_ECLASS="git-2"
-else
- V_ECLASS="versionator"
-fi
-
-inherit multilib toolchain-funcs flag-o-matic ${V_ECLASS}
-
-if [ "${PV#9999}" = "${PV}" ]; then
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-fi
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [ "${PV#9999}" != "${PV}" ] ; then
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SRC_URI=""
-else
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads"
-
-RDEPEND=""
-DEPEND="amd64? ( >=dev-lang/yasm-1 )
- amd64-fbsd? ( >=dev-lang/yasm-1 )
- x86? ( >=dev-lang/yasm-1 )
- x86-fbsd? ( >=dev-lang/yasm-1 )"
-
-if [ "${PV#9999}" = "${PV}" ]; then
- S="${WORKDIR}/${MY_P}"
-fi
-
-DOCS="AUTHORS doc/*.txt"
-
-src_prepare() {
- # Solaris' /bin/sh doesn't grok the syntax in these files
- sed -i -e '1c\#!/usr/bin/env sh' configure version.sh || die
- # for sparc-solaris
- if [[ ${CHOST} == sparc*-solaris* ]] ; then
- sed -i -e 's:-DPIC::g' configure || die
- fi
- # for OSX
- sed -i -e "s|-arch x86_64||g" configure || die
- epatch "${FILESDIR}"/x264-x32.patch #420241
-
- # fix crashes when compiled with gcc 4.8
- epatch "${FILESDIR}"/${P}-gcc48.patch
-}
-
-src_configure() {
- tc-export CC
-
- local myconf=""
- use 10bit && myconf+=" --bit-depth=10"
- use debug && myconf+=" --enable-debug"
- use interlaced || myconf+=" --disable-interlaced"
- use static-libs && myconf+=" --enable-static"
- use threads || myconf+=" --disable-thread"
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- if use x86 && use pic || [[ ${ABI} == "x32" ]] ; then
- myconf+=" --disable-asm"
- fi
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- ${myconf} || die
-
- # this is a nasty workaround for bug #376925 as upstream doesn't like us
- # fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
diff --git a/media-libs/x264/x264-0.0.20130506.ebuild b/media-libs/x264/x264-0.0.20130506.ebuild
deleted file mode 100644
index 11e10b0..0000000
--- a/media-libs/x264/x264-0.0.20130506.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SLOT="0"
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
- SONAME="132"
- SLOT="0/${SONAME}"
-
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-IUSE="10bit custom-cflags +interlaced pic static-libs +threads"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="amd64? ( ${ASM_DEP} )
- amd64-fbsd? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )"
-
-DOCS="AUTHORS doc/*.txt"
-
-src_prepare() {
- # Initial support for x32 ABI, bug #420241
- epatch "${FILESDIR}"/x264-x32.patch
-}
-
-src_configure() {
- tc-export CC
- local asm_conf=""
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- if use x86 && use pic || [[ ${ABI} == "x32" ]]; then
- asm_conf=" --disable-asm"
- fi
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex static-libs "" "--enable-static") \
- $(usex threads "" "--disable-thread") \
- ${asm_conf} || die
-
- # this is a nasty workaround for bug #376925 as upstream doesn't like us
- # fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
diff --git a/media-libs/x264/x264-0.0.20130731.ebuild b/media-libs/x264/x264-0.0.20130731.ebuild
deleted file mode 100644
index 0f1ce85..0000000
--- a/media-libs/x264/x264-0.0.20130731.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
- S="${WORKDIR}/${MY_P}"
-fi
-
-SONAME="135"
-SLOT="0/${SONAME}"
-
-LICENSE="GPL-2"
-IUSE="10bit +interlaced pic static-libs cpu_flags_x86_sse +threads"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="abi_x86_32? ( ${ASM_DEP} )
- abi_x86_64? ( ${ASM_DEP} )"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-DOCS="AUTHORS doc/*.txt"
-
-src_prepare() {
- # Initial support for x32 ABI, bug #420241
- # Avoid messing too much with CFLAGS.
- epatch "${FILESDIR}"/${P}-cflags.patch
-}
-
-multilib_src_configure() {
- tc-export CC
- local asm_conf=""
-
- if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
- asm_conf=" --disable-asm"
- fi
-
- # Upstream uses this, see the cflags patch
- use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
-
- "${S}/configure" \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex interlaced "" "--disable-interlaced") \
- --disable-opencl \
- $(usex static-libs "--enable-static" "") \
- $(usex threads "" "--disable-thread") \
- ${asm_conf} || die
-}
diff --git a/media-libs/x264/x264-0.0.20130912.ebuild b/media-libs/x264/x264-0.0.20130912.ebuild
deleted file mode 100644
index c561342..0000000
--- a/media-libs/x264/x264-0.0.20130912.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
- S="${WORKDIR}/${MY_P}"
-fi
-
-SONAME="138"
-SLOT="0/${SONAME}"
-
-LICENSE="GPL-2"
-IUSE="10bit +interlaced pic static-libs cpu_flags_x86_sse +threads"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="abi_x86_32? ( ${ASM_DEP} )
- abi_x86_64? ( ${ASM_DEP} )"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-DOCS="AUTHORS doc/*.txt"
-
-src_prepare() {
- # Initial support for x32 ABI, bug #420241
- # Avoid messing too much with CFLAGS.
- epatch "${FILESDIR}"/${P}-cflags.patch
-}
-
-multilib_src_configure() {
- tc-export CC
- local asm_conf=""
-
- if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
- asm_conf=" --disable-asm"
- fi
-
- # Upstream uses this, see the cflags patch
- use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
-
- "${S}/configure" \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex interlaced "" "--disable-interlaced") \
- --disable-opencl \
- $(usex static-libs "--enable-static" "") \
- $(usex threads "" "--disable-thread") \
- ${asm_conf} || die
-}
diff --git a/media-libs/x264/x264-0.0.20151011.ebuild b/media-libs/x264/x264-0.0.20151011.ebuild
new file mode 100644
index 0000000..f097db6
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20151011.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
+
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.videolan.org/x264.git"
+else
+ inherit versionator
+ MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+ SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+SONAME="148"
+SLOT="0/${SONAME}"
+
+LICENSE="GPL-2"
+IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="abi_x86_32? ( ${ASM_DEP} )
+ abi_x86_64? ( ${ASM_DEP} )
+ opencl? ( dev-lang/perl )"
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+DOCS="AUTHORS doc/*.txt"
+
+src_prepare() {
+ # Initial support for x32 ABI, bug #420241
+ # Avoid messing too much with CFLAGS.
+ epatch "${FILESDIR}"/x264-0.0.20151011-cflags.patch
+}
+
+multilib_src_configure() {
+ tc-export CC
+ local asm_conf=""
+
+ if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
+ asm_conf=" --disable-asm"
+ fi
+
+ # Upstream uses this, see the cflags patch
+ use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
+ append-flags "-ffast-math"
+
+ "${S}/configure" \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --disable-cli \
+ --disable-avs \
+ --disable-lavf \
+ --disable-swscale \
+ --disable-ffms \
+ --disable-gpac \
+ --enable-pic \
+ --enable-shared \
+ --host="${CHOST}" \
+ $(usex 10bit "--bit-depth=10" "") \
+ $(usex interlaced "" "--disable-interlaced") \
+ $(usex opencl "" "--disable-opencl") \
+ $(usex static-libs "--enable-static" "") \
+ $(usex threads "" "--disable-thread") \
+ ${asm_conf} || die
+}
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 4dc5041..f097db6 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -38,7 +38,7 @@
src_prepare() {
# Initial support for x32 ABI, bug #420241
# Avoid messing too much with CFLAGS.
- epatch "${FILESDIR}"/x264-cflags.patch
+ epatch "${FILESDIR}"/x264-0.0.20151011-cflags.patch
}
multilib_src_configure() {
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index ff45641..154e98a 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,2 +1,3 @@
DIST x265-1.5.tar.bz2 588263 SHA256 da226cbe56938f85d5a3d123d1f5ca895795f2eac794e45af4b70047e03d8648 SHA512 e5db8c3428b7b393c5c3049041de152b43821a083bc1988903ade8d6ce5fdc71a2fe0ad9efa0564aa3c2c6f1ec31659fcd2b338f6b53d22a202811be7071f077 WHIRLPOOL 9e1256832a3ece06d68a872b44337285afbbeebbd149ac71fda25524d60310f595adedce1b28f0ed5a59feadef39848d797bd58f4b0d7c7d707bcddca7520f6d
DIST x265_1.7.tar.gz 844212 SHA256 a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a623cf2b7e5cf8226585 SHA512 cf6fce24b008d36bbc79e2488ab5fb3010aa588113645597ffc66959088a73b3ba72f6bb81bd16e36847a73b50b8f264cff0899162552418ae499170c286eb89 WHIRLPOOL 9c932fd85fbc06a63802f8aabdbb5f44fe4bee6bc2d0996df8788acad30be965bde7b56f562e4ca8ae87856fbcf728b6938a701afb397ef2195437b73a60c744
+DIST x265_1.8.tar.gz 918469 SHA256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857 SHA512 498c25ff6e5c68849db11d1509cc6f7e96d3a2e6594542589ac5b9f6d65a09ab3af590dcc3357f985f218f8d54af364c998cfedfbe95644747835c059214935c WHIRLPOOL ef5c1a31e8ab45c2918e24e97c09809eda735df354d9000e3935b054ca01fd60ef1d1afad6c161c7c62b8b016c2a80155665448a18e4037fab8c56a841488eeb
diff --git a/media-libs/x265/x265-1.8.ebuild b/media-libs/x265/x265-1.8.ebuild
new file mode 100644
index 0000000..ee4a32f
--- /dev/null
+++ b/media-libs/x265/x265-1.8.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib multilib flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+ inherit mercurial
+ EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+ SRC_URI="
+ https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
+ http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/68"
+IUSE="+10bit test"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND=""
+DEPEND="${RDEPEND}
+ abi_x86_32? ( ${ASM_DEPEND} )
+ abi_x86_64? ( ${ASM_DEPEND} )"
+
+src_unpack() {
+ if [[ ${PV} = 9999* ]]; then
+ mercurial_src_unpack
+ # Can't set it at global scope due to mercurial.eclass limitations...
+ export S=${WORKDIR}/${P}/source
+ else
+ unpack ${A}
+ export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+ fi
+}
+
+multilib_src_configure() {
+ append-cflags -fPIC
+ append-cxxflags -fPIC
+ local mycmakeargs=(
+ $(cmake-utils_use_enable test TESTS)
+ $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+ -DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ if [ "${ABI}" = x86 ] ; then
+ use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)"
+ mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_configure() {
+ multilib_parallel_foreach_abi multilib_src_configure
+}
+
+multilib_src_test() {
+ if has ${MULTILIB_ABI_FLAG} abi_x86_32 abi_x86_64 ; then
+ cd "${BUILD_DIR}/test" || die
+ for i in TestBench ; do
+ ./${i} || die
+ done
+ fi
+}
+
+src_test() {
+ multilib_foreach_abi multilib_src_test
+}
+
+src_install() {
+ cmake-multilib_src_install
+ dodoc -r "${S}/../doc/"*
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 008e9cb..8a3e36f 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -21,7 +21,7 @@
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/59"
+SLOT="0/75"
IUSE="+10bit test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -37,7 +37,7 @@
export S=${WORKDIR}/${P}/source
else
unpack ${A}
- export S="${WORKDIR}/${PN}_${PV}/source"
+ export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
fi
}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild
index c6728c9..222abb3 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-2"
SLOT="1.0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="libav +orc"
RDEPEND="
diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.4.5.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.4.5.ebuild
index 555e259..bbffe3c 100644
--- a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.4.5.ebuild
+++ b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.4.5.ebuild
@@ -7,7 +7,7 @@
inherit gstreamer
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.4.5.ebuild b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.4.5.ebuild
index 2559b65..1ffbb18 100644
--- a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.4.5.ebuild
+++ b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.4.5.ebuild
@@ -8,7 +8,7 @@
inherit gstreamer
DESCRIPTION="GStreamer plugin for the MIMIC codec"
-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=""
RDEPEND=">=media-libs/libmimic-1.0.4-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.4.5.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.4.5.ebuild
index e521e13..c81fd4c 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.4.5.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.4.5.ebuild
@@ -8,7 +8,7 @@
inherit gstreamer
DESCRIPTION="Libmpeg2 based decoder plug-in for gstreamer"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.4.5.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.4.5.ebuild
index a536c17..d06a841 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.4.5.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.4.5.ebuild
@@ -8,7 +8,7 @@
inherit gstreamer
DESCRIPTION="GStreamer plugin for Opus audio codec support"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
IUSE=""
COMMON_DEPEND=">=media-libs/opus-1.0.2-r2:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.4.5.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.4.5.ebuild
index bda86f1..91a8832 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.4.5.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.4.5.ebuild
@@ -8,7 +8,7 @@
inherit gstreamer
DESCRIPTION="GStreamer plugin for OSS (Open Sound System) support"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd"
IUSE=""
RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.4.5.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.4.5.ebuild
index ebfcadf..a9a7d74 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.4.5.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.4.5.ebuild
@@ -8,7 +8,7 @@
inherit gstreamer
DESCRIPTION="GStreamer plugin for the PulseAudio sound server"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
IUSE=""
RDEPEND=">=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.4.5.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.4.5.ebuild
index 1b22d75..03b3202 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.4.5.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.4.5.ebuild
@@ -7,7 +7,7 @@
inherit gstreamer
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND="
diff --git a/media-plugins/vdr-remote/vdr-remote-0.6.0-r1.ebuild b/media-plugins/vdr-remote/vdr-remote-0.6.0-r1.ebuild
new file mode 100644
index 0000000..5eec3a9
--- /dev/null
+++ b/media-plugins/vdr-remote/vdr-remote-0.6.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: use various devices for controlling vdr (keyboards, lirc, remotes bundled with tv-cards)"
+HOMEPAGE="http://www.escape-edv.de/endriss/vdr/"
+SRC_URI="http://www.escape-edv.de/endriss/vdr/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+DEPEND=">=media-video/vdr-2.0.0"
+
+pkg_setup() {
+ vdr-plugin-2_pkg_setup
+
+ if use systemd; then
+ if ! getent group input | grep -q vdr; then
+ einfo "add user 'vdr' to group 'input' for full access to remote control device"
+ gpasswd -a vdr input
+ fi
+ fi
+}
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index d52fcba..b57962f 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,3 +1,4 @@
DIST fldigi-3.22.13.tar.gz 2909523 SHA256 f055b607dd28bde847541bd4518e5ceac49e0eccf4bda97c4c589d598c4a3baf SHA512 ef4d4cccf24a6c7f7ad6657af89cfbc617655c9852150ac45b92178549a91a8aed6d6d6d4737ac69ded64e85bfbc727697f16f64b5d24e4eb756a8c1ca11a57c WHIRLPOOL a8a175d59e656df86b321b9753a7656e10403c8921dc7081859e088a6868324594f2807a20b09c91eb3ec616404dc1a7ce0f721881e27ff27958c545d9fbf0b6
DIST fldigi-3.23.00.tar.gz 2950875 SHA256 34585f3755a51552bf2c65cc5c74db4b739a9c3239202f9dd5b3e0e3805a598b SHA512 83982feea33332e2365d6c2a5e840dd1ff815ced4ad9a7b8f31277dd3d92c08bbdadbb1614200d756b00e870be2d5f1bec845be388d9c1740664ed9377bfae67 WHIRLPOOL 1599b32a1781e575d55402c90d152209201b5dd0b699ed68c858327e35f8c6bf549725fd7c4001f485ac97a1e76e067d3f852ba2162a81023855a0e116239eed
DIST fldigi-3.23.01.tar.gz 2950969 SHA256 2daf2cca7c2abc9106e791cea28137a77b8b4e4e4c397efc8af350f208e357c3 SHA512 7ef3d9d614b188c593df704f96f5f238f08e02335f27ce819f1483d1c79bf32007e10750a63d842bd132bb7b8a8ec08509740a62b8810ea55d0d94b477029e45 WHIRLPOOL c195e986beb591bd5b7aff663938b14ba8bdfc4e52432b192ebec064b8f106a1a280a69b5b196e2c356949e2f5ee8412d77b81a0026d5843632f0181fa0a14dd
+DIST fldigi-3.23.03.tar.gz 2951727 SHA256 b308ceb0581e7668eedf83042baf6f9ae4af938648436cd1857655cad8fe978e SHA512 fde20fd72bc86a5f61a1bf4becad645ac23b672cf801731004909fd2a77c1f2bb409e562a77ba5ca6a6fdc9cf954e958125a59b66fb5ea7d7344a142eea1c338 WHIRLPOOL b914bb13f9adecf2c79b06e04535321858400d055efce787f095c90431f54d7bd32006bdec52cd27cac61b1d0390f0ba2fb2d703d46f2bcfaef0dde9528eccf4
diff --git a/media-radio/fldigi/fldigi-3.23.03.ebuild b/media-radio/fldigi/fldigi-3.23.03.ebuild
new file mode 100644
index 0000000..84204b0
--- /dev/null
+++ b/media-radio/fldigi/fldigi-3.23.03.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
+SRC_URI="http://www.w1hkj.com/downloads/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls portaudio pulseaudio sndfile"
+
+RDEPEND="x11-libs/fltk:1[threads,xft]
+ media-libs/libsamplerate
+ media-libs/libpng:0
+ x11-misc/xdg-utils
+ dev-perl/RPC-XML
+ dev-perl/Term-ReadLine-Perl
+ hamlib? ( media-libs/hamlib )
+ portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+ pulseaudio? ( media-sound/pulseaudio )
+ sndfile? ( >=media-libs/libsndfile-1.0.10 )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+ econf $(use_with sndfile) \
+ $(use_with portaudio) \
+ $(use_with hamlib) \
+ $(use_enable nls) \
+ $(use_with pulseaudio) \
+ --disable-silent-rules \
+ --without-asciidoc
+}
diff --git a/media-sound/abcde/abcde-2.7.ebuild b/media-sound/abcde/abcde-2.7.ebuild
index b5f9536..49ac743 100644
--- a/media-sound/abcde/abcde-2.7.ebuild
+++ b/media-sound/abcde/abcde-2.7.ebuild
@@ -10,7 +10,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
# Enable MP3 related flags by default
IUSE="aac cdparanoia cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack"
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild
index 284390b..120d48d 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild
@@ -24,6 +24,7 @@
selinux? ( sec-policy/selinux-alsa )"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-cross-compile.patch
epatch_user
}
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.29-cross-compile.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.29-cross-compile.patch
new file mode 100644
index 0000000..45aa8a9
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.29-cross-compile.patch
@@ -0,0 +1,44 @@
+fix from upstream
+
+From c0130c8ec22a89960d9304297a904a2a14979506 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Thu, 8 Oct 2015 12:14:05 -0400
+Subject: [PATCH alsa-utils] build: Do not try to detect cross-compiler
+
+cross compilers are passed via path may not be a gcc based cross
+compiler in such cases this check fails and try's to force gcc based
+cross compiler detection, This code is a convenience that limits the
+build system.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ configure.ac | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8c2d1a5..79a9aaf 100644
+--- a/configure
++++ b/configure
+@@ -6192,21 +6192,6 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+
+
+
+-if test "x$target" != "x$host" -a -z "`echo $CC | grep -e '-gcc'`";
+-then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cross-compiler" >&5
+-$as_echo_n "checking for cross-compiler... " >&6; }
+-
+- which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc
+- which ${target_cpu}-${target_os}-gcc >/dev/null 2>&1 \
+- && CC=${target_cpu}-${target-os}-gcc
+- which ${target_cpu}-${target_vendor}-${target_os}-gcc >/dev/null 2>&1 \
+- && CC=${target_cpu}-${target_vendor}-${target_os}-gcc
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
+-fi
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/media-sound/apetag/apetag-1.12.ebuild b/media-sound/apetag/apetag-1.12.ebuild
index 044fc9a..30515bb 100644
--- a/media-sound/apetag/apetag-1.12.ebuild
+++ b/media-sound/apetag/apetag-1.12.ebuild
@@ -14,7 +14,7 @@
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
S=${WORKDIR}/Apetag
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 3950b41..24cf5a3 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,3 +1,3 @@
DIST asunder-2.2.tar.bz2 208936 SHA256 bb608c1cdefcce2f533fb5d5cc23838846b2810ec89d0ebb083507cf27e7822f SHA512 6f2a9a2f6d047a41ef0aaa221fafdc86f3fe6e49f9c8cfcaae4e325b62f3f17cddafa57982d2d3aca0922bce6aa29015d398cbf97ddfb44c7d7dfdd75aefab4c WHIRLPOOL 16b0da49f44d09f95d2a86f6290718d850c014c7aef0e875654efda05e0b959bf64a21f2c101a4e897aec633dce215f41ee3f1db221c25d8b04cb600372a633b
-DIST asunder-2.5.tar.bz2 226657 SHA256 0e548050143f964a0f869d44680554c7f7204b53262340ef0bd0f32e37507f20 SHA512 037a9c2478227de400d6dd2a86db80e6d3c6ac189cfbaf5a8c3107f8443590dc50c18f91abb47ee660880f56ba6f03435c3fb539f5df874ad1076fef1e54f474 WHIRLPOOL 6818c1a821cfec63e7082d2ff27eedbd04b17f3c0f9d7ec2aa48fd7b7cab95feb0695f9cce9fdbed4d15dbf2e44141fc569e05df1c0cddb42dec3a7e40562b68
DIST asunder-2.7.tar.bz2 268834 SHA256 e69698f9524e443ac564b5d4b2df135ed7e5b2f94d6b3cabeae5bb2a3c828914 SHA512 3c5116411a30d4ac95ee4303c1627a385bc1bb62680ce15536fa524c8301928a81b4987043490318548832834893d31e51e46b8afb43a4e76ac0aedfeb38b7b7 WHIRLPOOL d97eeed3c7f0497b0afab2401601f1e53a3f5a0da81f1f3d74c26284ab383b3c4c08c4b664dc02083eadcc8bb2518d2b58ac19f8defe3e75525aa12a9bf49579
+DIST asunder-2.8.tar.bz2 269472 SHA256 d8c7014b87ab3c5467876def4d8650fd09fe415ded9de2569c629296499b09db SHA512 54f606e10a27cc73aa5c0f1dc74a2df87020562fb74f14ad7030dd1b5f4ab1a4f42477c7d23b5285a7b0cba00f75929f444bc63e18e8da545c3cbdd2c3330ebe WHIRLPOOL 5e662a14908903ae12a897aa59aa3ca1ab164c628a908c57b298c0019fe46bf66d63e36b0eff6306acdc06704128f5e368e296ce831897428a35a6b2d353552c
diff --git a/media-sound/asunder/asunder-2.5.ebuild b/media-sound/asunder/asunder-2.5.ebuild
deleted file mode 100644
index c54d2df..0000000
--- a/media-sound/asunder/asunder-2.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="A graphical Audio CD ripper and encoder with support for WAV, MP3, OggVorbis, FLAC and Opus"
-HOMEPAGE="http://littlesvr.ca/asunder/"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac flac mac mp3 musepack opus vorbis wavpack"
-
-COMMON_DEPEND=">=media-libs/libcddb-0.9.5
- media-sound/cdparanoia
- x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext"
-RDEPEND="${COMMON_DEPEND}
- aac? ( media-sound/neroaac )
- flac? ( media-libs/flac )
- mac? ( media-sound/mac )
- mp3? ( media-sound/lame )
- musepack? ( media-sound/musepack-tools )
- opus? ( media-sound/opus-tools )
- vorbis? ( media-sound/vorbis-tools )
- wavpack? ( media-sound/wavpack )"
-
-DOCS="AUTHORS ChangeLog README TODO" # NEWS is dummy
-
-src_prepare() {
- sed -i -e 's:cd syslogng && $(MAKE) install:true:' "${S}"/Makefile.in
-}
diff --git a/media-sound/asunder/asunder-2.8.ebuild b/media-sound/asunder/asunder-2.8.ebuild
new file mode 100644
index 0000000..0b6f31c
--- /dev/null
+++ b/media-sound/asunder/asunder-2.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A graphical Audio CD ripper and encoder with support for WAV, MP3, OggVorbis, FLAC and Opus"
+HOMEPAGE="http://littlesvr.ca/asunder/"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac flac mac mp3 musepack opus vorbis wavpack"
+
+COMMON_DEPEND=">=media-libs/libcddb-0.9.5
+ media-sound/cdparanoia
+ x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext"
+RDEPEND="${COMMON_DEPEND}
+ aac? ( media-sound/neroaac )
+ flac? ( media-libs/flac )
+ mac? ( media-sound/mac )
+ mp3? ( media-sound/lame )
+ musepack? ( media-sound/musepack-tools )
+ opus? ( media-sound/opus-tools )
+ vorbis? ( media-sound/vorbis-tools )
+ wavpack? ( media-sound/wavpack )"
+
+DOCS="AUTHORS ChangeLog README TODO" # NEWS is dummy
+
+src_prepare() {
+ sed -i -e 's:cd syslogng && $(MAKE) install:true:' "${S}"/Makefile.in
+}
diff --git a/media-sound/cmus/cmus-2.7.1.ebuild b/media-sound/cmus/cmus-2.7.1.ebuild
index 1fe39b0..d5e865e 100644
--- a/media-sound/cmus/cmus-2.7.1.ebuild
+++ b/media-sound/cmus/cmus-2.7.1.ebuild
@@ -11,7 +11,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="aac alsa ao cue cdio cddb discid debug examples +flac jack libsamplerate
+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor +unicode
+vorbis wavpack wma"
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 494ef47..e0f6a30 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,6 +1,3 @@
DIST easytag-2.1.8.tar.xz 2459496 SHA256 1a2f75c9a70aeb7a404dfaa96e0df0eaaa325df301c58f0f708d0da4c08e65a9 SHA512 cf5d92902276b8d462c695aaa0d1072684d60cbfc45d07fb2ac7b345907a775b94665612088b33f3272db22d4b4eb78f4a4e36f2caf6e151a08f640841208e48 WHIRLPOOL ab37d4942bde4a88c233869b3cf84d13dd4a259cd894941bd9c26ec4f3b22c02af3fc7633a09670ee707d0287bb8bb9fc654ea00e0fe694319a6cf24b220420c
-DIST easytag-2.2.2.tar.xz 973116 SHA256 fb21ac51975c90c58c5dc38c28aa1030d6fa3420bc6b8406f085e34df9e14164 SHA512 1b49fdb080ad59f08c956e63fb0a286a2785e6c4483b2b4003e1b217ad1537999d76dcaedbe4a59782514b655ee53bac8b6907eff246c00bc1a578b2be674010 WHIRLPOOL 270403fe0573b80e93b4084a2089c1492253e1a678fd4b9aceba9ae78a0f590d9d905ddb9fa002d73870bdda47817b652bb29bacb21f2ac951f63063eca5c16b
-DIST easytag-2.2.3.tar.xz 987288 SHA256 f49cadc868a67faeb99bdbedc21a3009783609b380d098412c4799ec48aeaeb3 SHA512 d3a27c6f9b6326cd5850855ea2acae1f73330198247516b3f44d1553e830d29043ef973de81e13743c83aca685258b5a6ba2a19969f571664ac60ff99e71a0ea WHIRLPOOL 22db6d14c0df1001aa4488e224cabc514f91d85c1207eb517d7cfa0213381c003a5c716a391e37da94ae253f0714aa62d394a849c5d59b244604f8032e9e7968
-DIST easytag-2.2.4.tar.xz 989660 SHA256 458329ab17e07fac5e92a2d732f0f4e9b12ea8aa31707506b39d3b2428d0c091 SHA512 bafa1e26371bb95f5edf74424b3733d0ffbb80c740c65e404cf863445a835fdc87f958e9cfddaac7d85281cb3be5ad6584a5750415e294a96c5ef26d4e51f9bf WHIRLPOOL ddb789dfe838c0fa20fc2c42187778b78896b9e038cd1786adb2332764b167268fdd4eb410e45cfb5e6b8fe211745be0bd184083f8677b21905d98da64f82a06
-DIST easytag-2.2.5.tar.xz 1004688 SHA256 a6da3a094997fa225d1c01211b282f2d3c2dfd93a74f3bec24017bd5a13f3855 SHA512 4ffcce0edb49333d9fcf6dc382f58abc60f9e35cdcebc7a98115203523403a5b10795de7f46cd2787fa250dfa887283c4752435c57bf0f60a8000c735b648062 WHIRLPOOL 3af39aba7900a6cce8f7b72ae1ede6ce1ecf120b49301f59f62d1025942a0926ff505965710dae10fb2e8a47915bd7fc54dab59405d6f7e5a3ce206ab5f1ffe2
DIST easytag-2.2.6.tar.xz 1016508 SHA256 26437f0d698c3b16794336c335b40f53fa26aefeb77322e45e4e2501c4cff14a SHA512 abd2f0e0c378c487d6b8f4761db610bf596a97cdfa469d8e597b3965934aa4e3a2e374afb404dcbd68ea124de194f428fee4ec7fe5e2615e87e92be3c9b8a246 WHIRLPOOL 9425b6f9a6bda67ac91475d2f972d70b06861d41d9a994d8a2f67fc0110b343dc87b8c83435a30a46ff8faaf9193fda529df8c3e55d4540d90fe461490a3f9a4
+DIST easytag-2.4.0.tar.xz 1342852 SHA256 b8d882bc168abca96b1b369b10e5b97fa29a7a43f7b33f34489768d111610c3d SHA512 c2cf8c30871a7505c8fda1d6af71d9792aad64565e1351d616858f545ed05477dd48d41628efc22d2edf1aa0f38ceb91d433a51512f01ea81a512f6c9893da0f WHIRLPOOL 764d6a0a6d824ba4457291fdb314a53f29251c6722ba1da19e59874f3b1269b8e91fd1d0b8d2a991247c67bbc2d9acf0adc3d62121029427a8300ae53127be40
diff --git a/media-sound/easytag/easytag-2.2.2.ebuild b/media-sound/easytag/easytag-2.2.2.ebuild
deleted file mode 100644
index 8ad4c6c..0000000
--- a/media-sound/easytag/easytag-2.2.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit fdo-mime gnome.org gnome2-utils
-
-DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
-HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
-REQUIRED_USE="|| ( gtk2 gtk3 )
- opus? ( vorbis )
- speex? ( vorbis )"
-
-RDEPEND=">=dev-libs/glib-2.32:2
- flac? ( >=media-libs/flac-1.3 )
- gtk2? ( >=x11-libs/gtk+-2.24:2 )
- gtk3? ( >=x11-libs/gtk+-3.4:3 )
- mp3? (
- >=media-libs/id3lib-3.8.3-r8
- >=media-libs/libid3tag-0.15.1b-r4
- )
- mp4? ( >=media-libs/taglib-1.9.1[mp4] )
- opus? (
- >=media-libs/opus-1.1
- >=media-libs/opusfile-0.4
- )
- speex? ( >=media-libs/speex-1.2_rc1 )
- vorbis? (
- >=media-libs/libogg-1.3.1
- >=media-libs/libvorbis-1.3.4
- )
- wavpack? ( >=media-sound/wavpack-4.70 )"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.4
- app-text/yelp-tools
- dev-libs/libxml2
- dev-libs/libxslt
- >=dev-util/intltool-0.50
- >=sys-devel/gettext-0.18.3.2
- virtual/pkgconfig
- !<dev-util/pkgconfig-0.27
- test? (
- >=dev-util/appdata-tools-0.1.7
- >=dev-util/desktop-file-utils-0.22
- )"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
-
-src_prepare() {
- sed -i \
- -e '/^DEPRECATED_CPPFLAGS="/d' \
- -e '/warning_flags/s: -Werror=.*:":' \
- configure || die
-}
-
-src_configure() {
- # Kludge to make easytag find its locales (bug #503698)
- export DATADIRNAME=share
-
- econf \
- $(use_enable test appdata-validate) \
- $(use_enable test tests) \
- $(use_enable mp3) \
- $(use_enable mp3 id3v23) \
- $(use_enable vorbis ogg) \
- $(use_enable opus) \
- $(use_enable speex) \
- $(use_enable flac) \
- $(use_enable mp4) \
- $(use_enable wavpack) \
- $(use_with gtk2)
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
-pkg_postrm() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.2.3.ebuild b/media-sound/easytag/easytag-2.2.3.ebuild
deleted file mode 100644
index 8ad4c6c..0000000
--- a/media-sound/easytag/easytag-2.2.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit fdo-mime gnome.org gnome2-utils
-
-DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
-HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
-REQUIRED_USE="|| ( gtk2 gtk3 )
- opus? ( vorbis )
- speex? ( vorbis )"
-
-RDEPEND=">=dev-libs/glib-2.32:2
- flac? ( >=media-libs/flac-1.3 )
- gtk2? ( >=x11-libs/gtk+-2.24:2 )
- gtk3? ( >=x11-libs/gtk+-3.4:3 )
- mp3? (
- >=media-libs/id3lib-3.8.3-r8
- >=media-libs/libid3tag-0.15.1b-r4
- )
- mp4? ( >=media-libs/taglib-1.9.1[mp4] )
- opus? (
- >=media-libs/opus-1.1
- >=media-libs/opusfile-0.4
- )
- speex? ( >=media-libs/speex-1.2_rc1 )
- vorbis? (
- >=media-libs/libogg-1.3.1
- >=media-libs/libvorbis-1.3.4
- )
- wavpack? ( >=media-sound/wavpack-4.70 )"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.4
- app-text/yelp-tools
- dev-libs/libxml2
- dev-libs/libxslt
- >=dev-util/intltool-0.50
- >=sys-devel/gettext-0.18.3.2
- virtual/pkgconfig
- !<dev-util/pkgconfig-0.27
- test? (
- >=dev-util/appdata-tools-0.1.7
- >=dev-util/desktop-file-utils-0.22
- )"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
-
-src_prepare() {
- sed -i \
- -e '/^DEPRECATED_CPPFLAGS="/d' \
- -e '/warning_flags/s: -Werror=.*:":' \
- configure || die
-}
-
-src_configure() {
- # Kludge to make easytag find its locales (bug #503698)
- export DATADIRNAME=share
-
- econf \
- $(use_enable test appdata-validate) \
- $(use_enable test tests) \
- $(use_enable mp3) \
- $(use_enable mp3 id3v23) \
- $(use_enable vorbis ogg) \
- $(use_enable opus) \
- $(use_enable speex) \
- $(use_enable flac) \
- $(use_enable mp4) \
- $(use_enable wavpack) \
- $(use_with gtk2)
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
-pkg_postrm() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.2.4.ebuild b/media-sound/easytag/easytag-2.2.4.ebuild
deleted file mode 100644
index 8ad4c6c..0000000
--- a/media-sound/easytag/easytag-2.2.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit fdo-mime gnome.org gnome2-utils
-
-DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
-HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
-REQUIRED_USE="|| ( gtk2 gtk3 )
- opus? ( vorbis )
- speex? ( vorbis )"
-
-RDEPEND=">=dev-libs/glib-2.32:2
- flac? ( >=media-libs/flac-1.3 )
- gtk2? ( >=x11-libs/gtk+-2.24:2 )
- gtk3? ( >=x11-libs/gtk+-3.4:3 )
- mp3? (
- >=media-libs/id3lib-3.8.3-r8
- >=media-libs/libid3tag-0.15.1b-r4
- )
- mp4? ( >=media-libs/taglib-1.9.1[mp4] )
- opus? (
- >=media-libs/opus-1.1
- >=media-libs/opusfile-0.4
- )
- speex? ( >=media-libs/speex-1.2_rc1 )
- vorbis? (
- >=media-libs/libogg-1.3.1
- >=media-libs/libvorbis-1.3.4
- )
- wavpack? ( >=media-sound/wavpack-4.70 )"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.4
- app-text/yelp-tools
- dev-libs/libxml2
- dev-libs/libxslt
- >=dev-util/intltool-0.50
- >=sys-devel/gettext-0.18.3.2
- virtual/pkgconfig
- !<dev-util/pkgconfig-0.27
- test? (
- >=dev-util/appdata-tools-0.1.7
- >=dev-util/desktop-file-utils-0.22
- )"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
-
-src_prepare() {
- sed -i \
- -e '/^DEPRECATED_CPPFLAGS="/d' \
- -e '/warning_flags/s: -Werror=.*:":' \
- configure || die
-}
-
-src_configure() {
- # Kludge to make easytag find its locales (bug #503698)
- export DATADIRNAME=share
-
- econf \
- $(use_enable test appdata-validate) \
- $(use_enable test tests) \
- $(use_enable mp3) \
- $(use_enable mp3 id3v23) \
- $(use_enable vorbis ogg) \
- $(use_enable opus) \
- $(use_enable speex) \
- $(use_enable flac) \
- $(use_enable mp4) \
- $(use_enable wavpack) \
- $(use_with gtk2)
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
-pkg_postrm() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.2.5.ebuild b/media-sound/easytag/easytag-2.2.5.ebuild
deleted file mode 100644
index 8ad4c6c..0000000
--- a/media-sound/easytag/easytag-2.2.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit fdo-mime gnome.org gnome2-utils
-
-DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
-HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
-REQUIRED_USE="|| ( gtk2 gtk3 )
- opus? ( vorbis )
- speex? ( vorbis )"
-
-RDEPEND=">=dev-libs/glib-2.32:2
- flac? ( >=media-libs/flac-1.3 )
- gtk2? ( >=x11-libs/gtk+-2.24:2 )
- gtk3? ( >=x11-libs/gtk+-3.4:3 )
- mp3? (
- >=media-libs/id3lib-3.8.3-r8
- >=media-libs/libid3tag-0.15.1b-r4
- )
- mp4? ( >=media-libs/taglib-1.9.1[mp4] )
- opus? (
- >=media-libs/opus-1.1
- >=media-libs/opusfile-0.4
- )
- speex? ( >=media-libs/speex-1.2_rc1 )
- vorbis? (
- >=media-libs/libogg-1.3.1
- >=media-libs/libvorbis-1.3.4
- )
- wavpack? ( >=media-sound/wavpack-4.70 )"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.4
- app-text/yelp-tools
- dev-libs/libxml2
- dev-libs/libxslt
- >=dev-util/intltool-0.50
- >=sys-devel/gettext-0.18.3.2
- virtual/pkgconfig
- !<dev-util/pkgconfig-0.27
- test? (
- >=dev-util/appdata-tools-0.1.7
- >=dev-util/desktop-file-utils-0.22
- )"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
-
-src_prepare() {
- sed -i \
- -e '/^DEPRECATED_CPPFLAGS="/d' \
- -e '/warning_flags/s: -Werror=.*:":' \
- configure || die
-}
-
-src_configure() {
- # Kludge to make easytag find its locales (bug #503698)
- export DATADIRNAME=share
-
- econf \
- $(use_enable test appdata-validate) \
- $(use_enable test tests) \
- $(use_enable mp3) \
- $(use_enable mp3 id3v23) \
- $(use_enable vorbis ogg) \
- $(use_enable opus) \
- $(use_enable speex) \
- $(use_enable flac) \
- $(use_enable mp4) \
- $(use_enable wavpack) \
- $(use_with gtk2)
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
-pkg_postrm() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.2.6.ebuild b/media-sound/easytag/easytag-2.2.6.ebuild
index 8ad4c6c..5eb03f2 100644
--- a/media-sound/easytag/easytag-2.2.6.ebuild
+++ b/media-sound/easytag/easytag-2.2.6.ebuild
@@ -59,9 +59,6 @@
}
src_configure() {
- # Kludge to make easytag find its locales (bug #503698)
- export DATADIRNAME=share
-
econf \
$(use_enable test appdata-validate) \
$(use_enable test tests) \
diff --git a/media-sound/easytag/easytag-2.4.0.ebuild b/media-sound/easytag/easytag-2.4.0.ebuild
new file mode 100644
index 0000000..1017064
--- /dev/null
+++ b/media-sound/easytag/easytag-2.4.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit fdo-mime gnome.org gnome2-utils
+
+DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
+HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
+REQUIRED_USE="opus? ( vorbis )
+ speex? ( vorbis )"
+
+RDEPEND=">=dev-libs/glib-2.38:2
+ media-libs/libcanberra[gtk3]
+ >=x11-libs/gtk+-3.10:3
+ flac? ( >=media-libs/flac-1.3 )
+ mp3? (
+ >=media-libs/id3lib-3.8.3-r8
+ >=media-libs/libid3tag-0.15.1b-r4
+ )
+ mp4? ( >=media-libs/taglib-1.9.1[mp4] )
+ opus? (
+ >=media-libs/opus-1.1
+ >=media-libs/opusfile-0.4
+ )
+ speex? ( >=media-libs/speex-1.2_rc1 )
+ vorbis? (
+ >=media-libs/libogg-1.3.1
+ >=media-libs/libvorbis-1.3.4
+ )
+ wavpack? ( >=media-sound/wavpack-4.70 )"
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.4
+ app-text/yelp-tools
+ dev-libs/libxml2
+ dev-libs/libxslt
+ >=dev-util/intltool-0.50
+ >=sys-devel/gettext-0.18.3.2
+ virtual/pkgconfig
+ !<dev-util/pkgconfig-0.27
+ test? (
+ >=dev-util/appdata-tools-0.1.7
+ >=dev-util/desktop-file-utils-0.22
+ )"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+
+src_prepare() {
+ sed -i \
+ -e '/^DEPRECATED_CPPFLAGS="/d' \
+ -e '/warning_flags/s: -Werror=.*:":' \
+ configure || die
+}
+
+src_configure() {
+ econf \
+ $(use_enable test appdata-validate) \
+ $(use_enable test tests) \
+ $(use_enable mp3) \
+ $(use_enable mp3 id3v23) \
+ $(use_enable vorbis ogg) \
+ $(use_enable opus) \
+ $(use_enable speex) \
+ $(use_enable flac) \
+ $(use_enable mp4) \
+ $(use_enable wavpack)
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+ gnome2_schemas_update
+}
diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest
index 109d80e..0f7be28 100644
--- a/media-sound/karlyriceditor/Manifest
+++ b/media-sound/karlyriceditor/Manifest
@@ -1,2 +1,2 @@
-DIST karlyriceditor-1.3.tar.gz 215564 SHA256 f59bc9352e30a02228db65d47e190aa00e6f8e7f6ec18b093a30841548b90e57 SHA512 23e91e6f950b4f3d5ddaa474380dfd5904bd29f262144df6d587efbba070e1c84bd6d364981e0babb75aa4562c375734b16944817e49ad83ab0c169cf9d2e0e5 WHIRLPOOL d71b7111e2bf57a995acb10de14c39bce37c8f8072936812d8d672540dd22650ce1259cffccecfe6231ca0a3cba87546cd00247247bdc2b6deeb58f2e6c11c10
+DIST karlyriceditor-1.11.tar.gz 275744 SHA256 55c074111d5e22950d9ef270d5c38f52bc3da167081efe570f77b8f4e578b8dc SHA512 d86cc10c18bff321d2f22b4b810bcc52189602bfddbe8cbdd99120cf281dc673221ce75c9a8e07b8bab03f9a60c3634853177b3fa72e3f1213b96a3303568820 WHIRLPOOL 9495665856346ab54a0662a2a89bb7a10358f16d9844491ddcb9105cc266c1994b786b60bf56b5c206e2740aa77599653cb5c23ae88cdb026bd44adafa7a77a8
DIST karlyriceditor-1.4.tar.gz 236662 SHA256 b458eb21087cd0d92e8ea87b4ac094a2126cfbcf6471b0b1ea03173cec0ebfef SHA512 ac92e8f67be46880e71082ae1b2d099deb15ca1abca1fdf7eb8539d0346ca223ee50d9739f7879699fb190e7bc544c2a753402804df20c9b4c35eefae2d3bdbb WHIRLPOOL 9072da5010deb34fe9e09dee165f824b3aeace89a3fd0c1b464def17cf767a5ee84a77d7b2f8696f81364be5bc54003243faba3870198ba084b98e3bc2207984
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch b/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch
new file mode 100644
index 0000000..6322c07
--- /dev/null
+++ b/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch
@@ -0,0 +1,320 @@
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin@steghoefer.eu>
+Date: Tue, 13 Nov 2012 20:19:11 +0100
+Subject: Add missing includes for libavutil
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Martin Steghöfer <martin@steghoefer.eu>
+Bug: http://sourceforge.net/tracker/?func=detail&aid=3512390&group_id=290648&atid=1229531
+Forwarded: not-needed
+
+Added includes necessary for the use of the function "av_rescale_q".
+Forwarding to upstream not needed because an equivalent patch has already been
+posted to upstream's bug tracker (see URL in the "Bug" field).
+---
+ src/audioplayerprivate.cpp | 3 +++
+ src/ffmpegvideoencoder.cpp | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/audioplayerprivate.cpp b/src/audioplayerprivate.cpp
+index ffff90e..1b6b32d 100644
+--- a/src/audioplayerprivate.cpp
++++ b/src/audioplayerprivate.cpp
+@@ -21,6 +21,9 @@
+
+ #include "audioplayer.h"
+ #include "audioplayerprivate.h"
++extern "C" {
++#include "libavutil/mathematics.h"
++}
+ #include <SDL/SDL.h>
+
+ // SDL defines its own main() function in SDL_main. And so does Qt, so if we continue without
+diff --git a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp
+index 5734d2e..49182b5 100644
+--- a/src/ffmpegvideoencoder.cpp
++++ b/src/ffmpegvideoencoder.cpp
+@@ -28,6 +28,9 @@
+ #include "videoencodingprofiles.h"
+ #include "audioplayer.h"
+ #include "audioplayerprivate.h"
++extern "C" {
++#include "libavutil/mathematics.h"
++}
+
+
+ #define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin@steghoefer.eu>
+Date: Sat, 12 Apr 2014 15:19:48 +0200
+Subject: Fix compilation: FFmpeg/Libav
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Martin Steghöfer <martin@steghoefer.eu>
+Forwarded: not-needed
+
+The upstream developers compile Karlyriceditor against FFmpeg, but in Debian
+there is only Libav available, whose API is slowly drifting away from
+FFmpeg's. This patch adapts the code to several of those differences:
+* The second parameters of "avformat_new_stream" is of non-const pointer
+ type, but the code tries to pass a const pointer to it.
+* There is no AV_ROUND_PASS_MINMAX flag for the rounding parameter of
+ av_rescale_q_rnd in Libav.
+* The member r_frame_rate is no longer present in AVStream. The recommended
+ replacement is avg_frame_rate.
+* The enums CODEC_ID_MP3 and CODEC_ID_AC3 have been prefixed with AV_.
+* The function avcodec_alloc_frame was removed in favor of av_frame_alloc.
+ The corresponding deallocation function is av_frame_free (not the generic
+ av_free).
+---
+ src/audioplayerprivate.cpp | 4 ++--
+ src/ffmpegvideodecoder.cpp | 8 ++++----
+ src/ffmpegvideoencoder.cpp | 32 ++++++++++++++++++++------------
+ 3 files changed, 26 insertions(+), 18 deletions(-)
+
+diff --git a/src/audioplayerprivate.cpp b/src/audioplayerprivate.cpp
+index 1b6b32d..a6536cd 100644
+--- a/src/audioplayerprivate.cpp
++++ b/src/audioplayerprivate.cpp
+@@ -118,7 +118,7 @@ void AudioPlayerPrivate::close()
+ }
+
+ if ( m_frame )
+- av_free( m_frame );
++ av_frame_free( &m_frame );
+
+ m_frame = 0;
+ pFormatCtx = 0;
+@@ -227,7 +227,7 @@ bool AudioPlayerPrivate::open( const QString& filename )
+ }
+
+ // Allocate the buffer
+- m_frame = avcodec_alloc_frame();
++ m_frame = av_frame_alloc();
+
+ if ( !m_frame )
+ {
+diff --git a/src/ffmpegvideodecoder.cpp b/src/ffmpegvideodecoder.cpp
+index 2ec5969..7820f72 100644
+--- a/src/ffmpegvideodecoder.cpp
++++ b/src/ffmpegvideodecoder.cpp
+@@ -113,8 +113,8 @@ bool FFMpegVideoDecoder::openFile( const QString& filename, unsigned int seekto
+ if ( d->videoStream == -1 )
+ return false; // Didn't find a video stream
+
+- d->m_fps_den = d->pFormatCtx->streams[d->videoStream]->r_frame_rate.den;
+- d->m_fps_num = d->pFormatCtx->streams[d->videoStream]->r_frame_rate.num;
++ d->m_fps_den = d->pFormatCtx->streams[d->videoStream]->avg_frame_rate.den;
++ d->m_fps_num = d->pFormatCtx->streams[d->videoStream]->avg_frame_rate.num;
+
+ if ( d->m_fps_den == 60000 )
+ d->m_fps_den = 30000;
+@@ -139,10 +139,10 @@ bool FFMpegVideoDecoder::openFile( const QString& filename, unsigned int seekto
+ }
+
+ // Allocate video frame
+- d->pFrame = avcodec_alloc_frame();
++ d->pFrame = av_frame_alloc();
+
+ // Allocate an AVFrame structure
+- d->pFrameRGB = avcodec_alloc_frame();
++ d->pFrameRGB = av_frame_alloc();
+
+ if ( !d->pFrame || !d->pFrameRGB )
+ {
+diff --git a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp
+index 49182b5..bdf1730 100644
+--- a/src/ffmpegvideoencoder.cpp
++++ b/src/ffmpegvideoencoder.cpp
+@@ -174,10 +174,10 @@ bool FFMpegVideoEncoderPriv::close()
+ delete[] audioSampleBuffer;
+
+ if ( videoFrame )
+- av_free(videoFrame);
++ av_frame_free( &videoFrame );
+
+ if ( audioFrame )
+- av_free( audioFrame );
++ av_frame_free( &audioFrame );
+
+ outputFormatCtx = 0;
+ outputFormat = 0;
+@@ -383,7 +383,11 @@ av_log_set_level(AV_LOG_VERBOSE);
+ }
+
+ // Create the video stream, index
+- videoStream = avformat_new_stream( outputFormatCtx, videoCodecCtx->codec );
++ // Use a block to keep the helper variable "codec" local to avoid conflict with gotos
++ {
++ AVCodec codec = *videoCodecCtx->codec;
++ videoStream = avformat_new_stream( outputFormatCtx, &codec );
++ }
+
+ if ( !videoStream )
+ {
+@@ -425,10 +429,10 @@ av_log_set_level(AV_LOG_VERBOSE);
+ // We're copying the stream
+ memcpy( newCtx, m_aplayer->aCodecCtx, sizeof(AVCodecContext) );
+
+- if ( newCtx->block_align == 1 && newCtx->codec_id == CODEC_ID_MP3 )
++ if ( newCtx->block_align == 1 && newCtx->codec_id == AV_CODEC_ID_MP3 )
+ newCtx->block_align= 0;
+
+- if ( newCtx->codec_id == CODEC_ID_AC3 )
++ if ( newCtx->codec_id == AV_CODEC_ID_AC3 )
+ newCtx->block_align= 0;
+ }
+ else
+@@ -443,7 +447,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ }
+
+ // Hack to use the fixed AC3 codec if available
+- if ( audioCodec->id == CODEC_ID_AC3 && avcodec_find_encoder_by_name( "ac3_fixed" ) )
++ if ( audioCodec->id == AV_CODEC_ID_AC3 && avcodec_find_encoder_by_name( "ac3_fixed" ) )
+ audioCodec = avcodec_find_encoder_by_name( "ac3_fixed" );
+
+ // Allocate the audio context
+@@ -544,7 +548,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ goto cleanup;
+ }
+
+- audioFrame = avcodec_alloc_frame();
++ audioFrame = av_frame_alloc();
+
+ if ( !audioFrame )
+ {
+@@ -573,10 +577,10 @@ av_log_set_level(AV_LOG_VERBOSE);
+ goto cleanup;
+ }
+
+- if ( audioStream->codec->block_align == 1 && audioStream->codec->codec_id == CODEC_ID_MP3 )
++ if ( audioStream->codec->block_align == 1 && audioStream->codec->codec_id == AV_CODEC_ID_MP3 )
+ audioStream->codec->block_align= 0;
+
+- if ( audioStream->codec->codec_id == CODEC_ID_AC3 )
++ if ( audioStream->codec->codec_id == AV_CODEC_ID_AC3 )
+ audioStream->codec->block_align= 0;
+ }
+
+@@ -595,7 +599,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ }
+
+ // Allocate the YUV frame
+- videoFrame = avcodec_alloc_frame();
++ videoFrame = av_frame_alloc();
+
+ if ( !videoFrame )
+ {
+@@ -753,8 +757,12 @@ int FFMpegVideoEncoderPriv::encodeImage( const QImage &img, qint64 )
+ pkt.flags |= AV_PKT_FLAG_KEY;
+
+ // Rescale output packet timestamp values from codec to stream timebase
+- pkt.pts = av_rescale_q_rnd( pkt.pts, audioCodecCtx->time_base, audioStream->time_base, (AVRounding) (AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX) );
+- pkt.dts = av_rescale_q_rnd( pkt.dts, audioCodecCtx->time_base, audioStream->time_base, (AVRounding) (AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX) );
++ if ( pkt.pts != AV_NOPTS_VALUE ) {
++ pkt.pts = av_rescale_q_rnd( pkt.pts, audioCodecCtx->time_base, audioStream->time_base, AV_ROUND_NEAR_INF );
++ }
++ if ( pkt.dts != AV_NOPTS_VALUE ) {
++ pkt.dts = av_rescale_q_rnd( pkt.dts, audioCodecCtx->time_base, audioStream->time_base, AV_ROUND_NEAR_INF );
++ }
+ pkt.duration = av_rescale_q( pkt.duration, audioCodecCtx->time_base, audioStream->time_base);
+
+ // And write the file
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin@steghoefer.eu>
+Date: Sat, 10 May 2014 01:04:56 +0200
+Subject: Fix segfault: AVFrame initialization (Libav/FFmpeg)
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Martin Steghöfer <martin@steghoefer.eu>
+Forwarded: not-needed
+
+The upstream developers compile Karlyriceditor against FFmpeg, but in Debian
+there is only Libav available, whose API is slowly drifting away from
+FFmpeg's. This patch adapts the code to one of those differences.
+In Libav the function avcodec_get_frame_defaults cannot be called on a
+completely uninitialized object. It expects at least some pointers inside
+the struct to be initialized to NULL. Otherwise (depending on the random
+pointer value) it may perform a free() on that random pointer. In Libav the
+preferred way to initialize an AVFrame object is by calling
+avcodec_alloc_frame(), which allocates the memory, initializes it to zero
+and then calls avcodec_get_frame_defaults itself. This involves changing
+"srcaudio" from a stack object to a heap object and freeing it after use.
+---
+ src/ffmpegvideoencoder.cpp | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp
+index bdf1730..ccfdc7c 100644
+--- a/src/ffmpegvideoencoder.cpp
++++ b/src/ffmpegvideoencoder.cpp
+@@ -685,12 +685,11 @@ int FFMpegVideoEncoderPriv::encodeImage( const QImage &img, qint64 )
+ }
+
+ // Initialize the frame
+- AVFrame srcaudio;
+- avcodec_get_frame_defaults( &srcaudio );
++ AVFrame *srcaudio = av_frame_alloc();
+
+ // Decode the original audio into the srcaudio frame
+ int got_audio;
+- err = avcodec_decode_audio4( m_aplayer->aCodecCtx, &srcaudio, &got_audio, &pkt );
++ err = avcodec_decode_audio4( m_aplayer->aCodecCtx, srcaudio, &got_audio, &pkt );
+
+ if ( err < 0 )
+ {
+@@ -710,9 +709,9 @@ int FFMpegVideoEncoderPriv::encodeImage( const QImage &img, qint64 )
+ NULL,
+ 0,
+ 0,
+- srcaudio.data,
++ srcaudio->data,
+ 0,
+- srcaudio.nb_samples )) < 0 )
++ srcaudio->nb_samples )) < 0 )
+ {
+ qWarning( "Error resampling decoded audio: %d", err );
+ return -1;
+@@ -777,6 +776,8 @@ int FFMpegVideoEncoderPriv::encodeImage( const QImage &img, qint64 )
+ av_free_packet( &pkt );
+ }
+ }
++
++ av_frame_free( &srcaudio );
+ }
+ }
+
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin@steghoefer.eu>
+Date: Sat, 10 May 2014 13:19:25 +0200
+Subject: Fix FP exception: Sample aspect ratio (Libav/FFmpeg)
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Martin Steghöfer <martin@steghoefer.eu>
+Forwarded: not-needed
+
+The upstream developers compile Karlyriceditor against FFmpeg, but in Debian
+there is only Libav available, whose API is slowly drifting away from
+FFmpeg's. This patch adapts the code to one of those differences.
+In Libav sample aspect ratio of a AVStream object is not automatically
+initialized to the one of its codec. So this has to be done manually.
+---
+ src/ffmpegvideoencoder.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp
+index ccfdc7c..3122f2a 100644
+--- a/src/ffmpegvideoencoder.cpp
++++ b/src/ffmpegvideoencoder.cpp
+@@ -399,6 +399,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ videoStream->codec = videoCodecCtx;
+
+ // Set the video stream timebase if not set
++ videoStream->sample_aspect_ratio = videoCodecCtx->sample_aspect_ratio;
+ if ( videoStream->time_base.den == 0 )
+ videoStream->time_base = videoCodecCtx->time_base;
+
diff --git a/media-sound/karlyriceditor/karlyriceditor-1.11-r1.ebuild b/media-sound/karlyriceditor/karlyriceditor-1.11-r1.ebuild
new file mode 100644
index 0000000..6f968fa
--- /dev/null
+++ b/media-sound/karlyriceditor/karlyriceditor-1.11-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Application to edit and synchronize lyrics with karaoke songs in various formats"
+HOMEPAGE="http://www.ulduzsoft.com/linux/karaoke-lyrics-editor/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="
+ dev-libs/openssl:0
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ media-libs/libsdl[sound]
+ libav? ( media-video/libav:= )
+ !libav? ( media-video/ffmpeg:= )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-libav.patch" )
+
+src_install() {
+ dodoc Changelog
+ dobin bin/${PN}
+ doicon packages/${PN}.png
+ make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
+}
diff --git a/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild b/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild
deleted file mode 100644
index b9afaa0..0000000
--- a/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils qt4-r2
-
-DESCRIPTION="A program which lets you edit and synchronize lyrics with karaoke songs in varions formats"
-HOMEPAGE="http://www.karlyriceditor.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl:0
- media-libs/libsdl
- >=virtual/ffmpeg-0.9
- dev-qt/qtcore:4
- dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-libav.patch" )
-
-src_install() {
- dodoc Changelog
- dobin bin/${PN}
- doicon packages/${PN}.png
- make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
-}
diff --git a/media-sound/kwave/kwave-0.8.10.ebuild b/media-sound/kwave/kwave-0.8.10.ebuild
index 9a00ffa..ceabb28 100644
--- a/media-sound/kwave/kwave-0.8.10.ebuild
+++ b/media-sound/kwave/kwave-0.8.10.ebuild
@@ -4,6 +4,7 @@
EAPI=5
+CMAKE_MAKEFILE_GENERATOR="emake"
KDE_LINGUAS="cs de fr"
KDE_HANDBOOK="optional"
inherit kde4-base
diff --git a/media-sound/kwave/kwave-0.8.12.ebuild b/media-sound/kwave/kwave-0.8.12.ebuild
index c5c0edf..6dc0d5a 100644
--- a/media-sound/kwave/kwave-0.8.12.ebuild
+++ b/media-sound/kwave/kwave-0.8.12.ebuild
@@ -4,6 +4,7 @@
EAPI=5
+CMAKE_MAKEFILE_GENERATOR="emake"
KDE_LINGUAS="cs de es fr"
KDE_HANDBOOK="optional"
inherit kde4-base
diff --git a/media-sound/kwave/kwave-0.8.99.ebuild b/media-sound/kwave/kwave-0.8.99.ebuild
index 3d41ad9..a2b42cc 100644
--- a/media-sound/kwave/kwave-0.8.99.ebuild
+++ b/media-sound/kwave/kwave-0.8.99.ebuild
@@ -4,6 +4,7 @@
EAPI=5
+CMAKE_MAKEFILE_GENERATOR="emake"
KDE_LINGUAS="cs de es fr"
KDE_HANDBOOK="optional"
inherit kde4-base
diff --git a/media-sound/mac/mac-3.99.4.5.7-r1.ebuild b/media-sound/mac/mac-3.99.4.5.7-r1.ebuild
index f0b8f1d..a59da99 100644
--- a/media-sound/mac/mac-3.99.4.5.7-r1.ebuild
+++ b/media-sound/mac/mac-3.99.4.5.7-r1.ebuild
@@ -16,7 +16,7 @@
LICENSE="mac"
SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 x86"
IUSE="cpu_flags_x86_mmx static-libs"
RDEPEND=""
diff --git a/media-sound/mp3diags/metadata.xml b/media-sound/mp3diags/metadata.xml
index 3159078..32a4a36 100644
--- a/media-sound/mp3diags/metadata.xml
+++ b/media-sound/mp3diags/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
- </maintainer>
<herd>qt</herd>
<upstream>
<remote-id type="sourceforge">mp3diags</remote-id>
diff --git a/media-sound/mumble/mumble-1.2.10-r1.ebuild b/media-sound/mumble/mumble-1.2.10-r1.ebuild
new file mode 100644
index 0000000..267536c
--- /dev/null
+++ b/media-sound/mumble/mumble-1.2.10-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+QT_MINIMAL="4.6"
+
+inherit eutils multilib qt4-r2
+
+MY_P="${PN}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf"
+
+RDEPEND=">=dev-libs/boost-1.41.0
+ !libressl? ( >=dev-libs/openssl-1.0.0b:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/protobuf-2.2.0
+ >=media-libs/libsndfile-1.0.20[-minimal]
+ >=media-libs/opus-1.0.1
+ >=media-libs/speex-1.2_rc1
+ sys-apps/lsb-release
+ x11-libs/libX11
+ x11-libs/libXi
+ dev-qt/qtcore:4[ssl]
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ dev-qt/qtsql:4[sqlite]
+ dev-qt/qtsvg:4
+ dev-qt/qtxmlpatterns:4
+ x11-proto/inputproto
+ alsa? ( media-libs/alsa-lib )
+ dbus? ( dev-qt/qtdbus:4 )
+ g15? ( app-misc/g15daemon )
+ portaudio? ( media-libs/portaudio )
+ pulseaudio? ( media-sound/pulseaudio )
+ speech? ( app-accessibility/speech-dispatcher )
+ zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ local conf_add
+
+ if has_version '<=sys-devel/gcc-4.2'; then
+ conf_add="${conf_add} no-pch"
+ else
+ use pch || conf_add="${conf_add} no-pch"
+ fi
+
+ use alsa || conf_add="${conf_add} no-alsa"
+ use dbus || conf_add="${conf_add} no-dbus"
+ use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+ use g15 || conf_add="${conf_add} no-g15"
+ use oss || conf_add="${conf_add} no-oss"
+ use portaudio || conf_add="${conf_add} no-portaudio"
+ use pulseaudio || conf_add="${conf_add} no-pulseaudio"
+ use speech || conf_add="${conf_add} no-speechd"
+ use zeroconf || conf_add="${conf_add} no-bonjour"
+
+ eqmake4 "${S}/main.pro" -recursive \
+ CONFIG+="${conf_add} \
+ bundled-celt \
+ no-bundled-opus \
+ no-bundled-speex \
+ no-embed-qt-translations \
+ no-server \
+ no-update" \
+ DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+src_compile() {
+ # parallel make workaround, bug #445960
+ emake -j1
+}
+
+src_install() {
+ newdoc README.Linux README
+ dodoc CHANGES
+
+ local dir
+ if use debug; then
+ dir=debug
+ else
+ dir=release
+ fi
+
+ dobin "${dir}"/mumble
+ dobin scripts/mumble-overlay
+
+ insinto /usr/share/services
+ doins scripts/mumble.protocol
+
+ domenu scripts/mumble.desktop
+
+ insinto /usr/share/icons/hicolor/scalable/apps
+ doins icons/mumble.svg
+
+ doman man/mumble-overlay.1
+ doman man/mumble.1
+
+ insopts -o root -g root -m 0755
+ insinto "/usr/$(get_libdir)/mumble"
+ doins "${dir}"/libmumble.so.${PV}
+ dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
+ doins "${dir}"/libcelt0.so.0.{7,11}.0
+ doins "${dir}"/plugins/lib*.so*
+}
+
+pkg_postinst() {
+ echo
+ elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+ elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+ echo
+}
diff --git a/media-sound/musique/Manifest b/media-sound/musique/Manifest
index e22fbb7..971fe7e 100644
--- a/media-sound/musique/Manifest
+++ b/media-sound/musique/Manifest
@@ -1,2 +1,2 @@
-DIST musique-1.2.1.tar.gz 374601 SHA256 cc0f626d7de981ff7fdd776fb9eab6a7750443ad55f6978132d9c9d11abd1f38 SHA512 b6d52d8345c69e5b4bfa6419cab4baeb5ed1c81106fbe98b74943cc4c6aa0712444e2189605132da2a2362d38de322926eb3f6ef0b8f25bb45e3e86e3b74cd33 WHIRLPOOL 775751a857dd2e4fbc1f9e50dea9ed0c9d40edd8af7c1bc0a9c7eb186aad39680760825b5c04bbc439d9ac98682952cf5fc2d8e8db595e0f0a99125e6112a078
DIST musique-1.3.tar.gz 399750 SHA256 401643ad9c750270a89d431806044c626dee3fe7ebc14d0ac72917197cdd0592 SHA512 eb197c315b77d4053960c8c18d012635f957eb9ae89bb8b576f938013db43f78ab0d5a0fe0d46fb32cc9f398f9d7f96a37cf975b2f192a6cbc3dd294c4cad279 WHIRLPOOL b4a48d2e8d57d3cfb6cb3d705b4cccbbaf9ae642f16864bb9c61ece02e658b941472a2767d82218c5bf36031af52354fd2868014d8af0a4b2bb71abdf96f3e6e
+DIST musique-1.4.tar.gz 390031 SHA256 08dfb4201aa0edc4b3fe4ef7788e618f754c3921f3a7c1cdce40ef3999760670 SHA512 0ecc7cf1038880fc302602967cd7563641310cbe19fe2394e8ce2c03562f5e336bfc76e1ea18b026c2602b11cfe278a106bc9b3b2dd625d7e70db0da57985a68 WHIRLPOOL 8185dcbe0559b34d3f8e7b93498312c375412faa83eed01acccc1faaabfb979672cb78969d2965251aa63bd2e38477654575e52d8a760fe186e39398efc08e36
diff --git a/media-sound/musique/files/musique-1.4-unbundle-qtsingleapplication.patch b/media-sound/musique/files/musique-1.4-unbundle-qtsingleapplication.patch
new file mode 100644
index 0000000..ddd5242
--- /dev/null
+++ b/media-sound/musique/files/musique-1.4-unbundle-qtsingleapplication.patch
@@ -0,0 +1,13 @@
+Use system copy of qtsingleapplication.
+
+--- musique.pro
++++ musique.pro
+@@ -16,7 +16,7 @@
+ TARGET = $${APP_UNIX_NAME}
+
+ QT += network xml sql
+-include(src/qtsingleapplication/qtsingleapplication.pri)
++CONFIG += qtsingleapplication
+
+ HEADERS += src/mainwindow.h \
+ src/aboutview.h \
diff --git a/media-sound/musique/musique-1.2.1.ebuild b/media-sound/musique/musique-1.2.1.ebuild
deleted file mode 100644
index 5cf7db1..0000000
--- a/media-sound/musique/musique-1.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Qt4 music player"
-HOMEPAGE="http://flavio.tordini.org/musique"
-# Same tarball for every release. We repackage it
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-qt/qtdbus:4
- dev-qt/qtgui:4[gtkstyle]
- dev-qt/qtsql:4[sqlite]
- || ( dev-qt/qtphonon:4 media-libs/phonon[qt4] )
- media-libs/taglib
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-DOCS="CHANGES TODO"
-
-src_prepare () {
- # bug 422665. Upstream only cares about ubuntu
- # so this bug will be fixed once ubuntu moves
- # to gcc-4.7. No, I will not send this patch upstream
- # *again*
- epatch "${FILESDIR}"/${PN}-1.1-gcc47.patch
- qt4-r2_src_prepare
-}
-
-src_configure() {
- eqmake4 ${PN}.pro PREFIX="/usr"
-}
-
-src_install() {
- qt4-r2_src_install
- doicon data/${PN}.svg
-}
diff --git a/media-sound/musique/musique-1.4.ebuild b/media-sound/musique/musique-1.4.ebuild
new file mode 100644
index 0000000..6e40cbb
--- /dev/null
+++ b/media-sound/musique/musique-1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Qt4 music player"
+HOMEPAGE="http://flavio.tordini.org/musique"
+SRC_URI="http://flavio.tordini.org/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ dev-qt/qtgui:4
+ dev-qt/qtsingleapplication[qt4,X]
+ dev-qt/qtsql:4[sqlite]
+ || ( dev-qt/qtphonon:4 media-libs/phonon[qt4] )
+ media-libs/taglib
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( CHANGES TODO )
+
+src_prepare () {
+ epatch "${FILESDIR}"/${P}-unbundle-qtsingleapplication.patch
+ rm -r src/qtsingleapplication || die
+ qt4-r2_src_prepare
+}
+
+src_configure() {
+ eqmake4 ${PN}.pro PREFIX="/usr"
+}
+
+src_install() {
+ qt4-r2_src_install
+ doicon data/${PN}.svg
+}
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 2b97a83..bd48e1f 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,3 +1,2 @@
-DIST ncmpcpp-0.6.4.tar.bz2 429705 SHA256 757e2e06b7e17009c24e2b46a69f008e61aa679476f93e00dc602ca087c805f1 SHA512 c60a6c2c89a9297d73360ec8819e8ae66ca53090c5ea5d3daf235e708467ee20006b1fff344c9312ccb0941c8307f3d84bcdc9cbf500955c74b10bd6a823c19f WHIRLPOOL 56bd22148f38289030a558b43008f83e9e0ccd1ff178be183ad935d08b397de51c49f2c7d84ab9504b62b0105516f460ff131d65a99af9e73519783e15c84797
DIST ncmpcpp-0.6.5.tar.bz2 429699 SHA256 51128f6835c592c8d4367a66b08e06a9419a86c9d5c6e91d0f1dc73af56cd1fd SHA512 b120bd3c0697d51755e04908d29ddd4180ae662d3f02d60e967ccbefca87471eaf0dcf4ebed5d76203b7a0a6dd17a397f318a65087c1b8ec1e3fb4178964e581 WHIRLPOOL c4fa51645de9f1c7a530ee06113bc0fce5954d155112de4921dec2af5da58465b646c193f8359708b51619ec5f0fc9968680ec22549f97352f9309006499c77b
DIST ncmpcpp-0.6.7.tar.bz2 429687 SHA256 08807dc515b4e093154a6e91cdd17ba64ebedcfcd7aa34d0d6eb4d4cc28a217b SHA512 2161a9799c218fe506aa7645338c6e5b32bc6fcb8ee5bcdc76484a068242ae39fd884ece845e1c2f895305d2e6867a3074c266548322f80766c1b8dfeb5d39bb WHIRLPOOL 9f1e4cda03fcb36c79c34a921e8bd272d1875b96a497c2af0a68f2928e82d0ecce208cd08c89a79643106c284757b85eb0f57bcd241f213c3f5d1bdbad087247
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.4.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.4.ebuild
deleted file mode 100644
index e0caa2b..0000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.6.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="http://ncmpcpp.rybczak.net/"
-SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="clock curl outputs taglib unicode visualizer"
-
-RDEPEND="
- >=media-libs/libmpdclient-2.1
- curl? ( net-misc/curl )
- dev-libs/boost:=[nls,threads]
- sys-libs/ncurses[unicode?]
- sys-libs/readline:*
- taglib? ( media-libs/taglib )
- visualizer? ( sci-libs/fftw:3.0 )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-src_prepare() {
- sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
- sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
- econf \
- $(use_enable clock) \
- $(use_enable outputs) \
- $(use_enable unicode) \
- $(use_enable visualizer) \
- $(use_with curl) \
- $(use_with taglib) \
- $(use_with visualizer fftw) \
- --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
- default
-
- dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
- echo
- elog "Example configuration files have been installed at"
- elog "${ROOT}usr/share/doc/${PF}"
- elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
- elog "as user configuration files."
- echo
- if use visualizer; then
- elog "If you want to use the visualizer, you need mpd with fifo enabled."
- echo
- fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
index fae8b48..583b403 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
@@ -11,7 +11,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86"
IUSE="clock curl outputs taglib unicode visualizer"
RDEPEND="
diff --git a/media-sound/nted/files/nted-1.10.18-freetype.patch b/media-sound/nted/files/nted-1.10.18-freetype.patch
index 66acdf2..505e756 100644
--- a/media-sound/nted/files/nted-1.10.18-freetype.patch
+++ b/media-sound/nted/files/nted-1.10.18-freetype.patch
@@ -1,16 +1,11 @@
-Description: Fix FTBFS caused by freetype headers path change.
-Author: Gilles Filippini <pini@debian.org>
-Bug-Debian: http://bugs.debian.org/733403
-Index: nted/mainwindow.cpp
-===================================================================
---- nted.orig/mainwindow.cpp 2013-12-30 17:45:21.000000000 +0100
-+++ nted/mainwindow.cpp 2013-12-30 17:45:44.000000000 +0100
+--- nted-1.10.18/mainwindow.cpp
++++ nted-1.10.18/mainwindow.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include <ft2build.h>
-#include <freetype/freetype.h>
-+#include <freetype.h>
++#include FT_FREETYPE_H
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <cairo-ps.h>
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index c669c18..72f748a 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1 +1,2 @@
DIST pasystray-0.2.1.tar.bz2 100456 SHA256 d24fe23773e0a25fd32aefe101bb703ca42a487c8e25411c831621332cee61a7 SHA512 db7c05c2eb5fd3dada2e3c23f28978497d17a2147078390ab3e8c88654c4bd8ce48d07a15e9a5b3834acffcc2d86fa719ce2403255915bdfb2eb610bd0549041 WHIRLPOOL 71e4519b9bf6012e770820cf1a72bfb875a34eb87e74eab87edc4a18e01d88ecabf56b88e30686ae409d6fe2456a1058a3194ce539e72934410ba402d72cdd22
+DIST pasystray-0.5.2.tar.gz 51738 SHA256 0cb574843bd7883c51291de03cca237e53a89821d6965c8413dd89e42d8ffc3e SHA512 ef305f354e7e012bb3cf999e7e91b7d1ed2298f633fa67270f9998cb95476460e65a7e3c7fb512da69928ed6ad6579e2c97c4cbf74016e868415f4ba875e0aa7 WHIRLPOOL bbf6cbc416a452ae25495b9a68e153a13ad24cf085462caa18936253addbf1d83cea22fef07de94b16c7c8466944418f3a0389e54bae8be94edae019d79392fe
diff --git a/media-sound/pasystray/metadata.xml b/media-sound/pasystray/metadata.xml
index ea0ac98..fe4fdc2 100644
--- a/media-sound/pasystray/metadata.xml
+++ b/media-sound/pasystray/metadata.xml
@@ -2,6 +2,12 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sound</herd>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>lmiphay@gmail.com</email>
+ <name>Paul Healy</name>
+ <description>Proxy maintainer</description>
+ </maintainer>
<upstream>
<remote-id type="github">christophgysin/pasystray</remote-id>
</upstream>
diff --git a/media-sound/pasystray/pasystray-0.5.2.ebuild b/media-sound/pasystray/pasystray-0.5.2.ebuild
new file mode 100644
index 0000000..16780cb
--- /dev/null
+++ b/media-sound/pasystray/pasystray-0.5.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils autotools
+
+DESCRIPTION="PulseAudio system tray"
+HOMEPAGE="https://github.com/christophgysin/pasystray"
+SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="
+ >=media-sound/pulseaudio-5.0-r3[glib,zeroconf]
+ >=net-dns/avahi-0.6
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ libnotify? ( >=x11-libs/libnotify-0.7 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS="AUTHORS README.md TODO"
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+ eautoreconf
+}
+src_configure() {
+ econf $(use_enable libnotify notify)
+ sed -i -e 's:volume:volume;:' "data/pasystray.desktop"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc ${DOCS}
+ doman man/pasystray.1
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/pulseaudio/pulseaudio-6.0.ebuild b/media-sound/pulseaudio/pulseaudio-6.0.ebuild
index a7c5358..28a8bf7 100644
--- a/media-sound/pulseaudio/pulseaudio-6.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-6.0.ebuild
@@ -17,7 +17,7 @@
SLOT="0"
#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
# +alsa-plugin as discussed in bug #519530
IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild
new file mode 100644
index 0000000..284d4f0
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="http://www.pulseaudio.org/"
+SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+# +alsa-plugin as discussed in bug #519530
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
+gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
++orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
++webrtc-aec +X xen zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="
+ bluetooth? ( dbus )
+ ofono-headset? ( bluetooth )
+ native-headset? ( bluetooth )
+ udev? ( || ( alsa oss ) )
+"
+
+# libpcre needed in some cases, bug #472228
+RDEPEND="
+ || (
+ elibc_glibc? ( virtual/libc )
+ elibc_uclibc? ( virtual/libc )
+ dev-libs/libpcre
+ )
+ >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libICE[${MULTILIB_USEDEP}]
+ x11-libs/libXtst[${MULTILIB_USEDEP}]
+ )
+ caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+ libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+ alsa? ( >=media-libs/alsa-lib-1.0.19 )
+ glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
+ zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+ jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
+ tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
+ lirc? ( app-misc/lirc )
+ dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+ gtk? ( x11-libs/gtk+:3 )
+ gnome? ( >=gnome-base/gconf-2.4.0 )
+ bluetooth? (
+ net-wireless/bluez:=
+ >=sys-apps/dbus-1.0.0
+ media-libs/sbc
+ )
+ asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
+ udev? ( >=virtual/udev-143[hwdb(+)] )
+ realtime? ( sys-auth/rtkit )
+ equalizer? ( sci-libs/fftw:3.0 )
+ ofono-headset? ( >=net-misc/ofono-1.13 )
+ orc? ( >=dev-lang/orc-0.4.15 )
+ sox? ( >=media-libs/soxr-0.1.1 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ >=media-libs/speex-1.2_rc1
+ gdbm? ( sys-libs/gdbm )
+ webrtc-aec? ( media-libs/webrtc-audio-processing )
+ xen? ( app-emulation/xen-tools )
+ systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+ >=dev-libs/json-c-0.11[${MULTILIB_USEDEP}]
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
+ !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+ dev-libs/libltdl:0
+ selinux? ( sec-policy/selinux-pulseaudio )
+"
+# it's a valid RDEPEND, libltdl.so is used for native abi
+
+DEPEND="${RDEPEND}
+ sys-devel/m4
+ doc? ( app-doc/doxygen )
+ test? ( dev-libs/check )
+ X? (
+ x11-proto/xproto[${MULTILIB_USEDEP}]
+ >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
+ )
+ dev-libs/libatomic_ops
+ virtual/pkgconfig
+ system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+ dev-util/intltool
+ >=sys-devel/gettext-0.18.1
+"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+ alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+# PyQt4 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+ equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
+ system-wide? (
+ alsa? ( media-sound/alsa-utils )
+ bluetooth? ( net-wireless/bluez:= )
+ )
+"
+
+pkg_pretend() {
+ CONFIG_CHECK="~HIGH_RES_TIMERS"
+ WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
+ check_extra_config
+
+ if linux_config_exists; then
+ local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
+ if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
+ ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
+ ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
+ fi
+ fi
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ gnome2_environment_reset #543364
+
+ enewgroup audio 18 # Just make sure it exists
+
+ if use system-wide; then
+ enewgroup pulse-access
+ enewgroup pulse
+ enewuser pulse -1 -1 /var/run/pulse pulse,audio
+ fi
+}
+
+src_prepare() {
+ # Skip test that cannot work with sandbox, bug #501846
+ sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+ epatch_user
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf=()
+
+ if use gdbm; then
+ myconf+=( --with-database=gdbm )
+ else
+ myconf+=( --with-database=simple )
+ fi
+
+ if use bluetooth; then
+ if multilib_is_native_abi; then
+ if has_version '<net-wireless/bluez-5'; then
+ myconf+=( --disable-bluez5 --enable-bluez4 )
+ else
+ myconf+=( --enable-bluez5 --disable-bluez4
+ $(use_enable native-headset bluez5-native-headset)
+ $(use_enable ofono-headset bluez5-ofono-headset) )
+ fi
+ fi
+ else
+ myconf+=( --disable-bluez5 --disable-bluez4 )
+ fi
+
+ myconf+=(
+ --enable-largefile
+ $(use_enable glib glib2)
+ --disable-solaris
+ $(use_enable asyncns)
+ $(use_enable oss oss-output)
+ $(use_enable alsa)
+ $(use_enable lirc)
+ $(use_enable neon neon-opt)
+ $(use_enable tcpd tcpwrap)
+ $(use_enable jack)
+ $(use_enable zeroconf avahi)
+ $(use_enable dbus)
+ $(use_enable gnome gconf)
+ $(use_enable gtk gtk3)
+ $(use_enable libsamplerate samplerate)
+ $(use_enable orc)
+ $(use_enable X x11)
+ $(use_enable test default-build-tests)
+ $(use_enable udev)
+ $(use_with sox soxr)
+ $(use_enable systemd systemd-daemon)
+ $(use_enable systemd systemd-login)
+ $(use_enable systemd systemd-journal)
+ $(use_enable ipv6)
+ $(use_enable ssl openssl)
+ $(use_enable webrtc-aec)
+ $(use_enable xen)
+ $(use_with caps)
+ $(use_with equalizer fftw)
+ --disable-adrian-aec
+ --disable-esound
+ --localstatedir="${EPREFIX}"/var
+ --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+ --with-systemduserunitdir=$(systemd_get_userunitdir)
+ )
+
+ if ! multilib_is_native_abi; then
+ # disable all the modules and stuff
+ myconf+=(
+ --disable-oss-output
+ --disable-alsa
+ --disable-lirc
+ --disable-jack
+ --disable-avahi
+ --disable-gconf
+ --disable-gtk3
+ --disable-samplerate
+ --disable-bluez4
+ --disable-bluez5
+ --disable-udev
+ --disable-openssl
+ --disable-orc
+ --disable-webrtc-aec
+ --disable-xen
+ --without-fftw
+ --without-soxr
+
+ # tests involve random modules, so just do them for the native
+ --disable-default-build-tests
+
+ # hack around unnecessary checks
+ # (results don't matter, we're not building anything using it)
+ ac_cv_lib_ltdl_lt_dladvise_init=yes
+ --with-database=simple
+ LIBSPEEX_CFLAGS=' '
+ LIBSPEEX_LIBS=' '
+ )
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ emake
+ use doc && emake doxygen
+ else
+ local targets=( libpulse.la libpulse-simple.la )
+ use glib && targets+=( libpulse-mainloop-glib.la )
+ emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la
+ fi
+}
+
+multilib_src_test() {
+ # We avoid running the toplevel check target because that will run
+ # po/'s tests too, and they are broken. Officially, it should work
+ # with intltool 0.41, but that doesn't look like a stable release.
+ if multilib_is_native_abi; then
+ emake -C src check
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
+ use doc && dohtml -r doxygen/html/
+ else
+ local targets=( libpulse.la libpulse-simple.la )
+ use glib && targets+=( libpulse-mainloop-glib.la )
+ emake DESTDIR="${D}" install-pkgconfigDATA
+ emake DESTDIR="${D}" -C src \
+ install-libLTLIBRARIES \
+ install-padsplibLTLIBRARIES \
+ lib_LTLIBRARIES="${targets[*]}" \
+ install-pulseincludeHEADERS
+ fi
+}
+
+multilib_src_install_all() {
+ # Drop the script entirely if X is disabled
+ use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
+
+ if use system-wide; then
+ newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+ use_define() {
+ local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+ use "$1" && echo "-D$define" || echo "-U$define"
+ }
+
+ unifdef $(use_define zeroconf AVAHI) \
+ $(use_define alsa) \
+ $(use_define bluetooth) \
+ $(use_define udev) \
+ "${FILESDIR}/pulseaudio.init.d-5" \
+ > "${T}/pulseaudio"
+
+ doinitd "${T}/pulseaudio"
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ fi
+
+ use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+ dodoc NEWS README todo
+
+ # Create the state directory
+ use prefix || diropts -o pulse -g pulse -m0755
+
+ # We need /var/run/pulse, bug #442852
+ use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+
+ # Prevent warnings when system-wide is not used, bug #447694
+ use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
+
+ prune_libtool_files --all
+}
+
+pkg_postinst() {
+ if use system-wide; then
+ elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+ elog "This mode should only be used on headless servers, embedded systems,"
+ elog "or thin clients. It will usually require manual configuration, and is"
+ elog "incompatible with many expected pulseaudio features."
+ elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+ elog "For more information, see"
+ elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+ elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+ elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+ if use gnome ; then
+ elog
+ elog "By enabling gnome USE flag, you enabled gconf support. Please note"
+ elog "that you might need to remove the gnome USE flag or disable the"
+ elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
+ elog "with a system-wide instance."
+ fi
+ fi
+
+ if use equalizer && ! use qt4; then
+ elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
+ elog "This will build the equalizer module, but the 'qpaeq' tool"
+ elog "which is required to set equalizer levels will not work."
+ fi
+
+ if use native-headset && use ofono-headset; then
+ elog "You have enabled both native and ofono headset profiles. The runtime decision"
+ elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+ fi
+
+ if use libsamplerate; then
+ elog "The libsamplerate based resamplers are now deprecated, because they offer no"
+ elog "particular advantage over speex. Upstream suggests disabling them."
+ fi
+
+ # Needed for pulseaudio-6.0 update from older versions
+ if use udev; then
+ if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then
+ udevadm control --reload && udevadm trigger
+ fi
+ fi
+}
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index c78a1a5..4d247cc 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -3,3 +3,5 @@
DIST qmmp-0.8.5.tar.bz2 991464 SHA256 7fe9347ad6c66e8013b73f2c5cf628037c58151e0cfcb926a8f27b93ad2d7c0d SHA512 07659ea7421079da77f6caa77c1e5f007664b1732a8bae160c154e3a687f330e476d5b2fec2e1b79da512ca1b68fdf6d462975821ced76f4f4c87799e6d79c39 WHIRLPOOL a46264d2886953f924fae40bd43cd5e23a59592ae8456a6120f6e41cd2d9572fa94a8c68f212dabfa97b8534f723ab9c91f26a0d98e0b6109266802ecb18d7f4
DIST qmmp-0.8.8.tar.bz2 993992 SHA256 23e422ef43e216f2d71f7d323d8345df2f3b6f46647e0ac0e03d4d69fbf62e57 SHA512 7882bfbc13ace5cca670a51b5f890b431163c4c0712222c16018b84080d7b42bed1f4cbe327ff767ececbf984193af7b0601be083ac1f0da1681d83e31f188de WHIRLPOOL 68f0a1f71dfe058226e4a4230c68fb48ac04935e16e326380ff3f0c6658c73921831ec5ced29073d3ce06de15cd7168cd7c6c7749db25ded6a092032b6bae025
DIST qmmp-0.9.1.tar.bz2 1112342 SHA256 9314f8b019689fa9f3f1bc8df4076a4b32d384ad992d578fd437284a5c86918b SHA512 1797662cb4b219c784ac591ff90eac05b66d43abed11021a9080aad5f709e0cb7b890bceeff3f5736500571154ba368cbec0611fa8143a313dae18b9989586e3 WHIRLPOOL 15c6c3af52bab35bd8208bef4597910fdfa5ea5eea434149c215c76d30bcd465df423934bca9e50a3fab43f94a610c049a192d38de921d6aacb309135dc5ee99
+DIST qmmp-0.9.2.tar.bz2 1112974 SHA256 90ac69a21779df5073efe71b25f28a7461d6a928deb1afbaa1ef8268f62ae9c5 SHA512 fc6cb0ec4bbf52e2ceb9e87a3585f25bd58b3a323ef07ddb9fd9f21a065ef0f5deb0b014f29b9648fe9e0a8b412f3b04643f8128638558089a25d867577690ad WHIRLPOOL 47a596b0f7d9e516737bfeb10a962f79edb74f61e2985b01f2cee80c8ff252a1709459f5712700784faef824e24ff3567d73f0d5759e2cd2c0c53c267cc6a026
+DIST qmmp-1.0.0.tar.bz2 1092970 SHA256 25cd86c67f287e9e7d062b364202831bb25c0930cdc7fbda759fd9287fb24220 SHA512 cdaeaf0202c03e745e9f32ff1068830410691d827a9775588d5679ac551960565df9125014549a7fc1b5f59a99bcbd86db901289d87675b642b84928f4dd1bd0 WHIRLPOOL ee843ca3a4a45c9bf7306a65c28c1dced8f33bc97c59783475e0052c991ba6ef37fdf294da6acaff6ee62d5f28fe5d997f7e1b43d4c03df2733850ed9c08557b
diff --git a/media-sound/qmmp/qmmp-0.9.2.ebuild b/media-sound/qmmp/qmmp-0.9.2.ebuild
new file mode 100644
index 0000000..5f82a4d
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.9.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [ "$PV" != "9999" ]; then
+ SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~ppc ~x86"
+else
+ SRC_URI=""
+ ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+ dev-qt/qtgui:4
+ alsa? ( media-libs/alsa-lib )
+ bs2b? ( media-libs/libbs2b )
+ cdda? ( dev-libs/libcdio-paranoia )
+ cue? ( media-libs/libcue )
+ curl? ( net-misc/curl )
+ dbus? ( sys-apps/dbus )
+ aac? ( media-libs/faad2 )
+ enca? ( app-i18n/enca )
+ flac? ( media-libs/flac )
+ game? ( media-libs/game-music-emu )
+ ladspa? ( media-libs/ladspa-cmt )
+ libsamplerate? ( media-libs/libsamplerate )
+ mad? ( media-libs/libmad )
+ midi? ( media-sound/wildmidi )
+ mms? ( media-libs/libmms )
+ mplayer? ( media-video/mplayer )
+ mpris? ( dev-qt/qtdbus:4 )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ modplug? ( >=media-libs/libmodplug-0.8.4 )
+ vorbis? ( media-libs/libvorbis
+ media-libs/libogg )
+ jack? ( media-sound/jack-audio-connection-kit
+ media-libs/libsamplerate )
+ ffmpeg? ( virtual/ffmpeg )
+ opus? ( media-libs/opusfile )
+ projectm? ( media-libs/libprojectm
+ dev-qt/qtopengl:4 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+ wavpack? ( media-sound/wavpack )
+ scrobbler? ( net-misc/curl )
+ sndfile? ( media-libs/libsndfile )
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( dbus ) "
+
+src_prepare() {
+ if has_version dev-libs/libcdio-paranoia; then
+ sed -i \
+ -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+ src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use aac)
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use analyzer)
+ $(cmake-utils_use_use bs2b)
+ $(cmake-utils_use_use cdda CDA)
+ $(cmake-utils_use_use crossfade)
+ $(cmake-utils_use_use cover)
+ $(cmake-utils_use_use cue)
+ $(cmake-utils_use_use curl)
+ $(cmake-utils_use_use dbus)
+ $(cmake-utils_use_use enca)
+ $(cmake-utils_use_use ffmpeg)
+ -DUSE_FFMPEG_LEGACY=OFF
+ $(cmake-utils_use_use flac)
+ $(cmake-utils_use_use game GME)
+ -DUSE_HAL=OFF
+ $(cmake-utils_use_use jack)
+ $(cmake-utils_use_use kde KDENOTIFY)
+ $(cmake-utils_use_use ladspa)
+ $(cmake-utils_use_use lyrics)
+ $(cmake-utils_use_use mad)
+ $(cmake-utils_use_use midi MIDI_WILDMIDI)
+ $(cmake-utils_use_use mplayer)
+ $(cmake-utils_use_use mms)
+ $(cmake-utils_use_use modplug)
+ $(cmake-utils_use_use mpris)
+ $(cmake-utils_use_use musepack MPC)
+ $(cmake-utils_use_use notifier)
+ $(cmake-utils_use_use opus)
+ $(cmake-utils_use_use oss)
+ $(cmake-utils_use_use projectm)
+ $(cmake-utils_use_use pulseaudio PULSE)
+ $(cmake-utils_use_use qsui)
+ $(cmake-utils_use_use scrobbler)
+ $(cmake-utils_use_use sndfile)
+ $(cmake-utils_use_use stereo)
+ $(cmake-utils_use_use tray STATICON)
+ $(cmake-utils_use_use udisks UDISKS2)
+ -DUSE_UDISKS=OFF
+ $(cmake-utils_use_use libsamplerate SRC)
+ $(cmake-utils_use_use vorbis)
+ $(cmake-utils_use_use wavpack)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-1.0.0.ebuild b/media-sound/qmmp/qmmp-1.0.0.ebuild
new file mode 100644
index 0000000..f91be1d
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.0.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [ "$PV" != "9999" ]; then
+ SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ SRC_URI=""
+ ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ alsa? ( media-libs/alsa-lib )
+ bs2b? ( media-libs/libbs2b )
+ cdda? ( dev-libs/libcdio-paranoia )
+ cue? ( media-libs/libcue )
+ curl? ( net-misc/curl )
+ dbus? ( sys-apps/dbus )
+ aac? ( media-libs/faad2 )
+ enca? ( app-i18n/enca )
+ flac? ( media-libs/flac )
+ game? ( media-libs/game-music-emu )
+ ladspa? ( media-libs/ladspa-cmt )
+ libsamplerate? ( media-libs/libsamplerate )
+ mad? ( media-libs/libmad )
+ midi? ( media-sound/wildmidi )
+ mms? ( media-libs/libmms )
+ mplayer? ( media-video/mplayer )
+ mpris? ( dev-qt/qtdbus:5 )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ modplug? ( >=media-libs/libmodplug-0.8.4 )
+ vorbis? ( media-libs/libvorbis
+ media-libs/libogg )
+ jack? ( media-sound/jack-audio-connection-kit
+ media-libs/libsamplerate )
+ ffmpeg? ( virtual/ffmpeg )
+ opus? ( media-libs/opusfile )
+ projectm? ( media-libs/libprojectm
+ dev-qt/qtopengl:5 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+ wavpack? ( media-sound/wavpack )
+ scrobbler? ( net-misc/curl )
+ sndfile? ( media-libs/libsndfile )
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( dbus ) "
+
+src_prepare() {
+ if has_version dev-libs/libcdio-paranoia; then
+ sed -i \
+ -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+ src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use aac)
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use analyzer)
+ $(cmake-utils_use_use bs2b)
+ $(cmake-utils_use_use cdda CDA)
+ $(cmake-utils_use_use crossfade)
+ $(cmake-utils_use_use cover)
+ $(cmake-utils_use_use cue)
+ $(cmake-utils_use_use curl)
+ $(cmake-utils_use_use dbus)
+ $(cmake-utils_use_use enca)
+ $(cmake-utils_use_use ffmpeg)
+ $(cmake-utils_use_use flac)
+ $(cmake-utils_use_use game GME)
+ -DUSE_HAL=OFF
+ $(cmake-utils_use_use jack)
+ $(cmake-utils_use_use kde KDENOTIFY)
+ $(cmake-utils_use_use ladspa)
+ $(cmake-utils_use_use lyrics)
+ $(cmake-utils_use_use mad)
+ $(cmake-utils_use_use midi MIDI_WILDMIDI)
+ $(cmake-utils_use_use mplayer)
+ $(cmake-utils_use_use mms)
+ $(cmake-utils_use_use modplug)
+ $(cmake-utils_use_use mpris)
+ $(cmake-utils_use_use musepack MPC)
+ $(cmake-utils_use_use notifier)
+ $(cmake-utils_use_use opus)
+ $(cmake-utils_use_use oss)
+ $(cmake-utils_use_use projectm)
+ $(cmake-utils_use_use pulseaudio PULSE)
+ $(cmake-utils_use_use qsui)
+ $(cmake-utils_use_use scrobbler)
+ $(cmake-utils_use_use sndfile)
+ $(cmake-utils_use_use stereo)
+ $(cmake-utils_use_use tray STATICON)
+ $(cmake-utils_use_use udisks UDISKS2)
+ $(cmake-utils_use_use libsamplerate SRC)
+ $(cmake-utils_use_use vorbis)
+ $(cmake-utils_use_use wavpack)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index b883778..5e563cf 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,3 +1,3 @@
DIST spotify-client_0.9.17.1.g9b85d43.7-1_amd64.deb 42733568 SHA256 717a878bcfa495852d19ac34bb4b0fa1b2f063ab94547defd32725d1dec10775 SHA512 a19403558c0a641b0264641501c9538f169b9e64d532e5d54dd67b7edbb27d400f07395014c9693fed298a1331c053cc9e62988d1293e9b1f1809d68a74646ad WHIRLPOOL 712ac07a3cd3230e3de17e9209380d0e0cc9a33c77cb4753e04490c5bb9a4e2d3e386ee92ffadecd9888ea701aa2a0c4c1b8c579cfa2f5b61d72981a5736f495
-DIST spotify-client_1.0.14.122.gf29d9be0_i386.deb 69292192 SHA256 a83243d333919cab99b1b215ef144c4bb9be8f9f662a7111cefb384439338c5e SHA512 04233a23632ba2d44526c99e6eaa2b56f2227f1fb8628d1d61e74966e0e0aa291f8b6d7307514086126ca3f0e52d7c65ee2e3e0834b87e39df0e6114b474efde WHIRLPOOL e1f234c541699962598d0efe15b7f07e9281e303dc228c122cf563ec13d11aeb11f680f6deeb9e445b494018e7dcd079c4677abed637b7cf29b6f0360447585d
-DIST spotify-client_1.0.14.124.g4dfabc51_amd64.deb 65887386 SHA256 6fed225815ada3a290dd588c7f19a5c83df2712cd016d8e6ad0a2bba4ef66257 SHA512 e7781aeb8c828d6cf4d27adbc717dc0d2d216a55a8c1501152780eb22b6a4aecb7631ce3c3657c79a1ec6f8a213fe5d442fbe9548c1cabce632600b863956c7b WHIRLPOOL 0e34476c73ee4655c5fca892a0a8dbdc711fbb518e7ce7a8c1d9000e02b7295fd0923f9f3b5a29b829bddb9081d2a9d1bd566ad37c9bfc82de3b61c41198d2ba
+DIST spotify-client_1.0.15.137.gbdf68615_amd64.deb 70266612 SHA256 7c9054348c675e350e097f24dce26119155d619c54fc49fc4295e3cb3c04e8c4 SHA512 588189bf76722e53b82c71cb10fa189ea7d7ba23319353c1db60fa1700517be87ce5950603f7314bfdf500b04c9615aa1cf235487c47c70a77b22d8a9d460bd8 WHIRLPOOL 5d98ae03c6afcf49479ed39472554d3f9d2ecfdb1aff2f7b92371a7022fdef418351493468f54f4a856845247fff712bea3d8008ac8fcfd49c89cb77a36f0d70
+DIST spotify-client_1.0.15.137.gbdf68615_i386.deb 75290058 SHA256 f783760cd6d50fd734a264ca6b994037b66b8cd4bc67b225eb6ea17804fa44d6 SHA512 e4402258825fdd59517afa2d1707bf6d2db54ba8d4b3c352c7242538f8e16b5b75bf727cc35a2c9c27b247827e1794d87cc08f82e488ce6b7b44c23ec2bdc34a WHIRLPOOL 8957cb611eed967a596e3f120d0584a568d6699ce8a3df1e4c259fb37c485723e430111179e4373bdb8ab50177937114bd5eb2a87b618716e824ad01098255a7
diff --git a/media-sound/spotify/spotify-1.0.14.ebuild b/media-sound/spotify/spotify-1.0.14.ebuild
deleted file mode 100644
index 1af9ca6..0000000
--- a/media-sound/spotify/spotify-1.0.14.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fdo-mime gnome2-utils pax-utils unpacker
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-MY_PV_AMD64="${PV}.124.g4dfabc51"
-MY_PV_I386="${PV}.122.gf29d9be0"
-MY_P="${PN}-client_"
-SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/"
-SRC_URI="amd64? ( ${SRC_BASE}${MY_P}${MY_PV_AMD64}_amd64.deb )
- x86? ( ${SRC_BASE}${MY_P}${MY_PV_I386}_i386.deb )"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-DEPEND=""
-RDEPEND="
- ${DEPEND}
- dev-libs/nss
- gnome-base/gconf
- media-libs/alsa-lib
- media-libs/harfbuzz
- media-libs/fontconfig
- media-libs/mesa
- net-misc/curl
- net-print/cups[ssl]
- sys-libs/glibc
- x11-libs/gtk+:2
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- pulseaudio? ( media-sound/pulseaudio )
- gnome? ( gnome-extra/gnome-integration-spotify )"
-
-S=${WORKDIR}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
- # Fix desktop entry to launch spotify-dbus.py for GNOME integration
- if use gnome ; then
- sed -i \
- -e 's/spotify \%U/spotify-dbus.py \%U/g' \
- usr/share/spotify/spotify.desktop || die "sed failed"
- fi
- #TODO: the semicolons will be fixed in 1.0.15, remove it then
- sed -i \
- -e 's/x-scheme-handler\/spotify$/x-scheme-handler\/spotify\;/g' \
- -e 's/AudioVideo$/AudioVideo\;/g' \
- usr/share/spotify/spotify.desktop || die "sed failed"
-}
-
-src_install() {
- dodoc usr/share/doc/spotify-client/changelog.Debian.gz
-
- SPOTIFY_PKG_HOME=usr/share/spotify
- insinto /usr/share/pixmaps
- doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
- # install in /opt/spotify
- SPOTIFY_HOME=/opt/spotify/spotify-client
- insinto ${SPOTIFY_HOME}
- doins -r ${SPOTIFY_PKG_HOME}/*
- fperms +x ${SPOTIFY_HOME}/spotify
-
- dodir /usr/bin
- cat <<-EOF >"${D}"/usr/bin/spotify
- #! /bin/sh
- exec ${SPOTIFY_HOME}/spotify "\$@"
- EOF
- fperms +x /usr/bin/spotify
-
- for size in 16 22 24 32 48 64 128 256 512; do
- newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
- "spotify-client.png"
- done
- domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
- if use pax_kernel; then
- #create the headers, reset them to default, then paxmark -m them
- pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
- pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
- pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
- eqawarn "You have set USE=pax_kernel meaning that you intend to run"
- eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
- eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
- eqawarn "you suspect that ${PN} is being broken by this modification,"
- eqawarn "please open a bug."
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-
- ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
- ewarn "To remove the cache:"
- ewarn "rm -rf ~/.cache/spotify"
- ewarn
- ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
- ewarn "Run"
- ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
- ewarn "Then log out and log in back to KDE."
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
diff --git a/media-sound/spotify/spotify-1.0.15.137.ebuild b/media-sound/spotify/spotify-1.0.15.137.ebuild
new file mode 100644
index 0000000..22a7994
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.15.137.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime gnome2-utils pax-utils unpacker
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+MY_PV="${PV}.gbdf68615"
+MY_P="${PN}-client_${MY_PV}"
+SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/"
+SRC_URI="amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
+ x86? ( ${SRC_BASE}${MY_P}_i386.deb )"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=""
+RDEPEND="
+ ${DEPEND}
+ dev-libs/nss
+ gnome-base/gconf
+ media-libs/alsa-lib
+ media-libs/harfbuzz
+ media-libs/fontconfig
+ media-libs/mesa
+ net-misc/curl
+ net-print/cups[ssl]
+ sys-libs/glibc
+ x11-libs/gtk+:2
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ pulseaudio? ( media-sound/pulseaudio )
+ gnome? ( gnome-extra/gnome-integration-spotify )"
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+ # Fix desktop entry to launch spotify-dbus.py for GNOME integration
+ if use gnome ; then
+ sed -i \
+ -e 's/spotify \%U/spotify-dbus.py \%U/g' \
+ usr/share/spotify/spotify.desktop || die "sed failed"
+ fi
+}
+
+src_install() {
+ dodoc usr/share/doc/spotify-client/changelog.Debian.gz
+
+ SPOTIFY_PKG_HOME=usr/share/spotify
+ insinto /usr/share/pixmaps
+ doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+ # install in /opt/spotify
+ SPOTIFY_HOME=/opt/spotify/spotify-client
+ insinto ${SPOTIFY_HOME}
+ doins -r ${SPOTIFY_PKG_HOME}/*
+ fperms +x ${SPOTIFY_HOME}/spotify
+
+ dodir /usr/bin
+ cat <<-EOF >"${D}"/usr/bin/spotify
+ #! /bin/sh
+ exec ${SPOTIFY_HOME}/spotify "\$@"
+ EOF
+ fperms +x /usr/bin/spotify
+
+ for size in 16 22 24 32 48 64 128 256 512; do
+ newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+ "spotify-client.png"
+ done
+ domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+ if use pax_kernel; then
+ #create the headers, reset them to default, then paxmark -m them
+ pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+ pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+ pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+ eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+ eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
+ eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
+ eqawarn "you suspect that ${PN} is being broken by this modification,"
+ eqawarn "please open a bug."
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+
+ ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+ ewarn "To remove the cache:"
+ ewarn "rm -rf ~/.cache/spotify"
+ ewarn
+ ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
+ ewarn "Run"
+ ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
+ ewarn "Then log out and log in back to KDE."
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+}
diff --git a/media-tv/kodi/kodi-14.1.ebuild b/media-tv/kodi/kodi-14.1.ebuild
index 7740ec6..7ad19f1 100644
--- a/media-tv/kodi/kodi-14.1.ebuild
+++ b/media-tv/kodi/kodi-14.1.ebuild
@@ -154,6 +154,8 @@
epatch "${FILESDIR}"/${P}-no-arm-flags.patch #400617
epatch "${FILESDIR}"/${PN}-14.0-dvddemux-ffmpeg.patch #526992#36
epatch "${FILESDIR}"/${P}-gcc-5.patch #557300
+ epatch_user #293109
+
# The mythtv patch touches configure.ac, so force a regen
rm -f configure
@@ -185,8 +187,6 @@
-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
xbmc/linux/*.cpp || die
- epatch_user #293109
-
# Tweak autotool timestamps to avoid regeneration
find . -type f -exec touch -r configure {} +
}
diff --git a/media-tv/kodi/kodi-15.1.ebuild b/media-tv/kodi/kodi-15.1.ebuild
index 912c5e5..198691d 100644
--- a/media-tv/kodi/kodi-15.1.ebuild
+++ b/media-tv/kodi/kodi-15.1.ebuild
@@ -155,6 +155,7 @@
epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
epatch "${FILESDIR}"/${P}-texturepacker.patch
epatch "${FILESDIR}"/${P}-gcc-5.patch #544760
+ epatch_user #293109
# some dirs ship generated autotools, some dont
multijob_init
@@ -189,8 +190,6 @@
-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
xbmc/linux/*.cpp || die
- epatch_user #293109
-
# Tweak autotool timestamps to avoid regeneration
find . -type f -exec touch -r configure {} +
}
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 165dacb..bf98528 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -155,6 +155,7 @@
src_prepare() {
epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
epatch "${FILESDIR}"/${PN}-9999-texturepacker.patch
+ epatch_user #293109
# some dirs ship generated autotools, some dont
multijob_init
@@ -189,8 +190,6 @@
-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
xbmc/linux/*.cpp || die
- epatch_user #293109
-
# Tweak autotool timestamps to avoid regeneration
find . -type f -exec touch -r configure {} +
}
diff --git a/media-tv/mythtv/files/mythbackend.init-r2 b/media-tv/mythtv/files/mythbackend.init-r2
index 6869eb5..dc5e66e 100644
--- a/media-tv/mythtv/files/mythbackend.init-r2
+++ b/media-tv/mythtv/files/mythbackend.init-r2
@@ -42,7 +42,7 @@
# Work around any strange permissions that may be on these files.
[ "x${MYTHBACKEND_LOGGING}" = "xfiles" ] && \
- checkpath --directory --owner mythtv:video --mode 0775 /var/log/mythtv
+ checkpath --directory --owner mythtv:video --mode 0755 /var/log/mythtv
checkpath --directory --owner mythtv:video --mode 0775 /home/mythtv
checkpath --directory --owner mythtv:video --mode 0750 /run/mythtv
}
diff --git a/media-tv/tvmovie2vdr/tvmovie2vdr-0.5.13.ebuild b/media-tv/tvmovie2vdr/tvmovie2vdr-0.5.13.ebuild
index 7f8caac..a2de590 100644
--- a/media-tv/tvmovie2vdr/tvmovie2vdr-0.5.13.ebuild
+++ b/media-tv/tvmovie2vdr/tvmovie2vdr-0.5.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@
SHARE_DIR="/usr/share/${PN}"
DESCRIPTION="load the program guide from tvmovie and others to vdr"
-HOMEPAGE="http://steckrue.be/tvm2vdr/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="http://steckrue.be/download/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch
new file mode 100644
index 0000000..392ef25
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch
@@ -0,0 +1,34 @@
+diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c
+--- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-09-03 00:30:08.662553247 +0200
++++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-09-03 00:31:03.899206845 +0200
+@@ -306,7 +306,7 @@
+ #define SAA716x_MODEL_TWINHAN_VP1028 "Twinhan/Azurewave VP-1028"
+ #define SAA716x_DEV_TWINHAN_VP1028 "DVB-S"
+
+-static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
++static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage)
+ {
+ struct saa716x_dev *saa716x = fe->dvb->priv;
+
+diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c
+--- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c 2014-11-09 15:44:55.000000000 +0100
++++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c 2015-09-03 00:31:03.899206845 +0200
+@@ -321,7 +321,7 @@
+ .request_firmware = tda1004x_vp6090_request_firmware,
+ };
+
+-static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
++static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage)
+ {
+ struct saa716x_dev *saa716x = fe->dvb->priv;
+
+diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c
+--- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c 2014-11-09 15:44:55.000000000 +0100
++++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c 2015-09-03 00:31:03.900206839 +0200
+@@ -1,3 +1,5 @@
++#include <asm/atomic.h>
++#include <linux/spinlock_types.h>
+ #include <asm/io.h>
+ #include <asm/pgtable.h>
+ #include <asm/page.h>
+
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild
new file mode 100644
index 0000000..7904dec
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-info linux-mod
+
+DESCRIPTION="driver for saa716x based dvb cards like Technotrend S2-6400 or Technisat Skystar 2 eXpress HD"
+HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
+
+HG_REVISION="d7e98fc59230"
+HG_REVISION_DATE="20141109"
+
+SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz
+-> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+firmware"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ firmware? ( sys-firmware/tt-s2-6400-firmware )"
+
+S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
+
+BUILD_TARGETS="modules"
+MODULE_NAMES="saa716x_ff(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+ saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+ saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+ saa716x_hybrid(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
+
+CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
+
+src_prepare() {
+ epatch "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
+ epatch "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
+ kernel_is ge 3 19 0 && epatch "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch"
+ kernel_is ge 4 2 0 && epatch "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch"
+}
+
+src_compile() {
+ BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
+ CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
+ CONFIG_DVB_SAA716X_HYBRID=m"
+ addpredict "${ROOT}"/usr/src/linux/
+ linux-mod_src_compile
+}
diff --git a/media-tv/xawtv/files/xawtv-3.95-stdbool.patch b/media-tv/xawtv/files/xawtv-3.95-stdbool.patch
new file mode 100644
index 0000000..b93bb11
--- /dev/null
+++ b/media-tv/xawtv/files/xawtv-3.95-stdbool.patch
@@ -0,0 +1,10 @@
+--- x11/blit.c
++++ x11/blit.c
+@@ -13,6 +13,7 @@
+ #include <pthread.h>
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
++#include <stdbool.h>
+
+ #include <X11/Xlib.h>
+ #include <X11/Intrinsic.h>
diff --git a/media-tv/xawtv/xawtv-3.95-r3.ebuild b/media-tv/xawtv/xawtv-3.95-r3.ebuild
index 451a9d1..429f21f 100644
--- a/media-tv/xawtv/xawtv-3.95-r3.ebuild
+++ b/media-tv/xawtv/xawtv-3.95-r3.ebuild
@@ -76,6 +76,7 @@
epatch "${FILESDIR}/${P}-libquicktime-compat.patch"
epatch "${FILESDIR}/${P}-pagemask-fix.patch"
epatch "${FILESDIR}/${P}-jpeg-7.patch"
+ epatch "${FILESDIR}/${P}-stdbool.patch"
eautoreconf
}
diff --git a/media-video/cinelerra/cinelerra-20140710.ebuild b/media-video/cinelerra/cinelerra-20140710.ebuild
index 0866be2..48f96ef 100644
--- a/media-video/cinelerra/cinelerra-20140710.ebuild
+++ b/media-video/cinelerra/cinelerra-20140710.ebuild
@@ -62,7 +62,9 @@
"${FILESDIR}"/${P}-ffmpeg-0.11.patch \
"${FILESDIR}"/${PN}-libav9.patch \
"${FILESDIR}"/${PN}-pngtoh.patch \
- "${FILESDIR}"/${PN}-nofindobject.patch
+ "${FILESDIR}"/${PN}-nofindobject.patch \
+ "${FILESDIR}"/${PN}-asm-gcc52.patch \
+ "${FILESDIR}"/${PN}-putbits-gcc52.patch
if has_version '>=media-video/ffmpeg-2' ; then
epatch "${FILESDIR}"/${PN}-ffmpeg2.patch
diff --git a/media-video/cinelerra/files/cinelerra-asm-gcc52.patch b/media-video/cinelerra/files/cinelerra-asm-gcc52.patch
new file mode 100644
index 0000000..1f46ad2
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-asm-gcc52.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=562208
+
+Index: cinelerra-20140710/quicktime/mmx.h
+===================================================================
+--- cinelerra-20140710.orig/quicktime/mmx.h
++++ cinelerra-20140710/quicktime/mmx.h
+@@ -102,7 +102,7 @@ typedef union {
+ * are unused by Cinelerra CV. Inspired by change found in
+ * <URL: http://hg.libsdl.org/SDL/file/32f0f603a0c8/src/video/mmx.h >
+ */
+-#if !defined(__clang__)
++#if 0
+ /* Function to test if multimedia instructions are supported...
+ */
+ inline extern int
diff --git a/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch b/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch
new file mode 100644
index 0000000..646db9f
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/show_bug.cgi?id=562208
+
+Index: cinelerra-20140710/toolame-02l/bitstream.c
+===================================================================
+--- cinelerra-20140710.orig/toolame-02l/bitstream.c
++++ cinelerra-20140710/toolame-02l/bitstream.c
+@@ -198,9 +198,6 @@ void put1bit (Bit_stream_struc * bs, int
+ }
+
+ /*write N bits into the bit stream */
+-#if !defined(__clang__)
+-INLINE
+-#endif /* not __clang__ */
+ void putbits (Bit_stream_struc * bs, unsigned int val, int N)
+ {
+ register int j = N;
+Index: cinelerra-20140710/toolame-02l/bitstream.h
+===================================================================
+--- cinelerra-20140710.orig/toolame-02l/bitstream.h
++++ cinelerra-20140710/toolame-02l/bitstream.h
+@@ -9,7 +9,7 @@ unsigned int get1bit (Bit_stream_struc *
+ void put1bit (Bit_stream_struc *, int);
+ unsigned long look_ahead (Bit_stream_struc *, int);
+ unsigned long getbits (Bit_stream_struc *, int);
+-INLINE void putbits (Bit_stream_struc *, unsigned int, int);
++void putbits (Bit_stream_struc *, unsigned int, int);
+ void byte_ali_putbits (Bit_stream_struc *, unsigned int, int);
+ unsigned long byte_ali_getbits (Bit_stream_struc *, int);
+ unsigned long sstell (Bit_stream_struc *);
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 9b216a9..b5eb371 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,3 +1,4 @@
DIST DVDStyler-2.7.2.tar.bz2 5982155 SHA256 b30df3870b9cfcac5bc4387d276aec10e0913ce66c63007f1393123afda180be SHA512 f4913ff5ed11e7cedccb8408bea9adbfae7494afde9062c4acc7e65014af821d4b5acacbce57fd07225cf3af8c21ba552897b50be67f21e242fb6f4baeed000d WHIRLPOOL 070254838db445175401c6d2fb05dc6ee5d79620a598f5a5f0c6d4d8bf9cb5b3ecfc1ad0e708b6289b37b0a5cd0a5c2b0c089c87951b60fe0d48eab85cc9410f
DIST DVDStyler-2.9.2.tar.bz2 7861116 SHA256 88abd17b0dcdfccbdfffe6e80bcfa59df023f1ff2eed782e58d1f793a81dbd1f SHA512 5688f383b03cb0ec6c57659494d1f4f98f72c21e3e125e16ec3adfeac20555d6f26a12d3629417b46f833933f504e1d55a7fcdb2c0926643e0bfadcab8c998be WHIRLPOOL cd857c39a5de581b201b2d78d7a676b05f5dbdef3592fe835158cceb05d8b8e37cf5a4f88514469bbfac908f827843718b733566cac6fd86f6c7700bc49e0431
DIST DVDStyler-2.9.3.tar.bz2 7861272 SHA256 ffbc22454e210ba8fcad9a7954b426d9dc5ff933527a6e39391d310101128c39 SHA512 c39a1c08ea5e86e05c25443685524c61c26a5fe11e66240884db6b54c117f1cc446634145bc99673eb7de2ed44e3d03277686470dfde3ab78a5943b2667e7b73 WHIRLPOOL d08202272c5ec9fbaec7b049e854cdb413a929b59ee047a99a4d70699f80a2a0a47786335a9bc05d8d7ca905f9137d4f81bc31fd56a78943c71b169999cc0cd3
+DIST DVDStyler-2.9.4.tar.bz2 7863263 SHA256 8b15ec98e3e5ec8c5a1f23eee316f646476e76b86b80d44b7c842887946a39e0 SHA512 8ef8e0241f31957b6c1695876a2067510750b3e997d57c688ceed640110488c2989af12d23147a5b439625cafc5bf7f2d3a8cdda8304b96555f48b6f5553cde4 WHIRLPOOL 07f3a96f83e0d7bbaea4cf01f9c440d63590f632de3ebbb516d7551ced21c9597790149f252f517f627c5d8800e5a1d8737ad15a015eb1f76e7fef4d7dc15dbf
diff --git a/media-video/dvdstyler/dvdstyler-2.9.4.ebuild b/media-video/dvdstyler/dvdstyler-2.9.4.ebuild
new file mode 100644
index 0000000..8587dc4
--- /dev/null
+++ b/media-video/dvdstyler/dvdstyler-2.9.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${P/dvds/DVDS}
+WX_GTK_VER=2.8
+
+inherit wxwidgets eutils
+
+DESCRIPTION="A cross-platform free DVD authoring application"
+HOMEPAGE="http://www.dvdstyler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +udev"
+
+COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1
+ media-libs/libexif:=
+ >=media-libs/wxsvg-1.3:=
+ >=media-video/dvdauthor-0.7.1
+ >=media-video/xine-ui-0.99.7
+ virtual/cdrtools
+ >=virtual/ffmpeg-9-r1[encode]
+ virtual/jpeg:0
+ >=x11-libs/wxGTK-2.8.7:2.8=[gstreamer,X]
+ sys-apps/dbus
+ udev? ( >=virtual/libudev-215:= )"
+RDEPEND="${COMMON_DEPEND}
+ >=app-cdr/dvdisaster-0.72.4
+ media-video/mjpegtools"
+DEPEND="${COMMON_DEPEND}
+ app-arch/zip
+ app-text/xmlto
+ sys-devel/gettext
+ virtual/yacc
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # disable obsolete GNOME 2.x libraries wrt #508854
+ sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
+ # rmdir: failed to remove `tempfoobar': Directory not empty
+ sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
+ # fix underlinking wrt #367863
+ sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die
+ # silence desktop-file-validate QA check
+ sed -i \
+ -e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \
+ data/dvdstyler.desktop || die
+ has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}/ffmpeg29.patch"
+}
+
+src_configure() {
+ econf \
+ --docdir=/usr/share/doc/${PF} \
+ $(use_enable debug) \
+ --with-wx-config=${WX_CONFIG}
+}
+
+src_install() {
+ default
+ rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
+}
diff --git a/media-video/ffmpeg/ffmpeg-2.8-r1.ebuild b/media-video/ffmpeg/ffmpeg-2.8-r1.ebuild
new file mode 100644
index 0000000..6f3904f
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-2.8-r1.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=54.56.56
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SCM="git-2"
+ EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+ SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+ SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+ !gpl? ( LGPL-2.1 )
+ gpl? ( GPL-2 )
+ amr? (
+ gpl? ( GPL-3 )
+ !gpl? ( LGPL-3 )
+ )
+ encode? (
+ aac? (
+ gpl? ( GPL-3 )
+ !gpl? ( LGPL-3 )
+ )
+ amrenc? (
+ gpl? ( GPL-3 )
+ !gpl? ( LGPL-3 )
+ )
+ )
+ samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+ +bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls +gpl
+ +hardcoded-tables +iconv lzma +network openssl +postproc
+ samba:libsmbclient sdl:ffplay vaapi vdpau X:xlib xcb:libxcb
+ xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+ # libavdevice options
+ cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+ opengl
+ # indevs
+ libv4l:libv4l2 pulseaudio:libpulse
+ # decoders
+ amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+ jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+ modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh
+ schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+ zvbi:libzvbi
+ # libavfilter options
+ bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa
+ libass truetype:libfreetype
+ # libswresample options
+ libsoxr
+ # Threads; we only support pthread for now but ffmpeg supports more
+ +threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+ aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame
+ aacplus:libaacplus faac:libfaac snappy:libsnappy theora:libtheora
+ twolame:libtwolame wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265
+ xvid:libxvid
+)
+
+IUSE="
+ alsa +encode examples jack libressl oss pic static-libs test v4l
+ ${FFMPEG_FLAG_MAP[@]%:*}
+ ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
+MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+ cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+ cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+ cpu_flags_x86_xop? ( cpu_flags_x86_avx )
+ cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 )
+ cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 )
+ cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 )
+ cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
+ cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
+ cpu_flags_x86_sse2? ( cpu_flags_x86_sse )
+ cpu_flags_x86_sse? ( cpu_flags_x86_mmxext )
+ cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx )
+ cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow )
+ cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+"
+
+IUSE="${IUSE}
+ ${ARM_CPU_FEATURES[@]%:*}
+ ${MIPS_CPU_FEATURES[@]%:*}
+ ${PPC_CPU_FEATURES[@]%:*}
+ ${X86_CPU_FEATURES[@]%:*}
+"
+
+CPU_REQUIRED_USE="
+ ${X86_CPU_REQUIRED_USE}
+"
+
+# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
+# $(tc-arch).
+CPU_FEATURES_MAP="
+ arm:ARM
+ arm64:ARM
+ mips:MIPS
+ ppc:PPC
+ ppc64:PPC
+ x86:X86
+ amd64:X86
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+ alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+ bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
+ bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+ bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+ cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+ celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+ encode? (
+ aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+ aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
+ amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+ faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+ mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+ snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
+ theora? (
+ >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+ >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+ )
+ twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+ wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+ webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+ x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+ x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+ xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+ )
+ fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+ flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+ fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+ frei0r? ( media-plugins/frei0r-plugins )
+ fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+ gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+ gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+ gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+ iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+ iec61883? (
+ >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+ >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+ >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+ >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+ )
+ jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+ jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+ libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
+ libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+ libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+ libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+ modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+ openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ openssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
+ opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+ pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+ quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
+ librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+ samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+ schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+ sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+ speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+ ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+ truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+ vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+ vorbis? (
+ >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+ >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+ )
+ vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ !xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
+ >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+ )
+ xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+ !media-video/qt-faststart
+ postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+ >=sys-devel/make-3.81
+ doc? ( app-text/texi2html )
+ fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+ gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+ ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+ ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+ libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+ cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
+ librtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+ schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+ test? ( net-misc/wget sys-devel/bc )
+ truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+ v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+ postproc? ( gpl )
+ frei0r? ( gpl )
+ cdio? ( gpl )
+ samba? ( gpl )
+ zvbi? ( gpl )
+ encode? (
+ x264? ( gpl )
+ x265? ( gpl )
+ xvid? ( gpl )
+ X? ( !xcb? ( gpl ) )
+ )
+"
+REQUIRED_USE="
+ libv4l? ( v4l )
+ fftools_cws2fws? ( zlib )
+ test? ( encode )
+ ${GPL_REQUIRED_USE}
+ ${CPU_REQUIRED_USE}"
+RESTRICT="
+ encode? ( faac? ( bindist ) aacplus? ( bindist ) )
+ gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+ if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+ export revision=git-N-${FFMPEG_REVISION}
+ fi
+ epatch_user
+}
+
+multilib_src_configure() {
+ local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+ local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+ use openssl && use gpl && myconf+=( --enable-nonfree )
+ use samba && myconf+=( --enable-version3 )
+
+ # Encoders
+ if use encode ; then
+ ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+ # Licensing.
+ if use aac || use amrenc ; then
+ myconf+=( --enable-version3 )
+ fi
+ if use aacplus || use faac ; then
+ myconf+=( --enable-nonfree )
+ fi
+ else
+ myconf+=( --disable-encoders )
+ fi
+
+ # Indevs
+ use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+ for i in alsa oss jack ; do
+ use ${i} || myconf+=( --disable-indev=${i} )
+ done
+ use xcb || ffuse+=( X:x11grab )
+
+ # Outdevs
+ for i in alsa oss sdl ; do
+ use ${i} || myconf+=( --disable-outdev=${i} )
+ done
+
+ # Decoders
+ use amr && myconf+=( --enable-version3 )
+ use fdk && use gpl && myconf+=( --enable-nonfree )
+
+ for i in "${ffuse[@]#+}" ; do
+ myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+ done
+
+ # (temporarily) disable non-multilib deps
+ if ! multilib_is_native_abi; then
+ for i in frei0r ; do
+ myconf+=( --disable-${i} )
+ done
+ fi
+
+ # CPU features
+ for i in ${CPU_FEATURES_MAP} ; do
+ if [ "$(tc-arch)" = "${i%:*}" ] ; then
+ local var="${i#*:}_CPU_FEATURES[@]"
+ for j in ${!var} ; do
+ use ${j%:*} || myconf+=( --disable-${j#*:} )
+ done
+ fi
+ done
+
+ if use pic ; then
+ myconf+=( --enable-pic )
+ # disable asm code if PIC is required
+ # as the provided asm decidedly is not PIC for x86.
+ [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+ fi
+ [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+ # Try to get cpu type based on CFLAGS.
+ # Bug #172723
+ # We need to do this so that features of that CPU will be better used
+ # If they contain an unknown CPU it will not hurt since ffmpeg's configure
+ # will just ignore it.
+ for i in $(get-flag mcpu) $(get-flag march) $(get-flag mtune) ; do
+ [[ ${i} = native ]] && i="host" # bug #273421
+ myconf+=( --cpu=${i} )
+ break
+ done
+
+ # Mandatory configuration
+ myconf=(
+ --enable-avfilter
+ --enable-avresample
+ --disable-stripping
+ "${myconf[@]}"
+ )
+
+ # cross compile support
+ if tc-is-cross-compiler ; then
+ myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+ case ${CHOST} in
+ *freebsd*)
+ myconf+=( --target-os=freebsd )
+ ;;
+ mingw32*)
+ myconf+=( --target-os=mingw32 )
+ ;;
+ *linux*)
+ myconf+=( --target-os=linux )
+ ;;
+ esac
+ fi
+
+ set -- "${S}/configure" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+ --mandir="${EPREFIX}/usr/share/man" \
+ --enable-shared \
+ --cc="$(tc-getCC)" \
+ --cxx="$(tc-getCXX)" \
+ --ar="$(tc-getAR)" \
+ --optflags=" " \
+ $(use_enable static-libs static) \
+ "${myconf[@]}"
+ echo "${@}"
+ "${@}" || die
+}
+
+multilib_src_compile() {
+ emake V=1
+
+ if multilib_is_native_abi; then
+ for i in "${FFTOOLS[@]}" ; do
+ if use fftools_${i} ; then
+ emake V=1 tools/${i}
+ fi
+ done
+ fi
+}
+
+multilib_src_install() {
+ emake V=1 DESTDIR="${D}" install install-man
+
+ if multilib_is_native_abi; then
+ for i in "${FFTOOLS[@]}" ; do
+ if use fftools_${i} ; then
+ dobin tools/${i}
+ fi
+ done
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+ [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+ use doc && dohtml -r doc/*
+ if use examples ; then
+ dodoc -r doc/examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
+
+multilib_src_test() {
+ LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+ emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 394941d..9808186 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -96,7 +96,7 @@
)
IUSE="
- alsa +encode examples jack oss pic static-libs test v4l
+ alsa +encode examples jack libressl oss pic static-libs test v4l
${FFMPEG_FLAG_MAP[@]%:*}
${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
"
@@ -205,7 +205,10 @@
modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
- openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ openssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
diff --git a/media-video/handbrake/handbrake-0.10.2-r1.ebuild b/media-video/handbrake/handbrake-0.10.2-r1.ebuild
new file mode 100644
index 0000000..adb5fc3
--- /dev/null
+++ b/media-video/handbrake/handbrake-0.10.2-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2-utils python-any-r1
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 -> ${P}.tar.bz2"
+ S="${WORKDIR}/HandBrake-${PV}"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
+HOMEPAGE="http://handbrake.fr/"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav libav-aac x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+ dev-libs/jansson
+ media-libs/a52dec
+ media-libs/libass
+ media-libs/libbluray
+ media-libs/libdvdnav
+ media-libs/libdvdread
+ media-libs/libsamplerate
+ media-libs/libtheora
+ media-libs/libvorbis
+ media-libs/libvpx
+ media-libs/x264:=
+ media-sound/lame
+ sys-libs/zlib
+ libav? ( >=media-video/libav-10.1:0= )
+ !libav? ( >=media-video/ffmpeg-2.3:0= )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-ugly:1.0
+ media-plugins/gst-plugins-a52dec:1.0
+ media-plugins/gst-plugins-libav:1.0
+ media-plugins/gst-plugins-x264:1.0
+ )
+ gtk? (
+ >=x11-libs/gtk+-3.10
+ dev-libs/dbus-glib
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/libnotify
+ x11-libs/pango
+ virtual/libgudev:=
+ )
+ fdk? ( media-libs/fdk-aac )
+ x265? ( >=media-libs/x265-1.7 )
+ "
+
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-lang/yasm
+ dev-util/intltool
+ sys-devel/automake"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch_user
+
+ # Get rid of leftover bundled library build definitions,
+ sed -i 's:.*\(/contrib\|contrib/\).*::g' \
+ "${S}"/make/include/main.defs \
+ || die "Contrib removal failed."
+
+ # Remove libdvdnav duplication and call it on the original instead.
+ # It may work this way; if not, we should try to mimic the duplication.
+ epatch "${FILESDIR}"/${PN}-9999-remove-dvdnav-dup.patch
+
+ # Remove faac dependency; TODO: figure out if we need to do this at all.
+ epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch
+
+ # Fix missing x265 link flag
+ epatch "${FILESDIR}"/${PN}-9999-fix-missing-x265-link-flag.patch
+
+ cd "${S}/gtk"
+ # Don't run autogen.sh.
+ sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+ eautoreconf
+}
+
+src_configure() {
+ ./configure \
+ --force \
+ --verbose \
+ --prefix="${EPREFIX}/usr" \
+ --disable-gtk-update-checks \
+ $(use_enable libav-aac) \
+ $(use_enable fdk fdk-aac) \
+ $(use_enable gtk) \
+ $(usex !gstreamer --disable-gst) \
+ $(use_enable x265) || die "Configure failed."
+}
+
+src_compile() {
+ emake -C build
+
+ # TODO: Documentation building is currently broken, try to fix it.
+ #
+ # if use doc ; then
+ # emake -C build doc
+ # fi
+}
+
+src_install() {
+ emake -C build DESTDIR="${D}" install
+
+ dodoc AUTHORS CREDITS NEWS THANKS TRANSLATIONS
+}
+
+pkg_postinst() {
+ einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+
+ if use gtk ; then
+ einfo ""
+ einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/media-video/handbrake/handbrake-0.10.2.ebuild b/media-video/handbrake/handbrake-0.10.2.ebuild
deleted file mode 100644
index d9c8308..0000000
--- a/media-video/handbrake/handbrake-0.10.2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2-utils python-any-r1
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/HandBrake-${PV}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
- dev-libs/jansson
- media-libs/a52dec
- media-libs/libass
- media-libs/libbluray
- media-libs/libdvdnav
- media-libs/libdvdread
- media-libs/libsamplerate
- media-libs/libtheora
- media-libs/libvorbis
- media-libs/libvpx
- media-libs/x264:=
- media-sound/lame
- sys-libs/zlib
- libav? ( >=media-video/libav-10.1:0= )
- !libav? ( >=media-video/ffmpeg-2.3:0= )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-ugly:1.0
- media-plugins/gst-plugins-a52dec:1.0
- media-plugins/gst-plugins-libav:1.0
- media-plugins/gst-plugins-x264:1.0
- )
- gtk? (
- >=x11-libs/gtk+-3.10
- dev-libs/dbus-glib
- dev-libs/glib:2
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/libnotify
- x11-libs/pango
- virtual/libgudev:=
- )
- fdk? ( media-libs/fdk-aac )
- x265? ( =media-libs/x265-1.7 )
- "
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-lang/yasm
- dev-util/intltool
- sys-devel/automake"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- epatch_user
-
- # Get rid of leftover bundled library build definitions,
- sed -i 's:.*\(/contrib\|contrib/\).*::g' \
- "${S}"/make/include/main.defs \
- || die "Contrib removal failed."
-
- # Remove libdvdnav duplication and call it on the original instead.
- # It may work this way; if not, we should try to mimic the duplication.
- epatch "${FILESDIR}"/${PN}-9999-remove-dvdnav-dup.patch
-
- # Remove faac dependency; TODO: figure out if we need to do this at all.
- epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch
-
- # Fix missing x265 link flag
- epatch "${FILESDIR}"/${PN}-9999-fix-missing-x265-link-flag.patch
-
- cd "${S}/gtk"
- # Don't run autogen.sh.
- sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
- eautoreconf
-}
-
-src_configure() {
- ./configure \
- --force \
- --verbose \
- --prefix="${EPREFIX}/usr" \
- --disable-gtk-update-checks \
- $(use_enable libav-aac) \
- $(use_enable fdk fdk-aac) \
- $(use_enable gtk) \
- $(usex !gstreamer --disable-gst) \
- $(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
- emake -C build
-
- # TODO: Documentation building is currently broken, try to fix it.
- #
- # if use doc ; then
- # emake -C build doc
- # fi
-}
-
-src_install() {
- emake -C build DESTDIR="${D}" install
-
- dodoc AUTHORS CREDITS NEWS THANKS TRANSLATIONS
-}
-
-pkg_postinst() {
- einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-
- if use gtk ; then
- einfo ""
- einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index d9c8308..adb5fc3 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -64,7 +64,7 @@
virtual/libgudev:=
)
fdk? ( media-libs/fdk-aac )
- x265? ( =media-libs/x265-1.7 )
+ x265? ( >=media-libs/x265-1.7 )
"
DEPEND="${RDEPEND}
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 05be3d8..79cf750 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.9.6.tar.gz 5290948 SHA256 da0eb23d19cc6248ef61535f3e4784ee57c113d68bfbb6e9c29dc713c2c60c0d SHA512 045205770410cdceb21035030a89502645e5e25b50ca2162250608d4a4d042477f968bf257b6313d0bd67234c48970027cae432943866cb78d53e11b39522ea3 WHIRLPOOL b048b3f4dcd4a729d7306a4d7f2d8448edb86f17226aab1217289d1581836fb0877eb100ce01c8645f07306d6f78a8a48d788960af0bdb9f2b08f3fb6cf60c97
-DIST makemkv-oss-1.9.6.tar.gz 4405665 SHA256 eddcd73db7b26f8fef0fcfa0cae588a8cfc9fd404fd15caeb33acc79cad6ae2a SHA512 141d7ba7608d17e0fa2d60be96dc6674641ec223c8d0ad0cdc438a4d979e8f84cb5ffc5abaf1d5b93accde30428b5080fcf9c2db046a8114854e347760f15164 WHIRLPOOL 171ea471eb90bb67846ca3356e97172f76b8fbd53969d719968740fbb3a83d0a70eb0fa5bf6973650bd6b4db3d8416ff08d8879ed2d56275030378265ab91139
+DIST makemkv-bin-1.9.7.tar.gz 5305589 SHA256 de6d0fd802c13fbaac4a3d0720e3de15f81b006fde0042a2df42d784b46b33ac SHA512 8d50673c5291381f5800c0e93341e6a01a4e40d9ac0b47ac1f48bbdfb883ed8e82e9fb9c50e48a667b45aa9903a88e4f680b7b7afe7d6913c5db0cc86030c133 WHIRLPOOL 346f4a64e4ec594deec592f9cf7b24d83357a1ec523eeeeed49e9370c68a82728f8431cbf5b54c0a3b9789b14ce18327ddd9194dd745a27c653db4938b70b1d6
+DIST makemkv-oss-1.9.7.tar.gz 4405814 SHA256 69fd254a2eb63e90f616051fde6cd7188c3ee454033bdf288c63843876a02e99 SHA512 842aecac301889116f24afa99f35bfe8acacc15a4544c6801742461c65f7f24e7bb2b75725cc22a64c2b6b3d6458eb991a6fa6b68ec61d2b559fd96a55472333 WHIRLPOOL 9856be4771628cee0ac2ceca8067926397f48d96ce5f3c250edaa7be4c3a149e8f00a1b9c51c9b1e905966ffbdae1c8544a07b38662767a6f1556f2c18fe1b74
diff --git a/media-video/makemkv/makemkv-1.9.6.ebuild b/media-video/makemkv/makemkv-1.9.7.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.9.6.ebuild
rename to media-video/makemkv/makemkv-1.9.7.ebuild
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 65a84e0..b575692 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1,4 @@
DIST mkvtoolnix-6.6.0.tar.xz 5174424 SHA256 cb1f965617fe064cf78457d3fbd0685eb31ae5b7e205cf4c8e74b6f27f3399e3 SHA512 c86f10a0a919e6d28c2587b60663c38713cfa6ca0a5188524b81af2fd60e4ea626a01431d29c6ae5885eae05d71af93d857986c5008aec4963dacc3ead9dc26f WHIRLPOOL 55a15bb2fdb62af85e189c39b1a1391d33eb08b4ba116fc307965be6817a944b21d18c034b9a3da16a6e84e93544dbd59f3c7fe9406ab454e15cf8ee1eb815c3
DIST mkvtoolnix-8.2.0.tar.xz 5856988 SHA256 eb6d3d7a0254bb4326dccc9983418801783198cdf4a259f31261dab4e843a5c4 SHA512 200fad08f6912081d7aabbae9330dc41b90af8d6fdce592090b9fedf2325a91f70d3a85ff40b03b57b0682a075050b6b73307872c1e716e8261849c3fb97968b WHIRLPOOL 1b25cd8913eb02018d62de369171ee1a48d31cbce6684c0c7febd2f88c3286bbf386c825ddeae54ef411dc14cc128c9e833408f9b0ac9cb1d5e525ba34aaa4ae
DIST mkvtoolnix-8.3.0.tar.xz 5863384 SHA256 87bd82222995d35c310a426ed43e0b27cbfefa0caadcbcca8296787314affc37 SHA512 fb3ac11480c20ae360fef9081991876ef2d7a717f24ec631bb8482ee7d22f79164aafeaf561dee503f1c0a83fe3ed6db319b420c34d638450aada762e6eb00c0 WHIRLPOOL b3cd3f4785c891c75eac3754136aa0b709ff0e784eea6d0e915478eea6fbdbe7132c56a997a007ba6d690649b6caaae46a8b45ae055aab7ae557486d99aab417
+DIST mkvtoolnix-8.4.0.tar.xz 3234284 SHA256 f6a5506d14a0b16abb3765d6f78cded0267e01096926b30e8f72df9d30aaf878 SHA512 ab9ab49baf06a8ef713872a09c58fdb1560628dbe3b2b661d809972f56a36c751a390a78ae260624510963b92e177d090088030bb96f9ab9e96e1a372772d22f WHIRLPOOL 811a0466413bdba84959c5ae84d637aba4371018ee3deed70d65f24472c0bf6a714003574efb4e4dcdc3bfb1b3c48595a347ab0bcdd935a9b49e2f1ab4c36c58
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild
new file mode 100644
index 0000000..6872d50
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
+SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="curl debug pch qt5"
+
+ruby_atom() {
+ local ruby_slot=${1/ruby/}
+ ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
+ echo "dev-lang/ruby:${ruby_slot}"
+}
+
+# hacks to avoid using the ruby eclasses since this requires something similar
+# to the python-any-r1 eclass for ruby which currently doesn't exist
+RUBY_IMPLS=( ruby22 ruby21 ruby20 )
+RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
+ echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
+
+RDEPEND="
+ >=dev-libs/boost-1.46.0:=
+ >=dev-libs/libebml-1.3.1:=
+ dev-libs/pugixml
+ media-libs/flac
+ >=media-libs/libmatroska-1.4.2:=
+ media-libs/libogg
+ media-libs/libvorbis
+ sys-apps/file
+ sys-libs/zlib
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="${RDEPEND}
+ || ( ${RUBY_BDEPS} )
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+pkg_pretend() {
+ # https://bugs.gentoo.org/419257
+ local ver=4.6
+ local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+ if ! version_is_at_least ${ver} $(gcc-version); then
+ eerror ${msg}
+ die ${msg}
+ fi
+}
+
+src_prepare() {
+ local ruby_impl
+ for ruby_impl in "${RUBY_IMPLS[@]}"; do
+ if has_version "$(ruby_atom ${ruby_impl})"; then
+ export RUBY=${ruby_impl}
+ break
+ fi
+ done
+ [[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
+
+ epatch_user
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ if use qt5 ; then
+ # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+ myconf+=(
+ --with-moc=/usr/$(get_libdir)/qt5/bin/moc
+ --with-uic=/usr/$(get_libdir)/qt5/bin/uic
+ --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
+ )
+ fi
+
+ econf \
+ $(use_enable debug) \
+ $(use_enable qt5 qt) \
+ $(use_with curl) \
+ $(usex pch "" --disable-precompiled-headers) \
+ "${myconf[@]}" \
+ --disable-optimization \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --with-boost="${EPREFIX}"/usr \
+ --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+ "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
+}
+
+src_install() {
+ DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
+
+ dodoc AUTHORS ChangeLog README.md
+ doman doc/man/*.1
+}
diff --git a/media-video/movit/movit-1.1.2.ebuild b/media-video/movit/movit-1.1.2.ebuild
index 80e118c..4a85141 100644
--- a/media-video/movit/movit-1.1.2.ebuild
+++ b/media-video/movit/movit-1.1.2.ebuild
@@ -15,7 +15,7 @@
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND="media-libs/mesa
diff --git a/media-video/movit/movit-1.1.3.ebuild b/media-video/movit/movit-1.1.3.ebuild
index c51efb9..0892714 100644
--- a/media-video/movit/movit-1.1.3.ebuild
+++ b/media-video/movit/movit-1.1.3.ebuild
@@ -15,7 +15,7 @@
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND="media-libs/mesa
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 8aad2a9..bb818f3 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,5 @@
DIST MPlayer-1.1.1.tar.xz 11202492 SHA256 ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76 SHA512 06371d47b02caec83c7662f6bb4a827eafb7f3309f6cda959a0f49b647df031166a6e7c5d530b57b580104289ee260aa96f3f43cbfffcef816cea776b0d5aed0 WHIRLPOOL 3cd0f3845cd45961b778c384a322bc628cc9cd6fef3801b62389bd616a443ba5270c378a889412a7dc72d37ff26704d5d989d2c995a2a4a6540f6313ccacbb63
+DIST MPlayer-1.2.tar.xz 13019196 SHA256 ffe7f6f10adf2920707e8d6c04f0d3ed34c307efc6cd90ac46593ee8fba2e2b6 SHA512 ac10dd4facd0d8fbc3454a3a2eae0e0d2ed76fa60f30ebd6f8495632e4541af712ab2d005e88bc2baa8302ccb98d63ba80a051db80d2b76ac928a2bd779b47aa WHIRLPOOL 65bcda55684dced6b286e505df4180f849d6a9f2e1e44560f3393311694ea5a0e96cd7c454b8bbc4198b92c1fd3b0fb4f7c5f6842710b40dc47216037a88b33b
DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 WHIRLPOOL d635f54be65b0ca1047d943b6f6da433cda9fce6ed74fcab993501cf7f6b443eb711e182cd7fff09e553d251b5fd1c60196aa22e8370cba99fa175ed5ecdb47f
DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25
DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
diff --git a/media-video/mplayer/files/mplayer-1.2-get_buffer.patch b/media-video/mplayer/files/mplayer-1.2-get_buffer.patch
new file mode 100644
index 0000000..3329b98
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.2-get_buffer.patch
@@ -0,0 +1,327 @@
+r37476 | rtogni | 2015-09-05 18:20:27 +0200 (Sat, 05 Sep 2015) | 5 lines
+
+Replace deprecated get_buffer, buffer_hints, and others
+
+This is needed to compile with latest FFmpeg
+
+Index: libmpcodecs/vd_ffmpeg.c
+===================================================================
+--- libmpcodecs/vd_ffmpeg.c (revision 37475)
++++ libmpcodecs/vd_ffmpeg.c (revision 37476)
+@@ -40,6 +40,7 @@
+ #if CONFIG_VDPAU
+ #include "libavcodec/vdpau.h"
+ #endif
++#include "libavutil/pixdesc.h"
+
+ static const vd_info_t info = {
+ "FFmpeg's libavcodec codec family",
+@@ -95,8 +96,11 @@
+
+ #include "m_option.h"
+
+-static int get_buffer(AVCodecContext *avctx, AVFrame *pic);
++static int get_buffer(AVCodecContext *avctx, AVFrame *pic, int isreference);
++static int mpcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame);
++static int get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags);
+ static void release_buffer(AVCodecContext *avctx, AVFrame *pic);
++static void mpcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
+ static void draw_slice(struct AVCodecContext *s, const AVFrame *src, int offset[4],
+ int y, int type, int height);
+
+@@ -269,19 +273,10 @@
+ if (lavc_param_vismv || (lavc_param_debug & (FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP))) {
+ ctx->do_slices = ctx->do_dr1 = 0;
+ }
+-#ifndef CODEC_FLAG_EMU_EDGE
+-#define CODEC_FLAG_EMU_EDGE 0
+-#endif
+ if(ctx->do_dr1){
+- avctx->flags |= CODEC_FLAG_EMU_EDGE;
+- avctx-> reget_buffer =
+- avctx-> get_buffer = get_buffer;
+- avctx->release_buffer = release_buffer;
++ avctx->get_buffer2 = get_buffer2;
+ } else if (lavc_codec->capabilities & CODEC_CAP_DR1) {
+- avctx->flags &= ~CODEC_FLAG_EMU_EDGE;
+- avctx-> reget_buffer = avcodec_default_reget_buffer;
+- avctx-> get_buffer = avcodec_default_get_buffer;
+- avctx->release_buffer = avcodec_default_release_buffer;
++ avctx->get_buffer2 = avcodec_default_get_buffer2;
+ }
+ avctx->slice_flags = 0;
+ }
+@@ -309,9 +304,7 @@
+ if (IMGFMT_IS_HWACCEL(imgfmt)) {
+ ctx->do_dr1 = 1;
+ ctx->nonref_dr = 0;
+- avctx->get_buffer = get_buffer;
+- avctx->release_buffer = release_buffer;
+- avctx->reget_buffer = get_buffer;
++ avctx->get_buffer2 = get_buffer2;
+ mp_msg(MSGT_DECVIDEO, MSGL_V, IMGFMT_IS_XVMC(imgfmt) ?
+ MSGTR_MPCODECS_XVMCAcceleratedMPEG2 :
+ "[VD_FFMPEG] VDPAU accelerated decoding\n");
+@@ -384,7 +377,6 @@
+ #endif
+ avctx->flags2|= lavc_param_fast;
+ avctx->codec_tag= sh->format;
+- avctx->stream_codec_tag= sh->video.fccHandler;
+ avctx->idct_algo= lavc_param_idct_algo;
+ avctx->error_concealment= lavc_param_error_concealment;
+ avctx->debug= lavc_param_debug;
+@@ -668,7 +660,7 @@
+ return 0;
+ }
+
+-static int get_buffer(AVCodecContext *avctx, AVFrame *pic){
++static int get_buffer(AVCodecContext *avctx, AVFrame *pic, int isreference){
+ sh_video_t *sh = avctx->opaque;
+ vd_ffmpeg_ctx *ctx = sh->context;
+ mp_image_t *mpi=NULL;
+@@ -677,27 +669,12 @@
+ int width = FFMAX(avctx->width, -(-avctx->coded_width >> avctx->lowres));
+ int height= FFMAX(avctx->height, -(-avctx->coded_height >> avctx->lowres));
+ // special case to handle reget_buffer
+- if (pic->opaque && pic->data[0] && (!pic->buffer_hints || pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE))
++ if (pic->opaque && pic->data[0])
+ return 0;
+ avcodec_align_dimensions(avctx, &width, &height);
+ //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count);
+
+- if (pic->buffer_hints) {
+- mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints);
+- type = MP_IMGTYPE_TEMP;
+- if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE)
+- flags |= MP_IMGFLAG_READABLE;
+- if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE ||
+- pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) {
+- ctx->ip_count++;
+- type = MP_IMGTYPE_IP;
+- flags |= MP_IMGFLAG_PRESERVE;
+- }
+- flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
+- MP_IMGFLAG_DRAW_CALLBACK:0;
+- mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_IP ? "using IP\n" : "using TEMP\n");
+- } else {
+- if(!pic->reference){
++ if(!isreference){
+ ctx->b_count++;
+ flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
+ MP_IMGFLAG_DRAW_CALLBACK:0;
+@@ -711,11 +688,10 @@
+ }else{
+ type= MP_IMGTYPE_IP;
+ }
+- }
+
+ if (ctx->nonref_dr) {
+ if (flags & MP_IMGFLAG_PRESERVE)
+- return avcodec_default_get_buffer(avctx, pic);
++ return mpcodec_default_get_buffer(avctx, pic);
+ // Use NUMBERED since for e.g. TEMP vos assume there will
+ // be no other frames between the get_image and matching put_image.
+ type = MP_IMGTYPE_NUMBERED;
+@@ -722,7 +698,6 @@
+ }
+
+ if(init_vo(sh, avctx->pix_fmt, 1) < 0){
+- avctx->release_buffer= avcodec_default_release_buffer;
+ goto disable_dr1;
+ }
+
+@@ -822,7 +797,6 @@
+ else
+ printf(".");
+ #endif
+- pic->type= FF_BUFFER_TYPE_USER;
+ return 0;
+
+ disable_dr1:
+@@ -829,13 +803,11 @@
+ ctx->do_dr1 = 0;
+ // For frame-multithreading these contexts aren't
+ // the same and must both be updated.
+- ctx->avctx->get_buffer =
+- avctx->get_buffer = avcodec_default_get_buffer;
+- ctx->avctx->reget_buffer =
+- avctx->reget_buffer = avcodec_default_reget_buffer;
++ ctx->avctx->get_buffer2 =
++ avctx->get_buffer2 = avcodec_default_get_buffer2;
+ if (pic->data[0])
+- release_buffer(avctx, pic);
+- return avctx->get_buffer(avctx, pic);
++ mpcodec_default_release_buffer(avctx, pic);
++ return avctx->get_buffer2(avctx, pic,0);
+ }
+
+ static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){
+@@ -843,8 +815,8 @@
+ sh_video_t *sh = avctx->opaque;
+ vd_ffmpeg_ctx *ctx = sh->context;
+ int i;
+- if (pic->type != FF_BUFFER_TYPE_USER) {
+- avcodec_default_release_buffer(avctx, pic);
++ if (pic->opaque == NULL) {
++ mpcodec_default_release_buffer(avctx, pic);
+ return;
+ }
+
+@@ -954,7 +926,7 @@
+ // even when we do dr we might actually get a buffer we had
+ // FFmpeg allocate - this mostly happens with nonref_dr.
+ // Ensure we treat it correctly.
+- dr1= ctx->do_dr1 && pic->type == FF_BUFFER_TYPE_USER;
++ dr1= ctx->do_dr1 && pic->opaque != NULL;
+ if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame!\n");
+ //printf("repeat: %d\n", pic->repeat_pict);
+ //-- vstats generation
+@@ -1128,3 +1100,148 @@
+ set_format_params(avctx, selected_format);
+ return selected_format;
+ }
++
++
++/*
++ FFWrapper
++*/
++static int mpcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame)
++{
++ return avcodec_default_get_buffer2(avctx, frame, 0);
++}
++
++static void mpcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic)
++{
++ av_frame_unref(pic);
++}
++
++typedef struct CompatReleaseBufPriv {
++ AVCodecContext avctx;
++ AVFrame frame;
++ uint8_t avframe_padding[1024]; // hack to allow linking to a avutil with larger AVFrame
++} CompatReleaseBufPriv;
++
++static void compat_free_buffer(void *opaque, uint8_t *data)
++{
++ CompatReleaseBufPriv *priv = opaque;
++ release_buffer(&priv->avctx, &priv->frame);
++ av_freep(&priv);
++}
++
++static void compat_release_buffer(void *opaque, uint8_t *data)
++{
++ AVBufferRef *buf = opaque;
++ av_buffer_unref(&buf);
++}
++
++static int get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags)
++{
++ /*
++ * Wrap an old get_buffer()-allocated buffer in a bunch of AVBuffers.
++ * We wrap each plane in its own AVBuffer. Each of those has a reference to
++ * a dummy AVBuffer as its private data, unreffing it on free.
++ * When all the planes are freed, the dummy buffer's free callback calls
++ * release_buffer().
++ */
++ CompatReleaseBufPriv *priv = NULL;
++ AVBufferRef *dummy_buf = NULL;
++ int planes, i, ret;
++
++ ret = get_buffer(avctx, frame, flags & AV_GET_BUFFER_FLAG_REF);
++ if (ret < 0)
++ return ret;
++
++ /* return if the buffers are already set up
++ * this would happen e.g. when a custom get_buffer() calls
++ * avcodec_default_get_buffer
++ */
++ if (frame->buf[0])
++ goto end0;
++
++ priv = av_mallocz(sizeof(*priv));
++ if (!priv) {
++ ret = AVERROR(ENOMEM);
++ goto fail;
++ }
++ priv->avctx = *avctx;
++ priv->frame = *frame;
++
++ dummy_buf = av_buffer_create(NULL, 0, compat_free_buffer, priv, 0);
++ if (!dummy_buf) {
++ ret = AVERROR(ENOMEM);
++ goto fail;
++ }
++
++#define WRAP_PLANE(ref_out, data, data_size) \
++do { \
++ AVBufferRef *dummy_ref = av_buffer_ref(dummy_buf); \
++ if (!dummy_ref) { \
++ ret = AVERROR(ENOMEM); \
++ goto fail; \
++ } \
++ ref_out = av_buffer_create(data, data_size, compat_release_buffer, \
++ dummy_ref, 0); \
++ if (!ref_out) { \
++ av_buffer_unref(&dummy_ref); \
++ av_frame_unref(frame); \
++ ret = AVERROR(ENOMEM); \
++ goto fail; \
++ } \
++} while (0)
++
++ if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
++ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
++
++ planes = av_pix_fmt_count_planes(frame->format);
++ /* workaround for AVHWAccel plane count of 0, buf[0] is used as
++ check for allocated buffers: make libavcodec happy */
++ if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
++ planes = 1;
++ if (!desc || planes <= 0) {
++ ret = AVERROR(EINVAL);
++ goto fail;
++ }
++
++ for (i = 0; i < planes; i++) {
++ int v_shift = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
++ int plane_size = (frame->height >> v_shift) * frame->linesize[i];
++
++ WRAP_PLANE(frame->buf[i], frame->data[i], plane_size);
++ }
++ } else {
++ int planar = av_sample_fmt_is_planar(frame->format);
++ planes = planar ? avctx->channels : 1;
++
++ if (planes > FF_ARRAY_ELEMS(frame->buf)) {
++ frame->nb_extended_buf = planes - FF_ARRAY_ELEMS(frame->buf);
++ frame->extended_buf = av_malloc_array(sizeof(*frame->extended_buf),
++ frame->nb_extended_buf);
++ if (!frame->extended_buf) {
++ ret = AVERROR(ENOMEM);
++ goto fail;
++ }
++ }
++
++ for (i = 0; i < FFMIN(planes, FF_ARRAY_ELEMS(frame->buf)); i++)
++ WRAP_PLANE(frame->buf[i], frame->extended_data[i], frame->linesize[0]);
++
++ for (i = 0; i < frame->nb_extended_buf; i++)
++ WRAP_PLANE(frame->extended_buf[i],
++ frame->extended_data[i + FF_ARRAY_ELEMS(frame->buf)],
++ frame->linesize[0]);
++ }
++
++ av_buffer_unref(&dummy_buf);
++
++end0:
++ frame->width = avctx->width;
++ frame->height = avctx->height;
++
++ return 0;
++
++fail:
++ release_buffer(avctx, frame);
++ av_freep(&priv);
++ av_buffer_unref(&dummy_buf);
++ return ret;
++}
diff --git a/media-video/mplayer/mplayer-1.2-r1.ebuild b/media-video/mplayer/mplayer-1.2-r1.ebuild
new file mode 100644
index 0000000..33a2fc0
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.2-r1.ebuild
@@ -0,0 +1,639 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
+
+inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+bs2b cddb +cdio cdparanoia cpudetection debug dga
+directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
+tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
+vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
+
+VIDEO_CARDS="s3virge mga tdfx"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+FONT_URI="
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
+if [[ ${PV} == *9999* ]]; then
+ RELEASE_URI=""
+elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+ MY_P="MPlayer-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
+else
+ RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+fi
+SRC_URI="${RELEASE_URI}
+ !truetype? ( ${FONT_URI} )"
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+FONT_RDEPS="
+ virtual/ttf-fonts
+ media-libs/fontconfig
+ >=media-libs/freetype-2.2.1:2
+"
+X_RDEPS="
+ x11-libs/libXext
+ x11-libs/libXxf86vm
+"
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+# nemesi? ( net-libs/libnemesi )
+RDEPEND+="
+ sys-libs/ncurses:0=
+ app-arch/bzip2
+ sys-libs/zlib
+ >=media-video/ffmpeg-2.6:0=[vdpau?]
+ a52? ( media-libs/a52dec )
+ aalib? ( media-libs/aalib )
+ alsa? ( media-libs/alsa-lib )
+ bidi? ( dev-libs/fribidi )
+ bluray? ( >=media-libs/libbluray-0.2.1 )
+ bs2b? ( media-libs/libbs2b )
+ cdio? ( dev-libs/libcdio )
+ cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+ dga? ( x11-libs/libXxf86dga )
+ directfb? ( dev-libs/DirectFB )
+ dts? ( media-libs/libdca )
+ dv? ( media-libs/libdv )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ dvd? ( >=media-libs/libdvdread-4.1.3 )
+ dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+ encode? (
+ !twolame? ( toolame? ( media-sound/toolame ) )
+ twolame? ( media-sound/twolame )
+ faac? ( media-libs/faac )
+ mp3? ( media-sound/lame )
+ x264? ( >=media-libs/x264-0.0.20100423:= )
+ xvid? ( media-libs/xvid )
+ )
+ enca? ( app-i18n/enca )
+ faad? ( media-libs/faad2 )
+ ggi? ( media-libs/libggi media-libs/libggiwmh )
+ gif? ( media-libs/giflib )
+ gsm? ( media-sound/gsm )
+ iconv? ( virtual/libiconv )
+ jack? ( media-sound/jack-audio-connection-kit )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:0 )
+ ladspa? ( media-libs/ladspa-sdk )
+ libass? ( >=media-libs/libass-0.9.10:= )
+ libcaca? ( media-libs/libcaca )
+ libmpeg2? ( media-libs/libmpeg2 )
+ lirc? ( app-misc/lirc )
+ live? ( media-plugins/live )
+ lzo? ( >=dev-libs/lzo-2 )
+ mad? ( media-libs/libmad )
+ mng? ( media-libs/libmng:= )
+ mp3? ( media-sound/mpg123 )
+ nas? ( media-libs/nas )
+ nut? ( >=media-libs/libnut-661 )
+ openal? ( media-libs/openal )
+ opengl? ( virtual/opengl )
+ png? ( media-libs/libpng:0= )
+ pnm? ( media-libs/netpbm )
+ pulseaudio? ( media-sound/pulseaudio )
+ rar? (
+ || (
+ app-arch/unrar
+ app-arch/rar
+ )
+ )
+ rtmp? ( media-video/rtmpdump )
+ samba? ( net-fs/samba )
+ sdl? ( media-libs/libsdl )
+ speex? ( media-libs/speex )
+ theora? ( media-libs/libtheora[encode?] )
+ tremor? ( media-libs/tremor )
+ truetype? ( ${FONT_RDEPS} )
+ vdpau? ( x11-libs/libvdpau )
+ vorbis? ( !tremor? ( media-libs/libvorbis ) )
+ X? ( ${X_RDEPS} )
+ xanim? ( media-video/xanim )
+ xinerama? ( x11-libs/libXinerama )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ xv? ( x11-libs/libXv )
+ xvmc? ( x11-libs/libXvMC )
+"
+
+X_DEPS="
+ x11-proto/videoproto
+ x11-proto/xf86vidmodeproto
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dga? ( x11-proto/xf86dgaproto )
+ X? ( ${X_DEPS} )
+ xinerama? ( x11-proto/xineramaproto )
+ xscreensaver? ( x11-proto/scrnsaverproto )
+ amd64? ( ${ASM_DEP} )
+ doc? (
+ dev-libs/libxslt app-text/docbook-xml-dtd
+ app-text/docbook-xsl-stylesheets
+ )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+"
+RDEPEND+="
+ selinux? ( sec-policy/selinux-mplayer )
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+if [[ ${PV} != *9999* ]]; then
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+ KEYWORDS=""
+fi
+
+# faac codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# radio requires oss or alsa backend
+# xvmc requires xvideo support
+REQUIRED_USE="
+ dga? ( X )
+ dvdnav? ( dvd )
+ enca? ( iconv )
+ ggi? ( X )
+ libass? ( truetype )
+ opengl? ( X )
+ osdmenu? ( X )
+ truetype? ( iconv )
+ vdpau? ( X )
+ vidix? ( X )
+ xinerama? ( X )
+ xscreensaver? ( X )
+ xv? ( X )
+ xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
+
+PATCHES=(
+ # Work with pulseaudio-6, bug #549680, https://trac.mplayerhq.hu/ticket/2241
+ "${FILESDIR}"/${PN}-1.2_pre20150214-pulseaudio-6.0.patch
+)
+
+pkg_setup() {
+ if [[ ${PV} == *9999* ]]; then
+ elog
+ elog "This is a live ebuild which installs the latest from upstream's"
+ elog "subversion repository, and is unsupported by Gentoo."
+ elog "Everything but bugs in the ebuild itself will be ignored."
+ elog
+ fi
+
+ if use cpudetection; then
+ ewarn
+ ewarn "You've enabled the cpudetection flag. This feature is"
+ ewarn "included mainly for people who want to use the same"
+ ewarn "binary on another system with a different CPU architecture."
+ ewarn "MPlayer will already detect your CPU settings by default at"
+ ewarn "buildtime; this flag is used for runtime detection."
+ ewarn "You won't need this turned on if you are only building"
+ ewarn "mplayer for this system. Also, if your compile fails, try"
+ ewarn "disabling this use flag."
+ fi
+
+ if has_version 'media-video/libav' ; then
+ ewarn "Please note that upstream uses media-video/ffmpeg."
+ ewarn "media-video/libav should be fine in theory but if you"
+ ewarn "experience any problem, try to move to media-video/ffmpeg."
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} = *9999* ]]; then
+ subversion_src_unpack
+ cd "${WORKDIR}"
+ rm -rf "${WORKDIR}/${P}/ffmpeg/"
+ ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+ else
+ unpack ${A}
+ fi
+
+ if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
+ cd "${S}"
+ cp "${FILESDIR}/dump_ffmpeg.sh" . || die
+ chmod +x dump_ffmpeg.sh
+ ./dump_ffmpeg.sh || die
+ fi
+
+ if ! use truetype; then
+ unpack font-arial-iso-8859-1.tar.bz2 \
+ font-arial-iso-8859-2.tar.bz2 \
+ font-arial-cp1250.tar.bz2
+ fi
+}
+
+src_prepare() {
+ local svf=snapshot_version
+ if [[ ${PV} = *9999* ]]; then
+ # Set SVN version manually
+ subversion_wc_info
+ printf "${ESVN_WC_REVISION}" > $svf
+ fi
+ if [ ! -f VERSION ] ; then
+ [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+ local sv=$(<$svf)
+ printf "SVN-r${sv} (Gentoo)" > VERSION
+ fi
+
+ # fix path to bash executable in configure scripts
+ sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
+
+ base_src_prepare
+
+ # Use sane default for >=virtual/udev-197
+ sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+
+ if has_version '>=media-video/ffmpeg-2.9'; then
+ epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch"
+ epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch"
+ epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch"
+ fi
+}
+
+src_configure() {
+ local myconf=""
+ local uses i
+
+ # set LINGUAS
+ [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+ [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+
+ # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+ # compilation in almost every situation. The reason for this is
+ # because if --enable is used, it will force the build of that option,
+ # regardless of whether the dependency is available or not.
+
+ ###################
+ #Optional features#
+ ###################
+ # disable svga since we don't want it
+ # disable arts since we don't have kde3
+ # always disable internal ass
+ # disable opus and ilbc since it only controls support in internal
+ # ffmpeg which we do not use
+ myconf+="
+ --disable-svga --disable-svgalib_helper
+ --disable-ass-internal
+ --disable-arts
+ --disable-kai
+ --disable-libopus
+ --disable-libilbc
+ $(use_enable network networking)
+ $(use_enable joystick)
+ "
+ uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
+ myconf+=" --disable-nemesi" # nemesi automagic disable
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use bidi || myconf+=" --disable-fribidi"
+ use ipv6 || myconf+=" --disable-inet6"
+ use libass || myconf+=" --disable-ass"
+ use nut || myconf+=" --disable-libnut"
+ use rar || myconf+=" --disable-unrarexec"
+ use samba || myconf+=" --disable-smb"
+ use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+ # libcdio support: prefer libcdio over cdparanoia
+ # don't check for cddb w/cdio
+ if use cdio; then
+ myconf+=" --disable-cdparanoia"
+ else
+ myconf+=" --disable-libcdio"
+ use cdparanoia || myconf+=" --disable-cdparanoia"
+ use cddb || myconf+=" --disable-cddb"
+ fi
+
+ ################################
+ # DVD read, navigation support #
+ ################################
+ #
+ # dvdread - accessing a DVD
+ # dvdnav - navigation of menus
+ use dvd || myconf+=" --disable-dvdread"
+ use dvdnav || myconf+=" --disable-dvdnav"
+
+ #############
+ # Subtitles #
+ #############
+ #
+ # SRT/ASS/SSA (subtitles) requires freetype support
+ # freetype support requires iconv
+ # iconv optionally can use unicode
+ use truetype || myconf+=" --disable-freetype"
+ use iconv || myconf+=" --disable-iconv --charset=noconv"
+ use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+ #####################################
+ # DVB / Video4Linux / Radio support #
+ #####################################
+ myconf+=" --disable-tv-bsdbt848"
+ # broken upstream, won't work with recent kernels
+ myconf+=" --disable-ivtv"
+ # gone since linux-headers-2.6.38
+ myconf+=" --disable-tv-v4l1"
+ if { use dvb || use v4l || use pvr || use radio; }; then
+ use dvb || myconf+=" --disable-dvb"
+ use pvr || myconf+=" --disable-pvr"
+ use v4l || myconf+=" --disable-tv-v4l2"
+ if use radio && { use dvb || use v4l; }; then
+ myconf+="
+ --enable-radio
+ $(use_enable encode radio-capture)
+ "
+ else
+ myconf+="
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ "
+ fi
+ else
+ myconf+="
+ --disable-tv
+ --disable-tv-v4l2
+ --disable-radio
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ --disable-dvb
+ --disable-v4l2
+ --disable-pvr"
+ fi
+
+ ##########
+ # Codecs #
+ ##########
+ myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
+ myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+ use dts || myconf+=" --disable-libdca"
+ if ! use mp3; then
+ myconf+="
+ --disable-mp3lame
+ --disable-mpg123
+ "
+ fi
+ uses="a52 bs2b dv gsm lzo rtmp vorbis"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-lib${i}"
+ done
+
+ uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use jpeg2k || myconf+=" --disable-libopenjpeg"
+
+ # Encoding
+ uses="faac x264 xvid toolame twolame"
+ if use encode; then
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ else
+ myconf+=" --disable-mencoder"
+ for i in ${uses}; do
+ myconf+=" --disable-${i}"
+ use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
+ done
+ fi
+
+ #################
+ # Binary codecs #
+ #################
+ myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+ ################
+ # Video Output #
+ ################
+ uses="directfb md5sum sdl"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use aalib || myconf+=" --disable-aa"
+ use fbcon || myconf+=" --disable-fbdev"
+ use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
+ use libcaca || myconf+=" --disable-caca"
+ use zoran || myconf+=" --disable-zr"
+
+ if ! use kernel_linux || ! use video_cards_mga; then
+ myconf+=" --disable-mga --disable-xmga"
+ fi
+
+ if use video_cards_tdfx; then
+ myconf+="
+ $(use_enable video_cards_tdfx tdfxvid)
+ $(use_enable fbcon tdfxfb)
+ "
+ else
+ myconf+="
+ --disable-3dfx
+ --disable-tdfxvid
+ --disable-tdfxfb
+ "
+ fi
+
+ # sun card, disable by default, see bug #258729
+ myconf+=" --disable-xvr100"
+
+ ################
+ # Audio Output #
+ ################
+ myconf+=" --disable-esd"
+ uses="alsa jack ladspa nas openal"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use pulseaudio || myconf+=" --disable-pulse"
+ if ! use radio; then
+ use oss || myconf+=" --disable-ossaudio"
+ fi
+
+ ####################
+ # Advanced Options #
+ ####################
+ # Platform specific flags, hardcoded on amd64 (see below)
+ use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+ uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+ for i in ${uses}; do
+ myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+ done
+
+ uses="altivec shm"
+ for i in ${uses}; do
+ myconf+=" $(use_enable ${i})"
+ done
+
+ use debug && myconf+=" --enable-debug=3"
+
+ if use x86 && gcc-specs-pie; then
+ filter-flags -fPIC -fPIE
+ append-ldflags -nopie
+ fi
+
+ ###########################
+ # X enabled configuration #
+ ###########################
+ myconf+=" --disable-gui"
+ myconf+=" --disable-vesa"
+ uses="ggi vdpau xinerama xv"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use dga || myconf+=" --disable-dga1 --disable-dga2"
+ use opengl || myconf+=" --disable-gl"
+ use osdmenu && myconf+=" --enable-menu"
+ use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
+ use xscreensaver || myconf+=" --disable-xss"
+ use X || myconf+=" --disable-x11"
+ if use xvmc; then
+ myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
+ else
+ myconf+=" --disable-xvmc"
+ fi
+
+ ############################
+ # OSX (aqua) configuration #
+ ############################
+ if use aqua; then
+ myconf+="
+ --enable-macosx-finder
+ --enable-macosx-bundle
+ "
+ fi
+
+ ./configure \
+ --cc="$(tc-getCC)" \
+ --host-cc="$(tc-getBUILD_CC)" \
+ --prefix="${EPREFIX}/usr" \
+ --bindir="${EPREFIX}/usr/bin" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --confdir="${EPREFIX}/etc/mplayer" \
+ --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
+ --mandir="${EPREFIX}/usr/share/man" \
+ --disable-ffmpeg_a \
+ ${myconf} || die
+}
+
+src_compile() {
+ base_src_compile
+ # Build only user-requested docs if they're available.
+ if use doc ; then
+ # select available languages from $LINGUAS
+ local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+ local BUILT_DOCS=""
+ for i in ${LINGUAS} ; do
+ has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+ done
+ if [[ -z $BUILT_DOCS ]]; then
+ emake -j1 html-chunked
+ else
+ for i in ${BUILT_DOCS}; do
+ emake -j1 html-chunked-${i}
+ done
+ fi
+ fi
+}
+
+src_install() {
+ local i
+
+ emake \
+ DESTDIR="${D}" \
+ INSTALLSTRIP="" \
+ install
+
+ dodoc AUTHORS Changelog Copyright README etc/codecs.conf
+
+ docinto tech/
+ dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
+ docinto TOOLS/
+ dodoc -r TOOLS
+ docinto tech/mirrors/
+ dodoc DOCS/tech/mirrors/*
+
+ if use doc; then
+ docinto html/
+ dohtml -r "${S}"/DOCS/HTML/*
+ fi
+
+ if ! use truetype; then
+ dodir /usr/share/mplayer/fonts
+ # Do this generic, as the mplayer people like to change the structure
+ # of their zips ...
+ for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
+ cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
+ done
+ # Fix the font symlink ...
+ rm -rf "${ED}/usr/share/mplayer/font"
+ dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+ fi
+
+ insinto /etc/mplayer
+ newins "${S}/etc/example.conf" mplayer.conf
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+ doins "${S}/etc/input.conf"
+ if use osdmenu; then
+ doins "${S}/etc/menu.conf"
+ fi
+
+ if use truetype; then
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+_EOF_
+ fi
+
+ # bug 256203
+ if use rar; then
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+ fi
+
+ dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+ newbin "${S}/TOOLS/midentify.sh" midentify
+}
+
+pkg_preinst() {
+ [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
+ rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
+}
+
+pkg_postrm() {
+ # Cleanup stale symlinks
+ [ -L "${EROOT}/usr/share/mplayer/font" -a \
+ ! -e "${EROOT}/usr/share/mplayer/font" ] && \
+ rm -f "${EROOT}/usr/share/mplayer/font"
+
+ [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
+ ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+ rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
+}
diff --git a/media-video/mplayer/mplayer-1.2.ebuild b/media-video/mplayer/mplayer-1.2.ebuild
new file mode 100644
index 0000000..3289e6b
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.2.ebuild
@@ -0,0 +1,639 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
+
+inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+bs2b cddb +cdio cdparanoia cpudetection debug dga
+directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
+tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
+vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
+
+VIDEO_CARDS="s3virge mga tdfx"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+FONT_URI="
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
+if [[ ${PV} == *9999* ]]; then
+ RELEASE_URI=""
+elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+ MY_P="MPlayer-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
+else
+ RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+fi
+SRC_URI="${RELEASE_URI}
+ !truetype? ( ${FONT_URI} )"
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+FONT_RDEPS="
+ virtual/ttf-fonts
+ media-libs/fontconfig
+ >=media-libs/freetype-2.2.1:2
+"
+X_RDEPS="
+ x11-libs/libXext
+ x11-libs/libXxf86vm
+"
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+# nemesi? ( net-libs/libnemesi )
+RDEPEND+="
+ sys-libs/ncurses:0=
+ app-arch/bzip2
+ sys-libs/zlib
+ >=media-video/ffmpeg-2.6:0=[vdpau?]
+ a52? ( media-libs/a52dec )
+ aalib? ( media-libs/aalib )
+ alsa? ( media-libs/alsa-lib )
+ bidi? ( dev-libs/fribidi )
+ bluray? ( >=media-libs/libbluray-0.2.1 )
+ bs2b? ( media-libs/libbs2b )
+ cdio? ( dev-libs/libcdio )
+ cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+ dga? ( x11-libs/libXxf86dga )
+ directfb? ( dev-libs/DirectFB )
+ dts? ( media-libs/libdca )
+ dv? ( media-libs/libdv )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ dvd? ( >=media-libs/libdvdread-4.1.3 )
+ dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+ encode? (
+ !twolame? ( toolame? ( media-sound/toolame ) )
+ twolame? ( media-sound/twolame )
+ faac? ( media-libs/faac )
+ mp3? ( media-sound/lame )
+ x264? ( >=media-libs/x264-0.0.20100423:= )
+ xvid? ( media-libs/xvid )
+ )
+ enca? ( app-i18n/enca )
+ faad? ( media-libs/faad2 )
+ ggi? ( media-libs/libggi media-libs/libggiwmh )
+ gif? ( media-libs/giflib )
+ gsm? ( media-sound/gsm )
+ iconv? ( virtual/libiconv )
+ jack? ( media-sound/jack-audio-connection-kit )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:0 )
+ ladspa? ( media-libs/ladspa-sdk )
+ libass? ( >=media-libs/libass-0.9.10:=[enca?] )
+ libcaca? ( media-libs/libcaca )
+ libmpeg2? ( media-libs/libmpeg2 )
+ lirc? ( app-misc/lirc )
+ live? ( media-plugins/live )
+ lzo? ( >=dev-libs/lzo-2 )
+ mad? ( media-libs/libmad )
+ mng? ( media-libs/libmng:= )
+ mp3? ( media-sound/mpg123 )
+ nas? ( media-libs/nas )
+ nut? ( >=media-libs/libnut-661 )
+ openal? ( media-libs/openal )
+ opengl? ( virtual/opengl )
+ png? ( media-libs/libpng:0= )
+ pnm? ( media-libs/netpbm )
+ pulseaudio? ( media-sound/pulseaudio )
+ rar? (
+ || (
+ app-arch/unrar
+ app-arch/rar
+ )
+ )
+ rtmp? ( media-video/rtmpdump )
+ samba? ( net-fs/samba )
+ sdl? ( media-libs/libsdl )
+ speex? ( media-libs/speex )
+ theora? ( media-libs/libtheora[encode?] )
+ tremor? ( media-libs/tremor )
+ truetype? ( ${FONT_RDEPS} )
+ vdpau? ( x11-libs/libvdpau )
+ vorbis? ( !tremor? ( media-libs/libvorbis ) )
+ X? ( ${X_RDEPS} )
+ xanim? ( media-video/xanim )
+ xinerama? ( x11-libs/libXinerama )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ xv? ( x11-libs/libXv )
+ xvmc? ( x11-libs/libXvMC )
+"
+
+X_DEPS="
+ x11-proto/videoproto
+ x11-proto/xf86vidmodeproto
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dga? ( x11-proto/xf86dgaproto )
+ X? ( ${X_DEPS} )
+ xinerama? ( x11-proto/xineramaproto )
+ xscreensaver? ( x11-proto/scrnsaverproto )
+ amd64? ( ${ASM_DEP} )
+ doc? (
+ dev-libs/libxslt app-text/docbook-xml-dtd
+ app-text/docbook-xsl-stylesheets
+ )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+"
+RDEPEND+="
+ selinux? ( sec-policy/selinux-mplayer )
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+if [[ ${PV} != *9999* ]]; then
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+ KEYWORDS=""
+fi
+
+# faac codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# radio requires oss or alsa backend
+# xvmc requires xvideo support
+REQUIRED_USE="
+ dga? ( X )
+ dvdnav? ( dvd )
+ enca? ( iconv )
+ ggi? ( X )
+ libass? ( truetype )
+ opengl? ( X )
+ osdmenu? ( X )
+ truetype? ( iconv )
+ vdpau? ( X )
+ vidix? ( X )
+ xinerama? ( X )
+ xscreensaver? ( X )
+ xv? ( X )
+ xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
+
+PATCHES=(
+ # Work with pulseaudio-6, bug #549680, https://trac.mplayerhq.hu/ticket/2241
+ "${FILESDIR}"/${PN}-1.2_pre20150214-pulseaudio-6.0.patch
+)
+
+pkg_setup() {
+ if [[ ${PV} == *9999* ]]; then
+ elog
+ elog "This is a live ebuild which installs the latest from upstream's"
+ elog "subversion repository, and is unsupported by Gentoo."
+ elog "Everything but bugs in the ebuild itself will be ignored."
+ elog
+ fi
+
+ if use cpudetection; then
+ ewarn
+ ewarn "You've enabled the cpudetection flag. This feature is"
+ ewarn "included mainly for people who want to use the same"
+ ewarn "binary on another system with a different CPU architecture."
+ ewarn "MPlayer will already detect your CPU settings by default at"
+ ewarn "buildtime; this flag is used for runtime detection."
+ ewarn "You won't need this turned on if you are only building"
+ ewarn "mplayer for this system. Also, if your compile fails, try"
+ ewarn "disabling this use flag."
+ fi
+
+ if has_version 'media-video/libav' ; then
+ ewarn "Please note that upstream uses media-video/ffmpeg."
+ ewarn "media-video/libav should be fine in theory but if you"
+ ewarn "experience any problem, try to move to media-video/ffmpeg."
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} = *9999* ]]; then
+ subversion_src_unpack
+ cd "${WORKDIR}"
+ rm -rf "${WORKDIR}/${P}/ffmpeg/"
+ ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+ else
+ unpack ${A}
+ fi
+
+ if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
+ cd "${S}"
+ cp "${FILESDIR}/dump_ffmpeg.sh" . || die
+ chmod +x dump_ffmpeg.sh
+ ./dump_ffmpeg.sh || die
+ fi
+
+ if ! use truetype; then
+ unpack font-arial-iso-8859-1.tar.bz2 \
+ font-arial-iso-8859-2.tar.bz2 \
+ font-arial-cp1250.tar.bz2
+ fi
+}
+
+src_prepare() {
+ local svf=snapshot_version
+ if [[ ${PV} = *9999* ]]; then
+ # Set SVN version manually
+ subversion_wc_info
+ printf "${ESVN_WC_REVISION}" > $svf
+ fi
+ if [ ! -f VERSION ] ; then
+ [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+ local sv=$(<$svf)
+ printf "SVN-r${sv} (Gentoo)" > VERSION
+ fi
+
+ # fix path to bash executable in configure scripts
+ sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
+
+ base_src_prepare
+
+ # Use sane default for >=virtual/udev-197
+ sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+
+ if has_version '>=media-video/ffmpeg-2.9'; then
+ epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch"
+ epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch"
+ epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch"
+ fi
+}
+
+src_configure() {
+ local myconf=""
+ local uses i
+
+ # set LINGUAS
+ [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+ [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+
+ # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+ # compilation in almost every situation. The reason for this is
+ # because if --enable is used, it will force the build of that option,
+ # regardless of whether the dependency is available or not.
+
+ ###################
+ #Optional features#
+ ###################
+ # disable svga since we don't want it
+ # disable arts since we don't have kde3
+ # always disable internal ass
+ # disable opus and ilbc since it only controls support in internal
+ # ffmpeg which we do not use
+ myconf+="
+ --disable-svga --disable-svgalib_helper
+ --disable-ass-internal
+ --disable-arts
+ --disable-kai
+ --disable-libopus
+ --disable-libilbc
+ $(use_enable network networking)
+ $(use_enable joystick)
+ "
+ uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
+ myconf+=" --disable-nemesi" # nemesi automagic disable
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use bidi || myconf+=" --disable-fribidi"
+ use ipv6 || myconf+=" --disable-inet6"
+ use libass || myconf+=" --disable-ass"
+ use nut || myconf+=" --disable-libnut"
+ use rar || myconf+=" --disable-unrarexec"
+ use samba || myconf+=" --disable-smb"
+ use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+ # libcdio support: prefer libcdio over cdparanoia
+ # don't check for cddb w/cdio
+ if use cdio; then
+ myconf+=" --disable-cdparanoia"
+ else
+ myconf+=" --disable-libcdio"
+ use cdparanoia || myconf+=" --disable-cdparanoia"
+ use cddb || myconf+=" --disable-cddb"
+ fi
+
+ ################################
+ # DVD read, navigation support #
+ ################################
+ #
+ # dvdread - accessing a DVD
+ # dvdnav - navigation of menus
+ use dvd || myconf+=" --disable-dvdread"
+ use dvdnav || myconf+=" --disable-dvdnav"
+
+ #############
+ # Subtitles #
+ #############
+ #
+ # SRT/ASS/SSA (subtitles) requires freetype support
+ # freetype support requires iconv
+ # iconv optionally can use unicode
+ use truetype || myconf+=" --disable-freetype"
+ use iconv || myconf+=" --disable-iconv --charset=noconv"
+ use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+ #####################################
+ # DVB / Video4Linux / Radio support #
+ #####################################
+ myconf+=" --disable-tv-bsdbt848"
+ # broken upstream, won't work with recent kernels
+ myconf+=" --disable-ivtv"
+ # gone since linux-headers-2.6.38
+ myconf+=" --disable-tv-v4l1"
+ if { use dvb || use v4l || use pvr || use radio; }; then
+ use dvb || myconf+=" --disable-dvb"
+ use pvr || myconf+=" --disable-pvr"
+ use v4l || myconf+=" --disable-tv-v4l2"
+ if use radio && { use dvb || use v4l; }; then
+ myconf+="
+ --enable-radio
+ $(use_enable encode radio-capture)
+ "
+ else
+ myconf+="
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ "
+ fi
+ else
+ myconf+="
+ --disable-tv
+ --disable-tv-v4l2
+ --disable-radio
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ --disable-dvb
+ --disable-v4l2
+ --disable-pvr"
+ fi
+
+ ##########
+ # Codecs #
+ ##########
+ myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
+ myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+ use dts || myconf+=" --disable-libdca"
+ if ! use mp3; then
+ myconf+="
+ --disable-mp3lame
+ --disable-mpg123
+ "
+ fi
+ uses="a52 bs2b dv gsm lzo rtmp vorbis"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-lib${i}"
+ done
+
+ uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use jpeg2k || myconf+=" --disable-libopenjpeg"
+
+ # Encoding
+ uses="faac x264 xvid toolame twolame"
+ if use encode; then
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ else
+ myconf+=" --disable-mencoder"
+ for i in ${uses}; do
+ myconf+=" --disable-${i}"
+ use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
+ done
+ fi
+
+ #################
+ # Binary codecs #
+ #################
+ myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+ ################
+ # Video Output #
+ ################
+ uses="directfb md5sum sdl"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use aalib || myconf+=" --disable-aa"
+ use fbcon || myconf+=" --disable-fbdev"
+ use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
+ use libcaca || myconf+=" --disable-caca"
+ use zoran || myconf+=" --disable-zr"
+
+ if ! use kernel_linux || ! use video_cards_mga; then
+ myconf+=" --disable-mga --disable-xmga"
+ fi
+
+ if use video_cards_tdfx; then
+ myconf+="
+ $(use_enable video_cards_tdfx tdfxvid)
+ $(use_enable fbcon tdfxfb)
+ "
+ else
+ myconf+="
+ --disable-3dfx
+ --disable-tdfxvid
+ --disable-tdfxfb
+ "
+ fi
+
+ # sun card, disable by default, see bug #258729
+ myconf+=" --disable-xvr100"
+
+ ################
+ # Audio Output #
+ ################
+ myconf+=" --disable-esd"
+ uses="alsa jack ladspa nas openal"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use pulseaudio || myconf+=" --disable-pulse"
+ if ! use radio; then
+ use oss || myconf+=" --disable-ossaudio"
+ fi
+
+ ####################
+ # Advanced Options #
+ ####################
+ # Platform specific flags, hardcoded on amd64 (see below)
+ use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+ uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+ for i in ${uses}; do
+ myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+ done
+
+ uses="altivec shm"
+ for i in ${uses}; do
+ myconf+=" $(use_enable ${i})"
+ done
+
+ use debug && myconf+=" --enable-debug=3"
+
+ if use x86 && gcc-specs-pie; then
+ filter-flags -fPIC -fPIE
+ append-ldflags -nopie
+ fi
+
+ ###########################
+ # X enabled configuration #
+ ###########################
+ myconf+=" --disable-gui"
+ myconf+=" --disable-vesa"
+ uses="ggi vdpau xinerama xv"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use dga || myconf+=" --disable-dga1 --disable-dga2"
+ use opengl || myconf+=" --disable-gl"
+ use osdmenu && myconf+=" --enable-menu"
+ use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
+ use xscreensaver || myconf+=" --disable-xss"
+ use X || myconf+=" --disable-x11"
+ if use xvmc; then
+ myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
+ else
+ myconf+=" --disable-xvmc"
+ fi
+
+ ############################
+ # OSX (aqua) configuration #
+ ############################
+ if use aqua; then
+ myconf+="
+ --enable-macosx-finder
+ --enable-macosx-bundle
+ "
+ fi
+
+ ./configure \
+ --cc="$(tc-getCC)" \
+ --host-cc="$(tc-getBUILD_CC)" \
+ --prefix="${EPREFIX}/usr" \
+ --bindir="${EPREFIX}/usr/bin" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --confdir="${EPREFIX}/etc/mplayer" \
+ --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
+ --mandir="${EPREFIX}/usr/share/man" \
+ --disable-ffmpeg_a \
+ ${myconf} || die
+}
+
+src_compile() {
+ base_src_compile
+ # Build only user-requested docs if they're available.
+ if use doc ; then
+ # select available languages from $LINGUAS
+ local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+ local BUILT_DOCS=""
+ for i in ${LINGUAS} ; do
+ has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+ done
+ if [[ -z $BUILT_DOCS ]]; then
+ emake -j1 html-chunked
+ else
+ for i in ${BUILT_DOCS}; do
+ emake -j1 html-chunked-${i}
+ done
+ fi
+ fi
+}
+
+src_install() {
+ local i
+
+ emake \
+ DESTDIR="${D}" \
+ INSTALLSTRIP="" \
+ install
+
+ dodoc AUTHORS Changelog Copyright README etc/codecs.conf
+
+ docinto tech/
+ dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
+ docinto TOOLS/
+ dodoc -r TOOLS
+ docinto tech/mirrors/
+ dodoc DOCS/tech/mirrors/*
+
+ if use doc; then
+ docinto html/
+ dohtml -r "${S}"/DOCS/HTML/*
+ fi
+
+ if ! use truetype; then
+ dodir /usr/share/mplayer/fonts
+ # Do this generic, as the mplayer people like to change the structure
+ # of their zips ...
+ for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
+ cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
+ done
+ # Fix the font symlink ...
+ rm -rf "${ED}/usr/share/mplayer/font"
+ dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+ fi
+
+ insinto /etc/mplayer
+ newins "${S}/etc/example.conf" mplayer.conf
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+ doins "${S}/etc/input.conf"
+ if use osdmenu; then
+ doins "${S}/etc/menu.conf"
+ fi
+
+ if use truetype; then
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+_EOF_
+ fi
+
+ # bug 256203
+ if use rar; then
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+ fi
+
+ dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+ newbin "${S}/TOOLS/midentify.sh" midentify
+}
+
+pkg_preinst() {
+ [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
+ rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
+}
+
+pkg_postrm() {
+ # Cleanup stale symlinks
+ [ -L "${EROOT}/usr/share/mplayer/font" -a \
+ ! -e "${EROOT}/usr/share/mplayer/font" ] && \
+ rm -f "${EROOT}/usr/share/mplayer/font"
+
+ [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
+ ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+ rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
+}
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index af049c6..666fcca 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -60,7 +60,7 @@
sys-libs/ncurses:0=
app-arch/bzip2
sys-libs/zlib
- >=media-video/ffmpeg-2.6:0=[vdpau?]
+ >=media-video/ffmpeg-2.8:0=[vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
@@ -94,7 +94,7 @@
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )
ladspa? ( media-libs/ladspa-sdk )
- libass? ( >=media-libs/libass-0.9.10:=[enca?] )
+ libass? ( >=media-libs/libass-0.9.10:= )
libcaca? ( media-libs/libcaca )
libmpeg2? ( media-libs/libmpeg2 )
lirc? ( app-misc/lirc )
diff --git a/media-video/mpv/mpv-0.11.0.ebuild b/media-video/mpv/mpv-0.11.0.ebuild
index 7bfb032..9d0d09e 100644
--- a/media-video/mpv/mpv-0.11.0.ebuild
+++ b/media-video/mpv/mpv-0.11.0.ebuild
@@ -84,7 +84,7 @@
jack? ( media-sound/jack-audio-connection-kit )
jpeg? ( virtual/jpeg:0 )
libass? (
- >=media-libs/libass-0.12.1:=[enca?,fontconfig]
+ >=media-libs/libass-0.12.1:=[enca(-)?,fontconfig]
virtual/ttf-fonts
)
libcaca? ( >=media-libs/libcaca-0.99_beta18 )
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index df81879..cd5ade7 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -7,7 +7,7 @@
PYTHON_REQ_USE='threads(+)'
inherit eutils python-any-r1 waf-utils pax-utils fdo-mime gnome2-utils
-WAF_V="1.8.4"
+WAF_V="1.8.12"
DESCRIPTION="Media player based on MPlayer and mplayer2"
HOMEPAGE="http://mpv.io/"
@@ -84,7 +84,7 @@
jack? ( media-sound/jack-audio-connection-kit )
jpeg? ( virtual/jpeg:0 )
libass? (
- >=media-libs/libass-0.12.1:=[enca?,fontconfig]
+ >=media-libs/libass-0.12.1:=[enca(-)?,fontconfig]
virtual/ttf-fonts
)
libcaca? ( >=media-libs/libcaca-0.99_beta18 )
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 4792cbd..d555a8c 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,5 +1,3 @@
-DIST smplayer-14.3.0.tar.bz2 3675657 SHA256 9b8db20043d1528ee5c6054526779e88a172d2c757429bd7095c794d65ecbc18 SHA512 11ccb390b220a8cf978f9059ed04871c68d91db2a234b7d42a695e17d2bc1ff108d0696439fc148637a5af6d9189fc19cf51dad581c6f59fe84361aa49db4faa WHIRLPOOL 6702e140527c95f5dc284c29fe6e49ac16b01af8162393f20d53ca7124abc9420d20ad3e704f7da79dc5e4341f282ab0ab48389f45dc3e481d2a76f19ea32180
-DIST smplayer-14.9.0.6690.tar.bz2 3813209 SHA256 5ec8a1d2912828e9b19f800e338029e6757fc30e3974cf62a21b67f46632bc5a SHA512 68f5a1ab162e5e722a6058b7e4724201dd37212591174d7045b1cd1a9a32a4a224006a5df3bbade47d6bca951725b5b2ae7c8630cd9baa3cecc57aecb550d882 WHIRLPOOL 67504ff5c475dffdd71267cc533e21afbf27c0c8746f295aed41a276d1747025164d1d6953042b8b0eed3161fd54f668306714a4591b20b4f3946fdd6004fc84
-DIST smplayer-14.9.0.6966.tar.bz2 3848779 SHA256 b24fb478e637151215bf050d3e84f99d802de2d9e3d10588aba33626fa24a34e SHA512 a398b90cca449efaa06d4e6ad0d508b452ab23e1f9117e919eece93fb637123211ea92002969c43fe6d20673bc26eccfd4008b37adc9e726382f5eb4de5c59ec WHIRLPOOL 2c543c19af6bad68d05fa083876b6d963e83965f09e712e2962482733f0050c634437fc95cf1061f7b72a3a0c774298d3e8d16f2c45d89b078b7b7f55327ff15
DIST smplayer-14.9.0.6994.tar.bz2 3872223 SHA256 4993f4d753f2982667e088d0f06fccd36535d8e65eff5acbef82d4cde132b301 SHA512 9e902979d1d58096424596c691e9885f10b50d1c3a0cda90387f9d59247036a66c570bb430a1441fd40e4f397757d7b3b3f089a93deabd5b6d8a02cbaf3b583c WHIRLPOOL a500aff18f93b72f4595869d9b9c57640599a3c9a8bcc31249ca502568e52f93fb059829196de1c7b5c3407cf987f199ffd568d93d23b1c11d6718f7aa4fb8ad
DIST smplayer-14.9.0.tar.bz2 3716434 SHA256 429ad4edd6df1fcedd5ea4fa2b024eb5a61c9412f52762e9d9a9c2245b7ddf13 SHA512 78cecdad7e5f18c221a2f08a0472da01eb14db6230733616b805b6fccf2929c3f5b4dd92fd037362890a308967fa6602b89318c5376c3ce3a38d0dd9a1a17e43 WHIRLPOOL d7e621cd9ebcee450ce7aa9beaf1240c3d2f91271d2a6f043688c8688d77e8ad4761777a05ae77230966d050d647e700aa5bc8d3b566adc3fb724eaf9e315399
+DIST smplayer-15.9.0.tar.bz2 3874708 SHA256 85a970df1c601f266101895e9bb9a17c20d1e964796fa590546527a9669ca6fb SHA512 36d9211717d99bf1b332add7d96c602e906c1fbda7f1233cc4df2d798e63cdef6cffa5a354219e6a1c589aafd4df668c6fdf1dd42a7e28ee661f816370fa0dc8 WHIRLPOOL e27c18f33862edfc1b87cfb2cf62df05d9f7bab165f8f08b364edb68cbd6ee16eefedd932880942e11c32163015ccf52294417bc8ce97b9369c9f8503898c9b0
diff --git a/media-video/smplayer/smplayer-14.3.0.ebuild b/media-video/smplayer/smplayer-14.3.0.ebuild
deleted file mode 100644
index 99aeff6..0000000
--- a/media-video/smplayer/smplayer-14.3.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PLOCALES="ar_SY bg ca cs da de el_GR en_US es et eu fi fr gl he_IL hr hu it ja
-ka ko ku lt mk ms_MY nl pl pt pt_BR ro_RO ru_RU sk sl_SI sr sv th tr uk_UA vi_VN
-zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-
-inherit eutils l10n qt4-r2
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-DESCRIPTION="Great Qt4 GUI front-end for mplayer"
-HOMEPAGE="http://smplayer.sourceforge.net/"
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux"
-IUSE="debug"
-
-DEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4"
-COMMON_USE="libass,png,X"
-RDEPEND="${DEPEND}
- media-video/mplayer[bidi,${COMMON_USE}]
-"
-
-src_prepare() {
- # Upstream Makefile sucks
- sed -i -e "/^PREFIX=/s:${EPREFIX}/usr/local:${EPREFIX}/usr:" \
- -e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \
- -e '/\.\/get_svn_revision\.sh/,+2c\
- cd src && $(DEFS) $(MAKE)' \
- "${S}"/Makefile || die "sed failed"
-
- # Turn debug message flooding off
- if ! use debug ; then
- sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
- "${S}"/src/smplayer.pro || die "sed failed"
- fi
-
- # Turn off online update checker, bug #479902
- sed -e 's:DEFINES += UPDATE_CHECKER:#DEFINES += UPDATE_CHECKER:' \
- -e 's:DEFINES += CHECK_UPGRADED:#DEFINES += CHECK_UPGRADED:' \
- -i "${S}"/src/smplayer.pro || die "sed failed"
-
- # l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
-}
-
-src_configure() {
- cd "${S}"/src
- echo "#define SVN_REVISION \"SVN-${MY_PV} (Gentoo)\"" > svn_revision.h
- eqmake4
-}
-
-gen_translation() {
- ebegin "Generating $1 translation"
- lrelease ${PN}_${1}.ts
- eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
- emake
-
- cd "${S}"/src/translations
- l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
- # remove unneeded copies of licenses
- rm Copying* docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
- rm -r docs/{de,es,fr,nl,ro} || die
-
- emake DESTDIR="${D}" install
-}
diff --git a/media-video/smplayer/smplayer-14.9.0.6690-r3.ebuild b/media-video/smplayer/smplayer-14.9.0.6690-r3.ebuild
deleted file mode 100644
index f878290..0000000
--- a/media-video/smplayer/smplayer-14.9.0.6690-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PLOCALES="ar ar_SY bg ca cs da de el_GR en_GB en_US es et eu fi fr gl he_IL hr
-hu it ja ka ko ku lt mk ms_MY nl pl pt pt_BR ro_RO ru_RU sk sl_SI sq_AL sr sv
-th tr uk_UA vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-inherit eutils l10n qmake-utils
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="http://smplayer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="autoshutdown bidi debug qt4 qt5 streaming"
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-DEPEND="
- qt4? ( dev-qt/qtcore:4
- dev-qt/qtgui:4
- autoshutdown? ( dev-qt/qtdbus:4 )
- streaming? ( dev-qt/qtcore:4[ssl] ) )
- qt5? ( dev-qt/linguist-tools:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- autoshutdown? ( dev-qt/qtdbus:5 )
- streaming? ( dev-qt/qtnetwork:5[ssl]
- dev-qt/qtscript:5 ) )"
-RDEPEND="${DEPEND}
- || ( media-video/mplayer[bidi?,libass,png,X]
- ( >=media-video/mpv-0.6.2[libass,X]
- streaming? ( >=net-misc/youtube-dl-2014.11.26 ) ) )"
-
-src_prepare() {
- use bidi || epatch "${FILESDIR}"/${P}-zero-bidi.patch
-
- # Upstream Makefile sucks
- sed -i -e "/^PREFIX=/s:${EPREFIX}/usr/local:${EPREFIX}/usr:" \
- -e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \
- -e '/\.\/get_svn_revision\.sh/,+2c\
- cd src && $(DEFS) $(MAKE)' \
- "${S}"/Makefile || die "sed failed"
-
- # Toggle autoshutdown option which pulls in dbus, bug #524392
- if ! use autoshutdown ; then
- sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#DEFINES += AUTO_SHUTDOWN_PC:' \
- -i "${S}"/src/smplayer.pro || die "sed failed"
- fi
-
- # Turn debug message flooding off
- if ! use debug ; then
- sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
- "${S}"/src/smplayer.pro || die "sed failed"
- fi
-
- # Turn off online update checker, bug #479902
- sed -e 's:DEFINES += UPDATE_CHECKER:#DEFINES += UPDATE_CHECKER:' \
- -e 's:DEFINES += CHECK_UPGRADED:#DEFINES += CHECK_UPGRADED:' \
- -i "${S}"/src/smplayer.pro || die "sed failed"
-
- # Turn off youtube support (which pulls in extra dependencies) if unwanted
- if ! use streaming ; then
- sed -e 's:DEFINES += YOUTUBE_SUPPORT:#DEFINES += YOUTUBE_SUPPORT:' \
- -i "${S}"/src/smplayer.pro || die "sed failed"
- fi
-
- # l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
-}
-
-src_configure() {
- cd "${S}"/src
- echo "#define SVN_REVISION \"${PV} (Gentoo)\"" > svn_revision.h
- use qt4 && eqmake4
- use qt5 && eqmake5
-}
-
-gen_translation() {
- local mydir
- if use qt4; then
- mydir="$(qt4_get_bindir)"
- elif use qt5; then
- mydir="$(qt5_get_bindir)"
- fi
- ebegin "Generating $1 translation"
- "${mydir}"/lrelease ${PN}_${1}.ts
- eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
- emake
-
- cd "${S}"/src/translations
- l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
- # remove unneeded copies of licenses
- rm Copying* docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
- rm -r docs/{de,es,fr,nl,ro} || die
-
- emake DESTDIR="${D}" install
-}
diff --git a/media-video/smplayer/smplayer-14.9.0.6966-r2.ebuild b/media-video/smplayer/smplayer-14.9.0.6966-r2.ebuild
deleted file mode 100644
index d548b68..0000000
--- a/media-video/smplayer/smplayer-14.9.0.6966-r2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PLOCALES="ar ar_SY bg ca cs da de el_GR en_GB en_US es et eu fi fr gl he_IL hr
-hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt pt_BR ro_RO ru_RU sk sl_SI sq_AL
-sr sv th tr uk_UA vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-inherit eutils l10n qmake-utils
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="http://smplayer.info/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris +qt4 qt5 streaming"
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-DEPEND="
- qt4? ( dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsingleapplication[X,qt4]
- autoshutdown? ( dev-qt/qtdbus:4 )
- mpris? ( dev-qt/qtdbus:4 )
- streaming? ( dev-qt/qtcore:4[ssl] ) )
- qt5? ( dev-qt/linguist-tools:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- autoshutdown? ( dev-qt/qtdbus:5 )
- mpris? ( dev-qt/qtdbus:5 )
- streaming? ( dev-qt/qtnetwork:5[ssl]
- dev-qt/qtscript:5 ) )"
-RDEPEND="${DEPEND}
- || ( media-video/mplayer[bidi?,libass,png,X]
- ( >=media-video/mpv-0.6.2[libass,X]
- streaming? ( >=net-misc/youtube-dl-2014.11.26 ) ) )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-unbundle-qtsingleapplication.patch # bug 487544
- use bidi || epatch "${FILESDIR}"/${PN}-14.9.0.6690-zero-bidi.patch
-
- # Upstream Makefile sucks
- sed -i -e "/^PREFIX=/s:${EPREFIX}/usr/local:${EPREFIX}/usr:" \
- -e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \
- -e '/\.\/get_svn_revision\.sh/,+2c\
- cd src && $(DEFS) $(MAKE)' \
- "${S}"/Makefile || die "sed failed"
-
- # Toggle autoshutdown option which pulls in dbus, bug #524392
- if ! use autoshutdown ; then
- sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#DEFINES += AUTO_SHUTDOWN_PC:' \
- -i "${S}"/src/smplayer.pro || die "sed failed"
- fi
-
- # Turn debug message flooding off
- if ! use debug ; then
- sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
- "${S}"/src/smplayer.pro || die "sed failed"
- fi
-
- # MPRIS2 pulls in dbus, bug #553710
- if ! use mpris ; then
- sed -e 's:DEFINES += MPRIS2:#DEFINES += MPRIS2:' \
- -i "${S}"/src/smplayer.pro || die "sed failed"
- fi
-
- # Turn off online update checker, bug #479902
- sed -e 's:DEFINES += UPDATE_CHECKER:#DEFINES += UPDATE_CHECKER:' \
- -e 's:DEFINES += CHECK_UPGRADED:#DEFINES += CHECK_UPGRADED:' \
- -i "${S}"/src/smplayer.pro || die "sed failed"
-
- # Turn off youtube support (which pulls in extra dependencies) if unwanted
- if ! use streaming ; then
- sed -e 's:DEFINES += YOUTUBE_SUPPORT:#DEFINES += YOUTUBE_SUPPORT:' \
- -i "${S}"/src/smplayer.pro || die "sed failed"
- fi
-
- l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
-}
-
-src_configure() {
- cd "${S}"/src
- echo "#define SVN_REVISION \"${PV} (Gentoo)\"" > svn_revision.h
- use qt4 && eqmake4
- use qt5 && eqmake5
-}
-
-gen_translation() {
- local mydir
- if use qt4; then
- mydir="$(qt4_get_bindir)"
- elif use qt5; then
- mydir="$(qt5_get_bindir)"
- fi
- ebegin "Generating $1 translation"
- "${mydir}"/lrelease ${PN}_${1}.ts
- eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
- emake
-
- cd "${S}"/src/translations
- l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
- # remove unneeded copies of licenses
- rm Copying* docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
- rm -r docs/{de,es,fr,nl,ro} || die
-
- emake DESTDIR="${D}" install
-}
diff --git a/media-video/smplayer/smplayer-15.9.0.ebuild b/media-video/smplayer/smplayer-15.9.0.ebuild
new file mode 100644
index 0000000..ea8286e
--- /dev/null
+++ b/media-video/smplayer/smplayer-15.9.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="ar ar_SY bg ca cs da de el_GR en_GB en_US es et eu fi fr gl he_IL hr
+hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt pt_BR ro_RO ru_RU sk sl_SI sq_AL
+sr sv th tr uk_UA vi_VN zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+inherit eutils l10n qmake-utils
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="http://smplayer.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="autoshutdown bidi debug mpris +qt4 qt5 streaming"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+DEPEND="
+ qt4? ( dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtsingleapplication[X,qt4]
+ autoshutdown? ( dev-qt/qtdbus:4 )
+ mpris? ( dev-qt/qtdbus:4 )
+ streaming? ( dev-qt/qtcore:4[ssl] ) )
+ qt5? ( dev-qt/linguist-tools:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ autoshutdown? ( dev-qt/qtdbus:5 )
+ mpris? ( dev-qt/qtdbus:5 )
+ streaming? ( dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtscript:5 ) )"
+RDEPEND="${DEPEND}
+ || ( media-video/mplayer[bidi?,libass,png,X]
+ ( >=media-video/mpv-0.6.2[libass,X]
+ streaming? ( >=net-misc/youtube-dl-2014.11.26 ) ) )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch # bug 487544
+ use bidi || epatch "${FILESDIR}"/${PN}-14.9.0.6690-zero-bidi.patch
+
+ # Upstream Makefile sucks
+ sed -i -e "/^PREFIX=/s:${EPREFIX}/usr/local:${EPREFIX}/usr:" \
+ -e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \
+ -e '/\.\/get_svn_revision\.sh/,+2c\
+ cd src && $(DEFS) $(MAKE)' \
+ "${S}"/Makefile || die "sed failed"
+
+ # Toggle autoshutdown option which pulls in dbus, bug #524392
+ if ! use autoshutdown ; then
+ sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#DEFINES += AUTO_SHUTDOWN_PC:' \
+ -i "${S}"/src/smplayer.pro || die "sed failed"
+ fi
+
+ # Turn debug message flooding off
+ if ! use debug ; then
+ sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+ "${S}"/src/smplayer.pro || die "sed failed"
+ fi
+
+ # MPRIS2 pulls in dbus, bug #553710
+ if ! use mpris ; then
+ sed -e 's:DEFINES += MPRIS2:#DEFINES += MPRIS2:' \
+ -i "${S}"/src/smplayer.pro || die "sed failed"
+ fi
+
+ # Turn off online update checker, bug #479902
+ sed -e 's:DEFINES += UPDATE_CHECKER:#DEFINES += UPDATE_CHECKER:' \
+ -e 's:DEFINES += CHECK_UPGRADED:#DEFINES += CHECK_UPGRADED:' \
+ -i "${S}"/src/smplayer.pro || die "sed failed"
+
+ # Turn off nasty share widget
+ sed -e 's:DEFINES += SHAREWIDGET:#DEFINES += SHAREWIDGET:' \
+ -i "${S}"/src/smplayer.pro || die "sed failed"
+
+ # Turn off youtube support (which pulls in extra dependencies) if unwanted
+ if ! use streaming ; then
+ sed -e 's:DEFINES += YOUTUBE_SUPPORT:#DEFINES += YOUTUBE_SUPPORT:' \
+ -i "${S}"/src/smplayer.pro || die "sed failed"
+ fi
+
+ l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
+}
+
+src_configure() {
+ cd "${S}"/src
+ echo "#define SVN_REVISION \"${PV} (Gentoo)\"" > svn_revision.h
+ use qt4 && eqmake4
+ use qt5 && eqmake5
+}
+
+gen_translation() {
+ local mydir
+ if use qt4; then
+ mydir="$(qt4_get_bindir)"
+ elif use qt5; then
+ mydir="$(qt5_get_bindir)"
+ fi
+ ebegin "Generating $1 translation"
+ "${mydir}"/lrelease ${PN}_${1}.ts
+ eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+ emake
+
+ cd "${S}"/src/translations
+ l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+ # remove unneeded copies of licenses
+ rm Copying* docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
+ rm -r docs/{de,es,fr,nl,ro} || die
+
+ emake DESTDIR="${D}" install
+}
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 203faf6..91c698a 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,2 +1,2 @@
DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
-DIST x264-snapshot-20150820-2245.tar.bz2 718209 SHA256 0ea86849d1a9b0a5b88fe6e0281359d7f5675c68fb83f6397b3e02896ccd77e3 SHA512 6b85f96f7cc85e1e938dad06c01b777aaf866796fb1763a02b4b7fa9c44f70bf15fc1bef123f7b24bb2c58b23f7276d4eb2b8f99b2e4fef3c716ed7f66d66e44 WHIRLPOOL daf5a63dbe2cb77a496a3eec1b1687ef6c4a008328064c46bd0e90139d328a6ff4e7dbd17b8dad57c357717c0b665293c86883213b483e85d25a06ec93c81024
+DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
diff --git a/media-video/x264-encoder/files/ffmpeg29.patch b/media-video/x264-encoder/files/ffmpeg29.patch
deleted file mode 100644
index d840c87..0000000
--- a/media-video/x264-encoder/files/ffmpeg29.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: x264-snapshot-20150820-2245/x264.c
-===================================================================
---- x264-snapshot-20150820-2245.orig/x264.c
-+++ x264-snapshot-20150820-2245/x264.c
-@@ -442,7 +442,7 @@ static void print_csp_names( int longhel
- printf( " - valid csps for `lavf' demuxer:\n" );
- printf( INDENT );
- size_t line_len = strlen( INDENT );
-- for( enum PixelFormat i = AV_PIX_FMT_NONE+1; i < AV_PIX_FMT_NB; i++ )
-+ for( enum AVPixelFormat i = AV_PIX_FMT_NONE+1; i < AV_PIX_FMT_NB; i++ )
- {
- const char *pfname = av_get_pix_fmt_name( i );
- if( pfname )
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild
deleted file mode 100644
index a837041..0000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs eutils
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SRC_URI=""
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
- ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
- ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.5.2 )"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${RDEPEND}
- amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}/gpac.patch" "${FILESDIR}/ffmpeg29.patch"
-}
-
-src_configure() {
- tc-export CC
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --system-libx264 \
- --host="${CHOST}" \
- --disable-lsmash \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex avs "" "--disable-avs") \
- $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
- $(usex ffmpegsource "" "--disable-ffms") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex mp4 "" "--disable-gpac") \
- $(usex threads "" "--disable-thread") || die
-
- # this is a nasty workaround for bug #376925 for x264 that also applies
- # here, needed because as upstream doesn't like us fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild
deleted file mode 100644
index 64e7ddc..0000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SRC_URI=""
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
- ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
- ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.4.1_pre20060122 )"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${RDEPEND}
- amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
- virtual/pkgconfig"
-
-src_configure() {
- tc-export CC
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --system-libx264 \
- --host="${CHOST}" \
- --disable-lsmash \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex avs "" "--disable-avs") \
- $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
- $(usex ffmpegsource "" "--disable-ffms") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex mp4 "" "--disable-gpac") \
- $(usex threads "" "--disable-thread") || die
-
- # this is a nasty workaround for bug #376925 for x264 that also applies
- # here, needed because as upstream doesn't like us fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild
new file mode 100644
index 0000000..71259d7
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs eutils
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.videolan.org/x264.git"
+ SRC_URI=""
+else
+ inherit versionator
+ MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+ SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="ffmpeg? ( virtual/ffmpeg )
+ ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+ ffmpegsource? ( media-libs/ffmpegsource )
+ mp4? ( >=media-video/gpac-0.5.2 )"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${RDEPEND}
+ amd64? ( ${ASM_DEP} )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}/gpac.patch"
+}
+
+src_configure() {
+ tc-export CC
+
+ # let upstream pick the optimization level by default
+ use custom-cflags || filter-flags -O?
+
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --system-libx264 \
+ --host="${CHOST}" \
+ --disable-lsmash \
+ $(usex 10bit "--bit-depth=10" "") \
+ $(usex avs "" "--disable-avs") \
+ $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+ $(usex ffmpegsource "" "--disable-ffms") \
+ $(usex interlaced "" "--disable-interlaced") \
+ $(usex mp4 "" "--disable-gpac") \
+ $(usex threads "" "--disable-thread") || die
+
+ # this is a nasty workaround for bug #376925 for x264 that also applies
+ # here, needed because as upstream doesn't like us fiddling with their CFLAGS
+ if use custom-cflags; then
+ local cflags
+ cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+ cflags="${cflags//$(get-flag O)/}"
+ cflags="${cflags//-O? /$(get-flag O) }"
+ cflags="${cflags//-g /}"
+ sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+ fi
+}
diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest
index a5a95da..25fef68 100644
--- a/net-analyzer/echoping/Manifest
+++ b/net-analyzer/echoping/Manifest
@@ -1,2 +1 @@
-DIST echoping-6.0.2.tar.gz 1660983 SHA256 1dfa4c45bf461b2379ff91773ed7136176e2abac9e85c26bc9654942b5155eac SHA512 ca9a38c3be9da283e73a7a1b13ab003dca6a2ee317e2961325f3e6803f132ae2f5e4206d946564915c573f21f9c3e9641d61f6b3ae5806bbaa92c2f30f1e5e22 WHIRLPOOL 9140d20d82ed1c38df91d8905fb678c1ca717af518b374c3379db285662d55e70c8da5bb227c4f47a4c34f649c686037636c024a38d1109cd939f6974b274e15
DIST echoping-6.0.2_p434.tar.gz 74568 SHA256 152a4a9d2a3962fa8cb95eeb29b5d22a7039d4408f5ba22286259856f095baf7 SHA512 1b4f5f1ea6ba000c558cab3b8e86758d6c539d8cd237620000d837b468861a177ac733441c885eb8ec1c35b49baa33a82e34e3f8b14b05429a075b72233d5799 WHIRLPOOL cae10459766311ded4f6459e519461fb91de7dd9429679927c3955a5a9b09b9b9a9706947b3a5c1495805367c91cf2035d3154a3ff180241782deec304eb8aaf
diff --git a/net-analyzer/echoping/echoping-6.0.2-r2.ebuild b/net-analyzer/echoping/echoping-6.0.2-r2.ebuild
deleted file mode 100644
index 58c1021..0000000
--- a/net-analyzer/echoping/echoping-6.0.2-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils autotools
-
-DESCRIPTION="Small program to test performances of remote servers"
-HOMEPAGE="http://echoping.sourceforge.net/"
-SRC_URI="mirror://sourceforge/echoping/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap"
-RESTRICT="test"
-
-RDEPEND="idn? ( net-dns/libidn )
- postgres? ( dev-db/postgresql )
- ldap? ( net-nds/openldap )
- ssl? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( >=dev-libs/openssl-0.9.7d )
- )"
-DEPEND="${RDEPEND}
- >=sys-devel/libtool-2"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO )
-
-src_prepare() {
- # bug 279525:
- epatch "${FILESDIR}/${P}-gnutls.patch"
-
- epatch "${FILESDIR}/${P}-fix_implicit_declarations.patch"
-
- rm -f ltmain.sh
- cp /usr/share/libtool/config/ltmain.sh .
- local i
- for i in . plugins/ plugins/*/; do
- pushd "${i}" > /dev/null
- eautoreconf
- popd > /dev/null
- done
-}
-
-src_configure() {
- econf \
- --config-cache \
- --disable-ttcp \
- $(use_enable http) \
- $(use_enable icp) \
- $(use_with idn libidn) \
- $(use_enable smtp) \
- $(use_enable tos) \
- $(use_enable priority) \
- $(usex gnutls $(use_with gnutls) $(use_with ssl))
-}
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild
index f96eb28..f0c6bf4 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild
@@ -32,7 +32,6 @@
src_prepare() {
epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch
- cp /usr/share/libtool/config/ltmain.sh .
eautoreconf
}
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434.ebuild
index 5a5cb1b..4245e74 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434.ebuild
@@ -32,7 +32,6 @@
src_prepare() {
epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch
- cp /usr/share/libtool/config/ltmain.sh .
eautoreconf
}
diff --git a/net-analyzer/echoping/files/echoping-6.0.2-fix_implicit_declarations.patch b/net-analyzer/echoping/files/echoping-6.0.2-fix_implicit_declarations.patch
deleted file mode 100644
index 1b0bce8..0000000
--- a/net-analyzer/echoping/files/echoping-6.0.2-fix_implicit_declarations.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- echoping.h
-+++ echoping.h 2009-09-15 00:55:43.000000000 +0200
-@@ -198,6 +198,7 @@
- #endif
- /* util.c */
- char *random_string ();
-+char *to_upper();
- void tvsub ();
- void tvadd ();
- void tvavg ();
---- plugins/ldap/ldap.c
-+++ plugins/ldap/ldap.c
-@@ -9,6 +9,7 @@
- #include "../../config.h"
- #include "config.h"
- #endif
-+#define LDAP_DEPRECATED 1
- #include <ldap.h>
-
- const char *request = NULL;
diff --git a/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch b/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch
deleted file mode 100644
index b5be2d9..0000000
--- a/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Date: 2009-06-30 14:26
-Sender: bortz
-
-The patch by ametzler seems indeed to work (thanks to him). I've committed
-it (r426) and will make a new release soon.
-
-http://sourceforge.net/tracker/index.php?func=detail&aid=2811861&group_id=4581&atid=104581
-
-
---- trunk/SRC/configure.ac 2009/06/30 14:18:15 425
-+++ trunk/SRC/configure.ac 2009/06/30 14:19:07 426
-@@ -92,14 +92,21 @@
- AC_ARG_WITH(gnutls,
- [ --with-gnutls[=DIR] SSL/TLS crypt support (needs GNU TLS), the argument DIR should not be necessary],dnl
- [if test "$withval" != "no"; then
-- AC_DEFINE(GNUTLS,,[Crypto (TLS) support])
-- GNUTLS=1
-- CPPFLAGS="${CPPFLAGS} `libgnutls-config --cflags`"
-- LDFLAGS="${LDFLAGS} `libgnutls-config --libs`"
-- if test "$withval" != "yes"; then
-- GNUTLSROOT=$withval
-- LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib"
-- CPPFLAGS="${CPPFLAGS} -I$GNUTLSROOT/include"
-+ if test "$withval" = "yes"; then
-+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.0],
-+ [
-+ echo "GnuTLS found"
-+ AC_DEFINE(GNUTLS,,[Crypto (TLS) support])
-+ GNUTLS=1
-+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-+ LIBS="$LIBS $LIBGNUTLS_LIBS"
-+ ],)
-+ else
-+ AC_DEFINE(GNUTLS,,[Crypto (TLS) support])
-+ GNUTLS=1
-+ GNUTLSROOT=$withval
-+ LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib -lgnutls"
-+ CPPFLAGS="${CPPFLAGS} -I$GNUTLSROOT/include"
- fi
- fi],
- dnl Default: disable it
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 7b154fd..d2acafb 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,2 +1 @@
-DIST framework-2.7.tar.gz 5800216 SHA256 516952772aaa8982628460b927c9119850925f870903c5a131a9c9f0390cf77f SHA512 a65740c81e6c711e6661170ec0dd87919cad6c4aa3aaac08fdaa72b4825be4bea28ec09c78f818ddab7660f5b485b13f87e3175b43c625319ce89b044a40f2a0 WHIRLPOOL f309608e30488484b24555fec84e65ed0dcbeba62a69e6ec23c507dbc0fcf720551a795e2a0793886fcd38d3a9b160819c864720155f58f274577b0246f05946
DIST metasploit-4.11.4_p2015090201.tar.gz 35211994 SHA256 1254dbb3e8cf33c7a6c8c701a0be13f78bbd2234503e636f1afacf88676aeea2 SHA512 b96c9735ef579b5f98d1fd7176f91bb1710d263a19d3ff891877df8e341baa1749d5fdce9825a19d9ecbe162b72ebcd11336d4d7884e066f4e199baaff8b4085 WHIRLPOOL 875db5df25112736dd62ec1195080d2567a670cf3a770e787b70c364c6b30b43bf906f7ba35901ff367ce940b02af7b17ae135693a28ff5fca9fc05038132ae2
diff --git a/net-analyzer/metasploit/files/agix_psexec_pull-2657.patch b/net-analyzer/metasploit/files/agix_psexec_pull-2657.patch
deleted file mode 100644
index 4f2e353..0000000
--- a/net-analyzer/metasploit/files/agix_psexec_pull-2657.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff -Naur metasploit-9999.orig/external/source/shellcode/windows/x86/src/block/block_service.asm metasploit-9999/external/source/shellcode/windows/x86/src/block/block_service.asm
---- metasploit-9999.orig/external/source/shellcode/windows/x86/src/block/block_service.asm 1970-01-01 01:00:00.000000000 +0100
-+++ metasploit-9999/external/source/shellcode/windows/x86/src/block/block_service.asm 2013-11-20 11:50:48.256366095 +0100
-@@ -0,0 +1,64 @@
-+;-----------------------------------------------------------------------------;
-+; Author: agix (florian.gaultier[at]gmail[dot]com)
-+; Compatible: Windows 7, 2008, Vista, 2003, XP, 2000, NT4
-+; Size: 137 bytes
-+;-----------------------------------------------------------------------------;
-+
-+[BITS 32]
-+; Input: EBP must be the address of 'api_call'.
-+
-+push byte 0x0
-+push 0x32336970
-+push 0x61766461
-+push esp
-+push 0x726774c
-+call ebp ;load advapi32.dll
-+push 0x00454349
-+push 0x56524553
-+mov ecx, esp ;ServiceTableEntry.SVCNAME
-+lea eax, [ebp+0xd0];ServiceTableEntry.SvcMain
-+push 0x00000000
-+push eax
-+push ecx
-+mov eax,esp
-+push 0x00000000
-+push eax
-+push 0xCB72F7FA
-+call ebp ;call StartServiceCtrlDispatcherA(ServiceTableEntry)
-+push 0x00000000
-+push 0x56A2B5F0
-+call ebp ;call ExitProcess(0)
-+pop eax ;SvcCtrlHandler
-+pop eax
-+pop eax
-+pop eax
-+xor eax,eax
-+ret
-+cld ;SvcMain
-+call me
-+me:
-+pop ebp
-+sub ebp, 0xd6 ;ebp => hashFunction
-+push 0x00464349
-+push 0x56524553
-+mov ecx, esp ;SVCNAME
-+lea eax, [ebp+0xc9];SvcCtrlHandler
-+push 0x00000000
-+push eax
-+push ecx
-+push 0x5244AA0B
-+call ebp ;RegisterServiceCtrlHandlerExA
-+push 0x00000000
-+push 0x00000000
-+push 0x00000000
-+push 0x00000000
-+push 0x00000000
-+push 0x00000000
-+push 0x00000004
-+push 0x00000010
-+mov ecx, esp
-+push 0x00000000
-+push ecx
-+push eax
-+push 0x7D3755C6
-+call ebp ;SetServiceStatus RUNNING
-\ No newline at end of file
-diff -Naur metasploit-9999.orig/external/source/shellcode/windows/x86/src/single/single_service_stuff.asm metasploit-9999/external/source/shellcode/windows/x86/src/single/single_service_stuff.asm
---- metasploit-9999.orig/external/source/shellcode/windows/x86/src/single/single_service_stuff.asm 1970-01-01 01:00:00.000000000 +0100
-+++ metasploit-9999/external/source/shellcode/windows/x86/src/single/single_service_stuff.asm 2013-11-20 11:50:48.256366095 +0100
-@@ -0,0 +1,17 @@
-+;-----------------------------------------------------------------------------;
-+; Author: Stephen Fewer (stephen_fewer[at]harmonysecurity[dot]com)
-+; Compatible: Windows 7, 2008, Vista, 2003, XP, 2000, NT4
-+; Version: 1.0 (28 July 2009)
-+; Size: 189 bytes + strlen(libpath) + 1
-+; Build: >build.py single_service_stuff
-+;-----------------------------------------------------------------------------;
-+
-+[BITS 32]
-+[ORG 0]
-+
-+ cld ; Clear the direction flag.
-+ call start ; Call start, this pushes the address of 'api_call' onto the stack.
-+%include "./src/block/block_api.asm"
-+start: ;
-+ pop ebp ; pop off the address of 'api_call' for calling later.
-+%include "./src/block/block_service.asm"
-\ No newline at end of file
-diff -Naur metasploit-9999.orig/lib/msf/util/exe.rb metasploit-9999/lib/msf/util/exe.rb
---- metasploit-9999.orig/lib/msf/util/exe.rb 2013-11-20 11:50:31.748365346 +0100
-+++ metasploit-9999/lib/msf/util/exe.rb 2013-11-20 11:50:48.256366095 +0100
-@@ -402,36 +402,86 @@
-
- case opts[:exe_type]
- when :service_exe
-+ exe = Rex::PeParsey::Pe.new_from_file(opts[:template], true)
- max_length = 8192
- name = opts[:servicename]
-
-- if name
-- bo = pe.index('SERVICENAME')
-- raise RuntimeError, "Invalid PE Service EXE template: missing \"SERVICENAME\" tag" if not bo
-- pe[bo, 11] = [name].pack('a11')
-+ if not name
-+ name = Rex::Text.rand_text_alpha(7)
- end
--
-- if not opts[:sub_method]
-- pe[136, 4] = [rand(0x100000000)].pack('V')
-+ #code_service could be encoded in the future
-+ code_service =
-+ "\xFC\xE8\x89\x00\x00\x00\x60\x89\xE5\x31\xD2\x64\x8B\x52\x30\x8B" +
-+ "\x52\x0C\x8B\x52\x14\x8B\x72\x28\x0F\xB7\x4A\x26\x31\xFF\x31\xC0" +
-+ "\xAC\x3C\x61\x7C\x02\x2C\x20\xC1\xCF\x0D\x01\xC7\xE2\xF0\x52\x57" +
-+ "\x8B\x52\x10\x8B\x42\x3C\x01\xD0\x8B\x40\x78\x85\xC0\x74\x4A\x01" +
-+ "\xD0\x50\x8B\x48\x18\x8B\x58\x20\x01\xD3\xE3\x3C\x49\x8B\x34\x8B" +
-+ "\x01\xD6\x31\xFF\x31\xC0\xAC\xC1\xCF\x0D\x01\xC7\x38\xE0\x75\xF4" +
-+ "\x03\x7D\xF8\x3B\x7D\x24\x75\xE2\x58\x8B\x58\x24\x01\xD3\x66\x8B" +
-+ "\x0C\x4B\x8B\x58\x1C\x01\xD3\x8B\x04\x8B\x01\xD0\x89\x44\x24\x24" +
-+ "\x5B\x5B\x61\x59\x5A\x51\xFF\xE0\x58\x5F\x5A\x8B\x12\xEB\x86\x5D" +
-+ "\x6A\x00\x68\x70\x69\x33\x32\x68\x61\x64\x76\x61\x54\x68\x4C\x77" +
-+ "\x26\x07\xFF\xD5\x68"+name[4,3]+"\x00\x68"+name[0,4]+"\x89\xE1" +
-+ "\x8D\x85\xD0\x00\x00\x00\x6A\x00\x50\x51\x89\xE0\x6A\x00\x50\x68" +
-+ "\xFA\xF7\x72\xCB\xFF\xD5\x6A\x00\x68\xF0\xB5\xA2\x56\xFF\xD5\x58" +
-+ "\x58\x58\x58\x31\xC0\xC3\xFC\xE8\x00\x00\x00\x00\x5D\x81\xED\xD6" +
-+ "\x00\x00\x00\x68"+name[4,3]+"\x00\x68"+name[0,4]+"\x89\xE1\x8D" +
-+ "\x85\xC9\x00\x00\x00\x6A\x00\x50\x51\x68\x0B\xAA\x44\x52\xFF\xD5" +
-+ "\x6A\x00\x6A\x00\x6A\x00\x6A\x00\x6A\x00\x6A\x00\x6A\x04\x6A\x10" +
-+ "\x89\xE1\x6A\x00\x51\x50\x68\xC6\x55\x37\x7D\xFF\xD5"
-+
-+ pe_header_size=0x18
-+ section_size=0x28
-+ characteristics_offset=0x24
-+ virtualAddress_offset=0xc
-+ sizeOfRawData_offset=0x10
-+
-+ sections_table_rva = exe._dos_header.v['e_lfanew']+exe._file_header.v['SizeOfOptionalHeader']+pe_header_size
-+ sections_table_offset = exe.rva_to_file_offset(sections_table_rva)
-+ sections_table_characteristics_offset = exe.rva_to_file_offset(sections_table_rva+characteristics_offset)
-+
-+ sections_header = []
-+ exe._file_header.v['NumberOfSections'].times { |i|
-+ sections_header << [sections_table_characteristics_offset+(i*section_size),pe[sections_table_offset+(i*section_size),section_size]]
-+ }
-+
-+ #look for section with entry point
-+ sections_header.each do |sec|
-+ virtualAddress = sec[1][virtualAddress_offset,0x4].unpack('L')[0]
-+ sizeOfRawData = sec[1][sizeOfRawData_offset,0x4].unpack('L')[0]
-+ characteristics = sec[1][characteristics_offset,0x4].unpack('L')[0]
-+ if exe.hdr.opt.AddressOfEntryPoint >= virtualAddress && exe.hdr.opt.AddressOfEntryPoint < virtualAddress+sizeOfRawData
-+ #put this section writable
-+ characteristics|=0x80000000
-+ newcharacteristics = [characteristics].pack('L')
-+ pe[sec[0],newcharacteristics.length]=newcharacteristics
-+ end
- end
-+
-+ #put the shellcode at the entry point, overwriting template
-+ pe[exe.rva_to_file_offset(exe.hdr.opt.AddressOfEntryPoint),code_service.length+code.length]=code_service+code
-+
- when :dll
- max_length = 2048
- when :exe_sub
- max_length = 4096
- end
-
-- bo = pe.index('PAYLOAD:')
-- raise RuntimeError, "Invalid PE EXE subst template: missing \"PAYLOAD:\" tag" if not bo
-+ if opts[:exe_type] != :service_exe
-
-- if (code.length <= max_length)
-- pe[bo, code.length] = [code].pack("a*")
-- else
-- raise RuntimeError, "The EXE generator now has a max size of #{max_length} bytes, please fix the calling module"
-- end
-+ bo = pe.index('PAYLOAD:')
-+ raise RuntimeError, "Invalid PE EXE subst template: missing \"PAYLOAD:\" tag" if not bo
-
-- if opts[:exe_type] == :dll
-- mt = pe.index('MUTEX!!!')
-- pe[mt,8] = Rex::Text.rand_text_alpha(8) if mt
-+ if (code.length <= max_length)
-+ pe[bo, code.length] = [code].pack("a*")
-+ else
-+ raise RuntimeError, "The EXE generator now has a max size of #{max_length} bytes, please fix the calling module"
-+ end
-+
-+ if opts[:exe_type] == :dll
-+ mt = pe.index('MUTEX!!!')
-+ pe[mt,8] = Rex::Text.rand_text_alpha(8) if mt
-+ end
- end
-
- return pe
-@@ -463,7 +513,7 @@
-
- def self.to_win32pe_service(framework, code, opts={})
- # Allow the user to specify their own service EXE template
-- set_template_default(opts, "template_x86_windows_svc.exe")
-+ set_template_default(opts, "template_x86_windows.exe")
- opts[:exe_type] = :service_exe
- exe_sub_method(code,opts)
- end
-diff -Naur metasploit-9999.orig/modules/exploits/windows/smb/psexec.rb metasploit-9999/modules/exploits/windows/smb/psexec.rb
---- metasploit-9999.orig/modules/exploits/windows/smb/psexec.rb 2013-11-20 11:50:31.988365357 +0100
-+++ metasploit-9999/modules/exploits/windows/smb/psexec.rb 2013-11-20 11:50:48.256366095 +0100
-@@ -153,7 +153,7 @@
- # Disconnect from the ADMIN$
- simple.disconnect("ADMIN$")
- else
-- servicename = rand_text_alpha(8)
-+ servicename = rand_text_alpha(7)
-
- # Upload the shellcode to a file
- print_status("Uploading payload...")
diff --git a/net-analyzer/metasploit/files/metasploit.icon b/net-analyzer/metasploit/files/metasploit.icon
deleted file mode 100644
index 87af020..0000000
--- a/net-analyzer/metasploit/files/metasploit.icon
+++ /dev/null
@@ -1,224 +0,0 @@
-/* XPM */
-static char *metasploit[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 170 2 ",
-" c #000000",
-". c #0B0B0B",
-"X c #131313",
-"o c #1C1C1C",
-"O c #251B0D",
-"+ c #2C2112",
-"@ c #2C241C",
-"# c #081933",
-"$ c #061F3B",
-"% c #07203C",
-"& c #09223C",
-"* c #232323",
-"= c #2D2D2D",
-"- c #353535",
-"; c #383838",
-": c #0C2141",
-"> c #0F264C",
-", c #0F284D",
-"< c #072755",
-"1 c #082754",
-"2 c #062855",
-"3 c #0E2C57",
-"4 c #072858",
-"5 c #0D2F5C",
-"6 c #033A6E",
-"7 c #1A3166",
-"8 c #043C72",
-"9 c #2F456F",
-"0 c #2A4174",
-"q c #314774",
-"w c #314A75",
-"e c #424242",
-"r c #444A5F",
-"t c #545454",
-"y c #5B5B5B",
-"u c #414B60",
-"i c #515A6F",
-"p c #4B6975",
-"a c #416679",
-"s c #46697B",
-"d c #4D6D7C",
-"f c #636363",
-"g c #686868",
-"h c #727272",
-"j c #7B7B7B",
-"k c #B37777",
-"l c #C76852",
-"z c #F26E40",
-"x c #C77A6F",
-"c c #DA8D75",
-"v c #023986",
-"b c #002F99",
-"n c #043296",
-"m c #043898",
-"M c #0038A0",
-"N c #094089",
-"B c #1C4583",
-"V c #194997",
-"C c #1E4E9F",
-"Z c #215192",
-"A c #225A9F",
-"S c #3D5C98",
-"D c #3B6F8A",
-"F c #0D43AD",
-"G c #1F4EA2",
-"H c #1F4EAA",
-"J c #1753BB",
-"K c #1852B9",
-"L c #224FA8",
-"P c #2450A4",
-"I c #2E55A0",
-"U c #2755AD",
-"Y c #2956AE",
-"T c #3464A5",
-"R c #2963BC",
-"E c #466E81",
-"W c #447082",
-"Q c #6C739A",
-"! c #4471B1",
-"~ c #4873B6",
-"^ c #4870BB",
-"/ c #4D78BA",
-"( c #0D53C3",
-") c #1866C9",
-"_ c #046EDB",
-"` c #126FD4",
-"' c #0C73DD",
-"] c #3767C7",
-"[ c #326AC2",
-"{ c #3D75C4",
-"} c #3574C8",
-"| c #3B74C9",
-" . c #3E79CC",
-".. c #2F74D3",
-"X. c #3B7BD0",
-"o. c #006EE5",
-"O. c #0479E5",
-"+. c #0074E9",
-"@. c #087EEC",
-"#. c #1479E1",
-"$. c #497AC7",
-"%. c #447BCD",
-"&. c #487FD2",
-"*. c #5B84A8",
-"=. c #3B82DA",
-"-. c #0C86EF",
-";. c #1F80E5",
-":. c #1393F9",
-">. c #1C99FB",
-",. c #348FEC",
-"<. c #3290E5",
-"1. c #3491EB",
-"2. c #2490F3",
-"3. c #279EFD",
-"4. c #3CA8FF",
-"5. c #5394D2",
-"6. c #758FC3",
-"7. c #689AD3",
-"8. c #7399D1",
-"9. c #4090E6",
-"0. c #4990E4",
-"q. c #4694EB",
-"w. c #559BED",
-"e. c #4B9BF1",
-"r. c #539FF3",
-"t. c #45A4FD",
-"y. c #47AAFA",
-"u. c #56A0F4",
-"i. c #5AA4F5",
-"p. c #5CA6F8",
-"a. c #56B5FD",
-"s. c #71A3E1",
-"d. c #65AFFB",
-"f. c #66B7FF",
-"g. c #68B7FF",
-"h. c #6CC2FF",
-"j. c #70C9FF",
-"k. c #7CD7FF",
-"l. c #7ED9FF",
-"z. c #838383",
-"x. c #8B8B8B",
-"c. c #939393",
-"v. c #9D9D9D",
-"b. c #B18A8B",
-"n. c #9193AB",
-"m. c #A3A3A3",
-"M. c #AEAEAE",
-"N. c #B2B2B2",
-"B. c #BDBDBD",
-"V. c #8299C5",
-"C. c #8899C3",
-"Z. c #81C2FF",
-"A. c #8BCEFF",
-"S. c #86D7FF",
-"D. c #8BD1FF",
-"F. c #84DCFF",
-"G. c #8ADFFF",
-"H. c #94D6FF",
-"J. c #9DDAFE",
-"K. c #8DE1FF",
-"L. c #97E0FF",
-"P. c #C3C3C3",
-"I. c #CBCBCB",
-"U. c #D3D3D3",
-"Y. c #DCDCDC",
-"T. c #E3E3E3",
-"R. c #ECECEC",
-"E. c #F4F4F4",
-"W. c #FFFFFF",
-"Q. c None",
-/* pixels */
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.8 V P G G G G G G G G G P G G G G G G G G G G G G G G G G G G G G G G G G L V 6 Q.Q.Q.Q.Q.",
-"Q.v N A | &.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.| } .%. .} | %. .=.} A Z B Q.Q.Q.",
-"Q.F K ..q.u.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.i.p.u.e.u.p.p.w.w.s.8.$.] P 5 Q.Q.",
-"Q.R ) _ ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' #.d.Z.u.;.,.j.g.1./ k x ~ ( n 4 : Q.",
-"Q.` ' +.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.f.D.t.@.2.A.g.1.! l z Q J b 2 % Q.",
-"Q.O.-.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.>.h.D.a.3.4.D.j.y.5.b.c n.[ M 2 & Q.",
-"Q.<.a.F.l.k.k.k.k.k.l.l.k.k.k.k.k.k.k.k.k.l.k.k.k.k.k.k.k.k.l.K.K.G.l.F.L.K.F.S.H.J.L.0.m 1 & Q.",
-"Q.7.*.p d d d d d d d d d d d d d d d d d d d d d d d d d d d s a s d s a s s E D D W T G 3 $ Q.",
-"Q.C.r 7 Y 3 $ Q.",
-"Q.V.u 7 Y 3 $ Q.",
-"Q.V.u 7 Y 3 $ Q.",
-"Q.V.u 7 Y 3 % Q.",
-"Q.V.u c.R.W.Y. 7 Y 3 $ Q.",
-"Q.V.u g W.W.W.Y. 7 Y 3 $ Q.",
-"Q.V.u M.W.W.R.X 7 Y 3 $ Q.",
-"Q.V.u T.W.W.E.m.R.E.B.m.W.E.I.- . j U.E.W.P.e h E.W.W.W.c. . 7 Y 3 $ Q.",
-"Q.V.u W.W.W.W.W.W.W.W.W.W.W.W.R.X v.W.W.W.W.W.R. E.W.W.W.W.E. E.c.* 7 Y 3 $ Q.",
-"Q.V.u W.W.W.W.W.W.W.W.W.W.W.W.W.f E.W.W.R.X P.f h W.W.W.E.y W.W.W.N.e 7 Y 3 $ Q.",
-"Q.V.u W.W.W.E.= W.W.W.U.- W.W.W.v.P.W.W.W.U.- W.W.W.Y. o x.R.W.W.I.f . 7 Y 3 $ Q.",
-"Q.V.u W.W.W.Y. W.W.W.I. W.W.W.B.* Y.W.W.W.W.j W.W.W.Y. . f U.W.W.R.z. 7 Y 3 $ Q.",
-"Q.V.u W.W.W.Y. W.W.W.Y. W.W.W.U.g . f T.W.W.W.g W.W.W.Y. y W.W.W. 7 Y 3 & Q.",
-"Q.V.u W.W.W.Y. W.W.W.Y.. W.W.W.R.W.t ; W.W.W.M. W.W.W.Y. e N.W.W.W.m. 7 Y 3 $ Q.",
-"Q.V.u W.W.W.Y. W.W.W.Y.- W.W.W.Y.E.W.U.T.W.W.W.c. W.W.W.Y. . g U.W.W.R.z.o 7 Y 3 $ Q.",
-"Q.V.u W.W.W.Y. W.W.W.U.m.W.W.W.P.c.W.W.W.W.W.E.* W.W.W.R. R.W.W.U.f . 7 Y 3 $ Q.",
-"Q.V.u U.W.W.U. W.W.W.m.T.W.W.W.x.. c.R.W.E.N.= U.W.W.T. W.N.e 7 Y 3 $ Q.",
-"Q.V.u * 7 Y 3 $ Q.",
-"Q.V.u 7 Y 3 $ Q.",
-"Q.V.u 7 Y 3 $ Q.",
-"Q.V.u 7 Y 3 $ Q.",
-"Q.V.u 7 Y 3 $ Q.",
-"Q.V.u 7 Y 3 $ Q.",
-"Q.V.u 7 Y 3 $ Q.",
-"Q.V.u . . . . . . . . . . . . . 7 Y 3 $ Q.",
-"Q.6.i O @ @ @ @ + @ @ @ @ @ + @ @ @ @ @ @ @ @ @ @ @ @ @ + @ @ @ @ @ @ @ + @ @ @ @ @ + 0 H 3 & Q.",
-"Q.^ S 9 w w w w q w w w w w w w w w w w w w w w w w w w w w w w w w w w w w w w w w q I G 3 $ Q.",
-"Q.V V P C G C C C C P C C C C C P C C C C C C C C C C C C C C C C C C C C C C P A C P A B > $ Q.",
-"Q.3 1 > , > > > > > > > > > > > > > > > > > > > > > > > > > , , > > > > > > > > > > > > > & : Q.",
-"Q.Q.Q.Q.Q.# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q."
-};
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.0-initd b/net-analyzer/metasploit/files/msfrpcd-4.0-initd
deleted file mode 100644
index ad6bf25..0000000
--- a/net-analyzer/metasploit/files/msfrpcd-4.0-initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION=4.0
-PIDFILE=/var/run/msfrpcd${VERSION}.pid
-
-start() {
- ebegin "Starting msfrpcd${VERSION}"
- start-stop-daemon --start --quiet --background \
- --exec /usr/lib/metasploit${VERSION}/msfrpcd \
- --pidfile ${PIDFILE} \
- --make-pidfile -- -f ${MSF_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping msfrpcd${VERSION}"
- start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.0-conf b/net-analyzer/metasploit/files/msfrpcd-4.11-conf
similarity index 100%
rename from net-analyzer/metasploit/files/msfrpcd-4.0-conf
rename to net-analyzer/metasploit/files/msfrpcd-4.11-conf
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.11-initd b/net-analyzer/metasploit/files/msfrpcd-4.11-initd
new file mode 100644
index 0000000..2b8a4cd
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfrpcd-4.11-initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION=4.11
+PIDFILE=/var/run/msfrpcd${VERSION}.pid
+
+start() {
+ ebegin "Starting msfrpcd${VERSION}"
+ start-stop-daemon --start --quiet --background \
+ --exec /usr/lib/metasploit${VERSION}/msfrpcd \
+ --pidfile ${PIDFILE} \
+ --make-pidfile -- -f ${MSF_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping msfrpcd${VERSION}"
+ start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
+ eend $?
+}
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.2-conf b/net-analyzer/metasploit/files/msfrpcd-4.2-conf
deleted file mode 100644
index dc56a9d..0000000
--- a/net-analyzer/metasploit/files/msfrpcd-4.2-conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config file for /etc/init.d/msfrpcd
-
-# msfrpcd -h for more info
-
-# Bind to the following IP instead of 0.0.0.0
-MSF_OPTS="-a 127.0.0.1"
-
-# Bind to the following TCP port instead of default 55553
-#MSF_OPTS="${MSF_OPTS} -p 55553"
-
-# Specify the username to access msfrpcd
-MSF_OPTS="${MSF_OPTS} -U msf"
-
-# Specify the password to access msfrpcd
-MSF_OPTS="${MSF_OPTS} -P secret"
-
-# Server type, [Basic|Web]
-#MSF_OPTS="${MSF_OPTS} -t Basic"
-
-# URI for Web server
-#MSF_OPTS="${MSF_OPTS} -u "
-
-# Disable SSL on the XMLRPC socket
-# JAVA GUI doesn't support SSL as of Nov 6, 2010
-MSF_OPTS="${MSF_OPTS} -S"
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.2-initd b/net-analyzer/metasploit/files/msfrpcd-4.2-initd
deleted file mode 100644
index 91a373f..0000000
--- a/net-analyzer/metasploit/files/msfrpcd-4.2-initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION=4.2
-PIDFILE=/var/run/msfrpcd${VERSION}.pid
-
-start() {
- ebegin "Starting msfrpcd${VERSION}"
- start-stop-daemon --start --quiet --background \
- --exec /usr/lib/metasploit${VERSION}/msfrpcd \
- --pidfile ${PIDFILE} \
- --make-pidfile -- -f ${MSF_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping msfrpcd${VERSION}"
- start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.3-conf b/net-analyzer/metasploit/files/msfrpcd-4.3-conf
deleted file mode 100644
index dc56a9d..0000000
--- a/net-analyzer/metasploit/files/msfrpcd-4.3-conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config file for /etc/init.d/msfrpcd
-
-# msfrpcd -h for more info
-
-# Bind to the following IP instead of 0.0.0.0
-MSF_OPTS="-a 127.0.0.1"
-
-# Bind to the following TCP port instead of default 55553
-#MSF_OPTS="${MSF_OPTS} -p 55553"
-
-# Specify the username to access msfrpcd
-MSF_OPTS="${MSF_OPTS} -U msf"
-
-# Specify the password to access msfrpcd
-MSF_OPTS="${MSF_OPTS} -P secret"
-
-# Server type, [Basic|Web]
-#MSF_OPTS="${MSF_OPTS} -t Basic"
-
-# URI for Web server
-#MSF_OPTS="${MSF_OPTS} -u "
-
-# Disable SSL on the XMLRPC socket
-# JAVA GUI doesn't support SSL as of Nov 6, 2010
-MSF_OPTS="${MSF_OPTS} -S"
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.3-initd b/net-analyzer/metasploit/files/msfrpcd-4.3-initd
deleted file mode 100644
index 4880d50..0000000
--- a/net-analyzer/metasploit/files/msfrpcd-4.3-initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION=4.3
-PIDFILE=/var/run/msfrpcd${VERSION}.pid
-
-start() {
- ebegin "Starting msfrpcd${VERSION}"
- start-stop-daemon --start --quiet --background \
- --exec /usr/lib/metasploit${VERSION}/msfrpcd \
- --pidfile ${PIDFILE} \
- --make-pidfile -- -f ${MSF_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping msfrpcd${VERSION}"
- start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.4-conf b/net-analyzer/metasploit/files/msfrpcd-4.4-conf
deleted file mode 100644
index dc56a9d..0000000
--- a/net-analyzer/metasploit/files/msfrpcd-4.4-conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config file for /etc/init.d/msfrpcd
-
-# msfrpcd -h for more info
-
-# Bind to the following IP instead of 0.0.0.0
-MSF_OPTS="-a 127.0.0.1"
-
-# Bind to the following TCP port instead of default 55553
-#MSF_OPTS="${MSF_OPTS} -p 55553"
-
-# Specify the username to access msfrpcd
-MSF_OPTS="${MSF_OPTS} -U msf"
-
-# Specify the password to access msfrpcd
-MSF_OPTS="${MSF_OPTS} -P secret"
-
-# Server type, [Basic|Web]
-#MSF_OPTS="${MSF_OPTS} -t Basic"
-
-# URI for Web server
-#MSF_OPTS="${MSF_OPTS} -u "
-
-# Disable SSL on the XMLRPC socket
-# JAVA GUI doesn't support SSL as of Nov 6, 2010
-MSF_OPTS="${MSF_OPTS} -S"
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.4-initd b/net-analyzer/metasploit/files/msfrpcd-4.4-initd
deleted file mode 100644
index 4880d50..0000000
--- a/net-analyzer/metasploit/files/msfrpcd-4.4-initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION=4.3
-PIDFILE=/var/run/msfrpcd${VERSION}.pid
-
-start() {
- ebegin "Starting msfrpcd${VERSION}"
- start-stop-daemon --start --quiet --background \
- --exec /usr/lib/metasploit${VERSION}/msfrpcd \
- --pidfile ${PIDFILE} \
- --make-pidfile -- -f ${MSF_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping msfrpcd${VERSION}"
- start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/net-analyzer/metasploit/files/msfweb.confd b/net-analyzer/metasploit/files/msfweb.confd
deleted file mode 100644
index 3e9fa64..0000000
--- a/net-analyzer/metasploit/files/msfweb.confd
+++ /dev/null
@@ -1,13 +0,0 @@
-# Config file for /etc/init.d/metasploit
-
-# Pidfile
-PIDFILE=/var/run/msfweb.pid
-
-# Bind to the following IP instead of the loopback address
-IPADDR=127.0.0.1
-
-# Bind to the following TCP port instead of default 55555
-PORT=55555
-
-# All options
-MSF_OPTS="-a $IPADDR -p $PORT"
diff --git a/net-analyzer/metasploit/files/msfweb.initd b/net-analyzer/metasploit/files/msfweb.initd
deleted file mode 100644
index 0805d58..0000000
--- a/net-analyzer/metasploit/files/msfweb.initd
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-start() {
- ebegin "Starting msfweb"
- start-stop-daemon --start --quiet --background --exec /usr/bin/msfweb \
- --pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping msfweb"
- start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
- rm -f ${PIDFILE}
- eend $?
-}
diff --git a/net-analyzer/metasploit/metasploit-2.7.ebuild b/net-analyzer/metasploit/metasploit-2.7.ebuild
deleted file mode 100644
index ed11d9b..0000000
--- a/net-analyzer/metasploit/metasploit-2.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-MY_P="${P/metasploit/framework}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-SRC_URI="http://metasploit.com/tools/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
- dev-perl/Net-SSLeay
- dev-perl/Term-ReadLine-Perl
- dev-perl/TermReadKey"
-
-src_install() {
- dodir /usr/lib/
- dodir /usr/bin/
-
- # should be as simple as copying everything into the target...
- cp -pPR "${S}" "${D}"usr/lib/metasploit || die
-
- # and creating symlinks in the /usr/bin dir
- cd "${D}"/usr/bin
- ln -s ../lib/metasploit/msf* ./ || die
- chown -R root:0 "${D}"
-
- newinitd "${FILESDIR}"/msfweb.initd msfweb || die "newinitd failed"
- newconfd "${FILESDIR}"/msfweb.confd msfweb || die "newconfd failed"
-}
-
-pkg_postinst() {
- elog "To update metasploit modules run:"
- elog " # cd /usr/lib/metasploit && svn update"
-}
-
-pkg_postrm() {
- if [[ -d /usr/lib/metasploit ]] ; then
- ewarn "If you ever updated modules emerge will keep /var/lib/metasploit"
- ewarn "directory. Thus to remove metasploit completely do not forgive to:"
- ewarn " # rm -r /usr/lib/metasploit"
- fi
-}
diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
new file mode 100644
index 0000000..70f03b9
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+#never ever ever have more than one ruby in here
+USE_RUBY="ruby21"
+inherit eutils ruby-ng
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+ EGIT_CHECKOUT_DIR="${WORKDIR}"/all
+ inherit git-r3
+ KEYWORDS=""
+ SLOT="9999"
+else
+ ##Tags https://github.com/rapid7/metasploit-framework/releases
+ ##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
+ #SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ ##Snapshots
+ MY_PV=${PV/_p/-}
+ SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+ RUBY_S="${PN}-framework-${MY_PV}"
+ inherit versionator
+ SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+fi
+
+DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+LICENSE="BSD"
+IUSE="development +java oracle +pcap test"
+
+#multiple known bugs with tests reported upstream and ignored
+#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
+RESTRICT="test"
+
+RUBY_COMMON_DEPEND="virtual/ruby-ssl
+ >=dev-ruby/activesupport-4.0.9:4.0
+ >=dev-ruby/actionpack-4.0.9:4.0
+ >=dev-ruby/activerecord-4.0.9:4.0
+ dev-ruby/bcrypt-ruby
+ dev-ruby/builder:3
+ dev-ruby/bundler
+ =dev-ruby/jsobfu-0.2*
+ dev-ruby/json
+ dev-ruby/kissfft
+ =dev-ruby/metasploit_data_models-1.2.5
+ dev-ruby/meterpreter_bins:0.0.22
+ dev-ruby/metasploit-payloads:1.0.9
+ =dev-ruby/metasploit-credential-1.0.0:1.0
+ >=dev-ruby/metasploit-concern-1.0.0:1.0
+ >=dev-ruby/metasploit-model-1.0.0:1.0
+ dev-ruby/msgpack
+ dev-ruby/nokogiri
+ dev-ruby/recog:2.0.6
+ =dev-ruby/rkelly-remix-0.0.6
+ dev-ruby/sqlite3
+ >=dev-ruby/pg-0.11
+ dev-ruby/packetfu:1.1.9
+ >=dev-ruby/rubyzip-1.1
+ dev-ruby/rb-readline-r7
+ dev-ruby/robots
+ java? ( dev-ruby/rjb )
+ oracle? ( dev-ruby/ruby-oci8 )
+ pcap? ( dev-ruby/pcaprub:*
+ dev-ruby/network_interface )
+ development? ( dev-ruby/fivemat
+ dev-ruby/pry
+ dev-ruby/redcarpet
+ dev-ruby/yard
+ >=dev-ruby/rake-10.0.0
+ >=dev-ruby/factory_girl-4.1.0 )"
+ #lorcon doesn't support ruby21
+ #lorcon? ( net-wireless/lorcon[ruby] )
+ruby_add_bdepend "${RUBY_COMMON_DEPEND}
+ test? ( >=dev-ruby/factory_girl-4.1.0
+ dev-ruby/fivemat
+ dev-ruby/database_cleaner
+ >=dev-ruby/rspec-2.12
+ dev-ruby/shoulda-matchers
+ dev-ruby/timecop
+ >=dev-ruby/rake-10.0.0 )"
+ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
+
+COMMON_DEPEND="dev-db/postgresql[server]
+ >=app-crypt/johntheripper-1.7.9-r1[-minimal]
+ net-analyzer/nmap"
+RDEPEND+=" ${COMMON_DEPEND}
+ >=app-eselect/eselect-metasploit-0.16"
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+ usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+ usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+ usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+ usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+ usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+ usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+ "
+
+pkg_setup() {
+ if use test; then
+ su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
+ su postgres -c "createuser msf_test_user -d -S -R"
+ if [ $? -ne 0 ]; then
+ su postgres -c "dropuser msf_test_user" || die
+ su postgres -c "createuser msf_test_user -d -S -R" || die
+ fi
+ su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
+ fi
+ ruby-ng_pkg_setup
+}
+
+all_ruby_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git-r3_src_unpack
+ else
+ default_src_unpack
+# mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
+# rm -r msf3
+ #msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
+ #msf_version=${msf_version#*=}
+ fi
+}
+
+all_ruby_prepare() {
+ # add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
+ #epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
+ epatch_user
+
+ #unbundle johntheripper, at least it now defaults to running the system version
+ rm -r data/john/run.*
+ rm -r data/john/src.tar.bz2
+ #remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
+ rm -r data/cpuinfo
+
+ #remove random oudated collected garbage
+ rm -r external
+
+ #remove unneeded ruby bundler versioning files
+ #Gemfile.lock contains the versions tested by the msf team but not the hard requirements
+ #we regen this file in each_ruby_prepare
+ rm Gemfile.lock
+ #The Gemfile contains real known deps
+ #add our dep on upstream rb-readline instead of bundled one
+ #and then they broke it...
+ #sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
+ sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+ #remove the bundled readline
+ #https://github.com/rapid7/metasploit-framework/pull/3105
+ #this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
+ #but now we have to go back to bundled readline because otherwise it's broken
+ #rm lib/rbreadline.rb
+ #now we edit the Gemfile based on use flags
+ #even if we pass --without=blah bundler still calculates the deps and messes us up
+ if ! use pcap; then
+ sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
+ fi
+ if ! use development; then
+ sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+ fi
+ if ! use test; then
+ sed -i -e "/^group :test/,/^end$/d" Gemfile || die
+ fi
+ if ! use test && ! use development; then
+ sed -i -e "/^group :development/,/^end$/d" Gemfile || die
+ fi
+ #We don't need simplecov
+ sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
+ sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
+
+ #we need to edit the gemspec too, since it tries to call git instead of anything sane
+ #probably a better way to fix this... if I care at some point
+ sed -i -e "/^ spec.files/,/^ }/d" metasploit-framework.gemspec || die
+
+ #let's bogart msfupdate
+ rm msfupdate
+ echo "#!/bin/sh" > msfupdate
+ echo "echo \"[*]\"" >> msfupdate
+ echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
+ echo "echo \"[*]\"" >> msfupdate
+ echo "echo \"\"" >> msfupdate
+ if [[ ${PV} == "9999" ]] ; then
+ echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
+ echo " smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
+ echo "else" >> msfupdate
+ echo " echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
+ echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
+ echo "fi" >> msfupdate
+ else
+ echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
+ echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
+ echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
+ fi
+ #this is set executable in src_install
+
+ #install our database.yml file before tests are run
+ cp "${FILESDIR}"/database.yml config/
+
+}
+
+each_ruby_prepare() {
+ MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+ MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+
+ #force all metasploit executables to use desired ruby version
+ #https://dev.metasploit.com/redmine/issues/8357
+ for file in $(ls -1 msf*)
+ do
+ #poorly adapted from python.eclass
+ sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
+ done
+}
+
+each_ruby_test() {
+ #review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
+
+ #we bogart msfupdate so no point in trying to test it
+ rm spec/msfupdate_spec.rb || die
+ #we don't really want to be uploading to virustotal during the tests
+ rm spec/tools/virustotal_spec.rb || die
+
+ # https://dev.metasploit.com/redmine/issues/8425
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
+
+ MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake || die
+ su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
+}
+
+each_ruby_install() {
+ #Tests have already been run, we don't need this stuff
+ rm -r spec || die
+ rm -r test || die
+ rm Gemfile.lock || die
+
+ #I'm 99% sure that this will only work for as long as we only support one ruby version. Creativity will be needed if we wish to support multiple.
+ # should be as simple as copying everything into the target...
+ dodir /usr/$(get_libdir)/${PN}${SLOT}
+ cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
+ rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+ fowners -R root:0 /
+
+}
+
+all_ruby_install() {
+ # do not remove LICENSE, bug #238137
+ dodir /usr/share/doc/${PF}
+ cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
+ dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+
+ fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+
+ #tell revdep-rebuild to ignore binaries meant for the target
+ dodir /etc/revdep-rebuild
+ cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
+ #These dirs contain prebuilt binaries for running on the TARGET not the HOST
+ SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
+ SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+ EOF
+}
+
+pkg_postinst() {
+ elog "Before use you should run 'env-update' and '. /etc/profile'"
+ elog "otherwise you may be missing important environmental variables."
+
+ elog "You need to prepare the database by running:"
+ elog "emerge --config postgresql"
+ elog "/etc/init.d/postgresql-<version> start"
+ elog "emerge --config =metasploit-${PV}"
+
+ "${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
+
+ einfo
+ elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
+}
+
+pkg_config() {
+ einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
+ su postgres -c "createuser msf_user -D -S -R"
+ su postgres -c "createdb --owner=msf_user msf_database"
+}
diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild
deleted file mode 100644
index fee815e..0000000
--- a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-#never ever ever have more than one ruby in here
-USE_RUBY="ruby21"
-inherit eutils ruby-ng
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
- EGIT_CHECKOUT_DIR="${WORKDIR}"/all
- inherit git-r3
- KEYWORDS=""
- SLOT="9999"
-else
- ##Tags https://github.com/rapid7/metasploit-framework/releases
- ##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
- #SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
- ##Snapshots
- MY_PV=${PV/_p/-}
- SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
- RUBY_S="${PN}-framework-${MY_PV}"
- inherit versionator
- SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
-fi
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-LICENSE="BSD"
-IUSE="development +java oracle +pcap test"
-
-#multiple known bugs with tests reported upstream and ignored
-#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
-
-RUBY_COMMON_DEPEND="virtual/ruby-ssl
- >=dev-ruby/activesupport-4.0.9:4.0
- >=dev-ruby/actionpack-4.0.9:4.0
- >=dev-ruby/activerecord-4.0.9:4.0
- dev-ruby/bcrypt-ruby
- dev-ruby/builder:3
- dev-ruby/bundler
- =dev-ruby/jsobfu-0.2*
- dev-ruby/json
- dev-ruby/kissfft
- =dev-ruby/metasploit_data_models-1.2.5
- dev-ruby/meterpreter_bins:0.0.22
- dev-ruby/metasploit-payloads:1.0.9
- =dev-ruby/metasploit-credential-1.0.0:1.0
- >=dev-ruby/metasploit-concern-1.0.0:1.0
- >=dev-ruby/metasploit-model-1.0.0:1.0
- dev-ruby/msgpack
- dev-ruby/nokogiri
- =dev-ruby/recog-2.0.6:2
- =dev-ruby/rkelly-remix-0.0.6
- dev-ruby/sqlite3
- >=dev-ruby/pg-0.11
- dev-ruby/packetfu:1.1.9
- >=dev-ruby/rubyzip-1.1
- dev-ruby/rb-readline-r7
- dev-ruby/robots
- java? ( dev-ruby/rjb )
- oracle? ( dev-ruby/ruby-oci8 )
- pcap? ( dev-ruby/pcaprub:*
- dev-ruby/network_interface )
- development? ( dev-ruby/fivemat
- dev-ruby/pry
- dev-ruby/redcarpet
- dev-ruby/yard
- >=dev-ruby/rake-10.0.0
- >=dev-ruby/factory_girl-4.1.0 )"
- #lorcon doesn't support ruby21
- #lorcon? ( net-wireless/lorcon[ruby] )
-ruby_add_bdepend "${RUBY_COMMON_DEPEND}
- test? ( >=dev-ruby/factory_girl-4.1.0
- dev-ruby/fivemat
- dev-ruby/database_cleaner
- >=dev-ruby/rspec-2.12
- dev-ruby/shoulda-matchers
- dev-ruby/timecop
- >=dev-ruby/rake-10.0.0 )"
-ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
-
-COMMON_DEPEND="dev-db/postgresql[server]
- >=app-crypt/johntheripper-1.7.9-r1[-minimal]
- net-analyzer/nmap"
-RDEPEND+=" ${COMMON_DEPEND}
- >=app-eselect/eselect-metasploit-0.16"
-
-RESTRICT="strip"
-
-QA_PREBUILT="
- usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
- usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
- usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
- usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
- usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
- usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
- usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_bsd.bin
- usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
- usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
- usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
- usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
- usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
- usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
- usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
- usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
- usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
- usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
- usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
- "
-
-pkg_setup() {
- if use test; then
- su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
- su postgres -c "createuser msf_test_user -d -S -R"
- if [ $? -ne 0 ]; then
- su postgres -c "dropuser msf_test_user" || die
- su postgres -c "createuser msf_test_user -d -S -R" || die
- fi
- su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
- fi
- ruby-ng_pkg_setup
-}
-
-all_ruby_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
- else
- default_src_unpack
-# mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
-# rm -r msf3
- #msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
- #msf_version=${msf_version#*=}
- fi
-}
-
-all_ruby_prepare() {
- # add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
- #epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
- epatch_user
-
- #unbundle johntheripper, at least it now defaults to running the system version
- rm -r data/john/run.*
- rm -r data/john/src.tar.bz2
- #remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
- rm -r data/cpuinfo
-
- #remove random oudated collected garbage
- rm -r external
-
- #remove unneeded ruby bundler versioning files
- #Gemfile.lock contains the versions tested by the msf team but not the hard requirements
- #we regen this file in each_ruby_prepare
- rm Gemfile.lock
- #The Gemfile contains real known deps
- #add our dep on upstream rb-readline instead of bundled one
- #and then they broke it...
- #sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
- sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
- #remove the bundled readline
- #https://github.com/rapid7/metasploit-framework/pull/3105
- #this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
- #but now we have to go back to bundled readline because otherwise it's broken
- #rm lib/rbreadline.rb
- #now we edit the Gemfile based on use flags
- #even if we pass --without=blah bundler still calculates the deps and messes us up
- if ! use pcap; then
- sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
- fi
- if ! use development; then
- sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
- fi
- if ! use test; then
- sed -i -e "/^group :test/,/^end$/d" Gemfile || die
- fi
- if ! use test && ! use development; then
- sed -i -e "/^group :development/,/^end$/d" Gemfile || die
- fi
- #We don't need simplecov
- sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
- sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
-
- #we need to edit the gemspec too, since it tries to call git instead of anything sane
- #probably a better way to fix this... if I care at some point
- sed -i -e "/^ spec.files/,/^ }/d" metasploit-framework.gemspec || die
-
- #let's bogart msfupdate
- rm msfupdate
- echo "#!/bin/sh" > msfupdate
- echo "echo \"[*]\"" >> msfupdate
- echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
- echo "echo \"[*]\"" >> msfupdate
- echo "echo \"\"" >> msfupdate
- if [[ ${PV} == "9999" ]] ; then
- echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
- echo " smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
- echo "else" >> msfupdate
- echo " echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
- echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
- echo "fi" >> msfupdate
- else
- echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
- echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
- echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
- fi
- #this is set executable in src_install
-
- #install our database.yml file before tests are run
- cp "${FILESDIR}"/database.yml config/
-
-}
-
-each_ruby_prepare() {
- MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
- MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-
- #force all metasploit executables to use desired ruby version
- #https://dev.metasploit.com/redmine/issues/8357
- for file in $(ls -1 msf*)
- do
- #poorly adapted from python.eclass
- sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
- done
-}
-
-each_ruby_test() {
- #review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
-
- #we bogart msfupdate so no point in trying to test it
- rm spec/msfupdate_spec.rb || die
- #we don't really want to be uploading to virustotal during the tests
- rm spec/tools/virustotal_spec.rb || die
-
- # https://dev.metasploit.com/redmine/issues/8425
- BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
- BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
-
- MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake || die
- su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
-}
-
-each_ruby_install() {
- #Tests have already been run, we don't need this stuff
- rm -r spec || die
- rm -r test || die
- rm Gemfile.lock || die
-
- #I'm 99% sure that this will only work for as long as we only support one ruby version. Creativity will be needed if we wish to support multiple.
- # should be as simple as copying everything into the target...
- dodir /usr/$(get_libdir)/${PN}${SLOT}
- cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
- rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
- fowners -R root:0 /
-
-}
-
-all_ruby_install() {
- # do not remove LICENSE, bug #238137
- dodir /usr/share/doc/${PF}
- cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
- dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
-
- fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
-
- #tell revdep-rebuild to ignore binaries meant for the target
- dodir /etc/revdep-rebuild
- cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
- #These dirs contain prebuilt binaries for running on the TARGET not the HOST
- SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
- SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
- EOF
-}
-
-pkg_postinst() {
- elog "Before use you should run 'env-update' and '. /etc/profile'"
- elog "otherwise you may be missing important environmental variables."
-
- elog "You need to prepare the database by running:"
- elog "emerge --config postgresql"
- elog "/etc/init.d/postgresql-<version> start"
- elog "emerge --config =metasploit-${PV}"
-
- "${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
-
- einfo
- elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
-}
-
-pkg_config() {
- einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
- su postgres -c "createuser msf_user -D -S -R"
- su postgres -c "createdb --owner=msf_user msf_database"
-}
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
new file mode 100644
index 0000000..2c43b84
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+#never ever ever have more than one ruby in here
+USE_RUBY="ruby21"
+inherit eutils ruby-ng
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+ EGIT_CHECKOUT_DIR="${WORKDIR}"/all
+ inherit git-r3
+ KEYWORDS=""
+ SLOT="9999"
+else
+ ##Tags https://github.com/rapid7/metasploit-framework/releases
+ ##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
+ #SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ ##Snapshots
+ MY_PV=${PV/_p/-}
+ SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+ RUBY_S="${PN}-framework-${MY_PV}"
+ inherit versionator
+ SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+fi
+
+DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+LICENSE="BSD"
+IUSE="development +java oracle +pcap test"
+
+#multiple known bugs with tests reported upstream and ignored
+#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
+RESTRICT="test"
+
+RUBY_COMMON_DEPEND="virtual/ruby-ssl
+ >=dev-ruby/activesupport-4.0.9:4.0
+ >=dev-ruby/actionpack-4.0.9:4.0
+ >=dev-ruby/activerecord-4.0.9:4.0
+ dev-ruby/bcrypt-ruby
+ dev-ruby/builder:3
+ dev-ruby/bundler
+ =dev-ruby/jsobfu-0.2*
+ dev-ruby/json
+ dev-ruby/kissfft
+ dev-ruby/metasm:1.0.2
+ dev-ruby/metasploit_data_models:1.2.7
+ dev-ruby/meterpreter_bins:0.0.22
+ dev-ruby/metasploit-payloads:1.0.15
+ dev-ruby/metasploit-credential:1.0.1
+ >=dev-ruby/metasploit-concern-1.0.0:1.0
+ >=dev-ruby/metasploit-model-1.0.0:1.0
+ dev-ruby/msgpack
+ dev-ruby/nokogiri
+ dev-ruby/recog:2.0.14
+ =dev-ruby/rkelly-remix-0.0.6
+ dev-ruby/sqlite3
+ >=dev-ruby/pg-0.11
+ dev-ruby/packetfu:1.1.11
+ >=dev-ruby/rubyzip-1.1
+ dev-ruby/rb-readline-r7
+ dev-ruby/robots
+ java? ( dev-ruby/rjb )
+ oracle? ( dev-ruby/ruby-oci8 )
+ pcap? ( dev-ruby/pcaprub:*
+ dev-ruby/network_interface )
+ development? ( dev-ruby/fivemat
+ dev-ruby/pry
+ dev-ruby/redcarpet
+ dev-ruby/yard
+ >=dev-ruby/rake-10.0.0
+ >=dev-ruby/factory_girl-4.1.0 )"
+ #lorcon doesn't support ruby21
+ #lorcon? ( net-wireless/lorcon[ruby] )
+ruby_add_bdepend "${RUBY_COMMON_DEPEND}
+ test? ( >=dev-ruby/factory_girl-4.1.0
+ dev-ruby/fivemat
+ dev-ruby/database_cleaner
+ >=dev-ruby/rspec-2.12
+ dev-ruby/shoulda-matchers
+ dev-ruby/timecop
+ >=dev-ruby/rake-10.0.0 )"
+ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
+
+COMMON_DEPEND="dev-db/postgresql[server]
+ >=app-crypt/johntheripper-1.7.9-r1[-minimal]
+ net-analyzer/nmap"
+RDEPEND+=" ${COMMON_DEPEND}
+ >=app-eselect/eselect-metasploit-0.16"
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+ usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+ usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+ usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+ usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+ usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+ usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+ usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+ "
+
+pkg_setup() {
+ if use test; then
+ su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
+ su postgres -c "createuser msf_test_user -d -S -R"
+ if [ $? -ne 0 ]; then
+ su postgres -c "dropuser msf_test_user" || die
+ su postgres -c "createuser msf_test_user -d -S -R" || die
+ fi
+ su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
+ fi
+ ruby-ng_pkg_setup
+}
+
+all_ruby_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git-r3_src_unpack
+ else
+ default_src_unpack
+# mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
+# rm -r msf3
+ #msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
+ #msf_version=${msf_version#*=}
+ fi
+}
+
+all_ruby_prepare() {
+ # add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
+ #epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
+ epatch_user
+
+ #unbundle johntheripper, at least it now defaults to running the system version
+ rm -r data/john/run.*
+ rm -r data/john/src.tar.bz2
+ #remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
+ rm -r data/cpuinfo
+
+ #remove random oudated collected garbage
+ rm -r external
+
+ #remove unneeded ruby bundler versioning files
+ #Gemfile.lock contains the versions tested by the msf team but not the hard requirements
+ #we regen this file in each_ruby_prepare
+ rm Gemfile.lock
+ #The Gemfile contains real known deps
+ #add our dep on upstream rb-readline instead of bundled one
+ #and then they broke it...
+ #sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
+ sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+ #remove the bundled readline
+ #https://github.com/rapid7/metasploit-framework/pull/3105
+ #this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
+ #but now we have to go back to bundled readline because otherwise it's broken
+ #rm lib/rbreadline.rb
+ #now we edit the Gemfile based on use flags
+ #even if we pass --without=blah bundler still calculates the deps and messes us up
+ if ! use pcap; then
+ sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
+ fi
+ if ! use development; then
+ sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+ fi
+ if ! use test; then
+ sed -i -e "/^group :test/,/^end$/d" Gemfile || die
+ fi
+ if ! use test && ! use development; then
+ sed -i -e "/^group :development/,/^end$/d" Gemfile || die
+ fi
+ #We don't need simplecov
+ sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
+ sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
+
+ #we need to edit the gemspec too, since it tries to call git instead of anything sane
+ #probably a better way to fix this... if I care at some point
+ sed -i -e "/^ spec.files/,/^ }/d" metasploit-framework.gemspec || die
+
+ #let's bogart msfupdate
+ rm msfupdate
+ echo "#!/bin/sh" > msfupdate
+ echo "echo \"[*]\"" >> msfupdate
+ echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
+ echo "echo \"[*]\"" >> msfupdate
+ echo "echo \"\"" >> msfupdate
+ if [[ ${PV} == "9999" ]] ; then
+ echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
+ echo " smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
+ echo "else" >> msfupdate
+ echo " echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
+ echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
+ echo "fi" >> msfupdate
+ else
+ echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
+ echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
+ echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
+ fi
+ #this is set executable in src_install
+
+ #install our database.yml file before tests are run
+ cp "${FILESDIR}"/database.yml config/
+
+}
+
+each_ruby_prepare() {
+ MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+ MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+
+ #force all metasploit executables to use desired ruby version
+ #https://dev.metasploit.com/redmine/issues/8357
+ for file in $(ls -1 msf*)
+ do
+ #poorly adapted from python.eclass
+ sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
+ done
+}
+
+each_ruby_test() {
+ #review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
+
+ #we bogart msfupdate so no point in trying to test it
+ rm spec/msfupdate_spec.rb || die
+ #we don't really want to be uploading to virustotal during the tests
+ rm spec/tools/virustotal_spec.rb || die
+
+ # https://dev.metasploit.com/redmine/issues/8425
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
+
+ MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake || die
+ su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
+}
+
+each_ruby_install() {
+ #Tests have already been run, we don't need this stuff
+ rm -r spec || die
+ rm -r test || die
+ rm Gemfile.lock || die
+
+ #I'm 99% sure that this will only work for as long as we only support one ruby version. Creativity will be needed if we wish to support multiple.
+ # should be as simple as copying everything into the target...
+ dodir /usr/$(get_libdir)/${PN}${SLOT}
+ cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
+ rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+ fowners -R root:0 /
+
+}
+
+all_ruby_install() {
+ # do not remove LICENSE, bug #238137
+ dodir /usr/share/doc/${PF}
+ cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
+ dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+
+ fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+
+ #tell revdep-rebuild to ignore binaries meant for the target
+ dodir /etc/revdep-rebuild
+ cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
+ #These dirs contain prebuilt binaries for running on the TARGET not the HOST
+ SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
+ SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+ EOF
+}
+
+pkg_postinst() {
+ elog "Before use you should run 'env-update' and '. /etc/profile'"
+ elog "otherwise you may be missing important environmental variables."
+
+ elog "You need to prepare the database by running:"
+ elog "emerge --config postgresql"
+ elog "/etc/init.d/postgresql-<version> start"
+ elog "emerge --config =metasploit-${PV}"
+
+ "${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
+
+ einfo
+ elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
+}
+
+pkg_config() {
+ einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
+ su postgres -c "createuser msf_user -D -S -R"
+ su postgres -c "createdb --owner=msf_user msf_database"
+}
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.1.1-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.1.1-r2.ebuild
new file mode 100644
index 0000000..5768949
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.1.1-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib user
+
+DESCRIPTION="Official plugins for Nagios"
+HOMEPAGE="http://nagios-plugins.org/"
+SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres samba selinux snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+ ldap? ( net-nds/openldap )
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:* )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+
+DEPEND="${REAL_DEPEND}
+ nagios-dns? ( net-dns/bind-tools )
+ nagios-game? ( games-util/qstat )
+ nagios-ping? ( net-analyzer/fping )
+ samba? ( net-fs/samba )
+ ssh? ( net-misc/openssh )
+ snmp? ( dev-perl/Net-SNMP
+ net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+ !net-analyzer/monitoring-plugins
+ selinux? ( sec-policy/selinux-nagios )"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+src_prepare() {
+ # Fix the path to our perl interpreter
+ sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
+ "${S}"/plugins-scripts/*.pl || die
+}
+
+src_configure() {
+ # Use an array to prevent econf from mangling the ping args.
+ local myconf=()
+
+ if use ssl; then
+ myconf+=( $(use_with ssl openssl /usr) )
+ else
+ myconf+=( --without-openssl )
+ myconf+=( --without-gnutls )
+ fi
+
+ # The autodetection for these two commands can hang if localhost is
+ # down or ICMP traffic is filtered. Bug #468296.
+ myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+ if use ipv6; then
+ myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+ fi
+
+ econf \
+ $(use_with mysql) \
+ $(use_with ipv6) \
+ $(use_with ldap) \
+ $(use_with postgres pgsql /usr) \
+ "${myconf[@]}" \
+ --libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+ --sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+ NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+ enewgroup nagios
+ enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+ elog "This ebuild has a number of USE flags that determine what you"
+ elog "are able to monitor. Depending on what you want to monitor, some"
+ elog "or all of these USE flags need to be set."
+ elog
+ elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r2.ebuild
new file mode 100644
index 0000000..3bdf6ed
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r2.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+WANT_AUTOMAKE=none
+PATCHSET=2
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools distutils-r1 eutils perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://net-snmp.sourceforge.net/"
+SRC_URI="
+ mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz
+ https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz
+"
+
+S=${WORKDIR}/${P/_/.}
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bzip2 doc elf ipv6 libressl mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql"
+
+COMMON_DEPEND="
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6d:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ rpm? (
+ app-arch/rpm
+ dev-libs/popt
+ )
+ bzip2? ( app-arch/bzip2 )
+ zlib? ( >=sys-libs/zlib-1.1.4 )
+ elf? ( dev-libs/elfutils )
+ python? (
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ )
+ pci? ( sys-apps/pciutils )
+ lm_sensors? ( sys-apps/lm_sensors )
+ netlink? ( dev-libs/libnl:3 )
+ mysql? ( virtual/mysql )
+ perl? ( dev-lang/perl:= )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ doc? ( app-doc/doxygen )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ perl? (
+ X? ( dev-perl/perl-tk )
+ !minimal? ( dev-perl/TermReadKey )
+ )
+ selinux? ( sec-policy/selinux-snmp )
+"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ rpm? ( bzip2 zlib )
+"
+
+RESTRICT=test
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # snmpconf generates config files with proper selinux context
+ use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+ epatch "${WORKDIR}"/patches/*.patch
+
+ epatch_user
+
+ eautoconf
+}
+
+src_configure() {
+ # keep this in the same line, configure.ac arguments are passed down to config.h
+ local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail smux etherlike-mib/dot3StatsTable"
+ use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+
+ econf \
+ $(use_enable !ssl internal-md5) \
+ $(use_enable ipv6) \
+ $(use_enable mfd-rewrites) \
+ $(use_enable perl embedded-perl) \
+ $(use_enable ucd-compat ucd-snmp-compatibility) \
+ $(use_with bzip2) \
+ $(use_with elf) \
+ $(use_with mysql) \
+ $(use_with netlink nl) \
+ $(use_with pci) \
+ $(use_with perl perl-modules INSTALLDIRS=vendor) \
+ $(use_with python python-modules) \
+ $(use_with rpm) \
+ $(use_with ssl openssl) \
+ $(use_with tcpd libwrap) \
+ $(use_with zlib) \
+ --enable-shared --disable-static \
+ --with-default-snmp-version="3" \
+ --with-install-prefix="${D}" \
+ --with-ldflags="${LDFLAGS}" \
+ --with-logfile="/var/log/net-snmpd.log" \
+ --with-mib-modules="${mibs}" \
+ --with-persistent-directory="/var/lib/net-snmp" \
+ --with-sys-contact="root@Unknown" \
+ --with-sys-location="Unknown"
+}
+
+src_compile() {
+ emake \
+ OTHERLDFLAGS="${LDFLAGS}" \
+ sedscript all
+
+ use doc && emake docsdox
+}
+
+src_install () {
+ # bug #317965
+ emake -j1 DESTDIR="${D}" install
+
+ if use perl ; then
+ perl_delete_localpod
+ if ! use X; then
+ rm "${D}"/usr/bin/tkmib || die
+ fi
+ else
+ rm -f \
+ "${D}"/usr/bin/fixproc \
+ "${D}"/usr/bin/ipf-mod.pl \
+ "${D}"/usr/bin/mib2c \
+ "${D}"/usr/bin/net-snmp-cert \
+ "${D}"/usr/bin/snmp-bridge-mib \
+ "${D}"/usr/bin/snmpcheck \
+ "${D}"/usr/bin/snmpconf \
+ "${D}"/usr/bin/tkmib \
+ "${D}"/usr/bin/traptoemail \
+ "${D}"/usr/share/snmp/mib2c.perl.conf \
+ "${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+ || die
+ fi
+
+ dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+ newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+ use doc && dohtml docs/html/*
+
+ keepdir /var/lib/net-snmp
+
+ newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+ newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+ newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+ newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+ systemd_dounit "${FILESDIR}"/snmpd.service
+ systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+ insinto /etc/snmp
+ newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+ # Remove everything not required for an agent.
+ # Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+ if use minimal; then
+ rm -rf \
+ "${D}"/**/*.pl \
+ "${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+ "${D}"/usr/share/snmp/*.conf \
+ "${D}"/usr/share/snmp/snmpconf-data \
+ || die
+ fi
+}
diff --git a/net-analyzer/nikto/nikto-2.1.5.ebuild b/net-analyzer/nikto/nikto-2.1.5.ebuild
index aa1e74e..694c4af 100644
--- a/net-analyzer/nikto/nikto-2.1.5.ebuild
+++ b/net-analyzer/nikto/nikto-2.1.5.ebuild
@@ -28,7 +28,7 @@
sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:;
s:# EXECDIR=/usr/local/nikto:EXECDIR=/usr/share/nikto:;
s:# use LW2:use LW2:;
- s:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":;' nikto.pl || die
+ s:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":;' nikto.pl || die
}
src_compile() { :; }
diff --git a/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild b/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
new file mode 100644
index 0000000..a3d9dc0
--- /dev/null
+++ b/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+ http://nmap.org/dist/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+ system-lua? ( nse )
+ ndiff? ( ${PYTHON_REQUIRED_USE} )
+ zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+ dev-libs/liblinear:=
+ dev-libs/libpcre
+ net-libs/libpcap[ipv6?]
+ zenmap? (
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ )
+ system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+ ndiff? ( ${PYTHON_DEPS} )
+ nls? ( virtual/libintl )
+ nmap-update? ( dev-libs/apr dev-vcs/subversion )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ if use ndiff || use zenmap; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_unpack() {
+ # prevent unpacking the logo
+ unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-4.75-nolua.patch \
+ "${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+ "${FILESDIR}"/${PN}-5.21-python.patch \
+ "${FILESDIR}"/${PN}-6.01-make.patch \
+ "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
+ "${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+ "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+ "${FILESDIR}"/${PN}-6.47-ncat-lua.patch \
+ "${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch
+
+ if use nls; then
+ local lingua=''
+ for lingua in ${NMAP_LINGUAS[@]}; do
+ if ! use linguas_${lingua}; then
+ rm -r zenmap/share/zenmap/locale/${lingua} || die
+ rm zenmap/share/zenmap/locale/${lingua}.po || die
+ fi
+ done
+ else
+ # configure/make ignores --disable-nls
+ for lingua in ${NMAP_LINGUAS[@]}; do
+ rm -r zenmap/share/zenmap/locale/${lingua} || die
+ rm zenmap/share/zenmap/locale/${lingua}.po || die
+ done
+ fi
+
+ sed -i \
+ -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+ Makefile.in || die
+
+ # Fix desktop files wrt bug #432714
+ sed -i \
+ -e '/^Encoding/d' \
+ -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+ zenmap/install_scripts/unix/zenmap-root.desktop \
+ zenmap/install_scripts/unix/zenmap.desktop || die
+
+ epatch_user
+}
+
+src_configure() {
+ # The bundled libdnet is incompatible with the version available in the
+ # tree, so we cannot use the system library here.
+ econf \
+ $(use_enable ipv6) \
+ $(use_enable nls) \
+ $(use_with zenmap) \
+ $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+ $(use_with ncat) \
+ $(use_with ndiff) \
+ $(use_with nmap-update) \
+ $(use_with nping) \
+ $(use_with ssl openssl) \
+ --with-libdnet=included \
+ --with-pcre=/usr
+ # --with-liblinear=/usr \
+ # Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+ emake \
+ AR=$(tc-getAR) \
+ RANLIB=$(tc-getRANLIB )
+}
+
+src_install() {
+ LC_ALL=C emake -j1 \
+ DESTDIR="${D}" \
+ STRIP=: \
+ nmapdatadir="${EPREFIX}"/usr/share/nmap \
+ install
+ if use nmap-update;then
+ LC_ALL=C emake -j1 \
+ -C nmap-update \
+ DESTDIR="${D}" \
+ STRIP=: \
+ nmapdatadir="${EPREFIX}"/usr/share/nmap \
+ install
+ fi
+
+ dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+ if use zenmap; then
+ doicon "${DISTDIR}/nmap-logo-64.png"
+ python_optimize
+ fi
+}
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 1185730..1e02fc0 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -19,7 +19,7 @@
LICENSE="GPL-2"
SLOT="0"
-IUSE="ipv6 +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
@@ -41,7 +41,10 @@
ndiff? ( ${PYTHON_DEPS} )
nls? ( virtual/libintl )
nmap-update? ( dev-libs/apr dev-vcs/subversion )
- ssl? ( dev-libs/openssl:0= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
"
DEPEND="
${RDEPEND}
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 73544d3..7828db1 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,2 +1,3 @@
DIST pmacct-1.5.1.tar.gz 874563 SHA256 96134549a10947f3f6d610b670a26f1a54e01af4be0eff09bf48c19246d33584 SHA512 c3a0ddaf1b8679df2097147ce844eb2a3e3058599aea457e463cd4e65a7601e0ce5bac5ca5e1c82afecd5edc92dae673eed3ed1787bfbd3e8ac2af5677885bb7 WHIRLPOOL bd071ac30493f5ee2e0393eb9277dfae2d2fdd6283293aee589ae41ab326b0aaef0ec9b70a421eeca4df857a0046ca7b196e0692ffdd2ea12d9a7c66a74e9a32
DIST pmacct-1.5.2.tar.gz 897530 SHA256 c12e3897e2f9aa89333968da46eb46855f357750ac1e06e36e72f374e2b54df9 SHA512 3705432cc2a28e179de637b8fc11becd2022b36191a13d440d5bec7d7e594d0936773f202f3d82e983a83695176380aa6a7c27748b632b180000590be0ead599 WHIRLPOOL e7bb1fa1b7372af7d932e19da1d14f3922d8a8ebda245fa03e2a5f283c66141a9299cc9dfa6f32e9384c7d2c9a2d2ef35ef62d7b9910e4f76cacc132231420e5
+DIST pmacct-1.5.3_pre20150925.tar.gz 896168 SHA256 ae63580ae879b3ce20e9725690b6337a72857376192dd2f610e0359ee9d4364c SHA512 e6675855f403ee746b0243cce1ee0e28fd649d2b1c6c1e33f012d7858f977952ba6ed5d1ee47ce42a4f6950b139be2bc50a88740fd19c4775d61d1fb1aa6c05d WHIRLPOOL c7f5003754835f0e1883f13bfba740667ebcbef54a49cc8b8f6fcca1f2db2dea337c910417ff75d86dcfa6bc294fa9b44567bc0d5d07b79ffcfc9b11b1efad5d
diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
new file mode 100644
index 0000000..06a5c51
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
+
+RDEPEND="
+ net-libs/libpcap
+ geoip? ( dev-libs/geoip )
+ mongodb? (
+ >=dev-libs/mongo-c-driver-0.8.1-r1
+ <dev-libs/mongo-c-driver-0.98
+ )
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:* )
+ sqlite? ( =dev-db/sqlite-3* )
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/pmacct-daily"
+
+DOCS=(
+ CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
+ docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+ tc-export CC AR RANLIB
+
+ econf \
+ $(use_enable 64bit) \
+ $(use_enable debug) \
+ $(use_enable geoip) \
+ $(use_enable ipv6) \
+ $(use_enable mongodb) \
+ $(use_enable mysql) \
+ $(use_enable postgres pgsql) \
+ $(use_enable sqlite sqlite3) \
+ $(use_enable threads) \
+ $(use_enable ulog) \
+ $(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
+ $(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
+ --disable-debug
+}
+
+src_install() {
+ default
+
+ for dirname in examples sql; do
+ docinto ${dirname}
+ dodoc -r ${dirname}/*
+ done
+
+ newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+ newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+ insinto /etc/pmacctd
+ newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index ef0b97c..1660cb5 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,2 +1 @@
-DIST speedtest-cli-0.2.4.tar.gz 10573 SHA256 be53386d0ea697aff192984a4f06bcf9b5c4e287b8ac13d68f5fb8d0fc5317f1 SHA512 d85ec7036ae183ef0906f4bf8ebec54ae2f27878a60165153602d7eff8b2b036aa343a91f94edc6777131c36fceed83901ee6a565ecb3ad6a46a2a96c158f352 WHIRLPOOL f0493907a51e1879f3d4df9a00dcb4ef181f0b2465d635d618075854ce6a0c61e4adb5adf95a4f5dff5dcdbacf982e4b578d53b087995b230b3898407aedd9e0
-DIST speedtest-cli-0.2.5.tar.gz 11786 SHA256 1fafa6d808823da17a6f4c75d802f13b42ad954d60f4cd18ba30d2bb1424e538 SHA512 d844fed185af9ace7fb6ec1b3ea33f4dcd841a47e0bc0e75577d5e40be57a4cbfeedc4180b5bf68649c8242ab5749c778c9941c056fe17d0cb9f6597d14c50ac WHIRLPOOL d179a7793a4a8e985e537e6bc5df9253fc16ccc68480d0c6231a016df4b71acdfb42cd23e0c6ebe0d35664d20d4aa2d4fb1b24baaa5afa85ac4b1b2e7c967e43
+DIST speedtest-cli-0.3.4.tar.gz 14452 SHA256 e50646e245ea3c80c9653a532db0dbaef72f1c439330bcc22c381074c17b719d SHA512 fb22ba9e17a30c172b8f751020d7117caf8b573dee112506917f24c5173e2901e0f0198b4946798daf3a27839519025f4a7f8f8942034bc19356b32d6a0f6851 WHIRLPOOL c5700ec9bc513274056b870c781782ceeea4441282564d18d8ed9fbc7f7c9d3d7099ffcfc5193efec37b823e8da10a953391919c8330f454540dc24ae9e517ea
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.2.4.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.2.4.ebuild
deleted file mode 100644
index d823fd5..0000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-0.2.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
-HOMEPAGE="https://github.com/sivel/speedtest-cli"
-SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.2.5.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.2.5.ebuild
deleted file mode 100644
index fbbd2a7..0000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-0.2.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
-HOMEPAGE="https://github.com/sivel/speedtest-cli"
-SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( CONTRIBUTING.md )
-
-python_install_all() {
- doman ${PN}.1
- distutils-r1_python_install_all
-}
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild
new file mode 100644
index 0000000..fb3a5b4
--- /dev/null
+++ b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
+HOMEPAGE="https://github.com/sivel/speedtest-cli"
+SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( CONTRIBUTING.md )
+
+python_install_all() {
+ doman ${PN}.1
+ distutils-r1_python_install_all
+}
diff --git a/net-analyzer/tcpdump/tcpdump-4.7.4-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.7.4-r1.ebuild
new file mode 100644
index 0000000..003ab7b
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.7.4-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic toolchain-funcs user
+
+DESCRIPTION="A Tool for network monitoring and data acquisition"
+HOMEPAGE="http://www.tcpdump.org/"
+SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
+ http://www.jp.tcpdump.org/release/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+drop-root libressl smi ssl ipv6 samba suid test"
+
+RDEPEND="
+ drop-root? ( sys-libs/libcap-ng )
+ net-libs/libpcap
+ smi? ( net-libs/libsmi )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6m:0 )
+ libressl? ( dev-libs/libressl )
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ drop-root? ( virtual/pkgconfig )
+ test? (
+ || ( app-arch/sharutils sys-freebsd/freebsd-ubin )
+ dev-lang/perl
+ )
+"
+
+pkg_setup() {
+ if use drop-root || use suid; then
+ enewgroup tcpdump
+ enewuser tcpdump -1 -1 -1 tcpdump
+ fi
+}
+
+src_configure() {
+ # tcpdump needs some optimization. see bug #108391
+ # but do not replace -Os
+ filter-flags -O[0-9]
+ has -O? ${CFLAGS} || append-cflags -O2
+
+ filter-flags -finline-functions
+
+ if use drop-root; then
+ append-cppflags -DHAVE_CAP_NG_H
+ export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
+ fi
+
+ econf \
+ $(use_enable ipv6) \
+ $(use_enable samba smb) \
+ $(use_with drop-root chroot '') \
+ $(use_with smi) \
+ $(use_with ssl crypto "${EPREFIX}/usr") \
+ $(usex drop-root "--with-user=tcpdump" "")
+}
+
+src_test() {
+ if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
+ sed -i -e '/^\(espudp1\|eapon1\)/d;' tests/TESTLIST || die
+ emake check
+ else
+ ewarn "If you want to run the test suite, make sure you either"
+ ewarn "set FEATURES=userpriv or set USE=-drop-root"
+ fi
+}
+
+src_install() {
+ dosbin tcpdump
+ doman tcpdump.1
+ dodoc *.awk
+ dodoc CHANGES CREDITS README.md
+
+ if use suid; then
+ fowners root:tcpdump /usr/sbin/tcpdump
+ fperms 4110 /usr/sbin/tcpdump
+ fi
+}
+
+pkg_preinst() {
+ if use drop-root || use suid; then
+ enewgroup tcpdump
+ enewuser tcpdump -1 -1 -1 tcpdump
+ fi
+}
+
+pkg_postinst() {
+ use suid && elog "To let normal users run tcpdump add them into tcpdump group."
+}
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 17b9895..7ca9116 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -12,13 +12,16 @@
LICENSE="BSD"
SLOT="0"
KEYWORDS=""
-IUSE="+drop-root smi ssl ipv6 samba suid test"
+IUSE="+drop-root libressl smi ssl ipv6 samba suid test"
RDEPEND="
drop-root? ( sys-libs/libcap-ng )
net-libs/libpcap
smi? ( net-libs/libsmi )
- ssl? ( >=dev-libs/openssl-0.9.6m )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6m:0 )
+ libressl? ( dev-libs/libressl )
+ )
"
DEPEND="
${RDEPEND}
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
new file mode 100644
index 0000000..23bcd10
--- /dev/null
+++ b/net-analyzer/testssl/Manifest
@@ -0,0 +1 @@
+DIST testssl-2.6.tar.gz 12296414 SHA256 286b3285f096a5d249de1507eee88b14848514696bc5bbc4faceffa46b563ebd SHA512 c09ef82a8062cac484df956ea68d459dcedaa9e96301f5d5108323eb482dd4ef226e6a41446eb230cdb459404357e3fb3ec02a386697e335a58a2b14db327780 WHIRLPOOL 290c4202358ac647ca7ed2ce0d17cf5ace6c533f7c79cee066d599193f9e77cfdd1e440e7670c5216fec9b1f882986dcf26f5cad638384b8b7a278fbcbe5eace
diff --git a/net-analyzer/testssl/metadata.xml b/net-analyzer/testssl/metadata.xml
new file mode 100644
index 0000000..b500834
--- /dev/null
+++ b/net-analyzer/testssl/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>kensington@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="bundled-openssl">Install precompiled versions of OpenSSL for greater testing coverage</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-analyzer/testssl/testssl-2.6.ebuild b/net-analyzer/testssl/testssl-2.6.ebuild
new file mode 100644
index 0000000..86d6a09
--- /dev/null
+++ b/net-analyzer/testssl/testssl-2.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN}.sh"
+
+DESCRIPTION="Tool to check TLS/SSL cipher support"
+HOMEPAGE="https://testssl.sh/"
+SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 bundled-openssl? ( openssl )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bundled-openssl"
+
+RDEPEND="
+ dev-libs/openssl:0
+ net-dns/bind-tools
+ sys-apps/util-linux
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+pkg_setup() {
+ use amd64 && BUNDLED_OPENSSL="openssl.Linux.x86_64"
+}
+
+src_prepare() {
+ sed -i -e "s|MAPPING_FILE_RFC=\"\"|MAPPING_FILE_RFC=\"/usr/share/${PN}/mapping-rfc.txt\"|" ${PN}.sh || die
+}
+
+src_install() {
+ dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
+ dodoc openssl-rfc.mappping.html
+
+ dobin ${PN}.sh
+
+ insinto /usr/share/${PN}
+ doins mapping-rfc.txt
+
+ if use bundled-openssl; then
+ exeinto /opt/${PN}
+ use amd64 && doexe bin/${BUNDLED_OPENSSL}
+ fi
+}
+
+pkg_postinst() {
+ if use bundled-openssl; then
+ einfo "A precompiled version of OpenSSL has been installed into /opt/${PN},"
+ einfo "configured to enable a wider range of features to allow better testing."
+ einfo ""
+ einfo "To use it, call ${PN} appropriately:"
+ einfo "${MY_PN} --openssl /opt/${PN}/${BUNDLED_OPENSSL} example.com"
+ fi
+}
diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index 47ff12c..d7c8afd 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -220,7 +220,7 @@
insinto /usr/include/wiretap
doins wiretap/wtap.h
- if use gtk3 || use qt4; then
+ if use gtk3 || use qt4 || use qt5; then
local c d
for c in hi lo; do
for d in 16 32 48; do
@@ -234,7 +234,7 @@
domenu wireshark.desktop
fi
- if use qt4; then
+ if use qt4 || use qt5; then
sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
domenu wireshark-qt.desktop
fi
diff --git a/net-analyzer/wireshark/wireshark-1.99.9.ebuild b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
index 1479231..348d4e4 100644
--- a/net-analyzer/wireshark/wireshark-1.99.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
@@ -226,7 +226,7 @@
insinto /usr/include/wiretap
doins wiretap/wtap.h
- if use gtk3 || use qt4; then
+ if use gtk3 || use qt4 || use qt5; then
local c d
for c in hi lo; do
for d in 16 32 48; do
@@ -240,7 +240,7 @@
domenu wireshark.desktop
fi
- if use qt4; then
+ if use qt4 || use qt5; then
sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
domenu wireshark-qt.desktop
fi
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 02e46af..6c12e53 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -229,7 +229,7 @@
insinto /usr/include/wiretap
doins wiretap/wtap.h
- if use gtk3 || use qt4; then
+ if use gtk3 || use qt4 || use qt5; then
local c d
for c in hi lo; do
for d in 16 32 48; do
@@ -243,7 +243,7 @@
domenu wireshark.desktop
fi
- if use qt4; then
+ if use qt4 || use qt5; then
sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
domenu wireshark-qt.desktop
fi
diff --git a/net-dialup/freeradius-client/Manifest b/net-dialup/freeradius-client/Manifest
index c33927d..6f355e6 100644
--- a/net-dialup/freeradius-client/Manifest
+++ b/net-dialup/freeradius-client/Manifest
@@ -1 +1 @@
-DIST freeradius-client-1.1.6.tar.bz2 297916 SHA256 a3c9522ed6d9bc795794595a8f3eebada868ea11a0c046637500faf257f9688f SHA512 883ea38f4c13113d76a1ee8d85993bdadbe031a1ef1a1d731f809b36d1a0570395bb3ac749a7c71d7f4471ef2079e54f8bfddf3f695b5c4cc14ab43a234098d8 WHIRLPOOL 36a5f76351d3097a3d149574adeacdd0f00dec464783646ce4360fd7d47119323dadcebab29f94205ba0b5747e1af2bc433a77060aa8f536166a55f5c7f8aacb
+DIST freeradius-client-1.1.7.tar.gz 433141 SHA256 eada2861b8f4928e3ac6b5bbfe11e92cd6cdcacfce40cae1085e77c1b6add0e9 SHA512 20e79ec97da79f46b334e1c2880803a692885a4038196a4d016094d349f675e2d0521d921140c5ab06703008619417f7a20d3e90cdfc7b3578faccbd232be0ce WHIRLPOOL f8c9f2875bb6bf8ba3ccb45bdc75f30a1708ee5a4966d48c533827400a417c440bf6ba3a356f774ef9d450b78ac1728737ed30932ceb1e1e4ff225876724ea11
diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.6.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.6.ebuild
deleted file mode 100644
index 4105214..0000000
--- a/net-dialup/freeradius-client/freeradius-client-1.1.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-DESCRIPTION="FreeRADIUS Client framework"
-HOMEPAGE="http://wiki.freeradius.org/Radiusclient"
-SRC_URI="ftp://ftp.freeradius.org/pub/freeradius/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scp shadow"
-
-DEPEND="!net-dialup/radiusclient
- !net-dialup/radiusclient-ng"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf \
- $(use_enable scp) \
- $(use_enable shadow) \
- --with-secure-path || die "econf failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc BUGS README* doc/ChangeLog doc/login.example doc/release-method.txt
- newdoc doc/README README.login.example
- dohtml doc/instop.html
-}
diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
new file mode 100644
index 0000000..8b0aa56
--- /dev/null
+++ b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools-utils
+
+DESCRIPTION="FreeRADIUS Client framework"
+HOMEPAGE="http://wiki.freeradius.org/Radiusclient"
+SRC_URI="ftp://ftp.freeradius.org/pub/freeradius/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="scp shadow static-libs"
+
+DEPEND="!net-dialup/radiusclient
+ !net-dialup/radiusclient-ng"
+RDEPEND="${DEPEND}"
+
+DOCS=( BUGS doc/ChangeLog doc/login.example doc/release-method.txt )
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable scp)
+ $(use_enable shadow)
+ --with-secure-path
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+ dodoc README*
+ newdoc doc/README README.login.example
+ dohtml doc/instop.html
+}
diff --git a/net-dialup/ppp/ppp-2.4.7-r2.ebuild b/net-dialup/ppp/ppp-2.4.7-r2.ebuild
new file mode 100644
index 0000000..089b67f
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.7-r2.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-info multilib pam toolchain-funcs
+
+PATCH_VER="2"
+DESCRIPTION="Point-to-Point Protocol (PPP)"
+HOMEPAGE="http://www.samba.org/ppp"
+SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
+ https://dev.gentoo.org/~pinkbyte/distfiles/patches/${P}-patches-${PATCH_VER}.tar.xz
+ http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
+
+DEPEND="activefilter? ( net-libs/libpcap )
+ atm? ( net-dialup/linux-atm )
+ pam? ( virtual/pam )
+ gtk? ( x11-libs/gtk+:2 )
+ eap-tls? (
+ net-misc/curl
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+RDEPEND="${DEPEND}"
+PDEPEND="net-dialup/ppp-scripts"
+
+src_prepare() {
+ mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+
+ use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*"
+ EPATCH_SUFFIX="patch" \
+ epatch "${WORKDIR}"/patch
+
+ if use atm ; then
+ einfo "Enabling PPPoATM support"
+ sed -i '/^#HAVE_LIBATM=yes/s:#::' \
+ pppd/plugins/pppoatm/Makefile.linux || die
+ fi
+
+ if ! use activefilter ; then
+ einfo "Disabling active filter"
+ sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
+ fi
+
+ if use pam ; then
+ einfo "Enabling PAM"
+ sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
+ fi
+
+ if use ipv6 ; then
+ einfo "Enabling IPv6"
+ sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
+ fi
+
+ einfo "Enabling CBCP"
+ sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
+
+ if use dhcp ; then
+ einfo "Adding ppp-dhcp plugin files"
+ sed -i \
+ -e '/^SUBDIRS :=/s:$: dhcp:' \
+ pppd/plugins/Makefile.linux || die
+ fi
+
+ # Set correct libdir
+ sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+ pppd/{pathnames.h,pppd.8} || die
+
+ if use radius ; then
+ #set the right paths in radiusclient.conf
+ sed -i -e "s:/usr/local/etc:/etc:" \
+ -e "s:/usr/local/sbin:/usr/sbin:" \
+ pppd/plugins/radius/etc/radiusclient.conf || die
+ #set config dir to /etc/ppp/radius
+ sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
+ pppd/plugins/radius/{*.8,*.c,*.h} \
+ pppd/plugins/radius/etc/* || die
+ else
+ einfo "Disabling radius"
+ sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
+ fi
+}
+
+src_compile() {
+ tc-export AR CC
+ emake COPTS="${CFLAGS} -D_GNU_SOURCE"
+
+ # build pppgetpass
+ cd contrib/pppgetpass || die
+ if use gtk ; then
+ emake -f Makefile.linux
+ else
+ emake pppgetpass.vt
+ fi
+}
+
+src_install() {
+ local i
+ for i in chat pppd pppdump pppstats ; do
+ doman ${i}/${i}.8
+ dosbin ${i}/${i}
+ done
+ fperms u+s-w /usr/sbin/pppd
+
+ # Install pppd header files
+ emake -C pppd INSTROOT="${D}" install-devel
+
+ dosbin pppd/plugins/rp-pppoe/pppoe-discovery
+
+ dodir /etc/ppp/peers
+ insinto /etc/ppp
+ insopts -m0600
+ newins etc.ppp/pap-secrets pap-secrets.example
+ newins etc.ppp/chap-secrets chap-secrets.example
+
+ insopts -m0644
+ doins etc.ppp/options
+
+ pamd_mimic_system ppp auth account session
+
+ local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
+ # closing " for syntax coloring
+ insinto "${PLUGINS_DIR}"
+ insopts -m0755
+ doins pppd/plugins/minconn.so
+ doins pppd/plugins/passprompt.so
+ doins pppd/plugins/passwordfd.so
+ doins pppd/plugins/winbind.so
+ doins pppd/plugins/rp-pppoe/rp-pppoe.so
+ doins pppd/plugins/pppol2tp/openl2tp.so
+ doins pppd/plugins/pppol2tp/pppol2tp.so
+ if use atm ; then
+ doins pppd/plugins/pppoatm/pppoatm.so
+ fi
+ if use dhcp ; then
+ doins pppd/plugins/dhcp/dhcpc.so
+ fi
+ if use radius ; then
+ doins pppd/plugins/radius/rad{ius,attr,realms}.so
+
+ #Copy radiusclient configuration files (#92878)
+ insinto /etc/ppp/radius
+ insopts -m0644
+ doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
+
+ doman pppd/plugins/radius/pppd-rad{ius,attr}.8
+ fi
+
+ insinto /etc/modprobe.d
+ insopts -m0644
+ newins "${FILESDIR}/modules.ppp" ppp.conf
+
+ dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+ dodoc "${FILESDIR}/README.mpls"
+
+ dosbin scripts/p{on,off,log}
+ doman scripts/pon.1
+
+ # Adding misc. specialized scripts to doc dir
+ insinto /usr/share/doc/${PF}/scripts/chatchat
+ doins scripts/chatchat/*
+ insinto /usr/share/doc/${PF}/scripts
+ doins scripts/*
+
+ if use gtk ; then
+ dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
+ newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
+ else
+ newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
+ fi
+ doman contrib/pppgetpass/pppgetpass.8
+}
+
+pkg_postinst() {
+ if linux-info_get_any_version && linux_config_src_exists ; then
+ echo
+ ewarn "If the following test report contains a missing kernel configuration option that you need,"
+ ewarn "you should reconfigure and rebuild your kernel before running pppd."
+ CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+ local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+ local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
+ local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
+ if use activefilter ; then
+ CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
+ local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
+ fi
+ CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
+ local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
+ local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
+ local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+ CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
+ local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
+ local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
+ if use atm ; then
+ CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
+ local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
+ fi
+ check_extra_config
+ fi
+
+ # create *-secrets files if not exists
+ [ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
+ cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
+ [ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
+ cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
+
+ # lib name has changed
+ sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options" || die
+
+ echo
+ elog "Pon, poff and plog scripts have been supplied for experienced users."
+ elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
+ elog "/usr/share/doc/${PF}/scripts directory."
+}
diff --git a/net-dns/avahi/avahi-0.6.31-r10.ebuild b/net-dns/avahi/avahi-0.6.31-r10.ebuild
index b7749eb..4b6c3c3 100644
--- a/net-dns/avahi/avahi-0.6.31-r10.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r10.ebuild
@@ -18,7 +18,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
REQUIRED_USE="
diff --git a/net-dns/bind-tools/bind-tools-9.10.2_p4-r1.ebuild b/net-dns/bind-tools/bind-tools-9.10.2_p4-r1.ebuild
new file mode 100644
index 0000000..38b6062
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.10.2_p4-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="gost? ( ssl )"
+
+DEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
+ xml? ( dev-libs/libxml2 )
+ idn? ( net-dns/idnkit )
+ gssapi? ( virtual/krb5 )
+ readline? ( sys-libs/readline:0= )
+ seccomp? ( sys-libs/libseccomp )"
+RDEPEND="${DEPEND}
+ !<net-dns/bind-9.10.2"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch #231247
+ epatch "${FILESDIR}"/${PN}-9.10.2-openssl.patch #417129
+
+ # Disable tests for now, bug 406399
+ sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+ # bug #220361
+ rm aclocal.m4
+ rm -rf libtool.m4/
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=
+
+ if use urandom; then
+ myconf="${myconf} --with-randomdev=/dev/urandom"
+ else
+ myconf="${myconf} --with-randomdev=/dev/random"
+ fi
+
+ # bug 344029
+ append-cflags "-DDIG_SIGCHASE"
+
+ # localstatedir for nsupdate -l, bug 395785
+ tc-export BUILD_CC
+ econf \
+ --localstatedir=/var \
+ --without-python \
+ --without-libjson \
+ --disable-openssl-version-check \
+ $(use_enable ipv6) \
+ $(use_with idn) \
+ $(usex idn --with-idnlib=-lidnkit '') \
+ $(use_enable seccomp) \
+ $(use_with ssl openssl) \
+ $(use_with xml libxml2) \
+ $(use_with gssapi) \
+ $(use_with readline) \
+ $(use_with gost) \
+ ${myconf}
+
+ # bug #151839
+ echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+ local AR=$(tc-getAR)
+
+ emake AR="${AR}" -C lib/
+ emake AR="${AR}" -C bin/delv/
+ emake AR="${AR}" -C bin/dig/
+ emake AR="${AR}" -C bin/nsupdate/
+ emake AR="${AR}" -C bin/dnssec/
+}
+
+src_install() {
+ dodoc README CHANGES FAQ
+
+ cd "${S}"/bin/delv
+ dobin delv
+ doman delv.1
+
+ cd "${S}"/bin/dig
+ dobin dig host nslookup
+ doman {dig,host,nslookup}.1
+
+ cd "${S}"/bin/nsupdate
+ dobin nsupdate
+ doman nsupdate.1
+ if use doc; then
+ dohtml nsupdate.html
+ fi
+
+ cd "${S}"/bin/dnssec
+ for tool in dsfromkey importkey keyfromlabel keygen \
+ revoke settime signzone verify; do
+ dobin dnssec-"${tool}"
+ doman dnssec-"${tool}".8
+ if use doc; then
+ dohtml dnssec-"${tool}".html
+ fi
+ done
+}
diff --git a/net-dns/bind/bind-9.10.2_p4-r1.ebuild b/net-dns/bind/bind-9.10.2_p4-r1.ebuild
new file mode 100644
index 0000000..68ccb97
--- /dev/null
+++ b/net-dns/bind/bind-9.10.2_p4-r1.ebuild
@@ -0,0 +1,408 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+NSLINT_DIR="contrib/nslint-3.0a2/"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
+ doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+# sdb-ldap? (
+# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
+# )"
+
+LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb +caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
+json ldap mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
++threads urandom xml"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="postgres? ( dlz )
+ berkdb? ( dlz )
+ mysql? ( dlz !threads )
+ odbc? ( dlz )
+ ldap? ( dlz )
+ gost? ( ssl )
+ threads? ( caps )"
+# sdb-ldap? ( dlz )
+
+DEPEND="ssl? ( dev-libs/openssl:0[-bindist] )
+ mysql? ( >=virtual/mysql-4.0 )
+ odbc? ( >=dev-db/unixODBC-2.2.6 )
+ ldap? ( net-nds/openldap )
+ idn? ( net-dns/idnkit )
+ postgres? ( dev-db/postgresql:= )
+ caps? ( >=sys-libs/libcap-2.1.0 )
+ xml? ( dev-libs/libxml2 )
+ geoip? ( >=dev-libs/geoip-1.4.6 )
+ gssapi? ( virtual/krb5 )
+ gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
+ seccomp? ( sys-libs/libseccomp )
+ json? ( dev-libs/json-c )"
+# sdb-ldap? ( net-nds/openldap )
+
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-bind )
+ || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+pkg_setup() {
+ ebegin "Creating named group and user"
+ enewgroup named 40
+ enewuser named 40 -1 /etc/bind named
+ eend ${?}
+}
+
+src_prepare() {
+ # Adjusting PATHs in manpages
+ for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
+ sed -i \
+ -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+ -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+ -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+ "${i}" || die "sed failed, ${i} doesn't exist"
+ done
+
+# if use dlz; then
+# # sdb-ldap patch as per bug #160567
+# # Upstream URL: http://bind9-ldap.bayour.com/
+# # New patch take from bug 302735
+# if use sdb-ldap; then
+# epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+# cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
+# cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
+# cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
+# fi
+# fi
+
+ # should be installed by bind-tools
+ sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+ # Disable tests for now, bug 406399
+ sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+ if use nslint; then
+ sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:' ${NSLINT_DIR}/nslint.{c,8} || die
+ fi
+
+ # bug #220361
+ rm aclocal.m4
+ rm -rf libtool.m4/
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=""
+
+ if use urandom; then
+ myconf="${myconf} --with-randomdev=/dev/urandom"
+ else
+ myconf="${myconf} --with-randomdev=/dev/random"
+ fi
+
+ use geoip && myconf="${myconf} --with-geoip"
+
+ # bug #158664
+# gcc-specs-ssp && replace-flags -O[23s] -O
+
+ # To include db.h from proper path
+ use berkdb && append-flags "-I$(db_includedir)"
+
+ export BUILD_CC=$(tc-getBUILD_CC)
+ econf \
+ --sysconfdir=/etc/bind \
+ --localstatedir=/var \
+ --with-libtool \
+ --enable-full-report \
+ $(use_enable threads) \
+ $(use_with dlz dlopen) \
+ $(use_with dlz dlz-filesystem) \
+ $(use_with dlz dlz-stub) \
+ $(use_with postgres dlz-postgres) \
+ $(use_with mysql dlz-mysql) \
+ $(use_with berkdb dlz-bdb) \
+ $(use_with ldap dlz-ldap) \
+ $(use_with odbc dlz-odbc) \
+ $(use_with ssl openssl "${EPREFIX}"/usr) \
+ $(use_with ssl ecdsa) \
+ $(use_with idn) \
+ $(use_enable ipv6) \
+ $(use_with xml libxml2) \
+ $(use_with gssapi) \
+ $(use_enable rpz rpz-nsip) \
+ $(use_enable rpz rpz-nsdname) \
+ $(use_enable caps linux-caps) \
+ $(use_with gost) \
+ $(use_enable filter-aaaa) \
+ $(use_enable fixed-rrset) \
+ $(use_with python) \
+ $(use_enable seccomp) \
+ $(use_with json libjson) \
+ --without-readline \
+ ${myconf}
+
+ # $(use_enable static-libs static) \
+
+ # bug #151839
+ echo '#undef SO_BSDCOMPAT' >> config.h
+
+ if use nslint; then
+ cd $NSLINT_DIR
+ econf
+ fi
+}
+
+src_compile() {
+ emake
+
+ if use nslint; then
+ emake -C $NSLINT_DIR CCOPT="${CFLAGS}"
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ if use nslint; then
+ cd $NSLINT_DIR
+ dobin nslint
+ doman nslint.8
+ cd "${S}"
+ fi
+
+ dodoc CHANGES FAQ README
+
+ if use idn; then
+ dodoc contrib/idn/README.idnkit
+ fi
+
+ if use doc; then
+ dodoc doc/arm/Bv9ARM.pdf
+
+ docinto misc
+ dodoc doc/misc/*
+
+ # might a 'html' useflag make sense?
+ docinto html
+ dohtml -r doc/arm/*
+
+ docinto contrib
+ dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+ # some handy-dandy dynamic dns examples
+ pushd "${D}"/usr/share/doc/${PF} 1>/dev/null
+ tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+ popd 1>/dev/null
+ fi
+
+ insinto /etc/bind
+ newins "${FILESDIR}"/named.conf-r8 named.conf
+
+ # ftp://ftp.rs.internic.net/domain/named.cache:
+ insinto /var/bind
+ doins "${FILESDIR}"/named.cache
+
+ insinto /var/bind/pri
+ newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+ newinitd "${FILESDIR}"/named.init-r13 named
+ newconfd "${FILESDIR}"/named.confd-r7 named
+
+ if use gost; then
+ sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
+ else
+ sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die
+ fi
+
+ newenvd "${FILESDIR}"/10bind.env 10bind
+
+ # Let's get rid of those tools and their manpages since they're provided by bind-tools
+ rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
+ rm -f "${D}"/usr/share/man/man8/nsupdate.8*
+ rm -f "${D}"/usr/bin/{dig,host,nslookup,nsupdate}
+ rm -f "${D}"/usr/sbin/{dig,host,nslookup,nsupdate}
+ for tool in dsfromkey importkey keyfromlabel keygen \
+ revoke settime signzone verify; do
+ rm -f "${D}"/usr/{,s}bin/dnssec-"${tool}"
+ rm -f "${D}"/usr/share/man/man8/dnssec-"${tool}".8*
+ done
+
+ # bug 405251, library archives aren't properly handled by --enable/disable-static
+ if ! use static-libs; then
+ find "${D}" -type f -name '*.a' -delete || die
+ fi
+
+ # bug 405251
+ find "${D}" -type f -name '*.la' -delete || die
+
+ if use python; then
+ install_python_tools() {
+ dosbin bin/python/dnssec-{checkds,coverage}
+ }
+ python_foreach_impl install_python_tools
+
+ python_replicate_script "${D}usr/sbin/dnssec-checkds"
+ python_replicate_script "${D}usr/sbin/dnssec-coverage"
+ fi
+
+ # bug 450406
+ dosym named.cache /var/bind/root.cache
+
+ dosym /var/bind/pri /etc/bind/pri
+ dosym /var/bind/sec /etc/bind/sec
+ dosym /var/bind/dyn /etc/bind/dyn
+ keepdir /var/bind/{pri,sec,dyn}
+
+ dodir /var/log/named
+
+ fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+ fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+ fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+ fperms 0750 /etc/bind /var/bind/pri
+ fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+ systemd_newunit "${FILESDIR}/named.service-r1" named.service
+ systemd_dotmpfilesd "${FILESDIR}"/named.conf
+ exeinto /usr/libexec
+ doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+pkg_postinst() {
+ if [ ! -f '/etc/bind/rndc.key' ]; then
+ if use urandom; then
+ einfo "Using /dev/urandom for generating rndc.key"
+ /usr/sbin/rndc-confgen -r /dev/urandom -a
+ echo
+ else
+ einfo "Using /dev/random for generating rndc.key"
+ /usr/sbin/rndc-confgen -a
+ echo
+ fi
+ chown root:named /etc/bind/rndc.key
+ chmod 0640 /etc/bind/rndc.key
+ fi
+
+ einfo
+ einfo "You can edit /etc/conf.d/named to customize named settings"
+ einfo
+ use mysql || use postgres || use ldap && {
+ elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+ elog "uncomment the specified rc_named_* lines in your"
+ elog "/etc/conf.d/named config to ensure they'll start before bind"
+ einfo
+ }
+ einfo "If you'd like to run bind in a chroot AND this is a new"
+ einfo "install OR your bind doesn't already run in a chroot:"
+ einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+ einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+ einfo
+
+ CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+ if [[ -n ${CHROOT} ]]; then
+ elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+ elog "To enable the old behaviour (without using mount) uncomment the"
+ elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+ elog "If you decide to use the new/default method, ensure to make backup"
+ elog "first and merge your existing configs/zones to /etc/bind and"
+ elog "/var/bind because bind will now mount the needed directories into"
+ elog "the chroot dir."
+ fi
+}
+
+pkg_config() {
+ CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+ CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+ CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+ if [[ -z "${CHROOT}" ]]; then
+ eerror "This config script is designed to automate setting up"
+ eerror "a chrooted bind/named. To do so, please first uncomment"
+ eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+ die "Unset CHROOT"
+ fi
+ if [[ -d "${CHROOT}" ]]; then
+ ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+ ewarn "To enable the old behaviour (without using mount) uncomment the"
+ ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+ ewarn
+ ewarn "${CHROOT} already exists... some things might become overridden"
+ ewarn "press CTRL+C if you don't want to continue"
+ sleep 10
+ fi
+
+ echo; einfo "Setting up the chroot directory..."
+
+ mkdir -m 0750 -p ${CHROOT}
+ mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run}
+ mkdir -m 0750 -p ${CHROOT}/etc/bind
+ mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/
+ # As of bind 9.8.0
+ if has_version net-dns/bind[gost]; then
+ if [ "$(get_libdir)" = "lib64" ]; then
+ mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines
+ ln -s lib64 ${CHROOT}/usr/lib
+ else
+ mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
+ fi
+ fi
+ chown root:named ${CHROOT} ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ ${CHROOT}/etc/bind
+
+ mknod ${CHROOT}/dev/null c 1 3
+ chmod 0666 ${CHROOT}/dev/null
+
+ mknod ${CHROOT}/dev/zero c 1 5
+ chmod 0666 ${CHROOT}/dev/zero
+
+ if use urandom; then
+ mknod ${CHROOT}/dev/urandom c 1 9
+ chmod 0666 ${CHROOT}/dev/urandom
+ else
+ mknod ${CHROOT}/dev/random c 1 8
+ chmod 0666 ${CHROOT}/dev/random
+ fi
+
+ if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+ cp -a /etc/bind ${CHROOT}/etc/
+ cp -a /var/bind ${CHROOT}/var/
+ fi
+
+ if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+ mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
+ fi
+
+ elog "You may need to add the following line to your syslog-ng.conf:"
+ elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/bind/bind-9.10.2_p4.ebuild b/net-dns/bind/bind-9.10.2_p4.ebuild
index 21a4739..8642d04 100644
--- a/net-dns/bind/bind-9.10.2_p4.ebuild
+++ b/net-dns/bind/bind-9.10.2_p4.ebuild
@@ -39,7 +39,7 @@
LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="berkdb +caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
json ldap mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
+threads urandom xml"
diff --git a/net-dns/bind/files/named.conf b/net-dns/bind/files/named.conf
new file mode 100644
index 0000000..1cfc82d
--- /dev/null
+++ b/net-dns/bind/files/named.conf
@@ -0,0 +1 @@
+d /run/named 0750 named named -
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index e16f178..e969d31 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1,4 +1,4 @@
DIST opendnssec-1.3.17.tar.gz 1140751 SHA256 9f0dcfb53a3e10255b2d85e6a30663548eca1ec2e900b7cd5db9329f1710e323 SHA512 6d3172cf5dc1bee1dbd14a5b9a8ada4ce3ebd954e2cd7adde664ac4b5e0cab81ed1cba2e2efeceacedf16f56d40a0874b73d7c844bbbbb6e1be1f8235a4c99f7 WHIRLPOOL 80e3a99dedb2ea1cc6a1d109bcf4e874cc9cc18abfaa233a2533f7a05b7129543cf2fbeaf6c6cde343755cacbca3125a4426c421805425204725f9ddcb156657
DIST opendnssec-1.3.18.tar.gz 1143889 SHA256 e61d23ae0cc57b6e09d408bade6872fe5241896c61a03e8bc5ceeb65df13a676 SHA512 5df39ba778c9b1245e88b81df7aa491bca0aad2943845284c4f8b4dd729fa69014d45f07bdf99a048ccf668a1c9675a8dd99efcec1abdbd4e06e9738fec6ab6d WHIRLPOOL 7213b8f2f86651114449bc4734452d6065960e26ee289051949ca27ae3b23280cea45ff707f71942eef91c9009200272c0985ef3d3de43c9343ad2e1e54303ce
-DIST opendnssec-1.4.4.tar.gz 1009728 SHA256 71f930d871e3526f930ac57925f5d5b934988e0b2e9e858926bfc73d9ba9d00e SHA512 aa88049cdd9275b7167e8a135beaa0ea6b9b2030818ec9d7815dbceb906cb0ac19d9a8e6e8571b6c37db452bbf9ab2a615785bad8ffb0a8eb21c50de42cd99b1 WHIRLPOOL 0ce1536aa69c394595105c1803761697d8450bc42e84c6a9e80568ade61fc6e0060f8b4d9bdb9547ff0cd17e27671a4c5fa3576c9d58a47188c7ff87043ccfb1
DIST opendnssec-1.4.6.tar.gz 1014314 SHA256 53f9c454f331822925d76c9d9e5e7cb3fe2dfb03e3c467f67f9412f10d0fd5ec SHA512 c01e6e46e2007d0ae4035253484590d9a892be8284b179b6d3cdb0f8481789a67a79f9043d04de0aecc165fb44d88dac0eb02444f48e0ccd366f118a2bbb5c18 WHIRLPOOL 4535fb49879b27698b0ba88f05b2fd963c69829446a7d5eb8419c19768059347e0adfd1b59efe50b2acd5550758f499290e02ee52b1b92695e8f9061ad465bf0
+DIST opendnssec-1.4.7.tar.gz 1038884 SHA256 8f757ca9e88d6a6dc8f9b6e46a3da5e3a2881b3311fb91c428bcf906683ac41f SHA512 def2a8e41331bd70f287ea3081a7368144ada92ad5cc9f62d28d3064e34f7c0c84998422d515f5ec9c7e668757e796df8c5446839e24e4a9e2af1357c342c0b2 WHIRLPOOL 37641549f4bb6ecb519a091e60537acf7fab69fc3482ab8857abd2ce57d8b5240031069d487246f88577ca32d48004b10a7784c10b4155b3339d67bd5567591a
diff --git a/net-dns/opendnssec/opendnssec-1.4.4.ebuild b/net-dns/opendnssec/opendnssec-1.4.4.ebuild
deleted file mode 100644
index 118902c..0000000
--- a/net-dns/opendnssec/opendnssec-1.4.4.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="${P/_}"
-PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit base autotools multilib user
-
-DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc +mysql +signer sqlite test ${PKCS11_IUSE}"
-
-RDEPEND="
- dev-lang/perl
- dev-libs/libxml2
- dev-libs/libxslt
- net-libs/ldns
- mysql? (
- virtual/mysql
- dev-perl/DBD-mysql
- )
- opensc? ( dev-libs/opensc )
- softhsm? ( dev-libs/softhsm )
- sqlite? (
- dev-db/sqlite:3
- dev-perl/DBD-SQLite
- )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- test? (
- app-text/trang
- )
-"
-
-REQUIRED_USE="
- ^^ ( mysql sqlite )
- ^^ ( softhsm opensc external-hsm )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-fix-localstatedir.patch"
- "${FILESDIR}/${PN}-fix-run-dir.patch"
- "${FILESDIR}/${PN}-drop-privileges.patch"
- "${FILESDIR}/${PN}-use-system-trang.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( MIGRATION NEWS )
-
-check_pkcs11_setup() {
- # PKCS#11 HSM's are often only available with proprietary drivers not
- # available in portage tree.
-
- if use softhsm; then
- PKCS11_LIB=softhsm
- if has_version ">=dev-libs/softhsm-1.3.1"; then
- PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
- else
- PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
- fi
- elog "Building with SoftHSM PKCS#11 library support."
- fi
- if use opensc; then
- PKCS11_LIB=opensc
- PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
- elog "Building with OpenSC PKCS#11 library support."
- fi
- if use external-hsm; then
- if [[ -n ${PKCS11_SCA6000} ]]; then
- PKCS11_LIB=sca6000
- PKCS11_PATH=${PKCS11_SCA6000}
- elif [[ -n ${PKCS11_ETOKEN} ]]; then
- PKCS11_LIB=etoken
- PKCS11_PATH=${PKCS11_ETOKEN}
- elif [[ -n ${PKCS11_NCIPHER} ]]; then
- PKCS11_LIB=ncipher
- PKCS11_PATH=${PKCS11_NCIPHER}
- elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
- PKCS11_LIB=aepkeyper
- PKCS11_PATH=${PKCS11_AEPKEYPER}
- else
- ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
- ewarn "library. To set a path, set one of the following environment variables:"
- ewarn " for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
- ewarn " for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
- ewarn " for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
- ewarn " for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
- ewarn "Example:"
- ewarn " PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
- ewarn "or store the variable into /etc/make.conf"
- die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
- fi
- elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
- fi
-}
-
-pkg_pretend() {
- check_pkcs11_setup
-}
-
-pkg_setup() {
- enewgroup opendnssec
- enewuser opendnssec -1 -1 -1 opendnssec
-
- # pretend does not preserve variables so we need to run this once more
- check_pkcs11_setup
-}
-
-src_prepare() {
- base_src_prepare
- eautoreconf
-}
-
-src_configure() {
- econf \
- --without-cunit \
- --localstatedir="${EPREFIX}/var/" \
- --disable-static \
- --with-database-backend=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
- --with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
- $(use_enable debug timeshift) \
- $(use_enable signer)
-}
-
-src_compile() {
- default
- use doc && emake docs
-}
-
-src_install() {
- default
-
- # remove useless .la files
- find "${ED}" -name '*.la' -delete
-
- # Remove subversion tags from config files to avoid useless config updates
- sed -i \
- -e '/<!-- \$Id:/ d' \
- "${ED}"/etc/opendnssec/* || die
-
- # install update scripts
- insinto /usr/share/opendnssec
- if use sqlite; then
- doins enforcer/utils/migrate_keyshare_sqlite3.pl
- doins enforcer/utils/migrate_adapters_1.sqlite3
- fi
- if use mysql; then
- doins enforcer/utils/migrate_keyshare_mysql.pl
- doins enforcer/utils/migrate_adapters_1.mysql
- fi
-
- # fix permissions
- fowners root:opendnssec /etc/opendnssec
- fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
- fowners opendnssec:opendnssec /var/lib/opendnssec/{,signconf,unsigned,signed,tmp}
-
- # install conf/init script
- newinitd "${FILESDIR}"/opendnssec.initd opendnssec
- newconfd "${FILESDIR}"/opendnssec.confd opendnssec
-}
-
-pkg_postinst() {
- local v
- if use softhsm; then
- elog "Please make sure that you create your softhsm database in a location writeable"
- elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
- elog "Suggested configuration is:"
- elog " echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
- elog " softhsm --init-token --slot 0 --label OpenDNSSEC"
- elog " chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
- fi
-
- for v in $REPLACING_VERSIONS; do
- case $v in
- 1.3.*)
- ewarn ""
- ewarn "You are upgrading from version 1.3."
- ewarn ""
- ewarn "Please be aware of the following:"
- ewarn " * OpenDNSSEC now supports both input and output adapters for"
- ewarn " AXFR and IXFR in addition to file transfer."
- ewarn " -> The zonefetch.xml file has been replaced by addns.xml"
- ewarn " to support this enhancement."
- ewarn " -> changes to the KASP database mean that a database"
- ewarn " migration is required to upgrade to 1.4 from earlier"
- ewarn " versions of OpenDNSSEC."
- ewarn " * The auditor is no longer supported."
- ewarn ""
- ewarn "You can find more information here:"
- ewarn " * /usr/share/doc/opendnssec*/MIGRATION*"
- ewarn " * https://wiki.opendnssec.org/display/DOCS/Migrating+zone+fetcher+to+DNS+adapters"
- ewarn " * https://wiki.opendnssec.org/display/DOCS/Migrating+from+earlier+versions+of+OpenDNSSEC"
- ewarn ""
- ;;
- esac
- done
-}
diff --git a/net-dns/opendnssec/opendnssec-1.4.7.ebuild b/net-dns/opendnssec/opendnssec-1.4.7.ebuild
new file mode 100644
index 0000000..032caea
--- /dev/null
+++ b/net-dns/opendnssec/opendnssec-1.4.7.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${P/_}"
+PKCS11_IUSE="+softhsm opensc external-hsm"
+inherit base autotools multilib user
+
+DESCRIPTION="An open-source turn-key solution for DNSSEC"
+HOMEPAGE="http://www.opendnssec.org/"
+SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc +mysql +signer sqlite test ${PKCS11_IUSE}"
+
+RDEPEND="
+ dev-lang/perl
+ dev-libs/libxml2
+ dev-libs/libxslt
+ net-libs/ldns
+ mysql? (
+ virtual/mysql
+ dev-perl/DBD-mysql
+ )
+ opensc? ( dev-libs/opensc )
+ softhsm? ( dev-libs/softhsm )
+ sqlite? (
+ dev-db/sqlite:3
+ dev-perl/DBD-SQLite
+ )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ app-text/trang
+ )
+"
+
+REQUIRED_USE="
+ ^^ ( mysql sqlite )
+ ^^ ( softhsm opensc external-hsm )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-fix-localstatedir.patch"
+ "${FILESDIR}/${PN}-fix-run-dir.patch"
+ "${FILESDIR}/${PN}-drop-privileges.patch"
+ "${FILESDIR}/${PN}-use-system-trang.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( MIGRATION NEWS )
+
+check_pkcs11_setup() {
+ # PKCS#11 HSM's are often only available with proprietary drivers not
+ # available in portage tree.
+
+ if use softhsm; then
+ PKCS11_LIB=softhsm
+ if has_version ">=dev-libs/softhsm-1.3.1"; then
+ PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
+ else
+ PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
+ fi
+ elog "Building with SoftHSM PKCS#11 library support."
+ fi
+ if use opensc; then
+ PKCS11_LIB=opensc
+ PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
+ elog "Building with OpenSC PKCS#11 library support."
+ fi
+ if use external-hsm; then
+ if [[ -n ${PKCS11_SCA6000} ]]; then
+ PKCS11_LIB=sca6000
+ PKCS11_PATH=${PKCS11_SCA6000}
+ elif [[ -n ${PKCS11_ETOKEN} ]]; then
+ PKCS11_LIB=etoken
+ PKCS11_PATH=${PKCS11_ETOKEN}
+ elif [[ -n ${PKCS11_NCIPHER} ]]; then
+ PKCS11_LIB=ncipher
+ PKCS11_PATH=${PKCS11_NCIPHER}
+ elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
+ PKCS11_LIB=aepkeyper
+ PKCS11_PATH=${PKCS11_AEPKEYPER}
+ else
+ ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
+ ewarn "library. To set a path, set one of the following environment variables:"
+ ewarn " for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
+ ewarn " for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
+ ewarn " for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
+ ewarn " for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
+ ewarn "Example:"
+ ewarn " PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
+ ewarn "or store the variable into /etc/make.conf"
+ die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
+ fi
+ elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
+ fi
+}
+
+pkg_pretend() {
+ check_pkcs11_setup
+}
+
+pkg_setup() {
+ enewgroup opendnssec
+ enewuser opendnssec -1 -1 -1 opendnssec
+
+ # pretend does not preserve variables so we need to run this once more
+ check_pkcs11_setup
+}
+
+src_prepare() {
+ base_src_prepare
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --without-cunit \
+ --localstatedir="${EPREFIX}/var/" \
+ --disable-static \
+ --with-database-backend=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
+ --with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
+ $(use_enable debug timeshift) \
+ $(use_enable signer)
+}
+
+src_compile() {
+ default
+ use doc && emake docs
+}
+
+src_install() {
+ default
+
+ # remove useless .la files
+ find "${ED}" -name '*.la' -delete
+
+ # Remove subversion tags from config files to avoid useless config updates
+ sed -i \
+ -e '/<!-- \$Id:/ d' \
+ "${ED}"/etc/opendnssec/* || die
+
+ # install update scripts
+ insinto /usr/share/opendnssec
+ if use sqlite; then
+ doins enforcer/utils/migrate_keyshare_sqlite3.pl
+ doins enforcer/utils/migrate_adapters_1.sqlite3
+ fi
+ if use mysql; then
+ doins enforcer/utils/migrate_keyshare_mysql.pl
+ doins enforcer/utils/migrate_adapters_1.mysql
+ fi
+
+ # fix permissions
+ fowners root:opendnssec /etc/opendnssec
+ fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
+ fowners opendnssec:opendnssec /var/lib/opendnssec/{,signconf,unsigned,signed,tmp}
+
+ # install conf/init script
+ newinitd "${FILESDIR}"/opendnssec.initd opendnssec
+ newconfd "${FILESDIR}"/opendnssec.confd opendnssec
+}
+
+pkg_postinst() {
+ local v
+ if use softhsm; then
+ elog "Please make sure that you create your softhsm database in a location writeable"
+ elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
+ elog "Suggested configuration is:"
+ elog " echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
+ elog " softhsm --init-token --slot 0 --label OpenDNSSEC"
+ elog " chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
+ fi
+
+ for v in $REPLACING_VERSIONS; do
+ case $v in
+ 1.3.*)
+ ewarn ""
+ ewarn "You are upgrading from version 1.3."
+ ewarn ""
+ ewarn "Please be aware of the following:"
+ ewarn " * OpenDNSSEC now supports both input and output adapters for"
+ ewarn " AXFR and IXFR in addition to file transfer."
+ ewarn " -> The zonefetch.xml file has been replaced by addns.xml"
+ ewarn " to support this enhancement."
+ ewarn " -> changes to the KASP database mean that a database"
+ ewarn " migration is required to upgrade to 1.4 from earlier"
+ ewarn " versions of OpenDNSSEC."
+ ewarn " * The auditor is no longer supported."
+ ewarn ""
+ ewarn "You can find more information here:"
+ ewarn " * /usr/share/doc/opendnssec*/MIGRATION*"
+ ewarn " * https://wiki.opendnssec.org/display/DOCS/Migrating+zone+fetcher+to+DNS+adapters"
+ ewarn " * https://wiki.opendnssec.org/display/DOCS/Migrating+from+earlier+versions+of+OpenDNSSEC"
+ ewarn ""
+ ;;
+ esac
+ done
+}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index dc729f4..5b7de2d 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -6,3 +6,4 @@
DIST pdns-3.4.2.tar.bz2 1331062 SHA256 a6ab05459a0118cb921092deee06362722c45fa69ed0166ebc3696d526014b5b SHA512 e04e0d0a9d6a10f6104a1b4e399e1b84b66aaa5561696281f85898f900bcbcbd41e49a110cddffc12e1f5043d60663ce679af91e4b76f8e1823528a5f38098ed WHIRLPOOL 84d8cd1ec0604e2dd7cb80ef8c7b0379569576e0a48541fcfa0eaaf31fc1d976129bf4d4cb0fb055940236bdcc8a791d56f78d68a94dd9a2e563f5faaeb7eb73
DIST pdns-3.4.4.tar.bz2 1336624 SHA256 ec49f5a0b55b69ba057bf9ce28ab81e5258fc60c8d4954d9100fe3bb3efd09c8 SHA512 c4567c5e09c3396af99263cbe370ffd8409a90e2583d968d7fa4760d0867ecb1696904e9ba8f6551d815b11b20b5862d789edfb599b9c5571110d3b785f2e08a WHIRLPOOL 4e744dd75a712a9928fda2d09339e7cc922ba63e8ebb11fee88d08d8e5046730d4ea23417bcc4251dc91edb3ec7aefaa480f832fc8167cc50c685435faee4256
DIST pdns-3.4.5.tar.bz2 1337222 SHA256 f3e1441532b0af05a6b5efe5346f02d0c55f252fbed62d5b4f2e4a80997c507d SHA512 cdf6496a832cff05519a02714aaab4b689541b01a83fe2415d360f8653db4e51a00b90ea86103dd535b22881420337b32ab8a33bb0d405df590cbed322b0827c WHIRLPOOL ee3287e2ac0c3d82e60daed2021b081fbb1e78a63847e98bfddef5fab5ce5ef43d6fea8ba5583a5f70ecc104b77814a7911b77b754492169c72bdbbec5ccb377
+DIST pdns-3.4.6.tar.bz2 1336760 SHA256 80a6a43cabd14db844bce84482ba56d03d46ebfbf96c88689fb3e2185ac286d8 SHA512 6ab4bef0482041d511ce0ea15e92cd12b0b331d3199c01463fa9150d04aca428c7b90fe25e53251f76a8809331cf32830240961dbf887e6b7c4e0a7fe07c8089 WHIRLPOOL a9541dce672e36b6f05f3a6c2b740f308af3c4b4ee3f96a5940f7ee5f2d9e017a9832604d29069e24f07925dd346f9f99a770779bccf35d14e7803fe34df8d46
diff --git a/net-dns/pdns/pdns-3.4.6.ebuild b/net-dns/pdns/pdns-3.4.6.ebuild
new file mode 100644
index 0000000..77d6d55
--- /dev/null
+++ b/net-dns/pdns/pdns-3.4.6.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib systemd user toolchain-funcs versionator
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="http://www.powerdns.com/"
+SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="botan cryptopp debug doc geoip ldap lua mydns mysql opendbx postgres remote sqlite static tools tinydns test"
+
+REQUIRED_USE="mydns? ( mysql )"
+
+RDEPEND="!static? (
+ net-libs/polarssl
+ >=dev-libs/boost-1.34:=
+ botan? ( =dev-libs/botan-1.10* )
+ cryptopp? ( dev-libs/crypto++ )
+ lua? ( dev-lang/lua:= )
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:= )
+ ldap? ( >=net-nds/openldap-2.0.27-r4 )
+ sqlite? ( dev-db/sqlite:3 )
+ opendbx? ( dev-db/opendbx )
+ geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip )
+ tinydns? ( >=dev-db/tinycdb-0.77 )
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ static? (
+ >=net-libs/polarssl-1.3.0[static-libs(+)]
+ >=dev-libs/boost-1.34[static-libs(+)]
+ botan? ( =dev-libs/botan-1.10*[static-libs(+)] )
+ cryptopp? ( dev-libs/crypto++[static-libs(+)] )
+ lua? ( dev-lang/lua:=[static-libs(+)] )
+ mysql? ( virtual/mysql[static-libs(+)] )
+ postgres? ( dev-db/postgresql[static-libs(+)] )
+ ldap? ( >=net-nds/openldap-2.0.27-r4[static-libs(+)] )
+ sqlite? ( dev-db/sqlite:3[static-libs(+)] )
+ opendbx? ( dev-db/opendbx[static-libs(+)] )
+ geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip[static-libs(+)] )
+ tinydns? ( >=dev-db/tinycdb-0.77 )
+ )
+ doc? ( app-doc/doxygen )"
+
+src_configure() {
+ local dynmodules="pipe geo bind" # the default backends, always enabled
+ local modules=""
+
+ #use db2 && dynmodules+=" db2"
+ use ldap && dynmodules+=" ldap"
+ use lua && dynmodules+=" lua"
+ use mydns && dynmodules+=" mydns"
+ use mysql && dynmodules+=" gmysql"
+ use opendbx && dynmodules+=" opendbx"
+ #use oracle && dynmodules+=" goracle oracle"
+ use postgres && dynmodules+=" gpgsql"
+ use remote && dynmodules+=" remote"
+ use sqlite && dynmodules+=" gsqlite3"
+ use tinydns && dynmodules+=" tinydns"
+ use geoip && dynmodules+=" geoip"
+ #use xdb && dynmodules+=" xdb"
+
+ if use static ; then
+ modules="${dynmodules}"
+ dynmodules=""
+ fi
+
+ use botan && myconf+=" --enable-botan1.10"
+ use cryptopp && myconf+=" --enable-cryptopp"
+ use debug && myconf+=" --enable-verbose-logging"
+
+ CRYPTOPP_CFLAGS=" " \
+ CRYPTOPP_LIBS="-lcrypto++" \
+ econf \
+ --with-system-polarssl \
+ --disable-static \
+ --sysconfdir=/etc/powerdns \
+ --libdir=/usr/$(get_libdir)/powerdns \
+ --with-modules="${modules}" \
+ --with-dynmodules="${dynmodules}" \
+ --with-pgsql-includes=/usr/include \
+ --with-pgsql-lib=/usr/$(get_libdir) \
+ --with-mysql-lib=/usr/$(get_libdir) \
+ $(use_enable test unit-tests) \
+ $(use_with lua) \
+ $(use_enable static static-binaries) \
+ $(use_enable tools) \
+ ${myconf}
+}
+
+src_compile() {
+ default
+ use doc && emake -C codedocs codedocs
+}
+
+src_install () {
+ default
+
+ mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+ fperms 0700 /etc/powerdns
+ fperms 0600 /etc/powerdns/pdns.conf
+
+ # set defaults: setuid=pdns, setgid=pdns
+ sed -i \
+ -e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+ "${D}"/etc/powerdns/pdns.conf
+
+ doinitd "${FILESDIR}"/pdns
+ systemd_newunit contrib/systemd-pdns.service pdns.service
+
+ keepdir /var/empty
+
+ use doc && dohtml -r codedocs/html/.
+
+ # Install development headers
+ insinto /usr/include/pdns
+ doins pdns/*.hh
+ insinto /usr/include/pdns/backends/gsql
+ doins pdns/backends/gsql/*.hh
+
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins "${FILESDIR}"/dnsdomain2.schema
+ fi
+
+ prune_libtool_files --all
+}
+
+pkg_preinst() {
+ enewgroup pdns
+ enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+ elog "PowerDNS provides multiple instances support. You can create more instances"
+ elog "by symlinking the pdns init script to another name."
+ elog
+ elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+ elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+ if use ldap ; then
+ ewarn "The official LDAP backend module is only compile-tested by upstream."
+ ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
+ fi
+
+ local fix_perms=0
+
+ for rv in ${REPLACING_VERSIONS} ; do
+ version_compare ${rv} 3.2
+ [[ $? -eq 1 ]] && fix_perms=1
+ done
+
+ if [[ $fix_perms -eq 1 ]] ; then
+ ewarn "To fix a security bug (bug #458018) had the following"
+ ewarn "files/directories the world-readable bit removed (if set):"
+ ewarn " ${EPREFIX}/etc/pdns"
+ ewarn " ${EPREFIX}/etc/pdns/pdns.conf"
+ ewarn "Check if this is correct for your setup"
+ ewarn "This is a one-time change and will not happen on subsequent updates."
+ chmod o-rwx "${EPREFIX}"/etc/pdns/{,pdns.conf}
+ fi
+
+}
diff --git a/net-firewall/arno-iptables-firewall/Manifest b/net-firewall/arno-iptables-firewall/Manifest
index fe6daf6..098487d 100644
--- a/net-firewall/arno-iptables-firewall/Manifest
+++ b/net-firewall/arno-iptables-firewall/Manifest
@@ -1,3 +1,2 @@
-DIST arno-iptables-firewall_2.0.1d.tar.gz 125329 SHA256 177343362063125985e8b0008fe69bc6ca8d3ba252cfa35a316e708f52fef9c6 SHA512 a99f4fcf4f84a47cc1bda26b39e4f3dc7e10b74f3aeaea8a2519bf18f43ff08ec0bfbd0f078ac36ce12da31d3ac0eabc51231b4559cadca13cd4d75e0940bf9d WHIRLPOOL 2dd56678015cf49ed9442c63c5455c70e72a6f252d9278a56ae1eaabda34d597c44f7fdb97695656882754776385778a5e67d83e7e35e4554e5765e3a0e68b13
DIST arno-iptables-firewall_2.0.1e.tar.gz 126238 SHA256 fa7b865e5d9b8e077cba73b2f28695a2fd691092a0a7f9e1c16ee369fc27fe43 SHA512 244b3bbf08b2d97128908aece487388bb71ced002cc129885144f4eacf9cf6053c9eb1225a1cd33fdefc502f1e6822a85710d35a7884e99cfde35d34f3fd4f70 WHIRLPOOL f6c1b5ade8b4acdcc4c8e90e19a84335c3932d2a58bbba2221a91b7cbd228c4d6072af6e21836314d86ef005780b47c5ce85198219b345116af529178e2133c1
DIST arno-iptables-firewall_2.0.1f-rc1.tar.gz 129834 SHA256 84f3e96bb85dbcad2916922d537aa0f188df59ece7ea9d9c0f669468938713e0 SHA512 cf7c2f97e74e01be48a8206be3116156740dfd2022df957651b587de1492157363249c067a778209c1e239f53c30426c32e6b1f901949c37ab2b5d690542d620 WHIRLPOOL 969e09b206cf1e132e93151461297fdb3b40ba849b4b4c9ff9e2ef8095526e4e8340b348e2bc97cfe9838b7de3f42cb1acae7c21d6261dcab5392e26ba81afc4
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1d-r2.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1d-r2.ebuild
deleted file mode 100644
index b611732..0000000
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1d-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit readme.gentoo systemd
-
-DESCRIPTION="Arno's iptables firewall script"
-HOMEPAGE="http://rocky.eld.leidenuniv.nl"
-SRC_URI="http://rocky.eld.leidenuniv.nl/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+plugins"
-
-# sys-apps/coreutils dependency wrt
-# https://bugs.gentoo.org/show_bug.cgi?id=448716
-
-DEPEND=""
-RDEPEND="net-firewall/iptables
- || ( <sys-apps/coreutils-8.20 >sys-apps/coreutils-8.20-r1 )
- sys-apps/iproute2
- plugins? ( net-dns/bind-tools )"
-
-S="${WORKDIR}/${PN}_${PV}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You will need to configure /etc/${PN}/firewall.conf
-before using this package. To start the script, run:
-
-/etc/init.d/${PN} start (for openRC)
-systemctl start ${PN} (for Systemd)
-
-If you want to start this script at boot, run:
-
-rc-update add ${PN} default (for openRC)
-systemctl enable ${PN} (for Systemd)"
-
-src_prepare() {
- sed -i -e 's:/usr/local/share/:/usr/libexec/:' \
- etc/"${PN}"/firewall.conf || die "Sed failed!"
-}
-
-src_install() {
-
- insinto /etc/"${PN}"
- doins etc/"${PN}"/firewall.conf
- doins etc/"${PN}"/custom-rules
-
- doinitd "${FILESDIR}/${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- dobin bin/arno-fwfilter
- dosbin bin/"${PN}"
-
- insinto /usr/libexec/"${PN}"
- doins share/"${PN}"/environment
-
- dodoc CHANGELOG README
- readme.gentoo_create_doc
-
- if use plugins
- then
- insinto /etc/"${PN}"/plugins
- doins etc/"${PN}"/plugins/*
-
- insinto /usr/libexec/"${PN}"/plugins
- doins share/"${PN}"/plugins/*.plugin
-
- exeinto /usr/libexec/"${PN}"/plugins
- doexe share/"${PN}"/plugins/dyndns-host-open-helper
- doexe share/"${PN}"/plugins/traffic-accounting-helper
- doexe share/"${PN}"/plugins/traffic-accounting-log-rotate
- doexe share/"${PN}"/plugins/traffic-accounting-show
-
- docinto plugins
- dodoc share/"${PN}"/plugins/*.CHANGELOG
- fi
-
- doman share/man/man1/arno-fwfilter.1 \
- share/man/man8/"${PN}".8
-}
-
-pkg_postinst () {
- ewarn "When you stop this script, all firewall rules are flushed!"
- ewarn "Make sure to not use multiple firewall scripts simultaneously"
- ewarn "unless you know what you are doing!"
- readme.gentoo_print_elog
-}
diff --git a/net-firewall/arno-iptables-firewall/files/arno-iptables-firewall.service b/net-firewall/arno-iptables-firewall/files/arno-iptables-firewall.service
deleted file mode 100644
index e663f08..0000000
--- a/net-firewall/arno-iptables-firewall/files/arno-iptables-firewall.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=A secure stateful firewall for both single and multi-homed machine
-Before=network.target
-Wants=network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/arno-iptables-firewall start
-ExecStop=/usr/sbin/arno-iptables-firewall stop
-ExecReload=/usr/sbin/arno-iptables-firewall force-reload
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/arno-iptables-firewall/files/rc.firewall_replace_opts.patch b/net-firewall/arno-iptables-firewall/files/rc.firewall_replace_opts.patch
deleted file mode 100644
index 6c271d5..0000000
--- a/net-firewall/arno-iptables-firewall/files/rc.firewall_replace_opts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Gentoo/rc.firewall 2012-11-29 08:44:13.000000000 +0100
-+++ contrib/Gentoo/rc.firewall.new 2012-12-15 18:38:12.179072084 +0100
-@@ -1,6 +1,7 @@
- #!/sbin/runscript
-
--opts="${opts} stats help reload"
-+extra_commands="stats help"
-+extra_started_commands="reload"
-
- depend() {
- before net
diff --git a/net-firewall/firehol/firehol-2.0.3.ebuild b/net-firewall/firehol/firehol-2.0.3.ebuild
index 3026dd7..182c9eb 100644
--- a/net-firewall/firehol/firehol-2.0.3.ebuild
+++ b/net-firewall/firehol/firehol-2.0.3.ebuild
@@ -44,7 +44,8 @@
--with-autosave6="${EPREFIX}/var/lib/ip6tables/rules-save" \
$(use_enable doc) \
IP6TABLES_CMD=/bin/false \
- IP6TABLES_SAVE_CMD=/bin/false
+ IP6TABLES_SAVE_CMD=/bin/false \
+ IP6TABLES_RESTORE_CMD=/bin/false
}
src_install() {
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 34fa18e..78785f2 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -1,2 +1 @@
-DIST nftables-0.4.tar.bz2 362120 SHA256 f6ca69b75c68915f9f3a3972274ec68354dfbbcfc0b9fc55c813a0525c351d3c SHA512 0932cf987da602285fbf7c7f61328b0d74d687889c2d4a5bd2bd7fe11e8b99433bc5ee53ebbddadf2c90e40acdcb28f6babf07e11feedff815c571c3b782dffc WHIRLPOOL 1604010f260247c2fd98d33ca931eb0be6f38097937983aadfbdf2eb44fd3827212d00e6e6351821ccd8a2696fc696d9e7ec102d447387f930b8fb2afadc22a8
DIST nftables-0.5.tar.gz 216740 SHA256 b48991f4e9e73b689bc254fa06b3ff3c1f937241d333291cb2ae72c0cd2398b6 SHA512 5d804ac9bb340446e52e5b0e86b726216ecc0d1eb42738cf133ba1acc5b442f720f5644005e02b9e3e8fae4e2bdc64d32560d6c6b1b26fe15bde24d62db51679 WHIRLPOOL 348d511c7ee530e6fb04b9828babad45407e4b60c443aaa8902aa9535705ff54cb78cd5e5c8ba970b57b97406b00718e94ab8a346fceaa82803bdaad84d30285
diff --git a/net-firewall/nftables/nftables-0.4.ebuild b/net-firewall/nftables/nftables-0.4.ebuild
deleted file mode 100644
index 85a0bbb..0000000
--- a/net-firewall/nftables/nftables-0.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools linux-info
-
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://netfilter.org/projects/nftables/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug +readline"
-SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-RDEPEND="net-libs/libmnl
- >=net-libs/libnftnl-1.0.2
- dev-libs/gmp
- readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
- >=app-text/docbook2X-0.8.8-r4
- sys-devel/bison
- sys-devel/flex"
-
-pkg_setup() {
- if kernel_is ge 3 13; then
- CONFIG_CHECK="~NF_TABLES"
- linux-info_pkg_setup
- else
- eerror "This package requires kernel version 3.13 or newer to work properly."
- fi
-}
-
-src_prepare() {
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- econf \
- --sbindir="${EPREFIX}"/sbin \
- $(use_enable debug) \
- $(use_with readline cli)
-}
-
-src_install() {
- default
-
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.init ${PN}
- keepdir /var/lib/nftables
-}
diff --git a/net-firewall/nftables/nftables-0.5.ebuild b/net-firewall/nftables/nftables-0.5.ebuild
index 2162672..fdefe00 100644
--- a/net-firewall/nftables/nftables-0.5.ebuild
+++ b/net-firewall/nftables/nftables-0.5.ebuild
@@ -4,16 +4,16 @@
EAPI=5
-inherit autotools linux-info
+inherit autotools linux-info eutils
DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
HOMEPAGE="http://netfilter.org/projects/nftables/"
+SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="debug gmp +readline"
-SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
RDEPEND=">=net-libs/libmnl-1.0.3
>=net-libs/libnftnl-1.0.5
diff --git a/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch b/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
index c2e2ea2..2c2067f 100644
--- a/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
+++ b/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
@@ -12,7 +12,7 @@
'systemd-ask-password' and let the shell find it.
Fixes: https://bugzilla.samba.org/show_bug.cgi?id=10054
-Signed-off-by: MichaŠGórny <mgorny@gentoo.org>
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
mount.cifs.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index 32de707..a2b3e7e 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,3 +1,4 @@
DIST tnftp-20100108.tar.gz 614438 SHA256 31d9f9ae333cdf99290c30b1f409e4fff79824cd2498464a8cade881c9b5511a SHA512 fa6dd4fc421af54004523e837bd8361dacf3d0e7862567141f4d822337d295215afae3a5df37fb4a08fc36879bb9b017eb2771bb600b0636663142a976a9651b WHIRLPOOL a62f4dd56cd7b45bb844187355466e1f77f8e41f7493be83ae6981955d164f7488d527f67f2fb986d8b344e60c173f2fde588d5dfdfd4818132ff6bccad89613
DIST tnftp-20130505.tar.gz 612475 SHA256 6f650e25f6fd51538f677b789b49379f367ae9f1dee74c94cfe24d92abc2cffb SHA512 cbae2d77a681e24d59d36c81922b122fd33eb54218bc6c132829c1b5ba2a344eef01ea30a6c09244f5b1ac8d347c2e62d30d23d4ed4def6b10848a97dfa85357 WHIRLPOOL f20803b23bc1e35676baf26da25547a4743183e36a3fe31089a4f2fec5270b869a194fd4d71ee9aa4bcbb742f9d88bd6096f85f97d4bbab9a723e141a94f4ef3
DIST tnftp-20141104.tar.gz 613180 SHA256 124e9f263c01600acb4072f936d2d0ab5120e68cd8598b86ff4b1d15c87af7b8 SHA512 e3d99215d36d27d3d841d946975c2a2723c6ca227cc7d9469f30dbc398f32bdd5c0922933dd12d9e822d7e85826a74619fb7712a6c5a97d1ee721c79d5728d55 WHIRLPOOL aa793e70f235627cf8540bbbe6decaaacee0f137fa22b23ed2fe17999fd1859449a21d392bcc5edd7fe276b673ed5eef5d70c9bf8ccc5c14bc119772bd996f0a
+DIST tnftp-20151004.tar.gz 613482 SHA256 c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0 SHA512 0702dc26c072599eebbe8731924452575eab93ab72245d4703497daa6e5e4a2c050b28278c0a20b4dbb86cee25949f216fc80a581ed73457a78c1616f484ed6e WHIRLPOOL 3bb888e9ccc2912b793a8e5e80416d8fe2f74dae4f85f53e42e416d21b5ac377807485beaf8be8e0f3c366f8ab61bc2fa7e67778e82a9ce529da34b40c39ab51
diff --git a/net-ftp/tnftp/tnftp-20151004.ebuild b/net-ftp/tnftp/tnftp-20151004.ebuild
new file mode 100644
index 0000000..8ed1dd8
--- /dev/null
+++ b/net-ftp/tnftp/tnftp-20151004.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="NetBSD FTP client with several advanced features"
+SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
+ ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/old/${P}.tar.gz"
+HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
+
+SLOT="0"
+LICENSE="BSD-4 BSD ISC"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 socks5"
+
+DEPEND=">=sys-libs/ncurses-5.1
+ socks5? ( net-proxy/dante )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf \
+ --enable-editcomplete \
+ $(use_enable ipv6) \
+ $(use_with socks5 socks) \
+ || die "econf failed"
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die "emake install failed"
+ dodoc ChangeLog README THANKS || die "dodoc failed"
+}
diff --git a/net-im/corebird/Manifest b/net-im/corebird/Manifest
index f4ffd33..40ca2b4 100644
--- a/net-im/corebird/Manifest
+++ b/net-im/corebird/Manifest
@@ -1,2 +1,3 @@
DIST corebird-0.8.tar.gz 1655839 SHA256 4e68e174edc40b49d70a11c1b0a1b196ca9517daa8eae6ce2da3e8004acda611 SHA512 308bc0ade8ddda0b0be0949e5199bf6ac1b3658bf6e181821a205a602b2a22a97e77583cd5ca63ba272926810095104ae4117e54ccda10234d143c3377b9384d WHIRLPOOL 2e014590c0d9222a6a53d78d855ff9017fa9b3c68c2c354bc2acad1b028bd6253fa9510fbc5ce391bc65319829e14c5447b4be4cbcc8427faace790767e6d98c
DIST corebird-1.0.tar.gz 1697452 SHA256 0ca4ca20b0281b2901382810ef8bd1682bb896c3915ad3bea3f2a41461118001 SHA512 098dd764a3aecaeda90ad5b0e24a4bf172025ce1a4105b713a1a73385d1de9cca028d7a34a39e9682ad4e2b2b22d4bf2889668c587e363cdfa6053136b1f4c39 WHIRLPOOL e033988b94632ad6b8d4e8c79a6125311466e81d746dd434801451f71e4590558b1797e8690ff033c1c04aeb4a299191993421a64e9d3a925409cda663478ab8
+DIST corebird-1.1.tar.gz 1757414 SHA256 f6109cc2bdc7ee5893c28861a73df4eeaec4b76b99222a90aec381b03b19c8a7 SHA512 b753a22ea9f597cb44df367852c27c94972f8747dfc3541826745c29a44c7b25237d40a7927b2be6002651efdd63f5e4bb6bd2b51edf6b66c3a436963be814bc WHIRLPOOL f01ee9e6452dc4f84f93c73c571033c64a4affdfb67c185e45cf1908101966075d2d310575ebfd8e340ba4fc10a8070af869b54b071a4ed6d95fc60cdb387144
diff --git a/net-im/corebird/corebird-1.1.ebuild b/net-im/corebird/corebird-1.1.ebuild
new file mode 100644
index 0000000..ee14180
--- /dev/null
+++ b/net-im/corebird/corebird-1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+VALA_MIN_API_VERSION=0.26
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils gnome2 vala
+
+DESCRIPTION="Native GTK+3 Twitter client"
+HOMEPAGE="http://corebird.baedert.org/"
+SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gstreamer"
+
+RDEPEND="
+ dev-db/sqlite:3
+ >=dev-libs/glib-2.44:2
+ dev-libs/json-glib
+ dev-libs/libgee:0.8
+ gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] )
+ >=net-libs/libsoup-2.42.3.1
+ >=net-libs/rest-0.7.93:0.7
+ >=x11-libs/gtk+-3.16:3
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ >=dev-util/intltool-0.40
+ sys-apps/sed
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
+ autotools-utils_src_prepare
+ gnome2_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(usex gstreamer "" --disable-video)
+ )
+ gnome2_src_configure "${myeconfargs[@]}"
+}
diff --git a/net-im/dianara/dianara-1.3.1-r1.ebuild b/net-im/dianara/dianara-1.3.1-r1.ebuild
new file mode 100644
index 0000000..37dad4c
--- /dev/null
+++ b/net-im/dianara/dianara-1.3.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils gnome2-utils qmake-utils
+
+MY_P=${PN}-v${PV/_beta/beta}
+DESCRIPTION="Qt-based client for the pump.io distributed social network"
+HOMEPAGE="http://dianara.nongnu.org/"
+SRC_URI="mirror://nongnu/dianara/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=app-crypt/qca-2.1.0.3:2[openssl,qt4]
+ dev-libs/qjson
+ dev-libs/qoauth
+ dev-qt/qtcore:4[ssl]
+ dev-qt/qtdbus:4
+ dev-qt/qtgui:4
+ sys-apps/file"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ eqmake4
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ doman manual/*
+ dodoc README TODO CHANGELOG BUGS
+ doicon -s 32 icon/32x32/${PN}.png
+ doicon -s 64 icon/64x64/${PN}.png
+ domenu ${PN}.desktop
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/net-im/dianara/dianara-1.3.1.ebuild b/net-im/dianara/dianara-1.3.1.ebuild
deleted file mode 100644
index 9ff4e3d..0000000
--- a/net-im/dianara/dianara-1.3.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils gnome2-utils qmake-utils
-
-MY_P=${PN}-v${PV/_beta/beta}
-DESCRIPTION="Qt-based client for the pump.io distributed social network"
-HOMEPAGE="http://dianara.nongnu.org/"
-SRC_URI="mirror://nongnu/dianara/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=app-crypt/qca-2.1.0.3:2[qt4]
- dev-libs/qjson
- dev-libs/qoauth
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- sys-apps/file"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- eqmake4
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- doman manual/*
- dodoc README TODO CHANGELOG BUGS
- doicon -s 32 icon/32x32/${PN}.png
- doicon -s 64 icon/64x64/${PN}.png
- domenu ${PN}.desktop
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/net-im/gajim/gajim-0.16.4.ebuild b/net-im/gajim/gajim-0.16.4.ebuild
index 3493262..3ba671c 100644
--- a/net-im/gajim/gajim-0.16.4.ebuild
+++ b/net-im/gajim/gajim-0.16.4.ebuild
@@ -22,7 +22,7 @@
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
REQUIRED_USE="
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 266581a..edd5f48 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,5 +1,3 @@
-DIST psi-0.14.tar.bz2 2168801 SHA256 aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0 SHA512 c68e5384afa1a40f1eb5622aa73dd9b1a7902d77b49cad26ac65bf495d688aff17376a738a98e3ff48d3d154abb3a20aad170b95e35bebd1d4e360268746ab3d WHIRLPOOL 95c577c295fad5e4cd54717c34ea2269156be82c480931cce1f140853eaa24be9bf9635d7c192b5da62acc85c145bb61980e00433466a42481ce9a0c3ce8d4da
-DIST psi-0.14_langpack_for_packagers_2009-12-02.zip 2553616 SHA256 27e5cec1847454c9ac3726122b204d923e87c11e1e37e8960c49c17fd4d74dc2 SHA512 5700534afc8f32843c5c56a678aff710edb6619ae4c6c92763c70553221e0078b881f25aa47a6752cfa58582fe617e797bdff32db3071b91521a5ce7f70bdbc9 WHIRLPOOL 79703d1e8a053ab9c0dd09088b26d4adee85d50d69436bff66475860b2bccda675ec5924b22b074fcebaee7cd56a58966a94e9a59f8468015f967eb701bb858a
DIST psi-0.15.tar.bz2 1984777 SHA256 593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6 SHA512 17e972adc8dfc541977e3717c21eb694f4e1268e4719e97432f260682867290d7034b98a345b6efd73026f98a425493e9159fef9c0e0af4c83b02e07d29a704a WHIRLPOOL 6a8953fe22342dca7347af78da3ea80d5a61a14caa6d62d6910b81730b07b76f156d8d5e1331b2a96dabe5a261353da7af565d999bc7246c25d0d88e010fd983
DIST psi-0.15_be.qm 255759 SHA256 0e9dbd9e4e738c8fcdd098dde4a17042600b35346a26d2176caa85f6253b6eb6 SHA512 90d623abe9f031af83185fc76d35d5ac390cd726490c6722bdf9ea5b1a6e0179aca650c230280a6390cc121d0e18cb9e2bd1bfd75d9e817eb4e8584d844ed3ad WHIRLPOOL f9d531127f861e5a07659f71433a12cd1d8ad6b805efb83e2d94d219c1e718a28f1390d7025122cdc94d563de99f8f245f4c8ab0297f622ad5712cc6eb4b9667
DIST psi-0.15_cs.qm 242386 SHA256 d579a7059466c11d4264d8197188a9be49b82e2af35405053ea772c0edea6718 SHA512 46eb273794a99045702f52e10aae2122dfd3db5a49bf68b27e36bf8a1443d8dfbdbcdf550dd0ac3e3ff3014e52010682880f7e883f0d1a0d41d8a678d1e16f2f WHIRLPOOL d2ae4a6045ea1072045032a726927439fe57ae8dfad813f718dd230b36a794945e0600ad1a55f0ac74d73a0d0be4ccf9ffecc5ec9e289ccef5d28566535fbe31
@@ -14,5 +12,3 @@
DIST psi-0.15_sv.qm 246214 SHA256 fc5822011ada2b7452c9d15baf74c90e1a58e05536e9a7cc1d81e163f44d3ca2 SHA512 b8dd5e7692512af5ec302b5fee562feb68292988160d1c9e4fac951562bd8b30bc1f67f4d39bbd437eee84b14f6aefd83a8666f0e77d02b539d65e89aee7c1aa WHIRLPOOL 6078437c20881babb731d8915952b40d415e5cc01ab7431be1930fbe887289988abc7ef9a76e09254ad8519146bd94633eba69872bee7cdb504dfc3237f1c1d0
DIST psi-0.15_ur_PK.qm 244903 SHA256 0101370007c9ce735c50dd9bf6dfd8680c5cd562a3213b960ee507367582b3e6 SHA512 df0786f1b625ecc3144bb9be0ce51558ae45901213405997b5f8ea3c791c64328b049a48a1b88372f7b0cb5bde3b795b306ad16847d91933eedc233f8dea8bc2 WHIRLPOOL 3dc2f807d5e1dce36609854e9360d9521a7fe36d61161a2c0cf195bf58e21a4efa9b8d977a6503f41588d8befb06ca678e6e629168c93f0ab90f0ec42ffe98a5
DIST psi-0.15_zh_TW.qm 171993 SHA256 a68897a3fe5653b4ea9651a7dc05486aadc9327fcfa96ceae84a6cfbeed4187a SHA512 69b20e18f346af244f7cfd2bc447fcb934786f7ff3d85a16ac471e275c78fb36cfb2008368d81413dbfc6ed5bd4edba3c1ab8185dae72b8aeb9bfa29fde9c871 WHIRLPOOL 2dd1e8e724007248128d69ec9389014d482d38b64df3dbcb1a17c90b94d193d793b17769d78cd36fd15d8409f1eac44eca4a2d7739d885316754df5b557a7344
-DIST psi-extra-iconsets-r1428.tar.bz2 3214991 SHA256 1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c SHA512 b6a74fc9b043800040c519504b14bcb5f44864b9115ea167b235a791bafc17c96986ffaf5b6f9ebe4dd3b467b8e472e7c9bf253893e59581a29ad2342b122bfc WHIRLPOOL a030ca57a5f11f46d17a19d8b2f109d043e6b4eed20fbdf406dd71b647a8bb923ecf24f1ed3f2197cdcaf9637b67fd39d52fd7ef6a174a4fc352cc5008da5759
-DIST psi-extra-patches-r1428.tar.bz2 131700 SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48 SHA512 6fe55bb5c97e672c05eb125defa590cce9575be339a7366d49c2c50aff19fc7d9a5dcf7feece4781e88cd3504c8e959a637c1a4a3e571d52c42e63edc0f60a78 WHIRLPOOL 9e70a07eb8fef72606e28ae2151003aebba724f86b29f9c46f3850a77b1647d9ce5746576c3e41f79b885b162b9889f233f77c2c5766103f5add6d5bc8088b40
diff --git a/net-im/psi/files/psi-0.14-input-validation.patch b/net-im/psi/files/psi-0.14-input-validation.patch
deleted file mode 100644
index 7260c80..0000000
--- a/net-im/psi/files/psi-0.14-input-validation.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-commit c68fdd9926a38b2820bc5df97fd1905355a2640d
-Author: rion <rion4ik@gmail.com>
-Date: Fri Oct 7 22:19:05 2011 +0600
-
- Fixed QLabel CVE
-
---- src/Certificates/CertificateDisplay.ui 2011-10-19 08:30:15 +0000
-+++ src/Certificates/CertificateDisplay.ui 2011-10-19 08:31:23 +0000
-@@ -1,105 +1,118 @@
--<ui version="4.0" >
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
- <class>CertificateDisplay</class>
-- <widget class="QDialog" name="CertificateDisplay" >
-- <property name="geometry" >
-+ <widget class="QDialog" name="CertificateDisplay">
-+ <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>518</width>
-+ <width>525</width>
- <height>369</height>
- </rect>
- </property>
-- <property name="windowTitle" >
-+ <property name="windowTitle">
- <string>Certificate Information</string>
- </property>
-- <layout class="QVBoxLayout" >
-- <property name="margin" >
-+ <layout class="QVBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>11</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
-- <layout class="QHBoxLayout" >
-- <property name="margin" >
-+ <layout class="QHBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>0</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
-- <layout class="QVBoxLayout" >
-- <property name="margin" >
-+ <layout class="QVBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>0</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
-- <widget class="QLabel" name="textLabel4" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel4">
-+ <property name="text">
- <string>Certificate Validation:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_valid" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_valid">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="textLabel2" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel2">
-+ <property name="text">
- <string>Valid From:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_notBefore" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_notBefore">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="textLabel3" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel3">
-+ <property name="text">
- <string>Valid Until:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_notAfter" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_notAfter">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="textLabel1" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel1">
-+ <property name="text">
- <string>Serial Number:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_sn" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_sn">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
- <spacer>
-- <property name="orientation" >
-+ <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
-- <property name="sizeType" >
-+ <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
-- <property name="sizeHint" >
-+ <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>106</height>
-@@ -110,14 +123,14 @@
- </layout>
- </item>
- <item>
-- <widget class="QTextBrowser" name="tb_cert" >
-- <property name="minimumSize" >
-+ <widget class="QTextBrowser" name="tb_cert">
-+ <property name="minimumSize">
- <size>
- <width>350</width>
- <height>300</height>
- </size>
- </property>
-- <property name="horizontalScrollBarPolicy" >
-+ <property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAlwaysOff</enum>
- </property>
- </widget>
-@@ -125,35 +138,35 @@
- </layout>
- </item>
- <item>
-- <widget class="Line" name="line1" >
-- <property name="frameShape" >
-+ <widget class="Line" name="line1">
-+ <property name="frameShape">
- <enum>QFrame::HLine</enum>
- </property>
-- <property name="frameShadow" >
-+ <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
-- <property name="orientation" >
-+ <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item>
-- <layout class="QHBoxLayout" >
-- <property name="margin" >
-+ <layout class="QHBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>0</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
- <spacer>
-- <property name="orientation" >
-+ <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
-- <property name="sizeType" >
-+ <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
-- <property name="sizeHint" >
-+ <property name="sizeHint" stdset="0">
- <size>
- <width>421</width>
- <height>20</height>
-@@ -162,17 +175,17 @@
- </spacer>
- </item>
- <item>
-- <widget class="QPushButton" native="1" name="pb_close">
-- <property name="text">
-- <string>Close</string>
-- </property>
-- </widget>
-+ <widget class="QPushButton" name="pb_close">
-+ <property name="text">
-+ <string>Close</string>
-+ </property>
-+ </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
-- <layoutdefault spacing="6" margin="11" />
-+ <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
- <tabstop>tb_cert</tabstop>
-
diff --git a/net-im/psi/files/psi-0.14-minizip-detection.patch b/net-im/psi/files/psi-0.14-minizip-detection.patch
deleted file mode 100644
index 1eff6da..0000000
--- a/net-im/psi/files/psi-0.14-minizip-detection.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-=== modified file 'conf_windows.pri'
---- conf_windows.pri 2011-10-25 10:03:42 +0000
-+++ conf_windows.pri 2011-10-25 10:04:13 +0000
-@@ -5,7 +5,7 @@
- #CONFIG += qca-static
-
- # tell iris to use our internal libz
--CONFIG += psi-zip
-+CONFIG += psi-winzlib
-
- # OpenSSL
- qca-static {
-
-=== modified file 'configure'
---- configure 2011-10-25 10:03:42 +0000
-+++ configure 2011-10-25 10:04:13 +0000
-@@ -955,41 +955,68 @@
- {
- #ifdef Q_OS_WIN
- // HACK: on windows, always use psi's bundled zlib
-- conf->addExtra("CONFIG += psi-zip");
-+ conf->addExtra("CONFIG += psi-winzlib psi-minizip");
- return true;
- #else
-- QString inc, lib;
-+ QStringList incs;
-+ QString version, libs, other;
- QString s;
-
-- s = conf->getenv("QC_WITH_ZLIB_INC");
-- if(!s.isEmpty()) {
-- if(!conf->checkHeader(s, "zlib.h"))
-- return false;
-- inc = s;
-- }
-- else {
-- if(!conf->findHeader("zlib.h", QStringList(), &s))
-- return false;
-- inc = s;
-- }
--
-- s = conf->getenv("QC_WITH_ZLIB_LIB");
-- if(!s.isEmpty()) {
-- if(!conf->checkLibrary(s, "z"))
-- return false;
-- lib = s;
-- }
-- else {
-- if(!conf->findLibrary("z", &s))
-- return false;
-- lib = s;
-- }
--
-- if(!inc.isEmpty())
-+ if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) {
-+
-+ s = conf->getenv("QC_WITH_ZLIB_INC");
-+ if(!s.isEmpty()) {
-+ if(!conf->checkHeader(s, "zlib.h"))
-+ return false;
-+ }
-+ else {
-+ if(!conf->findHeader("zlib.h", QStringList(), &s))
-+ return false;
-+ }
-+ incs.append(s);
-+
-+ s = conf->getenv("QC_WITH_ZLIB_LIB");
-+ if(!s.isEmpty()) {
-+ if(!conf->checkLibrary(s, "z"))
-+ return false;
-+ }
-+ else {
-+ if(!conf->findLibrary("z", &s))
-+ return false;
-+ }
-+ libs = QString("-L%1 -lz").arg(s);
-+ }
-+
-+ foreach(const QString &inc, incs) {
- conf->addIncludePath(inc);
-- if(!lib.isEmpty())
-- conf->addLib(QString("-L") + s);
-- conf->addLib("-lz");
-+ }
-+ conf->addLib(libs);
-+
-+ incs.clear();
-+ libs.clear();
-+ if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) {
-+
-+ s = conf->getenv("QC_WITH_MINIZIP_INC");
-+ if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) ||
-+ (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) {
-+ incs.append(s);
-+ }
-+
-+ s = conf->getenv("QC_WITH_MINIZIP_LIB");
-+ if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) ||
-+ (s.isEmpty() && conf->findLibrary("minizip", &s))) {
-+ libs = QString("-L%1 -lminizip").arg(s);
-+ }
-+ }
-+
-+ if (!incs.isEmpty() && !libs.isEmpty()) {
-+ foreach(const QString &inc, incs) {
-+ conf->addIncludePath(inc);
-+ }
-+ conf->addLib(libs);
-+ } else {
-+ conf->addExtra("CONFIG += psi-minizip");
-+ }
-
- return true;
- #endif
-
-=== modified file 'qcm/zlib.qcm'
---- qcm/zlib.qcm 2011-10-25 10:03:42 +0000
-+++ qcm/zlib.qcm 2011-10-25 10:04:13 +0000
-@@ -26,41 +26,68 @@
- {
- #ifdef Q_OS_WIN
- // HACK: on windows, always use psi's bundled zlib
-- conf->addExtra("CONFIG += psi-zip");
-+ conf->addExtra("CONFIG += psi-winzlib psi-minizip");
- return true;
- #else
-- QString inc, lib;
-+ QStringList incs;
-+ QString version, libs, other;
- QString s;
-
-- s = conf->getenv("QC_WITH_ZLIB_INC");
-- if(!s.isEmpty()) {
-- if(!conf->checkHeader(s, "zlib.h"))
-- return false;
-- inc = s;
-- }
-- else {
-- if(!conf->findHeader("zlib.h", QStringList(), &s))
-- return false;
-- inc = s;
-- }
--
-- s = conf->getenv("QC_WITH_ZLIB_LIB");
-- if(!s.isEmpty()) {
-- if(!conf->checkLibrary(s, "z"))
-- return false;
-- lib = s;
-- }
-- else {
-- if(!conf->findLibrary("z", &s))
-- return false;
-- lib = s;
-- }
--
-- if(!inc.isEmpty())
-+ if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) {
-+
-+ s = conf->getenv("QC_WITH_ZLIB_INC");
-+ if(!s.isEmpty()) {
-+ if(!conf->checkHeader(s, "zlib.h"))
-+ return false;
-+ }
-+ else {
-+ if(!conf->findHeader("zlib.h", QStringList(), &s))
-+ return false;
-+ }
-+ incs.append(s);
-+
-+ s = conf->getenv("QC_WITH_ZLIB_LIB");
-+ if(!s.isEmpty()) {
-+ if(!conf->checkLibrary(s, "z"))
-+ return false;
-+ }
-+ else {
-+ if(!conf->findLibrary("z", &s))
-+ return false;
-+ }
-+ libs = QString("-L%1 -lz").arg(s);
-+ }
-+
-+ foreach(const QString &inc, incs) {
- conf->addIncludePath(inc);
-- if(!lib.isEmpty())
-- conf->addLib(QString("-L") + s);
-- conf->addLib("-lz");
-+ }
-+ conf->addLib(libs);
-+
-+ incs.clear();
-+ libs.clear();
-+ if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) {
-+
-+ s = conf->getenv("QC_WITH_MINIZIP_INC");
-+ if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) ||
-+ (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) {
-+ incs.append(s);
-+ }
-+
-+ s = conf->getenv("QC_WITH_MINIZIP_LIB");
-+ if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) ||
-+ (s.isEmpty() && conf->findLibrary("minizip", &s))) {
-+ libs = QString("-L%1 -lminizip").arg(s);
-+ }
-+ }
-+
-+ if (!incs.isEmpty() && !libs.isEmpty()) {
-+ foreach(const QString &inc, incs) {
-+ conf->addIncludePath(inc);
-+ }
-+ conf->addLib(libs);
-+ } else {
-+ conf->addExtra("CONFIG += psi-minizip");
-+ }
-
- return true;
- #endif
-
-=== modified file 'src/conf_iris.pri'
---- src/conf_iris.pri 2011-10-25 10:03:42 +0000
-+++ src/conf_iris.pri 2011-10-25 10:04:13 +0000
-@@ -13,11 +13,6 @@
- CONFIG += crypto
- }
-
--# use zlib from psi if necessary
--psi-zip {
-- INCLUDEPATH += $$PWD/libpsi/tools/zip/minizip/win32
--}
--
- mac {
- # Universal binaries
- qc_universal:contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {
-
-=== modified file 'src/libpsi/tools/zip/zip.cpp'
---- src/libpsi/tools/zip/zip.cpp 2011-10-25 10:03:42 +0000
-+++ src/libpsi/tools/zip/zip.cpp 2011-10-25 10:04:13 +0000
-@@ -22,7 +22,11 @@
- #include <QStringList>
- #include <QFile>
-
-+#ifdef PSIMINIZIP
- #include "minizip/unzip.h"
-+#else
-+#include <minizip/unzip.h>
-+#endif
- #include "zip.h"
-
- class UnZipPrivate
-
-=== modified file 'src/libpsi/tools/zip/zip.pri'
---- src/libpsi/tools/zip/zip.pri 2011-10-25 10:03:42 +0000
-+++ src/libpsi/tools/zip/zip.pri 2011-10-25 10:04:13 +0000
-@@ -2,17 +2,20 @@
- $$PWD/zip.h
-
- SOURCES += \
-- $$PWD/zip.cpp \
-- $$PWD/minizip/unzip.c
--
--INCLUDEPATH += $$PWD
--DEPENDPATH += $$PWD
--
--win32: {
-+ $$PWD/zip.cpp
-+
-+psi-minizip {
-+ SOURCES += $$PWD/minizip/unzip.c
-+ DEFINES += PSIMINIZIP
-+ INCLUDEPATH += $$PWD
-+ DEPENDPATH += $$PWD
-+}
-+
-+psi-winzlib {
- INCLUDEPATH += $$PWD/minizip/win32
- DEPENDPATH += $$PWD/minizip/win32
- LIBS += $$PWD/minizip/win32/libz.a
- }
--mac: {
-+mac {
- QMAKE_LFLAGS += -lz
- }
-
diff --git a/net-im/psi/files/psi-0.14-qt-compat.patch b/net-im/psi/files/psi-0.14-qt-compat.patch
deleted file mode 100644
index 99fa307..0000000
--- a/net-im/psi/files/psi-0.14-qt-compat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit ec91add0e6398ad20c7a8f14a1a08c5e3282c5bd
-Author: Michail Pishchagin <mblsha@users.sourceforge.net>
-Date: Tue Oct 19 11:26:31 2010 +0400
-
- Fix crash in MUCAffiliationsModel on Qt 4.7 (closes #1087)
- Based on 1610-psi-fix-crash-in-muc-configurator.diff from Psi+
-
-diff --git a/src/mucaffiliationsmodel.cpp b/src/mucaffiliationsmodel.cpp
-index 722b762..fd0a830 100644
---- a/src/mucaffiliationsmodel.cpp
-+++ b/src/mucaffiliationsmodel.cpp
-@@ -150,15 +150,18 @@ void MUCAffiliationsModel::resetAffiliationLists()
-
- void MUCAffiliationsModel::resetAffiliationList(MUCItem::Affiliation a)
- {
-+ emit layoutAboutToBeChanged();
- enabled_[(AffiliationListIndex) affiliationToIndex(a)] = false;
- QModelIndex index = affiliationListIndex(a);
- if (hasChildren(index)) {
- removeRows(0,rowCount(index),index);
- }
-+ emit layoutChanged();
- }
-
- void MUCAffiliationsModel::setAffiliationListEnabled(MUCItem::Affiliation a, bool b)
- {
-+ emit layoutAboutToBeChanged();
- QModelIndex index = affiliationListIndex(a);
- enabled_[(AffiliationListIndex) index.row()] = b;
- emit layoutChanged();
-@@ -208,6 +211,9 @@ void MUCAffiliationsModel::addItems(const QList<MUCItem>& items)
- foreach(MUCItem item, items) {
- QModelIndex list = affiliationListIndex(item.affiliation());
- if (list.isValid() && !item.jid().isEmpty()) {
-+ if (!dirty) {
-+ emit layoutAboutToBeChanged();
-+ }
- int row = rowCount(list);
- if (row == 0) {
- enabled_[(AffiliationListIndex) list.row()] = true;
diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild
deleted file mode 100644
index fe68d9c..0000000
--- a/net-im/psi/psi-0.14-r4.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils qt4-r2 multilib
-
-MY_P="${P/_rc/-rc}"
-
-DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
-HOMEPAGE="http://psi-im.org/"
-# Langpack:
-# http://lists.affinix.com/pipermail/psi-devel-affinix.com/2009-August/008798.html
-# Later found his site: http://fs.scs-tsa.de/psi_l10n/
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
- http://fs.scs-tsa.de/psi_l10n/psi-0.14_langpack_for_packagers_2009-12-02.zip
- extras? ( mirror://gentoo/${PN}-extra-patches-r1428.tar.bz2
- mirror://gentoo/${PN}-extra-iconsets-r1428.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
-IUSE="crypt dbus debug doc extras jingle spell ssl xscreensaver webkit"
-RESTRICT="test"
-
-LANGS="be cs de fr it ja pl pt_BR ru sl sv ur_PK zh_TW"
-for LNG in ${LANGS}; do
- IUSE="${IUSE} linguas_${LNG}"
- #SRC_URI="${SRC_URI} http://psi-im.org/download/lang/psi_${LNG/ur_PK/ur_pk}.qm"
-done
-
-RDEPEND="
- app-arch/unzip
- =app-crypt/qca-2.0*[qt4(+)]
- dev-qt/qt3support:4
- dev-qt/qtcore:4
- dev-qt/qtgui:4[qt3support]
- >=sys-libs/zlib-1.2.5.1-r2[minizip]
- dbus? ( dev-qt/qtdbus:4 )
- extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
- spell? ( >=app-text/enchant-1.3.0 )
- xscreensaver? ( x11-libs/libXScrnSaver )
-"
-DEPEND="${RDEPEND}
- sys-devel/qconf
- doc? ( app-doc/doxygen )
-"
-PDEPEND="
- crypt? ( app-crypt/qca:2[gpg] )
- jingle? (
- net-im/psimedia
- app-crypt/qca:2[openssl]
- )
- ssl? ( app-crypt/qca:2[openssl] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}/psi-0.14-qt-compat.patch"
- epatch "${FILESDIR}/psi-0.14-minizip-detection.patch"
- epatch "${FILESDIR}/psi-0.14-input-validation.patch"
- epatch "${FILESDIR}/psi-0.14-drop-debug-cflags.patch"
- sed -i '/#include <errno.h>/a #include <unistd.h>' \
- iris/src/irisnet/corelib/netinterface_unix.cpp || die 'sed failed'
-
- if use extras; then
- # some patches from psi+ project https://code.google.com/p/psi-dev
- ewarn "You're about to build heavily patched version of Psi called Psi+."
- ewarn "It has really nice features but still is under heavy development."
- ewarn "Take a look at homepage for more info: https://code.google.com/p/psi-dev"
- ewarn "If you wish to disable some patches just put"
- ewarn "MY_EPATCH_EXCLUDE=\"list of patches\""
- ewarn "into /etc/portage/env/${CATEGORY}/${PN} file."
- ewarn
- ewarn "Note: some patches depend on other. So if you disabled some patch"
- ewarn "and other started to fail to apply, you'll have to disable patches"
- ewarn "that fail too."
-
- EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE}
- 005-less-includes.diff
- 755-psiplus-fix-application-info-defines.diff
- 9999-psiplus-application-info.diff" \
- EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
- sed -e 's/\(^#define PROG_CAPS_NODE \).*/\1"http:\/\/psi-dev.googlecode.com\/caps";/' \
- -e 's:\(^#define PROG_NAME "Psi\):\1+:' \
- -i src/applicationinfo.cpp || die
- else
- if use webkit; then
- ewarn "Webkit support disabled as it is only available in Psi+"
- ewarn "(USE='extras' enabled)."
- fi
- fi
-
- qconf || die "Failed to create ./configure."
- rm -rf third-party/qca || die # We use system libraries.
-}
-
-src_configure() {
- # unable to use econf because of non-standard configure script
- # disable growl as it is a MacOS X extension only
- local confcmd="./configure
- --prefix=/usr
- --qtdir=/usr
- --disable-bundled-qca
- --disable-growl
- $(use dbus || echo '--disable-qdbus')
- $(use debug && echo '--debug')
- $(use spell || echo '--disable-aspell')
- $(use spell || echo '--disable-enchant')
- $(use xscreensaver || echo '--disable-xss')
- $(use extras && { use webkit && echo '--enable-qtwebkit';} )"
-
- echo ${confcmd}
- ${confcmd} || die "configure failed"
- # Makefile is not always created...
- [[ ! -f Makefile ]] && die "configure failed"
-}
-
-src_compile() {
- eqmake4
-
- emake
-
- if use doc; then
- cd doc || die
- mkdir -p api || die # 259632
- emake api_public
- fi
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- rm "${D}"/usr/share/psi/{COPYING,README} || die
-
- # this way the docs will be installed in the standard gentoo dir
- newdoc iconsets/roster/README README.roster
- newdoc iconsets/system/README README.system
- newdoc certs/README README.certs
- dodoc README
-
- if use doc; then
- cd doc || die
- dohtml -r api
- fi
-
- # install translations
- cd "${WORKDIR}" || die
- insinto /usr/share/${PN}/
- local nolangs=true
- for LNG in ${LANGS}; do
- if use linguas_${LNG}; then
- doins ${LNG}/${PN}_${LNG}.qm
- newins ${LNG}/INFO INFO.${LNG}
- nolangs=false
- fi
- done
-
- # if linguas is empty install all translations
- if ${nolangs}; then
- for LNG in ${LANGS}; do
- doins ${LNG}/${PN}_${LNG}.qm
- newins ${LNG}/INFO INFO.${LNG}
- done
- fi
-
- if use extras; then
- cp -a "${WORKDIR}"/iconsets/* "${D}"/usr/share/${PN}/iconsets/ || die
- fi
-}
diff --git a/net-libs/czmq/czmq-3.0.2.ebuild b/net-libs/czmq/czmq-3.0.2.ebuild
index c69664d..b0d1819 100644
--- a/net-libs/czmq/czmq-3.0.2.ebuild
+++ b/net-libs/czmq/czmq-3.0.2.ebuild
@@ -45,6 +45,7 @@
src_install() {
autotools-utils_src_install
mv "${ED}"/usr/bin/makecert{,-czmq} || die
+ mv "${ED}"/usr/share/man/man1/makecert{,-cmzq}.1 || die
}
pkg_postinst() {
diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest
index 712f396..89c04f1 100644
--- a/net-libs/enet/Manifest
+++ b/net-libs/enet/Manifest
@@ -1,3 +1,3 @@
DIST enet-1.2.2.tar.gz 413454 SHA256 6ce4e183ebfe980201b39174ad952993dbd8e8a7c325903fd520074ac7c2e20f SHA512 2c28ab4b650dd4165ee5913c1bc80dc47e43f2363a5fdd7f3aa9be8fb3afbc8aff7a6bce731f7dac45eb930fc6338cd811c07e8dedca5554a7dd32293685062d WHIRLPOOL f63da36d2cc5c1dc15f0f88234620536c300c64906c1e9f3bfddcd6cf70aa81bd37b653c34dd0d25baae4022addcd17b9b9f4863f7899e1630fc22f08c095fcd
-DIST enet-1.3.12.tar.gz 550604 SHA256 a5851cbd0dde2ddb47bca487a61976825159cb508ece3b1e34605420ac7e1d0b SHA512 cd41f807dedd2a2d2e55ef9094d210a5dcc1df8f6371c7d974414eecec91b59d094dfb0ea5ac091875466a9c95141f340f82da2143698df8c95f787fffe04ee3 WHIRLPOOL fdf709830e272a0aa0ca35c28092cc65dd52e1d5870d185c863b90fb81e2bda99863886ef559098188cf0b5abffb02a4e01c7ad495995f6a9e14862719f1c5eb
+DIST enet-1.3.13.tar.gz 669090 SHA256 e36072021faa28731b08c15b1c3b5b91b911baf5f6abcc7fe4a6d425abada35c SHA512 82501c0248330a3a6bcac907907760e59b18cb662ebb42fe2c91e1557f1bc8ab452bf3fe7477dc01fa7a6e3b6124e1eb8eac46382d5bbebb2394879f9568b5df WHIRLPOOL ede7f9f331d34b8469af360d9e54b7c543d6fec0e5672943b2da3ce48a33c12e4fcb4a48b800b5bea6ec2e204b82503dbae404bb1f327e60bc7319309585fe3a
DIST enet-1.3.7.tar.gz 522150 SHA256 15acbfd8e3aaf353320a60c785093cdf34f2ae207bcdd489503ca3f37659fe15 SHA512 b715347d94d8c5361033002e366f2cd7b8dd263faf7e84bd3d120de770f85025749fed4325c08f12d27875a112fb534a0464f8776bea6c3df2f048b57e5623f0 WHIRLPOOL 2ed39a5669ba74e11a08b70a5518a5314b43dad7629132f7e75f10445bea6491bdf27cd6ca34f9434a65fee236074169173687823f76bba3d66a2959a3478916
diff --git a/net-libs/enet/enet-1.3.12.ebuild b/net-libs/enet/enet-1.3.12.ebuild
deleted file mode 100644
index fc29b1c..0000000
--- a/net-libs/enet/enet-1.3.12.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base
-
-DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP"
-HOMEPAGE="http://enet.bespin.org/"
-SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.3/2.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="!${CATEGORY}/${PN}:0"
-
-DOCS=( "ChangeLog" "README" )
-
-src_configure() {
- econf \
- --disable-dependency-tracking \
- $(use_enable static-libs static)
-}
-
-src_install() {
- base_src_install
- if ! use static-libs ; then
- find "${D}" -type f -name '*.la' -exec rm {} + || die
- fi
-}
diff --git a/net-libs/enet/enet-1.3.13.ebuild b/net-libs/enet/enet-1.3.13.ebuild
new file mode 100644
index 0000000..ff7aaaa
--- /dev/null
+++ b/net-libs/enet/enet-1.3.13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base
+
+DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP"
+HOMEPAGE="http://enet.bespin.org/"
+SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.3/7"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="!${CATEGORY}/${PN}:0"
+
+DOCS=( "ChangeLog" "README" )
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ base_src_install
+ if ! use static-libs ; then
+ find "${D}" -type f -name '*.la' -exec rm {} + || die
+ fi
+}
diff --git a/net-libs/glib-networking/glib-networking-2.44.0.ebuild b/net-libs/glib-networking/glib-networking-2.44.0.ebuild
index 15e9db0..3852b1a 100644
--- a/net-libs/glib-networking/glib-networking-2.44.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.44.0.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2+"
SLOT="0"
IUSE="+gnome +libproxy smartcard +ssl test"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.39.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/ldns/ldns-1.6.17-r1.ebuild b/net-libs/ldns/ldns-1.6.17-r1.ebuild
new file mode 100644
index 0000000..cf6e735
--- /dev/null
+++ b/net-libs/ldns/ldns-1.6.17-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib-minimal python-single-r1
+
+DESCRIPTION="a library with the aim to simplify DNS programming in C"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="dane doc +ecdsa gost libressl python +ssl static-libs vim-syntax"
+
+# configure will die if ecdsa is enabled and ssl is not
+REQUIRED_USE="ecdsa? ( ssl )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dane? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ ecdsa? ( >=dev-libs/openssl-1.0.1h-r2:0[-bindist,${MULTILIB_USEDEP}] )
+ gost? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ python? ( ${PYTHON_DEPS} )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="${RDEPEND}
+ python? ( dev-lang/swig )
+ doc? ( app-doc/doxygen )
+"
+
+RESTRICT="test" # 1.6.9 has no test directory
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/ldns-config
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}_perl522.patch"
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable ssl sha2) \
+ $(use_enable gost) \
+ $(use_enable ecdsa) \
+ $(use_enable dane) \
+ $(use_with ssl ssl "${EPREFIX}"/usr) \
+ $(multilib_native_use_with python pyldns) \
+ $(multilib_native_use_with python pyldnsx) \
+ --without-drill \
+ --without-examples \
+ --disable-rpath
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi && use doc ; then
+ emake doxygen
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi && use doc ; then
+ dohtml -r doc/html/.
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc Changelog README*
+
+ prune_libtool_files --modules
+ use python && python_optimize
+
+ if use vim-syntax ; then
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins libdns.vim
+ fi
+
+ einfo
+ elog "Install net-dns/ldns-utils if you want drill and examples"
+ einfo
+}
diff --git a/net-libs/libasyncns/files/libasyncns-0.8-configure-res_query.patch b/net-libs/libasyncns/files/libasyncns-0.8-configure-res_query.patch
new file mode 100644
index 0000000..ebc206b
--- /dev/null
+++ b/net-libs/libasyncns/files/libasyncns-0.8-configure-res_query.patch
@@ -0,0 +1,12 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac 2009-10-15 03:42:51.000000000 +0200
++++ b/configure.ac 2015-10-07 02:18:06.571175156 +0200
+@@ -82,6 +82,8 @@
+ ACF_SEARCH_FUNCTION([res_query], [-lresolv, -lbind],
+ [], [AC_MSG_ERROR([res_query not found])],
+ [AC_LANG_PROGRAM([[
++ #include <netinet/in.h>
++ #include <arpa/nameser.h>
+ #include <resolv.h>
+ ]], [[res_query(0, 0, 0, 0, 0);]])
+ ])
diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
new file mode 100644
index 0000000..a2c96ec
--- /dev/null
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-multilib eutils flag-o-matic libtool multilib multilib-minimal
+
+DESCRIPTION="C library for executing name service queries asynchronously"
+HOMEPAGE="http://0pointer.de/lennart/projects/libasyncns/"
+SRC_URI="http://0pointer.de/lennart/projects/libasyncns/${P}.tar.gz"
+
+SLOT="0"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="doc debug"
+
+RDEPEND=""
+DEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+ # fix libdir in pkgconfig file
+ epatch "${FILESDIR}/${P}-libdir.patch"
+ # fix configure check for res_query
+ epatch "${FILESDIR}/${P}-configure-res_query.patch"
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # libasyncns uses assert()
+ use debug || append-cppflags -DNDEBUG
+
+ ECONF_SOURCE=${S} \
+ econf \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ --disable-dependency-tracking \
+ --disable-lynx \
+ --disable-static
+}
+
+multilib_src_compile() {
+ emake || die "emake failed"
+
+ if multilib_is_native_abi && use doc; then
+ doxygen doxygen/doxygen.conf || die "doxygen failed"
+ fi
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ if multilib_is_native_abi && use doc; then
+ docinto apidocs
+ dohtml html/*
+ fi
+}
+
+multilib_src_install_all() {
+ find "${D}" -name '*.la' -delete
+}
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 222fa65..952fe8d 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,2 +1,3 @@
DIST libbtbb-2015-09-R2.tar.gz 222045 SHA256 35ce44636649163f0d9a4de5905f686470f54c79b408959760db8c8182853161 SHA512 e300ec09de34644a0cd2f4aba2fe0b03021aaa0b0fe5035022f1e698ff10867adfd84850d0d40e9c070fbd622efee1b614221c1f5b1818f1d4f5d58cc3f31919 WHIRLPOOL 99d8c621b263cd3cd82e423eabff21d4979b0407c31430aa26424d273c9e3ed802e68833e3a100588a46a9a2126a84d0be56e41c1b609ea2eed4a3d64203c995
+DIST libbtbb-2015-10-R1.tar.gz 221859 SHA256 95f493d379a53ec1134cfb36349cc9aac95d77260db4fdb557313b0dbb5c1d5a SHA512 550d793326cfb4d31ed00d46faf3521ccafc133614f866961ba6226dff41d3deda428b45f01178e0dea7925635a64e843f0510049408c3f299ad427f2c0832ac WHIRLPOOL 4ac8697150ff5215765a5331695bfc6d2967ff61a4fc89820dd8e3c72f52f51f3d5aff2b4f020de6c728cd368a295a90bbd0bb1cebb60d895c84d5219cc70e77
DIST libbtbb-2015.09.2-rename-plugins.patch.xz 15636 SHA256 391a51ef542deecbb680d7d14f1649e8190096bce38a38965bc00fe1e97ad038 SHA512 40af251835fae9031a28720bf15ec9a903eac5fc42f38a0edf234021861e3c64e3fb77c03675ac7623b6dae901988d28f3ef90d53ea9e2b62b2d692ca0bf2d2f WHIRLPOOL eb15206c66f6293d509affa855f186ccfbb32c9d745675217c1228e7d07c0ef587bd6f997f664c1141e9fa0f4c453faefed3b82982b4099b53b81ec233b2dfec
diff --git a/net-libs/libbtbb/libbtbb-2015.10.1.ebuild b/net-libs/libbtbb/libbtbb-2015.10.1.ebuild
new file mode 100644
index 0000000..3d12be1
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2015.10.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib cmake-utils
+
+DESCRIPTION="A library to decode Bluetooth baseband packets"
+HOMEPAGE="http://libbtbb.sourceforge.net/"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ MY_PV=${PV/\./-}
+ MY_PV=${MY_PV/./-R}
+ S=${WORKDIR}/${PN}-${MY_PV}
+ SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="+pcap +wireshark-plugins"
+
+RDEPEND="
+ pcap? ( net-libs/libpcap )
+ wireshark-plugins? (
+ >=net-analyzer/wireshark-1.8.3-r1:=
+ !>net-analyzer/wireshark-1.98
+ )
+"
+DEPEND="${RDEPEND}
+ wireshark-plugins? ( dev-libs/glib
+ virtual/pkgconfig )"
+
+get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
+
+which_plugins() {
+ if has_version '>=net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb btbredr"
+ elif has_version '<net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb btle btsm"
+ fi
+}
+
+src_prepare(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_prepare
+
+ if use wireshark-plugins; then
+ which_plugins
+ for i in ${plugins}
+ do
+ sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_prepare
+ done
+ fi
+}
+
+src_configure() {
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ local mycmakeargs=(
+ -DDISABLE_PYTHON=true
+ -DPACKAGE_MANAGER=true
+ $(cmake-utils_use pcap PCAPDUMP)
+ $(cmake-utils_use pcap USE_PCAP)
+ )
+ cmake-utils_src_configure
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
+ )
+ cmake-utils_src_configure
+ done
+ fi
+}
+
+src_compile(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_compile
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_compile
+ done
+ fi
+}
+
+src_test(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_test
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_test
+ done
+ fi
+}
+
+src_install(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_install
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_install
+ done
+ fi
+}
diff --git a/net-libs/libircclient/libircclient-1.8.ebuild b/net-libs/libircclient/libircclient-1.8.ebuild
index 1b5541a..bcbbef1 100644
--- a/net-libs/libircclient/libircclient-1.8.ebuild
+++ b/net-libs/libircclient/libircclient-1.8.ebuild
@@ -11,7 +11,7 @@
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="doc ipv6 ssl static-libs threads"
DEPEND="ssl? ( dev-libs/openssl:0 )"
diff --git a/net-libs/libmbim/libmbim-1.12.2.ebuild b/net-libs/libmbim/libmbim-1.12.2.ebuild
index 7f567e4..529ad90 100644
--- a/net-libs/libmbim/libmbim-1.12.2.ebuild
+++ b/net-libs/libmbim/libmbim-1.12.2.ebuild
@@ -9,7 +9,7 @@
inherit git-r3 autotools
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
else
- KEYWORDS="~alpha ~amd64 ~arm ~mips ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc64 ~x86"
SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
fi
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 45108a0..7e8d273 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,3 +1,2 @@
-DIST libmicrohttpd-0.9.39.tar.gz 1205722 SHA256 4f937b6065c366d776be86b1d24b8fc400ebc7ea006a9d77c49a8f2f0cd7e373 SHA512 f7a526803fd5bbd28c817836340f91569542c3f8db6f04ffc8e60cf794cd5a7f1da3beda782fa80b2f6c07bb48cd09454c5bbcae1ad81b00f0df2985740a927a WHIRLPOOL a2dc5f2303bf7fd042d9f5ca58f946e0e506232870b00d7a7cb65127cc1769fdbc9a5b12145d47d7ab4d32d48ab6b311f320c350adbc071d18aae810156073c0
DIST libmicrohttpd-0.9.42.tar.gz 1232516 SHA256 00352073367003da40607319e4090a6a8308748b59246ae80e9871f34dad7d5b SHA512 6516f545a5b81aa23bb0d22582f6d7e7f028069d94e0d33d9d6f929e111a3c0e0432eb43b26b4eec87860e8b9f50de38f1b5e6e20cd8faf30512e4891f29b9f3 WHIRLPOOL 9d42c08ee37042debf2e16ddd244c91375e4cecb9843e08d58581a9838677148d90d469bcd4890d4a0680a62e691c659394067da1c7060f7c4e49b309be4417c
DIST libmicrohttpd-0.9.44.tar.gz 1244988 SHA256 f2739cc05112dc00a5ebe1a470174970ca3a3fd71dcd67fb7539af9d83b8411e SHA512 4f8e679e70e95411f762615593fcf2271df542ffab2ddd89f2c435215590ffe375c8e8c1e09cc2d21389d335cad2062944d65591b9478ea26e65123ed5dd56d9 WHIRLPOOL 8cfce79be2c8c6683a8c1b5f1c2d749a6a598346b032726e4f045dda86074fc3a4b44083385a9117eab9a1f85104962aefa2c8e805bb16104e18f6e3c0646cdf
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.39.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.39.ebuild
deleted file mode 100644
index f8e88b5..0000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.39.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_P="${P/_/}"
-
-DESCRIPTION="A small C library that makes it easy to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-IUSE="epoll messages ssl static-libs test"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-RDEPEND="ssl? (
- dev-libs/libgcrypt:0
- net-libs/gnutls
- )"
-
-DEPEND="${RDEPEND}
- test? (
- ssl? ( >=net-misc/curl-7.25.0-r1[ssl] )
- )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-src_configure() {
- econf \
- --enable-bauth \
- --enable-dauth \
- --disable-spdy \
- $(use_enable epoll) \
- $(use_enable test curl) \
- $(use_enable messages) \
- $(use_enable messages postprocessor) \
- $(use_enable ssl https) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 4fb56bc..7c20829 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,3 +1 @@
-DIST libnftnl-1.0.3.tar.bz2 356264 SHA256 cf0ae7eab6a6866192a1fbd6b370a8a2cbe2066fe3975ab44939fd50747c27f7 SHA512 6fba3f3a0c3d98e0c3200edbd45910e326f0864383dc695fa77580d47d3fe541c50518f62d2dbfc50b2378b9b311aec28b3321ef18f59a321e0a3f0817952181 WHIRLPOOL 70219737c4d865bdfe9f58803377d3a10619198cb486623d03d30a43b0d159ded9d625505cb0209fe30585dbe3413d136d2fdd6552a6ce2339151bedb1c94c9a
-DIST libnftnl-1.0.4.tar.bz2 367016 SHA256 8f1fbf9bcf87bf68e782f464fb05428d476c2e9a0bec91c6cda7a389a21969d0 SHA512 ed4230581c139c004c39a9ef3e6d548cfad43d1f3c47e83db328b7ae6c6d7fa70b194699d7f18472fa7fb819c943a85b6997be0f2d2b926745dd5cdbdbf81a41 WHIRLPOOL f899694c2d45fc073af694f5bd6edcae70abead69ef37a3f84a290e6b3dbb246029337e14378e4b3af4a4040f9c407db247f4d8636b8986e3f0d5b48783c20bd
DIST libnftnl-1.0.5.tar.bz2 367016 SHA256 f6d4f5a702e38bc7987f2363f9fcd65930e8b702595c221a497e2f3a359be497 SHA512 85c71aaaeeafdffe09f2591f26d49d41e9f511a53ed313fe642b4968eae8aac1246a53d5908fc737c6eb9cc4f5f3ef2a4eaa17fe33db453a1fd60f2f9d5c5a1d WHIRLPOOL 15fb25aa9e23bfdcb19ab21ea1d6eadd22e5acc0c38e761e4637a06136c809f5a5827ac58643515432e1394e3e8d4575df11e52b5f16ca787157317e5e2ae463
diff --git a/net-libs/libnftnl/libnftnl-1.0.3.ebuild b/net-libs/libnftnl/libnftnl-1.0.3.ebuild
deleted file mode 100644
index d74a394..0000000
--- a/net-libs/libnftnl/libnftnl-1.0.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base linux-info toolchain-funcs
-
-DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="http://netfilter.org/projects/nftables/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="examples json static-libs test xml"
-SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-RDEPEND=">=net-libs/libmnl-1.0.0
- xml? ( >=dev-libs/mini-xml-2.6 )
- json? ( >=dev-libs/jansson-2.3 )"
-DEPEND="virtual/pkgconfig
- ${RDEPEND}"
-
-REQUIRED_USE="test? ( json xml )"
-
-pkg_setup() {
- if kernel_is ge 3 13; then
- CONFIG_CHECK="~NF_TABLES"
- linux-info_pkg_setup
- else
- eerror "This package requires kernel version 3.13 or newer to work properly."
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_with xml xml-parsing) \
- $(use_with json json-parsing)
-}
-
-src_install() {
- default
- gen_usr_ldscript -a nftnl
- prune_libtool_files
-
- if use examples; then
- find examples/ -name 'Makefile*' -delete
- dodoc -r examples/
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-src_test() {
- default
- cd tests || die
- ./test-script.sh || die
-}
diff --git a/net-libs/libnftnl/libnftnl-1.0.4.ebuild b/net-libs/libnftnl/libnftnl-1.0.4.ebuild
deleted file mode 100644
index 32b072d..0000000
--- a/net-libs/libnftnl/libnftnl-1.0.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base linux-info toolchain-funcs
-
-DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="http://netfilter.org/projects/nftables/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="examples json static-libs test xml"
-SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-RDEPEND=">=net-libs/libmnl-1.0.0
- xml? ( >=dev-libs/mini-xml-2.6 )
- json? ( >=dev-libs/jansson-2.3 )"
-DEPEND="virtual/pkgconfig
- ${RDEPEND}"
-
-REQUIRED_USE="test? ( json xml )"
-
-pkg_setup() {
- if kernel_is ge 3 13; then
- CONFIG_CHECK="~NF_TABLES"
- linux-info_pkg_setup
- else
- eerror "This package requires kernel version 3.13 or newer to work properly."
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_with xml xml-parsing) \
- $(use_with json json-parsing)
-}
-
-src_install() {
- default
- gen_usr_ldscript -a nftnl
- prune_libtool_files
-
- if use examples; then
- find examples/ -name 'Makefile*' -delete
- dodoc -r examples/
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-src_test() {
- default
- cd tests || die
- ./test-script.sh || die
-}
diff --git a/net-libs/libnftnl/libnftnl-1.0.5.ebuild b/net-libs/libnftnl/libnftnl-1.0.5.ebuild
index 4961da1..a95373c 100644
--- a/net-libs/libnftnl/libnftnl-1.0.5.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.0.5.ebuild
@@ -4,16 +4,16 @@
EAPI=5
-inherit base linux-info toolchain-funcs
+inherit base linux-info toolchain-funcs eutils
DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
HOMEPAGE="http://netfilter.org/projects/nftables/"
+SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0/4"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="examples json static-libs test xml"
-SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
RDEPEND=">=net-libs/libmnl-1.0.0
xml? ( >=dev-libs/mini-xml-2.6 )
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 8d3ef93..1ba4bfa 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1 +1,2 @@
DIST libsmi-0.4.8.tar.gz 4104111 SHA256 f048a5270f41bc88b0c3b0a8fe70ca4d716a46b531a0ecaaa87c462f49d74849 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863 WHIRLPOOL 33523c5aca6792c3ec08be748ce976046693188e61770db99c01a030b66442a387729c99196729efcd5a03c778f0263452a833a40add7173d65c4a9f51a6d842
+DIST libsmi-0.5.0.tar.gz 4798883 SHA256 f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c725754d3 SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708 WHIRLPOOL 13c33930981431729c5246d6f1a8a519c3985b04aa873475830dbc54ee8181eff7fa59c5cbd312633b29f2cac6c9cc74f2d922f2876aa8e461a47743e1445e3d
diff --git a/net-libs/libsmi/libsmi-0.5.0.ebuild b/net-libs/libsmi/libsmi-0.5.0.ebuild
new file mode 100644
index 0000000..716b4ab
--- /dev/null
+++ b/net-libs/libsmi/libsmi-0.5.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A Library to Access SMI MIB Information"
+HOMEPAGE="http://www.ibr.cs.tu-bs.de/projects/libsmi"
+SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static-libs"
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_test() {
+ # sming test is known to fail and some other fail if LC_ALL!=C:
+ # http://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/001014.html
+ sed -i '/^[[:space:]]*smidump-sming.test \\$/d' test/Makefile
+ LC_ALL=C emake -j1 check || die
+}
+
+src_install () {
+ default
+ dodoc smi.conf-example ANNOUNCE ChangeLog README THANKS TODO \
+ doc/{*.txt,smi.dia,smi.dtd,smi.xsd}
+ prune_libtool_files
+}
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild
index b5fb4bb..0a0aa4b 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild
@@ -18,7 +18,7 @@
LICENSE="LGPL-2+"
SLOT="2.4"
IUSE="debug +introspection"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
RDEPEND="
~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.50.0.ebuild b/net-libs/libsoup/libsoup-2.50.0.ebuild
index 830ab84..30a129e 100644
--- a/net-libs/libsoup/libsoup-2.50.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.50.0.ebuild
@@ -15,7 +15,7 @@
LICENSE="LGPL-2+"
SLOT="2.4"
IUSE="debug +introspection samba ssl test"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 41991e5..114693c 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -3,3 +3,4 @@
DIST libssh-0.7.0-ssh_forward_listen.patch 813 SHA256 3d5d4d4a5c7eb34b9790ebb557de2df359c98f955ff37e812945f256b8bdd482 SHA512 727face00743cf964b9fbbff001f2d2240c6d1ac64d2e65298bca97e973d06d2e1591755446fb7c8fd8d83bf1247c42591c47dcc7f008ca89b84d817b5b2f457 WHIRLPOOL f7fdb169a1f6db68dae4d591a2802901d12f030342da1c32e5bc85f95a6f3ea62cade29081d760e0dd67b77b91ec0aa6314a319280c1dd8abd777493237b1d9e
DIST libssh-0.7.0.tar.xz 349548 SHA256 0551bc341f33641ddc349b31730b3010870ad26a4dbfad3d090a1738fe3e402b SHA512 2ef897f7295d2b4ba63f0d797c51ba2c8cb7d8569152d34ec982d2b88adccc97c8f2aabea3bbc88b72421256d3d0be661f82bbcf5c4b151018b5a695be445568 WHIRLPOOL 1337ca1fc69c5de60f2d33ce1d66f04b0d2807b01794af6787a5d4b7ca84715afe00ff72d8b1bb21590186b7af9058fa90c69af865a0534402735076dec51397
DIST libssh-0.7.1.tar.xz 349888 SHA256 2fc7ccf96d3263cbd8ab520118cb94d9a2e11714c61e22b3f761fc5352fd046d SHA512 c7cea829e97c9f37c23b5d331e02ea5b8c8bea1a0b28fad62a273b252040a30ea9631b502ea165a1e041b6e23c3bf6746d49800875fa492d8f42c7d1e232ebb9 WHIRLPOOL 7569b16a9524efac40d7a7b8c91201a8ce2c37c56008c7262e4d7628f5ac0993a0164bccc845a121438a62451a10d94b71ba69788b145d0592b83fa88ee251e1
+DIST libssh-0.7.2.tar.xz 350540 SHA256 a32c45b9674141cab4bde84ded7d53e931076c6b0f10b8fd627f3584faebae62 SHA512 9cb15254478e2522e736688052e0862c856e2c1321d090c9b9d9562504fcb59cee344c07576eeee9c6d0ac5ead137d9ff05216d973c457c6a17ffa9fba475f5a WHIRLPOOL bf878264b900bfbbfe76f08d1c22e5ca2f1300024fc561841ed3fbef374ceab7a08ba0211c093d90d7e4047a896cce9f73e78268300362beaec194025eda1ed8
diff --git a/net-libs/libssh/libssh-0.7.2.ebuild b/net-libs/libssh/libssh-0.7.2.ebuild
new file mode 100644
index 0000000..88697e4
--- /dev/null
+++ b/net-libs/libssh/libssh-0.7.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${PN}-${PV/_rc/rc}
+inherit eutils cmake-multilib multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="http://www.libssh.org/"
+SRC_URI="https://red.libssh.org/attachments/download/177/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+RDEPEND="
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ !gcrypt? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5.0-tests.patch
+)
+
+src_prepare() {
+ # just install the examples do not compile them
+ sed -i \
+ -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+ CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with debug DEBUG_CALLTRACE)
+ $(cmake-utils_use_with debug DEBUG_CRYPTO)
+ $(cmake-utils_use_with gcrypt)
+ $(cmake-utils_use_with gssapi)
+ $(cmake-utils_use_with pcap)
+ $(cmake-utils_use_with server)
+ $(cmake-utils_use_with sftp)
+ $(cmake-utils_use_with ssh1)
+ $(cmake-utils_use_with static-libs STATIC_LIB)
+ $(cmake-utils_use_with test STATIC_LIB)
+ $(cmake-utils_use_with test TESTING)
+ $(cmake-utils_use_with zlib)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+
+ multilib_is_native_abi && use doc && dohtml -r doc/html/.
+
+ use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use examples; then
+ docinto examples
+ dodoc examples/*.{c,h,cpp}
+ fi
+}
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 7fcefa9..b76736e 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,12 +13,15 @@
LICENSE="LGPL-2.1"
KEYWORDS=""
SLOT="0"
-IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
+IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib"
# Maintainer: check IUSE-defaults at DefineOptions.cmake
RDEPEND="
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ !gcrypt? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
"
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index daf1559..3b30536 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,3 +1 @@
-DIST mbedtls-2.0.0.tar.gz 1737179 SHA256 2af7f064580d7b7845c0a430b8111bd2ccc06d79d94589680f811c4c1091a1a1 SHA512 fd9f7e684a67f249512651727a84e5f327975ce05100d865fef8d5078e813eb2fb8d036d47fc2b15c7712e4900719e58718a6fd2a6592836c273f3b38f06eb0f WHIRLPOOL b73dc273ee18f035d25532e537cfdb21223613514f125cfa8e392d838da8f1c1a250915ab51d63b02d52d37a7e68ca21afc97c27388c60d455654238e3a7abc0
-DIST mbedtls-2.1.0.tar.gz 1770972 SHA256 2d95eaed5c2ecc7acf04afe5cdb5895b6feb31c4040a55020a314b5a0182a27a SHA512 b581bcafcd76cd5830c84f4b8b23196d1e5db06399fe5578368468eea3ab4f9b814e107cc552ab94f62ffbe3054cac3071bac5ce72484cb7bf30209e9f497eee WHIRLPOOL 0cb3399c35c7181b4ea7c6585616bc488be9faa75c5ae6010248e9a516a125c95c344d132f0ae5a0fdf57008fbb7a360035ed4fef9aba9c216753ed7d675850f
-DIST mbedtls-2.1.1.tar.gz 1774848 SHA256 ae458a4987f36819bdf1d39519212f4063780fe448d4155878fccf4e782a715f SHA512 af49762f583d5063d1629498d5161ce58753cf2c05145d8b6c9e653bc99cc49e45bbab1d3b27f20ac8cc5ee937fb3b7aa4dbeba9fc8da6a8fa6253d3cbce3aef WHIRLPOOL 2586dafefb3ad992c32ab17462100c16f806eb75488461290d4fe2a99759001451bff2115eeb2b98a9eee11069c38ce564421cef99ab376b12014b9499708f4d
+DIST mbedtls-2.1.2.tar.gz 1775666 SHA256 c51c7e1dd91d7ef2115e9382b8d1cfabcb3f54063fe8198e9ee9d0fe839cceed SHA512 36a6cdb1a403ac36cb723bf93f6a8a84da0c7b177aa18d984072dca40a024f7265c4788852e115a8fe724c5913c2d93fa07559a5ee67a8ddacdc005396d53cd8 WHIRLPOOL 9475f75a56b6b4402f72a185fd8a2fa62774efca9b56353f30b1c1682dd35b7fd3b2c6104c93c7109876951ee00021ade9f79a975fdb0e18486ea9180a4709a0
diff --git a/net-libs/mbedtls/mbedtls-2.0.0.ebuild b/net-libs/mbedtls/mbedtls-2.0.0.ebuild
deleted file mode 100644
index 3aafc18..0000000
--- a/net-libs/mbedtls/mbedtls-2.0.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cpu_flags_x86_sse2 doc havege programs test threads zlib"
-
-RDEPEND="
- programs? ( dev-libs/openssl:0 )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen media-gfx/graphviz )
- test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${PN}-${P}
-
-enable_mbedtls_option() {
- local myopt="$@"
- # check that config.h syntax is the same at version bump
- sed -i \
- -e "s://#define ${myopt}:#define ${myopt}:" \
- include/mbedtls/config.h || die
-}
-
-src_prepare() {
- use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
- use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
- use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- $(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \
- || echo -DENABLE_PROGRAMS=OFF)
- $(cmake-utils_use_enable zlib ZLIB_SUPPORT)
- -DUSE_STATIC_MBEDTLS_LIBRARY=OFF
- $(cmake-utils_use_enable test TESTING)
- -DUSE_SHARED_MBEDTLS_LIBRARY=ON
- -DINSTALL_MBEDTLS_HEADERS=ON
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
- cmake-utils_src_test
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- use doc && dohtml -r apidoc
-
- if use programs ; then
- # avoid file collisions with sys-apps/coreutils
- local p e
- for p in "${ED%/}"/usr/bin/* ; do
- if [[ -x "${p}" && ! -d "${p}" ]] ; then
- mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
- fi
- done
- for e in aes hash pkey ssl test ; do
- docinto "${e}"
- dodoc programs/"${e}"/*.c
- dodoc programs/"${e}"/*.txt
- done
- fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.1.0.ebuild b/net-libs/mbedtls/mbedtls-2.1.0.ebuild
deleted file mode 100644
index 1c51012..0000000
--- a/net-libs/mbedtls/mbedtls-2.1.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cpu_flags_x86_sse2 doc havege programs test threads zlib"
-
-RDEPEND="
- programs? ( dev-libs/openssl:0 )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen media-gfx/graphviz )
- test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${PN}-${P}
-
-enable_mbedtls_option() {
- local myopt="$@"
- # check that config.h syntax is the same at version bump
- sed -i \
- -e "s://#define ${myopt}:#define ${myopt}:" \
- include/mbedtls/config.h || die
-}
-
-src_prepare() {
- use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
- use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
- use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- $(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \
- || echo -DENABLE_PROGRAMS=OFF)
- $(cmake-utils_use_enable zlib ZLIB_SUPPORT)
- -DUSE_STATIC_MBEDTLS_LIBRARY=OFF
- $(cmake-utils_use_enable test TESTING)
- -DUSE_SHARED_MBEDTLS_LIBRARY=ON
- -DINSTALL_MBEDTLS_HEADERS=ON
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
- cmake-utils_src_test
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- use doc && dohtml -r apidoc
-
- if use programs ; then
- # avoid file collisions with sys-apps/coreutils
- local p e
- for p in "${ED%/}"/usr/bin/* ; do
- if [[ -x "${p}" && ! -d "${p}" ]] ; then
- mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
- fi
- done
- for e in aes hash pkey ssl test ; do
- docinto "${e}"
- dodoc programs/"${e}"/*.c
- dodoc programs/"${e}"/*.txt
- done
- fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.1.1-r1.ebuild b/net-libs/mbedtls/mbedtls-2.1.1-r1.ebuild
deleted file mode 100644
index 58b18a5..0000000
--- a/net-libs/mbedtls/mbedtls-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
-
-RDEPEND="
- programs? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen media-gfx/graphviz )
- test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${PN}-${P}
-
-enable_mbedtls_option() {
- local myopt="$@"
- # check that config.h syntax is the same at version bump
- sed -i \
- -e "s://#define ${myopt}:#define ${myopt}:" \
- include/mbedtls/config.h || die
-}
-
-src_prepare() {
- use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
- use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
- use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- $(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \
- || echo -DENABLE_PROGRAMS=OFF)
- $(cmake-utils_use_enable zlib ZLIB_SUPPORT)
- -DUSE_STATIC_MBEDTLS_LIBRARY=OFF
- $(cmake-utils_use_enable test TESTING)
- -DUSE_SHARED_MBEDTLS_LIBRARY=ON
- -DINSTALL_MBEDTLS_HEADERS=ON
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
- cmake-utils_src_test
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- use doc && dohtml -r apidoc
-
- if use programs ; then
- # avoid file collisions with sys-apps/coreutils
- local p e
- for p in "${ED%/}"/usr/bin/* ; do
- if [[ -x "${p}" && ! -d "${p}" ]] ; then
- mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
- fi
- done
- for e in aes hash pkey ssl test ; do
- docinto "${e}"
- dodoc programs/"${e}"/*.c
- dodoc programs/"${e}"/*.txt
- done
- fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.1.1.ebuild b/net-libs/mbedtls/mbedtls-2.1.1.ebuild
deleted file mode 100644
index 1c51012..0000000
--- a/net-libs/mbedtls/mbedtls-2.1.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cpu_flags_x86_sse2 doc havege programs test threads zlib"
-
-RDEPEND="
- programs? ( dev-libs/openssl:0 )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen media-gfx/graphviz )
- test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${PN}-${P}
-
-enable_mbedtls_option() {
- local myopt="$@"
- # check that config.h syntax is the same at version bump
- sed -i \
- -e "s://#define ${myopt}:#define ${myopt}:" \
- include/mbedtls/config.h || die
-}
-
-src_prepare() {
- use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
- use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
- use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- $(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \
- || echo -DENABLE_PROGRAMS=OFF)
- $(cmake-utils_use_enable zlib ZLIB_SUPPORT)
- -DUSE_STATIC_MBEDTLS_LIBRARY=OFF
- $(cmake-utils_use_enable test TESTING)
- -DUSE_SHARED_MBEDTLS_LIBRARY=ON
- -DINSTALL_MBEDTLS_HEADERS=ON
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
- cmake-utils_src_test
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- use doc && dohtml -r apidoc
-
- if use programs ; then
- # avoid file collisions with sys-apps/coreutils
- local p e
- for p in "${ED%/}"/usr/bin/* ; do
- if [[ -x "${p}" && ! -d "${p}" ]] ; then
- mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
- fi
- done
- for e in aes hash pkey ssl test ; do
- docinto "${e}"
- dodoc programs/"${e}"/*.c
- dodoc programs/"${e}"/*.txt
- done
- fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.1.2.ebuild b/net-libs/mbedtls/mbedtls-2.1.2.ebuild
new file mode 100644
index 0000000..ec6bd00
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.1.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/10" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
+
+RDEPEND="
+ programs? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen media-gfx/graphviz )
+ test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${PN}-${P}
+
+enable_mbedtls_option() {
+ local myopt="$@"
+ # check that config.h syntax is the same at version bump
+ sed -i \
+ -e "s://#define ${myopt}:#define ${myopt}:" \
+ include/mbedtls/config.h || die
+}
+
+src_prepare() {
+ use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+ use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+ use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+ use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+ use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ $(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \
+ || echo -DENABLE_PROGRAMS=OFF)
+ $(cmake-utils_use_enable zlib ZLIB_SUPPORT)
+ -DUSE_STATIC_MBEDTLS_LIBRARY=OFF
+ $(cmake-utils_use_enable test TESTING)
+ -DUSE_SHARED_MBEDTLS_LIBRARY=ON
+ -DINSTALL_MBEDTLS_HEADERS=ON
+ -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+ cmake-utils_src_test
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ use doc && dohtml -r apidoc
+
+ if use programs ; then
+ # avoid file collisions with sys-apps/coreutils
+ local p e
+ for p in "${ED%/}"/usr/bin/* ; do
+ if [[ -x "${p}" && ! -d "${p}" ]] ; then
+ mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+ fi
+ done
+ for e in aes hash pkey ssl test ; do
+ docinto "${e}"
+ dodoc programs/"${e}"/*.c
+ dodoc programs/"${e}"/*.txt
+ done
+ fi
+}
diff --git a/net-libs/neon/neon-0.30.1-r1.ebuild b/net-libs/neon/neon-0.30.1-r1.ebuild
new file mode 100644
index 0000000..c2b7f79
--- /dev/null
+++ b/net-libs/neon/neon-0.30.1-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools libtool multilib-minimal
+
+DESCRIPTION="HTTP and WebDAV client library"
+HOMEPAGE="http://www.webdav.org/neon/"
+SRC_URI="http://www.webdav.org/neon/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
+IUSE_LINGUAS="cs de fr ja nn pl ru tr zh_CN"
+for lingua in ${IUSE_LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+unset lingua
+RESTRICT="test"
+
+RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
+ !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+ gnutls? (
+ app-misc/ca-certificates
+ net-libs/gnutls:0=[${MULTILIB_USEDEP}]
+ pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
+ )
+ !gnutls? ( ssl? (
+ !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+ pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
+ ) )
+ kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+ libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
+ nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] )
+ zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig[${MULTILIB_USEDEP}]"
+RDEPEND="${RDEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r8
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/neon-config
+)
+
+src_prepare() {
+ local lingua linguas
+ for lingua in ${IUSE_LINGUAS}; do
+ use linguas_${lingua} && linguas+=" ${lingua}"
+ done
+ sed -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/" -i configure.ac || die
+
+ epatch "${FILESDIR}"/${P}-xml2-config.patch
+ AT_M4DIR="macros" eautoreconf
+
+ elibtoolize
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myconf=()
+
+ if has_version sys-libs/glibc; then
+ einfo "Enabling SSL library thread-safety using POSIX threads..."
+ myconf+=(--enable-threadsafe-ssl=posix)
+ fi
+
+ if use expat; then
+ myconf+=(--with-expat)
+ else
+ myconf+=(--with-libxml2)
+ fi
+
+ if use gnutls; then
+ myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
+ elif use ssl; then
+ myconf+=(--with-ssl=openssl)
+ fi
+
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-shared \
+ $(use_with kerberos gssapi) \
+ $(use_with libproxy) \
+ $(use_enable nls) \
+ $(use_with pkcs11 pakchois) \
+ $(use_enable static-libs static) \
+ $(use_with zlib) \
+ "${myconf[@]}"
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
+
+ if multilib_is_native_abi && use doc; then
+ dohtml -r doc/html/
+ fi
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name "*.la" -delete
+
+ dodoc AUTHORS BUGS NEWS README THANKS TODO
+}
diff --git a/net-libs/nodejs/nodejs-4.1.1.ebuild b/net-libs/nodejs/nodejs-4.1.1.ebuild
index af811ba..fb66363 100644
--- a/net-libs/nodejs/nodejs-4.1.1.ebuild
+++ b/net-libs/nodejs/nodejs-4.1.1.ebuild
@@ -119,9 +119,11 @@
src_install() {
local LIBDIR="${ED}/usr/$(get_libdir)"
emake install DESTDIR="${ED}" PREFIX=/usr
- use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
- rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
- find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
+ if use npm; then
+ dodoc -r "${LIBDIR}"/node_modules/npm/html
+ rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+ find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
+ fi
# set up a symlink structure that npm expects..
dodir /usr/include/node/deps/{v8,uv}
diff --git a/net-libs/openslp/openslp-2.0.0-r1.ebuild b/net-libs/openslp/openslp-2.0.0-r1.ebuild
new file mode 100644
index 0000000..e4f8d64
--- /dev/null
+++ b/net-libs/openslp/openslp-2.0.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools systemd
+
+DESCRIPTION="An open-source implementation of Service Location Protocol"
+HOMEPAGE="http://www.openslp.org/"
+SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="libressl"
+RESTRICT="test"
+
+DEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.0.0-cflags.patch
+ eautoreconf
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "make install failed"
+ dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
+ rm -rfv "${D}"/usr/doc
+ dohtml -r .
+ newinitd "${FILESDIR}"/slpd-init slpd
+ systemd_dounit "${FILESDIR}"/slpd.service
+}
diff --git a/net-libs/phodav/phodav-2.0-r1.ebuild b/net-libs/phodav/phodav-2.0-r1.ebuild
index 41e4674..db292f3 100644
--- a/net-libs/phodav/phodav-2.0-r1.ebuild
+++ b/net-libs/phodav/phodav-2.0-r1.ebuild
@@ -13,7 +13,7 @@
LICENSE="LGPL-2.1+"
SLOT="2.0"
-KEYWORDS="alpha amd64 ~arm ~ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~ppc ppc64 x86"
IUSE="spice systemd zeroconf"
RDEPEND="
diff --git a/net-libs/polarssl/polarssl-1.3.9-r1.ebuild b/net-libs/polarssl/polarssl-1.3.9-r1.ebuild
new file mode 100644
index 0000000..516593b
--- /dev/null
+++ b/net-libs/polarssl/polarssl-1.3.9-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="http://polarssl.org/"
+SRC_URI="http://polarssl.org/download/${P}-gpl.tgz"
+
+LICENSE="GPL-2"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc havege libressl programs cpu_flags_x86_sse2 static-libs test threads zlib"
+
+RDEPEND="
+ programs? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen media-gfx/graphviz )
+ test? ( dev-lang/perl )"
+
+enable_polarssl_option() {
+ local myopt="$@"
+ # check that config.h syntax is the same at version bump
+ sed -i \
+ -e "s://#define ${myopt}:#define ${myopt}:" \
+ include/polarssl/config.h || die
+}
+
+src_prepare() {
+ use cpu_flags_x86_sse2 && enable_polarssl_option POLARSSL_HAVE_SSE2
+ use zlib && enable_polarssl_option POLARSSL_ZLIB_SUPPORT
+ use havege && enable_polarssl_option POLARSSL_HAVEGE_C
+ use threads && enable_polarssl_option POLARSSL_THREADING_C
+ use threads && enable_polarssl_option POLARSSL_THREADING_PTHREAD
+
+ epatch "${FILESDIR}"/${PN}-1.3.9-respect-cflags.patch
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ $(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \
+ || echo -DENABLE_PROGRAMS=OFF)
+ $(cmake-utils_use_enable zlib ZLIB_SUPPORT)
+ $(cmake-utils_use_use static-libs STATIC_POLARSSL_LIBRARY)
+ $(cmake-utils_use_enable test TESTING)
+ -DUSE_SHARED_POLARSSL_LIBRARY=ON
+ -DINSTALL_POLARSSL_HEADERS=ON
+ -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+ cmake-utils_src_test
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ use doc && dohtml -r apidoc
+
+ if use programs ; then
+ # avoid file collisions with sys-apps/coreutils
+ local p e
+ for p in "${ED%/}"/usr/bin/* ; do
+ if [[ -x "${p}" && ! -d "${p}" ]] ; then
+ mv "${p}" "${ED%/}"/usr/bin/polarssl_${p##*/} || die
+ fi
+ done
+ for e in aes hash pkey ssl test ; do
+ docinto "${e}"
+ dodoc programs/"${e}"/*.c
+ dodoc programs/"${e}"/*.txt
+ done
+ fi
+}
diff --git a/net-libs/ptlib/ptlib-2.12.9-r1.ebuild b/net-libs/ptlib/ptlib-2.12.9-r1.ebuild
new file mode 100644
index 0000000..47029cf
--- /dev/null
+++ b/net-libs/ptlib/ptlib-2.12.9-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Network focused portable C++ class library providing high level functions"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
+ doc? ( mirror://sourceforge/opalvoip/${P}-htmldoc.tar.bz2 )"
+
+LICENSE="MPL-1.0"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# default enabled are features from 'minsize', the most used according to ptlib
+IUSE="alsa +asn debug doc +dtmf examples ffmpeg ftp +http ipv6
+xmpp ldap libressl lua mail odbc oss pch pulseaudio remote sasl sdl serial
+shmvideo snmp soap socks +sound ssl static-libs +stun telnet tts v4l +video
+vxml wav xml xmlrpc"
+
+CDEPEND="
+ ldap? ( net-nds/openldap )
+ lua? ( dev-lang/lua )
+ odbc? ( dev-db/unixODBC )
+ pulseaudio? ( media-sound/pulseaudio )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ sdl? ( media-libs/libsdl )
+ sound? ( alsa? ( media-libs/alsa-lib ) )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ video? ( v4l? ( media-libs/libv4l ) )
+ xml? ( dev-libs/expat )
+ !!dev-libs/pwlib"
+RDEPEND="${CDEPEND}
+ ffmpeg? ( virtual/ffmpeg )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ sys-devel/bison
+ sys-devel/flex
+ video? ( v4l? ( sys-kernel/linux-headers ) )"
+
+# NOTES:
+# media-libs/libdc1394:2 should be supported but headers location have changed
+# tools/ directory is ignored
+# avc plugin is disabled to fix bug 276514, see upstream bug 2821744
+
+REQUIRED_USE="sdl? ( video )
+ xmpp? ( xml )
+ vxml? ( http tts xml )
+ xmlrpc? ( http xml )
+ soap? ( http xml )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.10.9-svn_revision_override.patch" \
+ "${FILESDIR}/${PN}-2.10.9-pkgconfig_ldflags.patch" \
+ "${FILESDIR}/${PN}-2.12.4-respect_cxxflags.patch" \
+ "${FILESDIR}/${PN}-2.12.4-sdl-linking.patch"
+
+ if ! use telnet; then
+ epatch "${FILESDIR}/${PN}-2.10.9-disable-telnet-symbols.patch"
+ fi
+
+ # remove visual studio related files from samples/
+ if use examples; then
+ rm -f samples/*/*.vcproj
+ rm -f samples/*/*.sln
+ rm -f samples/*/*.dsp
+ rm -f samples/*/*.dsw
+ fi
+
+ if [[ ! -z ${TARGET+set} ]]; then
+ ewarn "TARGET variable is set. Removing as it would break the build, bug #465722."
+ unset TARGET
+ fi
+}
+
+src_configure() {
+ local myconf=""
+
+ # plugins are disabled only if ! sound and ! video
+ if ! use sound && ! use video; then
+ myconf+=" --disable-plugins"
+ else
+ myconf+=" --enable-plugins"
+ fi
+
+ # minsize: presets of features (overwritten by use flags)
+ # ansi-bool, atomicity: there is no reason to disable those features
+ # internalregex: we want to use system one
+ # sunaudio and bsdvideo are respectively for SunOS and BSD's
+ # appshare, vfw: only for windows
+ # samples: no need to build samples
+ # avc: disabled, bug 276514, upstream bug 2821744
+ # mlib: SUN mediaLibs. Not in tree.
+ # pipechan, configfile, resolver, url: force enabling
+ econf ${myconf} \
+ --disable-minsize \
+ --enable-ansi-bool \
+ --enable-atomicity \
+ --disable-internalregex \
+ --disable-sunaudio \
+ --disable-bsdvideo \
+ --disable-appshare \
+ --disable-vfw \
+ --disable-samples \
+ --disable-avc \
+ --disable-mlib \
+ --enable-configfile \
+ --enable-pipechan \
+ --enable-resolver \
+ --enable-url \
+ $(use_enable alsa) \
+ $(use_enable asn) \
+ $(use_enable debug exceptions) \
+ $(use_enable debug memcheck) \
+ $(use_enable debug tracing) \
+ $(use_enable dtmf) \
+ --disable-esd \
+ $(use_enable ffmpeg ffvdev) \
+ $(use_enable ftp) \
+ $(use_enable http) \
+ $(use_enable http httpforms) \
+ $(use_enable http httpsvc) \
+ --disable-dc \
+ $(use_enable ipv6) \
+ $(use_enable xmpp jabber) \
+ $(use_enable ldap openldap) \
+ $(use_enable lua) \
+ $(use_enable mail pop3smtp) \
+ $(use_enable pulseaudio pulse) \
+ $(use_enable odbc) \
+ $(use_enable oss) \
+ $(use_enable pch) \
+ $(use_enable remote remconn) \
+ $(use_enable sasl) \
+ $(use_enable sdl) \
+ $(use_enable serial) \
+ $(use_enable shmvideo) \
+ $(use_enable snmp) \
+ $(use_enable soap) \
+ $(use_enable socks) \
+ $(use_enable sound audio) \
+ $(use_enable ssl openssl) \
+ $(use_enable stun) \
+ $(use_enable telnet) \
+ $(use_enable tts) \
+ --disable-v4l \
+ $(use_enable v4l v4l2) \
+ $(use_enable video) $(use_enable video vidfile) \
+ $(use_enable vxml) \
+ $(use_enable wav wavfile) \
+ $(use_enable xml expat) \
+ $(use_enable xmlrpc)
+}
+
+src_compile() {
+ local makeopts=""
+ tc-env_build
+
+ use debug && makeopts="debug"
+
+ emake ${makeopts}
+}
+
+src_install() {
+ local makeopts=""
+
+ use debug && makeopts="DEBUG=1"
+
+ emake DESTDIR="${D}" ${makeopts} install
+
+ # Get rid of static libraries if not requested
+ # There seems to be no easy way to disable this in the build system
+ if ! use static-libs; then
+ rm -v "${D}"/usr/lib*/*.a || die
+ fi
+
+ if use doc; then
+ dohtml -r "${WORKDIR}"/html/*
+ fi
+
+ dodoc History.txt ReadMe.txt ReadMe_QOS.txt
+
+ if use sound || use video; then
+ newdoc plugins/ReadMe.txt ReadMe-Plugins.txt
+ fi
+
+ if use examples; then
+ local exampledir="/usr/share/doc/${PF}/examples"
+ local basedir="samples"
+ local sampledirs="`ls samples --hide=Makefile`"
+
+ # first, install Makefile
+ insinto ${exampledir}/
+ doins ${basedir}/Makefile || die "doins failed"
+
+ # now, all examples
+ for x in ${sampledirs}; do
+ insinto ${exampledir}/${x}/
+ doins ${basedir}/${x}/* || die "doins failed"
+ done
+ fi
+}
+
+pkg_postinst() {
+ if use examples; then
+ ewarn "All examples have been installed, some of them will not work on your system"
+ ewarn "it will depend of the enabled USE flags."
+ ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
+ fi
+
+ if ! use sound || ! use video; then
+ ewarn "You have disabled sound or video USE flags."
+ ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
+ ewarn "Having a feature enabled via use flag but disabled can lead to issues."
+ fi
+
+ ewarn "If you've just removed pwlib to install ptlib, some packages will be broken."
+ ewarn "Please use 'revdep-rebuild' from app-portage/gentoolkit to check."
+ ewarn "If some packages need pwlib, consider removing ptlib and re-installing pwlib"
+ ewarn "or help us to make them live together."
+}
diff --git a/net-mail/courier-imap/courier-imap-4.15-r1.ebuild b/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
index ab8717f..baf7185 100644
--- a/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
@@ -169,8 +169,8 @@
done
cd ../share || die
- mv -f * ../sbin || die
- mv -f ../sbin/man . || die
+ mv -f * ../sbin || die
+ mv -f ../sbin/man . || die
cd .. || die
for x in mkimapdcert mkpop3dcert ; do
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 2f63595..ed73af2 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,6 +1,8 @@
DIST dovecot-2.2-pigeonhole-0.4.2.tar.gz 1159311 SHA256 0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13 SHA512 3b66d00a8462ee668b8671f5eaa48bb91d47ed8bf8b331f7d879ba8c581e2bef11e236b06a8c5da9f1248572348ad0b3e2b867fd0a17badf32152fedbe61c1ed WHIRLPOOL 4d86bd5c010434620d0741156d4b7b24c60252de76958c0fc774418abff4bebeb4a8a78b5490ee34b20d48f61fb2ee75c4ff04202108ecdd33e1eaa9e2763ad9
DIST dovecot-2.2-pigeonhole-0.4.7.tar.gz 1271959 SHA256 04a13ec11652cbff812519eacf4db7dda648ab5c4c5f63b43a437d1fb0cc8d2a SHA512 df1b4c5591ce36dc99a9e5fb0281d1d11e95b7bf37594910c5730ac611dafb744f057dc87416ff638d582191376d210bca63cc548bf34612144cae2ac6e9448d WHIRLPOOL 76b500f935ae2133e70affaf12a3fd3c158b60bd5903b160f7f3a63478b092b57cee6046d0b9afb10bf83ec4b869592ea632031cca75c4bff00f5c58b7fe23f6
DIST dovecot-2.2-pigeonhole-0.4.8.tar.gz 1567528 SHA256 d73c1c5a11cdfdcb58304a1c1272cce6c8e1868e3f61d393b3b8a725f3bf665b SHA512 34b0bbe2015f8a9558daa9ae8feebfb42437f99578b551cc15d0d5ac04cafc15bf9c5a8395d6903a013639936a5868e39bbebe6432a989da1411b3dfab351c32 WHIRLPOOL a6ba9fdf03c6c80e3e03c79475a283d4c99011c9763869894e53e84d4f556f1484d6eac9d6482f31972f12b7261afa89e21ea432bf01f9407fa50cf0f7543b4c
+DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 SHA256 82892f876d26008a076973dfddf1cffaf5a0451825fd44e06287e94b89078649 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2 WHIRLPOOL be309436b43af82a7cb8eff205e1638b2c59751927fdab187e6fde72330e4abd99878cbfa94ca50440ec8de1f9b569bf334d426891ddc73d5f647ee2040c193f
DIST dovecot-2.2.16.tar.gz 4830169 SHA256 56ce1287a17fa88a2083116db00200deff1a5390af5eac1c8ae3f59a2079cff0 SHA512 7e910a58cae6d215169a815423bffd1677663ccb1eb400f7f1e733167c29989f3c6786a2d6cea0ef07e64cb08aa1402adb451e0adbbb999f57b3754c0962dbf8 WHIRLPOOL 22b3911e7efa336da792c2af0dde4e556d6c398d9b9f8127e53b13081777b40846a0324b92bc0b41bfd66b6957c6baaeb4e79bd39bf9ba6e91f9e2726a9575a4
DIST dovecot-2.2.18.tar.gz 5100040 SHA256 b6d8468cea47f1227f47b80618f7fb872e2b2e9d3302adc107a005dd083865bb SHA512 227fa9c55070ce305d41faebb0fe15df86cb70427dd4043a01837095228b5504121fccaecfbf47fab3426334449b637bffdfe9a93ee2322bb8ff8d69de4967c7 WHIRLPOOL 117116bd436690613adaf51031fb371a82c55818a9d32f58d098c9d53fe52d27ecfe7466a3ce51ab8cd29c952b72b55586f3cd41e13784a7d614a23eabecab9c
+DIST dovecot-2.2.19.tar.gz 5256627 SHA256 759e1e3f9d907cdaabad1f5fbacc793ca191d234c084bec3bba42966952a4e9f SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9 WHIRLPOOL 30dbe70bfeef10dbe414ebf3f091041ad66926a8748cd401ecaf9ed5c7602939e86943d98bfb839f32c0aa1d0081ab71adacf23bb4adba34e828ee296e9a7278
DIST dovecot-2.2.9.tar.gz 4540858 SHA256 7c3b6b8a05f6ebcc9fd01736fdcac0de12158959f5b99d1f7077f7a8626ee2d5 SHA512 41f826df22d3b34116de7abaa4543cbcf9362d7db1348e3b685019263b89d0ffe8bf0c1ddf21e4baa3bb7e98c87047b85b6fec78873df7f0db18ccecf63cea55 WHIRLPOOL 775cdbca9be788b1d20cd7f45e4d9a6265936b39a780b2232efa84958fa75a11f0984f680249e2af5faf40c9c91fa5c57026b55865dcaeddabcc90d44e3b6fae
diff --git a/net-mail/dovecot/dovecot-2.2.18-r1.ebuild b/net-mail/dovecot/dovecot-2.2.18-r1.ebuild
new file mode 100644
index 0000000..5b195cb
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.18-r1.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.8"
+if [[ ${PV} == *_rc* ]] ; then
+ rc_dir="rc/"
+else
+ rc_dir=""
+fi
+SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+ sieve? (
+ http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ )
+ managesieve? (
+ http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ ) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+ caps? ( sys-libs/libcap )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap )
+ lucene? ( >=dev-cpp/clucene-2.3 )
+ lzma? ( app-arch/xz-utils )
+ lz4? ( app-arch/lz4 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+ selinux? ( sec-policy/selinux-dovecot )
+ solr? ( net-misc/curl dev-libs/expat )
+ sqlite? ( dev-db/sqlite:* )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ tcpd? ( sys-apps/tcp-wrappers )
+ vpopmail? ( net-mail/vpopmail )
+ zlib? ( sys-libs/zlib )
+ virtual/libiconv
+ dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+ net-mail/mailbase"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if use managesieve && ! use sieve; then
+ ewarn "managesieve USE flag selected but sieve USE flag unselected"
+ ewarn "sieve USE flag will be turned on"
+ fi
+ # default internal user
+ enewgroup dovecot 97
+ enewuser dovecot 97 -1 /dev/null dovecot
+ # default login user
+ enewuser dovenull -1 -1 /dev/null
+ # add "mail" group for suid'ing. Better security isolation.
+ if use suid; then
+ enewgroup mail
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-10-ssl.patch"
+
+ epatch_user
+}
+
+src_configure() {
+ local conf=""
+
+ if use postgres || use mysql || use sqlite; then
+ conf="${conf} --with-sql"
+ fi
+
+ local storages=""
+ for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
+ use ${storage} && storages="${storage} ${storages}"
+ done
+ [ "${storages}" ] || storages="maildir"
+
+ # turn valgrind tests off. Bug #340791
+ VALGRIND=no econf \
+ --localstatedir="${EPREFIX}/var" \
+ --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+ --without-stemmer \
+ --with-storages="${storages}" \
+ --disable-rpath \
+ --with-icu \
+ $( systemd_with_unitdir ) \
+ $( use_with bzip2 bzlib ) \
+ $( use_with caps libcap ) \
+ $( use_with kerberos gssapi ) \
+ $( use_with ldap ) \
+ $( use_with lucene ) \
+ $( use_with lz4 ) \
+ $( use_with lzma ) \
+ $( use_with mysql ) \
+ $( use_with pam ) \
+ $( use_with postgres pgsql ) \
+ $( use_with sqlite ) \
+ $( use_with solr ) \
+ $( use_with ssl ) \
+ $( use_with tcpd libwrap ) \
+ $( use_with vpopmail ) \
+ $( use_with zlib ) \
+ $( use_enable static-libs static ) \
+ ${conf}
+
+ if use sieve || use managesieve ; then
+ # The sieve plugin needs this file to be build to determine the plugin
+ # directory and the list of libraries to link to.
+ emake dovecot-config
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ econf \
+ $( use_enable static-libs static ) \
+ --localstatedir="${EPREFIX}/var" \
+ --enable-shared \
+ --with-dovecot="../${MY_P}" \
+ $( use_with managesieve )
+ fi
+}
+
+src_compile() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+ fi
+}
+
+src_test() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ default
+ fi
+}
+
+src_install () {
+ default
+
+ # insecure:
+ # use suid && fperms u+s /usr/libexec/dovecot/deliver
+ # better:
+ if use suid;then
+ einfo "Changing perms to allow deliver to be suided"
+ fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+ fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+ fi
+
+ newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
+
+ rm -rf "${ED}"/usr/share/doc/dovecot
+
+ dodoc AUTHORS NEWS README TODO
+ dodoc doc/*.{txt,cnf,xml,sh}
+ docinto example-config
+ dodoc doc/example-config/*.{conf,ext}
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.{conf,ext}
+ docinto wiki
+ dodoc doc/wiki/*
+ doman doc/man/*.{1,7}
+
+ # Create the dovecot.conf file from the dovecot-example.conf file that
+ # the dovecot folks nicely left for us....
+ local conf="${ED}/etc/dovecot/dovecot.conf"
+ local confd="${ED}/etc/dovecot/conf.d"
+
+ insinto /etc/dovecot
+ doins doc/example-config/*.{conf,ext}
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/*.{conf,ext}
+ fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+ rm -f "${confd}/../README"
+
+ # .maildir is the Gentoo default
+ local mail_location="maildir:~/.maildir"
+ if ! use maildir; then
+ if use mbox; then
+ mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+ keepdir /var/dovecot
+ sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
+ "${confd}/10-mail.conf" || die "sed failed"
+ elif use mdbox ; then
+ mail_location="mdbox:~/.mdbox"
+ elif use sdbox ; then
+ mail_location="sdbox:~/.sdbox"
+ fi
+ fi
+ sed -i -e \
+ "s|#mail_location =|mail_location = ${mail_location}|" \
+ "${confd}/10-mail.conf" \
+ || die "failed to update mail location settings in 10-mail.conf"
+
+ # We're using pam files (imap and pop3) provided by mailbase
+ if use pam; then
+ sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+ "${confd}/auth-system.conf.ext" \
+ || die "failed to update PAM settings in auth-system.conf.ext"
+ # mailbase does not provide a sieve pam file
+ use managesieve && dosym imap /etc/pam.d/sieve
+ sed -i -e \
+ 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update PAM settings in 10-auth.conf"
+ fi
+
+ # Disable ipv6 if necessary
+ if ! use ipv6; then
+ sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+ || die "failed to update listen settings in dovecot.conf"
+ fi
+
+ # Update ssl cert locations
+ if use ssl; then
+ sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+ || die "ssl conf failed"
+ sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+ -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+ "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+ fi
+
+ # Install SQL configuration
+ if use mysql || use postgres; then
+ sed -i -e \
+ 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+ "${confd}/10-auth.conf" || die "failed to update SQL settings in \
+ 10-auth.conf"
+ fi
+
+ # Install LDAP configuration
+ if use ldap; then
+ sed -i -e \
+ 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update ldap settings in 10-auth.conf"
+ fi
+
+ if use vpopmail; then
+ sed -i -e \
+ 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update vpopmail settings in 10-auth.conf"
+ fi
+
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake DESTDIR="${ED}" install
+ sed -i -e \
+ 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+ || die "failed to update sieve settings in 15-lda.conf"
+ rm -rf "${ED}"/usr/share/doc/dovecot
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.conf
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+ use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+ docinto sieve/rfc
+ dodoc doc/rfc/*.txt
+ docinto sieve/devel
+ dodoc doc/devel/DESIGN
+ docinto plugins
+ dodoc doc/plugins/*.txt
+ docinto extensions
+ dodoc doc/extensions/*.txt
+ docinto locations
+ dodoc doc/locations/*.txt
+ doman doc/man/*.{1,7}
+ fi
+
+ use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+ if use ssl; then
+ # Let's not make a new certificate if we already have one
+ if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+ -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
+ einfo "Creating SSL certificate"
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+ install_cert /etc/ssl/dovecot/server
+ fi
+ fi
+
+ elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/dovecot-2.2.18.ebuild b/net-mail/dovecot/dovecot-2.2.18.ebuild
index 566e035..90bfebf 100644
--- a/net-mail/dovecot/dovecot-2.2.18.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.18.ebuild
@@ -25,7 +25,7 @@
SLOT="0"
LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
diff --git a/net-mail/dovecot/dovecot-2.2.19.ebuild b/net-mail/dovecot/dovecot-2.2.19.ebuild
new file mode 100644
index 0000000..3c2689d
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.19.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.9"
+if [[ ${PV} == *_rc* ]] ; then
+ rc_dir="rc/"
+else
+ rc_dir=""
+fi
+SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+ sieve? (
+ http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ )
+ managesieve? (
+ http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ ) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+ caps? ( sys-libs/libcap )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap )
+ lucene? ( >=dev-cpp/clucene-2.3 )
+ lzma? ( app-arch/xz-utils )
+ lz4? ( app-arch/lz4 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+ selinux? ( sec-policy/selinux-dovecot )
+ solr? ( net-misc/curl dev-libs/expat )
+ sqlite? ( dev-db/sqlite:* )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ tcpd? ( sys-apps/tcp-wrappers )
+ vpopmail? ( net-mail/vpopmail )
+ zlib? ( sys-libs/zlib )
+ virtual/libiconv
+ dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+ net-mail/mailbase"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if use managesieve && ! use sieve; then
+ ewarn "managesieve USE flag selected but sieve USE flag unselected"
+ ewarn "sieve USE flag will be turned on"
+ fi
+ # default internal user
+ enewgroup dovecot 97
+ enewuser dovecot 97 -1 /dev/null dovecot
+ # default login user
+ enewuser dovenull -1 -1 /dev/null
+ # add "mail" group for suid'ing. Better security isolation.
+ if use suid; then
+ enewgroup mail
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-10-ssl.patch"
+ epatch_user
+}
+
+src_configure() {
+ local conf=""
+
+ if use postgres || use mysql || use sqlite; then
+ conf="${conf} --with-sql"
+ fi
+
+ local storages=""
+ for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
+ use ${storage} && storages="${storage} ${storages}"
+ done
+ [ "${storages}" ] || storages="maildir"
+
+ # turn valgrind tests off. Bug #340791
+ VALGRIND=no econf \
+ --localstatedir="${EPREFIX}/var" \
+ --runstatedir="${EPREFIX}/run" \
+ --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+ --without-stemmer \
+ --with-storages="${storages}" \
+ --disable-rpath \
+ --with-icu \
+ $( systemd_with_unitdir ) \
+ $( use_with bzip2 bzlib ) \
+ $( use_with caps libcap ) \
+ $( use_with kerberos gssapi ) \
+ $( use_with ldap ) \
+ $( use_with lucene ) \
+ $( use_with lz4 ) \
+ $( use_with lzma ) \
+ $( use_with mysql ) \
+ $( use_with pam ) \
+ $( use_with postgres pgsql ) \
+ $( use_with sqlite ) \
+ $( use_with solr ) \
+ $( use_with ssl ) \
+ $( use_with tcpd libwrap ) \
+ $( use_with vpopmail ) \
+ $( use_with zlib ) \
+ $( use_enable static-libs static ) \
+ ${conf}
+
+ if use sieve || use managesieve ; then
+ # The sieve plugin needs this file to be build to determine the plugin
+ # directory and the list of libraries to link to.
+ emake dovecot-config
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ econf \
+ $( use_enable static-libs static ) \
+ --localstatedir="${EPREFIX}/var" \
+ --enable-shared \
+ --with-dovecot="../${MY_P}" \
+ $( use_with managesieve )
+ fi
+}
+
+src_compile() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+ fi
+}
+
+src_test() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ default
+ fi
+}
+
+src_install () {
+ default
+
+ # insecure:
+ # use suid && fperms u+s /usr/libexec/dovecot/deliver
+ # better:
+ if use suid;then
+ einfo "Changing perms to allow deliver to be suided"
+ fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+ fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+ fi
+
+ newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
+
+ rm -rf "${ED}"/usr/share/doc/dovecot
+
+ dodoc AUTHORS NEWS README TODO
+ dodoc doc/*.{txt,cnf,xml,sh}
+ docinto example-config
+ dodoc doc/example-config/*.{conf,ext}
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.{conf,ext}
+ docinto wiki
+ dodoc doc/wiki/*
+ doman doc/man/*.{1,7}
+
+ # Create the dovecot.conf file from the dovecot-example.conf file that
+ # the dovecot folks nicely left for us....
+ local conf="${ED}/etc/dovecot/dovecot.conf"
+ local confd="${ED}/etc/dovecot/conf.d"
+
+ insinto /etc/dovecot
+ doins doc/example-config/*.{conf,ext}
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/*.{conf,ext}
+ fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+ rm -f "${confd}/../README"
+
+ # .maildir is the Gentoo default
+ local mail_location="maildir:~/.maildir"
+ if ! use maildir; then
+ if use mbox; then
+ mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+ keepdir /var/dovecot
+ sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
+ "${confd}/10-mail.conf" || die "sed failed"
+ elif use mdbox ; then
+ mail_location="mdbox:~/.mdbox"
+ elif use sdbox ; then
+ mail_location="sdbox:~/.sdbox"
+ fi
+ fi
+ sed -i -e \
+ "s|#mail_location =|mail_location = ${mail_location}|" \
+ "${confd}/10-mail.conf" \
+ || die "failed to update mail location settings in 10-mail.conf"
+
+ # We're using pam files (imap and pop3) provided by mailbase
+ if use pam; then
+ sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+ "${confd}/auth-system.conf.ext" \
+ || die "failed to update PAM settings in auth-system.conf.ext"
+ # mailbase does not provide a sieve pam file
+ use managesieve && dosym imap /etc/pam.d/sieve
+ sed -i -e \
+ 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update PAM settings in 10-auth.conf"
+ fi
+
+ # Disable ipv6 if necessary
+ if ! use ipv6; then
+ sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+ || die "failed to update listen settings in dovecot.conf"
+ fi
+
+ # Update ssl cert locations
+ if use ssl; then
+ sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+ || die "ssl conf failed"
+ sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+ -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+ "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+ fi
+
+ # Install SQL configuration
+ if use mysql || use postgres; then
+ sed -i -e \
+ 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+ "${confd}/10-auth.conf" || die "failed to update SQL settings in \
+ 10-auth.conf"
+ fi
+
+ # Install LDAP configuration
+ if use ldap; then
+ sed -i -e \
+ 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update ldap settings in 10-auth.conf"
+ fi
+
+ if use vpopmail; then
+ sed -i -e \
+ 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update vpopmail settings in 10-auth.conf"
+ fi
+
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake DESTDIR="${ED}" install
+ sed -i -e \
+ 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+ || die "failed to update sieve settings in 15-lda.conf"
+ rm -rf "${ED}"/usr/share/doc/dovecot
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.conf
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+ use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+ docinto sieve/rfc
+ dodoc doc/rfc/*.txt
+ docinto sieve/devel
+ dodoc doc/devel/DESIGN
+ docinto plugins
+ dodoc doc/plugins/*.txt
+ docinto extensions
+ dodoc doc/extensions/*.txt
+ docinto locations
+ dodoc doc/locations/*.txt
+ doman doc/man/*.{1,7}
+ fi
+
+ use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+ if use ssl; then
+ # Let's not make a new certificate if we already have one
+ if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+ -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
+ einfo "Creating SSL certificate"
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+ install_cert /etc/ssl/dovecot/server
+ fi
+ fi
+
+ elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/isync/isync-1.2.0.ebuild b/net-mail/isync/isync-1.2.0.ebuild
index cb9b929..9bf3887 100644
--- a/net-mail/isync/isync-1.2.0.ebuild
+++ b/net-mail/isync/isync-1.2.0.ebuild
@@ -10,7 +10,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="compat sasl ssl"
DEPEND=">=sys-libs/db-4.2:*
diff --git a/net-misc/aget/metadata.xml b/net-misc/aget/metadata.xml
index d891030..7026f2a 100644
--- a/net-misc/aget/metadata.xml
+++ b/net-misc/aget/metadata.xml
@@ -6,7 +6,7 @@
<name>Michael Weber</name>
</maintainer>
<longdescription>Aget fetches HTTP URLs in a manner similar to wget, but segments the retrieval into multiple parts to increase download speed. It can be many times as fast as wget in some circumstances.</longdescription>
-<longdescription lang="ja">Aget 㯠wget 風ã®æ¯èã㧠URL ä¸ãã HTTP
-çµç±ã§åãå¯ãã¾ãããç°ãªãç¹ã¨ãã¦ã¯ãã¦ã³ãã¼ãã®ã¹ãã¼ãã¢ããã®ãã対象ãåå²ãã¾ããåå²ãã¦ã
-wget ã¨å¤ãããªãå ´åãããã¾ãã</longdescription>
+<longdescription lang="ja">
+Aget は wget 風の振舞いで URL 上から HTTP 経由で取り寄せますが、異なる点としてはダウンロードのスピードアップのため対象を分割します。分割しても wget と変わらない場合もあります。
+</longdescription>
</pkgmetadata>
diff --git a/net-misc/asterisk/asterisk-11.19.0-r1.ebuild b/net-misc/asterisk/asterisk-11.19.0-r1.ebuild
new file mode 100644
index 0000000..21deb3e
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.19.0-r1.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+ mirror://gentoo/gentoo-asterisk-patchset-3.16.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+ +voicemail_storage_file
+ voicemail_storage_odbc
+ voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+ dev-libs/popt
+ dev-libs/libxml2
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ sys-libs/ncurses
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez )
+ calendar? ( net-libs/neon
+ dev-libs/libical
+ dev-libs/iksemel )
+ caps? ( sys-libs/libcap )
+ cluster? ( sys-cluster/corosync )
+ curl? ( net-misc/curl )
+ dahdi? ( >=net-libs/libpri-1.4.12_beta2
+ net-misc/dahdi-tools )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( dev-libs/ilbc-rfc3951 )
+ xmpp? ( dev-libs/iksemel )
+ ldap? ( net-nds/openldap )
+ libedit? ( dev-libs/libedit )
+ lua? ( dev-lang/lua:* )
+ mysql? ( virtual/mysql )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ osplookup? ( net-libs/osptoolkit )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/radiusclient-ng )
+ snmp? ( net-analyzer/net-snmp )
+ span? ( media-libs/spandsp )
+ speex? ( media-libs/speex )
+ srtp? ( net-libs/libsrtp )
+ vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+ !net-libs/openh323
+ !net-libs/pjsip
+ voicemail_storage_imap? ( virtual/imap-c-client )
+ virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-asterisk )
+ syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ enewgroup asterisk
+ enewgroup dialout 20
+ enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+ base_src_prepare
+ AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+ local vmst
+
+ econf \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-ssl \
+ --with-z \
+ --without-pwlib \
+ $(use_with caps cap) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with portaudio)
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ menuselect/menuselect --disable chan_misdn menuselect.makeopts
+ menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ menuselect/menuselect --enable smsq menuselect.makeopts
+ menuselect/menuselect --enable streamplayer menuselect.makeopts
+ menuselect/menuselect --enable aelparse menuselect.makeopts
+ menuselect/menuselect --enable astman menuselect.makeopts
+
+ # this is connected, otherwise it would not find
+ # ast_pktccops_gate_alloc symbol
+ menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+ menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+ menuselect/menuselect --enable func_aes menuselect.makeopts
+ menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ menuselect/menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ use_select alsa chan_alsa
+ use_select bluetooth chan_mobile
+ use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ use_select cluster res_corosync
+ use_select curl func_curl res_config_curl res_curl
+ use_select dahdi app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ use_select freetds {cdr,cel}_tds
+ use_select gtalk chan_motif
+ use_select http res_http_post
+ use_select iconv func_iconv
+ use_select xmpp res_xmpp
+ use_select ilbc codec_ilbc format_ilbc
+ use_select ldap res_config_ldap
+ use_select lua pbx_lua
+ use_select mysql app_mysql cdr_mysql res_config_mysql
+ use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ use_select osplookup app_osplookup
+ use_select oss chan_oss
+ use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ use_select radius {cdr,cel}_radius
+ use_select snmp res_snmp
+ use_select span res_fax_spandsp
+ use_select speex {codec,func}_speex
+ use_select srtp res_srtp
+ use_select syslog cdr_syslog
+ use_select vorbis format_ogg_vorbis
+
+ # Voicemail storage ...
+ for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+ if use ${vmst}; then
+ menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+ menuselect/menuselect --enable $o menuselect.makeopts
+ done
+ fi
+}
+
+src_compile() {
+ ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+ mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+ emake DESTDIR="${D}" installdirs
+ emake DESTDIR="${D}" install
+
+ if use radius; then
+ insinto /etc/radiusclient-ng/
+ doins contrib/dictionary.digium
+ fi
+ diropts -m 0750 -o root -g asterisk
+ keepdir /etc/asterisk
+ if use samples; then
+ emake DESTDIR="${D}" samples
+ for conffile in "${D}"etc/asterisk/*.*
+ do
+ chown root:root $conffile
+ chmod 0644 $conffile
+ done
+ einfo "Sample files have been installed"
+ else
+ einfo "Skipping installation of sample files..."
+ rm -f "${D}"var/lib/asterisk/mohmp3/* || die
+ rm -f "${D}"var/lib/asterisk/sounds/demo-* || die
+ rm -f "${D}"var/lib/asterisk/agi-bin/* || die
+ rm -f "${D}"etc/asterisk/* || die
+ fi
+ rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+ # keep directories
+ diropts -m 0770 -o asterisk asterisk
+ keepdir /var/lib/asterisk
+ keepdir /var/spool/asterisk
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+ newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+ systemd_dounit "${FILESDIR}"/asterisk.service
+ systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+ systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+ # install the upgrade documentation
+ #
+ dodoc README UPGRADE* BUGS CREDITS
+
+ # install extra documentation
+ #
+ if use doc
+ then
+ dodoc doc/*.txt
+ dodoc doc/*.pdf
+ fi
+
+ # install SIP scripts; bug #300832
+ #
+ dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+ dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+ dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+ dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+ # install logrotate snippet; bug #329281
+ #
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+ #
+ # Announcements, warnings, reminders...
+ #
+ einfo "Asterisk has been installed"
+ echo
+ elog "If you want to know more about asterisk, visit these sites:"
+ elog "http://www.asteriskdocs.org/"
+ elog "http://www.voip-info.org/wiki-Asterisk"
+ echo
+ elog "http://www.automated.it/guidetoasterisk.htm"
+ echo
+ elog "Gentoo VoIP IRC Channel:"
+ elog "#gentoo-voip @ irc.freenode.net"
+ echo
+ echo
+ elog "Please read the Asterisk 11 upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+ einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+ read tmp
+ tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+ if [[ "$tmp" = "y" ]] ||\
+ [[ "$tmp" = "yes" ]]
+ then
+ einfo "Resetting permissions to defaults..."
+
+ for x in spool run lib log; do
+ chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+ chmod -R u=rwX,g=rwX,o= "${ROOT}"var/${x}/asterisk
+ done
+
+ chown -R root:asterisk "${ROOT}"etc/asterisk
+ chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+ einfo "done"
+ else
+ einfo "skipping"
+ fi
+}
diff --git a/net-misc/asterisk/asterisk-13.5.0-r1.ebuild b/net-misc/asterisk/asterisk-13.5.0-r1.ebuild
new file mode 100644
index 0000000..4463e3e
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.5.0-r1.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+ mirror://gentoo/gentoo-asterisk-patchset-4.02.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+ +voicemail_storage_file
+ voicemail_storage_odbc
+ voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+ dev-libs/popt
+ dev-libs/jansson
+ dev-libs/libxml2
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ sys-libs/ncurses
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez )
+ calendar? ( net-libs/neon
+ dev-libs/libical
+ dev-libs/iksemel )
+ caps? ( sys-libs/libcap )
+ cluster? ( sys-cluster/corosync )
+ curl? ( net-misc/curl )
+ dahdi? ( >=net-libs/libpri-1.4.12_beta2
+ net-misc/dahdi-tools )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( dev-libs/ilbc-rfc3951 )
+ xmpp? ( dev-libs/iksemel )
+ ldap? ( net-nds/openldap )
+ libedit? ( dev-libs/libedit )
+ lua? ( dev-lang/lua:* )
+ mysql? ( virtual/mysql )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ osplookup? ( net-libs/osptoolkit )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/radiusclient-ng )
+ snmp? ( net-analyzer/net-snmp )
+ span? ( media-libs/spandsp )
+ speex? ( media-libs/speex )
+ srtp? ( net-libs/libsrtp )
+ vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+ !net-libs/openh323
+ !net-libs/pjsip
+ voicemail_storage_imap? ( virtual/imap-c-client )
+ virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-asterisk )
+ syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ enewgroup asterisk
+ enewgroup dialout 20
+ enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+ base_src_prepare
+ AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+ local vmst
+
+ econf \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-ssl \
+ --with-z \
+ --without-pwlib \
+ $(use_with caps cap) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with portaudio)
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ menuselect/menuselect --disable chan_misdn menuselect.makeopts
+ menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ menuselect/menuselect --enable smsq menuselect.makeopts
+ menuselect/menuselect --enable streamplayer menuselect.makeopts
+ menuselect/menuselect --enable aelparse menuselect.makeopts
+ menuselect/menuselect --enable astman menuselect.makeopts
+
+ # this is connected, otherwise it would not find
+ # ast_pktccops_gate_alloc symbol
+ menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+ menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+ menuselect/menuselect --enable func_aes menuselect.makeopts
+ menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ menuselect/menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ use_select alsa chan_alsa
+ use_select bluetooth chan_mobile
+ use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ use_select cluster res_corosync
+ use_select curl func_curl res_config_curl res_curl
+ use_select dahdi app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ use_select freetds {cdr,cel}_tds
+ use_select gtalk chan_motif
+ use_select http res_http_post
+ use_select iconv func_iconv
+ use_select xmpp res_xmpp
+ use_select ilbc codec_ilbc format_ilbc
+ use_select ldap res_config_ldap
+ use_select lua pbx_lua
+ use_select mysql app_mysql cdr_mysql res_config_mysql
+ use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ use_select osplookup app_osplookup
+ use_select oss chan_oss
+ use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ use_select radius {cdr,cel}_radius
+ use_select snmp res_snmp
+ use_select span res_fax_spandsp
+ use_select speex {codec,func}_speex
+ use_select srtp res_srtp
+ use_select syslog cdr_syslog
+ use_select vorbis format_ogg_vorbis
+
+ # Voicemail storage ...
+ for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+ if use ${vmst}; then
+ menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+ menuselect/menuselect --enable $o menuselect.makeopts
+ done
+ fi
+}
+
+src_compile() {
+ ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+ mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+ emake DESTDIR="${D}" installdirs
+ emake DESTDIR="${D}" install
+
+ if use radius; then
+ insinto /etc/radiusclient-ng/
+ doins contrib/dictionary.digium
+ fi
+ diropts -m 0750 -o root -g asterisk
+ keepdir /etc/asterisk
+ if use samples; then
+ emake DESTDIR="${D}" samples
+ for conffile in "${D}"etc/asterisk/*.*
+ do
+ chown root:root $conffile
+ chmod 0644 $conffile
+ done
+ einfo "Sample files have been installed"
+ else
+ einfo "Skipping installation of sample files..."
+ rm -f "${D}"var/lib/asterisk/mohmp3/* || die
+ rm -f "${D}"var/lib/asterisk/sounds/demo-* || die
+ rm -f "${D}"var/lib/asterisk/agi-bin/* || die
+ rm -f "${D}"etc/asterisk/* || die
+ fi
+ rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+ # keep directories
+ diropts -m 0770 -o asterisk asterisk
+ keepdir /var/lib/asterisk
+ keepdir /var/spool/asterisk
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+ newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+ systemd_dounit "${FILESDIR}"/asterisk.service
+ systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+ systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+ # install the upgrade documentation
+ #
+ dodoc README UPGRADE* BUGS CREDITS
+
+ # install extra documentation
+ #
+ if use doc
+ then
+ dodoc doc/*.txt
+ dodoc doc/*.pdf
+ fi
+
+ # install SIP scripts; bug #300832
+ #
+ dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+ dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+ dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+ dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+ # install logrotate snippet; bug #329281
+ #
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+ #
+ # Announcements, warnings, reminders...
+ #
+ einfo "Asterisk has been installed"
+ echo
+ elog "If you want to know more about asterisk, visit these sites:"
+ elog "http://www.asteriskdocs.org/"
+ elog "http://www.voip-info.org/wiki-Asterisk"
+ echo
+ elog "http://www.automated.it/guidetoasterisk.htm"
+ echo
+ elog "Gentoo VoIP IRC Channel:"
+ elog "#gentoo-voip @ irc.freenode.net"
+ echo
+ echo
+ elog "Please read the Asterisk 13 upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
+}
+
+pkg_config() {
+ einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+ read tmp
+ tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+ if [[ "$tmp" = "y" ]] ||\
+ [[ "$tmp" = "yes" ]]
+ then
+ einfo "Resetting permissions to defaults..."
+
+ for x in spool run lib log; do
+ chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+ chmod -R u=rwX,g=rwX,o= "${ROOT}"var/${x}/asterisk
+ done
+
+ chown -R root:asterisk "${ROOT}"etc/asterisk
+ chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+ einfo "done"
+ else
+ einfo "skipping"
+ fi
+}
diff --git a/net-misc/axel/axel-2.4-r3.ebuild b/net-misc/axel/axel-2.4-r3.ebuild
index e3cffa2..632ffe5 100644
--- a/net-misc/axel/axel-2.4-r3.ebuild
+++ b/net-misc/axel/axel-2.4-r3.ebuild
@@ -14,7 +14,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="amd64 hppa ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
IUSE="debug nls"
DEPEND="nls? ( sys-devel/gettext )"
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index a956ce6..176dd2e 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -1,10 +1,4 @@
DIST bfgminer-3.10.10.tbz2 1087392 SHA256 b361d6f195e4c91eb01b08f0907615029fc9bd7d58c017bc7943d0333c4ba018 SHA512 c8f6ee424dfd948f543c4ef20885f683acd9fc8925eb4cd2b4255b4b1073b5a58303f468adff2e9689df16833d4a1cdabc9f464d241d9eb1c8c5df0eae322cf0 WHIRLPOOL aabce648db6026f6a4527dafa6ed7e64b03cb9b0e5993a8a48b22c93683b78f992f0cb67c03dd2c72945bc92a42fa514a7a28a97a7e73149ddf1fd5e840c8d6a
DIST bfgminer-3.10.5.tbz2 1091287 SHA256 224e02979ed27f7cebe47ca7a17fa9a1ecce7680531c3995daade54cc3be2807 SHA512 500745b09ced2102cb7bfee8dbe3e44bf69c3220fff5d2fdc642a1b4c0674f36a1786c1e384ab641dde5b3149713d9b0a4e520cfd50c2cc89710fe54f1315303 WHIRLPOOL 0b4299b56b86cc4633225a321c957ce47fd719f3132c32f34618de2e7b15fc388a39cc3627959207490d7f8fb263942cc3be5a710b9cbe7114988364ba1a43fa
-DIST bfgminer-3.10.8.tbz2 1090429 SHA256 d9e67dfab78c3400954285d5f7d931f057bc8f491aacd387eb2ebe0d71414258 SHA512 dd42963d051cd64ab7b93404e2fe65b2de277b1e31af78defc595955a09064102ef006352c91a94c91b77aebbff967eb6ee04c4b625752331ff679a612f762fd WHIRLPOOL 74bdd376d6908c23d3308075e36eacac3523b24991e459b87411ef041a95e4ac07c03aa89a080847e07dfea5032c2093779e52de638374b54e7081b883e1bf33
-DIST bfgminer-4.10.1.tar.xz 986132 SHA256 a7862aabf8470c71fb275e2561ab9c1b1f1c19ba58d054048947c467f270330a SHA512 2e23d57261ce7ebc20b3b5a61e0454a69c06966bd8a04de85102e13f94052e527e04eff0314c323c54ca690b200a16b011b73a821a049993c4db5196b233cc94 WHIRLPOOL 4e82cee09452f1baac54320f3dd2c13e07c44ad395fed5762d5cceb505c593689b981c2ddde920a3f617528a0d2cd7d8c2bf81c1d50ddad8c44a260c4a1f8052
-DIST bfgminer-4.10.2.tar.xz 996560 SHA256 f7977bdf2ecd07962cf365b045ef440afd31b38034d3268091ccf74c84644b43 SHA512 1630007b437b78f3314a46a7064070cdaa64c9547311e3021717430d6364803d1cec91bb66d483cd6cee35c6422168b6413e91fade18d536df729caf5d17ab09 WHIRLPOOL e4d65b4ecfb94bff649b4e5625df1b2336747f863c8be86679b06b048e04ceb32ff0a716c621276373b489bedc6ce2884d2792af742874ab3cf7ef0e309f1e70
DIST bfgminer-4.10.3.tar.xz 988552 SHA256 c9e4ac3754dad838d3a8120afd499751ac2e8b15fe6dd6d18be28fc1ec72355a SHA512 99b684382c61c9e2eb0a3469af0f33ddb427f8f612bbad5623de29168547c7a87d065b18134b7e944163dcb429a9025f42c19ff8ac68cfeed705e008ef6292fb WHIRLPOOL b0887909dc878d9cf914bd092f3abbc2527a30cb4359f31cafbcc417cffa145bc3d3ab7a4809e8b068d8545ee5f01078cde753e37a615dc4532a2a352d75987a
-DIST bfgminer-5.0.0.tar.xz 1012092 SHA256 f1dada4d83737f7bc9623ad695a07a88808d8103c9c7617ce18825d241e328fd SHA512 fc1b116347e0b2af4e2c7f895368abe156019be5495e286df2f90708c16c1739e7362682389eb88ce64835d53545a5603eab4818d70018f7f872a28b4ec6c797 WHIRLPOOL 95085f7ddc374579520bae130b12923669c5788c0ea21e7377e57e907ed997936f6a413d9067c0121410bde42b33c0b194774794965a86328b60f3cf0d881165
-DIST bfgminer-5.1.0.tar.xz 1024292 SHA256 436595e8b3af267e8fed023ac6b5f208a385d891d0c3c1c41b8aa13f1c1e69c9 SHA512 826f3b1b2a3c0c0ce66ce888308cc531a2f8cf8212771bc07a650cf2811aeb40ed1d41ba1ffc8b3b16719cf261a5ce9d087bfa17603255cc53f0866b7ddc5459 WHIRLPOOL 9e1310b47f678c17840216e82f99d3c06152ad2efd49096ce27e31614282da62359bcca1e0a812ca2433fc933c5848ae0a8c271ccb2b7c8a7102e7d25b022ad2
-DIST bfgminer-5.2.0.tar.xz 1017012 SHA256 0cec8a4012d5784f781201d245bee834b0085274a24737ff3a4d0a28d48edc28 SHA512 5bb930d3cf9aed0ae9eaabbd92c3a26146a7308e61bcf5ebdf67f8f5f70a7bae1df0bad51312b4bdfabcc10547b0d991a1117db5f6b98b1047c1dae6fd880f85 WHIRLPOOL f18d4d029d6296d130bbb439b1323fe9ae8dfd89ddc3cdd3f4f85742969a17ccadb7ad49ff3527e9399d4b60ff6b7c2bd83cd291003e0f676af4307141b635da
DIST bfgminer-5.3.0.tar.xz 1017536 SHA256 d48fa6e51ff70ee1a85f77334a24f842ca6774c073c2d864fe739f07093ef77f SHA512 935b2a0595a2230f8ba9f832a280f52418c1b50b884010bebd2059cbef83d28c535d8d0b3cd7abe5b2420f6dc9fa8e9e0e32839ccdb6cd002a1e874dc5b1841a WHIRLPOOL 0244c9cf2a8928590f69819cfaa222498ae9e0b65aba4c0bc3fc751b7712e9284110ef238dd3bdeaa0562f4eaa292b4257e4d509966ff8e92731dd3f1d9f8ecc
diff --git a/net-misc/bfgminer/bfgminer-3.10.8.ebuild b/net-misc/bfgminer/bfgminer-3.10.8.ebuild
deleted file mode 100644
index fea1916..0000000
--- a/net-misc/bfgminer/bfgminer-3.10.8.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-# TODO: knc (needs i2c-tools header)
-IUSE="+adl antminer avalon bifury bitforce bfsb bigpic bitfury cpumining drillbit examples hardened hashbuster hashbuster2 hashfast icarus klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses +opencl proxy proxy_getwork proxy_stratum screen scrypt twinfury +udev unicode x6500 ztex"
-REQUIRED_USE='
- || ( antminer avalon bfsb bifury bigpic bitforce bitfury cpumining drillbit hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 ztex )
- adl? ( opencl )
- bfsb? ( bitfury )
- bigpic? ( bitfury )
- drillbit? ( bitfury )
- hashbuster? ( bitfury )
- hashbuster2? ( bitfury libusb )
- klondike? ( libusb )
- littlefury? ( bitfury )
- lm_sensors? ( opencl )
- metabank? ( bitfury )
- nanofury? ( bitfury )
- scrypt? ( || ( cpumining opencl proxy ) )
- twinfury? ( bitfury )
- unicode? ( ncurses )
- proxy? ( || ( proxy_getwork proxy_stratum ) )
- proxy_getwork? ( proxy )
- proxy_stratum? ( proxy )
- x6500? ( libusb )
- ztex? ( libusb )
-'
-
-DEPEND='
- net-misc/curl
- ncurses? (
- sys-libs/ncurses:=[unicode?]
- )
- >=dev-libs/jansson-2
- net-libs/libblkmaker:=
- udev? (
- virtual/udev
- )
- hashbuster? (
- dev-libs/hidapi
- )
- libusb? (
- virtual/libusb:1
- )
- lm_sensors? (
- sys-apps/lm_sensors
- )
- nanofury? (
- dev-libs/hidapi
- )
- proxy_getwork? (
- net-libs/libmicrohttpd
- )
- proxy_stratum? (
- dev-libs/libevent
- )
- screen? (
- app-misc/screen
- || (
- >=sys-apps/coreutils-8.15
- sys-freebsd/freebsd-bin
- app-misc/realpath
- )
- )
-'
-RDEPEND="${DEPEND}
- opencl? (
- || (
- virtual/opencl
- dev-util/nvidia-cuda-sdk[opencl]
- )
- )
-"
-DEPEND="${DEPEND}
- virtual/pkgconfig
- >=dev-libs/uthash-1.9.7
- sys-apps/sed
- cpumining? (
- amd64? (
- >=dev-lang/yasm-1.0.1
- )
- x86? (
- >=dev-lang/yasm-1.0.1
- )
- )
-"
-
-src_configure() {
- local CFLAGS="${CFLAGS}"
- local with_curses
- use hardened && CFLAGS="${CFLAGS} -nopie"
-
- if use ncurses; then
- if use unicode; then
- with_curses='--with-curses=ncursesw'
- else
- with_curses='--with-curses=ncurses'
- fi
- else
- with_curses='--without-curses'
- fi
-
- CFLAGS="${CFLAGS}" \
- econf \
- --docdir="/usr/share/doc/${PF}" \
- $(use_enable adl) \
- $(use_enable antminer) \
- $(use_enable avalon) \
- $(use_enable bifury) \
- $(use_enable bitforce) \
- $(use_enable bfsb) \
- $(use_enable bigpic) \
- $(use_enable bitfury) \
- $(use_enable cpumining) \
- $(use_enable drillbit) \
- $(use_enable hashbuster) \
- $(use_enable hashbuster2 hashbusterusb) \
- $(use_enable hashfast) \
- $(use_enable icarus) \
- $(use_enable klondike) \
- $(use_enable littlefury) \
- $(use_enable metabank) \
- $(use_enable modminer) \
- $(use_enable nanofury) \
- $(use_enable opencl) \
- $(use_enable scrypt) \
- $(use_enable twinfury) \
- --with-system-libblkmaker \
- $with_curses \
- $(use_with udev libudev) \
- $(use_with lm_sensors sensors) \
- $(use_with proxy_getwork libmicrohttpd) \
- $(use_with proxy_stratum libevent) \
- $(use_enable x6500) \
- $(use_enable ztex)
-}
-
-src_install() {
- emake install DESTDIR="$D"
- if ! use examples; then
- rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
- fi
- if ! use screen; then
- rm "${D}/usr/bin/start-bfgminer.sh"
- fi
-}
diff --git a/net-misc/bfgminer/bfgminer-4.10.1.ebuild b/net-misc/bfgminer/bfgminer-4.10.1.ebuild
deleted file mode 100644
index 66a4b78..0000000
--- a/net-misc/bfgminer/bfgminer-4.10.1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-# TODO: knc (needs i2c-tools header)
-# TODO: minergate (needs actual miner_gate)
-# TODO: titan
-IUSE="adl antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
-REQUIRED_USE='
- || ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
- adl? ( opencl )
- bfsb? ( bitfury )
- bfx? ( bitfury libusb )
- bigpic? ( bitfury )
- drillbit? ( bitfury )
- dualminer? ( icarus )
- gridseed? ( scrypt )
- hashbuster? ( bitfury )
- hashbuster2? ( bitfury libusb )
- klondike? ( libusb )
- littlefury? ( bitfury )
- lm_sensors? ( opencl )
- metabank? ( bitfury )
- nanofury? ( bitfury )
- scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
- twinfury? ( bitfury )
- unicode? ( ncurses )
- proxy? ( || ( proxy_getwork proxy_stratum ) )
- proxy_getwork? ( proxy )
- proxy_stratum? ( proxy )
- x6500? ( libusb )
- zeusminer? ( scrypt )
- ztex? ( libusb )
-'
-
-DEPEND='
- net-misc/curl
- ncurses? (
- sys-libs/ncurses:=[unicode?]
- )
- >=dev-libs/jansson-2
- dev-libs/libbase58
- net-libs/libblkmaker
- udev? (
- virtual/udev
- )
- hashbuster? (
- dev-libs/hidapi
- )
- libusb? (
- virtual/libusb:1
- )
- lm_sensors? (
- sys-apps/lm_sensors
- )
- nanofury? (
- dev-libs/hidapi
- )
- proxy_getwork? (
- net-libs/libmicrohttpd
- )
- proxy_stratum? (
- dev-libs/libevent
- )
- screen? (
- app-misc/screen
- || (
- >=sys-apps/coreutils-8.15
- sys-freebsd/freebsd-bin
- app-misc/realpath
- )
- )
-'
-RDEPEND="${DEPEND}
- opencl? (
- || (
- virtual/opencl
- dev-util/nvidia-cuda-sdk[opencl]
- )
- )
-"
-DEPEND="${DEPEND}
- virtual/pkgconfig
- >=dev-libs/uthash-1.9.7
- sys-apps/sed
- cpumining? (
- amd64? (
- >=dev-lang/yasm-1.0.1
- )
- x86? (
- >=dev-lang/yasm-1.0.1
- )
- )
-"
-
-src_configure() {
- local CFLAGS="${CFLAGS}"
- local with_curses
- use hardened && CFLAGS="${CFLAGS} -nopie"
-
- if use ncurses; then
- if use unicode; then
- with_curses='--with-curses=ncursesw'
- else
- with_curses='--with-curses=ncurses'
- fi
- else
- with_curses='--without-curses'
- fi
-
- CFLAGS="${CFLAGS}" \
- econf \
- --docdir="/usr/share/doc/${PF}" \
- $(use_enable adl) \
- $(use_enable antminer) \
- $(use_enable avalon) \
- $(use_enable avalonmm) \
- $(use_enable bifury) \
- $(use_enable bitforce) \
- $(use_enable bfsb) \
- $(use_enable bfx) \
- $(use_enable bigpic) \
- $(use_enable bitfury) \
- $(use_enable cointerra) \
- $(use_enable cpumining) \
- $(use_enable drillbit) \
- $(use_enable dualminer) \
- $(use_enable gridseed) \
- $(use_enable hashbuster) \
- $(use_enable hashbuster2 hashbusterusb) \
- $(use_enable hashfast) \
- $(use_enable icarus) \
- $(use_enable jingtian) \
- $(use_enable klondike) \
- $(use_enable littlefury) \
- $(use_enable metabank) \
- $(use_enable modminer) \
- $(use_enable nanofury) \
- $(use_enable opencl) \
- $(use_enable rockminer) \
- $(use_enable scrypt) \
- $(use_enable twinfury) \
- --with-system-libblkmaker \
- $with_curses \
- $(use_with udev libudev) \
- $(use_enable udev-broad-rules broad-udevrules) \
- $(use_with lm_sensors sensors) \
- $(use_with proxy_getwork libmicrohttpd) \
- $(use_with proxy_stratum libevent) \
- $(use_enable x6500) \
- $(use_enable zeusminer) \
- $(use_enable ztex)
-}
-
-src_install() {
- emake install DESTDIR="$D"
- if ! use examples; then
- rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
- fi
- if ! use screen; then
- rm "${D}/usr/bin/start-bfgminer.sh"
- fi
-}
diff --git a/net-misc/bfgminer/bfgminer-4.10.2.ebuild b/net-misc/bfgminer/bfgminer-4.10.2.ebuild
deleted file mode 100644
index 66a4b78..0000000
--- a/net-misc/bfgminer/bfgminer-4.10.2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-# TODO: knc (needs i2c-tools header)
-# TODO: minergate (needs actual miner_gate)
-# TODO: titan
-IUSE="adl antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
-REQUIRED_USE='
- || ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
- adl? ( opencl )
- bfsb? ( bitfury )
- bfx? ( bitfury libusb )
- bigpic? ( bitfury )
- drillbit? ( bitfury )
- dualminer? ( icarus )
- gridseed? ( scrypt )
- hashbuster? ( bitfury )
- hashbuster2? ( bitfury libusb )
- klondike? ( libusb )
- littlefury? ( bitfury )
- lm_sensors? ( opencl )
- metabank? ( bitfury )
- nanofury? ( bitfury )
- scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
- twinfury? ( bitfury )
- unicode? ( ncurses )
- proxy? ( || ( proxy_getwork proxy_stratum ) )
- proxy_getwork? ( proxy )
- proxy_stratum? ( proxy )
- x6500? ( libusb )
- zeusminer? ( scrypt )
- ztex? ( libusb )
-'
-
-DEPEND='
- net-misc/curl
- ncurses? (
- sys-libs/ncurses:=[unicode?]
- )
- >=dev-libs/jansson-2
- dev-libs/libbase58
- net-libs/libblkmaker
- udev? (
- virtual/udev
- )
- hashbuster? (
- dev-libs/hidapi
- )
- libusb? (
- virtual/libusb:1
- )
- lm_sensors? (
- sys-apps/lm_sensors
- )
- nanofury? (
- dev-libs/hidapi
- )
- proxy_getwork? (
- net-libs/libmicrohttpd
- )
- proxy_stratum? (
- dev-libs/libevent
- )
- screen? (
- app-misc/screen
- || (
- >=sys-apps/coreutils-8.15
- sys-freebsd/freebsd-bin
- app-misc/realpath
- )
- )
-'
-RDEPEND="${DEPEND}
- opencl? (
- || (
- virtual/opencl
- dev-util/nvidia-cuda-sdk[opencl]
- )
- )
-"
-DEPEND="${DEPEND}
- virtual/pkgconfig
- >=dev-libs/uthash-1.9.7
- sys-apps/sed
- cpumining? (
- amd64? (
- >=dev-lang/yasm-1.0.1
- )
- x86? (
- >=dev-lang/yasm-1.0.1
- )
- )
-"
-
-src_configure() {
- local CFLAGS="${CFLAGS}"
- local with_curses
- use hardened && CFLAGS="${CFLAGS} -nopie"
-
- if use ncurses; then
- if use unicode; then
- with_curses='--with-curses=ncursesw'
- else
- with_curses='--with-curses=ncurses'
- fi
- else
- with_curses='--without-curses'
- fi
-
- CFLAGS="${CFLAGS}" \
- econf \
- --docdir="/usr/share/doc/${PF}" \
- $(use_enable adl) \
- $(use_enable antminer) \
- $(use_enable avalon) \
- $(use_enable avalonmm) \
- $(use_enable bifury) \
- $(use_enable bitforce) \
- $(use_enable bfsb) \
- $(use_enable bfx) \
- $(use_enable bigpic) \
- $(use_enable bitfury) \
- $(use_enable cointerra) \
- $(use_enable cpumining) \
- $(use_enable drillbit) \
- $(use_enable dualminer) \
- $(use_enable gridseed) \
- $(use_enable hashbuster) \
- $(use_enable hashbuster2 hashbusterusb) \
- $(use_enable hashfast) \
- $(use_enable icarus) \
- $(use_enable jingtian) \
- $(use_enable klondike) \
- $(use_enable littlefury) \
- $(use_enable metabank) \
- $(use_enable modminer) \
- $(use_enable nanofury) \
- $(use_enable opencl) \
- $(use_enable rockminer) \
- $(use_enable scrypt) \
- $(use_enable twinfury) \
- --with-system-libblkmaker \
- $with_curses \
- $(use_with udev libudev) \
- $(use_enable udev-broad-rules broad-udevrules) \
- $(use_with lm_sensors sensors) \
- $(use_with proxy_getwork libmicrohttpd) \
- $(use_with proxy_stratum libevent) \
- $(use_enable x6500) \
- $(use_enable zeusminer) \
- $(use_enable ztex)
-}
-
-src_install() {
- emake install DESTDIR="$D"
- if ! use examples; then
- rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
- fi
- if ! use screen; then
- rm "${D}/usr/bin/start-bfgminer.sh"
- fi
-}
diff --git a/net-misc/bfgminer/bfgminer-4.10.3.ebuild b/net-misc/bfgminer/bfgminer-4.10.3.ebuild
index 66a4b78..052976b 100644
--- a/net-misc/bfgminer/bfgminer-4.10.3.ebuild
+++ b/net-misc/bfgminer/bfgminer-4.10.3.ebuild
@@ -41,7 +41,7 @@
proxy_getwork? ( proxy )
proxy_stratum? ( proxy )
x6500? ( libusb )
- zeusminer? ( scrypt )
+ zeusminer? ( scrypt icarus )
ztex? ( libusb )
'
diff --git a/net-misc/bfgminer/bfgminer-5.0.0.ebuild b/net-misc/bfgminer/bfgminer-5.0.0.ebuild
deleted file mode 100644
index bad51c9..0000000
--- a/net-misc/bfgminer/bfgminer-5.0.0.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-# TODO: knc (needs i2c-tools header)
-# TODO: kncasic & titan (need systemwide knc-asic install)
-# TODO: minergate (needs actual miner_gate)
-IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
-REQUIRED_USE='
- || ( keccak scrypt sha256d )
- || ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
- adl? ( opencl )
- antminer? ( sha256d )
- avalon? ( sha256d )
- avalonmm? ( sha256d )
- bfsb? ( sha256d bitfury )
- bfx? ( sha256d bitfury libusb )
- bifury? ( sha256d )
- bigpic? ( sha256d bitfury )
- bitforce? ( sha256d )
- bitfury? ( sha256d )
- cointerra? ( sha256d )
- drillbit? ( sha256d bitfury )
- dualminer? ( || ( sha256d scrypt ) icarus )
- gridseed? ( scrypt )
- hashbuster? ( sha256d bitfury )
- hashbuster2? ( sha256d bitfury libusb )
- hashfast? ( sha256d )
- icarus? ( || ( scrypt sha256d ) )
- jingtian? ( sha256d )
- keccak? ( || ( cpumining opencl proxy ) )
- klondike? ( sha256d libusb )
- littlefury? ( sha256d bitfury )
- lm_sensors? ( opencl )
- metabank? ( sha256d bitfury )
- minion? ( sha256d )
- modminer? ( sha256d )
- nanofury? ( sha256d bitfury )
- scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
- sha256d? ( || ( antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
- twinfury? ( bitfury )
- unicode? ( ncurses )
- proxy? ( || ( proxy_getwork proxy_stratum ) )
- proxy_getwork? ( proxy )
- proxy_stratum? ( proxy )
- rockminer? ( sha256d )
- twinfury? ( sha256d )
- x6500? ( sha256d libusb )
- zeusminer? ( scrypt )
- ztex? ( sha256d libusb )
-'
-
-DEPEND='
- net-misc/curl
- ncurses? (
- sys-libs/ncurses:=[unicode?]
- )
- >=dev-libs/jansson-2
- dev-libs/libbase58
- net-libs/libblkmaker
- udev? (
- virtual/udev
- )
- hashbuster? (
- dev-libs/hidapi
- )
- libusb? (
- virtual/libusb:1
- )
- lm_sensors? (
- sys-apps/lm_sensors
- )
- nanofury? (
- dev-libs/hidapi
- )
- proxy_getwork? (
- net-libs/libmicrohttpd
- )
- proxy_stratum? (
- dev-libs/libevent
- )
- screen? (
- app-misc/screen
- || (
- >=sys-apps/coreutils-8.15
- sys-freebsd/freebsd-bin
- app-misc/realpath
- )
- )
-'
-RDEPEND="${DEPEND}
- opencl? (
- || (
- virtual/opencl
- dev-util/nvidia-cuda-sdk[opencl]
- )
- )
-"
-DEPEND="${DEPEND}
- virtual/pkgconfig
- >=dev-libs/uthash-1.9.7
- sys-apps/sed
- cpumining? (
- amd64? (
- >=dev-lang/yasm-1.0.1
- )
- x86? (
- >=dev-lang/yasm-1.0.1
- )
- )
-"
-
-src_configure() {
- local CFLAGS="${CFLAGS}"
- local with_curses
- use hardened && CFLAGS="${CFLAGS} -nopie"
-
- if use ncurses; then
- if use unicode; then
- with_curses='--with-curses=ncursesw'
- else
- with_curses='--with-curses=ncurses'
- fi
- else
- with_curses='--without-curses'
- fi
-
- CFLAGS="${CFLAGS}" \
- econf \
- --docdir="/usr/share/doc/${PF}" \
- $(use_enable adl) \
- $(use_enable antminer) \
- $(use_enable avalon) \
- $(use_enable avalonmm) \
- $(use_enable bifury) \
- $(use_enable bitforce) \
- $(use_enable bfsb) \
- $(use_enable bfx) \
- $(use_enable bigpic) \
- $(use_enable bitfury) \
- $(use_enable cointerra) \
- $(use_enable cpumining) \
- $(use_enable drillbit) \
- $(use_enable dualminer) \
- $(use_enable gridseed) \
- $(use_enable hashbuster) \
- $(use_enable hashbuster2 hashbusterusb) \
- $(use_enable hashfast) \
- $(use_enable icarus) \
- $(use_enable jingtian) \
- $(use_enable keccak) \
- $(use_enable klondike) \
- $(use_enable littlefury) \
- $(use_enable metabank) \
- $(use_enable minion) \
- $(use_enable modminer) \
- $(use_enable nanofury) \
- $(use_enable opencl) \
- $(use_enable rockminer) \
- $(use_enable scrypt) \
- $(use_enable sha256d) \
- $(use_enable twinfury) \
- --with-system-libblkmaker \
- $with_curses \
- $(use_with udev libudev) \
- $(use_enable udev-broad-rules broad-udevrules) \
- $(use_with lm_sensors sensors) \
- $(use_with proxy_getwork libmicrohttpd) \
- $(use_with proxy_stratum libevent) \
- $(use_enable x6500) \
- $(use_enable zeusminer) \
- $(use_enable ztex)
-}
-
-src_install() {
- emake install DESTDIR="$D"
- if ! use examples; then
- rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
- fi
- if ! use screen; then
- rm "${D}/usr/bin/start-bfgminer.sh"
- fi
-}
diff --git a/net-misc/bfgminer/bfgminer-5.1.0.ebuild b/net-misc/bfgminer/bfgminer-5.1.0.ebuild
deleted file mode 100644
index bad51c9..0000000
--- a/net-misc/bfgminer/bfgminer-5.1.0.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-# TODO: knc (needs i2c-tools header)
-# TODO: kncasic & titan (need systemwide knc-asic install)
-# TODO: minergate (needs actual miner_gate)
-IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
-REQUIRED_USE='
- || ( keccak scrypt sha256d )
- || ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
- adl? ( opencl )
- antminer? ( sha256d )
- avalon? ( sha256d )
- avalonmm? ( sha256d )
- bfsb? ( sha256d bitfury )
- bfx? ( sha256d bitfury libusb )
- bifury? ( sha256d )
- bigpic? ( sha256d bitfury )
- bitforce? ( sha256d )
- bitfury? ( sha256d )
- cointerra? ( sha256d )
- drillbit? ( sha256d bitfury )
- dualminer? ( || ( sha256d scrypt ) icarus )
- gridseed? ( scrypt )
- hashbuster? ( sha256d bitfury )
- hashbuster2? ( sha256d bitfury libusb )
- hashfast? ( sha256d )
- icarus? ( || ( scrypt sha256d ) )
- jingtian? ( sha256d )
- keccak? ( || ( cpumining opencl proxy ) )
- klondike? ( sha256d libusb )
- littlefury? ( sha256d bitfury )
- lm_sensors? ( opencl )
- metabank? ( sha256d bitfury )
- minion? ( sha256d )
- modminer? ( sha256d )
- nanofury? ( sha256d bitfury )
- scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
- sha256d? ( || ( antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
- twinfury? ( bitfury )
- unicode? ( ncurses )
- proxy? ( || ( proxy_getwork proxy_stratum ) )
- proxy_getwork? ( proxy )
- proxy_stratum? ( proxy )
- rockminer? ( sha256d )
- twinfury? ( sha256d )
- x6500? ( sha256d libusb )
- zeusminer? ( scrypt )
- ztex? ( sha256d libusb )
-'
-
-DEPEND='
- net-misc/curl
- ncurses? (
- sys-libs/ncurses:=[unicode?]
- )
- >=dev-libs/jansson-2
- dev-libs/libbase58
- net-libs/libblkmaker
- udev? (
- virtual/udev
- )
- hashbuster? (
- dev-libs/hidapi
- )
- libusb? (
- virtual/libusb:1
- )
- lm_sensors? (
- sys-apps/lm_sensors
- )
- nanofury? (
- dev-libs/hidapi
- )
- proxy_getwork? (
- net-libs/libmicrohttpd
- )
- proxy_stratum? (
- dev-libs/libevent
- )
- screen? (
- app-misc/screen
- || (
- >=sys-apps/coreutils-8.15
- sys-freebsd/freebsd-bin
- app-misc/realpath
- )
- )
-'
-RDEPEND="${DEPEND}
- opencl? (
- || (
- virtual/opencl
- dev-util/nvidia-cuda-sdk[opencl]
- )
- )
-"
-DEPEND="${DEPEND}
- virtual/pkgconfig
- >=dev-libs/uthash-1.9.7
- sys-apps/sed
- cpumining? (
- amd64? (
- >=dev-lang/yasm-1.0.1
- )
- x86? (
- >=dev-lang/yasm-1.0.1
- )
- )
-"
-
-src_configure() {
- local CFLAGS="${CFLAGS}"
- local with_curses
- use hardened && CFLAGS="${CFLAGS} -nopie"
-
- if use ncurses; then
- if use unicode; then
- with_curses='--with-curses=ncursesw'
- else
- with_curses='--with-curses=ncurses'
- fi
- else
- with_curses='--without-curses'
- fi
-
- CFLAGS="${CFLAGS}" \
- econf \
- --docdir="/usr/share/doc/${PF}" \
- $(use_enable adl) \
- $(use_enable antminer) \
- $(use_enable avalon) \
- $(use_enable avalonmm) \
- $(use_enable bifury) \
- $(use_enable bitforce) \
- $(use_enable bfsb) \
- $(use_enable bfx) \
- $(use_enable bigpic) \
- $(use_enable bitfury) \
- $(use_enable cointerra) \
- $(use_enable cpumining) \
- $(use_enable drillbit) \
- $(use_enable dualminer) \
- $(use_enable gridseed) \
- $(use_enable hashbuster) \
- $(use_enable hashbuster2 hashbusterusb) \
- $(use_enable hashfast) \
- $(use_enable icarus) \
- $(use_enable jingtian) \
- $(use_enable keccak) \
- $(use_enable klondike) \
- $(use_enable littlefury) \
- $(use_enable metabank) \
- $(use_enable minion) \
- $(use_enable modminer) \
- $(use_enable nanofury) \
- $(use_enable opencl) \
- $(use_enable rockminer) \
- $(use_enable scrypt) \
- $(use_enable sha256d) \
- $(use_enable twinfury) \
- --with-system-libblkmaker \
- $with_curses \
- $(use_with udev libudev) \
- $(use_enable udev-broad-rules broad-udevrules) \
- $(use_with lm_sensors sensors) \
- $(use_with proxy_getwork libmicrohttpd) \
- $(use_with proxy_stratum libevent) \
- $(use_enable x6500) \
- $(use_enable zeusminer) \
- $(use_enable ztex)
-}
-
-src_install() {
- emake install DESTDIR="$D"
- if ! use examples; then
- rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
- fi
- if ! use screen; then
- rm "${D}/usr/bin/start-bfgminer.sh"
- fi
-}
diff --git a/net-misc/bfgminer/bfgminer-5.2.0.ebuild b/net-misc/bfgminer/bfgminer-5.2.0.ebuild
deleted file mode 100644
index bad51c9..0000000
--- a/net-misc/bfgminer/bfgminer-5.2.0.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-# TODO: knc (needs i2c-tools header)
-# TODO: kncasic & titan (need systemwide knc-asic install)
-# TODO: minergate (needs actual miner_gate)
-IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
-REQUIRED_USE='
- || ( keccak scrypt sha256d )
- || ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
- adl? ( opencl )
- antminer? ( sha256d )
- avalon? ( sha256d )
- avalonmm? ( sha256d )
- bfsb? ( sha256d bitfury )
- bfx? ( sha256d bitfury libusb )
- bifury? ( sha256d )
- bigpic? ( sha256d bitfury )
- bitforce? ( sha256d )
- bitfury? ( sha256d )
- cointerra? ( sha256d )
- drillbit? ( sha256d bitfury )
- dualminer? ( || ( sha256d scrypt ) icarus )
- gridseed? ( scrypt )
- hashbuster? ( sha256d bitfury )
- hashbuster2? ( sha256d bitfury libusb )
- hashfast? ( sha256d )
- icarus? ( || ( scrypt sha256d ) )
- jingtian? ( sha256d )
- keccak? ( || ( cpumining opencl proxy ) )
- klondike? ( sha256d libusb )
- littlefury? ( sha256d bitfury )
- lm_sensors? ( opencl )
- metabank? ( sha256d bitfury )
- minion? ( sha256d )
- modminer? ( sha256d )
- nanofury? ( sha256d bitfury )
- scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
- sha256d? ( || ( antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
- twinfury? ( bitfury )
- unicode? ( ncurses )
- proxy? ( || ( proxy_getwork proxy_stratum ) )
- proxy_getwork? ( proxy )
- proxy_stratum? ( proxy )
- rockminer? ( sha256d )
- twinfury? ( sha256d )
- x6500? ( sha256d libusb )
- zeusminer? ( scrypt )
- ztex? ( sha256d libusb )
-'
-
-DEPEND='
- net-misc/curl
- ncurses? (
- sys-libs/ncurses:=[unicode?]
- )
- >=dev-libs/jansson-2
- dev-libs/libbase58
- net-libs/libblkmaker
- udev? (
- virtual/udev
- )
- hashbuster? (
- dev-libs/hidapi
- )
- libusb? (
- virtual/libusb:1
- )
- lm_sensors? (
- sys-apps/lm_sensors
- )
- nanofury? (
- dev-libs/hidapi
- )
- proxy_getwork? (
- net-libs/libmicrohttpd
- )
- proxy_stratum? (
- dev-libs/libevent
- )
- screen? (
- app-misc/screen
- || (
- >=sys-apps/coreutils-8.15
- sys-freebsd/freebsd-bin
- app-misc/realpath
- )
- )
-'
-RDEPEND="${DEPEND}
- opencl? (
- || (
- virtual/opencl
- dev-util/nvidia-cuda-sdk[opencl]
- )
- )
-"
-DEPEND="${DEPEND}
- virtual/pkgconfig
- >=dev-libs/uthash-1.9.7
- sys-apps/sed
- cpumining? (
- amd64? (
- >=dev-lang/yasm-1.0.1
- )
- x86? (
- >=dev-lang/yasm-1.0.1
- )
- )
-"
-
-src_configure() {
- local CFLAGS="${CFLAGS}"
- local with_curses
- use hardened && CFLAGS="${CFLAGS} -nopie"
-
- if use ncurses; then
- if use unicode; then
- with_curses='--with-curses=ncursesw'
- else
- with_curses='--with-curses=ncurses'
- fi
- else
- with_curses='--without-curses'
- fi
-
- CFLAGS="${CFLAGS}" \
- econf \
- --docdir="/usr/share/doc/${PF}" \
- $(use_enable adl) \
- $(use_enable antminer) \
- $(use_enable avalon) \
- $(use_enable avalonmm) \
- $(use_enable bifury) \
- $(use_enable bitforce) \
- $(use_enable bfsb) \
- $(use_enable bfx) \
- $(use_enable bigpic) \
- $(use_enable bitfury) \
- $(use_enable cointerra) \
- $(use_enable cpumining) \
- $(use_enable drillbit) \
- $(use_enable dualminer) \
- $(use_enable gridseed) \
- $(use_enable hashbuster) \
- $(use_enable hashbuster2 hashbusterusb) \
- $(use_enable hashfast) \
- $(use_enable icarus) \
- $(use_enable jingtian) \
- $(use_enable keccak) \
- $(use_enable klondike) \
- $(use_enable littlefury) \
- $(use_enable metabank) \
- $(use_enable minion) \
- $(use_enable modminer) \
- $(use_enable nanofury) \
- $(use_enable opencl) \
- $(use_enable rockminer) \
- $(use_enable scrypt) \
- $(use_enable sha256d) \
- $(use_enable twinfury) \
- --with-system-libblkmaker \
- $with_curses \
- $(use_with udev libudev) \
- $(use_enable udev-broad-rules broad-udevrules) \
- $(use_with lm_sensors sensors) \
- $(use_with proxy_getwork libmicrohttpd) \
- $(use_with proxy_stratum libevent) \
- $(use_enable x6500) \
- $(use_enable zeusminer) \
- $(use_enable ztex)
-}
-
-src_install() {
- emake install DESTDIR="$D"
- if ! use examples; then
- rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
- fi
- if ! use screen; then
- rm "${D}/usr/bin/start-bfgminer.sh"
- fi
-}
diff --git a/net-misc/bfgminer/bfgminer-5.3.0.ebuild b/net-misc/bfgminer/bfgminer-5.3.0.ebuild
index bad51c9..12c5b79 100644
--- a/net-misc/bfgminer/bfgminer-5.3.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.3.0.ebuild
@@ -58,7 +58,7 @@
rockminer? ( sha256d )
twinfury? ( sha256d )
x6500? ( sha256d libusb )
- zeusminer? ( scrypt )
+ zeusminer? ( scrypt icarus )
ztex? ( sha256d libusb )
'
diff --git a/net-misc/bfgminer/metadata.xml b/net-misc/bfgminer/metadata.xml
index 00d5daf..ef981de 100644
--- a/net-misc/bfgminer/metadata.xml
+++ b/net-misc/bfgminer/metadata.xml
@@ -6,7 +6,7 @@
<name>Anthony G. Basile</name>
</maintainer>
<maintainer>
- <email>luke_gentoo_bitcoin@dashjr.org</email>
+ <email>luke-jr+gentoobugs@utopios.org</email>
<name>Luke Dashjr</name>
</maintainer>
<use>
diff --git a/net-misc/bopm/bopm-3.1.3-r1.ebuild b/net-misc/bopm/bopm-3.1.3-r1.ebuild
new file mode 100644
index 0000000..6636224
--- /dev/null
+++ b/net-misc/bopm/bopm-3.1.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib user
+
+DESCRIPTION="Blitzed Open Proxy Monitor"
+HOMEPAGE="http://www.blitzed.org/bopm/"
+SRC_URI="http://static.blitzed.org/www.blitzed.org/${PN}/files/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ econf \
+ --datadir="${EPREFIX}"/usr/share/doc/${PF} \
+ --localstatedir="${EPREFIX}"/var/log/${PN}
+}
+
+src_install () {
+ sed -i \
+ -e "s!/some/path/bopm.pid!/run/${PN}/${PN}.pid!" \
+ -e "s!/some/path/scan.log!/var/log/${PN}/scan.log!" \
+ bopm.conf.sample || die
+
+ # Custom Makefile.am rules do not respect DESTDIR,
+ # thus override sysconfdir and localstatedir.
+ emake \
+ DESTDIR="${D}" \
+ sysconfdir="${ED}"/etc \
+ localstatedir="${ED}"/var/log/bopm \
+ install || die "install failed"
+
+ fperms 600 /etc/bopm.conf
+
+ # Remove libopm related files, because bopm links statically to it
+ # If anybody wants libopm, please install net-libs/libopm
+ rm -r "${ED}"/usr/$(get_libdir) "${ED}"/usr/include || die
+
+ newinitd "${FILESDIR}"/bopm.init.d-r1 ${PN}
+ newconfd "${FILESDIR}"/bopm.conf.d-r1 ${PN}
+
+ dodoc ChangeLog INSTALL README TODO
+}
+
+pkg_postinst() {
+ enewuser bopm
+
+ install -d -m 0700 -o bopm -g root "${ROOT}"/var/log/bopm
+ chown bopm "${ROOT}"/etc/bopm.conf
+}
diff --git a/net-misc/bopm/files/bopm.conf.d-r1 b/net-misc/bopm/files/bopm.conf.d-r1
new file mode 100644
index 0000000..71bacbe
--- /dev/null
+++ b/net-misc/bopm/files/bopm.conf.d-r1
@@ -0,0 +1,9 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Config file for /etc/init.d/bopm
+
+BOPM_UID=bopm
+CONFFILE=/etc/${SVCNAME}.conf
+PIDFILE=/run/bopm/${SVCNAME}.pid
diff --git a/net-misc/bopm/files/bopm.init.d-r1 b/net-misc/bopm/files/bopm.init.d-r1
new file mode 100644
index 0000000..4f6f2ea
--- /dev/null
+++ b/net-misc/bopm/files/bopm.init.d-r1
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+command="/usr/bin/bopm"
+description="Blitzed Open Proxy Monitor"
+start_stop_daemon_args="--quiet --chuid ${BOPM_UID}"
+pidfile="${PIDFILE}"
+
+depend() {
+ need net
+}
+
+start_pre() {
+ checkpath -o ${BOPM_UID} -d "$(dirname "${PIDFILE}")"
+}
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index a5c073d..e24ccb5 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1 +1,2 @@
DIST chrony-2.1.1.tar.gz 391037 SHA256 b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4 SHA512 bbb6d4b3436b7c3c7d45628500678ce31291aaa7f59df0f616268fcdb9285f21a79b085d232773ce732eea82f28fa87f4c56ac5b6a7388275c67889daf641499 WHIRLPOOL a431253f173fb8c52f417c0a074c66e3125bb46247b3a177d6ad4c96d953a4557fb159e5940f03d39a83ad1b5a92dd73f84333e3d2274a42a5e93337ca2f6d7e
+DIST chrony-2.2-pre1.tar.gz 339418 SHA256 6a850a5d278ee2f28936baeb880f2bcd6774064302c58edff2577b16082de8e5 SHA512 eb77bd681ef4d1133ccfdf9d59b8ee1d161d5816b99e3ec58db9240181ac023f7d6950a7adeb37582abcd1a27f51df6964d41ff0fb2e095f7f0a5b3231386277 WHIRLPOOL 0cb671cabc31b8dfe4ebf4b3635e6591a31f2c7431e5a476d57f108b43b318f23bf8107eeb2038dcd194d574784dac1854f3537432c4ebe81f2d29d61653deec
diff --git a/net-misc/chrony/chrony-2.2_pre1-r1.ebuild b/net-misc/chrony/chrony-2.2_pre1-r1.ebuild
new file mode 100644
index 0000000..3b219f2
--- /dev/null
+++ b/net-misc/chrony/chrony-2.2_pre1-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
+REQUIRED_USE="
+ ?? ( libedit readline )
+"
+
+CDEPEND="
+ caps? ( sys-libs/libcap )
+ libedit? ( dev-libs/libedit )
+ readline? ( >=sys-libs/readline-4.1-r4:= )
+"
+DEPEND="
+ ${CDEPEND}
+ sys-apps/texinfo
+"
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-chronyd )
+"
+
+RESTRICT=test
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+ sed -i \
+ -e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+ -e 's:/var/run:/run:g' \
+ conf.c chrony.texi.in examples/* || die
+}
+
+src_configure() {
+ tc-export CC
+
+ local CHRONY_EDITLINE
+ # ./configure legend:
+ # --disable-readline : disable line editing entirely
+ # --without-readline : do not use sys-libs/readline (enabled by default)
+ # --without-editline : do not use dev-libs/libedit (enabled by default)
+ if ! use readline && ! use libedit; then
+ CHRONY_EDITLINE='--disable-readline'
+ else
+ CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+ CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+ fi
+
+ # not an autotools generated script
+ local CHRONY_CONFIGURE="
+ ./configure \
+ $(usex caps '' --disable-linuxcaps) \
+ $(usex cmdmon '' --disable-cmdmon) \
+ $(usex ipv6 '' --disable-ipv6) \
+ $(usex ntp '' --disable-ntp) \
+ $(usex phc '' --disable-phc) \
+ $(usex pps '' --disable-pps) \
+ $(usex rtc '' --disable-rtc) \
+ $(usex refclock '' --disable-refclock) \
+ $(usex adns '' --disable-asyncdns) \
+ ${CHRONY_EDITLINE} \
+ ${EXTRA_ECONF} \
+ --docdir=/usr/share/doc/${PF} \
+ --chronysockdir=/run/chrony \
+ --infodir=/usr/share/info \
+ --mandir=/usr/share/man \
+ --prefix=/usr \
+ --sysconfdir=/etc/chrony \
+ --disable-sechash \
+ --without-nss \
+ --without-tomcrypt
+ "
+
+ # print the ./configure call to aid in future debugging
+ einfo ${CHRONY_CONFIGURE}
+ bash ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+ emake all docs
+}
+
+src_install() {
+ default
+
+ doinfo chrony.info*
+
+ newinitd "${FILESDIR}"/chronyd.init chronyd
+ newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+ insinto /etc/${PN}
+ newins examples/chrony.conf.example1 chrony.conf
+
+ dodoc examples/*.example*
+
+ keepdir /var/{lib,log}/chrony
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/chrony-2.2.logrotate chrony
+
+ systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+ systemd_enable_ntpunit 50-chrony chronyd.service
+}
diff --git a/net-misc/chrony/files/chrony-2.2.logrotate b/net-misc/chrony/files/chrony-2.2.logrotate
new file mode 100644
index 0000000..ae76c8d
--- /dev/null
+++ b/net-misc/chrony/files/chrony-2.2.logrotate
@@ -0,0 +1,7 @@
+/var/log/chrony/*.log {
+ missingok
+ sharedscripts
+ postrotate
+ /usr/bin/chronyc cyclelogs
+ endscript
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index fa440e5..4409f48 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,3 +1,4 @@
DIST curl-7.42.1.tar.bz2 3327304 SHA256 e2905973391ec2dfd7743a8034ad10eeb58dab8b3a297e7892a41a7999cac887 SHA512 846c2d2bc73d39240686bf54e4c02553a1ca1640123fef30538cfc8a6317650f4cb9f1cc882016b7826ef9c84cb92adbfa24e55d59d2e7203bdcb12835fb474f WHIRLPOOL ff826e11812334ebca650c54788bf1b81b2927f7b9607b10e79cc70f6d1f9b893aebc816914158243510ffaead3b15a21ce10e7180eeb175b0b503e9ac8b0c6e
DIST curl-7.43.0.tar.bz2 3363770 SHA256 baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9 SHA512 0b06ec078680619f56a458ac115142546134917331b71b73ed2c0371c480034dac7ed848814be0dd1e752154c53e48b9e0276b83f75a690df6cfb480ab331272 WHIRLPOOL e5c97b3cbf0f9915f62a100ce2972e6cffcabae753770c2f0a1fc3bcef3a66c0a2d4d7e361b00f442d62eca3b0d9526eb34f6b043fb655648180e81ef630a527
DIST curl-7.44.0.tar.bz2 3398814 SHA256 1e2541bae6582bb697c0fbae49e1d3e6fad5d05d5aa80dbd6f072e0a44341814 SHA512 250a0aa6ba9917cd7666ff180efb02d994d1040759b94370b8c3bb215467d632b867f111b555228ab7f9a7ecd1e5d205204b29cbc003797dd315f628376a376d WHIRLPOOL 6725c44667016365f6c83a75cae1fc1f4d310256194a7f6b2738f642250b5229a565047c9f4882f07dd2daf0a4b5149e22ce91d62c26a52d73c087e50c64f6cd
+DIST curl-7.45.0.tar.bz2 3473632 SHA256 65154e66b9f8a442b57c436904639507b4ac37ec13d6f8a48248f1b4012b98ea SHA512 71c557c69eb8d160f74a9b76ef83a46ce33ef4e8a66a261699329583dadf10205b4ba4783f92d4e6c8724f6610ffade5b0a9f189b0a7b9169ff839dfc8980481 WHIRLPOOL afc1627cebb64c9111f943fe63d95c8a998934fd02e3b8d12f061d23b174b7475c48451ecc1713ce54771455a6465238aa3b818b0eb9ba5c86ffd06eb1f2bc76
diff --git a/net-misc/curl/curl-7.45.0.ebuild b/net-misc/curl/curl-7.45.0.ebuild
new file mode 100644
index 0000000..93ba073
--- /dev/null
+++ b/net-misc/curl/curl-7.45.0.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="http://curl.haxx.se/"
+SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+ ssl? (
+ curl_ssl_axtls? (
+ >=net-libs/axtls-1.4.9-r1[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ curl_ssl_gnutls? (
+ || (
+ (
+ >=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}]
+ >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
+ )
+ (
+ =net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}]
+ >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
+ )
+ (
+ =net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}]
+ >=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}]
+ )
+ )
+ app-misc/ca-certificates
+ )
+ curl_ssl_libressl? (
+ dev-libs/libressl[static-libs?,${MULTILIB_USEDEP}]
+ )
+ curl_ssl_openssl? (
+ >=dev-libs/openssl-1.0.1h-r2[static-libs?,${MULTILIB_USEDEP}]
+ )
+ curl_ssl_nss? (
+ >=dev-libs/nss-3.15.4[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ curl_ssl_polarssl? (
+ >=net-libs/polarssl-1.3.4:=[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ )
+ http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+ idn? ( >=net-dns/libidn-1.28[static-libs?,${MULTILIB_USEDEP}] )
+ adns? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] )
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+ rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+ ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,${MULTILIB_USEDEP}] )
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+# rtmp? (
+# media-video/rtmpdump
+# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+# )
+
+# ssl providers to be added:
+# fbopenssl $(use_with spnego)
+
+# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
+
+DEPEND="${RDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? (
+ sys-apps/diffutils
+ dev-lang/perl
+ )"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+ curl_ssl_winssl? ( elibc_Winnt )
+ threads? ( !adns )
+ ssl? (
+ ^^ (
+ curl_ssl_axtls
+ curl_ssl_gnutls
+ curl_ssl_libressl
+ curl_ssl_openssl
+ curl_ssl_nss
+ curl_ssl_polarssl
+ curl_ssl_winssl
+ )
+ )"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
+ docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/curl-config
+)
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-7.30.0-prefix.patch \
+ "${FILESDIR}"/${PN}-respect-cflags-3.patch \
+ "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+ sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+ epatch_user
+ eprefixify curl-config.in
+ eautoreconf
+}
+
+multilib_src_configure() {
+ einfo "\033[1;32m**************************************************\033[00m"
+
+ # We make use of the fact that later flags override earlier ones
+ # So start with all ssl providers off until proven otherwise
+ local myconf=()
+ myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
+ myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+ if use ssl ; then
+ if use curl_ssl_axtls; then
+ einfo "SSL provided by axtls"
+ einfo "NOTE: axtls is meant for embedded systems and"
+ einfo "may not be the best choice as an ssl provider"
+ myconf+=( --with-axtls )
+ fi
+ if use curl_ssl_gnutls; then
+ einfo "SSL provided by gnutls"
+ if has_version ">=net-libs/gnutls-3.2.15[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then
+ einfo "gnutls compiled with dev-libs/nettle"
+ myconf+=( --with-gnutls --with-nettle )
+ else
+ einfo "gnutls compiled with dev-libs/libgcrypt"
+ myconf+=( --with-gnutls --without-nettle )
+ fi
+ fi
+ if use curl_ssl_nss; then
+ einfo "SSL provided by nss"
+ myconf+=( --with-nss )
+ fi
+ if use curl_ssl_polarssl; then
+ einfo "SSL provided by polarssl"
+ einfo "NOTE: polarssl is meant for embedded systems and"
+ einfo "may not be the best choice as an ssl provider"
+ myconf+=( --with-polarssl )
+ fi
+ if use curl_ssl_libressl; then
+ einfo "SSL provided by LibreSSL"
+ myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+ fi
+ if use curl_ssl_openssl; then
+ einfo "SSL provided by openssl"
+ myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+ fi
+ if use curl_ssl_winssl; then
+ einfo "SSL provided by Windows"
+ myconf+=( --with-winssl )
+ fi
+ else
+ einfo "SSL disabled"
+ fi
+ einfo "\033[1;32m**************************************************\033[00m"
+
+ # These configuration options are organized alphabetically
+ # within each category. This should make it easier if we
+ # ever decide to make any of them contingent on USE flags:
+ # 1) protocols first. To see them all do
+ # 'grep SUPPORT_PROTOCOLS configure.ac'
+ # 2) --enable/disable options second.
+ # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+ # 3) --with/without options third.
+ # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+ ECONF_SOURCE="${S}" \
+ econf \
+ --enable-dict \
+ --enable-file \
+ --enable-ftp \
+ --enable-gopher \
+ --enable-http \
+ --enable-imap \
+ $(use_enable ldap) \
+ $(use_enable ldap ldaps) \
+ --enable-pop3 \
+ --enable-rt \
+ --enable-rtsp \
+ $(use_enable samba smb) \
+ $(use_with ssh libssh2) \
+ --enable-smtp \
+ --enable-telnet \
+ --enable-tftp \
+ $(use_enable adns ares) \
+ --enable-cookies \
+ --enable-hidden-symbols \
+ $(use_enable ipv6) \
+ --enable-largefile \
+ --enable-manual \
+ --enable-proxy \
+ --disable-soname-bump \
+ --disable-sspi \
+ $(use_enable static-libs static) \
+ $(use_enable threads threaded-resolver) \
+ --disable-versioned-symbols \
+ --without-cyassl \
+ --without-darwinssl \
+ $(use_with idn libidn) \
+ $(use_with kerberos gssapi "${EPREFIX}"/usr) \
+ --without-krb4 \
+ $(use_with metalink libmetalink) \
+ $(use_with http2 nghttp2) \
+ $(use_with rtmp librtmp) \
+ --without-spnego \
+ --without-winidn \
+ --with-zlib \
+ "${myconf[@]}"
+
+ if ! multilib_is_native_abi; then
+ # avoid building the client
+ sed -i -e '/SUBDIRS/s:src::' Makefile || die
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --all
+
+ rm -rf "${ED}"/etc/
+
+ # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
+ insinto /usr/share/aclocal
+ doins docs/libcurl/libcurl.m4
+}
diff --git a/net-misc/dhcp/dhcp-4.3.3-r1.ebuild b/net-misc/dhcp/dhcp-4.3.3-r1.ebuild
new file mode 100644
index 0000000..35851c1
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.3.3-r1.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils systemd toolchain-funcs user
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+ ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
+
+DEPEND="
+ client? (
+ kernel_linux? (
+ ipv6? ( sys-apps/iproute2 )
+ sys-apps/net-tools
+ )
+ )
+ ldap? (
+ net-nds/openldap
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-dhcp )
+ vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack ${A}
+ # handle local bind hell
+ cd "${S}"/bind
+ unpack ./bind.tar.gz
+}
+
+src_prepare() {
+ # Gentoo patches - these will probably never be accepted upstream
+ # Fix some permission issues
+ epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
+ # Enable dhclient to equery NTP servers
+ epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
+ epatch "${FILESDIR}"/${PN}-4.3.1-dhclient-resolvconf.patch
+ # Stop downing the interface on Linux as that breaks link daemons
+ # such as wpa_supplicant and netplug
+ epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
+ # Enable dhclient to get extra configuration from stdin
+ epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
+ epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
+ epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
+ epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
+ epatch "${FILESDIR}"/${PN}-4.2.5-iproute2-path.patch #480636
+ epatch "${FILESDIR}"/${PN}-4.2.5-bindtodevice-inet6.patch #471142
+ epatch "${FILESDIR}"/${PN}-4.3.3-ldap-ipv6-client-id.patch #559832
+
+ # Brand the version with Gentoo
+ sed -i \
+ -e "/VERSION=/s:'$: Gentoo-${PR}':" \
+ configure || die
+
+ # Change the hook script locations of the scripts
+ sed -i \
+ -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+ -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+ client/scripts/* || die
+
+ # No need for the linux script to force bash #158540
+ sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+ # Quiet the freebsd logger a little
+ sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+ # Remove these options from the sample config
+ sed -i -r \
+ -e "/(script|host-name|domain-name) /d" \
+ client/dhclient.conf.example || die
+
+ if use client && ! use server ; then
+ sed -i -r \
+ -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+ Makefile.in || die
+ elif ! use client && use server ; then
+ sed -i -r \
+ -e '/^SUBDIRS/s:\<client\>::' \
+ Makefile.in || die
+ fi
+
+ # Only install different man pages if we don't have en
+ if [[ " ${LINGUAS} " != *" en "* ]]; then
+ # Install Japanese man pages
+ if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+ einfo "Installing Japanese documention"
+ cp doc/ja_JP.eucJP/dhclient* client
+ cp doc/ja_JP.eucJP/dhcp* common
+ fi
+ fi
+ # Now remove the non-english docs so there are no errors later
+ rm -rf doc/ja_JP.eucJP
+
+ # make the bind build work
+ binddir=${S}/bind
+ cd "${binddir}" || die
+ cat <<-EOF > bindvar.tmp
+ binddir=${binddir}
+ GMAKE=${MAKE:-gmake}
+ EOF
+ epatch "${FILESDIR}"/${PN}-4.3.3-bind-disable.patch
+ cd bind-*/
+ epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+ epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
+}
+
+src_configure() {
+ # bind defaults to stupid `/usr/bin/ar`
+ tc-export AR BUILD_CC
+ export ac_cv_path_AR=${AR}
+
+ # this is tested for by the bind build system, and can cause trouble
+ # when cross-building; since dhcp itself doesn't make use of libcap,
+ # simply disable it.
+ export ac_cv_lib_cap_cap_set_proc=no
+
+ # Use FHS sane paths ... some of these have configure options,
+ # but not all, so just do it all here.
+ local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+ cat <<-EOF >> includes/site.h
+ #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
+ #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
+ #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
+ #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
+ #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
+ #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
+ #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
+ #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
+ #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
+ #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
+ #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
+ #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
+ EOF
+
+ econf \
+ --enable-paranoia \
+ --enable-early-chroot \
+ --sysconfdir=${e} \
+ $(use_enable ipv6 dhcpv6) \
+ $(use_with ldap) \
+ $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+
+ # configure local bind cruft. symtable option requires
+ # perl and we don't want to require that #383837.
+ cd bind/bind-*/ || die
+ eval econf \
+ $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
+ --disable-symtable \
+ --without-make-clean
+}
+
+src_compile() {
+ # build local bind cruft first
+ emake -C bind/bind-*/lib/export install
+ # then build standard dhcp code
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+ dohtml doc/References.html
+
+ if [[ -e client/dhclient ]] ; then
+ # move the client to /
+ dodir /sbin
+ mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+ exeinto /sbin
+ if use kernel_linux ; then
+ newexe "${S}"/client/scripts/linux dhclient-script
+ else
+ newexe "${S}"/client/scripts/freebsd dhclient-script
+ fi
+ fi
+
+ if [[ -e server/dhcpd ]] ; then
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins contrib/ldap/dhcp.*
+ dosbin contrib/ldap/dhcpd-conf-to-ldap
+ fi
+
+ newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+ newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+ newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+ newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+ systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+ systemd_dounit "${FILESDIR}"/dhcpd4.service
+ systemd_dounit "${FILESDIR}"/dhcpd6.service
+ systemd_dounit "${FILESDIR}"/dhcrelay4.service
+ systemd_dounit "${FILESDIR}"/dhcrelay6.service
+ systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+ systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+ sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+ fi
+
+ # the default config files aren't terribly useful #384087
+ local f
+ for f in "${ED}"/etc/dhcp/*.conf.example ; do
+ mv "${f}" "${f%.example}" || die
+ done
+ sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+ enewgroup dhcp
+ enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+ # Keep the user files over the sample ones. The
+ # hashing is to ignore the crappy defaults #384087.
+ local f h
+ for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+ h=${f#*:}
+ f="/etc/dhcp/${f%:*}.conf"
+ if [ -e "${EROOT}"${f} ] ; then
+ case $(md5sum "${EROOT}"${f}) in
+ ${h}*) ;;
+ *) cp -p "${EROOT}"${f} "${ED}"${f};;
+ esac
+ fi
+ done
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+ ewarn
+ ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+ ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+ ewarn "and dhcp should be removed from the default runlevel"
+ ewarn
+ fi
+}
diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest
index e8f71fb..92042ee 100644
--- a/net-misc/dibbler/Manifest
+++ b/net-misc/dibbler/Manifest
@@ -1,3 +1,4 @@
DIST dibbler-0.8.4.tar.gz 4292008 SHA256 90382709200b6f1c4d403aceeedb52fd5633cfb71c7df3742062ddfe8b71c013 SHA512 7d0323abd42d0ab57fcaecb30c1354a831f2b8b8b300a9a20678062ef52743b5724569d1885f3866d517abbfae48651966734d47a6c5f43d19fd65332ebeca6c WHIRLPOOL f1d9c2219daebe3f69fbcde956a164902fa2b6ba1448d95a00aaada0423a995d013256fc35fbc8c860efd11f28b0dd42f97de4761a31f0b7662dec23bb36b25a
DIST dibbler-1.0.0.tar.gz 4372693 SHA256 51283702a1e56c1bfe56fb95469ec7b1fc56ecb8e9a2c6d296b81d43bec14048 SHA512 38eae78e5d5dab2484c6467eb91e7e8eed62067a1f375a9a0e0ed3639c1bd9db7230bc7a33ee41ffd785d031994c6bec4a6b2eb75bb5c0d4645c7e669f568434 WHIRLPOOL 80a9deb26802b0d26a108abffb09a9b3e81faf1e2fda1f25f5a71b855741ee967b82486e0f7e79f9d1560abd43dfe6934e2d69c486c6302f0154972041e98d46
DIST dibbler-1.0.0RC2.tar.gz 4331108 SHA256 206a27421db7ae5298805d00f9adcafcf6aef7496a5fb23640f6fa99a6ee2d68 SHA512 b0384629a4139bc95609eaf19df6d0c57daebfd0ecd063981271153e3c3cd1658376fd8a473a6568f8b782e58c08c44a101209b49ea3ac39436a3aac4cb27259 WHIRLPOOL 6377ad56bbe61eb7e88f0e92814fd4cbceb4518419b0ec74bceaa7fd09d8de8b00061d73d8d2dead2c3b4389b058ab968586d8373e9b47f1eede0e18b91784f4
+DIST dibbler-1.0.1.tar.gz 4375118 SHA256 27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1 SHA512 2369d4a3ca50a1c60bd5a47bf4168d4c113e2fdcb1ae4d937a3bf226c057142f2e81f6c46bf4e1dfa9ca0d2e92f7f857572a4bfb0d0dd721c35efe762e6c3ea0 WHIRLPOOL dafc1663b487bc62068ef86be6261484729cf8da966f5572b1e459fb3a902c9474d9a8bea361dba683111f9f7994b86a3a7484333c77c9f977ec54169653898d
diff --git a/net-misc/dibbler/dibbler-1.0.1.ebuild b/net-misc/dibbler/dibbler-1.0.1.ebuild
new file mode 100644
index 0000000..93b9c87
--- /dev/null
+++ b/net-misc/dibbler/dibbler-1.0.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils readme.gentoo systemd
+
+DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)"
+HOMEPAGE="http://klub.com.pl/dhcpv6/"
+SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( || (
+ dev-texlive/texlive-latexextra
+ dev-tex/floatflt )
+ )"
+RDEPEND=""
+
+DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf
+to suit your needs. They are stored in /etc/dibbler"
+
+src_prepare() {
+ epatch_user
+}
+
+src_compile() {
+ emake
+ # devel documentation is broken and users should consult the online version
+ # http://klub.com.pl/dhcpv6/doxygen/
+ use doc && emake -C doc/ user
+}
+
+src_install() {
+ readme.gentoo_create_doc
+
+ dosbin dibbler-{client,relay,server}
+ doman doc/man/*.8
+
+ insinto /etc/dibbler
+ doins doc/examples/*.conf
+ dodir /var/lib/dibbler
+
+ dodoc AUTHORS CHANGELOG RELNOTES TODO
+ use doc && dodoc doc/dibbler-user.pdf
+
+ doinitd "${FILESDIR}"/dibbler-{client,relay,server}
+ systemd_dounit "${FILESDIR}"/dibbler-client.service
+}
diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
new file mode 100644
index 0000000..0ea2daf
--- /dev/null
+++ b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils vcs-snapshot
+
+if [[ ${PV} != 9999* ]]; then
+ COMMIT="aa2181dcf2dd98693767ba738c5b2ad8c3d742d4"
+ SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="alpha amd64 arm ppc ppc64 x86"
+else
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git
+ https://github.com/FreeRDP/FreeRDP.git"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/1.2"
+IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg
+ libressl neon pulseaudio server smartcard test usb wayland X xinerama xv"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ sys-libs/zlib:0
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ client? (
+ usb? (
+ virtual/libudev:0=
+ sys-apps/util-linux:0=
+ dev-libs/dbus-glib:0=
+ virtual/libusb:1=
+ )
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ xinerama? ( x11-libs/libXinerama )
+ xv? ( x11-libs/libXv )
+ )
+ )
+ ffmpeg? ( >=virtual/ffmpeg-9 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ x11-libs/libXrandr
+ )
+ jpeg? ( virtual/jpeg:0 )
+ pulseaudio? ( media-sound/pulseaudio )
+ server? (
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ xinerama? ( x11-libs/libXinerama )
+ )
+ )
+ smartcard? ( sys-apps/pcsc-lite )
+ wayland? ( dev-libs/wayland )
+ X? (
+ x11-libs/libX11
+ x11-libs/libxkbfile
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ client? ( X? ( doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/xmlto
+ ) ) )
+"
+
+DOCS=( README )
+
+PATCHES=( "${FILESDIR}/freerdp-armfp.patch" "${FILESDIR}/freerdp-ffmpeg29.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with alsa ALSA)
+ $(cmake-utils_use_with client CLIENT)
+ $(cmake-utils_use_with cups CUPS)
+ $(cmake-utils_use_with debug DEBUG_ALL)
+ $(cmake-utils_use_with doc MANPAGES)
+ $(cmake-utils_use_with ffmpeg FFMPEG)
+ $(cmake-utils_use_with gstreamer GSTREAMER_1_0)
+ $(cmake-utils_use_with jpeg JPEG)
+ $(cmake-utils_use_with neon NEON)
+ $(cmake-utils_use_with pulseaudio PULSE)
+ $(cmake-utils_use_with server SERVER)
+ $(cmake-utils_use_with smartcard PCSC)
+ $(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
+ $(cmake-utils_use usb CHANNEL_URBDRC)
+ $(cmake-utils_use_with X X11)
+ $(cmake-utils_use_with xinerama XINERAMA)
+ $(cmake-utils_use_with xv XV)
+ $(cmake-utils_use_build test TESTING)
+ $(cmake-utils_use_with wayland WAYLAND)
+ )
+ cmake-utils_src_configure
+}
diff --git a/net-misc/freerdp/freerdp-9999.1.ebuild b/net-misc/freerdp/freerdp-9999.1.ebuild
index 131105e..d38b4c4 100644
--- a/net-misc/freerdp/freerdp-9999.1.ebuild
+++ b/net-misc/freerdp/freerdp-9999.1.ebuild
@@ -23,10 +23,11 @@
LICENSE="Apache-2.0"
SLOT="0/1.2"
IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg
- neon pulseaudio server smartcard test usb wayland X xinerama xv"
+ libressl neon pulseaudio server smartcard test usb wayland X xinerama xv"
RDEPEND="
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
sys-libs/zlib:0
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
diff --git a/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild b/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild
new file mode 100644
index 0000000..7929b2f
--- /dev/null
+++ b/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+if [[ ${PV} = *9999 ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://github.com/vitalif/${PN}2.git"
+else
+ inherit vcs-snapshot
+ COMMIT="5dc7028c8aebb26d35ed31c4b07ac180cc1887c9"
+ SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/expat
+ >=dev-libs/json-c-0.11-r1:=
+ dev-libs/libgcrypt:0=
+ net-misc/curl
+ sys-libs/binutils-libs:0=
+ sys-libs/glibc
+ dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/i2pd/Manifest b/net-misc/i2pd/Manifest
index 0712c33..a4e7a86 100644
--- a/net-misc/i2pd/Manifest
+++ b/net-misc/i2pd/Manifest
@@ -1,2 +1,3 @@
+DIST i2pd-0.10.0.tar.gz 391777 SHA256 5195e01a2e5ebad580631fbf3e5f17cf158f4ee323cbc4b0200ae046fbefc733 SHA512 ab0d32108f8ca1093ae3fcd752deeb8bed018074a8dd04fbcbffe49f1a2a78c3f2cf00341ddad18e8c8007edba6b75e45bce4357a621540fcdf7c2b74a26e726 WHIRLPOOL 19e8a92e20ae6fe1500a3f5462580d4896d5906be6ef307e48ea465712f5266b5251d75ad8b5636a3b894da3b3100dde329ddc733f7cd394499810d1bc65a083
DIST i2pd-0.5.0.tar.gz 352460 SHA256 7f2033fe1c380c458722d68f611d0fa69a844ceba71db13a918adac6e01a0594 SHA512 08c51dc5fa3712af54b7dcc9f4524fb19d7b42a279646c7852efdf1fd49cf4ea24192c936229954c3733ba4bcbc480205bcfeca739ffae3642f5c62bd24e0cf6 WHIRLPOOL 1812a8733f17cd6b9885cf8af3ad0412f238356121118d46fbed53cb826aaa6c878a045adb69e0a692fd5cd3fc720192c635f4e594d3d42efb2116f14bbba9e9
DIST i2pd-0.6.0.tar.gz 360829 SHA256 149a8c2d870ebc3988aea06eec906c9e968b3d89ae282bd3b2b5ead205f7c3b7 SHA512 084c75c5f972dbc07740119c3ae1711924cf740391703a95752164eab7a04d6cea0cfb302530e1e1bebafb54f9eed552e747479ae55fb053e824cdf059ab3266 WHIRLPOOL a858a49173755e052f31a95f4f7075965dac0c89943a7dc05c3c88d51b646ab86a7510a9533e33d9c5f0e7736e9f702f6fd0de4e6a841cc3ec57ea5aaf2b991c
diff --git a/net-misc/i2pd/i2pd-0.10.0.ebuild b/net-misc/i2pd/i2pd-0.10.0.ebuild
new file mode 100644
index 0000000..29fb6fe
--- /dev/null
+++ b/net-misc/i2pd/i2pd-0.10.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd user cmake-utils
+
+DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
+HOMEPAGE="https://github.com/PrivacySolutions/i2pd"
+SRC_URI="https://github.com/PrivacySolutions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cpu_flags_x86_aes i2p-hardening static"
+
+RDEPEND="!static? ( >=dev-libs/boost-1.46[threads] )
+ !static? ( dev-libs/crypto++ )"
+DEPEND="${RDEPEND}
+ static? ( >=dev-libs/boost-1.46[static-libs,threads] )
+ static? ( dev-libs/crypto++[static-libs] )
+ >=dev-util/cmake-2.8.5
+ i2p-hardening? ( >=sys-devel/gcc-4.6 )
+ || ( >=sys-devel/gcc-4.6 >=sys-devel/clang-3.3 )"
+
+I2PD_USER="${I2PD_USER:-i2pd}"
+I2PD_GROUP="${I2PD_GROUP:-i2pd}"
+
+CMAKE_USE_DIR="${S}/build"
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_with cpu_flags_x86_aes AESNI)
+ $(cmake-utils_use_with i2p-hardening HARDENING)
+ $(cmake-utils_use_with static STATIC)
+ -DWITH_LIBRARY=OFF
+ -DWITH_BINARY=ON
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ dodoc README.md
+ doman "${FILESDIR}/${PN}.1"
+ keepdir /var/lib/i2pd/
+ fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
+ fperms 700 /var/lib/i2pd/
+ insinto /etc/
+ doins "${FILESDIR}/${PN}.conf"
+ fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}.conf"
+ fperms 600 "/etc/${PN}.conf"
+ dodir /usr/share/i2pd
+ cp -R "${S}/contrib/certificates" "${D}/var/lib/i2pd" || die "Install failed!"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ doenvd "${FILESDIR}/99${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+}
+
+pkg_setup() {
+ enewgroup "${I2PD_GROUP}"
+ enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
+}
diff --git a/net-misc/iputils/iputils-20150815-r1.ebuild b/net-misc/iputils/iputils-20150815-r1.ebuild
new file mode 100644
index 0000000..a23f1b9
--- /dev/null
+++ b/net-misc/iputils/iputils-20150815-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors. This avoids ugly issues while
+# building stages, and when the jade/sgml packages are broken (which
+# seems to be more common than would be nice).
+
+EAPI="4"
+
+inherit flag-o-matic eutils toolchain-funcs fcaps
+if [[ ${PV} == "99999999" ]] ; then
+ EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"
+
+LICENSE="BSD-4"
+SLOT="0"
+IUSE="arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+
+LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
+ idn? ( net-dns/libidn[static-libs(+)] )
+ ipv6? ( ssl? (
+ gcrypt? ( dev-libs/libgcrypt[static-libs(+)] )
+ nettle? ( dev-libs/nettle[static-libs(+)] )
+ openssl? (
+ !libressl? ( dev-libs/openssl:0[static-libs(+)] )
+ libressl? ( dev-libs/libressl[static-libs(+)] )
+ )
+ ) )"
+RDEPEND="arping? ( !net-misc/arping )
+ rarpd? ( !net-misc/rarpd )
+ traceroute? ( !net-misc/traceroute )
+ !static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )
+ virtual/os-headers"
+if [[ ${PV} == "99999999" ]] ; then
+ DEPEND+="
+ app-text/openjade
+ dev-perl/SGMLSpm
+ app-text/docbook-sgml-dtd
+ app-text/docbook-sgml-utils
+ "
+fi
+
+REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
+
+S=${WORKDIR}/${PN}-s${PV}
+
+PATCHES=(
+ "${FILESDIR}/021109-uclibc-no-ether_ntohost.patch"
+ "${FILESDIR}/${PN}-20150815-ping_default_ipv4.patch"
+ "${FILESDIR}/${PN}-20150815-ping6_crypto.patch"
+)
+
+src_prepare() {
+ epatch ${PATCHES[@]}
+ use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
+}
+
+src_configure() {
+ use static && append-ldflags -static
+
+ TARGETS=(
+ ping
+ $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
+ )
+ if use ipv6 ; then
+ TARGETS+=(
+ $(usex tracepath 'tracepath6' '')
+ $(usex traceroute 'traceroute6' '')
+ )
+ fi
+
+ myconf=(
+ USE_CRYPTO=no
+ USE_GCRYPT=no
+ USE_NETTLE=no
+ )
+
+ if use ipv6 && use ssl ; then
+ myconf=(
+ USE_CRYPTO=$(usex openssl)
+ USE_GCRYPT=$(usex gcrypt)
+ USE_NETTLE=$(usex nettle)
+ )
+ fi
+}
+
+src_compile() {
+ tc-export CC
+ emake \
+ USE_CAP=$(usex caps) \
+ USE_IDN=$(usex idn) \
+ IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
+ TARGETS="${TARGETS[*]}" \
+ ${myconf[@]}
+
+ if [[ ${PV} == "99999999" ]] ; then
+ emake html man
+ fi
+}
+
+src_install() {
+ into /
+ dobin ping
+ dosym ping "${EPREFIX}"/bin/ping4
+ if use ipv6 ; then
+ dosym ping "${EPREFIX}"/bin/ping6
+ dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8
+ fi
+ doman doc/ping.8
+
+ if use arping ; then
+ dobin arping
+ doman doc/arping.8
+ fi
+
+ into /usr
+
+ local u
+ for u in clockdiff rarpd rdisc tftpd tracepath ; do
+ if use ${u} ; then
+ case ${u} in
+ clockdiff) dobin ${u};;
+ *) dosbin ${u};;
+ esac
+ doman doc/${u}.8
+ fi
+ done
+
+ if use tracepath && use ipv6 ; then
+ dosbin tracepath6
+ dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8
+ fi
+
+ if use traceroute && use ipv6 ; then
+ dosbin traceroute6
+ doman doc/traceroute6.8
+ fi
+
+ if use rarpd ; then
+ newinitd "${FILESDIR}"/rarpd.init.d rarpd
+ newconfd "${FILESDIR}"/rarpd.conf.d rarpd
+ fi
+
+ dodoc INSTALL RELNOTES
+
+ use doc && dohtml doc/*.html
+}
+
+pkg_postinst() {
+ fcaps cap_net_raw \
+ bin/ping \
+ $(usex arping 'bin/arping' '') \
+ $(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 3957639..0135191 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -24,7 +24,7 @@
LICENSE="BSD-4"
SLOT="0"
-IUSE="arping caps clockdiff doc gnutls idn ipv6 rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+IUSE="arping caps clockdiff doc gnutls idn ipv6 libressl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
idn? ( net-dns/libidn[static-libs(+)] )
@@ -33,7 +33,10 @@
net-libs/gnutls[openssl(+)]
net-libs/gnutls[static-libs(+)]
)
- !gnutls? ( dev-libs/openssl:0[static-libs(+)] )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0[static-libs(+)] )
+ libressl? ( dev-libs/libressl[static-libs(+)] )
+ )
) )"
RDEPEND="arping? ( !net-misc/arping )
rarpd? ( !net-misc/rarpd )
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index dfe3eaa..7a5cd8d 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -1,3 +1,4 @@
DIST minidlna-1.1.3.tar.gz 481789 SHA256 ed42d5cadf9488a95a0107341918879ef8ce4c650e19337688c46cdcd484bc4e SHA512 3b3c28ed17325a1d2c461c51c7958fcc7fd02b71332a952e06f0ad8bca04f8ff58a74bb3d221ad432282c7289953bd31c213c2703008fb36037c39a743001aa9 WHIRLPOOL 4ac0a4344feb026d483562d5711f3f3ce4f70d68d9b043ec54e7d3667c7b38e2d1b7df2cbb2a5c9d05d4afc29182fe65c95389530b187000e496902734bb498e
DIST minidlna-1.1.4.tar.gz 494478 SHA256 9814c04a2c506a0dd942c4218d30c07dedf90dabffbdef2d308a3f9f23545314 SHA512 24c2d82222798278d60faa46c6d7b19e44a91868da869f7d2aa2bf3c68e343a6c2a323f67223ea69242919047b08f059ed9c7a49b0b516384244acd98b51db4e WHIRLPOOL 5f82dd2130086e90784b05d67037e9c40e20b539ddc1bfb3733910beee44578027d9c245aa1f6117ba05b3c039a2b32125ea561f71c63cf0e422664e7067007f
+DIST minidlna-1.1.5.tar.gz 488191 SHA256 8477ad0416bb2af5cd8da6dde6c07ffe1a413492b7fe40a362bc8587be15ab9b SHA512 2a8eaa42fcda6f98648f1726af5cdba6d2358c386440dd0de933364cfbd1ced2fee5f883033e1a5a692b760749beb2c12798020a3591ddcea22663102d4f3dfa WHIRLPOOL 8ed8fd62fb063b042a234c8647fa05c65e4f1e331a66efae8f361002f5cedcd2706d777348332075e3263e0d8bbde7794dd84fc400dfe3a656e5d70952427669
DIST minidlna-gentoo-artwork.patch.xz 49372 SHA256 37ae7228b07b7c81c8962c5dc88a41ed1691bdf1b019b654a9fc93ac1da0c7ce SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e WHIRLPOOL e243b9b6a002af5e3ee1bb196239790ff86724624ebccb34c84ac072426341db6b5f44e455d13657d5284220fe2688ddf3a2ec0212a7b86525eb02a6c080af80
diff --git a/net-misc/minidlna/files/minidlna-1.0.18-Makefile.patch b/net-misc/minidlna/files/minidlna-1.0.18-Makefile.patch
deleted file mode 100644
index 2ce5e64..0000000
--- a/net-misc/minidlna/files/minidlna-1.0.18-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -12,7 +12,7 @@
- #
- #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
- #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
--CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
-+CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
- -I/usr/include/ffmpeg \
- -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
- -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
diff --git a/net-misc/minidlna/files/minidlna-1.0.23-r1.initd b/net-misc/minidlna/files/minidlna-1.0.23-r1.initd
deleted file mode 100644
index 1ba3e1b..0000000
--- a/net-misc/minidlna/files/minidlna-1.0.23-r1.initd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting MiniDLNA"
- local params=""
- local stop=0
-
- checkpath -q -d -m 0755 -o ${M_USER:-nobody}:${M_GROUP:-nogroup} /var/run/minidlna
-
- params="$params -P /var/run/minidlna/minidlna.pid"
-
- if [[ "${RESCAN}" = "true" || "{$RESCAN}" = yes ]]; then
- params="$params -R"
- fi
-
- #set the config file and check if it exists
- if [ -z "${CONFIG}" ]; then
- if [ ! -f "/etc/minidlna.conf" ]; then
- ewarn "You did not set the config file correctly"
- stop=1
- fi
- params="$params -f /etc/minidlna.conf"
- else
- if [ ! -f "${CONFIG}" ]; then
- ewarn "The specified config file does not exist"
- stop=1
- fi
- params="$params -f ${CONFIG}"
- fi
-
-
- if [ $stop -eq 1 ]; then
- eend 1
- else
- start-stop-daemon --start \
- --user ${M_USER:-nobody} --group ${M_GROUP:-nogroup} \
- --exec /usr/sbin/minidlna -- ${params}
- eend $?
- fi
-}
-
-stop() {
- ebegin "Stopping MiniDLNA"
- start-stop-daemon --stop --quiet --exec /usr/sbin/minidlna
- eend $?
-}
diff --git a/net-misc/minidlna/files/minidlna-1.0.23.confd b/net-misc/minidlna/files/minidlna-1.0.23.confd
deleted file mode 100644
index c98c7ab..0000000
--- a/net-misc/minidlna/files/minidlna-1.0.23.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# /etc/conf.d/minidlna
-
-# Should minidlna rescan the entire collection on startup?
-# Warning: This may take a long time!
-RESCAN="false"
-
-# The location of the config file
-#CONFIG="/etc/minidlna.conf"
-
-# Specify the user/group minidlna should run as
-#M_USER="nobody"
-#M_GROUP="nogroup"
-
-# vim: ft=gentoo-conf-d
diff --git a/net-misc/minidlna/files/minidlna-1.1.0.initd b/net-misc/minidlna/files/minidlna-1.1.0.initd
deleted file mode 100644
index 9ccffe7..0000000
--- a/net-misc/minidlna/files/minidlna-1.1.0.initd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting MiniDLNA"
- local params=""
- local stop=0
-
- checkpath -q -d -m 0755 -o ${M_USER:-minidlna}:${M_GROUP:-minidlna} /var/run/minidlna
-
- params="$params -P /var/run/minidlna/minidlna.pid"
-
- if [[ "${RESCAN}" = "true" || "{$RESCAN}" = yes ]]; then
- params="$params -R"
- fi
-
- #set the config file and check if it exists
- if [ -z "${CONFIG}" ]; then
- if [ ! -f "/etc/minidlna.conf" ]; then
- ewarn "You did not set the config file correctly"
- stop=1
- fi
- params="$params -f /etc/minidlna.conf"
- else
- if [ ! -f "${CONFIG}" ]; then
- ewarn "The specified config file does not exist"
- stop=1
- fi
- params="$params -f ${CONFIG}"
- fi
-
-
- if [ $stop -eq 1 ]; then
- eend 1
- else
- start-stop-daemon --start \
- --user ${M_USER:-minidlna} --group ${M_GROUP:-minidlna} \
- --exec /usr/sbin/minidlnad -- ${params}
- eend $?
- fi
-}
-
-stop() {
- ebegin "Stopping MiniDLNA"
- start-stop-daemon --stop --quiet --exec /usr/sbin/minidlnad
- eend $?
-}
diff --git a/net-misc/minidlna/files/minidlna-1.1.0.service b/net-misc/minidlna/files/minidlna-1.1.0.service
deleted file mode 100644
index 908b1d5..0000000
--- a/net-misc/minidlna/files/minidlna-1.1.0.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=MiniDLNA is a DLNA/UPnP-AV server software
-After=syslog.target local-fs.target network.target
-
-[Service]
-User=minidlna
-Group=minidlna
-Type=forking
-PIDFile=/var/run/minidlna/minidlna.pid
-ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf -P /var/run/minidlna/minidlna.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/minidlna/files/minidlna-1.1.2.initd b/net-misc/minidlna/files/minidlna-1.1.2.initd
index c7f3026..7b5366e 100644
--- a/net-misc/minidlna/files/minidlna-1.1.2.initd
+++ b/net-misc/minidlna/files/minidlna-1.1.2.initd
@@ -16,7 +16,7 @@
params="$params -P /run/minidlna/minidlna.pid"
- if [[ "${RESCAN}" = "true" || "{$RESCAN}" = yes ]]; then
+ if [[ "${RESCAN}" = "true" || "${RESCAN}" = yes ]]; then
params="$params -R"
fi
diff --git a/net-misc/minidlna/minidlna-1.1.5.ebuild b/net-misc/minidlna/minidlna-1.1.5.ebuild
new file mode 100644
index 0000000..ef55959
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.1.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-info systemd toolchain-funcs user
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="http://minidlna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
+ https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="netgear readynas"
+
+RDEPEND="dev-db/sqlite:3
+ media-libs/flac
+ media-libs/libexif
+ media-libs/libid3tag
+ media-libs/libogg
+ media-libs/libvorbis
+ virtual/ffmpeg
+ virtual/jpeg:0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+ local my_is_new="yes"
+ [ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+ if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
+ # created by above enewuser command w/ wrong group and permissions
+ chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
+ chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
+ # if user already exists, but /var/lib/minidlna is missing
+ # rely on ${D}/var/lib/minidlna created in src_install
+ fi
+
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
+ -e "/db_dir/s:/var/cache/:/var/lib/:" \
+ -i ${PN}.conf || die
+
+ epatch "${WORKDIR}"/${PN}-gentoo-artwork.patch
+
+ epatch_user
+}
+
+src_configure() {
+ econf \
+ --disable-silent-rules \
+ --with-db-path=/var/lib/${PN} \
+ --with-log-path=/var/log/${PN} \
+ --enable-tivo \
+ $(use_enable netgear) \
+ $(use_enable readynas)
+}
+
+src_install() {
+ default
+
+ #bug 536532
+ dosym /usr/sbin/${PN}d /usr/bin/${PN}
+
+ insinto /etc
+ doins ${PN}.conf
+
+ newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}-1.1.2.initd ${PN}
+ systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
+ echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
+ systemd_dotmpfilesd "${T}"/${PN}.conf
+
+ dodir /var/{lib,log}/${PN}
+ fowners ${PN}:${PN} /var/{lib,log}/${PN}
+ fperms 0750 /var/{lib,log}/${PN}
+
+ dodoc AUTHORS NEWS README TODO
+ doman ${PN}d.8 ${PN}.conf.5
+}
+
+pkg_postinst() {
+ elog "minidlna now runs as minidlna:minidlna (bug 426726),"
+ elog "logfile is moved to /var/log/minidlna/minidlna.log,"
+ elog "cache is moved to /var/lib/minidlna."
+ elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 3d6b3b9..409c529 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,3 +1,2 @@
DIST NetworkManager-1.0.2.tar.xz 3210588 SHA256 359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff SHA512 9c5884c75c2a2aae478d99bde4ecbb0dc4293b3f50dcf78a1579aa13e09ab95b01981a366f1dc58cd5d02fe77dc90fc0941f00142cd5ef1cea14c3b9d89f5c36 WHIRLPOOL 0a9f4bc6cc0f176bfc1c82294b45392c86b6d6a65cefe38fc80fce8f09584f275a23163d1909dfde9427405fe7b4086b8e2bc4995eded4cf441b8024fa00657d
-DIST NetworkManager-1.0.4.tar.xz 3364168 SHA256 e4099fa2f4f4b8d95d0ad9fdd03ec20960845085fa500bf79aecbf54cee018c9 SHA512 b07583ca654a95dc018a712626ba0065c2ff5d9904b326891be684b32526f360f287b46cbd11026277a385558c1b55e38a086ae2b0aab059b63a4f3e11566cb1 WHIRLPOOL d6a612a855e216b7b46c620a85ceb3b3893029cf83bb9699ed0ba1c2d349abdeb4ee8921155216fb8285ac369cea64704836984e86bbf3813d8287b4803fc49a
DIST NetworkManager-1.0.6.tar.xz 3381092 SHA256 38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd SHA512 74e8f91bbd9a70f1764b06c729717e091d2be0a8e316fe1b6235e644b65f43add5214be7a1100fe9d30b1511f4a00b9892dce79bb8ba0f0b0d57089d2ba6ddbb WHIRLPOOL 5f1d8c905e4aaa78c742c16e773f8fdbcdb2771edf36565f6b419af457776084573aa43b384ba32885992e76b399d4f2fc7dc94ad4295ac28dcfa3d6b6994b97
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.6-vpn-mtu.patch b/net-misc/networkmanager/files/networkmanager-1.0.6-vpn-mtu.patch
new file mode 100644
index 0000000..6159972
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-1.0.6-vpn-mtu.patch
@@ -0,0 +1,53 @@
+From 105e30efbaf422401902575749efdcd18706ace1 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Mon, 28 Sep 2015 20:57:09 +0200
+Subject: vpn-connection: set the MTU for the VPN IP interface
+
+The 9b79e6c73 commit moved setting of the MTU from IP4Config to NMDevice, but
+VPN connections don't have a NMDevice instance (yet). Set the MTU also from the
+VPN connection. Also, copying of the MTU to the IP4Config is no longer needed
+as the ip4_config_commit no longer sets the MTU.
+
+Fixes: 9b79e6c732ffb2fb105647c1465070d36a6cc180
+
+https://bugzilla.gnome.org/show_bug.cgi?id=754781
+(cherry picked from commit e0fa48f224abcb73a1a129f10050f7cd942ee629)
+
+diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
+index f0e6149..e2d3103 100644
+--- a/src/vpn-manager/nm-vpn-connection.c
++++ b/src/vpn-manager/nm-vpn-connection.c
+@@ -980,6 +980,9 @@ nm_vpn_connection_apply_config (NMVpnConnection *connection)
+ TRUE))
+ return FALSE;
+ }
++
++ if (priv->mtu && priv->mtu != nm_platform_link_get_mtu (NM_PLATFORM_GET, priv->ip_ifindex))
++ nm_platform_link_set_mtu (NM_PLATFORM_GET, priv->ip_ifindex, priv->mtu);
+ }
+
+ apply_parent_device_config (connection);
+@@ -1149,10 +1152,6 @@ process_generic_config (NMVpnConnection *connection,
+ }
+ }
+
+- /* MTU; this is a per-connection value, though NM's API treats it
+- * like it's IP4-specific. So we store it for now and retrieve it
+- * later in ip4_config_get.
+- */
+ priv->mtu = 0;
+ val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_CONFIG_MTU);
+ if (val) {
+@@ -1328,9 +1327,6 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy,
+ if (val)
+ nm_ip4_config_set_mss (config, g_value_get_uint (val));
+
+- if (priv->mtu)
+- nm_ip4_config_set_mtu (config, priv->mtu, NM_IP_CONFIG_SOURCE_VPN);
+-
+ val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN);
+ if (val)
+ nm_ip4_config_add_domain (config, g_value_get_string (val));
+--
+cgit v0.10.2
+
diff --git a/net-misc/networkmanager/networkmanager-1.0.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.0.4-r1.ebuild
deleted file mode 100644
index 3d133d3..0000000
--- a/net-misc/networkmanager/networkmanager-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \
- user readme.gentoo toolchain-funcs vala versionator virtualx udev multilib-minimal
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
-vala +wext +wifi zeroconf" # wimax
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- wext? ( wifi )
- ^^ ( nss gnutls )
- ^^ ( dhclient dhcpcd )
-"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: Qt support?
-COMMON_DEPEND="
- >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
- >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
- >=dev-libs/libnl-3.2.8:3=
- >=sys-auth/polkit-0.106
- net-libs/libndp
- >=net-libs/libsoup-2.26:2.4=
- net-misc/iputils
- sys-libs/readline:0
- >=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
- bluetooth? ( >=net-wireless/bluez-5 )
- connection-sharing? (
- net-dns/dnsmasq[dhcp]
- net-firewall/iptables )
- gnutls? (
- dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
- net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- modemmanager? ( >=net-misc/modemmanager-0.7.991 )
- ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
- dhclient? ( >=net-misc/dhcp-4[client] )
- dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe )
- resolvconf? ( net-dns/openresolv )
- systemd? ( >=sys-apps/systemd-209:0= )
- !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
- teamd? ( >=net-misc/libteam-1.9 )
- zeroconf? ( net-dns/avahi:=[autoipd] )
-"
-RDEPEND="${COMMON_DEPEND}
- consolekit? ( sys-auth/consolekit )
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gdbus-codegen
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- >=sys-kernel/linux-headers-2.6.29
- virtual/pkgconfig
- vala? ( $(vala_depend) )
- test? (
- $(python_gen_any_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:2[${PYTHON_USEDEP}]')
- )
-"
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-pkg_setup() {
- enewgroup plugdev
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- # Force use of /run, avoid eautoreconf, upstream bug #737139, fixed in 'master'
- sed -e 's:$localstatedir/run/:/run/:' -i configure || die
-
- use vala && vala_src_prepare
-
- epatch_user # don't remove, users often want custom patches for NM
-
- eautoreconf
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=()
-
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- if use ppp; then
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
- fi
-
- # unit files directory needs to be passed only when systemd is enabled,
- # otherwise systemd support is not disabled completely, bug #524534
- use systemd && myconf+=( "$(systemd_with_unitdir)" )
-
- if multilib_is_native_abi; then
- # work-around man out-of-source brokenness, must be done before configure
- mkdir man || die
- find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
- else
- # libnl, libndp are only used for executables, not libraries
- myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' )
- fi
-
- # TODO: enable wimax when we have a libnl:3 compatible revision of it
- # wimax will be removed, bug #522822
- # ifnet plugin always disabled until someone volunteers to actively
- # maintain and fix it
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- --disable-more-warnings \
- --disable-static \
- --localstatedir=/var \
- --disable-lto \
- --disable-config-plugin-ibft \
- --disable-ifnet \
- --without-netconfig \
- --with-dbus-sys-dir=/etc/dbus-1/system.d \
- --with-udev-dir="$(get_udevdir)" \
- --with-config-plugins-default=keyfile \
- --with-iptables=/sbin/iptables \
- $(multilib_native_with libsoup) \
- $(multilib_native_enable concheck) \
- --with-crypto=$(usex nss nss gnutls) \
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \
- --with-suspend-resume=$(multilib_native_usex systemd systemd upower) \
- $(multilib_native_use_enable bluetooth bluez5-dun) \
- $(multilib_native_use_enable introspection) \
- $(multilib_native_use_enable ppp) \
- --disable-wimax \
- $(use_with dhclient) \
- $(use_with dhcpcd) \
- $(multilib_native_use_with modemmanager modem-manager-1) \
- $(multilib_native_use_with ncurses nmtui) \
- $(multilib_native_use_with resolvconf) \
- $(multilib_native_use_with selinux) \
- $(multilib_native_use_enable teamd teamdctl) \
- $(multilib_native_use_enable test tests) \
- $(multilib_native_use_enable vala) \
- --without-valgrind \
- $(multilib_native_use_with wext) \
- $(multilib_native_use_enable wifi) \
- "${myconf[@]}"
-
- # work-around gtk-doc out-of-source brokedness
- if multilib_is_native_abi; then
- local d
- for d in api libnm libnm-util libnm-glib; do
- ln -s "${S}"/docs/${d}/html docs/${d}/html || die
- done
- fi
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- emake all-am
- emake -C include
- emake -C introspection # generated headers, needed for libnm
- emake -C libnm-core
- emake -C libnm
- emake -C libnm-util
- emake -C libnm-glib
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi; then
- python_setup
- Xemake check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
- else
- emake DESTDIR="${D}" install-am
- emake DESTDIR="${D}" install -C include
- emake DESTDIR="${D}" install -C introspection
- emake DESTDIR="${D}" install -C libnm-core
- emake DESTDIR="${D}" install -C libnm
- emake DESTDIR="${D}" install -C libnm-util
- emake DESTDIR="${D}" install -C libnm-glib
- fi
-}
-
-multilib_src_install_all() {
- ! use systemd && readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # /var/run/NetworkManager is used by some distros, but not by Gentoo
- rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
- rmdir -v "${ED}/var/run" || die "rmdir failed"
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- ! use systemd && readme.gentoo_print_elog
-
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # The polkit rules file moved to /usr/share
- old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
- if [[ -f "${old_rules}" ]]; then
- case "$(md5sum ${old_rules})" in
- 574d0cfa7e911b1f7792077003060240* )
- # Automatically delete the old rules.d file if the user did not change it
- elog
- elog "Removing old ${old_rules} ..."
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
- ;;
- * )
- elog "The ${old_rules}"
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
- elog "If you edited ${old_rules}"
- elog "without changing its behavior, you may want to remove it."
- ;;
- esac
- fi
-
- # ifnet plugin was disabled for systemd users with 0.9.8.6 version
- # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations)
- if use systemd; then
- if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then
- ewarn "Ifnet plugin won't be used with systemd support enabled"
- ewarn "as it is meant to be used with openRC and can cause collisions"
- ewarn "(like bug #485658)."
- ewarn "Because of this, you will likely need to reconfigure some of"
- ewarn "your networks. To do this you can rely on Gnome control center,"
- ewarn "nm-connection-editor or nmtui tools for example once updated"
- ewarn "NetworkManager version is installed."
- fi
- else
- if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then
- ewarn "Ifnet plugin is now disabled because of it being unattended"
- ewarn "and unmaintained for a long time, leading to some unfixed bugs"
- ewarn "and new problems appearing. We will now use upstream 'keyfile'"
- ewarn "plugin."
- ewarn "Because of this, you will likely need to reconfigure some of"
- ewarn "your networks. To do this you can rely on Gnome control center,"
- ewarn "nm-connection-editor or nmtui tools for example once updated"
- ewarn "NetworkManager version is installed."
- fi
- fi
-
- # NM fallbacks to plugin specified at compile time (upstream bug #738611)
- # but still show a warning to remember people to have cleaner config file
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
- ewarn
- fi
- fi
-
- # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
- ewarn "You have psk-flags=1 setting in above files, you will need to"
- ewarn "either reconfigure affected networks or, at least, set the flag"
- ewarn "value to '0'."
- fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.0.6-r1.ebuild b/net-misc/networkmanager/networkmanager-1.0.6-r1.ebuild
new file mode 100644
index 0000000..89bc91b
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.0.6-r1.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \
+ user readme.gentoo toolchain-funcs vala versionator virtualx udev multilib-minimal
+
+DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
+kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
+vala +wext +wifi zeroconf" # wimax
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="
+ modemmanager? ( ppp )
+ wext? ( wifi )
+ ^^ ( nss gnutls )
+ ^^ ( dhclient dhcpcd )
+"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# TODO: Qt support?
+COMMON_DEPEND="
+ >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+ >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+ >=dev-libs/libnl-3.2.8:3=
+ >=sys-auth/polkit-0.106
+ net-libs/libndp
+ >=net-libs/libsoup-2.26:2.4=
+ net-misc/iputils
+ sys-libs/readline:0
+ >=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
+ bluetooth? ( >=net-wireless/bluez-5 )
+ connection-sharing? (
+ net-dns/dnsmasq[dhcp]
+ net-firewall/iptables )
+ gnutls? (
+ dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+ net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+ modemmanager? ( >=net-misc/modemmanager-0.7.991 )
+ ncurses? ( >=dev-libs/newt-0.52.15 )
+ nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+ dhclient? ( >=net-misc/dhcp-4[client] )
+ dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+ introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+ ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe )
+ resolvconf? ( net-dns/openresolv )
+ systemd? ( >=sys-apps/systemd-209:0= )
+ !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
+ teamd? ( >=net-misc/libteam-1.9 )
+ zeroconf? ( net-dns/avahi:=[autoipd] )
+"
+RDEPEND="${COMMON_DEPEND}
+ consolekit? ( sys-auth/consolekit )
+ wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/gdbus-codegen
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ >=sys-kernel/linux-headers-2.6.29
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+ test? (
+ $(python_gen_any_dep '
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pygobject:2[${PYTHON_USEDEP}]')
+ )
+"
+
+sysfs_deprecated_check() {
+ ebegin "Checking for SYSFS_DEPRECATED support"
+
+ if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+ eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+ eerror "or NetworkManager will not work correctly."
+ eerror "See https://bugs.gentoo.org/333639 for more info."
+ die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+ fi
+ eend $?
+}
+
+pkg_pretend() {
+ if use kernel_linux; then
+ get_version
+ if linux_config_exists; then
+ sysfs_deprecated_check
+ else
+ ewarn "Was unable to determine your kernel .config"
+ ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+ ewarn "See https://bugs.gentoo.org/333639 for more info."
+ fi
+
+ fi
+}
+
+pkg_setup() {
+ enewgroup plugdev
+}
+
+src_prepare() {
+ DOC_CONTENTS="To modify system network connections without needing to enter the
+ root password, add your user account to the 'plugdev' group."
+
+ # vpn-connection: set the MTU for the VPN IP interface (from nm-1.0 branch)
+ epatch "${FILESDIR}"/${P}-vpn-mtu.patch
+
+ # Force use of /run, avoid eautoreconf, upstream bug #737139, fixed in 'master'
+ sed -e 's:$localstatedir/run/:/run/:' -i configure || die
+
+ # Don't build examples, they are not needed and can cause build failure
+ sed -e '/^\s*examples\s*\\/d' -i Makefile.{am,in} || die
+
+ use vala && vala_src_prepare
+
+ epatch_user # don't remove, users often want custom patches for NM
+
+ eautoreconf
+
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=()
+
+ # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+ if use ppp; then
+ local PPPD_VER=`best_version net-dialup/ppp`
+ PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+ PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+ myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+ fi
+
+ # unit files directory needs to be passed only when systemd is enabled,
+ # otherwise systemd support is not disabled completely, bug #524534
+ use systemd && myconf+=( "$(systemd_with_unitdir)" )
+
+ if multilib_is_native_abi; then
+ # work-around man out-of-source brokenness, must be done before configure
+ mkdir man || die
+ find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
+ else
+ # libnl, libndp are only used for executables, not libraries
+ myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' )
+ fi
+
+ # TODO: enable wimax when we have a libnl:3 compatible revision of it
+ # wimax will be removed, bug #522822
+ # ifnet plugin always disabled until someone volunteers to actively
+ # maintain and fix it
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-more-warnings \
+ --disable-static \
+ --localstatedir=/var \
+ --disable-lto \
+ --disable-config-plugin-ibft \
+ --disable-ifnet \
+ --without-netconfig \
+ --with-dbus-sys-dir=/etc/dbus-1/system.d \
+ --with-udev-dir="$(get_udevdir)" \
+ --with-config-plugins-default=keyfile \
+ --with-iptables=/sbin/iptables \
+ $(multilib_native_with libsoup) \
+ $(multilib_native_enable concheck) \
+ --with-crypto=$(usex nss nss gnutls) \
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \
+ --with-suspend-resume=$(multilib_native_usex systemd systemd upower) \
+ $(multilib_native_use_enable bluetooth bluez5-dun) \
+ $(multilib_native_use_enable introspection) \
+ $(multilib_native_use_enable ppp) \
+ --disable-wimax \
+ $(use_with dhclient) \
+ $(use_with dhcpcd) \
+ $(multilib_native_use_with modemmanager modem-manager-1) \
+ $(multilib_native_use_with ncurses nmtui) \
+ $(multilib_native_use_with resolvconf) \
+ $(multilib_native_use_with selinux) \
+ $(multilib_native_use_enable teamd teamdctl) \
+ $(multilib_native_use_enable test tests) \
+ $(multilib_native_use_enable vala) \
+ --without-valgrind \
+ $(multilib_native_use_with wext) \
+ $(multilib_native_use_enable wifi) \
+ "${myconf[@]}"
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ local d
+ for d in api libnm libnm-util libnm-glib; do
+ ln -s "${S}"/docs/${d}/html docs/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ emake
+ else
+ emake all-am
+ emake -C include
+ emake -C introspection # generated headers, needed for libnm
+ emake -C libnm-core
+ emake -C libnm
+ emake -C libnm-util
+ emake -C libnm-glib
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ python_setup
+ Xemake check
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ # Install completions at proper place, bug #465100
+ gnome2_src_install completiondir="$(get_bashcompdir)"
+ else
+ emake DESTDIR="${D}" install-am
+ emake DESTDIR="${D}" install -C include
+ emake DESTDIR="${D}" install -C introspection
+ emake DESTDIR="${D}" install -C libnm-core
+ emake DESTDIR="${D}" install -C libnm
+ emake DESTDIR="${D}" install -C libnm-util
+ emake DESTDIR="${D}" install -C libnm-glib
+ fi
+}
+
+multilib_src_install_all() {
+ ! use systemd && readme.gentoo_create_doc
+
+ newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
+ newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+ # /var/run/NetworkManager is used by some distros, but not by Gentoo
+ rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
+ rmdir -v "${ED}/var/run" || die "rmdir failed"
+
+ # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+ keepdir /etc/NetworkManager/dispatcher.d
+
+ # Provide openrc net dependency only when nm is connected
+ exeinto /etc/NetworkManager/dispatcher.d
+ newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+ sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+ -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+ keepdir /etc/NetworkManager/system-connections
+ chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+ # Allow users in plugdev group to modify system connections
+ insinto /usr/share/polkit-1/rules.d/
+ doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ ! use systemd && readme.gentoo_print_elog
+
+ if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+ ewarn "The ${PN} system configuration file has moved to a new location."
+ ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+ ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+ ewarn
+ ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+ fi
+
+ # The polkit rules file moved to /usr/share
+ old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+ if [[ -f "${old_rules}" ]]; then
+ case "$(md5sum ${old_rules})" in
+ 574d0cfa7e911b1f7792077003060240* )
+ # Automatically delete the old rules.d file if the user did not change it
+ elog
+ elog "Removing old ${old_rules} ..."
+ rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+ ;;
+ * )
+ elog "The ${old_rules}"
+ elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
+ elog "If you edited ${old_rules}"
+ elog "without changing its behavior, you may want to remove it."
+ ;;
+ esac
+ fi
+
+ # ifnet plugin was disabled for systemd users with 0.9.8.6 version
+ # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations)
+ if use systemd; then
+ if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then
+ ewarn "Ifnet plugin won't be used with systemd support enabled"
+ ewarn "as it is meant to be used with openRC and can cause collisions"
+ ewarn "(like bug #485658)."
+ ewarn "Because of this, you will likely need to reconfigure some of"
+ ewarn "your networks. To do this you can rely on Gnome control center,"
+ ewarn "nm-connection-editor or nmtui tools for example once updated"
+ ewarn "NetworkManager version is installed."
+ fi
+ else
+ if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then
+ ewarn "Ifnet plugin is now disabled because of it being unattended"
+ ewarn "and unmaintained for a long time, leading to some unfixed bugs"
+ ewarn "and new problems appearing. We will now use upstream 'keyfile'"
+ ewarn "plugin."
+ ewarn "Because of this, you will likely need to reconfigure some of"
+ ewarn "your networks. To do this you can rely on Gnome control center,"
+ ewarn "nm-connection-editor or nmtui tools for example once updated"
+ ewarn "NetworkManager version is installed."
+ fi
+ fi
+
+ # NM fallbacks to plugin specified at compile time (upstream bug #738611)
+ # but still show a warning to remember people to have cleaner config file
+ if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+ if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+ ewarn
+ ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+ ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+ ewarn
+ fi
+ fi
+
+ # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+ if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+ ewarn "You have psk-flags=1 setting in above files, you will need to"
+ ewarn "either reconfigure affected networks or, at least, set the flag"
+ ewarn "value to '0'."
+ fi
+}
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index de9f81e..a75e518 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -1,3 +1,2 @@
-DIST ofono-1.14.tar.bz2 947471 SHA256 46228f101a73d700f2b240b1e4b52b79dbae2201e6d18bb67572935e0f440dd9 SHA512 3e5725ef76f0952665e31165bda01d8d43e79cd576fd447564418bffc96217d532d2246e2976b6616498a434f06b148acd426583c3a281de90aeeddbda60371f WHIRLPOOL 49fd61077e21fce9b009b2f663fc8f793d592695751fca8708e70cd247b0049a529b77a7eecf243c8398e16641de95daed3678f89616a77ae06e2e4a6ec467c1
-DIST ofono-1.15.tar.xz 849268 SHA256 978807a05e8904eb4e57d6533ed71e75676a55fa3819a39fe2c878f45dbf7af6 SHA512 ed47bcdc9e903a4e841922e1f3dd2f649a005aa8c0c0a8900820c745c9386e8619412745d21361c3731c564d9d814080f3e7e385bb69bf9ec62a6321272f2c70 WHIRLPOOL 24a6cef324ccca12e025207c7b239789529788dd296c5cdf4cdac35a89c435da8a5c267d01936d9fea15073432d5e45b7bac48a2e0df3136606a312ad6c8c2e9
DIST ofono-1.16.tar.xz 854296 SHA256 403b98dadece8bc804c0bd16b96d3db5a3bb0f84af64b3d67924da2d1a754b07 SHA512 21887e1bc3b8af18881f9456f950b97885b567164e28ebe2ab6fc5a3042c439891a20b5034a8fa0c7a78567286ac53c1b8a72122f428fbcf5da8bf139423b913 WHIRLPOOL b13aec1b3548b4959e68bd742efc239a0c6d928be2a0d70352d5bdcca3c551b6d2f4c09dd3eef4afcf3547547c47c488bbd49ebac1e468c2519846de3fe8e81a
+DIST ofono-1.17.tar.xz 860460 SHA256 cbf20f07fd15253c682b23c1786d517f505c3688f7c4ea93da777e1523b89635 SHA512 d945c87b9c759b459926fcc002d4fb6938c5359a0070a0c623da9f98e342fd2bd92a5f4f22a14e4aa66b5cb3467c3d8f09a95d991ced0b774c066a6406d0746c WHIRLPOOL d509c69030c63d62f158c96a2b39764f803b68435bcf9ff561e910b80372a98659b9563976995bc83c6b2aaed9c27ad787357a67717e3c4d1ce06339c246870a
diff --git a/net-misc/ofono/files/ofono-1.12-sys-types.patch b/net-misc/ofono/files/ofono-1.12-sys-types.patch
deleted file mode 100644
index 15f94ab..0000000
--- a/net-misc/ofono/files/ofono-1.12-sys-types.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit e1d5dfe3aebcb0d2669ec1534cb6eba25f07dbb7
-Author: Lucas De Marchi <lucas.demarchi@profusion.mobi>
-Date: Wed Jan 16 19:11:24 2013 -0200
-
- storage: Include sys/types.h for ssize_t
-
- src/storage.h:32:1: error: unknown type name 'ssize_t'
- src/storage.h:36:1: error: unknown type name 'ssize_t'
-
-diff --git a/src/storage.h b/src/storage.h
-index c455bae..70446ad 100644
---- a/src/storage.h
-+++ b/src/storage.h
-@@ -26,6 +26,7 @@
- #endif
-
- #include <fcntl.h>
-+#include <sys/types.h>
-
- int create_dirs(const char *filename, const mode_t mode);
-
diff --git a/net-misc/ofono/ofono-1.14.ebuild b/net-misc/ofono/ofono-1.14.ebuild
deleted file mode 100644
index 4b7451d..0000000
--- a/net-misc/ofono/ofono-1.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib systemd
-
-DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
-HOMEPAGE="http://ofono.org/"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads tools +udev"
-
-REQUIRED_USE="dundee? ( bluetooth )"
-
-RDEPEND=">=sys-apps/dbus-1.4
- >=dev-libs/glib-2.28
- net-misc/mobile-broadband-provider-info
- bluetooth? ( >=net-wireless/bluez-4.99 )
- udev? ( virtual/udev )
- examples? ( dev-python/dbus-python )
- tools? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS )
-
-src_configure() {
- econf \
- $(use_enable threads) \
- $(use_enable udev) \
- $(use_enable isimodem) \
- $(use_enable atmodem) \
- $(use_enable cdmamodem) \
- $(use_enable datafiles) \
- $(use_enable dundee) \
- $(use_enable bluetooth) \
- $(use_enable phonesim) \
- $(use_enable provision) \
- $(use_enable qmimodem) \
- $(use_enable tools) \
- $(use_enable examples test) \
- --disable-maintainer-mode \
- --localstatedir=/var \
- --with-systemdunitdir="$(systemd_get_unitdir)"
-}
-
-src_install() {
- default
-
- if use tools ; then
- dobin tools/auto-enable \
- tools/huawei-audio \
- tools/lookup-provider-name \
- tools/lookup-apn \
- tools/get-location \
- tools/qmi \
- tools/tty-redirector
- fi
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- use doc && dodoc doc/*.txt
-}
diff --git a/net-misc/ofono/ofono-1.15.ebuild b/net-misc/ofono/ofono-1.15.ebuild
deleted file mode 100644
index 7939bb3..0000000
--- a/net-misc/ofono/ofono-1.15.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib systemd
-
-DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
-HOMEPAGE="http://ofono.org/"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads tools +udev"
-
-REQUIRED_USE="dundee? ( bluetooth )"
-
-RDEPEND=">=sys-apps/dbus-1.4
- >=dev-libs/glib-2.28
- net-misc/mobile-broadband-provider-info
- bluetooth? ( >=net-wireless/bluez-4.99 )
- udev? ( virtual/udev )
- examples? ( dev-python/dbus-python )
- tools? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS )
-
-src_configure() {
- econf \
- $(use_enable threads) \
- $(use_enable udev) \
- $(use_enable isimodem) \
- $(use_enable atmodem) \
- $(use_enable cdmamodem) \
- $(use_enable datafiles) \
- $(use_enable dundee) \
- $(use_enable bluetooth) \
- $(use_enable phonesim) \
- $(use_enable provision) \
- $(use_enable qmimodem) \
- $(use_enable tools) \
- $(use_enable examples test) \
- --disable-maintainer-mode \
- --localstatedir=/var \
- --with-systemdunitdir="$(systemd_get_unitdir)"
-}
-
-src_install() {
- default
-
- if use tools ; then
- dobin tools/auto-enable \
- tools/huawei-audio \
- tools/lookup-provider-name \
- tools/lookup-apn \
- tools/get-location \
- tools/qmi \
- tools/tty-redirector
- fi
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- use doc && dodoc doc/*.txt
-}
diff --git a/net-misc/ofono/ofono-1.17.ebuild b/net-misc/ofono/ofono-1.17.ebuild
new file mode 100644
index 0000000..2b34b3c
--- /dev/null
+++ b/net-misc/ofono/ofono-1.17.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib systemd
+
+DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
+HOMEPAGE="http://ofono.org/"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads tools +udev"
+
+REQUIRED_USE="dundee? ( bluetooth )"
+
+RDEPEND=">=sys-apps/dbus-1.4
+ >=dev-libs/glib-2.28
+ net-misc/mobile-broadband-provider-info
+ bluetooth? ( >=net-wireless/bluez-4.99 )
+ udev? ( virtual/udev )
+ examples? ( dev-python/dbus-python )
+ tools? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS )
+
+src_configure() {
+ econf \
+ $(use_enable threads) \
+ $(use_enable udev) \
+ $(use_enable isimodem) \
+ $(use_enable atmodem) \
+ $(use_enable cdmamodem) \
+ $(use_enable datafiles) \
+ $(use_enable dundee) \
+ $(use_enable bluetooth) \
+ $(use_enable phonesim) \
+ $(use_enable provision) \
+ $(use_enable qmimodem) \
+ $(use_enable tools) \
+ $(use_enable examples test) \
+ --disable-maintainer-mode \
+ --localstatedir=/var \
+ --with-systemdunitdir="$(systemd_get_unitdir)"
+}
+
+src_install() {
+ default
+
+ if use tools ; then
+ dobin tools/auto-enable \
+ tools/huawei-audio \
+ tools/lookup-provider-name \
+ tools/lookup-apn \
+ tools/get-location \
+ tools/qmi \
+ tools/tty-redirector
+ fi
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ use doc && dodoc doc/*.txt
+}
diff --git a/net-misc/openconnect/openconnect-7.06-r2.ebuild b/net-misc/openconnect/openconnect-7.06-r2.ebuild
new file mode 100644
index 0000000..2a75168
--- /dev/null
+++ b/net-misc/openconnect/openconnect-7.06-r2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo
+
+DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
+HOMEPAGE="http://www.infradead.org/openconnect.html"
+VPNC_VER=20140806
+SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
+ ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc +gnutls gssapi java libressl libproxy nls static-libs"
+ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW"
+for lang in $ILINGUAS; do
+ IUSE="${IUSE} linguas_${lang}"
+done
+
+DEPEND="dev-libs/libxml2
+ sys-libs/zlib
+ !gnutls? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] )
+ libressl? ( dev-libs/libressl[static-libs?] )
+ )
+ gnutls? (
+ >=net-libs/gnutls-3[static-libs?] dev-libs/nettle
+ app-misc/ca-certificates
+ )
+ gssapi? ( virtual/krb5 )
+ libproxy? ( net-libs/libproxy )
+ nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+ sys-apps/iproute2
+ !<sys-apps/openrc-0.13"
+DEPEND="${DEPEND}
+ virtual/pkgconfig
+ doc? ( ${PYTHON_DEPS} sys-apps/groff )
+ java? ( >=virtual/jdk-1.6 )
+ nls? ( sys-devel/gettext )"
+
+CONFIG_CHECK="~TUN"
+
+pkg_pretend() {
+ check_extra_config
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+
+ if use doc; then
+ python-any-r1_pkg_setup
+ fi
+}
+
+src_configure() {
+ strip-linguas $ILINGUAS
+ echo ${LINGUAS} > po/LINGUAS
+ if ! use doc; then
+ # If the python cannot be found, the docs will not build
+ sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
+ fi
+
+ # stoken and liboath not in portage
+ econf \
+ --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \
+ $(use_enable static-libs static) \
+ $(use_enable nls ) \
+ $(use_with !gnutls openssl) \
+ $(use_with gnutls ) \
+ $(use_with libproxy) \
+ --without-stoken \
+ $(use_with gssapi) \
+ $(use_with java)
+}
+
+DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels.
+
+You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d
+instead of calling it directly:
+
+ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0
+
+You can then start the vpn tunnel like this:
+
+/etc/init.d/openconnect.vpn0 start
+
+If you would like to run preup, postup, predown, and/or postdown scripts,
+You need to create a directory in /etc/openconnect with the name of the vpn:
+
+mkdir /etc/openconnect/vpn0
+
+Then add executable shell files:
+
+mkdir /etc/openconnect/vpn0
+cd /etc/openconnect/vpn0
+echo '#!/bin/sh' > preup.sh
+cp preup.sh predown.sh
+cp preup.sh postup.sh
+cp preup.sh postdown.sh
+chmod 755 /etc/openconnect/vpn0/*
+"
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS TODO
+ newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
+ dodir /etc/openconnect
+ insinto /etc/openconnect
+ newconfd "${FILESDIR}"/openconnect.conf.in openconnect
+ exeinto /etc/openconnect
+ newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/openconnect.logrotate openconnect
+ keepdir /var/log/openconnect
+
+ # Remove useless .la files
+ prune_libtool_files --all
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog
+ elog "You may want to consider installing the following optional packages."
+ optfeature "resolvconf support" net-dns/openresolv
+ fi
+}
diff --git a/net-misc/openvpn/openvpn-2.3.8.ebuild b/net-misc/openvpn/openvpn-2.3.8.ebuild
index 7df6370..0f81333 100644
--- a/net-misc/openvpn/openvpn-2.3.8.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.8.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE="examples down-root iproute2 +lzo pam passwordsave pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
REQUIRED_USE="static? ( !plugins !pkcs11 )
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index f084980..ce426f9 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,3 +1,2 @@
-DIST putty-0.64.tar.gz 1977448 SHA256 2a46c97a184144e3ec2392aca9acc64d062317a3a38b9a5f623a147eda5f3821 SHA512 ba4d4086b8edcb6388924bf3d9b018841be36a9dbf298271c9d2ed063aae9854093e9ff6808bd1f65669d78369548639eb3c95fdec5e3f0daee4b1c7bb603051 WHIRLPOOL 9f91dd80e9fa92e6c7957b5797158d8f5ff8162ef04f76c26e044ff4a421444c30ca1089111a448f307dc9f060c80bfb1b5616abf9ca88dd16808680ce86d253
DIST putty-0.65.tar.gz 1937861 SHA256 d543c1fd4944ea51d46d4abf31bfb8cde9bd1c65cb36dc6b83e51ce875660ca0 SHA512 cfb3e5437a920aa11bccedf1bd43a538a51ec3777a6d1dba9e9714c3b3699eaf1f4eb027a8f5fd6425f9909564a28b607f465b1f2b2e1250059b04b9a9d40569 WHIRLPOOL 15eff58a0cec37516daf67cef56772602f5bcbcb39ba09d3d8fdba31fadb77734c404a9d85e674e17c17e53db8c0deaad906b56b3bce302ec08adc9a44850c2b
DIST putty-icons.tar.bz2 4878 SHA256 960b189069dbfb20a1f49e378ab88bed716c6457593815e414d51ad7a3fa93a7 SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71 WHIRLPOOL ec96fe682582bfa58ce73c3e5cb7bb61d2363b7a5e9d3259dfd11cd6396512b5b9ed954f6a431baab36b1f17963714b30c239cdf4c08191d27b5abb858f54a57
diff --git a/net-misc/putty/putty-0.64.ebuild b/net-misc/putty/putty-0.64.ebuild
deleted file mode 100644
index 43bfb68..0000000
--- a/net-misc/putty/putty-0.64.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils gnome2-utils toolchain-funcs
-
-DESCRIPTION="A Free Telnet/SSH Client"
-HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86"
-IUSE="doc +gtk ipv6 kerberos"
-SRC_URI="
- https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
- http://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
-"
-
-RDEPEND="
- !net-misc/pssh
- gtk? (
- dev-libs/glib:2
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/pango
- )
- kerberos? ( virtual/krb5 )
-"
-DEPEND="
- ${RDEPEND}
- dev-lang/perl
- virtual/pkgconfig
-"
-
-src_prepare() {
- sed -i \
- -e '/AM_PATH_GTK(/d' \
- -e 's|-Werror||g' \
- configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- cd "${S}"/unix || die
- econf \
- $(use_with kerberos gssapi) \
- $(use_with gtk)
-}
-
-src_compile() {
- cd "${S}"/unix || die
- emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
-}
-
-src_install() {
- dodoc doc/puttydoc.txt
-
- if use doc; then
- dohtml doc/*.html
- fi
-
- cd "${S}"/unix || die
- default
-
- if use gtk ; then
- for i in 16 22 24 32 48 64 128 256; do
- newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
- done
-
- # install desktop file provided by Gustav Schaffter in #49577
- make_desktop_entry ${PN} PuTTY ${PN} Network
- fi
-}
-
-pkg_preinst() {
- use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- use gtk && gnome2_icon_cache_update
-}
diff --git a/net-misc/radvd/radvd-2.11-r1.ebuild b/net-misc/radvd/radvd-2.11-r1.ebuild
index d7e1949..9b5c111 100644
--- a/net-misc/radvd/radvd-2.11-r1.ebuild
+++ b/net-misc/radvd/radvd-2.11-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=4
-inherit systemd user eutils readme.gentoo
+inherit autotools systemd user eutils readme.gentoo
DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
HOMEPAGE="http://v6web.litech.org/radvd/"
@@ -36,6 +36,7 @@
src_prepare() {
epatch "${FILESDIR}"/${PN}-2.10-musl-libc-fix.patch
+ eautoreconf
}
src_configure() {
diff --git a/net-misc/redir/metadata.xml b/net-misc/redir/metadata.xml
index 59e2b8f..ffdcb3d 100644
--- a/net-misc/redir/metadata.xml
+++ b/net-misc/redir/metadata.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>proxy-maintainers</herd>
<maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <name>Default assignee for orphaned packages</name>
+ <email>brendan@horan.hk</email>
+ <name>Brendan Hhoran</name>
+ <description>Proxy maintainer, to be assigned all bugs</description>
</maintainer>
</pkgmetadata>
diff --git a/net-misc/ser/ser-0.9.7-r1.ebuild b/net-misc/ser/ser-0.9.7-r1.ebuild
index 13538c4..244f4df 100644
--- a/net-misc/ser/ser-0.9.7-r1.ebuild
+++ b/net-misc/ser/ser-0.9.7-r1.ebuild
@@ -94,7 +94,7 @@
MY_A=$(eval echo ${x}-\${$(echo ${x} | tr "[:lower:]" "[:upper:]")_PV}-${PN}-${MODULES_PV})
MY_PATCH_A="${P}-extmod-${x}"
mkdir -p "${S}"/modules/${x} || die
- cd "${S}"/modules/${x} || die
+ cd "${S}"/modules/${x} || die
unpack ${MY_A}.tar.gz
# fix makefiles
if [[ -f "${FILESDIR}"/${MY_A}.diff ]]; then
@@ -154,7 +154,7 @@
chown -R root:ser "${D}"/etc/ser || die
chmod 750 "${D}"/etc/ser || die
- chmod 640 "${D}"/etc/ser/* || die
+ chmod 640 "${D}"/etc/ser/* || die
# fix manpages
sed -i -e "s:^.B /ser-${PV}AUTHORS:.B /usr/share/doc/${PF}/AUTHORS:" \
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index bfac8ea..ed74d36 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1 +1,2 @@
DIST smb4k-1.2.0.tar.xz 3911380 SHA256 42b32a7f5c534e17e5130cb8a69ee1f38d82e8c5932091a20e9faf0b16c4fd2f SHA512 3256c24328246a86f19b943c7d10bed7a5979ef5940be1381a07be93c91a80adcf42e5bbfb791dc62edc1d9ece38a5e86c33974706ed23a4db399e4b869acf58 WHIRLPOOL 1b24526acb042c3f06a05b3c1f7516f0a1fe21667abb5bb1330868c48bd7731f4c6aacc307b1befbd9e2407665ba8b1ac1b43478013c671c9fd15e4fff79949d
+DIST smb4k-1.2.1.tar.xz 3817104 SHA256 6562ab12c783d47e246d9d0a43b2342288384a7a78e0207a14e1dd6c40ffe97b SHA512 df5782de9b140dc6ec97f4b66e758dc62923a6d6e85843717a0a17b3f853d036bcd3e73cf289819c5b5caa6bc28e3943dea73a745197356a3351d5a643c21f37 WHIRLPOOL 6e89a20d4a7ce48278db2a27c7ce291c737f6a6485a02febedb4fc45dedadff2185867e87ad14d97cb1e56a593c80d7b09b2a1ee65c5a4dae0784700772f100b
diff --git a/net-misc/smb4k/smb4k-1.2.1.ebuild b/net-misc/smb4k/smb4k-1.2.1.ebuild
new file mode 100644
index 0000000..0cc2aa6
--- /dev/null
+++ b/net-misc/smb4k/smb4k-1.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DECLARATIVE_REQUIRED="always"
+KDE_LINGUAS="bg bs ca ca@valencia cs da de en_GB eo es et fi fr ga gl hu is it
+ja ko lt mai mr nb nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
+inherit kde4-base
+
+DESCRIPTION="The advanced network neighborhood browser for KDE"
+HOMEPAGE="http://sourceforge.net/projects/smb4k/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND=">=net-fs/samba-3.4.2[cups]"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+DOCS=( AUTHORS BUGS ChangeLog README )
diff --git a/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild
index 5ddbfec..4f5d78f 100644
--- a/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild
@@ -18,7 +18,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio
python sasl smartcard static-libs usbredir vala webdav"
diff --git a/net-misc/spice-gtk/spice-gtk-0.28.ebuild b/net-misc/spice-gtk/spice-gtk-0.28.ebuild
index f81e7b3..34ea2b7 100644
--- a/net-misc/spice-gtk/spice-gtk-0.28.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.28.ebuild
@@ -18,7 +18,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~ia64 ~ppc ppc64 ~sparc x86"
IUSE="dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav"
REQUIRED_USE="
diff --git a/net-misc/spiped/spiped-1.5.0-r1.ebuild b/net-misc/spiped/spiped-1.5.0-r1.ebuild
index caf32da..ae0cb10 100644
--- a/net-misc/spiped/spiped-1.5.0-r1.ebuild
+++ b/net-misc/spiped/spiped-1.5.0-r1.ebuild
@@ -10,7 +10,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
MY_PN="${PN/d/}"
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 3d2ecf1..512fc7c 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,7 +1,3 @@
-DIST stunnel-5.14.tar.gz 608366 SHA256 2197b4fc1db82eba69c8baf1fac30f0767af26e9f8c7e9e1d5a4a8fbb264695a SHA512 f0d074f5c525036d98565c9c315f1761920c2e7cd7687a9a0f0441e7caf5cf3930b14c078f4f158806c557ba8ea0698aa3b23d5e7e03c076ee3b6667140148c8 WHIRLPOOL af8d018ffb74aafafef7bc90c63c2a5c1e4dbe164f71eb7aea7cf5388f60c9f49c19ce4dcbf2e55c2c166ee1be98ff5ef72171d750949e668391a7afeca78224
-DIST stunnel-5.17.tar.gz 613840 SHA256 c3e79e582621a0827125e35e1c00450190104fc02dc3c5274cb02b05859fd472 SHA512 07064bda6978d94f783fd1c125485f46eadcba0e4a419366149e91cf88333b875eeb86f63848b5dd774f9f01d41206f93905fa5a51a08ade915b4b0bce777419 WHIRLPOOL 832b3cef06ec945d2dae33d3bdba048d93ca85757f149f705d6ff5bf03440dd3d3857a73f1167ae792aedceefcb7df4ea6c31164fa5d7ee8857f5e589b08e257
-DIST stunnel-5.18.tar.gz 624660 SHA256 0532c0a2f8de3da1ab625e384146501ce5936fac63d01561c3a9bf652b692317 SHA512 292d5ef96c6d84c248b75f9e0e9b344c79177ec72f96097281bb37a12e52f4b5e44d363b1c164ee86536dbc492c8e9f899e17a1842c85453c2ef113a5d1862ec WHIRLPOOL 2cea6cc70350fa750e46d09ad28621fe4c0334442829e42d2157344424e6a2437b2642c5219bf4d5be1588f8c91671c805423c13c06b24b73d56686dabb4b412
-DIST stunnel-5.19.tar.gz 620810 SHA256 0b543242cf26649acfdd9f00de564c3e8de7ac2237d53935ffdc7eb24f4d556d SHA512 93b1b6f62873610dada98b7d555aafa8495f9d34fd2a9b92e2bc6420edbc087f428ca6d6d47560055b36809fad08ec7eb41e71bc0abe97c84277125484866574 WHIRLPOOL 5fbab7761a7284766b65bac177bd997ac506141627992bc7f8642250a99d6dd7dc09a2a609934aa66ad99ba7faa2cf886edb2d0b1b942d672671aff57cbf3d48
DIST stunnel-5.20.tar.gz 625091 SHA256 4a36a3729a7287d9d82c4b38bf72c4d3496346cb969b86129c5deac22b20292b SHA512 59262aacf866cac25bac707b94c5a6185aa868b5fdfab38a9ef03a00b80f106d92e2872c0b0fecbc5d13adb7bdea7f922768fb78f38355dbf67eb34a148441e4 WHIRLPOOL fc890dff4ddeb00df9e8ea84fae8f0f23609d1356c91d4cdeade55f164bad322a8a2df72955b710e46e1f74a33bbc7f5c8d734efc190d0835056926d7c902b26
-DIST stunnel-5.22.tar.gz 627014 SHA256 8ad628a6948153cdb2044283f6988384a30585ea7e14778c2ee616a6678cb83f SHA512 edf48fda7d431eee79feb72b6901c02d667ae25f85db9850e12776b57cc68ccacdf069deb3858106939b5c3c53b682a785083f5e7241221a350e06f4307e74f5 WHIRLPOOL f467f91976100e2941ac9809199ce229655daaaee2ebd83eebe525499cb670b1577ddb7b3a65ae2a15d36c925a4747db402d969b9589c698a5d0d52508705f44
DIST stunnel-5.23.tar.gz 630943 SHA256 0fc4a702afd2e857bae8ad1f39c51546eb282c3d0ff4f4d55d62aece7328ddea SHA512 f312b5feff78548a7d1e7785068f0a0e3dd3785541f09d5850f9f5c5ee6bdf63b30761d68c3ba17465e87b048acd47e613aab139aab540873a38594f68669cb9 WHIRLPOOL dd32db35f2b09c3414471dd45d74369156a909429cf2becf34e08854d838d8c3c3979fb0b7e9e524a2e01abe7740ea0ac320985bb6dd813081296168ed7f1819
+DIST stunnel-5.24.tar.gz 631730 SHA256 ab2e5a1034d422951ddad21b572eb7fa8efb4c4ce04bc86536c6845f3d02b07e SHA512 d9a1ef9cdd3ffafc2a3d1b3383bcf3dfc1a52cdd5a0bcfd64f50addf78a0fd0ce0def6b32ed801f8dfcabbecd64284454b1c90a18435b5d603ecba594d840340 WHIRLPOOL b625adbc9299c04308733bb5ee732350084b603128734214ec3079f58c02b58d08bfc53bf604468cd83cc5dc1bf5d968a4d5139cd98d7b2219303fdd3d6eae64
diff --git a/net-misc/stunnel/stunnel-5.14.ebuild b/net-misc/stunnel/stunnel-5.14.ebuild
deleted file mode 100644
index eb29582..0000000
--- a/net-misc/stunnel/stunnel-5.14.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit ssl-cert eutils systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
- http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
- dev-libs/openssl"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
- enewgroup stunnel
- enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
- # Hack away generation of certificate
- sed -i -e "s/^install-data-local:/do-not-run-this:/" \
- tools/Makefile.in || die "sed failed"
-}
-
-src_configure() {
- econf \
- $(use_enable ipv6) \
- $(use_enable tcpd libwrap) \
- --with-ssl="${EPREFIX}"/usr \
- --disable-fips
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- rm -rf "${ED}"/usr/share/doc/${PN}
- rm -f "${ED}"/etc/stunnel/stunnel.conf-sample "${ED}"/usr/bin/stunnel3 \
- "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-
- # The binary was moved to /usr/bin with 4.21,
- # symlink for backwards compatibility
- dosym ../bin/stunnel /usr/sbin/stunnel
-
- dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
- dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
- tools/importCA.html
-
- insinto /etc/stunnel
- doins "${FILESDIR}"/stunnel.conf
- doinitd "${FILESDIR}"/stunnel
-
- systemd_dounit "${S}/tools/stunnel.service"
- systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
- if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
- install_cert /etc/stunnel/stunnel
- chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
- chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
- fi
-
- einfo "If you want to run multiple instances of stunnel, create a new config"
- einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
- einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.17.ebuild b/net-misc/stunnel/stunnel-5.17.ebuild
deleted file mode 100644
index de6ba6f..0000000
--- a/net-misc/stunnel/stunnel-5.17.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit ssl-cert eutils multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
- http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
- dev-libs/openssl:="
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
- enewgroup stunnel
- enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
- # Hack away generation of certificate
- sed -i -e "s/^install-data-local:/do-not-run-this:/" \
- tools/Makefile.in || die "sed failed"
-
- echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-}
-
-src_configure() {
- econf \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- $(use_enable ipv6) \
- $(use_enable tcpd libwrap) \
- --with-ssl="${EPREFIX}"/usr \
- --disable-fips
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- rm -rf "${ED}"/usr/share/doc/${PN}
- rm -f "${ED}"/etc/stunnel/stunnel.conf-sample "${ED}"/usr/bin/stunnel3 \
- "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-
- # The binary was moved to /usr/bin with 4.21,
- # symlink for backwards compatibility
- dosym ../bin/stunnel /usr/sbin/stunnel
-
- dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
- dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
- tools/importCA.html
-
- insinto /etc/stunnel
- doins "${FILESDIR}"/stunnel.conf
- doinitd "${FILESDIR}"/stunnel
-
- doenvd "${T}"/20stunnel
-
- systemd_dounit "${S}/tools/stunnel.service"
- systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
- if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
- install_cert /etc/stunnel/stunnel
- chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
- chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
- fi
-
- einfo "If you want to run multiple instances of stunnel, create a new config"
- einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
- einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.18.ebuild b/net-misc/stunnel/stunnel-5.18.ebuild
deleted file mode 100644
index e50c72d..0000000
--- a/net-misc/stunnel/stunnel-5.18.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit ssl-cert eutils multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
- http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
- dev-libs/openssl:="
-RDEPEND="${DEPEND}
- stunnel3? ( dev-lang/perl )
- selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
- enewgroup stunnel
- enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
- # Hack away generation of certificate
- sed -i -e "s/^install-data-local:/do-not-run-this:/" \
- tools/Makefile.in || die "sed failed"
-
- echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-}
-
-src_configure() {
- econf \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- $(use_enable ipv6) \
- $(use_enable tcpd libwrap) \
- --with-ssl="${EPREFIX}"/usr \
- --disable-fips
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- rm -rf "${ED}"/usr/share/doc/${PN}
- rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
- "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
- use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
- # The binary was moved to /usr/bin with 4.21,
- # symlink for backwards compatibility
- dosym ../bin/stunnel /usr/sbin/stunnel
-
- dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
- dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
- tools/importCA.html
-
- insinto /etc/stunnel
- doins "${FILESDIR}"/stunnel.conf
- doinitd "${FILESDIR}"/stunnel
-
- doenvd "${T}"/20stunnel
-
- systemd_dounit "${S}/tools/stunnel.service"
- systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
- if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
- install_cert /etc/stunnel/stunnel
- chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
- chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
- fi
-
- einfo "If you want to run multiple instances of stunnel, create a new config"
- einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
- einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.19.ebuild b/net-misc/stunnel/stunnel-5.19.ebuild
deleted file mode 100644
index 0993abb..0000000
--- a/net-misc/stunnel/stunnel-5.19.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit ssl-cert eutils multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
- http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
- dev-libs/openssl:="
-RDEPEND="${DEPEND}
- stunnel3? ( dev-lang/perl )
- selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
- enewgroup stunnel
- enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
- # Hack away generation of certificate
- sed -i -e "s/^install-data-local:/do-not-run-this:/" \
- tools/Makefile.in || die "sed failed"
-
- echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-}
-
-src_configure() {
- econf \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- $(use_enable ipv6) \
- $(use_enable tcpd libwrap) \
- --with-ssl="${EPREFIX}"/usr \
- --disable-fips
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- rm -rf "${ED}"/usr/share/doc/${PN}
- rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
- "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
- use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
- # The binary was moved to /usr/bin with 4.21,
- # symlink for backwards compatibility
- dosym ../bin/stunnel /usr/sbin/stunnel
-
- dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
- dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
- tools/importCA.html
-
- insinto /etc/stunnel
- doins "${FILESDIR}"/stunnel.conf
- doinitd "${FILESDIR}"/stunnel
-
- doenvd "${T}"/20stunnel
-
- systemd_dounit "${S}/tools/stunnel.service"
- systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
- if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
- install_cert /etc/stunnel/stunnel
- chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
- chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
- fi
-
- einfo "If you want to run multiple instances of stunnel, create a new config"
- einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
- einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.20.ebuild b/net-misc/stunnel/stunnel-5.20.ebuild
index 0de1c8f..89f4130 100644
--- a/net-misc/stunnel/stunnel-5.20.ebuild
+++ b/net-misc/stunnel/stunnel-5.20.ebuild
@@ -18,7 +18,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="ipv6 selinux stunnel3 tcpd"
DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.22.ebuild b/net-misc/stunnel/stunnel-5.22.ebuild
deleted file mode 100644
index 29080cc..0000000
--- a/net-misc/stunnel/stunnel-5.22.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit ssl-cert eutils multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
- http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
- ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
- dev-libs/openssl:="
-RDEPEND="${DEPEND}
- stunnel3? ( dev-lang/perl )
- selinux? ( sec-policy/selinux-stunnel )"
-
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup stunnel
- enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
- # Hack away generation of certificate
- sed -i -e "s/^install-data-local:/do-not-run-this:/" \
- tools/Makefile.in || die "sed failed"
-
- echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-}
-
-src_configure() {
- econf \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- $(use_enable ipv6) \
- $(use_enable tcpd libwrap) \
- --with-ssl="${EPREFIX}"/usr \
- --disable-fips
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- rm -rf "${ED}"/usr/share/doc/${PN}
- rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
- "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
- use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
- # The binary was moved to /usr/bin with 4.21,
- # symlink for backwards compatibility
- dosym ../bin/stunnel /usr/sbin/stunnel
-
- dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
- dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
- tools/importCA.html
-
- insinto /etc/stunnel
- doins "${FILESDIR}"/stunnel.conf
- doinitd "${FILESDIR}"/stunnel
-
- doenvd "${T}"/20stunnel
-
- systemd_dounit "${S}/tools/stunnel.service"
- systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
- if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
- install_cert /etc/stunnel/stunnel
- chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
- chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
- fi
-
- einfo "If you want to run multiple instances of stunnel, create a new config"
- einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
- einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.23.ebuild b/net-misc/stunnel/stunnel-5.23.ebuild
index 29080cc..ba38b4a 100644
--- a/net-misc/stunnel/stunnel-5.23.ebuild
+++ b/net-misc/stunnel/stunnel-5.23.ebuild
@@ -22,7 +22,7 @@
IUSE="ipv6 selinux stunnel3 tcpd"
DEPEND="tcpd? ( sys-apps/tcp-wrappers )
- dev-libs/openssl:="
+ dev-libs/openssl:0"
RDEPEND="${DEPEND}
stunnel3? ( dev-lang/perl )
selinux? ( sec-policy/selinux-stunnel )"
diff --git a/net-misc/stunnel/stunnel-5.24-r1.ebuild b/net-misc/stunnel/stunnel-5.24-r1.ebuild
new file mode 100644
index 0000000..d75157c
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.24-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit ssl-cert eutils multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+ http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}
+ stunnel3? ( dev-lang/perl )
+ selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+ enewgroup stunnel
+ enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+ # Hack away generation of certificate
+ sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+ tools/Makefile.in || die "sed failed"
+
+ echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+}
+
+src_configure() {
+ econf \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ $(use_enable ipv6) \
+ $(use_enable tcpd libwrap) \
+ --with-ssl="${EPREFIX}"/usr \
+ --disable-fips
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ rm -rf "${ED}"/usr/share/doc/${PN}
+ rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+ "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+ use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+ # The binary was moved to /usr/bin with 4.21,
+ # symlink for backwards compatibility
+ dosym ../bin/stunnel /usr/sbin/stunnel
+
+ dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+ dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+ tools/importCA.html
+
+ insinto /etc/stunnel
+ doins "${FILESDIR}"/stunnel.conf
+ doinitd "${FILESDIR}"/stunnel
+
+ doenvd "${T}"/20stunnel
+
+ systemd_dounit "${S}/tools/stunnel.service"
+ systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+ if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+ install_cert /etc/stunnel/stunnel
+ chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+ chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+ fi
+
+ einfo "If you want to run multiple instances of stunnel, create a new config"
+ einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+ einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/stunnel/stunnel-5.24.ebuild b/net-misc/stunnel/stunnel-5.24.ebuild
new file mode 100644
index 0000000..ba38b4a
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.24.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit ssl-cert eutils multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+ http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+ dev-libs/openssl:0"
+RDEPEND="${DEPEND}
+ stunnel3? ( dev-lang/perl )
+ selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+ enewgroup stunnel
+ enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+ # Hack away generation of certificate
+ sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+ tools/Makefile.in || die "sed failed"
+
+ echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+}
+
+src_configure() {
+ econf \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ $(use_enable ipv6) \
+ $(use_enable tcpd libwrap) \
+ --with-ssl="${EPREFIX}"/usr \
+ --disable-fips
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ rm -rf "${ED}"/usr/share/doc/${PN}
+ rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+ "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+ use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+ # The binary was moved to /usr/bin with 4.21,
+ # symlink for backwards compatibility
+ dosym ../bin/stunnel /usr/sbin/stunnel
+
+ dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+ dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+ tools/importCA.html
+
+ insinto /etc/stunnel
+ doins "${FILESDIR}"/stunnel.conf
+ doinitd "${FILESDIR}"/stunnel
+
+ doenvd "${T}"/20stunnel
+
+ systemd_dounit "${S}/tools/stunnel.service"
+ systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+ if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+ install_cert /etc/stunnel/stunnel
+ chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+ chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+ fi
+
+ einfo "If you want to run multiple instances of stunnel, create a new config"
+ einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+ einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/tor/tor-0.2.7.3_rc-r1.ebuild b/net-misc/tor/tor-0.2.7.3_rc-r1.ebuild
new file mode 100644
index 0000000..940f951
--- /dev/null
+++ b/net-misc/tor/tor-0.2.7.3_rc-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+ https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="-bufferevents libressl scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web"
+
+DEPEND="
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ sys-libs/zlib
+ dev-libs/libevent
+ bufferevents? ( dev-libs/libevent[ssl] )
+ scrypt? ( app-crypt/libscrypt )
+ seccomp? ( sys-libs/libseccomp )
+ systemd? ( sys-apps/systemd )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-tor )"
+
+pkg_setup() {
+ enewgroup tor
+ enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.patch
+ epatch_user
+}
+
+src_configure() {
+ # Upstream isn't sure of all the user provided CFLAGS that
+ # will break tor, but does recommend against -fstrict-aliasing.
+ # We'll filter-flags them here as we encounter them.
+ filter-flags -fstrict-aliasing
+
+ econf \
+ --enable-system-torrc \
+ --enable-asciidoc \
+ --docdir=/usr/share/doc/${PF} \
+ $(use_enable stats instrument-downloads) \
+ $(use_enable bufferevents) \
+ $(use_enable scrypt libscrypt) \
+ $(use_enable seccomp) \
+ $(use_enable systemd) \
+ $(use_enable tor-hardening gcc-hardening) \
+ $(use_enable tor-hardening linker-hardening) \
+ $(use_enable transparent-proxy transparent) \
+ $(use_enable web tor2web-mode) \
+ $(use_enable test unittests) \
+ $(use_enable test coverage)
+}
+
+src_install() {
+ readme.gentoo_create_doc
+
+ newconfd "${FILESDIR}"/tor.confd tor
+ newinitd "${FILESDIR}"/tor.initd-r7 tor
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+ emake DESTDIR="${D}" install
+
+ keepdir /var/lib/tor
+
+ dodoc README ChangeLog ReleaseNotes doc/HACKING
+
+ fperms 750 /var/lib/tor
+ fowners tor:tor /var/lib/tor
+
+ insinto /etc/tor/
+ newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+pkg_postinst() {
+ readme.gentoo_pkg_postinst
+
+ if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
+ ewarn "Due to a bug in >=gcc-4.8.1, compiling ${P} with -Os leads to an infinite"
+ ewarn "loop. See:"
+ ewarn
+ ewarn " https://trac.torproject.org/projects/tor/ticket/10259"
+ ewarn " https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59358"
+ ewarn
+ fi
+}
diff --git a/net-misc/wget/wget-1.16.3-r1.ebuild b/net-misc/wget/wget-1.16.3-r1.ebuild
index 2303854..99874fd 100644
--- a/net-misc/wget/wget-1.16.3-r1.ebuild
+++ b/net-misc/wget/wget-1.16.3-r1.ebuild
@@ -13,7 +13,7 @@
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib"
LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index ca600bc..2368616 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
DIST youtube-dl-2015.04.03.tar.gz 1472296 SHA256 0521a15a24a9b620728a2f45ea9163ca74660ed443781b6e69b4e06d36d7bf59 SHA512 6b2c85cfa222a31f3462aab583fa98bb92544cd5fb0d395ca0b69a26c24ab174870d02264e058281f09305752d50aa5a06d0d747205499a530b275e3194fc6f9 WHIRLPOOL 391e06ea261f92e03a0b38618307f1c9d53a2dfb9f2062fe0cd3ded1ea0c411033a17ded581616032c74a9e4fb398a57e565bf847196a23a9f89433f861362ae
-DIST youtube-dl-2015.09.22.tar.gz 1740309 SHA256 447cb37694a5dc3b4897ac382642305526a60b6da196c2bcfcabc0ccc83764b2 SHA512 92f679cbcd5edda96edb3a6108f58a537e3debd0dc205526cc59d60942c5b0fb77fa6fb49e71d291451c8c9c679e7971ed842c836d9a8fd6b47ce4e7bd8ec478 WHIRLPOOL 97191ba8daecca6aa2d6f789de091a6cd528781596e20b0b19d276a1c549a033a09f2b82c82293761aa1dd15db4ebea2458090551eb07c02f1f35f5e7d45772a
-DIST youtube-dl-2015.09.28.tar.gz 1742315 SHA256 6396ee3150f51bd6ca2717b7d09f9524fbab22c04c3d2b560b99061d92127a60 SHA512 bbbaa0d27702fb0fddc17ca65dea80cd7df5bd795f8e35d4094e4f05ad1792ac26937a3e26c311a04caf49c60f67fbd0044d2969d2c330a479eb75f79e2babbb WHIRLPOOL 0b8d6b5776a7f21c5e9986fb79be43102544894451da10b648da978363d1740d2accb62c0b496ed0be376496adebc528f4b870249b053f0523405b22d03009f4
+DIST youtube-dl-2015.10.09.tar.gz 1754748 SHA256 33103a3197ee1bfa5e9fa78449ed19de888d6b36cc27f46f5c2e76ea11aee0ab SHA512 5e1c9e2344bd4b02834310be8cfae27f734a846d995a5890522ad9d2908832127ab20b76557a7986b146bb2ad7c278815c50523a946ee8a3eb2b5cd76db31290 WHIRLPOOL bd6f1b1525b5b2fae35490ba7823dde878d88f20f13d3f6de4a95a677ec03ed1b527ff8845406cdee658f6d6c668bd528f20863fb753616caab3fa3dfd8b0e44
+DIST youtube-dl-2015.10.12.tar.gz 1758938 SHA256 3e620a6d7edb656b48eef913d3350e925679ccdb959184c5fa88f4e55604289f SHA512 810ac5ad45c1fb7f01b09636f9fc1bfef1dc4bd4d00f8b6c50393e380e291a18b2410050c111f9f08f8a467df111afc7714043c5f766301aa2955e7d9a9e2168 WHIRLPOOL 6957b6a2bf883632087b4bd3830e1cf9ea12e91f90a08d334b0eda93a72b2c6f8a89a22f8df3fbdf90d1208af425b663bb258f5ddc7d3308d12ad3040ed3e8cf
diff --git a/net-misc/youtube-dl/youtube-dl-2015.09.28.ebuild b/net-misc/youtube-dl/youtube-dl-2015.09.28.ebuild
deleted file mode 100644
index db29af2..0000000
--- a/net-misc/youtube-dl/youtube-dl-2015.09.28.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="offensive test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- if ! use offensive; then
- sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
- youtube_dl/version.py || die
- # these have single line import statements
- local xxx=(
- alphaporno anysex behindkink drtuber eporner eroprofile extremetube
- fourtube foxgay goshgay hellporno hentaistigma hornbunny keezmovies
- mofosex motherless porn91 pornhd pornotube pornovoisines pornoxo
- redtube sexykarma sexu sunporno slutload spankbang spankwire thisav
- trutube tube8 vporn xbef xnxx xtube xvideos xxxymovies youjizz
- youporn
- )
- # these have multi-line import statements
- local mxxx=(
- pornhub xhamster tnaflix
- )
- # do single line imports
- sed -i \
- -e $( printf '/%s/d;' ${xxx[@]} ) \
- youtube_dl/extractor/__init__.py \
- || die
-
- # do multiple line imports
- sed -i \
- -e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
- youtube_dl/extractor/__init__.py \
- || die
-
- sed -i \
- -e $( printf '/%s/d;' ${mxxx[@]} ) \
- youtube_dl/extractor/generic.py \
- youtube_dl/extractor/tumblr.py \
- || die
-
- rm \
- $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
- $( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
- test/test_age_restriction.py \
- || die
- fi
-
- epatch_user
-}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- python_domodule youtube_dl
- dobin bin/${PN}
- dodoc README.txt
- doman ${PN}.1
- newbashcomp ${PN}.bash-completion ${PN}
- python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2015.09.22.ebuild b/net-misc/youtube-dl/youtube-dl-2015.10.09.ebuild
similarity index 100%
copy from net-misc/youtube-dl/youtube-dl-2015.09.22.ebuild
copy to net-misc/youtube-dl/youtube-dl-2015.10.09.ebuild
diff --git a/net-misc/youtube-dl/youtube-dl-2015.09.22.ebuild b/net-misc/youtube-dl/youtube-dl-2015.10.12.ebuild
similarity index 100%
rename from net-misc/youtube-dl/youtube-dl-2015.09.22.ebuild
rename to net-misc/youtube-dl/youtube-dl-2015.10.12.ebuild
diff --git a/net-nds/shelldap/Manifest b/net-nds/shelldap/Manifest
index b114ae1..dc9ac80 100644
--- a/net-nds/shelldap/Manifest
+++ b/net-nds/shelldap/Manifest
@@ -1,2 +1 @@
-DIST shelldap-1.0.2.tar.bz2 16205 SHA256 c02a22ba980a2f87a2f65caa6bbcb228cb38bf08e9e0d5d309a6b8118ad3cbe0 SHA512 aa199de5251eeeec1b20f77cbda1bc76b3c8203dcb5021250ebccb8d1c8fa9134b076eb38574636789e2828fb582b588f63fe819c05d6e051ae079e9a0a99acd WHIRLPOOL c0b615d06b84eeaa7b08242efe332afddbb174cfa8fa6cbd357ee0285c998a8960c1721aeb03098dcb5ae146ea814888aa16157097f639a96cfa34a37dbb8003
-DIST shelldap-1.3.0.tar.bz2 17624 SHA256 168d5902e5d3a4e843242c2de98c98edaa8755941a70a55410f416e0f6a1da46 SHA512 d20714d2c41206a8921eea5937e03432b1cc9cf5224f9cfd62dfc048ab987c6753e92d828f25687ee0d69737729e4df9d77580fd832edd93191753dff6c12ead WHIRLPOOL 7b2f592f1a1b222463a7acd9e2d8ef447f3c937d0b7fce97f5ce7a786bbf2d166dbdeb10b86a74504c320e00fda9eb3a8e09b8d789d2f80ad91cc5e27a9513de
+DIST shelldap-1.3.1.tar.bz2 17794 SHA256 a637a3a941338b5dd6cf184e5a3d640b880ebbea7a9c90edb252f893601aea0d SHA512 be512aebba883e507506901474403e07ab0e4f78075e26c566b6eded6c24b4231d491c5f6e84af57b38408040f6e802d2c6f59c309a2e21e0ab02a0fe08af001 WHIRLPOOL be72dc3db8de5968b3d4f9fa33d037661ae7ce9d628d01f5ea4aaab535657162e79ed8bb481d0d82deb32407910bbe980034a7e9b7de0b01b2d5ca8afebe72a8
diff --git a/net-nds/shelldap/shelldap-1.0.2.ebuild b/net-nds/shelldap/shelldap-1.0.2.ebuild
deleted file mode 100644
index ab8b1b0..0000000
--- a/net-nds/shelldap/shelldap-1.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="A handy shell-like interface for browsing LDAP servers and editing their content"
-HOMEPAGE="http://projects.martini.nu/shelldap/"
-SRC_URI="http://code.martini.nu/shelldap/archive/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="dev-perl/Algorithm-Diff
- dev-perl/perl-ldap
- dev-perl/TermReadKey
- dev-perl/Term-ReadLine-Gnu
- dev-perl/Term-Shell
- dev-perl/YAML-Syck
- virtual/perl-Digest-MD5"
-
-src_compile() {
- pod2man --name "${PN}" < "${PN}" > "${PN}.1" || die 'creating manpage failed'
-}
-
-src_install() {
- doman "${PN}.1"
- dobin "${PN}"
-}
diff --git a/net-nds/shelldap/shelldap-1.3.0.ebuild b/net-nds/shelldap/shelldap-1.3.1.ebuild
similarity index 100%
rename from net-nds/shelldap/shelldap-1.3.0.ebuild
rename to net-nds/shelldap/shelldap-1.3.1.ebuild
diff --git a/net-p2p/bitcoinxtd/Manifest b/net-p2p/bitcoinxtd/Manifest
new file mode 100644
index 0000000..0b2beb9
--- /dev/null
+++ b/net-p2p/bitcoinxtd/Manifest
@@ -0,0 +1 @@
+DIST bitcoinxtd-0.11.0.tar.gz 5226736 SHA256 f6fc1651b3cad90bae6f9d70a5f476ca4cd9b8b38681331bccc6d2651c5e2c89 SHA512 044f2b95644b831641fc48fe65e980438e58e784635b32f393e9aeb6473124708df3870aa3bd3848acd90b4b9785fba9163ad07e5ea7d243c175741429bc2b6b WHIRLPOOL 5b2e692e0ccafff454260bb1f8871bec2775c21124e22cf11fd3d175b2d25634fc514e0cfe6b6334e20692846319e9f5fd1a580d8ef31389d6e84025bc600eaa
diff --git a/net-p2p/bitcoinxtd/bitcoinxtd-0.11.0.ebuild b/net-p2p/bitcoinxtd/bitcoinxtd-0.11.0.ebuild
new file mode 100644
index 0000000..78c2366
--- /dev/null
+++ b/net-p2p/bitcoinxtd/bitcoinxtd-0.11.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DB_VER="4.8"
+
+inherit db-use autotools eutils toolchain-funcs user systemd
+
+DESCRIPTION="BitcoinXT crypto-currency wallet for automated services"
+HOMEPAGE="https://github.com/bitcoinxt/bitcoinxt"
+My_PV="${PV/\.0/}A"
+SRC_URI="https://github.com/bitcoinxt/bitcoinxt/archive/v${My_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+doc +ssl +logrotate +upnp +wallet"
+
+OPENSSL_DEPEND="dev-libs/openssl:0[-bindist]"
+WALLET_DEPEND="media-gfx/qrencode sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]"
+
+RDEPEND="
+ app-shells/bash:0
+ sys-apps/sed
+ dev-libs/boost[threads(+)]
+ dev-libs/glib:2
+ dev-libs/crypto++
+ ssl? ( ${OPENSSL_DEPEND} )
+ logrotate? ( app-admin/logrotate )
+ wallet? ( ${WALLET_DEPEND} )
+ upnp? ( net-libs/miniupnpc )
+ virtual/bitcoin-leveldb
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/bitcoinxt-${My_PV}"
+
+pkg_setup() {
+ local UG='bitcoinxt'
+ enewgroup "${UG}"
+ enewuser "${UG}" -1 -1 /var/lib/bitcoinxt "${UG}"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/9999-syslibs.patch"
+ eautoreconf
+}
+
+src_configure() {
+ local my_econf=
+
+ if use upnp; then
+ my_econf="${my_econf} --with-miniupnpc --enable-upnp-default"
+ else
+ my_econf="${my_econf} --without-miniupnpc --disable-upnp-default"
+ fi
+ if use wallet; then
+ my_econf="${my_econf} --enable-wallet"
+ else
+ my_econf="${my_econf} --disable-wallet"
+ fi
+ my_econf="${my_econf} --with-system-leveldb"
+ econf \
+ --disable-ccache \
+ --disable-static \
+ --without-libs \
+ --without-utils \
+ --with-daemon \
+ --without-gui \
+ ${my_econf} \
+ "$@"
+}
+
+src_compile() {
+ local OPTS=()
+
+ OPTS+=("CXXFLAGS=${CXXFLAGS} -I$(db_includedir "${DB_VER}")")
+ OPTS+=("LDFLAGS=${LDFLAGS} -ldb_cxx-${DB_VER}")
+
+ use ssl && OPTS+=(USE_SSL=1)
+ use upnp && OPTS+=(USE_UPNP=1)
+
+ cd src || die
+ emake CXX="$(tc-getCXX)" "${OPTS[@]}" bitcoind
+ mv bitcoind ${PN}
+}
+
+src_install() {
+ local my_topdir="/var/lib/bitcoinxt"
+ local my_data="${my_topdir}/.bitcoinxt"
+
+ dobin src/${PN}
+
+ insinto "${my_data}"
+ doins "${FILESDIR}/bitcoinxt.conf"
+ fowners bitcoinxt:bitcoinxt "${my_data}/bitcoinxt.conf"
+ fperms 600 "${my_data}/bitcoinxt.conf"
+
+ newconfd "${FILESDIR}/bitcoinxt.confd" ${PN}
+ newinitd "${FILESDIR}/bitcoinxt.initd" ${PN}
+ systemd_dounit "${FILESDIR}/bitcoinxtd.service"
+
+ keepdir "${my_data}"
+ fperms 700 "${my_topdir}"
+ fowners bitcoinxt:bitcoinxt "${my_topdir}"
+ fowners bitcoinxt:bitcoinxt "${my_data}"
+
+ if use doc; then
+ dodoc README.md
+ dodoc doc/release-notes.md
+ fi
+
+ if use logrotate; then
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/bitcoinxtd.logrotate" bitcoinxtd
+ fi
+}
diff --git a/net-p2p/bitcoinxtd/files/9999-syslibs.patch b/net-p2p/bitcoinxtd/files/9999-syslibs.patch
new file mode 100644
index 0000000..2cdf2ab
--- /dev/null
+++ b/net-p2p/bitcoinxtd/files/9999-syslibs.patch
@@ -0,0 +1,243 @@
+diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4
+index 66f106c..5f0a3b1 100644
+--- a/build-aux/m4/bitcoin_subdir_to_include.m4
++++ b/build-aux/m4/bitcoin_subdir_to_include.m4
+@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[
+ AC_MSG_RESULT([default])
+ else
+ echo "#include <$2$3.h>" >conftest.cpp
+- newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`]
++ newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d])
+ AC_MSG_RESULT([${newinclpath}])
+ if test "x${newinclpath}" != "x"; then
+ eval "$1=\"\$$1\"' -I${newinclpath}'"
+diff --git a/configure.ac b/configure.ac
+index 37fe47e..14e5c34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -170,6 +170,18 @@ AC_ARG_WITH([utils],
+ [build_bitcoin_utils=$withval],
+ [build_bitcoin_utils=yes])
+
++AC_ARG_ENABLE([util-cli],
++ [AS_HELP_STRING([--enable-util-cli],
++ [build bitcoin-cli])],
++ [build_bitcoin_cli=$enableval],
++ [build_bitcoin_cli=$build_bitcoin_utils])
++
++AC_ARG_ENABLE([util-tx],
++ [AS_HELP_STRING([--enable-util-tx],
++ [build bitcoin-tx])],
++ [build_bitcoin_tx=$enableval],
++ [build_bitcoin_tx=$build_bitcoin_utils])
++
+ AC_ARG_WITH([libs],
+ [AS_HELP_STRING([--with-libs],
+ [build libraries (default=yes)])],
+@@ -488,14 +500,65 @@ if test x$use_reduce_exports = xyes; then
+ [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])])
+ fi
+
++dnl Check for leveldb, only if explicitly requested
+ LEVELDB_CPPFLAGS=
+ LIBLEVELDB=
+ LIBMEMENV=
+-AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
++AC_ARG_WITH([system-leveldb],
++ [AS_HELP_STRING([--with-system-leveldb],
++ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
++ [system_leveldb=$withval],
++ [system_leveldb=no]
++)
++if test x$system_leveldb != xno; then
++ LEVELDB_CPPFLAGS=
++ AC_CHECK_LIB([leveldb],[main],[
++ LIBLEVELDB=-lleveldb
++ ],[
++ AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway])
++ ])
++ TEMP_LIBS="$LIBS"
++ LIBS="$LIBS $LIBLEVELDB"
++ AC_CHECK_LIB([memenv],[main],[
++ LIBMEMENV=-lmemenv
++ ],[
++ AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway])
++ ])
++ LIBS="$TEMP_LIBS"
++ AC_CHECK_HEADER([leveldb/filter_policy.h],[],[
++ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++ ])
++ AC_CHECK_HEADER([leveldb/helpers/memenv.h],[
++ AC_MSG_CHECKING([for memenv.h path])
++ BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv])
++ ],[
++ AC_CHECK_HEADER([memenv.h],[],[
++ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++ ])
++ ])
++fi
++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno])
+ AC_SUBST(LEVELDB_CPPFLAGS)
+ AC_SUBST(LIBLEVELDB)
+ AC_SUBST(LIBMEMENV)
+
++dnl Check for libsecp256k1, only if explicitly requested
++AC_ARG_WITH([system-libsecp256k1],
++ [AS_HELP_STRING([--with-system-libsecp256k1],
++ [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])],
++ [system_libsecp256k1=$withval],
++ [system_libsecp256k1=no]
++)
++if test x$system_libsecp256k1 != xno; then
++ PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true])
++else
++ libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include'
++ libsecp256k1_LIBS='secp256k1/libsecp256k1.la'
++fi
++AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno])
++AC_SUBST(libsecp256k1_CFLAGS)
++AC_SUBST(libsecp256k1_LIBS)
++
+ if test x$enable_wallet != xno; then
+ dnl Check for libdb_cxx only if wallet enabled
+ BITCOIN_FIND_BDB48
+@@ -515,7 +578,7 @@ BITCOIN_QT_INIT
+ dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
+ BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])
+
+-if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
+ use_boost=no
+ else
+ use_boost=yes
+@@ -701,9 +764,13 @@ AC_MSG_CHECKING([whether to build bitcoind])
+ AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
+ AC_MSG_RESULT($build_bitcoind)
+
+-AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)])
+-AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
+-AC_MSG_RESULT($build_bitcoin_utils)
++AC_MSG_CHECKING([whether to build bitcoin-cli])
++AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
++AC_MSG_RESULT($build_bitcoin_cli)
++
++AC_MSG_CHECKING([whether to build bitcoin-tx])
++AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes])
++AC_MSG_RESULT($build_bitcoin_tx)
+
+ AC_MSG_CHECKING([whether to build libraries])
+ AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
+@@ -826,7 +893,7 @@ else
+ AC_MSG_RESULT([no])
+ fi
+
+-if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then
+ AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests])
+ fi
+
+@@ -895,8 +962,10 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
+ unset PKG_CONFIG_LIBDIR
+ PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
+
++if test x$system_libsecp256k1 = xno; then
+ ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no"
+ AC_CONFIG_SUBDIRS([src/secp256k1])
++fi
+
+ AC_OUTPUT
+
+diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh
+index 9b31865..5bb187c 100755
+--- a/qa/pull-tester/rpc-tests.sh
++++ b/qa/pull-tester/rpc-tests.sh
+@@ -57,7 +57,7 @@ testScriptsExt=(
+ extArg="-extended"
+ passOn=${@#$extArg}
+
+-if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then
++if [ "x${ENABLE_BITCOIND}${ENABLE_CLI}${ENABLE_WALLET}" = "x111" ]; then
+ for (( i = 0; i < ${#testScripts[@]}; i++ ))
+ do
+ if [ -z "$1" ] || [ "${1:0:1}" == "-" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ]
+diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in
+index 10f4d33..e0e407d 100755
+--- a/qa/pull-tester/tests-config.sh.in
++++ b/qa/pull-tester/tests-config.sh.in
+@@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@"
+
+ # These will turn into comments if they were disabled when configuring.
+ @ENABLE_WALLET_TRUE@ENABLE_WALLET=1
+-@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1
++@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1
+ @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1
+
+ REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}"
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1c2f770..4d60ddf 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,6 @@
++if EMBEDDED_LIBSECP256K1
+ DIST_SUBDIRS = secp256k1
++endif
+ AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
+
+
+@@ -20,7 +22,7 @@ endif
+ BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
+ BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
+
+-BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
++BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS)
+
+ LIBBITCOIN_SERVER=libbitcoin_server.a
+ LIBBITCOIN_WALLET=libbitcoin_wallet.a
+@@ -30,10 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a
+ LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
+ LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a
+ LIBBITCOINQT=qt/libbitcoinqt.a
++if EMBEDDED_LIBSECP256K1
+ LIBSECP256K1=secp256k1/libsecp256k1.la
++else
++LIBSECP256K1=$(libsecp256k1_LIBS)
++endif
+
++if EMBEDDED_LIBSECP256K1
+ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
+ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
++endif
+
+ # Make is not made aware of per-object dependencies to avoid limiting building parallelization
+ # But to build the less dependent modules first, we manually select their order here:
+@@ -63,8 +71,11 @@ if BUILD_BITCOIND
+ bin_PROGRAMS += bitcoind
+ endif
+
+-if BUILD_BITCOIN_UTILS
+- bin_PROGRAMS += bitcoin-cli bitcoin-tx
++if BUILD_BITCOIN_CLI
++ bin_PROGRAMS += bitcoin-cli
++endif
++if BUILD_BITCOIN_TX
++ bin_PROGRAMS += bitcoin-tx
+ endif
+
+ .PHONY: FORCE
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 0997148..14b4deb 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -111,10 +111,12 @@ bitcoin_test_check: $(TEST_BINARY) FORCE
+ bitcoin_test_clean : FORCE
+ rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+
++if EMBEDDED_LIBSECP256K1
+ check-local:
+ @echo "Running test/bitcoin-util-test.py..."
+ $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py
+ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
++endif
+
+ %.json.h: %.json
+ @$(MKDIR_P) $(@D)
diff --git a/net-p2p/bitcoinxtd/files/bitcoinxt.conf b/net-p2p/bitcoinxtd/files/bitcoinxt.conf
new file mode 100644
index 0000000..c6a55f3
--- /dev/null
+++ b/net-p2p/bitcoinxtd/files/bitcoinxt.conf
@@ -0,0 +1,8 @@
+# http://www.bitcoin.org/smf/index.php?topic=644.0
+#rpcuser=
+#rpcpassword=
+
+
+
+
+
diff --git a/net-p2p/bitcoinxtd/files/bitcoinxt.confd b/net-p2p/bitcoinxtd/files/bitcoinxt.confd
new file mode 100644
index 0000000..134b934
--- /dev/null
+++ b/net-p2p/bitcoinxtd/files/bitcoinxt.confd
@@ -0,0 +1,12 @@
+# Config file for /etc/init.d/bitcoinxt
+
+# owner of bitcoinxtd process (don't change, must be existing)
+BITCOINXT_USER="bitcoinxt"
+BITCOINXT_CONF="/var/lib/bitcoinxt/.bitcoinxt/bitcoinxt.conf"
+BITCOINXT_DATA="/var/lib/bitcoinxt/.bitcoinxt"
+
+# See http://www.bitcoin.org/smf/index.php?topic=1063
+BITCOINXT_OPTS="-conf=${BITCOINXT_CONF} -datadir=${BITCOINXT_DATA} ${BITCOINXT_OPTS}"
+
+# nice level
+NICELEVEL="19"
diff --git a/net-p2p/bitcoinxtd/files/bitcoinxt.initd b/net-p2p/bitcoinxtd/files/bitcoinxt.initd
new file mode 100644
index 0000000..bb2cc87
--- /dev/null
+++ b/net-p2p/bitcoinxtd/files/bitcoinxt.initd
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+vardir="/var/lib/bitcoinxt"
+conffile="${vardir}/.bitcoinxt/bitcoinxt.conf"
+bitcoinxtd_user="${BITCOINXT_USER:-nobody:nobody}"
+
+description="BitcoinXT crypto-currency wallet for automated services"
+pidfile="/run/${SVCNAME}.pid"
+command="/usr/bin/bitcoinxtd"
+command_args="${BITCOINXT_OPTS}"
+command_background="true"
+start_stop_daemon_args="-u ${bitcoinxtd_user} -e HOME=${vardir} -N ${NICELEVEL:-0} -w 2000"
+
+depend() {
+ need net
+}
+
+start_pre() {
+ checkpath -f -o ${bitcoinxtd_user} -m 0400 ${conffile} || return 1
+
+ if ! grep -q '^rpcpassword=' "${conffile}"; then
+ eerror "Please edit `readlink -f ${conffile}`"
+ eerror "There must be at least a line assigning rpcpassword=something-secure"
+ return 1
+ fi
+}
diff --git a/net-p2p/bitcoinxtd/files/bitcoinxtd.logrotate b/net-p2p/bitcoinxtd/files/bitcoinxtd.logrotate
new file mode 100644
index 0000000..d23bac7
--- /dev/null
+++ b/net-p2p/bitcoinxtd/files/bitcoinxtd.logrotate
@@ -0,0 +1,8 @@
+/var/lib/bitcoinxt/.bitcoinxt/debug.log {
+ missingok
+ weekly
+ sharedscripts
+ postrotate
+ killall -HUP bitcoinxtd
+ endscript
+}
diff --git a/net-p2p/bitcoinxtd/files/bitcoinxtd.service b/net-p2p/bitcoinxtd/files/bitcoinxtd.service
new file mode 100644
index 0000000..c3469ff
--- /dev/null
+++ b/net-p2p/bitcoinxtd/files/bitcoinxtd.service
@@ -0,0 +1,30 @@
+# It's not recommended to modify this file in-place, because it will be
+# overwritten during package upgrades. If you want to customize, the
+# best way is to create file
+# "/etc/systemd/system/bitcoinxtd.service.d/*.conf"
+# containing your changes
+
+# For example, if you want to change some daemon and/or unit options,
+# create a file named
+# "/etc/systemd/system/bitcoinxtd.service.d/myopts.conf"
+# containing:
+# [Service]
+# Environment="BITCOINXT_OPTS=-debug -logtimestamps"
+# Nice=10
+# This will override the setting appearing below.
+
+# Note that almost all daemon options could be specified in
+# /etc/bitcoinxt/bitcoinxt.conf
+
+[Unit]
+Description=BitcoinXT Daemon
+After=network.target
+
+[Service]
+User=bitcoinxt
+Environment=BITCOINXT_OPTS=
+ExecStart=/usr/bin/bitcoinxtd -daemon=0 $BITCOINXT_OPTS
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/bitcoinxtd/metadata.xml b/net-p2p/bitcoinxtd/metadata.xml
new file mode 100644
index 0000000..a4c7c61
--- /dev/null
+++ b/net-p2p/bitcoinxtd/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+ <maintainer>
+ <email>rono@sentuny.com</email>
+ <name>Ron OHara</name>
+ </maintainer>
+ <use>
+ <flag name='doc'> Include documentatio</flag>
+ <flag name='logrotate'>Use app-admin/logrotate for rotating logs</flag>
+ <flag name='upnp'>Enable Universal Plug and Play</flag>
+ <flag name='wallet'>Enable wallet support</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 610d26d..85b9e2b 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,2 +1,3 @@
DIST gtk-gnutella-1.1.3.tar.bz2 19504243 SHA256 2659ddb846f60d13789674e926a71bbb4a8b9d3ca98c6b034a95eaa073531405 SHA512 df143b6e89b0a4c6e8ddbba24ddcab3603f04e7df1fab7d389241a112c6cd3297e4837dfc0d225289997b99867a5466a5b8697c68ef2bdc5817261fbc103d505 WHIRLPOOL fe1a1375e75204bdf92c9690f1885211dc456c2cc466f4d7e47c865fc0e1c77ce07d27b58ff2e53c4c28214d055878c7d805f0b79043748e1448c6b8ac398c82
DIST gtk-gnutella-1.1.4.tar.bz2 19546318 SHA256 6ae259ff9d5f20a2d10dba66ed6cbe5b56552307a6e8bc36df053b70aff4c956 SHA512 e09fde0e1f8a701e099f91768e032d022f6e9d41cdb4cc7833f1e7ba0e2795bc102c6b835960eb69e577ffc1426c42f6e1682ebadb8c5a643a796f88ff204ac6 WHIRLPOOL a9e63865896444c2ba22e9cf4302f5da5f6bdcec257cc87c618c3c3514cbf924e0eb6df7909b21ad5798650a577adf38cb37806810fd3f6a7f67be5f7a7cc8f1
+DIST gtk-gnutella-1.1.5.tar.bz2 19552392 SHA256 c332043a885ba302841a261c118264d903627fd21b062c99538db7dc7dada8a5 SHA512 eb94ef5cbc447ebf75d16eb24f0a4d88197a9b79f842fe73f963af3ba5985cc4ce99605d29e33123754d9a509218b71acc684df27a075c3947278211c1b204e5 WHIRLPOOL c5bc302dd7bd92eac2298c52b557723b473a930a7e1b40cddc74424bef7acf0a9b90f27ba503dc40038c925047dfcf6f80ca8de2f0e20a6429d70267de3ada49
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.5.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.5.ebuild
new file mode 100644
index 0000000..154b509
--- /dev/null
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+IUSE="nls dbus ssl +gtk"
+
+DESCRIPTION="A GTK+ Gnutella client"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+ dev-libs/glib:2
+ sys-libs/zlib
+ gtk? ( >=x11-libs/gtk+-2.2.1:2 )
+ dbus? ( >=sys-apps/dbus-0.35.2 )
+ ssl? ( >=net-libs/gnutls-2.2.5 )
+ nls? ( >=sys-devel/gettext-0.11.5 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ strip-linguas -i po
+
+ echo "# Gentoo-selected LINGUAS" > po/LINGUAS
+ for ling in ${LINGUAS}; do
+ echo $ling >> po/LINGUAS
+ done
+}
+
+src_configure() {
+ # There is no option to turn off optimization through the build.sh
+ # script.
+ sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
+
+ # The build script does not support the equivalent --enable
+ # options so we must construct the configuration by hand.
+
+ local myconf
+
+ if ! use nls; then
+ myconf="${myconf} --disable-nls"
+ fi
+
+ if ! use dbus; then
+ myconf="${myconf} --disable-dbus"
+ fi
+
+ if ! use ssl; then
+ myconf="${myconf} --disable-gnutls"
+ fi
+
+ if use gtk; then
+ myconf="${myconf} --gtk2"
+ else
+ myconf="${myconf} --topless"
+ fi
+
+ ./build.sh \
+ --configure-only \
+ --prefix="/usr" \
+ --cc=$(tc-getCC) \
+ ${myconf}
+}
+
+src_compile() {
+ # Build system is not parallel-safe, bug 500760
+ emake -j1
+}
+
+src_install() {
+ dodir /usr/bin
+ emake INSTALL_PREFIX="${D}" install || die "Install failed"
+ dodoc AUTHORS ChangeLog README TODO
+
+ # Touch the symbols file into the future to avoid warnings from
+ # gtk-gnutella later on, since we will most likely strip the binary.
+ touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
+}
diff --git a/net-p2p/transmission/files/2.84-libevent-2.1.5.patch b/net-p2p/transmission/files/2.84-libevent-2.1.5.patch
new file mode 100644
index 0000000..48101eb
--- /dev/null
+++ b/net-p2p/transmission/files/2.84-libevent-2.1.5.patch
@@ -0,0 +1,112 @@
+Fix runtime issues with libevent-2.1.5
+
+Bug: https://bugs.gentoo.org/536922
+Index: libtransmission/peer-io.c
+===================================================================
+--- libtransmission/peer-io.c (revision 14541)
++++ libtransmission/peer-io.c (revision 14545)
+@@ -1041,6 +1041,33 @@
+ ***
+ **/
+
++static inline void
++processBuffer (tr_crypto * crypto,
++ struct evbuffer * buffer,
++ size_t offset,
++ size_t size,
++ void (* callback) (tr_crypto *, size_t, const void *, void *))
++{
++ struct evbuffer_ptr pos;
++ struct evbuffer_iovec iovec;
++
++ evbuffer_ptr_set (buffer, &pos, offset, EVBUFFER_PTR_SET);
++
++ do
++ {
++ if (evbuffer_peek (buffer, size, &pos, &iovec, 1) <= 0)
++ break;
++
++ callback (crypto, iovec.iov_len, iovec.iov_base, iovec.iov_base);
++
++ assert (size >= iovec.iov_len);
++ size -= iovec.iov_len;
++ }
++ while (!evbuffer_ptr_set (buffer, &pos, iovec.iov_len, EVBUFFER_PTR_ADD));
++
++ assert (size == 0);
++}
++
+ static void
+ addDatatype (tr_peerIo * io, size_t byteCount, bool isPieceData)
+ {
+@@ -1051,19 +1078,14 @@
+ peer_io_push_datatype (io, d);
+ }
+
+-static void
+-maybeEncryptBuffer (tr_peerIo * io, struct evbuffer * buf)
++static inline void
++maybeEncryptBuffer (tr_peerIo * io,
++ struct evbuffer * buf,
++ size_t offset,
++ size_t size)
+ {
+ if (io->encryption_type == PEER_ENCRYPTION_RC4)
+- {
+- struct evbuffer_ptr pos;
+- struct evbuffer_iovec iovec;
+- evbuffer_ptr_set (buf, &pos, 0, EVBUFFER_PTR_SET);
+- do {
+- evbuffer_peek (buf, -1, &pos, &iovec, 1);
+- tr_cryptoEncrypt (&io->crypto, iovec.iov_len, iovec.iov_base, iovec.iov_base);
+- } while (!evbuffer_ptr_set (buf, &pos, iovec.iov_len, EVBUFFER_PTR_ADD));
+- }
++ processBuffer (&io->crypto, buf, offset, size, &tr_cryptoEncrypt);
+ }
+
+ void
+@@ -1070,7 +1092,7 @@
+ tr_peerIoWriteBuf (tr_peerIo * io, struct evbuffer * buf, bool isPieceData)
+ {
+ const size_t byteCount = evbuffer_get_length (buf);
+- maybeEncryptBuffer (io, buf);
++ maybeEncryptBuffer (io, buf, 0, byteCount);
+ evbuffer_add_buffer (io->outbuf, buf);
+ addDatatype (io, byteCount, isPieceData);
+ }
+@@ -1126,6 +1148,16 @@
+ ****
+ ***/
+
++static inline void
++maybeDecryptBuffer (tr_peerIo * io,
++ struct evbuffer * buf,
++ size_t offset,
++ size_t size)
++{
++ if (io->encryption_type == PEER_ENCRYPTION_RC4)
++ processBuffer (&io->crypto, buf, offset, size, &tr_cryptoDecrypt);
++}
++
+ void
+ tr_peerIoReadBytesToBuf (tr_peerIo * io, struct evbuffer * inbuf, struct evbuffer * outbuf, size_t byteCount)
+ {
+@@ -1141,17 +1173,7 @@
+ evbuffer_add_buffer (outbuf, tmp);
+ evbuffer_free (tmp);
+
+- /* decrypt if needed */
+- if (io->encryption_type == PEER_ENCRYPTION_RC4) {
+- struct evbuffer_ptr pos;
+- struct evbuffer_iovec iovec;
+- evbuffer_ptr_set (outbuf, &pos, old_length, EVBUFFER_PTR_SET);
+- do {
+- evbuffer_peek (outbuf, byteCount, &pos, &iovec, 1);
+- tr_cryptoDecrypt (&io->crypto, iovec.iov_len, iovec.iov_base, iovec.iov_base);
+- byteCount -= iovec.iov_len;
+- } while (!evbuffer_ptr_set (outbuf, &pos, iovec.iov_len, EVBUFFER_PTR_ADD));
+- }
++ maybeDecryptBuffer (io, outbuf, old_length, byteCount);
+ }
+
+ void
diff --git a/net-p2p/transmission/files/2.84-miniupnp14.patch b/net-p2p/transmission/files/2.84-miniupnp14.patch
new file mode 100644
index 0000000..cdf64e1
--- /dev/null
+++ b/net-p2p/transmission/files/2.84-miniupnp14.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/562020
+
+Index: libtransmission/upnp.c
+===================================================================
+--- libtransmission/upnp.c (revision 14564)
++++ libtransmission/upnp.c (revision 14565)
+@@ -88,7 +88,11 @@
+
+ #if (MINIUPNPC_API_VERSION >= 8) /* adds ipv6 and error args */
+ int err = UPNPDISCOVER_SUCCESS;
++ #if (MINIUPNPC_API_VERSION >= 14) /* adds ttl */
++ ret = upnpDiscover (msec, NULL, NULL, 0, 0, 2, &err);
++ #else
+ ret = upnpDiscover (msec, NULL, NULL, 0, 0, &err);
++ #endif
+ have_err = err != UPNPDISCOVER_SUCCESS;
+ #else
+ ret = upnpDiscover (msec, NULL, NULL, 0);
diff --git a/net-p2p/transmission/files/2.84-node_alloc-segfault.patch b/net-p2p/transmission/files/2.84-node_alloc-segfault.patch
new file mode 100644
index 0000000..7172428
--- /dev/null
+++ b/net-p2p/transmission/files/2.84-node_alloc-segfault.patch
@@ -0,0 +1,55 @@
+Index: libtransmission/list.c
+===================================================================
+--- libtransmission/list.c (revision 14318)
++++ libtransmission/list.c (revision 14319)
+@@ -30,20 +30,24 @@
+ static tr_list*
+ node_alloc (void)
+ {
+- tr_list * ret;
++ tr_list * ret = NULL;
++ tr_lock * lock = getRecycledNodesLock ();
+
+- if (recycled_nodes == NULL)
++ tr_lockLock (lock);
++
++ if (recycled_nodes != NULL)
+ {
+- ret = tr_new (tr_list, 1);
+- }
+- else
+- {
+- tr_lockLock (getRecycledNodesLock ());
+ ret = recycled_nodes;
+ recycled_nodes = recycled_nodes->next;
+- tr_lockUnlock (getRecycledNodesLock ());
+ }
+
++ tr_lockUnlock (lock);
++
++ if (ret == NULL)
++ {
++ ret = tr_new (tr_list, 1);
++ }
++
+ *ret = TR_LIST_CLEAR;
+ return ret;
+ }
+@@ -51,13 +55,15 @@
+ static void
+ node_free (tr_list* node)
+ {
++ tr_lock * lock = getRecycledNodesLock ();
++
+ if (node != NULL)
+ {
+ *node = TR_LIST_CLEAR;
+- tr_lockLock (getRecycledNodesLock ());
++ tr_lockLock (lock);
+ node->next = recycled_nodes;
+ recycled_nodes = node;
+- tr_lockUnlock (getRecycledNodesLock ());
++ tr_lockUnlock (lock);
+ }
+ }
+
diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
index 6bccb48..5d6d934 100644
--- a/net-p2p/transmission/metadata.xml
+++ b/net-p2p/transmission/metadata.xml
@@ -3,6 +3,10 @@
<pkgmetadata>
<herd>net-p2p</herd>
<maintainer>
+ <email>floppym@gentoo.org</email>
+ <name>Mike Gilbert</name>
+ </maintainer>
+ <maintainer>
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
diff --git a/net-p2p/transmission/transmission-2.84-r1.ebuild b/net-p2p/transmission/transmission-2.84-r1.ebuild
index 9cbecb4..97a3a72 100644
--- a/net-p2p/transmission/transmission-2.84-r1.ebuild
+++ b/net-p2p/transmission/transmission-2.84-r1.ebuild
@@ -72,6 +72,8 @@
# http://trac.transmissionbt.com/ticket/5700
sed -i -e '1iQMAKE_CXXFLAGS += -std=c++11' qt/qtr.pro || die
+ epatch "${FILESDIR}/2.84-miniupnp14.patch"
+
epatch_user
eautoreconf
}
diff --git a/net-p2p/transmission/transmission-2.84-r3.ebuild b/net-p2p/transmission/transmission-2.84-r3.ebuild
new file mode 100644
index 0000000..53430d5
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.84-r3.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils qmake-utils systemd user
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
+
+# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
+# transmission in licenses/ is for mentioning OpenSSL linking exception
+# MIT is in several libtransmission/ headers
+LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
+SLOT=0
+IUSE="ayatana gtk lightweight systemd qt4 qt5 xfs"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+
+RDEPEND=">=dev-libs/libevent-2.0.10:=
+ dev-libs/openssl:0=
+ net-libs/libnatpmp:=
+ >=net-libs/miniupnpc-1.7:=
+ >=net-misc/curl-7.16.3:=[ssl]
+ sys-libs/zlib:=
+ gtk? (
+ >=dev-libs/dbus-glib-0.100:=
+ >=dev-libs/glib-2.32:2=
+ >=x11-libs/gtk+-3.4:3=
+ ayatana? ( >=dev-libs/libappindicator-0.4.90:3= )
+ )
+ systemd? ( sys-apps/systemd:= )
+ qt4? (
+ dev-qt/qtcore:4=
+ dev-qt/qtgui:4=
+ dev-qt/qtdbus:4=
+ )
+ qt5? (
+ dev-qt/qtcore:5=
+ dev-qt/qtdbus:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtnetwork:5=
+ dev-qt/qtwidgets:5=
+ )"
+DEPEND="${RDEPEND}
+ >=dev-libs/glib-2.32
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/os-headers
+ virtual/pkgconfig
+ qt5? ( dev-qt/linguist-tools:5 )
+ xfs? ( sys-fs/xfsprogs )"
+
+REQUIRED_USE="ayatana? ( gtk ) ?? ( qt4 qt5 )"
+
+DOCS="AUTHORS NEWS qt/README.txt"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
+ # Trick to avoid automagic dependency
+ use ayatana || { sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die; }
+ # Pass our configuration dir to systemd unit file
+ sed -i '/ExecStart/ s|$| -g /var/lib/transmission/config|' daemon/${PN}-daemon.service || die
+ # http://trac.transmissionbt.com/ticket/4324
+ sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' lib${PN}/Makefile.am || die
+ # Fix for broken translations path
+ epatch "${FILESDIR}"/${PN}-2.80-translations-path-fix.patch
+ # http://trac.transmissionbt.com/ticket/5700
+ sed -i -e '1iQMAKE_CXXFLAGS += -std=c++11' qt/qtr.pro || die
+
+ epatch "${FILESDIR}/2.84-miniupnp14.patch"
+ epatch "${FILESDIR}/2.84-libevent-2.1.5.patch"
+ epatch "${FILESDIR}/2.84-node_alloc-segfault.patch"
+
+ epatch_user
+ eautoreconf
+}
+
+src_configure() {
+ export ac_cv_header_xfs_xfs_h=$(usex xfs)
+
+ econf \
+ --enable-external-natpmp \
+ $(use_enable lightweight) \
+ $(use_with systemd systemd-daemon) \
+ $(use_with gtk)
+
+ if use qt4 || use qt5; then
+ pushd qt >/dev/null || die
+ use qt4 && eqmake4 qtr.pro
+ use qt5 && eqmake5 qtr.pro
+ popd >/dev/null || die
+ fi
+}
+
+src_compile() {
+ emake
+
+ if use qt4 || use qt5; then
+ use qt4 && local -x QT_SELECT=4
+ use qt5 && local -x QT_SELECT=5
+ emake -C qt
+ lrelease qt/translations/*.ts || die
+ fi
+}
+
+src_install() {
+ default
+
+ rm -f "${ED}"/usr/share/${PN}/web/LICENSE
+
+ newinitd "${FILESDIR}"/${PN}-daemon.initd.9 ${PN}-daemon
+ newconfd "${FILESDIR}"/${PN}-daemon.confd.4 ${PN}-daemon
+ systemd_dounit daemon/${PN}-daemon.service
+
+ keepdir /var/{lib/${PN}/{config,downloads},log/${PN}}
+ fowners -R ${PN}:${PN} /var/{lib/${PN}/{,config,downloads},log/${PN}}
+
+ if use qt4 || use qt5; then
+ pushd qt >/dev/null || die
+ emake INSTALL_ROOT="${ED}"/usr install
+
+ domenu ${PN}-qt.desktop
+
+ local res
+ for res in 16 22 24 32 48 64 72 96 128 192 256; do
+ doicon -s ${res} icons/hicolor/${res}x${res}/${PN}-qt.png
+ done
+ doicon -s scalable icons/hicolor/scalable/${PN}-qt.svg
+
+ use qt4 && insinto /usr/share/qt4/translations
+ use qt5 && insinto /usr/share/qt5/translations
+ doins translations/*.qm
+ popd >/dev/null || die
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+
+ elog "If you use ${PN}-daemon, please, set 'rpc-username' and"
+ elog "'rpc-password' (in plain text, ${PN}-daemon will hash it on"
+ elog "start) in settings.json file located at /var/lib/${PN}/config or"
+ elog "any other appropriate config directory."
+ elog
+ elog "Since µTP is enabled by default, ${PN} needs large kernel buffers for"
+ elog "the UDP socket. You can append following lines into /etc/sysctl.conf:"
+ elog " net.core.rmem_max = 4194304"
+ elog " net.core.wmem_max = 1048576"
+ elog "and run sysctl -p"
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/net-p2p/transmission/transmission-2.84.ebuild b/net-p2p/transmission/transmission-2.84.ebuild
index 8af517c..d1648c4 100644
--- a/net-p2p/transmission/transmission-2.84.ebuild
+++ b/net-p2p/transmission/transmission-2.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -65,6 +65,8 @@
# http://trac.transmissionbt.com/ticket/5700
sed -i -e '1iQMAKE_CXXFLAGS += -std=c++11' qt/qtr.pro || die
+ epatch "${FILESDIR}/2.84-miniupnp14.patch"
+
epatch_user
eautoreconf
}
diff --git a/net-print/pykota/pykota-1.26.ebuild b/net-print/pykota/pykota-1.26.ebuild
index f588266..7b7d5d5 100644
--- a/net-print/pykota/pykota-1.26.ebuild
+++ b/net-print/pykota/pykota-1.26.ebuild
@@ -25,7 +25,7 @@
ldap? ( dev-python/python-ldap )
mysql? ( dev-python/mysql-python )
postgres? ( dev-db/postgresql[server] dev-python/pygresql )
- snmp? ( net-analyzer/net-snmp =dev-python/pysnmp-3.4* )
+ snmp? ( net-analyzer/net-snmp dev-python/pysnmp )
xml? ( dev-python/jaxml )"
RDEPEND="${DEPEND}"
diff --git a/net-proxy/squidguard/metadata.xml b/net-proxy/squidguard/metadata.xml
index 19dd2fb..8de62f5 100644
--- a/net-proxy/squidguard/metadata.xml
+++ b/net-proxy/squidguard/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-<longdescription>Combined filter, redirector and access controller plugin for Squid</longdescription>
+ <maintainer>
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+ <longdescription>Combined filter, redirector and access controller plugin for Squid</longdescription>
</pkgmetadata>
diff --git a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
index 917df47..4fbf1b3 100644
--- a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
+++ b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
@@ -20,7 +20,7 @@
IUSE="ldap"
-RDEPEND=">=sys-libs/db-2
+RDEPEND=">=sys-libs/db-2:*
ldap? ( net-nds/openldap:0 )"
DEPEND="${RDEPEND}
diff --git a/net-proxy/squidguard/squidguard-1.5_beta.ebuild b/net-proxy/squidguard/squidguard-1.5_beta.ebuild
deleted file mode 100644
index 1e6d391..0000000
--- a/net-proxy/squidguard/squidguard-1.5_beta.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-WANT_AUTOMAKE=none
-
-inherit eutils autotools user
-
-MY_P="squidGuard-${PV/_/-}"
-
-DESCRIPTION="Combined filter, redirector and access controller plugin for Squid"
-HOMEPAGE="http://www.squidguard.org"
-SRC_URI="http://www.squidguard.org/Downloads/Devel/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="ldap"
-
-RDEPEND=">=sys-libs/db-2
- ldap? ( net-nds/openldap:0 )"
-
-DEPEND="${RDEPEND}
- sys-devel/bison:0
- sys-devel/flex:0"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewgroup squid
- enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with ldap) \
- --with-sg-config=/etc/squidGuard/squidGuard.conf \
- --with-sg-logdir=/var/log/squidGuard
-}
-
-src_install() {
- emake prefix="/usr" INSTDIR="${D}" install
-
- keepdir /var/log/squidGuard
- fowners squid:squid /var/log/squidGuard
-
- insinto /etc/squidGuard/sample
- doins "${FILESDIR}"/squidGuard.conf.*
- insinto /etc/squidGuard/sample/db
- doins "${FILESDIR}"/blockedsites
-
- dodoc ANNOUNCE CHANGELOG README
- dohtml doc/*.html
- docinto text
- dodoc doc/*.txt
-}
-
-pkg_postinst() {
- einfo "To enable squidGuard, add the following lines to /etc/squid/squid.conf:"
- einfo " url_rewrite_program /usr/bin/squidGuard"
- einfo " url_rewrite_children 10"
- einfo ""
- einfo "Remember to edit /etc/squidGuard/squidGuard.conf first!"
- einfo "Examples can be found in /etc/squidGuard/sample/"
-}
diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest
index 2d5c114..bfef683 100644
--- a/net-proxy/torsocks/Manifest
+++ b/net-proxy/torsocks/Manifest
@@ -1,2 +1,2 @@
DIST torsocks-1.2.tar.gz 456453 SHA256 bea57d3624d723724fd1e260f0e6b2a354c0da742c023aa994c7692270d111d4 SHA512 c48cf466c1d4f6204c90ccb5f741d14304b24651d18d080a73952b9a06bbe146e3f6e6c4343ed06ed7a73714d86561cde3eba369e17fc4e155f3553a8d0f3890 WHIRLPOOL af892c2a6f8070308f6867154c50ee8ce6fd20c761dbd6466ea1ae3b46730452ce0757e9de8bf698f8bd455649f3f76a4e9a0bd883408f464c619c1d41e937cf
-DIST torsocks-2.0.0.tar.gz 96281 SHA256 a01f9e5ccc8a6e1d4e13704581ec9675129c147d10d08f86635f7bceb8001f48 SHA512 fa30244a5a06c6371a86090088b3abe9f4513eefce90580e7c7899843887b8a1eac641500dee81e576f27fa0f1b447b34f7b8300a889bcda2119779deb69d77d WHIRLPOOL 41ea31225866c50153dd0d46bc0659311835c5617f42a3c8275d5046cc0019fc4caa0ab9ef06d1b3552c1f082cb01a2036fc14c61a061378d01f988ff586a9c5
+DIST torsocks-2.1.0.tar.gz 106339 SHA256 a72c3ea757f5fe81d1ab91e0d5f0d83f195e235aae66d4df2f88a20db7028104 SHA512 5bdec6fd6c2d99effb73e418acd37ee135b3c912fad7811bfc8c724282370beea23149c6e94b995cfed0e61be43e63ac11d8c6ef420ba0137a19b96d8ac370e5 WHIRLPOOL 4511c9bff51ec25efb9b6f211d4b37931ba9c23ad89b1b272adf6b60351308e59a5e3d5157ba4adfab9e085deba435a9a1a8b4c69ec98514069c42561799c25c
diff --git a/net-proxy/torsocks/files/avoid-pie-static.patch b/net-proxy/torsocks/files/avoid-pie-static.patch
deleted file mode 100644
index 7556556..0000000
--- a/net-proxy/torsocks/files/avoid-pie-static.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-We need to avoid tests which have -static and -pie together.
-
-See https://bugs.gentoo.org/show_bug.cgi?id=533862
-
-diff -Naur torsocks-2.0.0.orig/configure.ac torsocks-2.0.0/configure.ac
---- torsocks-2.0.0.orig/configure.ac 2014-08-11 12:44:46.000000000 -0400
-+++ torsocks-2.0.0/configure.ac 2015-01-11 12:00:21.174826622 -0500
-@@ -144,24 +144,6 @@
- # Version information for libtorsocks
- TORSOCKSLDFLAGS="$LDFLAGS -version-info 1:0:0"
-
--# Check for the gcc hardening flags.
--AX_CHECK_COMPILE_FLAG([-fPIE],[CFLAGS="$CFLAGS -fPIE"],[],[])
--AX_CHECK_COMPILE_FLAG([-fwrapv],[CFLAGS="$CFLAGS -fwrapv"],[],[])
--AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1],
-- [CFLAGS="$CFLAGS --param ssp-buffer-size=1"],[],[])
--AX_CHECK_COMPILE_FLAG([-fstack-protector-all],
-- [CFLAGS="$CFLAGS -fstack-protector-all"],[],[]
--)
--AX_CHECK_COMPILE_FLAG([-fno-strict-overflow],
-- [CFLAGS="$CFLAGS -fno-strict-overflow"],[],[]
--)
--
--dnl Add hardening linker flags
--AX_CHECK_LINK_FLAG([-pie],[LDFLAGS="$LDFLAGS -pie"],[],[])
--AX_CHECK_LINK_FLAG([-z relro],[LDFLAGS="$LDFLAGS -z relro"],[],[])
--AX_CHECK_LINK_FLAG([-z now],[LDFLAGS="$LDFLAGS -z now"],[],[])
--LDFLAGS="$LDFLAGS -D_FORTIFY_SOURCE=2"
--
- dnl Linker checks for Mac OSX, which uses DYLD_INSERT_LIBRARIES
- dnl instead of LD_PRELOAD
- case "$host_os" in
-@@ -255,6 +237,34 @@
- DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include -include config.h"
- AC_SUBST(DEFAULT_INCLUDES)
-
-+##############################################################################
-+# 9. Test and add hardening flags
-+##############################################################################
-+
-+# Check for the gcc hardening flags.
-+AX_CHECK_COMPILE_FLAG([-fPIE],[CFLAGS="$CFLAGS -fPIE"],[],[])
-+AX_CHECK_COMPILE_FLAG([-fwrapv],[CFLAGS="$CFLAGS -fwrapv"],[],[])
-+AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1],
-+ [CFLAGS="$CFLAGS --param ssp-buffer-size=1"],[],[])
-+AX_CHECK_COMPILE_FLAG([-fstack-protector-all],
-+ [CFLAGS="$CFLAGS -fstack-protector-all"],[],[]
-+)
-+AX_CHECK_COMPILE_FLAG([-fno-strict-overflow],
-+ [CFLAGS="$CFLAGS -fno-strict-overflow"],[],[]
-+)
-+
-+dnl Add hardening linker flags
-+AX_CHECK_LINK_FLAG([-pie],[LDFLAGS="$LDFLAGS -pie"],[],[])
-+AX_CHECK_LINK_FLAG([-z relro],[LDFLAGS="$LDFLAGS -z relro"],[],[])
-+AX_CHECK_LINK_FLAG([-z now],[LDFLAGS="$LDFLAGS -z now"],[],[])
-+
-+dnl Add glibc hardening
-+CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
-+
-+##############################################################################
-+# 10. Finish up
-+##############################################################################
-+
- AC_CONFIG_FILES([
- Makefile
- extras/Makefile
diff --git a/net-proxy/torsocks/files/fix-docdir-r2.patch b/net-proxy/torsocks/files/fix-docdir-r2.patch
deleted file mode 100644
index 05986ec..0000000
--- a/net-proxy/torsocks/files/fix-docdir-r2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur torsocks-2.0.0-rc2.orig/doc/Makefile.am torsocks-2.0.0-rc2/doc/Makefile.am
---- torsocks-2.0.0-rc2.orig/doc/Makefile.am 2013-09-02 14:06:44.000000000 -0400
-+++ torsocks-2.0.0-rc2/doc/Makefile.am 2013-09-17 14:19:37.769272561 -0400
-@@ -6,5 +6,5 @@
- dist_man5_MANS = torsocks.conf.5
- dist_man8_MANS = torsocks.8
-
--dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG
-+#dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG
-
-diff -Naur torsocks-2.0.0-rc2.orig/Makefile.am torsocks-2.0.0-rc2/Makefile.am
---- torsocks-2.0.0-rc2.orig/Makefile.am 2013-09-02 14:06:44.000000000 -0400
-+++ torsocks-2.0.0-rc2/Makefile.am 2013-09-17 14:20:07.945273935 -0400
-@@ -2,6 +2,6 @@
-
- SUBDIRS = src doc tests
-
--dist_doc_DATA = ChangeLog
-+#dist_doc_DATA = ChangeLog
-
- EXTRA_DIST = gpl-2.0.txt
diff --git a/net-proxy/torsocks/files/fix-find-libc.so.patch b/net-proxy/torsocks/files/fix-find-libc.so.patch
deleted file mode 100644
index 0fb1949..0000000
--- a/net-proxy/torsocks/files/fix-find-libc.so.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar torsocks-2.0.0-rc3.orig/configure.ac torsocks-2.0.0-rc3/configure.ac
---- torsocks-2.0.0-rc3.orig/configure.ac 2013-11-03 13:24:51.000000000 -0500
-+++ torsocks-2.0.0-rc3/configure.ac 2014-01-26 12:49:55.157606016 -0500
-@@ -132,7 +132,7 @@
- dnl Get libc full system path. Use prefix or some hardcoded standard
- dnl location on Unixish system.
- AC_MSG_CHECKING(location of libc.so)
--for DIR in "$prefix/lib" "$prefix/usr/lib" '/lib' '/usr/lib'; do
-+for DIR in "$prefix/lib*" "$prefix/usr/lib*" '/lib*' '/usr/lib*'; do
- if test "${LIBC_PATH}" = ""; then
- LIBC_PATH=`$FIND $DIR -name "libc.so.?" 2>/dev/null | $TAIL -1`
- fi
diff --git a/net-proxy/torsocks/torsocks-1.2.ebuild b/net-proxy/torsocks/torsocks-1.2.ebuild
deleted file mode 100644
index f010fa0..0000000
--- a/net-proxy/torsocks/torsocks-1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit multilib
-
-DESCRIPTION="Use most socks-friendly applications with Tor"
-HOMEPAGE="https://code.google.com/p/torsocks"
-SRC_URI="https://${PN}.googlecode.com/files/${PN}-1.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="static-libs"
-
-# We do not depend on tor which might be running on a different box
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- #Remove libtool .la files
- cd "${D}"/usr/$(get_libdir)/torsocks
- rm -f *.la
-}
diff --git a/net-proxy/torsocks/torsocks-2.0.0-r1.ebuild b/net-proxy/torsocks/torsocks-2.0.0-r1.ebuild
deleted file mode 100644
index efdf15c..0000000
--- a/net-proxy/torsocks/torsocks-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils multilib versionator
-
-MY_PV="$(replace_version_separator 3 -)"
-MY_PF="${PN}-${MY_PV}"
-S=${WORKDIR}/${MY_PF}
-
-DESCRIPTION="Use most socks-friendly applications with Tor"
-HOMEPAGE="https://github.com/dgoulet/torsocks"
-SRC_URI="https://github.com/dgoulet/torsocks/archive/v${MY_PV}.tar.gz -> ${MY_PF}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static-libs"
-
-# We do not depend on tor which might be running on a different box
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i -e "/dist_doc_DATA/s/^/#/" Makefile.am doc/Makefile.am || die
-
- # Disable tests requiring network access.
- sed -i -e '/^\.\/test_dns$/d' tests/test_list || \
- die "failed to disable network tests"
-
- # Bug #533862
- epatch "${FILESDIR}"/avoid-pie-static.patch
-
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- dodoc ChangeLog README.md TODO doc/notes/DEBUG doc/socks/{SOCKS5,socks-extensions.txt}
-
- #Remove libtool .la files
- cd "${D}"/usr/$(get_libdir)/torsocks
- rm -f *.la
-}
diff --git a/net-proxy/torsocks/torsocks-2.1.0.ebuild b/net-proxy/torsocks/torsocks-2.1.0.ebuild
new file mode 100644
index 0000000..b085f65
--- /dev/null
+++ b/net-proxy/torsocks/torsocks-2.1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils multilib versionator
+
+MY_PV="$(replace_version_separator 3 -)"
+MY_PF="${PN}-${MY_PV}"
+S=${WORKDIR}/${MY_PF}
+
+DESCRIPTION="Use most socks-friendly applications with Tor"
+HOMEPAGE="https://github.com/dgoulet/torsocks"
+SRC_URI="https://github.com/dgoulet/torsocks/archive/v${MY_PV}.tar.gz -> ${MY_PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static-libs"
+
+# We do not depend on tor which might be running on a different box
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i -e "/dist_doc_DATA/s/^/#/" Makefile.am doc/Makefile.am || die
+
+ # Disable tests requiring network access.
+ sed -i -e '/^\.\/test_dns$/d' tests/test_list || \
+ die "failed to disable network tests"
+
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ dodoc ChangeLog README.md TODO doc/notes/DEBUG doc/socks/{SOCKS5,socks-extensions.txt}
+
+ #Remove libtool .la files
+ cd "${D}"/usr/$(get_libdir)/torsocks || die
+ rm -f *.la
+}
diff --git a/net-wireless/blueman/blueman-2.0-r1.ebuild b/net-wireless/blueman/blueman-2.0-r1.ebuild
new file mode 100644
index 0000000..f84849c
--- /dev/null
+++ b/net-wireless/blueman/blueman-2.0-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils gnome2-utils linux-info python-single-r1
+
+DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks"
+HOMEPAGE="https://github.com/blueman-project/blueman"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="appindicator network nls policykit pulseaudio thunar"
+
+COMMON_DEPEND="
+ dev-python/pygobject:3
+ >=net-wireless/bluez-4.61:=
+ ${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+ dev-python/cython[${PYTHON_USEDEP}]
+ virtual/pkgconfig
+ nls? ( dev-util/intltool sys-devel/gettext )"
+RDEPEND="${COMMON_DEPEND}
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ sys-apps/dbus
+ x11-libs/gtk+:3[introspection]
+ x11-libs/libnotify[introspection]
+ || (
+ x11-themes/faenza-icon-theme
+ x11-themes/gnome-icon-theme
+ x11-themes/mate-icon-theme
+ )
+ appindicator? ( dev-libs/libappindicator:3[introspection] )
+ network? (
+ net-dns/avahi[autoipd]
+ net-firewall/iptables
+ sys-apps/net-tools
+ || (
+ net-dns/dnsmasq
+ net-misc/dhcp
+ >=net-misc/networkmanager-0.8
+ )
+ )
+ policykit? ( sys-auth/polkit )
+ pulseaudio? ( media-sound/pulseaudio[bluetooth] )
+ thunar? ( xfce-base/thunar )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+ if use network; then
+ local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
+ ~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
+ linux-info_pkg_setup
+ fi
+}
+
+pkg_setup() {
+ pkg_pretend
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch"
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+ econf \
+ --docdir=/usr/share/doc/${PF} \
+ --disable-runtime-deps-check \
+ --disable-static \
+ $(use_enable policykit polkit) \
+ $(use_enable nls) \
+ $(use_enable thunar thunar-sendto)
+}
+
+src_install() {
+ default
+
+ python_fix_shebang "${D}"
+ rm "${D}"/$(python_get_sitedir)/*.la || die
+
+ use appindicator || { rm "${D}"/$(python_get_sitedir)/${PN}/plugins/applet/AppIndicator.py* || die; }
+ use pulseaudio || { rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py*,plugins/manager/Pulse*.py*} || die; }
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ gnome2_schemas_update
+}
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index e8d35ba..638e1c5 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,5 +1,5 @@
DIST bluez-4.101-patches.tar.xz 12380 SHA256 ea4b837245080ebe904fe4f338cd3c8c1370e197cdfbcd42bd55430c940b5e13 SHA512 0ef3219ed923a0880b2fe7008c36c185ff631a8fe1b357cc3612888817d9a7eaa6624bd31ed00a8bbbb6739528cb777a0b9900a7db4930482d1cbc38417b89aa WHIRLPOOL b89729b2cb1ecd6c816210682605b275af396af056e85d9a8671192ede0470002c1f61931781f27ad988ce8bc137f69a6725008a5ea9fe743ae41bc2f5edc7e8
DIST bluez-4.101.tar.xz 887236 SHA256 41f9578bef39b8c94a2d6ddeaa556afd22d136936d0f03100e422fe970a45a7d SHA512 c8a88fa6948e43c81687047856806c9dc576d3223371947b496f228dec2b2614d1c5a8ff587e9f26eec44843a50503c55861f9fa736fdba43b2364f663f0cb0d WHIRLPOOL 0c4f163e4f4d0ba8f7928f5330ac3fd5f204c299346c59e73b64ebb331b0887a2b01e8ed6f4e6ae91f826a0431df4f97fe3a0900fa6013ae66fd755aaa136196
-DIST bluez-5.25.tar.xz 1479312 SHA256 5ca62f3f45e2638a0f7a81658d6c8813ee01487436ae8e53e9fe395e23d1fd30 SHA512 2e13c552e771a9066c3170dfca43cca8a16b3afa3580b90ff065301e3a85d35ac47b145f5aa4db42001c466675994e9115d5c1909b7abe76c381114b7f4d872a WHIRLPOOL 28dfe9e7a6eb9a1cb81001f7183a26b3a3cf8d6383b4c6d17e0b851eeb87497e23c8262a07564cb1cc0fcec128627503ff266d17c86c7ebd8906b9c714dc5df1
DIST bluez-5.33.tar.xz 1636808 SHA256 1801807a13506678cbfeb15c6a4b89ecb5739efe1067eb464da6641d731436d3 SHA512 6b91b7d232c2654985b4777162e14a750b2840ec8bea7f913fc22bb63c5b767f6e8a7c39645cc7d583f17c993bd772f836bf0ab491eb5c75950c08dd9291a3da WHIRLPOOL cf176fabc4689c6e0233005a95731977e177eefb84c1652cbb0ca70a6a484366c7f4c95f3086652a8e3f6ccc023f741cbf930844265cf7090685863dc38fc105
DIST bluez-5.34.tar.xz 1640772 SHA256 e461ec2927f5491a202de4a180b2b42377f596b0ce372430d8204ae042d3b19c SHA512 9735c95dd2a7d4c51168aed622604efeaf820bc4c99615c4ab2a4b153cb650e0d82e24d09c96d7e1f15e3bc6aa61e83b49c90e8cff200d9b4d0b144a4e6138b8 WHIRLPOOL 2f4364a2a3feb7e9e23761ff1e3ac153772ab39403702b4f850e473153ec12f981fae7235ab14120d46d48007af751dd66d344b52e7d9dad1aef7b309c40605c
+DIST bluez-5.35.tar.xz 1643068 SHA256 1afee054644a8b1753ac98d7ad5cd95681a38f5c4cbb1b4bb3ceaa078bf8f0e2 SHA512 33850a01e135f14015295f0eb9b578c515d180d24441b89dff545ec7c0ce8dad5fa321e20918ed6285edaa386375b4ed5688cb17bbfaf4db0742f6d6a72eec6d WHIRLPOOL e334e0e9b37f823eb348cf1679e010567893a73941533a5dc12b598f3b3c845d82f15b3b79e106a7fc4c4344a204a2205fa96509e61d7e61b6ec9f413d650356
diff --git a/net-wireless/bluez/bluez-5.25.ebuild b/net-wireless/bluez/bluez-5.25.ebuild
deleted file mode 100644
index c5568b3..0000000
--- a/net-wireless/bluez/bluez-5.25.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools eutils multilib python-any-r1 readme.gentoo systemd udev user multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="cups debug +obex +readline selinux systemd test +udev"
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
- >=dev-libs/glib-2.28:2
- >=sys-apps/dbus-1.6:=
- >=sys-apps/hwids-20121202.2
- cups? ( net-print/cups:= )
- obex? ( dev-libs/libical )
- readline? ( sys-libs/readline:= )
- systemd? ( sys-apps/systemd )
- udev? ( >=virtual/udev-172 )
- abi_x86_32? (
- !<app-emulation/emul-linux-x86-soundlibs-20140406-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
- )
-"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- test? (
- ${PYTHON_DEPS}
- >=dev-python/dbus-python-1
- dev-python/pygobject:2
- dev-python/pygobject:3
- )
-"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-bluetooth )
-"
-DOC_CONTENTS="
- If you want to use rfcomm as a normal user, you need to add the user
- to the uucp group.
-"
-
-pkg_setup() {
- enewgroup plugdev
- use test && python-any-r1_pkg_setup
-
- if ! use udev; then
- ewarn
- ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
- ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
- ewarn "and hid2hci will not be available."
- ewarn
- fi
-}
-
-src_prepare() {
- # Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
- epatch "${FILESDIR}"/bluez-plugdev.patch
-
- # Fedora patches
- # http://www.spinics.net/lists/linux-bluetooth/msg38490.html
- epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
-
- # http://www.spinics.net/lists/linux-bluetooth/msg40136.html
- epatch "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
- # http://www.spinics.net/lists/linux-bluetooth/msg41264.html
- epatch "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
-
- # ???
- epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
-
- # Ubuntu workaround for bug #501120
- epatch "${FILESDIR}"/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
-
- if use cups; then
- sed -i \
- -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
- Makefile.{in,tools} || die
- fi
-
- eautoreconf
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myconf=(
- # readline is automagic when client is enabled
- # --enable-client always needs readline, bug #504038
- ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
- )
-
- if ! multilib_is_native_abi; then
- myconf+=(
- # deps not used for the library
- {DBUS,GLIB}_{CFLAGS,LIBS}=' '
- )
- fi
-
- econf \
- --localstatedir=/var \
- --disable-android \
- --enable-datafiles \
- --enable-experimental \
- --enable-optimization \
- $(use_enable debug) \
- --enable-pie \
- --enable-threads \
- --enable-library \
- $(multilib_native_use_enable test) \
- --enable-tools \
- --enable-manpages \
- --enable-monitor \
- $(multilib_native_use_enable cups) \
- $(multilib_native_use_enable obex) \
- $(multilib_native_use_enable readline client) \
- $(multilib_native_use_enable systemd) \
- $(systemd_with_unitdir) \
- $(multilib_native_use_enable udev) \
- $(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- else
- emake -f Makefile -f - libs \
- <<<'libs: $(lib_LTLIBRARIES)'
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && default
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
-
- # Upstream don't install this, bug #524640
- # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
- # http://comments.gmane.org/gmane.linux.bluez.kernel/54564
- # gatttool is only built with readline, bug #530776
- use readline && dobin attrib/gatttool
- dobin tools/hex2hcd
-
- # Unittests are not that useful once installed
- if use test ; then
- rm -r "${ED}"/usr/$(get_libdir)/bluez/test || die
- fi
- else
- emake DESTDIR="${D}" \
- install-includeHEADERS \
- install-libLTLIBRARIES \
- install-pkgconfigDATA
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --modules
-
- keepdir /var/lib/bluetooth
-
- # Upstream don't want people to play with them
- # But we keep installing them due 'historical' reasons
- insinto /etc/bluetooth
- local d
- for d in input network proximity; do
- doins profiles/${d}/${d}.conf
- done
- doins src/main.conf
- doins src/bluetooth.conf
-
-# FIXME:
-# Looks like upstream installs it only for systemd, probably not needed
-# insinto /usr/share/dbus-1/system-services
-# doins src/org.bluez.service
-
- newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
- newinitd "${FILESDIR}"/rfcomm-init.d-r2 rfcomm
-
- einstalldocs
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- use udev && udev_reload
-
- has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-
- if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
- elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will only"
- elog "be able to run bluetooth clients as root. If you want to be able to run bluetooth clients as"
- elog "a regular user, you need to add the user to the plugdev group."
- fi
-}
diff --git a/net-wireless/bluez/bluez-5.35.ebuild b/net-wireless/bluez/bluez-5.35.ebuild
new file mode 100644
index 0000000..49c03c1
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.35.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools eutils multilib python-any-r1 readme.gentoo systemd udev user multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="cups debug +obex +readline selinux systemd test +udev"
+
+CDEPEND="
+ >=dev-libs/glib-2.28:2
+ >=sys-apps/dbus-1.6:=
+ >=sys-apps/hwids-20121202.2
+ cups? ( net-print/cups:= )
+ obex? ( dev-libs/libical:= )
+ readline? ( sys-libs/readline:= )
+ systemd? ( sys-apps/systemd )
+ udev? ( >=virtual/udev-172 )
+ abi_x86_32? (
+ !<app-emulation/emul-linux-x86-soundlibs-20140406-r1
+ !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
+ )
+"
+DEPEND="${CDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ test? (
+ $(python_gen_any_dep '
+ >=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+ || (
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ )
+ ')
+ )
+"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-bluetooth )
+"
+DOC_CONTENTS="
+ If you want to use rfcomm as a normal user, you need to add the user
+ to the uucp group.
+"
+
+pkg_setup() {
+ enewgroup plugdev
+ use test && python-any-r1_pkg_setup
+
+ if ! use udev; then
+ ewarn
+ ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+ ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+ ewarn "and hid2hci will not be available."
+ ewarn
+ fi
+}
+
+src_prepare() {
+ # Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
+ epatch "${FILESDIR}"/bluez-plugdev.patch
+
+ # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+ # http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+ epatch "${FILESDIR}"/bluez-udevadm-path.patch
+
+ # Fedora patches
+ # http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+ epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+
+ # http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+ epatch "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+ # http://www.spinics.net/lists/linux-bluetooth/msg41264.html
+ epatch "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
+
+ # ???
+ epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
+
+ if use cups; then
+ sed -i \
+ -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+ Makefile.{in,tools} || die
+ fi
+
+ eautoreconf
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myconf=(
+ # readline is automagic when client is enabled
+ # --enable-client always needs readline, bug #504038
+ ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+ )
+
+ if ! multilib_is_native_abi; then
+ myconf+=(
+ # deps not used for the library
+ {DBUS,GLIB}_{CFLAGS,LIBS}=' '
+ )
+ fi
+
+ econf \
+ --localstatedir=/var \
+ --disable-android \
+ --enable-datafiles \
+ --enable-experimental \
+ --enable-optimization \
+ $(use_enable debug) \
+ --enable-pie \
+ --enable-threads \
+ --enable-library \
+ $(multilib_native_use_enable test) \
+ --enable-tools \
+ --enable-manpages \
+ --enable-monitor \
+ $(multilib_native_use_enable cups) \
+ $(multilib_native_use_enable obex) \
+ $(multilib_native_use_enable readline client) \
+ $(multilib_native_use_enable systemd) \
+ $(systemd_with_unitdir) \
+ $(multilib_native_use_enable udev) \
+ $(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ default
+ else
+ emake -f Makefile -f - libs \
+ <<<'libs: $(lib_LTLIBRARIES)'
+ fi
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+
+ # Upstream doesn't install this, bug #524640
+ # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+ # http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+ # gatttool is only built with readline, bug #530776
+ use readline && dobin attrib/gatttool
+ dobin tools/hex2hcd
+
+ # Unittests are not that useful once installed
+ if use test ; then
+ rm -r "${ED}"/usr/$(get_libdir)/bluez/test || die
+ fi
+ else
+ emake DESTDIR="${D}" \
+ install-includeHEADERS \
+ install-libLTLIBRARIES \
+ install-pkgconfigDATA
+ fi
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --modules
+
+ keepdir /var/lib/bluetooth
+
+ # Upstream don't want people to play with them
+ # But we keep installing them due to 'historical' reasons
+ insinto /etc/bluetooth
+ local d
+ for d in input network proximity; do
+ doins profiles/${d}/${d}.conf
+ done
+ doins src/main.conf
+
+ newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
+ newinitd "${FILESDIR}"/rfcomm-init.d-r2 rfcomm
+
+ einstalldocs
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ use udev && udev_reload
+
+ has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
+
+ if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
+ elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will"
+ elog "need to add the user to the plugdev group."
+ fi
+}
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index f9a5061..530780e 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1 +1,2 @@
DIST hostapd-2.4.tar.gz 1658872 SHA256 6fe0eb6bd1c9cbd24952ece8586b6f7bd14ab358edfda99794e79b9b9dbd657f SHA512 37e648fe9cce92923ab1d1e23a4267e274c988785d7be5610f1affca425ffa86b438de81e37446926a0f9158d6b67ee83e6396c3f81d571545c973dddbf1ffe3 WHIRLPOOL 78484c7e09725ba967c8815c3d8b0ffcc0c56daaec4acc79bc15c7392084c8642a2b41156b2c6a6360badb7e9d23792699d452fe600b56e3d62dd569188b6c2c
+DIST hostapd-2.5.tar.gz 1720783 SHA256 8e272d954dc0d7026c264b79b15389ec2b2c555b32970de39f506b9f463ec74a SHA512 bbb0547c29f4925aff8639cae3291ed020c2a9d989dd267be831b2418880916d2ec69003e36ecc796c348476086397cca8f63c52633f91c11a9c2ab72e1c83c0 WHIRLPOOL a2c07e8426796a82cd01dbd4fff22c065c93dff8ea25ccce9b37d78a732941750947e934acfdac8f63841d322636271e976c43aabe419c916e405264ecd4b06a
diff --git a/net-wireless/hostapd/hostapd-2.5.ebuild b/net-wireless/hostapd/hostapd-2.5.ebuild
new file mode 100644
index 0000000..8366085
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.5.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit toolchain-funcs eutils systemd
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
+
+DEPEND="ssl? ( dev-libs/openssl[-bindist] )
+ kernel_linux? (
+ dev-libs/libnl:3
+ crda? ( net-wireless/crda )
+ )
+ netlink? ( net-libs/libnfnetlink )
+ sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+src_prepare() {
+ sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+ "${S}/hostapd.conf" || die
+}
+
+src_configure() {
+ local CONFIG="${S}/.config"
+
+ # toolchain setup
+ echo "CC = $(tc-getCC)" > ${CONFIG}
+
+ # EAP authentication methods
+ echo "CONFIG_EAP=y" >> ${CONFIG}
+ echo "CONFIG_ERP=y" >> ${CONFIG}
+ echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+ if use ssl; then
+ # SSL authentication methods
+ echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+ echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+ echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+ echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+ echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+ echo "CONFIG_TLSV11=y" >> ${CONFIG}
+ echo "CONFIG_TLSV12=y" >> ${CONFIG}
+ fi
+
+ if use wps; then
+ # Enable Wi-Fi Protected Setup
+ echo "CONFIG_WPS=y" >> ${CONFIG}
+ echo "CONFIG_WPS2=y" >> ${CONFIG}
+ echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+ echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+ einfo "Enabling Wi-Fi Protected Setup support"
+ fi
+
+ echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+ echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+ echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+ echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+ echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+ echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+ echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
+ echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+ echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+ echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
+ echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
+ echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
+ echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+
+ einfo "Enabling drivers: "
+
+ # drivers
+ echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+ einfo " HostAP driver enabled"
+ echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+ einfo " Wired driver enabled"
+ echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
+ einfo " Prism54 driver enabled"
+ echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+ einfo " None driver enabled"
+
+ einfo " nl80211 driver enabled"
+ echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+
+ # epoll
+ echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
+
+ # misc
+ echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
+ echo "CONFIG_PKCS12=y" >> ${CONFIG}
+ echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
+ echo "CONFIG_IAPP=y" >> ${CONFIG}
+ echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
+ echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
+ echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
+ echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
+ echo "CONFIG_PEERKEY=y" >> ${CONFIG}
+ echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
+ echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
+ echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
+ echo "CONFIG_HS20=y" >> ${CONFIG}
+ echo "CONFIG_WNM=y" >> ${CONFIG}
+ echo "CONFIG_FST=y" >> ${CONFIG}
+ echo "CONFIG_FST_TEST=y" >> ${CONFIG}
+ echo "CONFIG_ACS=y" >> ${CONFIG}
+
+ if use netlink; then
+ # Netlink support
+ echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
+ fi
+
+ if use ipv6; then
+ # IPv6 support
+ echo "CONFIG_IPV6=y" >> ${CONFIG}
+ fi
+
+ if use sqlite; then
+ # Sqlite support
+ echo "CONFIG_SQLITE=y" >> ${CONFIG}
+ fi
+
+ # If we are using libnl 2.0 and above, enable support for it
+ # Removed for now, since the 3.2 version is broken, and we don't
+ # support it.
+ if has_version ">=dev-libs/libnl-3.2"; then
+ echo "CONFIG_LIBNL32=y" >> .config
+ fi
+
+ # TODO: Add support for BSD drivers
+
+ default_src_configure
+}
+
+src_compile() {
+ emake V=1
+
+ if use ssl; then
+ emake V=1 nt_password_hash
+ emake V=1 hlr_auc_gw
+ fi
+}
+
+src_install() {
+ insinto /etc/${PN}
+ doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
+
+ fperms -R 600 /etc/${PN}
+
+ dosbin ${PN}
+ dobin ${PN}_cli
+
+ use ssl && dobin nt_password_hash hlr_auc_gw
+
+ newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+ newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ doman ${PN}{.8,_cli.1}
+
+ dodoc ChangeLog README
+ use wps && dodoc README-WPS
+
+ docinto examples
+ dodoc wired.conf
+
+ if use logwatch; then
+ insinto /etc/log.d/conf/services/
+ doins logwatch/${PN}.conf
+
+ exeinto /etc/log.d/scripts/services/
+ doexe logwatch/${PN}
+ fi
+}
+
+pkg_postinst() {
+ einfo
+ einfo "If you are running openRC you need to follow this instructions:"
+ einfo "In order to use ${PN} you need to set up your wireless card"
+ einfo "for master mode in /etc/conf.d/net and then start"
+ einfo "/etc/init.d/${PN}."
+ einfo
+ einfo "Example configuration:"
+ einfo
+ einfo "config_wlan0=( \"192.168.1.1/24\" )"
+ einfo "channel_wlan0=\"6\""
+ einfo "essid_wlan0=\"test\""
+ einfo "mode_wlan0=\"master\""
+ einfo
+ #if [ -e "${KV_DIR}"/net/mac80211 ]; then
+ # einfo "This package now compiles against the headers installed by"
+ # einfo "the kernel source for the mac80211 driver. You should "
+ # einfo "re-emerge ${PN} after upgrading your kernel source."
+ #fi
+
+ if use wps; then
+ einfo "You have enabled Wi-Fi Protected Setup support, please"
+ einfo "read the README-WPS file in /usr/share/doc/${P}"
+ einfo "for info on how to use WPS"
+ fi
+}
diff --git a/net-wireless/inspectrum/Manifest b/net-wireless/inspectrum/Manifest
new file mode 100644
index 0000000..7296f31
--- /dev/null
+++ b/net-wireless/inspectrum/Manifest
@@ -0,0 +1 @@
+DIST inspectrum-0.1.tar.gz 151125 SHA256 30eeec26166e41fe2d8007b0042420602d9920bcd4ccf0f74ea1fd64dfc93bfe SHA512 f451a7d9d6fda95f6b0c1c03fc5679c859331df5df85d2f378648e95d8db94552bc2b237d552e705db302841dbab87bfa61f799886108ec1e4ba78df4beae441 WHIRLPOOL b2f35c6bef7af93fb6a3c71cc9c8718c5a8da63e649f574bfb53149cce7688a1ba2b37c5e0885f3be9d2de18d72ed376f12100308f08b2f5c0ca241bd700c997
diff --git a/net-wireless/inspectrum/files/inspectrum-0.1-cxxflags.patch b/net-wireless/inspectrum/files/inspectrum-0.1-cxxflags.patch
new file mode 100644
index 0000000..b7b35a9
--- /dev/null
+++ b/net-wireless/inspectrum/files/inspectrum-0.1-cxxflags.patch
@@ -0,0 +1,28 @@
+From 6287ae4153231865c9d3cafaf8c80d488b8ba84e Mon Sep 17 00:00:00 2001
+From: Mike Walters <mike@flomp.net>
+Date: Mon, 5 Oct 2015 18:29:37 +0100
+Subject: [PATCH] Set default CXXFLAGS if none are set
+
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 47e8faa..b788a24 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,9 +15,13 @@ if (WIN32)
+ endif(NOT(MMAN))
+ ENDIF (WIN32)
+
++if (NOT CMAKE_CXX_FLAGS)
++ set(CMAKE_CXX_FLAGS "-O2")
++endif (NOT CMAKE_CXX_FLAGS)
++
+ # This only works in cmake >3.1
+ #set_property(TARGET inspectrum PROPERTY CXX_STANDARD 11)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -O3")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+
+ list(APPEND inspectrum_sources
+ main.cpp
diff --git a/net-wireless/inspectrum/inspectrum-0.1-r1.ebuild b/net-wireless/inspectrum/inspectrum-0.1-r1.ebuild
new file mode 100644
index 0000000..e8001cf
--- /dev/null
+++ b/net-wireless/inspectrum/inspectrum-0.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-utils eutils
+
+DESCRIPTION="a tool for analysing captured signals, primarily from software-defined radio receivers"
+HOMEPAGE="https://github.com/miek/inspectrum"
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/miek/inspectrum.git"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/miek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+RDEPEND="sci-libs/fftw:3.0=
+ dev-qt/qtwidgets:5
+ dev-qt/qtgui:5
+ dev-qt/qtcore:5"
+DEPEND="virtual/pkgconfig
+ ${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-cxxflags.patch
+ cmake-utils_src_prepare
+}
diff --git a/net-wireless/inspectrum/inspectrum-9999.ebuild b/net-wireless/inspectrum/inspectrum-9999.ebuild
index eca6969..9d93c62 100644
--- a/net-wireless/inspectrum/inspectrum-9999.ebuild
+++ b/net-wireless/inspectrum/inspectrum-9999.ebuild
@@ -5,16 +5,20 @@
EAPI=5
inherit cmake-utils
-inherit git-r3
DESCRIPTION="a tool for analysing captured signals, primarily from software-defined radio receivers"
HOMEPAGE="https://github.com/miek/inspectrum"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/miek/inspectrum.git"
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/miek/inspectrum.git"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/miek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS=""
IUSE=""
RDEPEND="sci-libs/fftw:3.0=
@@ -23,7 +27,3 @@
dev-qt/qtcore:5"
DEPEND="virtual/pkgconfig
${RDEPEND}"
-
-src_install() {
- dobin "${BUILD_DIR}"/inspectrum
-}
diff --git a/net-wireless/kismet-ubertooth/Manifest b/net-wireless/kismet-ubertooth/Manifest
index 22b1af3..fdbdd18 100644
--- a/net-wireless/kismet-ubertooth/Manifest
+++ b/net-wireless/kismet-ubertooth/Manifest
@@ -1 +1,2 @@
DIST ubertooth-2015-09-R2.tar.xz 1706712 SHA256 f2088c8c0e754df47dd8dbf604d5822bf5894b91e4505276c6f9e26b6a23b56d SHA512 240f6d682fe0addc05bb8ccf7eec931534449adfa9c1369b484aeac73d9bcaf75c211aeede21c6c219e363773ce3d63e4aa0ee6b662acc83409587bd7ac7e4da WHIRLPOOL 9fba78d1740efd342f3892ffc3cf914d1919ef1c7d282786a64afb72d6ed306dec3600363e3f85f2f70d9ccfba6b62f826a72942cb7c9316d151dd2718f79b09
+DIST ubertooth-2015-10-R1.tar.xz 1716840 SHA256 bc37e7978d137a64d918d7c8f1e7ca9cff093f9921d805e9809b12e5ab12ae35 SHA512 ad7229c9509db4b4230ec28d1c16200f0780dd7ce55224528ced6d8969f342a79b7317b69e7b9e49d03e93f973203801f4f703dd80dc115400366b0984c965b1 WHIRLPOOL 5f46bdc8746481d68fd5c8e3ce04aadbcc1bc704c95b1b5a3d389376704a2a3e702faf819c749f98cb737578e9ccfa3ac01887081bceeceed2e4804493b2c2a8
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.10.1.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.10.1.ebuild
new file mode 100644
index 0000000..3c32ca2
--- /dev/null
+++ b/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.10.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ MY_PV=${PV/\./-}
+ MY_PV=${MY_PV/./-R}
+ S="${WORKDIR}/ubertooth-${MY_PV}"
+ SRC_URI="https://github.com/greatscottgadgets/ubertooth/releases/download/${MY_PV}/ubertooth-${MY_PV}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Provides basic bluetooth support in kismet"
+HOMEPAGE="http://ubertooth.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE=""
+
+DEPEND=">=net-wireless/kismet-2011.03.2-r1:= \
+ >=net-wireless/ubertooth-${PV}:= \
+ >=net-libs/libbtbb-${PV}:= \
+ virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ if has_version =net-wireless/kismet-9999; then
+ cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
+ else
+ cd "${S}/host/kismet/plugin-ubertooth" || die
+ fi
+ emake KIS_SRC_DIR="/usr/include/kismet/"
+}
+
+src_install() {
+ if has_version =net-wireless/kismet-9999; then
+ cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
+ else
+ cd "${S}/host/kismet/plugin-ubertooth" || die
+ fi
+ emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
+}
+
+pkg_postinst() {
+ ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
+}
diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index 0c78e62..40da1f6 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,2 +1,3 @@
DIST ubertooth-2015-09-R2.tar.xz 1706712 SHA256 f2088c8c0e754df47dd8dbf604d5822bf5894b91e4505276c6f9e26b6a23b56d SHA512 240f6d682fe0addc05bb8ccf7eec931534449adfa9c1369b484aeac73d9bcaf75c211aeede21c6c219e363773ce3d63e4aa0ee6b662acc83409587bd7ac7e4da WHIRLPOOL 9fba78d1740efd342f3892ffc3cf914d1919ef1c7d282786a64afb72d6ed306dec3600363e3f85f2f70d9ccfba6b62f826a72942cb7c9316d151dd2718f79b09
+DIST ubertooth-2015-10-R1.tar.xz 1716840 SHA256 bc37e7978d137a64d918d7c8f1e7ca9cff093f9921d805e9809b12e5ab12ae35 SHA512 ad7229c9509db4b4230ec28d1c16200f0780dd7ce55224528ced6d8969f342a79b7317b69e7b9e49d03e93f973203801f4f703dd80dc115400366b0984c965b1 WHIRLPOOL 5f46bdc8746481d68fd5c8e3ce04aadbcc1bc704c95b1b5a3d389376704a2a3e702faf819c749f98cb737578e9ccfa3ac01887081bceeceed2e4804493b2c2a8
DIST ubertooth_one_rx_only.dfu 32060 SHA256 fefc034ff19fa8b4b307d77c875bfeaa639e2aa0ecf8b8337e6424618480b1b5 SHA512 daeaeae90cb2aa591db2787466cbdc7365ce4e74ce5f7af4f61c9c1a22af93e846ea9230acca64f88a85a959d0db447b19da4dc4d213601db8dd1ad3d9978fa7 WHIRLPOOL 3069bf540c87d317e4f612b25ef4af10c3a9197ec9ead69082021442e0cc70d4b381488ba4bd509f75535a43f8f7b5fcebae313b96623513de846edb51cf63a0
diff --git a/net-wireless/ubertooth/ubertooth-2015.10.1.ebuild b/net-wireless/ubertooth/ubertooth-2015.10.1.ebuild
new file mode 100644
index 0000000..c35791d
--- /dev/null
+++ b/net-wireless/ubertooth/ubertooth-2015.10.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit multilib distutils-r1 cmake-utils udev
+
+HOMEPAGE="http://ubertooth.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+bluez +specan +pcap +ubertooth1-firmware +udev"
+REQUIRED_USE=" specan? ( ${PYTHON_REQUIRED_USE} )"
+DEPEND="bluez? ( net-wireless/bluez:= )
+ >=net-libs/libbtbb-${PV}:=
+ pcap? ( net-libs/libbtbb[pcap] )
+ specan? ( ${PYTHON_DEPS} )
+ virtual/libusb:1="
+RDEPEND="${DEPEND}
+ specan? ( >=dev-qt/qtgui-4.7.2:4
+ >=dev-python/pyside-1.0.2[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.3[${PYTHON_USEDEP}] )
+ udev? ( virtual/udev )"
+
+MY_PV=${PV/\./-}
+MY_PV=${MY_PV/./-R}
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
+ inherit git-r3
+ KEYWORDS=""
+ S="${WORKDIR}/${P}/host"
+else
+ S="${WORKDIR}/${PN}-${MY_PV}/host"
+ SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+DESCRIPTION="An open source wireless development platform suitable for Bluetooth experimentation"
+
+#readd firmware building, but do it right
+#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
+
+src_prepare() {
+ cmake-utils_src_prepare
+ if use specan; then
+ pushd python/specan_ui || die
+ distutils-r1_src_prepare
+ popd
+ fi
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_enable bluez USE_BLUEZ)
+ $(cmake-utils_use pcap USE_PCAP)
+ $(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
+ -DDISABLE_PYTHON=true
+ )
+ if use udev; then
+ mycmakeargs+=(
+ -DUDEV_RULES_GROUP=usb
+ -DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
+ )
+ fi
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+
+ if use specan; then
+ pushd python/specan_ui || die
+ distutils-r1_src_compile
+ popd
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ insinto /usr/share/${PN}
+ pushd "${WORKDIR}/${PN}-${MY_PV}" || die
+ if [[ ${PV} == "9999" ]] ; then
+ ewarn "Firmware isn't available for git releases, we assume you are already"
+ ewarn "on the latest and/or can build your own."
+ else
+ use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
+ use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu
+ fi
+ popd
+
+ if use specan; then
+ pushd python/specan_ui || die
+ distutils-r1_src_install
+ popd
+ fi
+
+ elog "Everyone can read from the ubertooth, but to talk to it"
+ elog "your user needs to be in the usb group."
+}
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index ae358ea..c35791d 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.ebuild
@@ -87,7 +87,8 @@
ewarn "Firmware isn't available for git releases, we assume you are already"
ewarn "on the latest and/or can build your own."
else
- use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
+ use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
+ use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu
fi
popd
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 0e170b4..b8c30a4 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1 +1,2 @@
DIST wpa_supplicant-2.4.tar.gz 2525648 SHA256 058dc832c096139a059e6df814080f50251a8d313c21b13364c54a1e70109122 SHA512 03d8199325b3910f77013ddb7edd803ab4444542230484e1cb465dc3df9372b39ee3307d823ce88730e8f5a5231ef3183954c54cf07297b70432f526e45aac2b WHIRLPOOL 092ae97e2c0f55d7055fd4e5d688e2ba538f785089a13c754129829854b20a98de832d9d0925dce5823a060d10a3bb5882b0bf3d6cf55f8de9bbc2b00fbb7392
+DIST wpa_supplicant-2.5.tar.gz 2607336 SHA256 cce55bae483b364eae55c35ba567c279be442ed8bab5b80a3c7fb0d057b9b316 SHA512 e3ca36ed10b4dae8f663e98ad230c8c059c952316c21a6b0638ecb1b40a5ef1b9083138ab45207cb764a17e870b4bd0625dd6efdb65856cb4dca13ccc0559e81 WHIRLPOOL 7f35ba06fc4022fe21f05a54a5b108bf2111dcb22e795e1566a514400db8348e79cc80b605dab5b586ab8f3966833ade7153e63c118794a0f06c4afd7a37781d
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch
new file mode 100644
index 0000000..deb6996
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch
@@ -0,0 +1,12 @@
+diff -Naur wpa_supplicant/dbus/dbus_new_helpers.c wpa_supplicant-fixed/dbus/dbus_new_helpers.c
+--- wpa_supplicant/dbus/dbus_new_helpers.c 2015-09-27 15:02:05.000000000 -0400
++++ wpa_supplicant-fixed/dbus/dbus_new_helpers.c 2015-10-05 18:38:58.489713168 -0400
+@@ -847,7 +847,7 @@
+ const struct wpa_dbus_property_desc *dsc;
+ int i = 0;
+
+- if (iface == NULL)
++ if (iface == NULL || path == NULL)
+ return;
+
+ dbus_connection_get_object_path_data(iface->con, path,
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild
new file mode 100644
index 0000000..7e8122d
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild
@@ -0,0 +1,384 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs qt4-r2 qmake-utils systemd multilib
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="|| ( GPL-2 BSD )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 p2p ps3 qt4 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl ) ?? ( qt4 qt5 )"
+
+CDEPEND="dbus? ( sys-apps/dbus )
+ kernel_linux? (
+ eap-sim? ( sys-apps/pcsc-lite )
+ dev-libs/libnl:3
+ net-wireless/crda
+ )
+ !kernel_linux? ( net-libs/libpcap )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtsvg:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtsvg:5
+ )
+ readline? (
+ sys-libs/ncurses:0=
+ sys-libs/readline:0
+ )
+ ssl? ( dev-libs/openssl:0 )
+ !ssl? ( gnutls? ( net-libs/gnutls ) )
+ !ssl? ( !gnutls? ( dev-libs/libtommath ) )
+"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-networkmanager )
+"
+
+S="${WORKDIR}/${P}/${PN}"
+
+Kconfig_style_config() {
+ #param 1 is CONFIG_* item
+ #param 2 is what to set it = to, defaulting in y
+ CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
+ setting="${2:-y}"
+
+ if [ ! $setting = n ]; then
+ #first remove any leading "# " if $2 is not n
+ sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM"
+ #set item = $setting (defaulting to y)
+ sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
+ else
+ #ensure item commented out
+ sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM"
+ fi
+}
+
+pkg_setup() {
+ if use gnutls && use ssl ; then
+ elog "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
+ fi
+}
+
+src_prepare() {
+ # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
+ sed -i \
+ -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
+ ../src/l2_packet/l2_packet_freebsd.c || die
+
+ # People seem to take the example configuration file too literally (bug #102361)
+ sed -i \
+ -e "s:^\(opensc_engine_path\):#\1:" \
+ -e "s:^\(pkcs11_engine_path\):#\1:" \
+ -e "s:^\(pkcs11_module_path\):#\1:" \
+ wpa_supplicant.conf || die
+
+ # Change configuration to match Gentoo locations (bug #143750)
+ sed -i \
+ -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
+ -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
+ wpa_supplicant.conf || die
+
+ #if use dbus; then
+ # epatch "${FILESDIR}/${P}-dbus-path-fix.patch"
+ #fi
+
+ # systemd entries to D-Bus service files (bug #372877)
+ echo 'SystemdService=wpa_supplicant.service' \
+ | tee -a dbus/*.service >/dev/null || die
+
+ cd "${WORKDIR}/${P}"
+
+ if use wimax; then
+ # generate-libeap-peer.patch comes before
+ # fix-undefined-reference-to-random_get_bytes.patch
+ epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
+
+ # multilib-strict fix (bug #373685)
+ sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile
+ fi
+
+ # bug (320097)
+ epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
+
+ # TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX,
+ # SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED.
+ # bug (374089)
+ #epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch"
+}
+
+src_configure() {
+ # Toolchain setup
+ tc-export CC
+
+ cp defconfig .config
+
+ # Basic setup
+ Kconfig_style_config CTRL_IFACE
+ Kconfig_style_config BACKEND file
+ Kconfig_style_config IBSS_RSN
+ Kconfig_style_config IEEE80211W
+ Kconfig_style_config IEEE80211R
+
+ # Basic authentication methods
+ # NOTE: we don't set GPSK or SAKE as they conflict
+ # with the below options
+ Kconfig_style_config EAP_GTC
+ Kconfig_style_config EAP_MD5
+ Kconfig_style_config EAP_OTP
+ Kconfig_style_config EAP_PAX
+ Kconfig_style_config EAP_PSK
+ Kconfig_style_config EAP_TLV
+ Kconfig_style_config EAP_EXE
+ Kconfig_style_config IEEE8021X_EAPOL
+ Kconfig_style_config PKCS12
+ Kconfig_style_config PEERKEY
+ Kconfig_style_config EAP_LEAP
+ Kconfig_style_config EAP_MSCHAPV2
+ Kconfig_style_config EAP_PEAP
+ Kconfig_style_config EAP_TLS
+ Kconfig_style_config EAP_TTLS
+
+ # Enabling background scanning.
+ Kconfig_style_config BGSCAN_SIMPLE
+ Kconfig_style_config BGSCAN_LEARN
+
+ if use dbus ; then
+ Kconfig_style_config CTRL_IFACE_DBUS
+ Kconfig_style_config CTRL_IFACE_DBUS_NEW
+ Kconfig_style_config CTRL_IFACE_DBUS_INTRO
+ fi
+
+ # Enable support for writing debug info to a log file and syslog.
+ Kconfig_style_config DEBUG_FILE
+ Kconfig_style_config DEBUG_SYSLOG
+
+ if use hs2-0 ; then
+ Kconfig_style_config INTERWORKING
+ Kconfig_style_config HS20
+ fi
+
+ if use uncommon-eap-types; then
+ Kconfig_style_config EAP_GPSK
+ Kconfig_style_config EAP_SAKE
+ Kconfig_style_config EAP_GPSK_SHA256
+ Kconfig_style_config EAP_IKEV2
+ Kconfig_style_config EAP_EKE
+ fi
+
+ if use eap-sim ; then
+ # Smart card authentication
+ Kconfig_style_config EAP_SIM
+ Kconfig_style_config EAP_AKA
+ Kconfig_style_config EAP_AKA_PRIME
+ Kconfig_style_config PCSC
+ fi
+
+ if use fasteap ; then
+ Kconfig_style_config EAP_FAST
+ fi
+
+ if use readline ; then
+ # readline/history support for wpa_cli
+ Kconfig_style_config READLINE
+ else
+ #internal line edit mode for wpa_cli
+ Kconfig_style_config WPA_CLI_EDIT
+ fi
+
+ # SSL authentication methods
+ if use ssl ; then
+ Kconfig_style_config TLS openssl
+ elif use gnutls ; then
+ Kconfig_style_config TLS gnutls
+ Kconfig_style_config GNUTLS_EXTRA
+ else
+ Kconfig_style_config TLS internal
+ fi
+
+ if use smartcard ; then
+ Kconfig_style_config SMARTCARD
+ fi
+
+ if use tdls ; then
+ Kconfig_style_config TDLS
+ fi
+
+ if use kernel_linux ; then
+ # Linux specific drivers
+ Kconfig_style_config DRIVER_ATMEL
+ Kconfig_style_config DRIVER_HOSTAP
+ Kconfig_style_config DRIVER_IPW
+ Kconfig_style_config DRIVER_NL80211
+ Kconfig_style_config DRIVER_RALINK
+ Kconfig_style_config DRIVER_WEXT
+ Kconfig_style_config DRIVER_WIRED
+
+ if use ps3 ; then
+ Kconfig_style_config DRIVER_PS3
+ fi
+
+ elif use kernel_FreeBSD ; then
+ # FreeBSD specific driver
+ Kconfig_style_config DRIVER_BSD
+ fi
+
+ # Wi-Fi Protected Setup (WPS)
+ if use wps ; then
+ Kconfig_style_config WPS
+ Kconfig_style_config WPS2
+ # USB Flash Drive
+ Kconfig_style_config WPS_UFD
+ # External Registrar
+ Kconfig_style_config WPS_ER
+ # Universal Plug'n'Play
+ Kconfig_style_config WPS_UPNP
+ # Near Field Communication
+ Kconfig_style_config WPS_NFC
+ fi
+
+ # Wi-Fi Direct (WiDi)
+ if use p2p ; then
+ Kconfig_style_config P2P
+ Kconfig_style_config WIFI_DISPLAY
+ fi
+
+ # Access Point Mode
+ if use ap ; then
+ Kconfig_style_config AP
+ fi
+
+ # Enable mitigation against certain attacks against TKIP
+ Kconfig_style_config DELAYED_MIC_ERROR_REPORT
+
+ # If we are using libnl 2.0 and above, enable support for it
+ # Bug 382159
+ # Removed for now, since the 3.2 version is broken, and we don't
+ # support it.
+ if has_version ">=dev-libs/libnl-3.2"; then
+ Kconfig_style_config LIBNL32
+ fi
+
+ if use qt4 ; then
+ pushd "${S}"/wpa_gui-qt4 > /dev/null
+ eqmake4 wpa_gui.pro
+ popd > /dev/null
+ fi
+ if use qt5 ; then
+ pushd "${S}"/wpa_gui-qt4 > /dev/null
+ eqmake5 wpa_gui.pro
+ popd > /dev/null
+ fi
+}
+
+src_compile() {
+ einfo "Building wpa_supplicant"
+ emake V=1 BINDIR=/usr/sbin
+
+ if use wimax; then
+ emake -C ../src/eap_peer clean
+ emake -C ../src/eap_peer
+ fi
+
+ if use qt4 || use qt5; then
+ pushd "${S}"/wpa_gui-qt4 > /dev/null
+ einfo "Building wpa_gui"
+ emake
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ dosbin wpa_supplicant
+ dobin wpa_cli wpa_passphrase
+
+ # baselayout-1 compat
+ if has_version "<sys-apps/baselayout-2.0.0"; then
+ dodir /sbin
+ dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
+ dodir /bin
+ dosym /usr/bin/wpa_cli /bin/wpa_cli
+ fi
+
+ if has_version ">=sys-apps/openrc-0.5.0"; then
+ newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
+ newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
+ fi
+
+ exeinto /etc/wpa_supplicant/
+ newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
+
+ dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
+ wpa_supplicant.conf
+
+ newdoc .config build-config
+
+ doman doc/docbook/*.{5,8}
+
+ if use qt4 || use qt5 ; then
+ into /usr
+ dobin wpa_gui-qt4/wpa_gui
+ doicon wpa_gui-qt4/icons/wpa_gui.svg
+ make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
+ fi
+
+ use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
+
+ if use dbus ; then
+ pushd "${S}"/dbus > /dev/null
+ insinto /etc/dbus-1/system.d
+ newins dbus-wpa_supplicant.conf wpa_supplicant.conf
+ insinto /usr/share/dbus-1/system-services
+ doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service
+ popd > /dev/null
+
+ # This unit relies on dbus support, bug 538600.
+ systemd_dounit systemd/wpa_supplicant.service
+ fi
+
+ systemd_dounit "systemd/wpa_supplicant@.service"
+ systemd_dounit "systemd/wpa_supplicant-nl80211@.service"
+ systemd_dounit "systemd/wpa_supplicant-wired@.service"
+}
+
+pkg_postinst() {
+ elog "If this is a clean installation of wpa_supplicant, you"
+ elog "have to create a configuration file named"
+ elog "/etc/wpa_supplicant/wpa_supplicant.conf"
+ elog
+ elog "An example configuration file is available for reference in"
+ elog "/usr/share/doc/${PF}/"
+
+ if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
+ echo
+ ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
+ ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
+ fi
+
+ # Mea culpa, feel free to remove that after some time --mgorny.
+ local fn
+ for fn in wpa_supplicant{,@wlan0}.service; do
+ if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]]
+ then
+ ebegin "Moving ${fn} to multi-user.target"
+ mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \
+ "${ROOT}"/etc/systemd/system/multi-user.target.wants/
+ eend ${?} \
+ "Please try to re-enable ${fn}"
+ fi
+ done
+}
diff --git a/profiles/arch/alpha/package.mask b/profiles/arch/alpha/package.mask
index f5a5b71..ec1e226 100644
--- a/profiles/arch/alpha/package.mask
+++ b/profiles/arch/alpha/package.mask
@@ -2,6 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Tobias Klausmann <klausman@gentoo.org> (03 Oct 2015)
+# Hangs/spins-on-cpu with any program on alpha.
+# Upstream bug: https://sourceware.org/bugzilla/show_bug.cgi?id=19061
+# Gentoo bug: 562128
+>=sys-devel/gdb-7.10
+
# Julian Ospald <hasufell@gentoo.org> (01 Sep 2014)
# Needs either hardmasked >=media-video/libav-10 or
# >=media-video/ffmpeg-2.1.4 which is not keyworded for
@@ -12,3 +18,4 @@
# Alexey Shvetsov <alexxy@gentoo.org> (21 May 2012)
# Need deps pecl-apc and pecl-uploadprogress bug #416897
>=www-apps/drupal-7.14
+
diff --git a/profiles/arch/amd64-fbsd/package.mask b/profiles/arch/amd64-fbsd/package.mask
deleted file mode 100644
index 5264156..0000000
--- a/profiles/arch/amd64-fbsd/package.mask
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Davide Pesavento <pesa@gentoo.org> (20 Nov 2014)
-# Qt4 multilib ebuilds, masked until dev-qt/qtchooser
-# gets keyworded. See bug 529196.
->=dev-qt/assistant-4.8.6:4
->=dev-qt/designer-4.8.6:4
->=dev-qt/linguist-4.8.6:4
->=dev-qt/pixeltool-4.8.6:4
->=dev-qt/qdbusviewer-4.8.6:4
->=dev-qt/qt3support-4.8.6:4
->=dev-qt/qtbearer-4.8.6:4
->=dev-qt/qtcore-4.8.6:4
->=dev-qt/qtdbus-4.8.6:4
->=dev-qt/qtdeclarative-4.8.6:4
->=dev-qt/qtdemo-4.8.6:4
->=dev-qt/qtgui-4.8.6:4
->=dev-qt/qthelp-4.8.6:4
->=dev-qt/qtmultimedia-4.8.6:4
->=dev-qt/qtopengl-4.8.6:4
->=dev-qt/qtopenvg-4.8.6:4
->=dev-qt/qtphonon-4.8.6:4
->=dev-qt/qtscript-4.8.6:4
->=dev-qt/qtsql-4.8.6:4
->=dev-qt/qtsvg-4.8.6:4
->=dev-qt/qttest-4.8.6:4
->=dev-qt/qttranslations-4.8.6:4
->=dev-qt/qtwebkit-4.8.6:4
->=dev-qt/qtxmlpatterns-4.8.6:4
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.force b/profiles/arch/amd64-fbsd/todo/package.use.force
index 1a0c90a..c0333cd 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.force
+++ b/profiles/arch/amd64-fbsd/todo/package.use.force
@@ -3,3 +3,6 @@
# $Id$
sys-libs/libcxx libcxxrt
+
+# bug 562412
+www-client/firefox pulseaudio
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index ca813a7..7816ee1 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -213,3 +213,6 @@
# net-misc/freerdp (doesnt build)
media-video/vlc rdp
+
+# net-wireless/bluez
+media-sound/pulseaudio bluetooth
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 3af4863..25bb19d 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -2,6 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Markus Meier <maekke@gentoo.org> (10 Oct 2015)
+# unkeyworded deps, bug #552330
+app-portage/g-sorcery bson
+
# Ben de Groot <yngwin@gentoo.org> (03 May 2015)
# media-libs/rubberband lacks arm keyword, bug 548446
media-video/mpv rubberband
@@ -217,7 +221,7 @@
# Markus Meier <maekke@gentoo.org> (04 Aug 2013)
# Unkeyworded deps, bug #474026
-app-admin/conky lua-cairo lua-imlib xmms2 audacious moc
+app-admin/conky audacious cmus irc lua-cairo lua-imlib lua-rsvg moc xmms2
# Sergey Popov <pinkbyte@gentoo.org> (30 Jul 2013)
# Not tested
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 7b51fce..8fcdbd2 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -2,6 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Pacho Ramos <pacho@gentoo.org> (03 Oct 2015)
+# Missing stable, bug #529462
+media-gfx/graphviz java
+
# Markus Meier <maekke@gentoo.org> (30 Jul 2015)
# Missing stable
x11-libs/wxGTK webkit
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 6087274..d840e92 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -127,10 +127,6 @@
kde-apps/okular dpi
kde-base/nepomuk-core migrator
-# Pacho Ramos <pacho@gentoo.org> (12 Apr 2014)
-# Missing keywords, bug #507490
-net-misc/modemmanager mbim
-
# Pacho Ramos <pacho@gentoo.org> (22 Feb 2013)
# Missing keywords, bug #495250
>=gnome-base/gnome-extra-apps-3.10 tracker
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 824d4a7..2f9807c 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -28,6 +28,10 @@
# Dependencies lack keywords
games-fps/lsdldoom shareware
+# Pacho Ramos <pacho@gentoo.org> (12 Apr 2014)
+# Missing keywords, bug #507490
+net-misc/modemmanager mbim
+
# Julian Ospald <hasufell@gentoo.org> (23 Nov 2013)
# FIXME: app-arch/innoextract not available under ppc yet
games-fps/duke3d-data gog
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 8177727..5854c03 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -31,6 +31,10 @@
# sys-devel/clang is not keyworded
app-doc/doxygen clang
+# Pacho Ramos <pacho@gentoo.org> (12 Apr 2014)
+# Missing keywords, bug #507490
+net-misc/modemmanager mbim
+
# Michael Sterrett <mr_bones_@gentoo.org (12 Nov 2013)
# Mask openmedia use flag because the content generation tools
# are missing keywords.
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 9ecd214..14abfe8 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -34,7 +34,7 @@
# Michał Górny <mgorny@gentoo.org> (14 Oct 2012)
# Force-enable all PYTHON_TARGETS for python-exec to avoid using private
# API. Please remember to keep it in sync with python_targets.desc.
-dev-lang/python-exec python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy python_targets_pypy3
+dev-lang/python-exec python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy python_targets_pypy3
# Zac Medico <zmedico@gentoo.org> (20 Oct 2010)
# Force ipc USE flag since it should remain enabled unless
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index cc2e933..4d49b91 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,6 +5,10 @@
# This file requires >=portage-2.1.1
# New entries go on top.
+# Rick Farina <zerochaos@gentoo.org> (06 Oct 2015)
+# forward porting this patch is non-trivial, mask for now
+=net-wireless/wpa_supplicant-2.5 wimax
+
# Nathan Phillip Brink <binki@gentoo.org> (26 Sep 2015)
# git useflag requires dev-libs/libgit2 which few arches support
dev-util/geany-plugins git
@@ -445,10 +449,6 @@
# gentoo bugs.
media-libs/libsdl2 custom-cflags
-# Mike Gilbert <floppym@gentoo.org> (23 Aug 2013)
-# Requires hard-masked ffmpeg.
->=www-client/chromium-30 system-ffmpeg
-
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
# Causes build to fail, issue is being discussed with upstream
>=www-plugins/gnash-0.8.10_p20130822 openvg
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 72a22f6..159c181 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -5,6 +5,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in package.use.mask
+# Mike Gilbert <floppym@gentoo.org> (03 Oct 2015)
+# Unmask python3.5 for python-exec
+dev-lang/python-exec -python_targets_python3_5
+
# Andreas Huettel <dilfridge@gentoo.org> (26 Sep 2015)
# Not stable enough for stable (Debian and SuSE disable it completely)
=app-office/libreoffice-5.0* gtk3
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index f93ee4d..4abfbed 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -15,6 +15,7 @@
ruby_targets_ruby18
ruby_targets_jruby
ruby_targets_ree18
+ruby_targets_ruby19
# masking here and unmasking in default/linux/
kmod
@@ -194,6 +195,7 @@
userland_BSD
elibc_AIX
+elibc_bionic
elibc_Cygwin
elibc_Darwin
elibc_DragonFly
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 955e697..ea8f6eb 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -5,6 +5,11 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Mike Gilbert <floppym@gentoo.org> (02 Oct 2015)
+# Needs dev-lang/python:3.5 stable
+python_targets_python3_5
+python_single_target_python3_5
+
# Justin Lecher <jlec@gentoo.org> (30 Sep 2015)
# No stable libressl yet
libressl
diff --git a/profiles/desc/elibc.desc b/profiles/desc/elibc.desc
index 6b8fbda..70929ed 100644
--- a/profiles/desc/elibc.desc
+++ b/profiles/desc/elibc.desc
@@ -7,6 +7,7 @@
# Keep it sorted.
AIX - ELIBC setting for systems that use the AIX C library
+bionic - ELIBC setting for systems that use Android's Bionic C library
Cygwin - ELIBC setting for systems that use Cygwin
Darwin - ELIBC setting for systems that use the Darwin C library
DragonFly - ELIBC setting for systems that use the DragonFly C library
diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc
index 13da7f0..2eb0801 100644
--- a/profiles/desc/python_single_target.desc
+++ b/profiles/desc/python_single_target.desc
@@ -8,6 +8,7 @@
python3_2 - Build for Python 3.2 only (deprecated)
python3_3 - Build for Python 3.3 only
python3_4 - Build for Python 3.4 only
+python3_5 - Build for Python 3.5 only
jython2_5 - Build for Jython 2.5 only
jython2_7 - Build for Jython 2.7 only
pypy - Build for PyPy only
diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc
index ff70e6c..3168d91 100644
--- a/profiles/desc/python_targets.desc
+++ b/profiles/desc/python_targets.desc
@@ -9,6 +9,7 @@
python3_2 - Build with Python 3.2 (deprecated)
python3_3 - Build with Python 3.3
python3_4 - Build with Python 3.4
+python3_5 - Build with Python 3.5
jython2_5 - Build with Jython 2.5
jython2_7 - Build with Jython 2.7
pypy2_0 - Build with PyPy 2.0 (removed)
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.use.mask b/profiles/hardened/linux/amd64/no-multilib/package.use.mask
index 140a298..b552f1c 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.use.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.use.mask
@@ -7,7 +7,7 @@
# Disable 32-bit parts of wine, bug #351436
app-emulation/wine mono win32
-# Apr 28, 2008 Sébastien Fabbro <bicatali@gentoo.org>
+# Apr 28, 2008 Sébastien Fabbro <bicatali@gentoo.org>
# ifc masked
sci-libs/acml ifc
diff --git a/profiles/package.mask b/profiles/package.mask
index 8e78ff7b..bee75ee 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,46 @@
#--- END OF EXAMPLES ---
+# Bernard Cafarelli <voyageur@gentoo.org> (11 Oct 2015)
+# Masked for testing
+=sys-devel/llvm-3.7.0-r2
+
+# Hans de Graaff <graaff@gentoo.org> (11 Oct 2015)
+# Ruby 1.9 is no longer maintained upstream since January
+# 2015, bug 536852.
+# Masked for removal in 30 days.
+=dev-lang/ruby-1.9*
+
+# Michael Palimaka <kensington@gentoo.org (9 Oct 2015)
+# Dead upstream. No consumers. Collides with other packages.
+# Bug #560932 and bug #557006. Masked for removal in 30 days.
+dev-libs/libhash
+
+# Michael Palimaka <kensington@gentoo.org (9 Oct 2015)
+# Superceded by >=app-crypt/qca-2.1
+# Masked for removal in 30 days
+<app-crypt/qca-2.1
+app-crypt/qca-cyrus-sasl
+app-crypt/qca-gnupg
+app-crypt/qca-logger
+app-crypt/qca-ossl
+app-crypt/qca-pkcs11
+
+# Anthony G. Basile <blueness@gentoo.org> (6 Oct 2015)
+# Dead upstream for a long time. Masked for removal
+# in 30 days.
+dev-util/elfsh
+
+# Patrice Clement <monsieurp@gentoo.org> (6 Oct 2015)
+# No update since 2008. Masked for removal in 30 days.
+# See bug #562370.
+dev-java/cos
+
+# Patrice Clement <monsieurp@gentoo.org> (6 Oct 2015)
+# Dead upstream. Masked for removal in 30 days.
+# See bug #562370.
+dev-java/commons-grant
+
# Mike Pagano <mpagano@gentoo.org> (2 Oct 2015)
# A regression in kernel 4.1.9 could lead to a system
# lockup. This has been fixed in gentoo-sources-4.1.9-r1
@@ -38,11 +78,6 @@
=sys-kernel/vanilla-sources-4.1.9
=sys-kernel/gentoo-sources-4.1.9
-# Michał Górny <mgorny@gentoo.org> (1 Oct 2015)
-# Thoroughly broken for me since the switch to Python 3 / PyQt5. Masking
-# to account for opt-in testing.
-=games-emulation/m64py-0.2.3
-
# Patrice Clement <monsieurp@gentoo.org> (1 Oct 2015)
# Project is over 10 years old and seems to have stalled.
# Masked for removal in 30 days. See bug 561954.
@@ -238,19 +273,11 @@
# experimental features and accept a more unstable release.
>=www-client/chromium-47
-# Rick Farina <zerochaos@gentoo.org> (04 Sep 2015)
-# Ancient, please upgrade to ~arch version
-=net-analyzer/metasploit-2.7
-
# Michael Palimaka <kensington@gentoo.org> (01 Sep 2015)
# Fails to build (bug #559330). Dead upstream.
# Masked for removal in 30 days.
kde-misc/socket-sentry
-# Matt Turner <mattst88@gentoo.org> (28 Aug 2015)
-# Masked for removal in 30 days. Bug 482304
-x11-libs/libXevie
-
# Hans de Graaff <graaff@gentoo.org> (28 Aug 2015)
# Masked for removal in 30 days.
# Only needed for ruby18 which has been removed a long time
@@ -263,15 +290,6 @@
# via the kernel as upstream has deprecated these packages.
app-emulation/kvm-kmod
-# Lars Wendler <polynomial-c@gentoo.org> (21 Aug 2015)
-# This version breaks tests in app-admin/rsyslog and
-# also breaks rule settings.
-# See
-# http://lists.adiscon.net/pipermail/rsyslog/2015-August/041013.html
-# and
-# https://github.com/rsyslog/rsyslog/issues/489
-=dev-libs/liblognorm-1.1.2
-
# Lars Wendler <polynomial-c@gentoo.org> (20 Aug 2015)
# Masked for testing
=net-misc/iputils-20150815
@@ -638,21 +656,6 @@
# This is not for your production kit quite yet.
=net-misc/asterisk-12*
-# Michał Górny <mgorny@gentoo.org> (15 Dec 2013)
-# Masked for testing due to almost complete redesign. It is now
-# completely split and no longer has an integrated GUI. Currently,
-# the only working GUI is the PyQt4 GUI and it has license issues
-# (bug #494524).
->=games-emulation/mupen64plus-2
-games-emulation/mupen64plus-core
-games-emulation/mupen64plus-audio-sdl
-games-emulation/mupen64plus-input-sdl
-games-emulation/mupen64plus-rsp-hle
-games-emulation/mupen64plus-ui-console
-games-emulation/mupen64plus-video-glide64mk2
-games-emulation/mupen64plus-video-rice
-games-emulation/m64py
-
# Justin Lecher <jlec@gentoo.org> (14 Oct 2013)
# Seems to break all deps - API change?
>=sci-libs/metis-5
diff --git a/profiles/prefix/darwin/macos/10.11/eapi b/profiles/prefix/darwin/macos/10.11/eapi
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/10.11/make.defaults b/profiles/prefix/darwin/macos/10.11/make.defaults
new file mode 100644
index 0000000..033c307
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/make.defaults
@@ -0,0 +1,9 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MACOSX_DEPLOYMENT_TARGET="10.11"
+
+# sandbox is working with use of Mac OS X's seatbelt (since 10.5)
+# but it generates problems, #456234
+#FEATURES="sandbox"
diff --git a/profiles/prefix/darwin/macos/10.11/package.mask b/profiles/prefix/darwin/macos/10.11/package.mask
new file mode 100644
index 0000000..1164f69
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/package.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Fabian Groffen <grobian@gentoo.org> (30 Sep 2012)
+# Requires XQuartz, since Apple dropped much of X-support in 10.8
+# (a.k.a. Mountain Lion), bug #431182
+<=media-libs/opengl-apple-4.9999
diff --git a/profiles/prefix/darwin/macos/10.11/package.provided b/profiles/prefix/darwin/macos/10.11/package.provided
new file mode 100644
index 0000000..a27ff1e
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/package.provided
@@ -0,0 +1,5 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+sys-darwin/libsystem-71
diff --git a/profiles/prefix/darwin/macos/10.11/package.unmask b/profiles/prefix/darwin/macos/10.11/package.unmask
new file mode 100644
index 0000000..b20523d
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/package.unmask
@@ -0,0 +1,8 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
+# Recent releases are supported in >10.10.
+dev-java/oracle-jdk-bin
+dev-java/oracle-jre-bin
diff --git a/profiles/prefix/darwin/macos/10.11/package.use.mask b/profiles/prefix/darwin/macos/10.11/package.use.mask
new file mode 100644
index 0000000..24f749c
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/package.use.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Fabian Groffen <grobian@gentoo.org> (10 Apr 2011)
+# as long as util-linux installs uuid.h which breaks the system headers
+# (hence we don't) we can't do uuid support here
+x11-libs/libSM -uuid
diff --git a/profiles/prefix/darwin/macos/10.11/parent b/profiles/prefix/darwin/macos/10.11/parent
new file mode 100644
index 0000000..f3229c5
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/prefix/darwin/macos/10.11/profile.bashrc b/profiles/prefix/darwin/macos/10.11/profile.bashrc
new file mode 100644
index 0000000..012e122
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/profile.bashrc
@@ -0,0 +1,5 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+export MACOSX_DEPLOYMENT_TARGET=10.11
diff --git a/profiles/prefix/darwin/macos/10.11/x64/eapi b/profiles/prefix/darwin/macos/10.11/x64/eapi
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/10.11/x64/make.defaults b/profiles/prefix/darwin/macos/10.11/x64/make.defaults
new file mode 100644
index 0000000..bc12981
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/make.defaults
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+ARCH="x64-macos"
+CHOST="x86_64-apple-darwin15"
+ACCEPT_KEYWORDS="~x64-macos"
+
+USE="mmx mmxext sse sse2"
+CPU_FLAGS_X86="mmx mmxext sse sse2"
+# set arch to nocona for all MacTel users, as this enables SSE and MMX
+# support in GCC, nocona = Core2Duo = 64-bits
+CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.11/x64/package.mask b/profiles/prefix/darwin/macos/10.11/x64/package.mask
new file mode 100644
index 0000000..445a68b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/package.mask
@@ -0,0 +1,3 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
diff --git a/profiles/prefix/darwin/macos/10.11/x64/package.use.force b/profiles/prefix/darwin/macos/10.11/x64/package.use.force
new file mode 100644
index 0000000..05bc3b7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/package.use.force
@@ -0,0 +1,7 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
+# compiles with -aqua, doesn't work, though
+media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.11/x64/package.use.mask b/profiles/prefix/darwin/macos/10.11/x64/package.use.mask
new file mode 100644
index 0000000..4bccb5f
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/package.use.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+
diff --git a/profiles/prefix/darwin/macos/10.11/x64/parent b/profiles/prefix/darwin/macos/10.11/x64/parent
new file mode 100644
index 0000000..fc24616
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/parent
@@ -0,0 +1,2 @@
+../../arch/x64
+..
diff --git a/profiles/prefix/darwin/macos/10.11/x64/use.mask b/profiles/prefix/darwin/macos/10.11/x64/use.mask
new file mode 100644
index 0000000..f1549ec
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/use.mask
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# This file masks out USE flags that are simply NOT allowed in the default
+# x86 profile. This works, for example, if another architecture's
+# profile have a USE flag associated with (such as altivec, mmx, etc).
+
+# Unmask x86 instruction sets
+-icc
+-icc-pgo
+-ifc
+-mmx
+-mmxext
+-sse
+-sse2
+-ssse3
+-cpu_flags_x86_mmx
+-cpu_flags_x86_mmxext
+-cpu_flags_x86_sse
+-cpu_flags_x86_sse2
+-cpu_flags_x86_ssse3
+-svga
+-kqemu
+
+# Unmask nvidia XvMC support
+-nvidia
+
+# Unmask dev-db/oracle-instantclient-basic support
+-oci8-instant-client
+
+# Unmask osp, used by asterisk; bug 115798
+-osp
+
+# Modular X: unmask for architectures on which they are available
+-input_devices_synaptics
+-input_devices_vmmouse
+-input_devices_wacom
+-video_cards_nvidia
+-video_cards_fglrx
+-video_cards_vmware
+
+# Modular X: mask for architectures on which they aren't available
+video_cards_newport
+
+#codec support
+-x264
+
+# lvm2 cluster
+-gulm
+
+# ibm is only used for ppc64 stuff
+ibm
+
+# psyco works on x86
+-psyco
+
+# Adobe FDF toolkit is x86 only.
+-fdftk
diff --git a/profiles/prefix/darwin/macos/10.11/x86/eapi b/profiles/prefix/darwin/macos/10.11/x86/eapi
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/10.11/x86/make.defaults b/profiles/prefix/darwin/macos/10.11/x86/make.defaults
new file mode 100644
index 0000000..918b7eb
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/make.defaults
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+ARCH="x86-macos"
+CHOST="i686-apple-darwin15"
+ACCEPT_KEYWORDS="~x86-macos"
+
+USE="mmx mmxext sse sse2"
+CPU_FLAGS_X86="mmx mmxext sse sse2"
+# normally we set arch to prescott for all MacTel users, as this enables
+# SSE and MMX support in GCC
+CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.mask b/profiles/prefix/darwin/macos/10.11/x86/package.mask
new file mode 100644
index 0000000..d1b293c
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/package.mask
@@ -0,0 +1,10 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# The Carbon interface has been removed entirely in Lion, only tk-8.6
+# will come with Cocoa support. If you must have tk, you'll have to
+# force USE=-aqua, but don't report bugs for incompatabilities you might
+# encounter.
+# NOTE: keep this mask synced with arch/x64
+<dev-lang/tk-8.6
diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.use.force b/profiles/prefix/darwin/macos/10.11/x86/package.use.force
new file mode 100644
index 0000000..05bc3b7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/package.use.force
@@ -0,0 +1,7 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
+# compiles with -aqua, doesn't work, though
+media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.use.mask b/profiles/prefix/darwin/macos/10.11/x86/package.use.mask
new file mode 100644
index 0000000..4bccb5f
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/package.use.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+
diff --git a/profiles/prefix/darwin/macos/10.11/x86/parent b/profiles/prefix/darwin/macos/10.11/x86/parent
new file mode 100644
index 0000000..4a6aa36
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/parent
@@ -0,0 +1,2 @@
+../../arch/x86
+..
diff --git a/profiles/prefix/darwin/macos/10.11/x86/use.mask b/profiles/prefix/darwin/macos/10.11/x86/use.mask
new file mode 100644
index 0000000..f1549ec
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/use.mask
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# This file masks out USE flags that are simply NOT allowed in the default
+# x86 profile. This works, for example, if another architecture's
+# profile have a USE flag associated with (such as altivec, mmx, etc).
+
+# Unmask x86 instruction sets
+-icc
+-icc-pgo
+-ifc
+-mmx
+-mmxext
+-sse
+-sse2
+-ssse3
+-cpu_flags_x86_mmx
+-cpu_flags_x86_mmxext
+-cpu_flags_x86_sse
+-cpu_flags_x86_sse2
+-cpu_flags_x86_ssse3
+-svga
+-kqemu
+
+# Unmask nvidia XvMC support
+-nvidia
+
+# Unmask dev-db/oracle-instantclient-basic support
+-oci8-instant-client
+
+# Unmask osp, used by asterisk; bug 115798
+-osp
+
+# Modular X: unmask for architectures on which they are available
+-input_devices_synaptics
+-input_devices_vmmouse
+-input_devices_wacom
+-video_cards_nvidia
+-video_cards_fglrx
+-video_cards_vmware
+
+# Modular X: mask for architectures on which they aren't available
+video_cards_newport
+
+#codec support
+-x264
+
+# lvm2 cluster
+-gulm
+
+# ibm is only used for ppc64 stuff
+ibm
+
+# psyco works on x86
+-psyco
+
+# Adobe FDF toolkit is x86 only.
+-fdftk
diff --git a/profiles/updates/4Q-2015 b/profiles/updates/4Q-2015
new file mode 100644
index 0000000..9cf9e9d
--- /dev/null
+++ b/profiles/updates/4Q-2015
@@ -0,0 +1,5 @@
+slotmove =dev-ruby/mysql2-0.4* 0.3 0.4
+move sys-apps/cv sys-apps/progress
+slotmove =dev-ruby/recog-2.0.6 2 2.0.6
+slotmove =dev-ruby/recog-2.0.12 2 2.0.12
+slotmove =dev-ruby/recog-2.0.14 2 2.0.14
diff --git a/profiles/use.desc b/profiles/use.desc
index 47a977a..26abfe9 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -24,6 +24,7 @@
aqua - Include support for the Mac OS X Aqua (Carbon/Cocoa) GUI
atm - Enable Asynchronous Transfer Mode protocol support
audiofile - Add support for libaudiofile where applicable
+audit - Enable support for Linux audit subsystem using sys-process/audit
avahi - Add avahi/Zeroconf support
ayatana - Build in support for Ayatana notification using the libindicate or libappindicator plugin
bash-completion - Enable bash-completion support
diff --git a/ros-meta/audio_common/Manifest b/ros-meta/audio_common/Manifest
index aec3da0..3a2fcd2 100644
--- a/ros-meta/audio_common/Manifest
+++ b/ros-meta/audio_common/Manifest
@@ -1 +1,2 @@
DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
+DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
diff --git a/ros-meta/audio_common/audio_common-0.2.8.ebuild b/ros-meta/audio_common/audio_common-0.2.8.ebuild
new file mode 100644
index 0000000..618c77e
--- /dev/null
+++ b/ros-meta/audio_common/audio_common-0.2.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common code for working with audio in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/audio_capture
+ dev-ros/audio_common_msgs
+ dev-ros/audio_play
+ dev-ros/sound_play
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/calibration/Manifest b/ros-meta/calibration/Manifest
new file mode 100644
index 0000000..3890704
--- /dev/null
+++ b/ros-meta/calibration/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/ros-meta/calibration/calibration-0.10.13.ebuild b/ros-meta/calibration/calibration-0.10.13.ebuild
new file mode 100644
index 0000000..f74bee3
--- /dev/null
+++ b/ros-meta/calibration/calibration-0.10.13.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Provides a toolchain running through the robot calibration process"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/calibration_estimation
+ dev-ros/calibration_launch
+ dev-ros/calibration_msgs
+ dev-ros/calibration_setup_helper
+ dev-ros/image_cb_detector
+ dev-ros/interval_intersection
+ dev-ros/joint_states_settler
+ dev-ros/laser_cb_detector
+ dev-ros/monocam_settler
+ dev-ros/settlerlib
+"
+DEPEND=""
diff --git a/ros-meta/calibration/calibration-9999.ebuild b/ros-meta/calibration/calibration-9999.ebuild
new file mode 100644
index 0000000..f74bee3
--- /dev/null
+++ b/ros-meta/calibration/calibration-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Provides a toolchain running through the robot calibration process"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/calibration_estimation
+ dev-ros/calibration_launch
+ dev-ros/calibration_msgs
+ dev-ros/calibration_setup_helper
+ dev-ros/image_cb_detector
+ dev-ros/interval_intersection
+ dev-ros/joint_states_settler
+ dev-ros/laser_cb_detector
+ dev-ros/monocam_settler
+ dev-ros/settlerlib
+"
+DEPEND=""
diff --git a/ros-meta/calibration/metadata.xml b/ros-meta/calibration/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/ros-meta/calibration/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/ros-meta/geometry_tutorials/Manifest b/ros-meta/geometry_tutorials/Manifest
new file mode 100644
index 0000000..9605317
--- /dev/null
+++ b/ros-meta/geometry_tutorials/Manifest
@@ -0,0 +1 @@
+DIST geometry_tutorials-0.2.2.tar.gz 15148 SHA256 4b3fdc98bf4cb97ba2f1c40666901fa7d08eb3dfed0d3323de4841de2e3a22cc SHA512 5a6fe2e26d11d3fe8c1fc6979d1d76b13b01df23ef1f0d5e5df094aa0441e1ded33d2402b88be1143a88002ecde2a6bddc3b03efca713bd5521c68de2e054548 WHIRLPOOL b9ce88950911e87d008a19de08fb829e59f0c6e81711859125b3bf377fff907e6054d2229d8dd13c39baf395c3da3d749fcf62144c88caf9eab0d7d76026e518
diff --git a/ros-meta/geometry_tutorials/geometry_tutorials-0.2.2.ebuild b/ros-meta/geometry_tutorials/geometry_tutorials-0.2.2.ebuild
new file mode 100644
index 0000000..f9d0fbb
--- /dev/null
+++ b/ros-meta/geometry_tutorials/geometry_tutorials-0.2.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage of geometry tutorials ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/turtle_tf
+ dev-ros/turtle_tf2
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/geometry_tutorials/geometry_tutorials-9999.ebuild b/ros-meta/geometry_tutorials/geometry_tutorials-9999.ebuild
new file mode 100644
index 0000000..f9d0fbb
--- /dev/null
+++ b/ros-meta/geometry_tutorials/geometry_tutorials-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage of geometry tutorials ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/turtle_tf
+ dev-ros/turtle_tf2
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/geometry_tutorials/metadata.xml b/ros-meta/geometry_tutorials/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/ros-meta/geometry_tutorials/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/ros-meta/imu_pipeline/Manifest b/ros-meta/imu_pipeline/Manifest
new file mode 100644
index 0000000..dc8ff72
--- /dev/null
+++ b/ros-meta/imu_pipeline/Manifest
@@ -0,0 +1 @@
+DIST imu_pipeline-0.2.1.tar.gz 7962 SHA256 91e0d491bd08dce8629876bf6005a1aaabcb130413ed749c4ab168e17f0118fa SHA512 43c990e3b5a813661111f15bbaf6101794480de0f5bd9af663ce48ebbcf75ee79fa388cf228216427e7ffcbc575a317f3b0ee3ae5b8e6cca2cc0cab736c139e4 WHIRLPOOL 189279d535c11add08df686ca84598f4e1c5a6a9835416b4f10bef2a85c192359da1795d52171d083d19cfee7e43ef011a676304046893d7f75d4a33a72c204c
diff --git a/ros-meta/imu_pipeline/imu_pipeline-0.2.1.ebuild b/ros-meta/imu_pipeline/imu_pipeline-0.2.1.ebuild
new file mode 100644
index 0000000..b20cc3d
--- /dev/null
+++ b/ros-meta/imu_pipeline/imu_pipeline-0.2.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for processing and pre-processing IMU messages for easier use by later subscribers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/imu_processors
+ dev-ros/imu_transformer
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/imu_pipeline/imu_pipeline-9999.ebuild b/ros-meta/imu_pipeline/imu_pipeline-9999.ebuild
new file mode 100644
index 0000000..b20cc3d
--- /dev/null
+++ b/ros-meta/imu_pipeline/imu_pipeline-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for processing and pre-processing IMU messages for easier use by later subscribers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/imu_processors
+ dev-ros/imu_transformer
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/imu_pipeline/metadata.xml b/ros-meta/imu_pipeline/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/ros-meta/imu_pipeline/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/ros-meta/rosbridge_suite/Manifest b/ros-meta/rosbridge_suite/Manifest
new file mode 100644
index 0000000..901d1ec
--- /dev/null
+++ b/ros-meta/rosbridge_suite/Manifest
@@ -0,0 +1 @@
+DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
diff --git a/ros-meta/rosbridge_suite/metadata.xml b/ros-meta/rosbridge_suite/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/ros-meta/rosbridge_suite/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/ros-meta/rosbridge_suite/rosbridge_suite-0.7.13.ebuild b/ros-meta/rosbridge_suite/rosbridge_suite-0.7.13.ebuild
new file mode 100644
index 0000000..90f4cce
--- /dev/null
+++ b/ros-meta/rosbridge_suite/rosbridge_suite-0.7.13.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="JSON API to ROS functionality for non-ROS programs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosapi
+ dev-ros/rosbridge_library
+ dev-ros/rosbridge_server
+ "
+DEPEND=""
diff --git a/ros-meta/rosbridge_suite/rosbridge_suite-9999.ebuild b/ros-meta/rosbridge_suite/rosbridge_suite-9999.ebuild
new file mode 100644
index 0000000..90f4cce
--- /dev/null
+++ b/ros-meta/rosbridge_suite/rosbridge_suite-9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="JSON API to ROS functionality for non-ROS programs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosapi
+ dev-ros/rosbridge_library
+ dev-ros/rosbridge_server
+ "
+DEPEND=""
diff --git a/ros-meta/rosserial/Manifest b/ros-meta/rosserial/Manifest
new file mode 100644
index 0000000..2af1683
--- /dev/null
+++ b/ros-meta/rosserial/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/ros-meta/rosserial/metadata.xml b/ros-meta/rosserial/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/ros-meta/rosserial/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/ros-meta/rosserial/rosserial-0.7.1.ebuild b/ros-meta/rosserial/rosserial-0.7.1.ebuild
new file mode 100644
index 0000000..82cbc9b
--- /dev/null
+++ b/ros-meta/rosserial/rosserial-0.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage for core of rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosserial_arduino
+ dev-ros/rosserial_client
+ dev-ros/rosserial_embeddedlinux
+ dev-ros/rosserial_msgs
+ dev-ros/rosserial_python
+ dev-ros/rosserial_server
+ dev-ros/rosserial_windows
+ dev-ros/rosserial_xbee
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/rosserial/rosserial-9999.ebuild b/ros-meta/rosserial/rosserial-9999.ebuild
new file mode 100644
index 0000000..82cbc9b
--- /dev/null
+++ b/ros-meta/rosserial/rosserial-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage for core of rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosserial_arduino
+ dev-ros/rosserial_client
+ dev-ros/rosserial_embeddedlinux
+ dev-ros/rosserial_msgs
+ dev-ros/rosserial_python
+ dev-ros/rosserial_server
+ dev-ros/rosserial_windows
+ dev-ros/rosserial_xbee
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-biology/phylip/phylip-3.69-r1.ebuild b/sci-biology/phylip/phylip-3.69-r1.ebuild
index ecc4420..6068d8b 100644
--- a/sci-biology/phylip/phylip-3.69-r1.ebuild
+++ b/sci-biology/phylip/phylip-3.69-r1.ebuild
@@ -36,7 +36,7 @@
}
src_install() {
- cd "${WORKDIR}/${P}" || die
+ cd "${WORKDIR}/${P}" || die
mv exe/font* fonts || die "Font move failed."
mv exe/factor exe/factor-${PN} || die "Renaming factor failed."
diff --git a/sci-biology/phylip/phylip-3.696.ebuild b/sci-biology/phylip/phylip-3.696.ebuild
index d5960bb..cf6fe40 100644
--- a/sci-biology/phylip/phylip-3.696.ebuild
+++ b/sci-biology/phylip/phylip-3.696.ebuild
@@ -38,7 +38,7 @@
}
src_install() {
- cd "${WORKDIR}/${P}" || die
+ cd "${WORKDIR}/${P}" || die
mv exe/font* fonts || die "Font move failed."
mv exe/factor exe/factor-${PN} || die "Renaming factor failed."
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index e5365a6..d4145e0 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,3 +1,3 @@
DIST units-2.11.tar.gz 861772 SHA256 53b6daf2a03d9a060449944b0a6c1aca0d18a84d1d9a93098e4a8920181f5abe SHA512 83e062a0daf9541454cdcaa4efe03bf9f03afdcfdbe2013d5e913a53e1b5e37ef846a3129185898ad2d25e3ea632533f8eb8d89681c855b19a3998aca6e733ce WHIRLPOOL 4c405e0a81af2b02d05156225c26573631ddb02d323d160b0850fcfda52b4a84a36f3ddbfdc732aa8a9dc06c8fc59a41141f985d6025ea6cb18b87749b78d500
-DIST units-2.11a.tar.gz 865120 SHA256 cdc1ef5adf0701f9bf0f9e3c890cd832554e5bf3f078dab852e5a6783e525b8b SHA512 d942194b73a4d920d711bdcf07481aefff8fc1403f47ca73c1c0fd9837cb7c385a45f326d9537ba1aa77283c4f812be346a1b5ac15ca1e508c268857cc9d78db WHIRLPOOL 72efc473f9105796bdbdc92e2e355a0a2c8ede0ae5febbc017a112b6524e6ad9081a581cc22666ed4e7e74a87bf1b8d45e3a262df53358cbe32107edbe4b6230
DIST units-2.11d.tar.gz 868580 SHA256 f1ba31658de19fa4ab3ecf791a08c590dc4f6dd5903c771bb9d678ba68ac785b SHA512 6e0dac8ae8830d0ab914e6e367f9473ac8c860cde9d189d05a8ade047037d21884a66e07733e8decc4d95325dcfb5a7110e4552b4b47c72b746cdc248354c1e5 WHIRLPOOL a54a33f50a0976d180e889485600de5354c94302dbe4b83aaff732efe9d473a07295d447b6d1df9fef766c35cb9571c947c4f12a23f8c21f8665ddb365078914
+DIST units-2.11f.tar.gz 874405 SHA256 ec01319a468f6f34bc65e312fa706e3a88ac1a34f7ddee24b4b751b810e95ea3 SHA512 25dc834d60845c835fbf9392d44c80fbc14c92cfa1dfbb0dd40fe3c21404aab4859d98be718a13fcf3a1857b8c1fe58c71691c4ff2bb309185a2f15e19497a17 WHIRLPOOL b718a8dae4111e9f89cc557f2544c069dfde212338146a8ccdca9c3b0ab0c5f6f91b4febfabdac0ff42bd5cc8d0788dca946656368820188557c6f47d63502b0
diff --git a/sci-calculators/units/units-2.11a.ebuild b/sci-calculators/units/units-2.11a.ebuild
deleted file mode 100644
index f22adad..0000000
--- a/sci-calculators/units/units-2.11a.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-inherit eutils python-r1
-
-DESCRIPTION="Unit conversion program"
-HOMEPAGE="https://www.gnu.org/software/units/units.html"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+units_cur"
-
-DEPEND="
- >=sys-libs/readline-4.1-r2
- units_cur? (
- dev-lang/python-exec:2
- )
-"
-RDEPEND="
- ${DEPEND}
- units_cur? (
- dev-python/unidecode[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )
-"
-
-DOCS=( ChangeLog NEWS README )
-
-units_cur_prepare() {
- local UNITS_PYTHON_MAJOR
- UNITS_PYTHON_MAJOR=$(
- UNITS_PYTHON_MAJOR=${EPYTHON/.*}
- shopt -s extglob
- echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])}
- )
- sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON}
-}
-
-src_prepare() {
- use units_cur && python_foreach_impl units_cur_prepare
-}
-
-src_compile() {
- emake HAVE_PYTHON=no
-}
-
-units_cur_install() {
- python_newexe units_cur-${EPYTHON} units_cur
-}
-
-src_install() {
- emake DESTDIR="${D}" HAVE_PYTHON=no install
-
- use units_cur && python_foreach_impl units_cur_install
-}
diff --git a/sci-calculators/units/units-2.11f.ebuild b/sci-calculators/units/units-2.11f.ebuild
new file mode 100644
index 0000000..b08c085
--- /dev/null
+++ b/sci-calculators/units/units-2.11f.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="xml"
+inherit eutils python-r1
+
+DESCRIPTION="Unit conversion program"
+HOMEPAGE="https://www.gnu.org/software/units/units.html"
+SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+units_cur"
+
+DEPEND="
+ >=sys-libs/readline-4.1-r2
+ units_cur? (
+ dev-lang/python-exec:2
+ )
+"
+RDEPEND="
+ ${DEPEND}
+ units_cur? (
+ dev-python/unidecode[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ )
+"
+
+units_cur_prepare() {
+ local UNITS_PYTHON_MAJOR
+ UNITS_PYTHON_MAJOR=$(
+ UNITS_PYTHON_MAJOR=${EPYTHON/.*}
+ shopt -s extglob
+ echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])}
+ )
+ sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON}
+}
+
+src_prepare() {
+ use units_cur && python_foreach_impl units_cur_prepare
+}
+
+src_compile() {
+ emake HAVE_PYTHON=no
+}
+
+units_cur_install() {
+ python_newexe units_cur-${EPYTHON} units_cur
+}
+
+src_install() {
+ emake DESTDIR="${D}" HAVE_PYTHON=no install
+
+ dodoc ChangeLog NEWS README
+
+ use units_cur && python_foreach_impl units_cur_install
+}
diff --git a/sci-chemistry/coot/coot-0.8.2-r1.ebuild b/sci-chemistry/coot/coot-0.8.2-r1.ebuild
index 2663fba..0f95e67 100644
--- a/sci-chemistry/coot/coot-0.8.2-r1.ebuild
+++ b/sci-chemistry/coot/coot-0.8.2-r1.ebuild
@@ -134,7 +134,7 @@
src_test() {
source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh"
- mkdir "${T}"/coot_test || die
+ mkdir "${T}"/coot_test || die
export COOT_STANDARD_RESIDUES="${S}/standard-residues.pdb"
export COOT_SCHEME_DIR="${S}/scheme/"
diff --git a/sci-chemistry/platon/Manifest b/sci-chemistry/platon/Manifest
index 8b5d3da..c144751 100644
--- a/sci-chemistry/platon/Manifest
+++ b/sci-chemistry/platon/Manifest
@@ -1 +1 @@
-DIST platon-20150921.tar.gz 12019784 SHA256 a667ce5ae4c60edc12776f0da9f8c481bee451d1c78b4a9edc2bd2df18ee7612 SHA512 59786d3978c11167f5f12f8f487e6e478d0bc1f070a443ca4626d830e4014122ad974d6e1e1debc2c6c6bbc37d82b7b6b6bb89ad0c74fbd061af26a639db9448 WHIRLPOOL e42d651310da8ae4108b1ec8dfaa3d556236e55889fa153fdfd90d7abbe33b70931fe78a559b0e86afc5d07cc8eb47356d91e9bf0d90a168238d8ce14875c52c
+DIST platon-20151001.tar.gz 12076455 SHA256 0f693de9b8ef601bc502d56a203c851ee350185e0816ede4b1b4d154917fa5b2 SHA512 fc93e4c425c25ddc9ae634c82b63e95c5ce99bcbada43976478a58783e3b369f082e08e2ee24ff7d9ebe2d9d2d730cd42f6361276a53bed9edd0c0476cfb5148 WHIRLPOOL 458e6a263958473bf39d460524fb98963e701d96050db5c622a6cb934796271bb45313526614b3bd28ce372e7bd6a60d76cb6aaa8e80d1e18d7fdc436a03b702
diff --git a/sci-chemistry/platon/platon-20150921.ebuild b/sci-chemistry/platon/platon-20150921.ebuild
deleted file mode 100644
index 70f0828..0000000
--- a/sci-chemistry/platon/platon-20150921.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils fortran-2 flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Versatile, SHELX-97 compatible, multipurpose crystallographic tool"
-HOMEPAGE="http://www.cryst.chem.uu.nl/platon/"
-SRC_URI="http://www.cryst.chem.uu.nl/xraysoft/unix/${PN}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-# Can't do libf2c dependent on whether <gcc-4 is selected for the build,
-# so we must always require it
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${PN}"
-
-pkg_nofetch() {
- elog "If there is a digest mismatch, please file a bug"
- elog "at https://bugs.gentoo.org/ -- a version bump"
- elog "is probably required."
-}
-
-src_unpack() {
- default
- cd "${S}" || die
- gunzip platon.f.gz xdrvr.c.gz || die
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PV}-buffer-overflow.patch
-}
-
-src_compile() {
- # easy to ICE, at least on gcc 4.3
- strip-flags
-
- COMMAND="$(tc-getCC) -c ${CFLAGS} xdrvr.c"
- echo ${COMMAND}
- ${COMMAND} || die "Compilation of xdrvr.c failed"
- COMMAND="$(tc-getFC) -c ${FFLAGS:- -O2} -fno-second-underscore platon.f"
- echo ${COMMAND}
- ${COMMAND} || die "Compilation of platon.f failed"
- COMMAND="$(tc-getFC) -o platon ${LDFLAGS} platon.o xdrvr.o -lX11 ${F2C}"
- echo ${COMMAND}
- ${COMMAND} || die "Linking failed"
-}
-
-src_install() {
- dobin platon
-
- for bin in pluton s cifchk helena stidy; do
- dosym platon /usr/bin/${bin}
- done
-
- insinto /usr/$(get_libdir)/platon
- doins check.def
-
- echo "CHECKDEF=\"${EPREFIX}/usr/$(get_libdir)/platon/check.def\"" > "${T}"/env.d
- newenvd "${T}"/env.d 50platon
-
- dodoc README.*
-
- if use examples; then
- insinto /usr/share/${PN}
- doins -r TEST
- fi
-}
diff --git a/sci-chemistry/platon/platon-20151001.ebuild b/sci-chemistry/platon/platon-20151001.ebuild
new file mode 100644
index 0000000..f4b0aae
--- /dev/null
+++ b/sci-chemistry/platon/platon-20151001.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fortran-2 flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Versatile, SHELX-97 compatible, multipurpose crystallographic tool"
+HOMEPAGE="http://www.cryst.chem.uu.nl/platon/"
+SRC_URI="http://www.cryst.chem.uu.nl/xraysoft/unix/${PN}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+# Can't do libf2c dependent on whether <gcc-4 is selected for the build,
+# so we must always require it
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/${PN}"
+
+pkg_nofetch() {
+ elog "If there is a digest mismatch, please file a bug"
+ elog "at https://bugs.gentoo.org/ -- a version bump"
+ elog "is probably required."
+}
+
+src_unpack() {
+ default
+ cd "${S}" || die
+ gunzip platon.f.gz xdrvr.c.gz || die
+}
+
+src_compile() {
+ # easy to ICE, at least on gcc 4.3
+ strip-flags
+
+ COMMAND="$(tc-getCC) -c ${CFLAGS} xdrvr.c"
+ echo ${COMMAND}
+ ${COMMAND} || die "Compilation of xdrvr.c failed"
+ COMMAND="$(tc-getFC) -c ${FFLAGS:- -O2} -fno-second-underscore platon.f"
+ echo ${COMMAND}
+ ${COMMAND} || die "Compilation of platon.f failed"
+ COMMAND="$(tc-getFC) -o platon ${LDFLAGS} platon.o xdrvr.o -lX11 ${F2C}"
+ echo ${COMMAND}
+ ${COMMAND} || die "Linking failed"
+}
+
+src_install() {
+ dobin platon
+
+ for bin in pluton s cifchk helena stidy; do
+ dosym platon /usr/bin/${bin}
+ done
+
+ insinto /usr/$(get_libdir)/platon
+ doins check.def
+
+ echo "CHECKDEF=\"${EPREFIX}/usr/$(get_libdir)/platon/check.def\"" > "${T}"/env.d
+ newenvd "${T}"/env.d 50platon
+
+ dodoc README.*
+
+ if use examples; then
+ insinto /usr/share/${PN}
+ doins -r TEST
+ fi
+}
diff --git a/sci-chemistry/prody/Manifest b/sci-chemistry/prody/Manifest
new file mode 100644
index 0000000..df88491
--- /dev/null
+++ b/sci-chemistry/prody/Manifest
@@ -0,0 +1 @@
+DIST prody-1.6.tar.gz 5333629 SHA256 db5f2223005640e64b5bfd5ef147744381b9b170ced61db7bc8f3a0fdb583c86 SHA512 d913ad45b034f1b0e7e36428a6f8f199b365b94bd85bee5ade8eb9eb2b04a18c93d894a2abd18b3a1342597725ffbf96f8ce8a49191fc27e5608f3d2c9a3c49a WHIRLPOOL a6435d88046970cca53290b258017d09b19457c4bbd5530743a3dc9cbc023ee78a28a4df81b190a5499df114d9909afff0697e571ef5bc4726311f4ea287c4be
diff --git a/sci-chemistry/prody/metadata.xml b/sci-chemistry/prody/metadata.xml
new file mode 100644
index 0000000..ae9ec7c
--- /dev/null
+++ b/sci-chemistry/prody/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-chemistry</herd>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-chemistry/prody/prody-1.6.ebuild b/sci-chemistry/prody/prody-1.6.ebuild
new file mode 100644
index 0000000..a2ece4d
--- /dev/null
+++ b/sci-chemistry/prody/prody-1.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Protein Dynamics Analysis"
+HOMEPAGE="http://prody.csb.pitt.edu/ https://github.com/prody/ProDy"
+SRC_URI="https://github.com/prody/ProDy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+ dev-python/ipython[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ sci-biology/biopython[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}"/ProDy-${PV}
+
+DISTUTILS_IN_SOURCE_BUILD=true
+
+python_prepare_all() {
+ emake remove
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ cd "${BUILD_DIR}" || die
+ PATH="${S}"/scripts:${PATH} \
+ nosetests --verbose || die
+}
diff --git a/sci-chemistry/pymol-plugins-dynamics/Manifest b/sci-chemistry/pymol-plugins-dynamics/Manifest
index a607e37..258493d 100644
--- a/sci-chemistry/pymol-plugins-dynamics/Manifest
+++ b/sci-chemistry/pymol-plugins-dynamics/Manifest
@@ -1 +1,2 @@
DIST pymol-plugins-dynamics-1.2.0.tar.gz 725163 SHA256 edf9bddbbce41ee5319bfd0b28d6e0b0eba56e8b2d8a300d510be8ff5894704f SHA512 7e8d62ea58cb88348136fccd132d9a1faaa3474c0a0f821e729ced777620e2083b1b0606d79fc75802755c96c5eb0b90e08b00e5c865ecbaaee2b837f56987de WHIRLPOOL 07061d3b0840fef0025be55b90fca013afc1ea58308d6ee11a8b74321de4f1c24760b1cf141b0a86678c5cf652c8890cdf2c4e0da60403c8454e04b003e20aaa
+DIST pymol-plugins-dynamics-2.0.4.tar.gz 821563 SHA256 358452e0d8589ffae28fe486eeca0be353f17f1fdde9f05f548025b241afabe5 SHA512 befad8b5c09ddba89b9e00bd712a2af7202e312b2ebee7722cbeec5698125dd7614463465d79c17c805714ba23ca1188c64610789e90c93bb0ad7572841ebf25 WHIRLPOOL 039e40c7c57a242476e72a351ecc099201021f479762c2eb29bdad25b72c11c33295e8f9707ece486235efb1b205524e479cd4ae57639d1410515a75d2221989
diff --git a/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.4.ebuild b/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.4.ebuild
new file mode 100644
index 0000000..1111c61
--- /dev/null
+++ b/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+MY_PN="Dynamics"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Molecular dynamics in Pymol"
+HOMEPAGE="https://github.com/tomaszmakarewicz/Dynamics"
+SRC_URI="https://github.com/tomaszmakarewicz/Dynamics/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ sci-chemistry/prody[${PYTHON_USEDEP}]
+ "
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS=( manual.odt )
+
+src_install() {
+ python_moduleinto pmg_tk/startup
+ python_parallel_foreach_impl python_domodule pymol_plugin_dynamics.py
+}
diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 789564f..42f7f7f 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,5 +1,2 @@
-DIST relax-3.3.4.src.tar.bz2 89206485 SHA256 03ecc20353126d155c7d5c9ab45e3bb146a87243472711c937befced2db333c0 SHA512 78ae5778ef0fe84fc3a26648dd2192d529fb1e5241728f7c06a5a2cec2ce849a2c75c19a931123a17d5c210acc4f4c2401574b10a1fbbe0307d2d9867567352d WHIRLPOOL 4fcdec36e8df412091ab1a99a6b017ebc72f8e5c400429e698221f22e4ef7ae35713a6e2a05f6f1b573e5223f8eccc7cb0d2a20b1171e5bc483fd3ef1a0242bc
-DIST relax-3.3.5.src.tar.bz2 90164368 SHA256 d9e3668221dba7589ba1d12ab40df517b5b6f742ee413864cc87ab636546e2ef SHA512 c8c248abf0edb54af631c11b102b641d41a106036bbdb88d8f1563c9750d3c7d402ee150d7afd770b845d3a421e431afcf95e6222197f9dc1afec61ddcd0bf37 WHIRLPOOL d9070bed833ef063c22fec5e55b1968c65b672ee100247b1af9a25d3149eb57475aeb94a4f125fc3cd278d97ac248e7826b083c840b47f9db83bae7e1aaae710
-DIST relax-3.3.6.src.tar.bz2 90005292 SHA256 2b1994626a910036c63d67c609c49b3bde8c754b60763de62c2ac8f6c3f589c3 SHA512 cda773a4af259d25550e4e4dbd8500594afd9df051ba06130355058347f308b804726acafaa76957e062c78d1d8fb26f843b3ac97d5aecd534b53c1a5155cafb WHIRLPOOL 0bf0f51664a132653fbd981ee6776cb16dd6371504df2167658027325d632cda8a6f4a21d4a530c46dc75c93b3ffb87f5189d4986acadb344154cd7420361e0b
-DIST relax-3.3.7.src.tar.bz2 90268061 SHA256 a32508bd55fa124f6472e08d89ec0fa9f3837efcceb2be681404eb998457381f SHA512 3724a51ef9177f9bd78b3c92add7b88d559f21f5166eaf62b865586c061d17ce0a1af61a794db324d0f792eece04d8f1d037f9e982c858768da1d3fc208e9270 WHIRLPOOL e4446c7ccbe1e8f3caa450a3d747fb8dfcc33d9d336386572b72481544101199150e7938b0e5319a70ef3a5a7f4ad53c143d4a6c01cc7553f435fbc0d00fe952
DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9 WHIRLPOOL 1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
+DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461 WHIRLPOOL 4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
diff --git a/sci-chemistry/relax/relax-3.3.4.ebuild b/sci-chemistry/relax/relax-3.3.4.ebuild
deleted file mode 100644
index e394217..0000000
--- a/sci-chemistry/relax/relax-3.3.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/"
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-python/Numdifftools[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
- sci-chemistry/molmol
- sci-chemistry/pymol[${PYTHON_USEDEP}]
- sci-chemistry/vmd
- >=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
- >=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- sci-visualization/grace
- sci-visualization/opendx
- x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
- media-gfx/pngcrush"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- rm -rf minfx bmrblib extern/numdifftools || die
- tc-export CC
-}
-
-src_compile() {
- escons
-}
-
-src_test() {
- VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
- virtualmake
-}
-
-src_install() {
- dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
- python_moduleinto ${PN}
- python_domodule *
-
- rm ${PN} README || die
-
- make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
-}
diff --git a/sci-chemistry/relax/relax-3.3.5.ebuild b/sci-chemistry/relax/relax-3.3.5.ebuild
deleted file mode 100644
index 154bc9a..0000000
--- a/sci-chemistry/relax/relax-3.3.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/"
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-python/Numdifftools[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
- sci-chemistry/molmol
- sci-chemistry/pymol[${PYTHON_USEDEP}]
- sci-chemistry/vmd
- >=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
- >=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- sci-visualization/grace
- sci-visualization/opendx
- x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
- media-gfx/pngcrush"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- rm -rf minfx bmrblib extern/numdifftools || die
- tc-export CC
-}
-
-src_compile() {
- escons
-}
-
-src_test() {
- VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
- virtualmake
-}
-
-src_install() {
- dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
- python_moduleinto ${PN}
- python_domodule *
-
- rm ${PN} README || die
-
- make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
-}
diff --git a/sci-chemistry/relax/relax-3.3.6.ebuild b/sci-chemistry/relax/relax-3.3.6.ebuild
deleted file mode 100644
index b8a571c..0000000
--- a/sci-chemistry/relax/relax-3.3.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/"
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-python/Numdifftools[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
- sci-chemistry/molmol
- sci-chemistry/pymol[${PYTHON_USEDEP}]
- sci-chemistry/vmd
- >=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
- >=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- sci-visualization/grace
- sci-visualization/opendx
- x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
- media-gfx/pngcrush
- test? (
- ${RDEPEND}
- )
- "
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- rm -rf minfx bmrblib extern/numdifftools || die
- tc-export CC
-}
-
-src_compile() {
- escons
-}
-
-src_test() {
- VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
- virtualmake
-}
-
-src_install() {
- dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
- python_moduleinto ${PN}
- python_domodule *
-
- rm ${PN} README || die
-
- make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
-}
diff --git a/sci-chemistry/relax/relax-3.3.7.ebuild b/sci-chemistry/relax/relax-3.3.7.ebuild
deleted file mode 100644
index b8a571c..0000000
--- a/sci-chemistry/relax/relax-3.3.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/"
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-python/Numdifftools[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
- sci-chemistry/molmol
- sci-chemistry/pymol[${PYTHON_USEDEP}]
- sci-chemistry/vmd
- >=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
- >=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- sci-visualization/grace
- sci-visualization/opendx
- x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
- media-gfx/pngcrush
- test? (
- ${RDEPEND}
- )
- "
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- rm -rf minfx bmrblib extern/numdifftools || die
- tc-export CC
-}
-
-src_compile() {
- escons
-}
-
-src_test() {
- VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
- virtualmake
-}
-
-src_install() {
- dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
- python_moduleinto ${PN}
- python_domodule *
-
- rm ${PN} README || die
-
- make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
-}
diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild b/sci-chemistry/relax/relax-3.3.9.ebuild
new file mode 100644
index 0000000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-3.3.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/"
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-python/Numdifftools[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
+ sci-chemistry/molmol
+ sci-chemistry/pymol[${PYTHON_USEDEP}]
+ sci-chemistry/vmd
+ >=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
+ >=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ sci-visualization/grace
+ sci-visualization/opendx
+ x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+ media-gfx/pngcrush
+ test? ( ${RDEPEND} )
+ "
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ rm -rf minfx bmrblib extern/numdifftools || die
+ tc-export CC
+}
+
+src_compile() {
+ escons
+}
+
+src_test() {
+ VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+ virtualmake
+}
+
+src_install() {
+ dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+ python_moduleinto ${PN}
+ python_domodule *
+
+ rm ${PN} README || die
+
+ make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
+}
diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
index 20e837e..185282d 100644
--- a/sci-electronics/xoscope/Manifest
+++ b/sci-electronics/xoscope/Manifest
@@ -1 +1,2 @@
DIST xoscope-2.0.tgz 334875 SHA256 a8a3027971dd1bd902861ea8f099ea003a19b6e86f87ae97a4811aeef1deb403 SHA512 8a7506dd40133c1bfaf101102f84a5d81712b4cc28d75002f14d5c5b2e08162813dfb68a3e15e1056545d225d563c66ac8a5a81deede3c93a5bb943b81c8fc70 WHIRLPOOL 4afd660cb05a9a70ce49a5553c4f08d5877f32a85adcf86ada1014d7d90c358817cdb6da7f4b2d08edfb406375848434f679ea976c15ad16bf3ca2b8691a944c
+DIST xoscope-2.1.tar.gz 302170 SHA256 ff14532ced6ac140064093e7aafaf6a032a50eb09f6b3608c45f81d00dc836ac SHA512 2ecc75d04d36634d83b7c6636dc7e45fb068ae37e0ee1b0e97c65f9cd56f7fe0e511828821fa0ca2cfe4c6cd6a05e8d23275ec96253dc6faec91db4cbdecd13d WHIRLPOOL e8dc3e9b56e776431d3d4f6dc30865666d7dc5d3bb0df12ebec62018db040fbb2518023688502dce01a98a7139a23e5222f258a8481511832e9233eadcef00c7
diff --git a/sci-electronics/xoscope/files/xoscope-2.1-man_no_-Tutf8.patch b/sci-electronics/xoscope/files/xoscope-2.1-man_no_-Tutf8.patch
new file mode 100644
index 0000000..f00cd8c
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.1-man_no_-Tutf8.patch
@@ -0,0 +1,11 @@
+--- xoscope-2.1/configure.ac
++++ xoscope-2.1/configure.ac
+@@ -132,7 +132,7 @@
+
+ AC_DEFINE(MSECREFRESH, 30, [minimum number of milliseconds between refresh on libsx version])
+
+-AC_DEFINE(HELPCOMMAND, "man -Tutf8 xoscope 2>&1", [shell command for X11 help])
++AC_DEFINE(HELPCOMMAND, "man xoscope 2>&1", [shell command for X11 help])
+
+ AC_DEFINE(FILENAME, "oscope.dat", [default file name])
+
diff --git a/sci-electronics/xoscope/xoscope-2.1.ebuild b/sci-electronics/xoscope/xoscope-2.1.ebuild
new file mode 100644
index 0000000..a8352fa
--- /dev/null
+++ b/sci-electronics/xoscope/xoscope-2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils linux-info
+
+DESCRIPTION="Soundcard Oscilloscope for X"
+HOMEPAGE="http://xoscope.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtkdatabox
+ virtual/man"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+CONFIG_CHECK="~!SND_PCM_OSS"
+ERROR_SND_PCM_OSS="CONFIG_SND_PCM_OSS is needed to support sound card input via /dev/dsp"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-man_no_-Tutf8.patch
+
+ eautoreconf
+}
diff --git a/sci-libs/arpack/arpack-3.1.5.ebuild b/sci-libs/arpack/arpack-3.1.5.ebuild
index 17640a9..fc71a16 100644
--- a/sci-libs/arpack/arpack-3.1.5.ebuild
+++ b/sci-libs/arpack/arpack-3.1.5.ebuild
@@ -43,7 +43,7 @@
}
src_test() {
- cp "${S}"/TESTS/testA.mtx "${BUILD_DIR}"/TESTS || die
+ cp "${S}"/TESTS/testA.mtx "${BUILD_DIR}"/TESTS || die
autotools-utils_src_test
}
diff --git a/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild b/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild
index befa384..bd973c5 100644
--- a/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild
+++ b/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild
@@ -36,7 +36,7 @@
# db files shouldn't be executable
find "${ED}"/usr/share/balbes/BALBES_0.0.1/ \
-type f \
- -exec chmod 664 '{}' \; || die
+ -exec chmod 664 '{}' \; || die
dosym ../../ccp4/data/monomers /usr/share/balbes/BALBES_0.0.1/dic
cat >> "${T}"/20balbes <<- EOF
diff --git a/sci-libs/cdf/cdf-3.4.1.ebuild b/sci-libs/cdf/cdf-3.4.1.ebuild
index 7db24ca..a6a3cce 100644
--- a/sci-libs/cdf/cdf-3.4.1.ebuild
+++ b/sci-libs/cdf/cdf-3.4.1.ebuild
@@ -114,7 +114,7 @@
fi
if use java; then
- cd cdfjava || die
+ cd cdfjava || die
dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
dosym libcdfNativeLibrary.so.${PV_SO} \
/usr/$(get_libdir)/libcdfNativeLibrary.so
diff --git a/sci-libs/cdf/cdf-3.5.0.2.ebuild b/sci-libs/cdf/cdf-3.5.0.2.ebuild
index c370eb3..b582232 100644
--- a/sci-libs/cdf/cdf-3.5.0.2.ebuild
+++ b/sci-libs/cdf/cdf-3.5.0.2.ebuild
@@ -114,7 +114,7 @@
fi
if use java; then
- cd cdfjava || die
+ cd cdfjava || die
dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
dosym libcdfNativeLibrary.so.${PV_SO} \
/usr/$(get_libdir)/libcdfNativeLibrary.so
diff --git a/sci-libs/gts/gts-20121130.ebuild b/sci-libs/gts/gts-20121130.ebuild
index 82353d6..636bc65 100644
--- a/sci-libs/gts/gts-20121130.ebuild
+++ b/sci-libs/gts/gts-20121130.ebuild
@@ -16,7 +16,7 @@
SLOT="0"
LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
IUSE="doc examples static-libs test"
RDEPEND="dev-libs/glib:2"
diff --git a/sci-libs/inchi/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04.ebuild
index 06370f2..25ed6f8 100644
--- a/sci-libs/inchi/inchi-1.04.ebuild
+++ b/sci-libs/inchi/inchi-1.04.ebuild
@@ -67,7 +67,7 @@
fi
dobin "${S}"/INCHI/gcc/inchi-1/inchi-1
cd "${S}/INCHI_API/gcc_so_makefile/result" || die
- rm *gz || die
+ rm *gz || die
dolib.so lib*so*
use static-libs && dolib.a lib*a
doheader ../../inchi_main/inchi_api.h
diff --git a/sci-libs/itpp/itpp-4.3.1-r1.ebuild b/sci-libs/itpp/itpp-4.3.1-r1.ebuild
index 3634f7b..e97f4fa 100644
--- a/sci-libs/itpp/itpp-4.3.1-r1.ebuild
+++ b/sci-libs/itpp/itpp-4.3.1-r1.ebuild
@@ -12,7 +12,7 @@
SLOT="0"
LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="doc"
RDEPEND="
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index 21f8cb9..526e8c6 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -1,6 +1,2 @@
-DIST p95v279.linux32.tar.gz 4539547 SHA256 500d7e0f5a6f19084bdc439f25532ca0b8609ceb4fe88f792fbc01dd844abdbe SHA512 a4391e3767492cd427390206e5e5cd1da70b062214cd2e067914c18df76d8dd4688991e3269cb22f9ea006f208b3659e0940ed555f36749189cc58dad6457254 WHIRLPOOL e6ecc301dcc558906ea523c94ea8cb61c99505de6f171f0b070c75b0999edb9155aa1c2c15aa5c3b6a579fd72aba12c1ff08ff3e0377d7a50e30f7333221cebc
-DIST p95v279.linux64.tar.gz 4873050 SHA256 7fb64f49f4825945d0ed470ecaa12f4b1ffc62c5e56edc7a181fb0751785692d SHA512 555a53f46f49131b737b44bd8a8fca018e40812beefd0fe4bc452501c65e68c892460aa3c816bc8f9d38d62f1afd0d031a51aa0936f103bb0f8b9272947bd697 WHIRLPOOL 3424ace005d9453a5ec2633d02f03cbf37bd32ec8bc8c87478ba09c4c6046016b658f2a21a320a62ab2cdb68c9ec1c492006b9a5a7a607fd57c4257caf856e97
-DIST p95v286.linux32.tar.gz 4610624 SHA256 dc4e90670c984e2e2628022b9e7347220e50e06f4d17c3bce21ffd743aeb26fb SHA512 fc78c06eea5850b84f4f8d62c042a0cac1280711a40a55c78cf31610acfeb55773098041c4bf93c2e89e7e2b32f37da4d9d714bfc69116cb3131fc3bf7137d2c WHIRLPOOL 4dab596cd6503df2370faaf111c32affe6cbdafa75b225c40f88c45856d9f33ec4b9072e115b69af3116c5679e77a8c528f13356abdd3f6b7c4c4db8a7f99391
-DIST p95v286.linux64.tar.gz 5661343 SHA256 50e86250e774ffb4120a17cf778411cac62a9ffa41e32ccf532f99eff3660f28 SHA512 b6fa3ff241feeca98dae7792d4912f491911a70a33ba243fac38ca43ba31fe1fddb6dea37670f082e6efa91abd24e0443143b031697d135cd270efa3d3998469 WHIRLPOOL 05dcd380528f1bc79303609174c65174e19f67b828245860b0516666b1b146331fb1148a007d1285be0dbd2e4ae73e53ced5dff5f59e37b524a9e3ab3176f87f
DIST p95v287.linux32.tar.gz 4610011 SHA256 836ad76a17762dca50c2bed55c9e46655268e42b0de1c87e2499e92602e41435 SHA512 2f60c2801f02b6f72e71704f99f94512483da192d659fd691e3be2b562cdc4f174e744c276173b2b17b6c664be998d5b483e4aeda9e716afbc885e87cc919060 WHIRLPOOL c57f34beb0b46b6f5c822a63ae3281b70ca69167589d1b3b33c1e455da1f476cbfa8213c1053c2aedbc9f543cba7c3a1ac2d4ed2a98e7d6433be6ba2c47c32ed
DIST p95v287.linux64.tar.gz 5661102 SHA256 3555426f170ae222de34599aca8dac9c621923a3e7d492d25138c086f45536ab SHA512 8e35af16bffe1e624f08797baa67d8890fd62a6b6ada1cbd1b4d37afb60e08f9f58dc8e566e0bc6e5e8fb714367e78c30dbff8b77c76a47d7b0935d10afd4c48 WHIRLPOOL 36ce137654d9a7a02643940349f0465d4a4592f4e35158b3d5512e2d5e24ea1f86105ec6cebff1369200ab45d8e5968c32d94ea2f747e666df444a4e13049d0e
diff --git a/sci-mathematics/gimps/gimps-27.9-r2.ebuild b/sci-mathematics/gimps/gimps-27.9-r2.ebuild
deleted file mode 100644
index 0a48670..0000000
--- a/sci-mathematics/gimps/gimps-27.9-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit pax-utils systemd
-
-DESCRIPTION="The Great Internet Mersenne Prime Search"
-HOMEPAGE="http://mersenne.org/"
-SRC_URI="
- amd64? ( ftp://mersenne.org/gimps/p95v${PV/./}.linux64.tar.gz )
- x86? ( ftp://mersenne.org/gimps/p95v${PV/./}.linux32.tar.gz )"
-
-SLOT="0"
-LICENSE="GIMPS"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-# Since there are no statically linked binaries for this version of mprime,
-# and no static binaries for amd64 in general, we use the dynamically linked
-# ones and try to cover the .so deps with the packages listed in RDEPEND.
-DEPEND=""
-RDEPEND="net-misc/curl"
-
-S="${WORKDIR}"
-I="/opt/gimps"
-
-QA_PREBUILT="opt/gimps/mprime"
-
-src_install() {
- dodir ${I} /var/lib/gimps
- pax-mark m mprime
- cp mprime "${D}/${I}"
- fperms a-w "${I}/mprime"
- fowners root:0 "${I}"
- fowners root:0 "${I}/mprime"
-
- dodoc license.txt readme.txt stress.txt whatsnew.txt undoc.txt
-
- newinitd "${FILESDIR}/${PN}-26.6-r1-init.d" gimps
- newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
-
- systemd_dounit "${FILESDIR}/${PN}.service"
- systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-}
-
-pkg_postinst() {
- echo
- einfo "You can use \`/etc/init.d/gimps start\` to start a GIMPS client in the"
- einfo "background at boot. Have a look at /etc/conf.d/gimps and check some"
- einfo "configuration options."
- einfo
- einfo "If you don't want to use the init script to start gimps, remember to"
- einfo "pass it an additional command line parameter specifying where the data"
- einfo "files are to be stored, e.g.:"
- einfo " ${I}/mprime -w/var/lib/gimps"
- echo
-}
-
-pkg_postrm() {
- echo
- einfo "GIMPS data files were not removed."
- einfo "Remove them manually from /var/lib/gimps/"
- echo
-}
diff --git a/sci-mathematics/gimps/gimps-28.6.ebuild b/sci-mathematics/gimps/gimps-28.6.ebuild
deleted file mode 100644
index 0a48670..0000000
--- a/sci-mathematics/gimps/gimps-28.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit pax-utils systemd
-
-DESCRIPTION="The Great Internet Mersenne Prime Search"
-HOMEPAGE="http://mersenne.org/"
-SRC_URI="
- amd64? ( ftp://mersenne.org/gimps/p95v${PV/./}.linux64.tar.gz )
- x86? ( ftp://mersenne.org/gimps/p95v${PV/./}.linux32.tar.gz )"
-
-SLOT="0"
-LICENSE="GIMPS"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-# Since there are no statically linked binaries for this version of mprime,
-# and no static binaries for amd64 in general, we use the dynamically linked
-# ones and try to cover the .so deps with the packages listed in RDEPEND.
-DEPEND=""
-RDEPEND="net-misc/curl"
-
-S="${WORKDIR}"
-I="/opt/gimps"
-
-QA_PREBUILT="opt/gimps/mprime"
-
-src_install() {
- dodir ${I} /var/lib/gimps
- pax-mark m mprime
- cp mprime "${D}/${I}"
- fperms a-w "${I}/mprime"
- fowners root:0 "${I}"
- fowners root:0 "${I}/mprime"
-
- dodoc license.txt readme.txt stress.txt whatsnew.txt undoc.txt
-
- newinitd "${FILESDIR}/${PN}-26.6-r1-init.d" gimps
- newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
-
- systemd_dounit "${FILESDIR}/${PN}.service"
- systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-}
-
-pkg_postinst() {
- echo
- einfo "You can use \`/etc/init.d/gimps start\` to start a GIMPS client in the"
- einfo "background at boot. Have a look at /etc/conf.d/gimps and check some"
- einfo "configuration options."
- einfo
- einfo "If you don't want to use the init script to start gimps, remember to"
- einfo "pass it an additional command line parameter specifying where the data"
- einfo "files are to be stored, e.g.:"
- einfo " ${I}/mprime -w/var/lib/gimps"
- echo
-}
-
-pkg_postrm() {
- echo
- einfo "GIMPS data files were not removed."
- einfo "Remove them manually from /var/lib/gimps/"
- echo
-}
diff --git a/sci-mathematics/reduce/reduce-20110414-r1.ebuild b/sci-mathematics/reduce/reduce-20110414-r1.ebuild
index 7394f78..244dd46 100644
--- a/sci-mathematics/reduce/reduce-20110414-r1.ebuild
+++ b/sci-mathematics/reduce/reduce-20110414-r1.ebuild
@@ -62,7 +62,7 @@
pushd bin > /dev/null
cp "${FILESDIR}"/redcsl "${FILESDIR}"/csl . || die
sed -e "s/lib/${lib}/" -i redcsl || die
- sed -e "s/lib/${lib}/" -i csl || die
+ sed -e "s/lib/${lib}/" -i csl || die
dobin redcsl csl
popd > /dev/null
@@ -77,7 +77,7 @@
dosym /usr/share/${PN}/doc /usr/${lib}/${PN}/${PN}.doc
if use X; then
doins -r ${PN}.fonts
- mv "${D}"usr/share/${PN}/${PN}.fonts "${D}"usr/share/${PN}/fonts || die
+ mv "${D}"usr/share/${PN}/${PN}.fonts "${D}"usr/share/${PN}/fonts || die
dosym /usr/share/${PN}/fonts /usr/${lib}/${PN}/${PN}.fonts
fi
popd > /dev/null
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 5562a01..9d1cdf0 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -7,4 +7,5 @@
DIST lammps-24Sep15.tar.gz 87307191 SHA256 e03cdeb2b3b6107d98969febea26575c85590603ab4f79d26efc46bac6d6cc60 SHA512 356dd556f845cec456865062375120c0898cef1870617d80b31b0e8e964585140120b21f891cd9b40ecde7aaf43beb34d7b15396830e08273624a9b14da551e4 WHIRLPOOL 667b8aaf927d268c569a192c835b7dbdc80a0f25abb1f2c96007517ea218a69b2816dde4ebe28ca82974d01472c0e1126b67e89a19fb3ef49e4020f3d9c69fba
DIST lammps-29Aug15.tar.gz 87253305 SHA256 fff69b47c40936d4ccd90a8443ce5bb1bcf4cb449ae06a5822c1b11a2ab2dd67 SHA512 991c56608a3288ebdcd2fb0857c595d42047b5ed0780b6d4ddb98388627499727b6c04fe0eff3e7221238dba2a8601f0b4b4067b5aa5ec2f356b4ee13f6c129c WHIRLPOOL 88da74fa65aeb187330439417512d516fe8adf4a5df4be48fdafafa198e8c4d657ecce7f04f749d77cb2f8a7881ac47f4604cf6bc8eb3ca8b2cbc7988d866a87
DIST lammps-4Sep15.tar.gz 87259558 SHA256 8652c801e4ce8b6b7d42a6c71f76b68a6e741dc8efb8d7d3dad36b624fe8f150 SHA512 ee730c8bd96e14931192a68c12e4ebde301cc3525b20816d051059f155b70c6edcea7dc2ed911e0b89685d751cd5a74b4bb5eedd6c16a042a2191bf8a9665fc9 WHIRLPOOL 271ac0d74e03d3e3e118a8b2385d98ce3f566ead67f1c329a219c265f886dc267b11be17c2caa52749ebac212bbc7456fba2d0d6ec69cd25815316e601b3360a
+DIST lammps-5Oct15.tar.gz 88451532 SHA256 a76f92ae05b99f9257abf7d79d9365c5743fa5a16b941a5e40f74036c5879211 SHA512 e0a034778cd5e3b9a27c9fc6257f1f7a6a9161732cd83bac2c4b0f82c39d5a6a385bb4640322478bfbe9467afb28b998cd19108b3d4a21e369b80c39a486e065 WHIRLPOOL 291e7820d4736421aeda9a1295854bd7b52d8ca3f14900e9394373410ee5db02ad6ab53991cf4dc8e73328b24fa44659d10693aca7cb48301227299ad622ce31
DIST lammps-9Sep15.tar.gz 87275742 SHA256 c783be8bf2c2fbef75522b09b4420006d94104f2a60b82f55f7bc255c6163079 SHA512 60fa8c818c72c3c236095c7aa23c2ec30cc3370b6dc14d0c1d9e347772e70c96dab43019092eb93f2327377f1b4cc642416be65d156b1faf934bfa805d228bcf WHIRLPOOL 4a9dbb0f1b493177614646dcef124c723a3b6171d0894fee8b34e9fff7d0962ada0a2a27564338fef6551aaff322f4b50784b98c250555173cba5478cc60e9af
diff --git a/sci-physics/lammps/lammps-20151005.ebuild b/sci-physics/lammps/lammps-20151005.ebuild
new file mode 100644
index 0000000..5400e87
--- /dev/null
+++ b/sci-physics/lammps/lammps-20151005.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+inherit eutils flag-o-matic fortran-2 multilib python-r1
+
+convert_month() {
+ case $1 in
+ 01) echo Jan
+ ;;
+ 02) echo Feb
+ ;;
+ 03) echo Mar
+ ;;
+ 04) echo Apr
+ ;;
+ 05) echo May
+ ;;
+ 06) echo Jun
+ ;;
+ 07) echo Jul
+ ;;
+ 08) echo Aug
+ ;;
+ 09) echo Sep
+ ;;
+ 10) echo Oct
+ ;;
+ 11) echo Nov
+ ;;
+ 12) echo Dec
+ ;;
+ *) echo unknown
+ ;;
+ esac
+}
+
+MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="http://lammps.sandia.gov/"
+SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples gzip lammps-memalign mpi python static-libs"
+
+DEPEND="
+ mpi? (
+ virtual/blas
+ virtual/lapack
+ virtual/mpi
+ )
+ gzip? ( app-arch/gzip )
+ sci-libs/voro++
+ python? ( ${PYTHON_DEPS} )
+ "
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+lmp_emake() {
+ local LAMMPS_INCLUDEFLAGS
+ LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
+ LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN=64' '')"
+
+ # The lammps makefile uses CC to indicate the C++ compiler.
+ emake \
+ ARCHIVE=$(tc-getAR) \
+ CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
+ F90=$(usex mpi "mpif90" "$(tc-getFC)") \
+ LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
+ CCFLAGS="${CXXFLAGS}" \
+ F90FLAGS="${FCFLAGS}" \
+ LINKFLAGS="${LDFLAGS}" \
+ LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
+ MPI_INC=$(usex mpi "" "-I../STUBS") \
+ MPI_PATH=$(usex mpi "" "-L../STUBS") \
+ MPI_LIB=$(usex mpi "" "-lmpi_stubs") \
+ user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
+ "$@"
+}
+
+lmp_activate_packages() {
+ # Build packages
+ lmp_emake -C src yes-asphere
+ lmp_emake -C src yes-body
+ lmp_emake -C src yes-class2
+ lmp_emake -C src yes-colloid
+ lmp_emake -C src yes-coreshell
+ lmp_emake -C src yes-dipole
+ lmp_emake -C src yes-fld
+ #lmp_emake -C src yes-gpu
+ lmp_emake -C src yes-granular
+ # Need OpenKIM external dependency.
+ #lmp_emake -C src yes-kim
+ # Need Kokkos external dependency.
+ #lmp_emake -C src yes-kokkos
+ lmp_emake -C src yes-kspace
+ lmp_emake -C src yes-manybody
+ lmp_emake -C src yes-mc
+ lmp_emake -C src yes-meam
+ lmp_emake -C src yes-misc
+ lmp_emake -C src yes-molecule
+ #lmp_emake -C src yes-mpiio
+ lmp_emake -C src yes-opt
+ lmp_emake -C src yes-peri
+ lmp_emake -C src yes-poems
+ lmp_emake -C src yes-qeq
+ lmp_emake -C src yes-reax
+ lmp_emake -C src yes-replica
+ lmp_emake -C src yes-rigid
+ lmp_emake -C src yes-shock
+ lmp_emake -C src yes-snap
+ lmp_emake -C src yes-srd
+ lmp_emake -C src yes-voronoi
+ lmp_emake -C src yes-xtc
+
+ if use mpi; then
+ lmp_emake -C src yes-user-atc
+ fi
+ lmp_emake -C src yes-user-eff
+ lmp_emake -C src yes-user-fep
+ use mpi && lmp_emake -C src yes-user-lb
+ lmp_emake -C src yes-user-phonon
+ lmp_emake -C src yes-user-sph
+}
+
+lmp_build_packages() {
+ lmp_emake -C lib/meam -j1 -f Makefile.gfortran
+ lmp_emake -C lib/poems -f Makefile.g++
+ lmp_emake -C lib/reax -j1 -f Makefile.gfortran
+ use mpi && lmp_emake -C lib/atc -f Makefile.g++
+}
+
+lmp_clean_packages() {
+ lmp_emake -C lib/meam -f Makefile.gfortran clean
+ lmp_emake -C lib/poems -f Makefile.g++ clean
+ lmp_emake -C lib/reax -f Makefile.gfortran clean
+ use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean
+}
+
+src_prepare() {
+ # Fix inconsistent use of SHFLAGS.
+ sed -i \
+ -e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
+ -e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
+ lib/voronoi/Makefile.lammps || die
+
+ # Fix missing .so name.
+ sed -i \
+ -e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
+ src/MAKE/Makefile.serial || die
+
+ # Fix makefile in tools.
+ sed -i \
+ -e 's:g++:$(CXX) $(CXXFLAGS):' \
+ -e 's:gcc:$(CC) $(CCFLAGS):' \
+ -e 's:ifort:$(FC) $(FCFLAGS):' \
+ tools/Makefile || die
+
+ # Patch python.
+ epatch "${FILESDIR}/lammps-python3-r1.patch"
+ epatch "${FILESDIR}/python-shebang.patch"
+}
+
+src_compile() {
+ # Fix atc...
+ append-cxxflags -I../../src
+
+ # Acticate packages.
+ elog "Activating lammps packages..."
+ lmp_activate_packages
+
+ # Compile stubs for serial version.
+ use mpi || lmp_emake -C src mpi-stubs
+
+ elog "Building packages..."
+ lmp_build_packages
+
+ if use static-libs; then
+ # Build static library.
+ elog "Building static library..."
+ lmp_emake -C src mode=lib serial
+ fi
+
+ # Clean out packages (that's not done by the build system with the clean
+ # target), so we can rebuild the packages with -fPIC.
+ elog "Cleaning packages..."
+ lmp_clean_packages
+
+ # The build system does not rebuild the packages with -fPIC, adding flag
+ # manually.
+ append-cxxflags -fPIC
+ append-fflags -fPIC
+
+ # Compile stubs for serial version.
+ use mpi || lmp_emake -C src mpi-stubs
+
+ elog "Building packages..."
+ lmp_build_packages
+
+ # Build shared library.
+ elog "Building shared library..."
+ lmp_emake -C src mode=shlib serial
+
+ # Compile main executable. The shared library is always built, and
+ # mode=shexe is simply a way to re-use the object files built in the
+ # "shlib" step when linking the executable. The executable is not actually
+ # using the shared library. If we have built the static library, then we
+ # link that into the executable.
+ elog "Linking executable..."
+ if use static-libs; then
+ lmp_emake -C src mode=exe serial
+ else
+ lmp_emake -C src mode=shexe serial
+ fi
+
+ # Compile tools.
+ elog "Building tools..."
+ lmp_emake -C tools binary2txt chain data2xmovie micelle2d
+}
+
+src_install() {
+ use static-libs && newlib.a src/liblammps_serial.a liblammps.a
+ newlib.so src/liblammps_serial.so liblammps.so.0.0.0
+ dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
+ dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
+ newbin src/lmp_serial lmp
+ dobin tools/binary2txt
+ dobin tools/chain
+ dobin tools/data2xmovie
+ dobin tools/micelle2d
+ # Don't forget to add header files of optional packages as they are added
+ # to this ebuild. There may also be .mod files from Fortran based
+ # packages.
+ insinto "/usr/include/${PN}"
+ doins -r src/*.h lib/meam/*.mod
+
+ local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
+ insinto "/${LAMMPS_POTENTIALS}"
+ doins potentials/*
+ echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
+ doenvd 99lammps
+
+ # Install python script.
+ use python && python_foreach_impl python_domodule python/lammps.py
+
+ if use examples; then
+ local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
+ insinto "${LAMMPS_EXAMPLES}"
+ doins -r examples/*
+ fi
+
+ dodoc README
+ if use doc; then
+ dodoc doc/Manual.pdf
+ dohtml -r doc/*
+ fi
+}
diff --git a/sys-apps/cv/Manifest b/sys-apps/cv/Manifest
deleted file mode 100644
index eafe074..0000000
--- a/sys-apps/cv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cv-0.4.1.tar.gz 53682 SHA256 e7537b363662060a55e1a59b78a124e76b54c3b64f0bd62c35fd3cb34c725aa9 SHA512 eb64cc44a834805209f93d23f61b270d670f1f2e535a3dbed84bdb9cbb27cec9e077abb1138c8557436baa021d2d7661132c56eae04a36f0a83b3e7a116de7d4 WHIRLPOOL c496d21287b90101720d11ca5b816878e9578f646cf846d0fd3c641d27edf2afb885a6c068850fd10ce629b856afbd15d7703da433f53c74042bc20c3e7a0e4b
diff --git a/sys-apps/cv/cv-0.4.1.ebuild b/sys-apps/cv/cv-0.4.1.ebuild
deleted file mode 100644
index fa9e8f2..0000000
--- a/sys-apps/cv/cv-0.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Coreutils Viewer: show progress for cp, rm, dd, and so forth"
-HOMEPAGE="https://github.com/Xfennec/cv"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-src_prepare() {
- sed -i \
- -e '/LFLAGS/s:-lncurses:$(LDFLAGS) $(shell $(PKG_CONFIG) --libs ncurses):' \
- -e 's:CFLAGS=-g:CFLAGS+=:' \
- -e 's:gcc:$(CC):g' \
- Makefile || die
- tc-export CC PKG_CONFIG
-}
-
-src_install() {
- emake PREFIX="${D}/${EPREFIX}/usr" install
- dodoc README.md
-}
diff --git a/sys-apps/debianutils/debianutils-4.4.ebuild b/sys-apps/debianutils/debianutils-4.4.ebuild
index 126fa01..9652b01 100644
--- a/sys-apps/debianutils/debianutils-4.4.ebuild
+++ b/sys-apps/debianutils/debianutils-4.4.ebuild
@@ -15,8 +15,6 @@
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="kernel_linux static"
-PDEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )"
-
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch
}
diff --git a/sys-apps/debianutils/debianutils-4.5.1.ebuild b/sys-apps/debianutils/debianutils-4.5.1.ebuild
index b05260f..e3c9a71 100644
--- a/sys-apps/debianutils/debianutils-4.5.1.ebuild
+++ b/sys-apps/debianutils/debianutils-4.5.1.ebuild
@@ -15,8 +15,6 @@
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="kernel_linux static"
-PDEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )"
-
S="${WORKDIR}/${PN}"
src_prepare() {
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 83e9294..6a22f62 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -10,3 +10,4 @@
DIST ethtool-3.4.2.tar.bz2 200731 SHA256 e2cb6e7977c804b0fa387ba41a04772d37efeb237f27de59eace06792a47a187 SHA512 43714a643c741ef46132e06f6f407bbf77c7787a6fcfe6b9b73165883ea498890ee23d34662255c6fbaeba924d2f8e8cd5160c33c960492dcf5e4a94d2bb68a9 WHIRLPOOL ffaecb40293f15c2e33f85fc6a6318ce1ce82b5db0395e6a0ead0deb45ef39d765c3dd91e66e4b0e83d33b07b98c5ac30e821f9800fff56b788bb46351ce204c
DIST ethtool-3.8.tar.xz 184168 SHA256 510df229ffb27bc030bf60d6181a021e9d3707a082d6565b6daae3d352ee2c95 SHA512 ce003286651f225baf631d7a760f910297a5cd083887f8d96dcc302c2597cb5c3774c58ab34ea55fd9c12d17493bab09fc5cddfc6b383235b818198d5e8d751e WHIRLPOOL c0314b0293b43fc8fdaf6462140a7d56e87b9d6bb03cd5eb9589a5bc26ee006c17764e9cb8c36ff4aacaa54ff10bb9971086ac4a9e25c50cebff966eb15e0595
DIST ethtool-4.0.tar.xz 199548 SHA256 904887acc7d2f9c35dec04eb0e8a727a3205f346af4f4c95560ea3798de5ecff SHA512 708f7df17f04339d1f6e9f80e0e9b4d7855fd71b974a833e5644ee4b7a431032ce70ceac85e37e59847eb0bea4226c0467b12605e16a005f83d75c33367a6ef2 WHIRLPOOL c1649c83146ded3d245d1e96783f1fc79d51f2d2fdbf877eed6968d5c7a37d4bb3855d45d4110369199d95bc8a4b807fe4707265f89e4a8e1e883b843739e322
+DIST ethtool-4.2.tar.xz 201140 SHA256 8cb854bcf71ef8b484b5d2a0e6bf056ae1fbf12cfb19e4907b74b7b21da91e87 SHA512 37334266866bad3c9c116808f928adf220e5ca08544187d3b98be10e101cfaed66c5bc2aaa8426f231a194b59534d4cae07d22fed218f90eff833b8c5aacc2b5 WHIRLPOOL 08c712d208fb990c775be7347cda6553a0704a833a6b8bd7e275bc32d1d4a6e72e76ac36388332b82d54eae1bc47b6c27c8cf94b12c00391e648fc2f3d4bb614
diff --git a/sys-apps/ethtool/ethtool-4.2.ebuild b/sys-apps/ethtool/ethtool-4.2.ebuild
new file mode 100644
index 0000000..0520caf
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-4.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
+HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
+SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/install-xattr/install-xattr-0.4.ebuild b/sys-apps/install-xattr/install-xattr-0.4.ebuild
index 814485f..e26737e 100644
--- a/sys-apps/install-xattr/install-xattr-0.4.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.4.ebuild
@@ -14,7 +14,7 @@
inherit git-2
else
SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+ KEYWORDS="arm64"
S=${WORKDIR}/${PN}
fi
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index e065e97..bbc19ff 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -8,3 +8,4 @@
DIST openrc-0.16.4.tar.bz2 158599 SHA256 6771257e208da2e4d20b4ac2e3e7f065eb8873566644ff385e9dbd6bc5221d21 SHA512 8ade50cdb8c2e05e00e917f848e96bfee54bb4ac77bf50af8c5ab66e2e01f8a5c2621123087945feaa9b15ad84a5936e23cc489a2bb7127c2b118a5a0695ee6e WHIRLPOOL 706d7b1101927ff89afb01ad766f491db94ff04f574bc7b69349b6ab0334ed5d2cd5ee2d8041cf5a0ba00f5a6a3596502835fa132c668533772a42737f0e2412
DIST openrc-0.16.tar.bz2 157924 SHA256 969ce450bb095a406ef14362572633b14c8696b57d67361394c5951704273ce3 SHA512 3ff3958bf480ec6bf97e50c8911c382dc855322a74d57b65da975e98d8b76debda971826d15803be96f2ae9c7fd5ebf4cf0c43013663a042224a9c49377614f8 WHIRLPOOL 5e6bb11b907a2fe3812653354950b0ec4e13571981580d03d2ee9b93dc8a68ce128ee1ec7560557adbc90af44aa881648aae51e15bb0f0990ca338ffb3c6c814
DIST openrc-0.17.tar.bz2 160533 SHA256 45818d9ef4659e8dd924a1468a091255c305daee5417f94d9515f0e125298b30 SHA512 6e69b036d113f066b0dd0bfe55e019328e0e77cff6c93f0a3e55751aa0a72411aa3b1efe8b4327e156a9612e4155863b0a81c9eda043c12904bb36e861b71399 WHIRLPOOL de45daf6f4aebe632ea9fcb46408e63f0aed6c9b9129fb5510f348f20cf1c62aa42e7dce47a7f19a441696596fa57494642e7334a42c415fdbc865cb80a18eff
+DIST openrc-0.18.tar.bz2 158171 SHA256 1d4831d9941df9248a5622060fb974bc912382cd1f1e07682a34d50e8f5215e7 SHA512 12ff8ffe9476a6f677708724eac537dfec5e49c22e98815c281f2316c88c0d7402f91de99bad8819393de0c0b00dd81a7917808bef47c51d2f593da7ef351b94 WHIRLPOOL b29b599efda3ab0a84895779ebc3cb013d9a7dc16742ea166f1c7bf2b98c38132d479fc43e7904d245a8eacb5c3af685d671be4d770e9f53a68062b76ebf00e7
diff --git a/sys-apps/openrc/metadata.xml b/sys-apps/openrc/metadata.xml
index 8c3b63e..0043936 100644
--- a/sys-apps/openrc/metadata.xml
+++ b/sys-apps/openrc/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>openrc</herd>
<use>
- <flag name="audit">enable support for Linux audit subsystem</flag>
<flag name="netifrc">enable Gentoo's network stack (net.* scripts)</flag>
<flag name="newnet">enable the new network stack (experimental)</flag>
<flag name="tools">build optional tools</flag>
diff --git a/sys-apps/openrc/openrc-0.18.ebuild b/sys-apps/openrc/openrc-0.18.ebuild
new file mode 100644
index 0000000..f1c78ac
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.18.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+ tools unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+ elibc_glibc? ( >=sys-libs/glibc-2.5 )
+ ncurses? ( sys-libs/ncurses:0= )
+ pam? (
+ sys-auth/pambase
+ virtual/pam
+ )
+ tools? ( dev-lang/perl )
+ audit? ( sys-process/audit )
+ kernel_linux? (
+ sys-process/psmisc
+ !<sys-process/procps-3.3.9-r2
+ )
+ selinux? (
+ sys-apps/policycoreutils
+ sys-libs/libselinux
+ )
+ !<sys-apps/baselayout-2.1-r1
+ !<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+ virtual/os-headers
+ ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+ !prefix? (
+ kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
+ kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+ )
+ selinux? (
+ sec-policy/selinux-base-policy
+ sec-policy/selinux-openrc
+ )
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+ sed -i 's:0444:0644:' mk/sys.mk || die
+
+ if [[ ${PV} == "9999" ]] ; then
+ local ver="git-${EGIT_VERSION:0:6}"
+ sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+ fi
+
+ # Allow user patches to be applied without modifying the ebuild
+ epatch_user
+}
+
+src_compile() {
+ unset LIBDIR #266688
+
+ MAKE_ARGS="${MAKE_ARGS}
+ LIBNAME=$(get_libdir)
+ LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+ MKNET=$(usex newnet)
+ MKSELINUX=$(usex selinux)
+ MKAUDIT=$(usex audit)
+ MKPAM=$(usev pam)
+ MKSTATICLIBS=$(usex static-libs)
+ MKTOOLS=$(usex tools)"
+
+ local brand="Unknown"
+ if use kernel_linux ; then
+ MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+ brand="Linux"
+ elif use kernel_FreeBSD ; then
+ MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+ brand="FreeBSD"
+ fi
+ export BRANDING="Gentoo ${brand}"
+ use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+ export DEBUG=$(usev debug)
+ export MKTERMCAP=$(usev ncurses)
+
+ tc-export CC AR RANLIB
+ emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+ local file="${ED}/$1" var=$2 val com
+ eval "${@:5}" && val=$3 || val=$4
+ [[ ${val} == "#" ]] && com="#" && val='\2'
+ sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+ set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+ emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+ # move the shared libs back to /usr so ldscript can install
+ # more of a minimal set of files
+ # disabled for now due to #270646
+ #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+ #gen_usr_ldscript -a einfo rc
+ gen_usr_ldscript libeinfo.so
+ gen_usr_ldscript librc.so
+
+ if ! use kernel_linux; then
+ keepdir /$(get_libdir)/rc/init.d
+ fi
+ keepdir /$(get_libdir)/rc/tmp
+
+ # Backup our default runlevels
+ dodir /usr/share/"${PN}"
+ cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+ rm -rf "${ED}"/etc/runlevels
+
+ # Setup unicode defaults for silly unicode users
+ set_config_yes_no /etc/rc.conf unicode use unicode
+
+ # Cater to the norm
+ set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+ # On HPPA, do not run consolefont by default (bug #222889)
+ if use hppa; then
+ rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+ fi
+
+ # Support for logfile rotation
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/openrc.logrotate openrc
+
+ # install the gentoo pam.d file
+ newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+
+ # install documentation
+ dodoc ChangeLog *.md
+ if use newnet; then
+ dodoc README.newnet
+ fi
+}
+
+add_boot_init() {
+ local initd=$1
+ local runlevel=${2:-boot}
+ # if the initscript is not going to be installed and is not
+ # currently installed, return
+ [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+ || return
+ [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+ # if runlevels dont exist just yet, then create it but still flag
+ # to pkg_postinst that it needs real setup #277323
+ if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+ mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+ touch "${EROOT}"etc/runlevels/.add_boot_init.created
+ fi
+
+ elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+ ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+ local config=$1 initd=$2
+ if [[ -e ${EROOT}${config} ]] ; then
+ if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+ add_boot_init ${initd}
+ fi
+ fi
+}
+
+pkg_preinst() {
+ local f LIBDIR=$(get_libdir)
+
+ # avoid default thrashing in conf.d files when possible #295406
+ if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+ (
+ unset hostname HOSTNAME
+ source "${EROOT}"etc/conf.d/hostname
+ : ${hostname:=${HOSTNAME}}
+ [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+ )
+ fi
+
+ # set default interactive shell to sulogin if it exists
+ set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+ # termencoding was added in 0.2.1 and needed in boot
+ has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+ # swapfiles was added in 0.9.9 and needed in boot (february 2012)
+ has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+ if ! has_version ">=sys-apps/openrc-0.11"; then
+ add_boot_init sysfs sysinit
+ fi
+
+ if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+ migrate_udev_mount_script
+ add_boot_init tmpfiles.setup boot
+ fi
+
+ # these were added in 0.12.
+ if ! has_version ">=sys-apps/openrc-0.12"; then
+ add_boot_init loopback
+ add_boot_init tmpfiles.dev sysinit
+
+ # ensure existing /etc/conf.d/net is not removed
+ # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+ # this needs to stay in openrc ebuilds for a long time. :(
+ # Added in 0.12.
+ if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+ einfo "Modifying conf.d/net to keep it from being removed"
+ cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment. Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+ fi
+ fi
+ has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+ if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+ ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+ add_boot_init udev-mount sysinit
+ fi
+ return 0
+}
+
+pkg_postinst() {
+ local LIBDIR=$(get_libdir)
+
+ # Make our runlevels if they don't exist
+ if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+ einfo "Copying across default runlevels"
+ cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+ rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+ else
+ if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+ mkdir -p "${EROOT}"etc/runlevels/sysinit
+ cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+ "${EROOT}"etc/runlevels/sysinit
+ fi
+ if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+ mkdir -p "${EROOT}"etc/runlevels/shutdown
+ cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+ "${EROOT}"etc/runlevels/shutdown
+ fi
+ fi
+
+ if use hppa; then
+ elog "Setting the console font does not work on all HPPA consoles."
+ elog "You can still enable it by running:"
+ elog "# rc-update add consolefont boot"
+ fi
+
+ # Handle the conf.d/local.{start,stop} -> local.d transition
+ if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+ elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+ elog "files to ${EROOT}etc/local.d"
+ mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+ mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+ chmod +x "${EROOT}"etc/local.d/*{start,stop}
+ fi
+
+ if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+ if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+ ewarn "The dependency data could not be migrated to /run/openrc."
+ ewarn "This means you need to reboot your system."
+ fi
+ fi
+
+ # update the dependency tree after touching all files #224171
+ [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+ if ! use newnet && ! use netifrc; then
+ ewarn "You have emerged OpenRc without network support. This"
+ ewarn "means you need to SET UP a network manager such as"
+ ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+ ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+ ewarn "Or, you have the option of emerging openrc with the newnet"
+ ewarn "use flag and configuring /etc/conf.d/network and"
+ ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+ ewarn
+ fi
+
+ if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+ ewarn "Please add the network service to your boot runlevel"
+ ewarn "as soon as possible. Not doing so could leave you with a system"
+ ewarn "without networking."
+ ewarn
+ fi
+
+ ewarn "In this version of OpenRC, the loopback interface no longer"
+ ewarn "satisfies the net virtual."
+ ewarn "If you have services now which do not start because of this,"
+ ewarn "They can be fixed by adding rc_need=\"!net\""
+ ewarn "to the ${EROOT}etc/conf.d/<servicename> file."
+ ewarn "You should also file a bug against the service asking that"
+ ewarn "need net be dropped from the dependencies."
+ ewarn "The bug you file should block the following tracker:"
+ ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092"
+ ewarn
+
+ # Updated for 0.13.2.
+ ewarn "Bug https://bugs.gentoo.org/show_bug.cgi?id=427996 was not"
+ ewarn "fixed correctly in earlier versions of OpenRC."
+ ewarn "The correct fix is implemented in this version, but that"
+ ewarn "means netmount needs to be added to the default runlevel if"
+ ewarn "you are using nfs file systems."
+ ewarn
+
+ elog "You should now update all files in /etc, using etc-update"
+ elog "or equivalent before restarting any services or this host."
+}
diff --git a/sys-apps/paludis/metadata.xml b/sys-apps/paludis/metadata.xml
index 93c3ebe9..8c4fd0d 100644
--- a/sys-apps/paludis/metadata.xml
+++ b/sys-apps/paludis/metadata.xml
@@ -13,6 +13,9 @@
<flag name="pbins">Enable binary package support. Adds dependency upon
<pkg>app-arch/libarchive</pkg></flag>
<flag name="pink">Use a less boring colourscheme than the default</flag>
- <flag name='search-index'>Enable cave search --index. Requires sqlite.</flag>
+ <flag name='search-index'>Enable cave search --index. Requires
+ <pkg>dev-db/sqlite</pkg>.</flag>
+ <flag name='xml'>Build xml things for metadata.xml and GLSA support
+ (needs <pkg>dev-libs/libxml2</pkg>).</flag>
</use>
</pkgmetadata>
diff --git a/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild
index a329e63..0da6cda 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild
@@ -25,7 +25,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
>=sys-libs/glibc-2.4
diff --git a/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild
index 10f0012..047d511 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild
@@ -31,7 +31,7 @@
else
SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
S1="${WORKDIR}/${MY_P}"
S2="${WORKDIR}/policycoreutils-extra"
S="${S1}"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index bbba34b..1f0dbca 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,3 @@
-DIST portage-2.2.14.tar.bz2 896674 SHA256 8dd65971e0f1c31dca922b0f7be06e622aabbed8d012d056ff25a169fc9946d8 SHA512 c8724b42d9932adf6065ff9f9c3bb3d22ec3258dcdb23e041ce704f2c7b634d459a36764f3ec5aa4613843733c70725025af10439816c538ec12837db50dc1ab WHIRLPOOL 82bb660fcc1f0bb4639b53829cf8207fc40ee01a0cb9935ad46fb5039f0558fbbbb3af3d12d208289e9701e0874d77a7990911fd50fe04806948c6c6955625fc
-DIST portage-2.2.18.tar.bz2 942561 SHA256 e0d54f2fbcdc8b5fce716475183fa6e889b6fa8178c92d65a850df73f1636560 SHA512 be4f95bc04a61cdb371fc66a03d2183961bfd458e9b2b89cf8cab8c9e70bde4119be266177d947e31429627609ed75a75c21abfe4b674ca529632d5728e8e8a6 WHIRLPOOL f334bf5198d2214de557a046ed3217e23d48d8f8d7d64fb0bd2611dd5c8725139eaf7d1e1065f822d8816f3979e86d6a6f8df4d2f4605df0b5c157d6bbf09a6d
DIST portage-2.2.20.1.tar.bz2 950298 SHA256 84dd3ed1d9fd0a3336e956d057590c75834a906ae62a450411232fe5a842475c SHA512 5f7373da20d448059e8fdc8a3593eaca780be3184f0494bac66f5eea7c33d00dd61b9e74cbe9a52413f08cef29d426ed8751e20e16be09178468c18d77a6ae2e WHIRLPOOL 99643ce0ab74c5df64fb5239948c6102bc39847ff88eaf210c069c0c9587c1e8bdd1a032a7e61c1225b6113645387861d439e9c4f103df4d0f042b73e1afc328
-DIST portage-2.2.20.tar.bz2 950293 SHA256 483ce0b20960840f6499452ca4ef7df36fde08f835dcadf3cdd118c1ff7207a4 SHA512 fffb43a4c25a70cae071246fde7e379107535e607b9e8dd9fb513315a10750db92209bb436f532930a44cac06ba43aade06a7c2b0a1d675fd816968ba0fce7ae WHIRLPOOL aa1e560007cdafebd2bf56964d61e55a91fef4be5cd9bc50560891140287f6827ecda9d99e31ceb4e5a64691863fde325b51594cfdcfe88eb260fba47dad5fb9
-DIST portage-2.2.22.tar.bz2 973737 SHA256 d8ae50e2306452c4f8c2772e4001fbfffbcb8f6e3606d61fad039c7c11a3f180 SHA512 8acfe71880bdd1a681f54c8225d73f9dea52192c056b9cf64ed50aff2cc822568bebc5a8d7bac46f2d1f16093b6950434004926b10007c9591c18a435465e689 WHIRLPOOL 30d95197c63bac768f08e2397f1be79f077619f92833db6e86cb06e967ae982eed004106d869c86d37ac1b3cd66ca0a6c8acb4915dfb0385904caf09a901c93e
+DIST portage-2.2.23.tar.bz2 960229 SHA256 9aecc9f4c813810f99f6604a9806e268b162d90243a9769f1410b3a96822cdfb SHA512 17b8fe4967719bacd8f3ca324bde3328d82f5b7748a05b66cca165dcc8a4abbaf7e05ec61a54684cd1b001297dc0adc04c3771d0fd3cc4732f17ac9e0810e6ad WHIRLPOOL da7229c2be8330e898ef1e422a62683a003c16a640fee9d183c8afc8474779d302c0de639072099c8d47372fa0c74e2a635c485d8c7ed2b2344cacc857199578
DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2
diff --git a/sys-apps/portage/portage-2.2.14.ebuild b/sys-apps/portage/portage-2.2.14.ebuild
deleted file mode 100644
index a601aab..0000000
--- a/sys-apps/portage/portage-2.2.14.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
- pypy
- python3_3 python3_4
- python2_7
-)
-# Note: substituted below
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
- dev-lang/python-exec:2
- >=sys-apps/sed-4.0.5 sys-devel/patch
- doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
- epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
- dev-lang/python-exec:2
- !build? (
- >=sys-apps/sed-4.0.5
- app-shells/bash:0[readline]
- >=app-admin/eselect-1.2
- )
- elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
- elibc_glibc? ( >=sys-apps/sandbox-2.2 )
- elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
- >=app-misc/pax-utils-0.1.17
- selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
- xattr? ( kernel_linux? (
- >=sys-apps/install-xattr-0.3
- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
- python2_7 pypy)
- ) )
- !<app-admin/logrotate-3.8.0"
-PDEPEND="
- !build? (
- >=net-misc/rsync-2.6.4
- userland_GNU? ( >=sys-apps/coreutils-6.4 )
- )"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-prefix_src_archives() {
- local x y
- for x in ${@}; do
- for y in ${SRC_ARCHIVES}; do
- echo ${y}/${x}
- done
- done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if ! use ipc ; then
- einfo "Disabling ipc..."
- sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
- -i pym/_emerge/AbstractEbuildProcess.py || \
- die "failed to patch AbstractEbuildProcess.py"
- fi
-
- if use xattr && use kernel_linux ; then
- einfo "Adding FEATURES=xattr to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- if [[ -n ${EPREFIX} ]] ; then
- einfo "Setting portage.const.EPREFIX ..."
- sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
- -i pym/portage/const.py || \
- die "Failed to patch portage.const.EPREFIX"
-
- einfo "Prefixing shebangs ..."
- while read -r -d $'\0' ; do
- local shebang=$(head -n1 "$REPLY")
- if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
- sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
- die "sed failed"
- fi
- done < <(find . -type f -print0)
-
- einfo "Adjusting make.globals ..."
- sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
- -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
- -i cnf/make.globals || die "sed failed"
-
- einfo "Adjusting repos.conf ..."
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
- -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
- -i cnf/repos.conf || die "sed failed"
-
- einfo "Adding FEATURES=force-prefix to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- cd "${S}/cnf" || die
- if [ -f "make.conf.example.${ARCH}".diff ]; then
- patch make.conf.example "make.conf.example.${ARCH}".diff || \
- die "Failed to patch make.conf.example"
- else
- eerror ""
- eerror "Portage does not have an arch-specific configuration for this arch."
- eerror "Please notify the arch maintainer about this issue. Using generic."
- eerror ""
- fi
-}
-
-python_compile_all() {
- local targets=()
- use doc && targets+=( docbook )
- use epydoc && targets+=( epydoc )
-
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-}
-
-python_test() {
- esetup.py test
-}
-
-python_install() {
- # Install sbin scripts to bindir for python-exec linking
- # they will be relocated in pkg_preinst()
- distutils-r1_python_install \
- --system-prefix="${EPREFIX}/usr" \
- --bindir="$(python_get_scriptdir)" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
- --sbindir="$(python_get_scriptdir)" \
- --sysconfdir="${EPREFIX}/etc" \
- "${@}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- local targets=()
- use doc && targets+=( install_docbook )
- use epydoc && targets+=( install_epydoc )
-
- # install docs
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-
- # Due to distutils/python-exec limitations
- # these must be installed to /usr/bin.
- local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
- einfo "Moving admin scripts to the correct directory"
- dodir /usr/sbin
- for target in ${sbin_relocations}; do
- einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
- mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
- done
-}
-
-pkg_preinst() {
- # comment out sanity test until it is fixed to work
- # with the new PORTAGE_PYM_PATH
- #if [[ $ROOT == / ]] ; then
- ## Run some minimal tests as a sanity check.
- #local test_runner=$(find "${ED}" -name runTests)
- #if [[ -n $test_runner && -x $test_runner ]] ; then
- #einfo "Running preinst sanity tests..."
- #"$test_runner" || die "preinst sanity tests failed"
- #fi
- #fi
-
- # elog dir must exist to avoid logrotate error for bug #415911.
- # This code runs in preinst in order to bypass the mapping of
- # portage:portage to root:root which happens after src_install.
- keepdir /var/log/portage/elog
- # This is allowed to fail if the user/group are invalid for prefix users.
- if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
- chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
- fi
-
- if has_version "<${CATEGORY}/${PN}-2.1.13" || \
- {
- has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
- has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
- } ; then
- USERPRIV_UPGRADE=true
- USERSYNC_UPGRADE=true
- REPOS_CONF_UPGRADE=true
- REPOS_CONF_SYNC=
- type -P portageq >/dev/null 2>&1 && \
- REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
- else
- USERPRIV_UPGRADE=false
- USERSYNC_UPGRADE=false
- REPOS_CONF_UPGRADE=false
- fi
-}
-
-get_ownership() {
- case ${USERLAND} in
- BSD)
- stat -f '%Su:%Sg' "${1}"
- ;;
- *)
- stat -c '%U:%G' "${1}"
- ;;
- esac
-}
-
-new_config_protect() {
- # Generate a ._cfg file even if the target file
- # does not exist, ensuring that the user will
- # notice the config change.
- local basename=${1##*/}
- local dirname=${1%/*}
- local i=0
- while true ; do
- local filename=$(
- echo -n "${dirname}/._cfg"
- printf "%04d" ${i}
- echo -n "_${basename}"
- )
- [[ -e ${filename} ]] || break
- (( i++ ))
- done
- echo "${filename}"
-}
-
-pkg_postinst() {
-
- if ${REPOS_CONF_UPGRADE} ; then
- einfo "Generating repos.conf"
- local repo_name=
- [[ -f ${PORTDIR}/profiles/repo_name ]] && \
- repo_name=$(< "${PORTDIR}/profiles/repo_name")
- if [[ -z ${REPOS_CONF_SYNC} ]] ; then
- REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
- fi
- local sync_type=
- [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
- if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
- sync_type=cvs
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
- fi
-
- cat <<-EOF > "${T}/repos.conf"
- [DEFAULT]
- main-repo = ${repo_name:-gentoo}
-
- [${repo_name:-gentoo}]
- location = ${PORTDIR:-${EPREFIX}/usr/portage}
- sync-type = ${sync_type:-rsync}
- sync-uri = ${REPOS_CONF_SYNC}
- EOF
-
- [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
- local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
- if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
- dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
- fi
- # Don't install the config update if the desired repos.conf directory
- # and config file exist, since users may accept it blindly and break
- # their config (bug #478726).
- [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
- mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
- if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
- einfo "Generating make.conf PORTDIR setting for backward compatibility"
- for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
- [[ -e ${dest} ]] && break
- done
- [[ -d ${dest} ]] && dest=${dest}/portdir.conf
- rm -rf "${T}/make.conf"
- [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
- cat <<-EOF >> "${T}/make.conf"
-
- # Set PORTDIR for backward compatibility with various tools:
- # gentoo-bashcomp - bug #478444
- # euse - bug #474574
- # euses and ufed - bug #478318
- PORTDIR="${EPREFIX}/usr/portage"
- EOF
- mkdir -p "${dest%/*}"
- mv "${T}/make.conf" "$(new_config_protect "${dest}")"
- fi
- fi
-
- local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
- if ${USERSYNC_UPGRADE} && \
- [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
- local ownership=$(get_ownership "${PORTDIR}")
- if [[ -n ${ownership} ]] ; then
- einfo "Adjusting PORTDIR permissions for usersync"
- find "${PORTDIR}" -path "${distdir%/}" -prune -o \
- ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
- -exec chown "${ownership}" {} +
- fi
- fi
-
- # Do this last, since it could take a long time if there
- # are lots of live sources, and the user may be tempted
- # to kill emerge while it is running.
- if ${USERPRIV_UPGRADE} && \
- [[ -d ${distdir} && -w ${distdir} ]] ; then
- local ownership=$(get_ownership "${distdir}")
- if [[ ${ownership#*:} == portage ]] ; then
- einfo "Adjusting DISTDIR permissions for userpriv"
- find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
- -exec chown -R portage:portage {} +
- fi
- fi
-}
diff --git a/sys-apps/portage/portage-2.2.18.ebuild b/sys-apps/portage/portage-2.2.18.ebuild
deleted file mode 100644
index ebea2d3..0000000
--- a/sys-apps/portage/portage-2.2.18.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
- pypy
- python3_3 python3_4
- python2_7
-)
-# Note: substituted below
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
- dev-lang/python-exec:2
- >=sys-apps/sed-4.0.5 sys-devel/patch
- doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
- epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
- dev-lang/python-exec:2
- !build? (
- >=sys-apps/sed-4.0.5
- app-shells/bash:0[readline]
- >=app-admin/eselect-1.2
- )
- elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
- elibc_glibc? ( >=sys-apps/sandbox-2.2 )
- elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
- >=app-misc/pax-utils-0.1.17
- selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
- xattr? ( kernel_linux? (
- >=sys-apps/install-xattr-0.3
- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
- python2_7 pypy)
- ) )
- !<app-admin/logrotate-3.8.0"
-PDEPEND="
- !build? (
- >=net-misc/rsync-2.6.4
- userland_GNU? ( >=sys-apps/coreutils-6.4 )
- )"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-prefix_src_archives() {
- local x y
- for x in ${@}; do
- for y in ${SRC_ARCHIVES}; do
- echo ${y}/${x}
- done
- done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if ! use ipc ; then
- einfo "Disabling ipc..."
- sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
- -i pym/_emerge/AbstractEbuildProcess.py || \
- die "failed to patch AbstractEbuildProcess.py"
- fi
-
- if use xattr && use kernel_linux ; then
- einfo "Adding FEATURES=xattr to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- if [[ -n ${EPREFIX} ]] ; then
- einfo "Setting portage.const.EPREFIX ..."
- sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
- -i pym/portage/const.py || \
- die "Failed to patch portage.const.EPREFIX"
-
- einfo "Prefixing shebangs ..."
- while read -r -d $'\0' ; do
- local shebang=$(head -n1 "$REPLY")
- if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
- sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
- die "sed failed"
- fi
- done < <(find . -type f -print0)
-
- einfo "Adjusting make.globals ..."
- sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
- -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
- -i cnf/make.globals || die "sed failed"
-
- einfo "Adjusting repos.conf ..."
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
- -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
- -i cnf/repos.conf || die "sed failed"
-
- einfo "Adding FEATURES=force-prefix to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- cd "${S}/cnf" || die
- if [ -f "make.conf.example.${ARCH}".diff ]; then
- patch make.conf.example "make.conf.example.${ARCH}".diff || \
- die "Failed to patch make.conf.example"
- else
- eerror ""
- eerror "Portage does not have an arch-specific configuration for this arch."
- eerror "Please notify the arch maintainer about this issue. Using generic."
- eerror ""
- fi
-}
-
-python_compile_all() {
- local targets=()
- use doc && targets+=( docbook )
- use epydoc && targets+=( epydoc )
-
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-}
-
-python_test() {
- esetup.py test
-}
-
-python_install() {
- # Install sbin scripts to bindir for python-exec linking
- # they will be relocated in pkg_preinst()
- distutils-r1_python_install \
- --system-prefix="${EPREFIX}/usr" \
- --bindir="$(python_get_scriptdir)" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
- --sbindir="$(python_get_scriptdir)" \
- --sysconfdir="${EPREFIX}/etc" \
- "${@}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- local targets=()
- use doc && targets+=( install_docbook )
- use epydoc && targets+=( install_epydoc )
-
- # install docs
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-
- # Due to distutils/python-exec limitations
- # these must be installed to /usr/bin.
- local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
- einfo "Moving admin scripts to the correct directory"
- dodir /usr/sbin
- for target in ${sbin_relocations}; do
- einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
- mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
- done
-}
-
-pkg_preinst() {
- # comment out sanity test until it is fixed to work
- # with the new PORTAGE_PYM_PATH
- #if [[ $ROOT == / ]] ; then
- ## Run some minimal tests as a sanity check.
- #local test_runner=$(find "${ED}" -name runTests)
- #if [[ -n $test_runner && -x $test_runner ]] ; then
- #einfo "Running preinst sanity tests..."
- #"$test_runner" || die "preinst sanity tests failed"
- #fi
- #fi
-
- # elog dir must exist to avoid logrotate error for bug #415911.
- # This code runs in preinst in order to bypass the mapping of
- # portage:portage to root:root which happens after src_install.
- keepdir /var/log/portage/elog
- # This is allowed to fail if the user/group are invalid for prefix users.
- if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
- chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
- fi
-
- if has_version "<${CATEGORY}/${PN}-2.1.13" || \
- {
- has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
- has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
- } ; then
- USERPRIV_UPGRADE=true
- USERSYNC_UPGRADE=true
- REPOS_CONF_UPGRADE=true
- REPOS_CONF_SYNC=
- type -P portageq >/dev/null 2>&1 && \
- REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
- else
- USERPRIV_UPGRADE=false
- USERSYNC_UPGRADE=false
- REPOS_CONF_UPGRADE=false
- fi
-}
-
-get_ownership() {
- case ${USERLAND} in
- BSD)
- stat -f '%Su:%Sg' "${1}"
- ;;
- *)
- stat -c '%U:%G' "${1}"
- ;;
- esac
-}
-
-new_config_protect() {
- # Generate a ._cfg file even if the target file
- # does not exist, ensuring that the user will
- # notice the config change.
- local basename=${1##*/}
- local dirname=${1%/*}
- local i=0
- while true ; do
- local filename=$(
- echo -n "${dirname}/._cfg"
- printf "%04d" ${i}
- echo -n "_${basename}"
- )
- [[ -e ${filename} ]] || break
- (( i++ ))
- done
- echo "${filename}"
-}
-
-pkg_postinst() {
-
- if ${REPOS_CONF_UPGRADE} ; then
- einfo "Generating repos.conf"
- local repo_name=
- [[ -f ${PORTDIR}/profiles/repo_name ]] && \
- repo_name=$(< "${PORTDIR}/profiles/repo_name")
- if [[ -z ${REPOS_CONF_SYNC} ]] ; then
- REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
- fi
- local sync_type=
- [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
- if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
- sync_type=cvs
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
- fi
-
- cat <<-EOF > "${T}/repos.conf"
- [DEFAULT]
- main-repo = ${repo_name:-gentoo}
-
- [${repo_name:-gentoo}]
- location = ${PORTDIR:-${EPREFIX}/usr/portage}
- sync-type = ${sync_type:-rsync}
- sync-uri = ${REPOS_CONF_SYNC}
- EOF
-
- [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
- local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
- if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
- dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
- fi
- # Don't install the config update if the desired repos.conf directory
- # and config file exist, since users may accept it blindly and break
- # their config (bug #478726).
- [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
- mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
- if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
- einfo "Generating make.conf PORTDIR setting for backward compatibility"
- for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
- [[ -e ${dest} ]] && break
- done
- [[ -d ${dest} ]] && dest=${dest}/portdir.conf
- rm -rf "${T}/make.conf"
- [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
- cat <<-EOF >> "${T}/make.conf"
-
- # Set PORTDIR for backward compatibility with various tools:
- # gentoo-bashcomp - bug #478444
- # euse - bug #474574
- # euses and ufed - bug #478318
- PORTDIR="${EPREFIX}/usr/portage"
- EOF
- mkdir -p "${dest%/*}"
- mv "${T}/make.conf" "$(new_config_protect "${dest}")"
- fi
- fi
-
- local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
- if ${USERSYNC_UPGRADE} && \
- [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
- local ownership=$(get_ownership "${PORTDIR}")
- if [[ -n ${ownership} ]] ; then
- einfo "Adjusting PORTDIR permissions for usersync"
- find "${PORTDIR}" -path "${distdir%/}" -prune -o \
- ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
- -exec chown "${ownership}" {} +
- fi
- fi
-
- # Do this last, since it could take a long time if there
- # are lots of live sources, and the user may be tempted
- # to kill emerge while it is running.
- if ${USERPRIV_UPGRADE} && \
- [[ -d ${distdir} && -w ${distdir} ]] ; then
- local ownership=$(get_ownership "${distdir}")
- if [[ ${ownership#*:} == portage ]] ; then
- einfo "Adjusting DISTDIR permissions for userpriv"
- find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
- -exec chown -R portage:portage {} +
- fi
- fi
-}
diff --git a/sys-apps/portage/portage-2.2.20.ebuild b/sys-apps/portage/portage-2.2.20.ebuild
deleted file mode 100644
index 5db3fab..0000000
--- a/sys-apps/portage/portage-2.2.20.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
- pypy
- python3_3 python3_4
- python2_7
-)
-# Note: substituted below
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
- >=app-arch/tar-1.27
- dev-lang/python-exec:2
- >=sys-apps/sed-4.0.5 sys-devel/patch
- doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
- epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
- >=app-arch/tar-1.27
- dev-lang/python-exec:2
- !build? (
- >=sys-apps/sed-4.0.5
- app-shells/bash:0[readline]
- >=app-admin/eselect-1.2
- )
- elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
- elibc_glibc? ( >=sys-apps/sandbox-2.2 )
- elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
- >=app-misc/pax-utils-0.1.17
- selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
- xattr? ( kernel_linux? (
- >=sys-apps/install-xattr-0.3
- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
- python2_7 pypy)
- ) )
- !<app-admin/logrotate-3.8.0"
-PDEPEND="
- !build? (
- >=net-misc/rsync-2.6.4
- userland_GNU? ( >=sys-apps/coreutils-6.4 )
- )"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-prefix_src_archives() {
- local x y
- for x in ${@}; do
- for y in ${SRC_ARCHIVES}; do
- echo ${y}/${x}
- done
- done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if ! use ipc ; then
- einfo "Disabling ipc..."
- sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
- -i pym/_emerge/AbstractEbuildProcess.py || \
- die "failed to patch AbstractEbuildProcess.py"
- fi
-
- if use xattr && use kernel_linux ; then
- einfo "Adding FEATURES=xattr to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- if [[ -n ${EPREFIX} ]] ; then
- einfo "Setting portage.const.EPREFIX ..."
- sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
- -i pym/portage/const.py || \
- die "Failed to patch portage.const.EPREFIX"
-
- einfo "Prefixing shebangs ..."
- while read -r -d $'\0' ; do
- local shebang=$(head -n1 "$REPLY")
- if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
- sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
- die "sed failed"
- fi
- done < <(find . -type f -print0)
-
- einfo "Adjusting make.globals ..."
- sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
- -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
- -i cnf/make.globals || die "sed failed"
-
- einfo "Adjusting repos.conf ..."
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
- -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
- -i cnf/repos.conf || die "sed failed"
-
- einfo "Adding FEATURES=force-prefix to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- cd "${S}/cnf" || die
- if [ -f "make.conf.example.${ARCH}".diff ]; then
- patch make.conf.example "make.conf.example.${ARCH}".diff || \
- die "Failed to patch make.conf.example"
- else
- eerror ""
- eerror "Portage does not have an arch-specific configuration for this arch."
- eerror "Please notify the arch maintainer about this issue. Using generic."
- eerror ""
- fi
-}
-
-python_compile_all() {
- local targets=()
- use doc && targets+=( docbook )
- use epydoc && targets+=( epydoc )
-
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-}
-
-python_test() {
- esetup.py test
-}
-
-python_install() {
- # Install sbin scripts to bindir for python-exec linking
- # they will be relocated in pkg_preinst()
- distutils-r1_python_install \
- --system-prefix="${EPREFIX}/usr" \
- --bindir="$(python_get_scriptdir)" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
- --sbindir="$(python_get_scriptdir)" \
- --sysconfdir="${EPREFIX}/etc" \
- "${@}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- local targets=()
- use doc && targets+=( install_docbook )
- use epydoc && targets+=( install_epydoc )
-
- # install docs
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-
- # Due to distutils/python-exec limitations
- # these must be installed to /usr/bin.
- local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
- einfo "Moving admin scripts to the correct directory"
- dodir /usr/sbin
- for target in ${sbin_relocations}; do
- einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
- mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
- done
-}
-
-pkg_preinst() {
- # comment out sanity test until it is fixed to work
- # with the new PORTAGE_PYM_PATH
- #if [[ $ROOT == / ]] ; then
- ## Run some minimal tests as a sanity check.
- #local test_runner=$(find "${ED}" -name runTests)
- #if [[ -n $test_runner && -x $test_runner ]] ; then
- #einfo "Running preinst sanity tests..."
- #"$test_runner" || die "preinst sanity tests failed"
- #fi
- #fi
-
- # elog dir must exist to avoid logrotate error for bug #415911.
- # This code runs in preinst in order to bypass the mapping of
- # portage:portage to root:root which happens after src_install.
- keepdir /var/log/portage/elog
- # This is allowed to fail if the user/group are invalid for prefix users.
- if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
- chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
- fi
-
- if has_version "<${CATEGORY}/${PN}-2.1.13" || \
- {
- has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
- has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
- } ; then
- USERPRIV_UPGRADE=true
- USERSYNC_UPGRADE=true
- REPOS_CONF_UPGRADE=true
- REPOS_CONF_SYNC=
- type -P portageq >/dev/null 2>&1 && \
- REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
- else
- USERPRIV_UPGRADE=false
- USERSYNC_UPGRADE=false
- REPOS_CONF_UPGRADE=false
- fi
-}
-
-get_ownership() {
- case ${USERLAND} in
- BSD)
- stat -f '%Su:%Sg' "${1}"
- ;;
- *)
- stat -c '%U:%G' "${1}"
- ;;
- esac
-}
-
-new_config_protect() {
- # Generate a ._cfg file even if the target file
- # does not exist, ensuring that the user will
- # notice the config change.
- local basename=${1##*/}
- local dirname=${1%/*}
- local i=0
- while true ; do
- local filename=$(
- echo -n "${dirname}/._cfg"
- printf "%04d" ${i}
- echo -n "_${basename}"
- )
- [[ -e ${filename} ]] || break
- (( i++ ))
- done
- echo "${filename}"
-}
-
-pkg_postinst() {
-
- if ${REPOS_CONF_UPGRADE} ; then
- einfo "Generating repos.conf"
- local repo_name=
- [[ -f ${PORTDIR}/profiles/repo_name ]] && \
- repo_name=$(< "${PORTDIR}/profiles/repo_name")
- if [[ -z ${REPOS_CONF_SYNC} ]] ; then
- REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
- fi
- local sync_type=
- [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
- if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
- sync_type=cvs
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
- fi
-
- cat <<-EOF > "${T}/repos.conf"
- [DEFAULT]
- main-repo = ${repo_name:-gentoo}
-
- [${repo_name:-gentoo}]
- location = ${PORTDIR:-${EPREFIX}/usr/portage}
- sync-type = ${sync_type:-rsync}
- sync-uri = ${REPOS_CONF_SYNC}
- EOF
-
- [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
- local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
- if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
- dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
- fi
- # Don't install the config update if the desired repos.conf directory
- # and config file exist, since users may accept it blindly and break
- # their config (bug #478726).
- [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
- mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
- if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
- einfo "Generating make.conf PORTDIR setting for backward compatibility"
- for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
- [[ -e ${dest} ]] && break
- done
- [[ -d ${dest} ]] && dest=${dest}/portdir.conf
- rm -rf "${T}/make.conf"
- [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
- cat <<-EOF >> "${T}/make.conf"
-
- # Set PORTDIR for backward compatibility with various tools:
- # gentoo-bashcomp - bug #478444
- # euse - bug #474574
- # euses and ufed - bug #478318
- PORTDIR="${EPREFIX}/usr/portage"
- EOF
- mkdir -p "${dest%/*}"
- mv "${T}/make.conf" "$(new_config_protect "${dest}")"
- fi
- fi
-
- local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
- if ${USERSYNC_UPGRADE} && \
- [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
- local ownership=$(get_ownership "${PORTDIR}")
- if [[ -n ${ownership} ]] ; then
- einfo "Adjusting PORTDIR permissions for usersync"
- find "${PORTDIR}" -path "${distdir%/}" -prune -o \
- ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
- -exec chown "${ownership}" {} +
- fi
- fi
-
- # Do this last, since it could take a long time if there
- # are lots of live sources, and the user may be tempted
- # to kill emerge while it is running.
- if ${USERPRIV_UPGRADE} && \
- [[ -d ${distdir} && -w ${distdir} ]] ; then
- local ownership=$(get_ownership "${distdir}")
- if [[ ${ownership#*:} == portage ]] ; then
- einfo "Adjusting DISTDIR permissions for userpriv"
- find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
- -exec chown -R portage:portage {} +
- fi
- fi
-
- einfo ""
- einfo "The 'websync' module has now been properly renamed to 'webrsync'"
- einfo "Please update your repos.conf/gentoo.conf file if needed."
- einfo ""
- einfo "This release of portage removed the new squashfs sync module "
- einfo "introduced in portage-2.2.19."
- einfo "Look for it to be released as an installable portage module soon."
- einfo "This will allow it to develop at it's own pace partially independant"
- einfo "of portage"
- einfo ""
-}
diff --git a/sys-apps/portage/portage-2.2.22.ebuild b/sys-apps/portage/portage-2.2.22.ebuild
deleted file mode 100644
index 99d5c1c..0000000
--- a/sys-apps/portage/portage-2.2.22.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
- pypy
- python3_3 python3_4
- python2_7
-)
-# Note: substituted below
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
- >=app-arch/tar-1.27
- dev-lang/python-exec:2
- >=sys-apps/sed-4.0.5 sys-devel/patch
- doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
- epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
- >=app-arch/tar-1.27
- dev-lang/python-exec:2
- !build? (
- >=sys-apps/sed-4.0.5
- app-shells/bash:0[readline]
- >=app-admin/eselect-1.2
- )
- elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
- elibc_glibc? ( >=sys-apps/sandbox-2.2 )
- elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
- >=app-misc/pax-utils-0.1.17
- selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
- xattr? ( kernel_linux? (
- >=sys-apps/install-xattr-0.3
- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
- python2_7 pypy)
- ) )
- !<app-admin/logrotate-3.8.0"
-PDEPEND="
- !build? (
- >=net-misc/rsync-2.6.4
- userland_GNU? ( >=sys-apps/coreutils-6.4 )
- )"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-prefix_src_archives() {
- local x y
- for x in ${@}; do
- for y in ${SRC_ARCHIVES}; do
- echo ${y}/${x}
- done
- done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if ! use ipc ; then
- einfo "Disabling ipc..."
- sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
- -i pym/_emerge/AbstractEbuildProcess.py || \
- die "failed to patch AbstractEbuildProcess.py"
- fi
-
- if use xattr && use kernel_linux ; then
- einfo "Adding FEATURES=xattr to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- if [[ -n ${EPREFIX} ]] ; then
- einfo "Setting portage.const.EPREFIX ..."
- sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
- -i pym/portage/const.py || \
- die "Failed to patch portage.const.EPREFIX"
-
- einfo "Prefixing shebangs ..."
- while read -r -d $'\0' ; do
- local shebang=$(head -n1 "$REPLY")
- if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
- sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
- die "sed failed"
- fi
- done < <(find . -type f -print0)
-
- einfo "Adjusting make.globals ..."
- sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
- -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
- -i cnf/make.globals || die "sed failed"
-
- einfo "Adjusting repos.conf ..."
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
- -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
- -i cnf/repos.conf || die "sed failed"
-
- einfo "Adding FEATURES=force-prefix to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- cd "${S}/cnf" || die
- if [ -f "make.conf.example.${ARCH}".diff ]; then
- patch make.conf.example "make.conf.example.${ARCH}".diff || \
- die "Failed to patch make.conf.example"
- else
- eerror ""
- eerror "Portage does not have an arch-specific configuration for this arch."
- eerror "Please notify the arch maintainer about this issue. Using generic."
- eerror ""
- fi
-}
-
-python_compile_all() {
- local targets=()
- use doc && targets+=( docbook )
- use epydoc && targets+=( epydoc )
-
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-}
-
-python_test() {
- esetup.py test
-}
-
-python_install() {
- # Install sbin scripts to bindir for python-exec linking
- # they will be relocated in pkg_preinst()
- distutils-r1_python_install \
- --system-prefix="${EPREFIX}/usr" \
- --bindir="$(python_get_scriptdir)" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
- --sbindir="$(python_get_scriptdir)" \
- --sysconfdir="${EPREFIX}/etc" \
- "${@}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- local targets=()
- use doc && targets+=( install_docbook )
- use epydoc && targets+=( install_epydoc )
-
- # install docs
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-
- # Due to distutils/python-exec limitations
- # these must be installed to /usr/bin.
- local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
- einfo "Moving admin scripts to the correct directory"
- dodir /usr/sbin
- for target in ${sbin_relocations}; do
- einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
- mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
- done
-}
-
-pkg_preinst() {
- # comment out sanity test until it is fixed to work
- # with the new PORTAGE_PYM_PATH
- #if [[ $ROOT == / ]] ; then
- ## Run some minimal tests as a sanity check.
- #local test_runner=$(find "${ED}" -name runTests)
- #if [[ -n $test_runner && -x $test_runner ]] ; then
- #einfo "Running preinst sanity tests..."
- #"$test_runner" || die "preinst sanity tests failed"
- #fi
- #fi
-
- # elog dir must exist to avoid logrotate error for bug #415911.
- # This code runs in preinst in order to bypass the mapping of
- # portage:portage to root:root which happens after src_install.
- keepdir /var/log/portage/elog
- # This is allowed to fail if the user/group are invalid for prefix users.
- if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
- chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
- fi
-
- if has_version "<${CATEGORY}/${PN}-2.1.13" || \
- {
- has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
- has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
- } ; then
- USERPRIV_UPGRADE=true
- USERSYNC_UPGRADE=true
- REPOS_CONF_UPGRADE=true
- REPOS_CONF_SYNC=
- type -P portageq >/dev/null 2>&1 && \
- REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
- else
- USERPRIV_UPGRADE=false
- USERSYNC_UPGRADE=false
- REPOS_CONF_UPGRADE=false
- fi
-}
-
-get_ownership() {
- case ${USERLAND} in
- BSD)
- stat -f '%Su:%Sg' "${1}"
- ;;
- *)
- stat -c '%U:%G' "${1}"
- ;;
- esac
-}
-
-new_config_protect() {
- # Generate a ._cfg file even if the target file
- # does not exist, ensuring that the user will
- # notice the config change.
- local basename=${1##*/}
- local dirname=${1%/*}
- local i=0
- while true ; do
- local filename=$(
- echo -n "${dirname}/._cfg"
- printf "%04d" ${i}
- echo -n "_${basename}"
- )
- [[ -e ${filename} ]] || break
- (( i++ ))
- done
- echo "${filename}"
-}
-
-pkg_postinst() {
-
- if ${REPOS_CONF_UPGRADE} ; then
- einfo "Generating repos.conf"
- local repo_name=
- [[ -f ${PORTDIR}/profiles/repo_name ]] && \
- repo_name=$(< "${PORTDIR}/profiles/repo_name")
- if [[ -z ${REPOS_CONF_SYNC} ]] ; then
- REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
- fi
- local sync_type=
- [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
- if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
- sync_type=cvs
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
- fi
-
- cat <<-EOF > "${T}/repos.conf"
- [DEFAULT]
- main-repo = ${repo_name:-gentoo}
-
- [${repo_name:-gentoo}]
- location = ${PORTDIR:-${EPREFIX}/usr/portage}
- sync-type = ${sync_type:-rsync}
- sync-uri = ${REPOS_CONF_SYNC}
- EOF
-
- [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
- local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
- if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
- dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
- fi
- # Don't install the config update if the desired repos.conf directory
- # and config file exist, since users may accept it blindly and break
- # their config (bug #478726).
- [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
- mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
- if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
- einfo "Generating make.conf PORTDIR setting for backward compatibility"
- for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
- [[ -e ${dest} ]] && break
- done
- [[ -d ${dest} ]] && dest=${dest}/portdir.conf
- rm -rf "${T}/make.conf"
- [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
- cat <<-EOF >> "${T}/make.conf"
-
- # Set PORTDIR for backward compatibility with various tools:
- # gentoo-bashcomp - bug #478444
- # euse - bug #474574
- # euses and ufed - bug #478318
- PORTDIR="${EPREFIX}/usr/portage"
- EOF
- mkdir -p "${dest%/*}"
- mv "${T}/make.conf" "$(new_config_protect "${dest}")"
- fi
- fi
-
- local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
- if ${USERSYNC_UPGRADE} && \
- [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
- local ownership=$(get_ownership "${PORTDIR}")
- if [[ -n ${ownership} ]] ; then
- einfo "Adjusting PORTDIR permissions for usersync"
- find "${PORTDIR}" -path "${distdir%/}" -prune -o \
- ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
- -exec chown "${ownership}" {} +
- fi
- fi
-
- # Do this last, since it could take a long time if there
- # are lots of live sources, and the user may be tempted
- # to kill emerge while it is running.
- if ${USERPRIV_UPGRADE} && \
- [[ -d ${distdir} && -w ${distdir} ]] ; then
- local ownership=$(get_ownership "${distdir}")
- if [[ ${ownership#*:} == portage ]] ; then
- einfo "Adjusting DISTDIR permissions for userpriv"
- find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
- -exec chown -R portage:portage {} +
- fi
- fi
-
- einfo ""
- einfo "This release of portage contains the new repoman code base"
- einfo "This code base is still being developed. So its API's are"
- einfo "not to be considered stable and are subject to change."
- einfo "The code released has been tested and considered ready for use."
- einfo "This however does not guarantee it to be completely bug free."
- einfo "Please report any bugs you may encounter."
- einfo ""
-}
diff --git a/sys-apps/portage/portage-2.2.23.ebuild b/sys-apps/portage/portage-2.2.23.ebuild
new file mode 100644
index 0000000..43cb079
--- /dev/null
+++ b/sys-apps/portage/portage-2.2.23.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(
+ pypy
+ python3_3 python3_4 python3_5
+ python2_7
+)
+# Note: substituted below
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
+
+DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ >=sys-apps/sed-4.0.5 sys-devel/patch
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+ epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ !build? (
+ >=sys-apps/sed-4.0.5
+ app-shells/bash:0[readline]
+ >=app-admin/eselect-1.2
+ )
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ >=app-misc/pax-utils-0.1.17
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+ xattr? ( kernel_linux? (
+ >=sys-apps/install-xattr-0.3
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+ python2_7 pypy)
+ ) )
+ !<app-admin/logrotate-3.8.0"
+PDEPEND="
+ !build? (
+ >=net-misc/rsync-2.6.4
+ userland_GNU? ( >=sys-apps/coreutils-6.4 )
+ )"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
+
+prefix_src_archives() {
+ local x y
+ for x in ${@}; do
+ for y in ${SRC_ARCHIVES}; do
+ echo ${y}/${x}
+ done
+ done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ if ! use ipc ; then
+ einfo "Disabling ipc..."
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+ -i pym/_emerge/AbstractEbuildProcess.py || \
+ die "failed to patch AbstractEbuildProcess.py"
+ fi
+
+ if use xattr && use kernel_linux ; then
+ einfo "Adding FEATURES=xattr to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ if [[ -n ${EPREFIX} ]] ; then
+ einfo "Setting portage.const.EPREFIX ..."
+ sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+ -i pym/portage/const.py || \
+ die "Failed to patch portage.const.EPREFIX"
+
+ einfo "Prefixing shebangs ..."
+ while read -r -d $'\0' ; do
+ local shebang=$(head -n1 "$REPLY")
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+ die "sed failed"
+ fi
+ done < <(find . -type f -print0)
+
+ einfo "Adjusting make.globals ..."
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+ -i cnf/make.globals || die "sed failed"
+
+ einfo "Adjusting repos.conf ..."
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+ -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
+ -i cnf/repos.conf || die "sed failed"
+
+ einfo "Adding FEATURES=force-prefix to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ cd "${S}/cnf" || die
+ if [ -f "make.conf.example.${ARCH}".diff ]; then
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \
+ die "Failed to patch make.conf.example"
+ else
+ eerror ""
+ eerror "Portage does not have an arch-specific configuration for this arch."
+ eerror "Please notify the arch maintainer about this issue. Using generic."
+ eerror ""
+ fi
+}
+
+python_compile_all() {
+ local targets=()
+ use doc && targets+=( docbook )
+ use epydoc && targets+=( epydoc )
+
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install() {
+ # Install sbin scripts to bindir for python-exec linking
+ # they will be relocated in pkg_preinst()
+ distutils-r1_python_install \
+ --system-prefix="${EPREFIX}/usr" \
+ --bindir="$(python_get_scriptdir)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+ --sbindir="$(python_get_scriptdir)" \
+ --sysconfdir="${EPREFIX}/etc" \
+ "${@}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ local targets=()
+ use doc && targets+=( install_docbook )
+ use epydoc && targets+=( install_epydoc )
+
+ # install docs
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+
+ # Due to distutils/python-exec limitations
+ # these must be installed to /usr/bin.
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+ einfo "Moving admin scripts to the correct directory"
+ dodir /usr/sbin
+ for target in ${sbin_relocations}; do
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+ done
+}
+
+pkg_preinst() {
+ # comment out sanity test until it is fixed to work
+ # with the new PORTAGE_PYM_PATH
+ #if [[ $ROOT == / ]] ; then
+ ## Run some minimal tests as a sanity check.
+ #local test_runner=$(find "${ED}" -name runTests)
+ #if [[ -n $test_runner && -x $test_runner ]] ; then
+ #einfo "Running preinst sanity tests..."
+ #"$test_runner" || die "preinst sanity tests failed"
+ #fi
+ #fi
+
+ # elog dir must exist to avoid logrotate error for bug #415911.
+ # This code runs in preinst in order to bypass the mapping of
+ # portage:portage to root:root which happens after src_install.
+ keepdir /var/log/portage/elog
+ # This is allowed to fail if the user/group are invalid for prefix users.
+ if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+ chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+ fi
+
+ if has_version "<${CATEGORY}/${PN}-2.1.13" || \
+ {
+ has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
+ has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
+ } ; then
+ USERPRIV_UPGRADE=true
+ USERSYNC_UPGRADE=true
+ REPOS_CONF_UPGRADE=true
+ REPOS_CONF_SYNC=
+ type -P portageq >/dev/null 2>&1 && \
+ REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
+ else
+ USERPRIV_UPGRADE=false
+ USERSYNC_UPGRADE=false
+ REPOS_CONF_UPGRADE=false
+ fi
+}
+
+get_ownership() {
+ case ${USERLAND} in
+ BSD)
+ stat -f '%Su:%Sg' "${1}"
+ ;;
+ *)
+ stat -c '%U:%G' "${1}"
+ ;;
+ esac
+}
+
+new_config_protect() {
+ # Generate a ._cfg file even if the target file
+ # does not exist, ensuring that the user will
+ # notice the config change.
+ local basename=${1##*/}
+ local dirname=${1%/*}
+ local i=0
+ while true ; do
+ local filename=$(
+ echo -n "${dirname}/._cfg"
+ printf "%04d" ${i}
+ echo -n "_${basename}"
+ )
+ [[ -e ${filename} ]] || break
+ (( i++ ))
+ done
+ echo "${filename}"
+}
+
+pkg_postinst() {
+
+ if ${REPOS_CONF_UPGRADE} ; then
+ einfo "Generating repos.conf"
+ local repo_name=
+ [[ -f ${PORTDIR}/profiles/repo_name ]] && \
+ repo_name=$(< "${PORTDIR}/profiles/repo_name")
+ if [[ -z ${REPOS_CONF_SYNC} ]] ; then
+ REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
+ REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
+ fi
+ local sync_type=
+ [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
+
+ if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
+ sync_type=cvs
+ REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
+ fi
+
+ cat <<-EOF > "${T}/repos.conf"
+ [DEFAULT]
+ main-repo = ${repo_name:-gentoo}
+
+ [${repo_name:-gentoo}]
+ location = ${PORTDIR:-${EPREFIX}/usr/portage}
+ sync-type = ${sync_type:-rsync}
+ sync-uri = ${REPOS_CONF_SYNC}
+ EOF
+
+ [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
+
+ local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
+ if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
+ dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
+ fi
+ # Don't install the config update if the desired repos.conf directory
+ # and config file exist, since users may accept it blindly and break
+ # their config (bug #478726).
+ [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
+ mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
+
+ if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
+ einfo "Generating make.conf PORTDIR setting for backward compatibility"
+ for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
+ [[ -e ${dest} ]] && break
+ done
+ [[ -d ${dest} ]] && dest=${dest}/portdir.conf
+ rm -rf "${T}/make.conf"
+ [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
+ cat <<-EOF >> "${T}/make.conf"
+
+ # Set PORTDIR for backward compatibility with various tools:
+ # gentoo-bashcomp - bug #478444
+ # euse - bug #474574
+ # euses and ufed - bug #478318
+ PORTDIR="${EPREFIX}/usr/portage"
+ EOF
+ mkdir -p "${dest%/*}"
+ mv "${T}/make.conf" "$(new_config_protect "${dest}")"
+ fi
+ fi
+
+ local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
+
+ if ${USERSYNC_UPGRADE} && \
+ [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
+ local ownership=$(get_ownership "${PORTDIR}")
+ if [[ -n ${ownership} ]] ; then
+ einfo "Adjusting PORTDIR permissions for usersync"
+ find "${PORTDIR}" -path "${distdir%/}" -prune -o \
+ ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
+ -exec chown "${ownership}" {} +
+ fi
+ fi
+
+ # Do this last, since it could take a long time if there
+ # are lots of live sources, and the user may be tempted
+ # to kill emerge while it is running.
+ if ${USERPRIV_UPGRADE} && \
+ [[ -d ${distdir} && -w ${distdir} ]] ; then
+ local ownership=$(get_ownership "${distdir}")
+ if [[ ${ownership#*:} == portage ]] ; then
+ einfo "Adjusting DISTDIR permissions for userpriv"
+ find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
+ -exec chown -R portage:portage {} +
+ fi
+ fi
+
+ einfo ""
+ einfo "This release of portage contains the new repoman code base"
+ einfo "This code base is still being developed. So its API's are"
+ einfo "not to be considered stable and are subject to change."
+ einfo "The code released has been tested and considered ready for use."
+ einfo "This however does not guarantee it to be completely bug free."
+ einfo "Please report any bugs you may encounter."
+ einfo ""
+}
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 51113f5..f6dea3e 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -6,7 +6,7 @@
PYTHON_COMPAT=(
pypy
- python3_3 python3_4
+ python3_3 python3_4 python3_5
python2_7
)
# Note: substituted below
diff --git a/sys-apps/progress/Manifest b/sys-apps/progress/Manifest
new file mode 100644
index 0000000..9573a57
--- /dev/null
+++ b/sys-apps/progress/Manifest
@@ -0,0 +1 @@
+DIST progress-0.9.tar.gz 56297 SHA256 63e1834ec114ccc1de3d11722131b5975e475bfd72711d457e21ddd7fd16b6bd SHA512 f2928b2bf2a50edd0b85c5c1452d6c8451ad271527cf7963dce3498ded85804a9ecae7c8483b654f8f4751e7697796a8d5bb8cd310d9f6dc4b9db7769ef11e92 WHIRLPOOL b890e9dc049a20f3da1caaab6fcefd7be53710f58f0f84b464cf7ac5bdeb7102324b38b1bbe51994f7c5917d18aeae633133a965e1cb0d038e8e6b7de100f2d8
diff --git a/sys-apps/cv/metadata.xml b/sys-apps/progress/metadata.xml
similarity index 100%
rename from sys-apps/cv/metadata.xml
rename to sys-apps/progress/metadata.xml
diff --git a/sys-apps/progress/progress-0.9.ebuild b/sys-apps/progress/progress-0.9.ebuild
new file mode 100644
index 0000000..2ad11d2
--- /dev/null
+++ b/sys-apps/progress/progress-0.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Coreutils Viewer: show progress for cp, rm, dd, and so forth"
+HOMEPAGE="https://github.com/Xfennec/progress"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ sed -i \
+ -e '/LDFLAGS/s:-lncurses:$(shell $(PKG_CONFIG) --libs ncurses):' \
+ -e 's:CFLAGS=-g:CFLAGS+=:' \
+ -e 's:gcc:$(CC):g' \
+ Makefile || die
+ tc-export CC PKG_CONFIG
+}
+
+src_install() {
+ emake PREFIX="${D}/${EPREFIX}/usr" install
+ dodoc README.md
+}
diff --git a/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch b/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch
new file mode 100644
index 0000000..a48b235
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch
@@ -0,0 +1,45 @@
+From: Gokturk Yuksek <gokturk@binghamton.edu>
+Subject: [PATCH] Fix rngd to open the entropy source with 'O_NOCTTY' flag
+
+When start-stop-daemon starts a rngd instance configured to use a tty
+device as its entropy source, the application crashes due to not being
+able to read from the entropy device. This is caused by
+start-stop-daemon calling setsid() before executing rngd, which
+disassociates the controlling terminal. When rngd attempts to open a
+hardware entropy source that's a tty device, per POSIX rules, the
+device becomes the controlling terminal for the process. Then rngd
+calls daemon(), which internally calls setsid(), and consequently
+disassociates the controlling terminal for the child. Meanwhile the
+parent rngd process exits. This results in tty device hanging up. By
+looking at the strace logs attached to the bug, it can be observed
+that although the parent rngd process is able to read() from the
+entropy source successfully, further attempts to read() by the child
+rngd process return 0. This complies with the POSIX, which states that
+read() calls on a hung up terminal shall return 0.
+
+Note that when rngd is started without start-stop-daemon, this problem
+does not happen because at the time of opening the entropy source rngd
+already has a controlling terminal.
+
+Prevent the entropy source from becoming the controlling terminal by
+passing 'O_NOCTTY' flag to open() when opening an entropy source. This
+flag prevents a tty device from becoming the controlling terminal for
+a process without a controlling terminal at the time of open().
+
+Thanks to John Bowler <jbowler@acm.org> for debugging the problem and
+pinpointing the issue as well as confirming the fix.
+
+Gentoo-Bug-URL: https://bugs.gentoo.org/556456
+Reported-By: John Bowler <jbowler@acm.org>
+
+--- rngd_entsource.c
++++ rngd_entsource.c
+@@ -175,7 +175,7 @@
+ */
+ int init_entropy_source(struct rng *ent_src)
+ {
+- ent_src->rng_fd = open(ent_src->rng_name, O_RDONLY);
++ ent_src->rng_fd = open(ent_src->rng_name, O_RDONLY | O_NOCTTY);
+ if (ent_src->rng_fd == -1) {
+ return 1;
+ }
diff --git a/sys-apps/rng-tools/files/rngd-initd-r1-4.1 b/sys-apps/rng-tools/files/rngd-initd-r1-4.1
index 1e63c84..d7f8a86 100644
--- a/sys-apps/rng-tools/files/rngd-initd-r1-4.1
+++ b/sys-apps/rng-tools/files/rngd-initd-r1-4.1
@@ -9,9 +9,6 @@
provide entropy
}
-# Do NOT add /dev/tpm to this.
-DEFAULT_DEVICE="/dev/hw_random* /dev/hwrandom* /dev/i810_rng /dev/hwrng*"
-
command=/usr/sbin/rngd
pidfile="/var/run/${SVCNAME}.pid"
command_args="--pid-file ${pidfile} --background --random-step ${STEP:-64} ${NO_TPM:+--no-tpm=1} \
diff --git a/sys-apps/rng-tools/rng-tools-5-r2.ebuild b/sys-apps/rng-tools/rng-tools-5-r2.ebuild
new file mode 100644
index 0000000..a104f8b
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools systemd toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="http://gkernel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="selinux"
+
+DEPEND="dev-libs/libgcrypt:0
+ dev-libs/libgpg-error"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-rngd )"
+
+src_prepare() {
+ echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+ epatch "${FILESDIR}"/test-for-argp.patch
+ epatch "${FILESDIR}"/${P}-fix-textrels-on-PIC-x86.patch #469962
+ epatch "${FILESDIR}"/${P}-man-fill-watermark.patch #555094
+ epatch "${FILESDIR}"/${P}-man-rng-device.patch #555106
+ epatch "${FILESDIR}"/${P}-fix-noctty.patch #556456
+ eautoreconf
+
+ sed -i '/^AR /d' Makefile.in || die
+ tc-export AR
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}"/rngd-initd-r1-4.1 rngd
+ newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
+ systemd_dounit "${FILESDIR}"/rngd.service
+}
diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml
index 5979227..87480c4 100644
--- a/sys-apps/shadow/metadata.xml
+++ b/sys-apps/shadow/metadata.xml
@@ -3,9 +3,6 @@
<pkgmetadata>
<herd>base-system</herd>
<herd>pam</herd> <!-- only for USE=pam -->
-<use>
- <flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
-</use>
<upstream>
<remote-id type="cpe">cpe:/a:debian:shadow</remote-id>
</upstream>
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index ca76f13..72c65e0 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -92,7 +92,7 @@
app-text/docbook-xml-dtd:4.5
app-text/docbook-xsl-stylesheets
dev-libs/libxslt:0
- >=dev-libs/libgcrypt-1.4.5:0"
+"
pkg_pretend() {
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index fa7b65f..91ee485 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1 +1,2 @@
DIST the_silver_searcher-0.29.1.tar.gz 65821 SHA256 779eb781751fd3dc07bff3b88f4475ed78eea3fa7b21139d8230d17c31db072a SHA512 648efe0cd52092ee5d036c7d024c7e2d1ce728c5f80ea9447356f2e31cdbbe96fee67b968a9d66c2b3739f1fc8f6d639452019c6fdeb5996e0d74e9549729fe5 WHIRLPOOL 0dd3934daaf42e1414363ae2b4409bb2187a9c6bbfb76c6cc9337c07129c9d744fe71a3c1d9670531ac92fe9ae4793a5bfad35185b6e697ccfc1d571f1055985
+DIST the_silver_searcher-0.31.0.tar.gz 150102 SHA256 61bc827f4557d8108e91cdfc9ba31632e2568b26884c92426417f58135b37da8 SHA512 61629ee3b11462a978a03879c19cf327cd08d5e669136c85c8f217b5e5ad27f78058c62555f47ae58882451361e09cf8093c7d4f4c4eda160a78f755af50b092 WHIRLPOOL 843e9502a4dbbfb5a049b524b2a85156bc57b624e10c875d5438bb6641ea48edee818af3f473d254cb16f188c321c17bc3b6da69aaf0ff081f055c61209302e1
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild
new file mode 100644
index 0000000..8d5e95c
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher"
+SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="lzma zlib"
+
+RDEPEND="dev-libs/libpcre
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS="README.md"
+
+src_prepare() {
+ sed -i '/^dist_bashcomp/d' Makefile.am || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable lzma) \
+ $(use_enable zlib)
+}
+
+src_install() {
+ default
+ newbashcomp ag.bashcomp.sh ag
+}
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index c9daa9c..2d98187 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -1,10 +1,5 @@
-DIST usb-modeswitch-1.2.7.tar.bz2 259738 SHA256 f61e63e544575f4757b8f9d22416d63ebd5a24c7876c7b0539026a98601f9c7d SHA512 d1c033809e22e25aa089af0f1df6ad0db848fa1a6f98bf552f3a4b86189301cfb1ec1563158ce63b7539ea8c2302257de67fa7766e7ebd1c4c7c9a6fdbe149a5 WHIRLPOOL de9db037ff8d983b56bd14a1ea94b948f550c96bdc62b52cbdfe882d2cf27f4ba5d5d0c5c0e66609d318eb55e37c1b5a61de3d8eb7540dd6aa3be4ed11471887
-DIST usb-modeswitch-2.1.0.tar.bz2 261428 SHA256 53fd6927843817c30b17c496443a31c0e5df52a88b6c4b2c2c2bef6e976e40de SHA512 9aa80edf6ace56503347030f8881d327491d7cce065ae4a7b91463833ee0c67ab87cb8018da6075ee563d94ec019b97ea69ac9c4f29afce743bac480121ae668 WHIRLPOOL 00ba131f2f74379f6f2f411053b4b84fb70a8854c077ac1c6ac2cc87ed6e7f9a0098315d2a4d816c2dd4cf8f92c06375de73562d14e454936ac4785505f92430
-DIST usb-modeswitch-2.1.1.tar.bz2 261358 SHA256 5ad1134e142502f52f034c1e3f148386d334ddb70e744be96a5174d303dc2542 SHA512 582323b27d875bfe05f0337f2548b77e4b3cc9ab2b644eecefd377f021e2cb1283aae3100f8fba6dccb5f9172ee57cd2d2175d3ff6e17744f18b0e2df0a24d89 WHIRLPOOL f7b279a9c127319bfb56ba99cd82941f9e1dc32a181d2b3c536f4cb55bf114bed200f27064dacaaa3128becaedf637158fc3911aa3b887ba98ef1bb026b1a7e2
DIST usb-modeswitch-2.2.0.tar.bz2 261888 SHA256 2752103de171ed5f6c8d6a6e3e73e16c9ee3e8e394dd39c5991f7680eb908a3a SHA512 1311365c580035361e961ffefb84acf88771aae17d4b084733f2e0d10ac2ad770cf7d3b64c1c6cc400f19082530b425714f3afb88d10d6023e3798261a982e67 WHIRLPOOL 0e9e2bca6e72c9f34a18c82ba52d02b3281f3a016a5fdab251f7556b4d4aa04936c22a08e97d13985e2cf2d416ee0d51a5cf9494d0e9a449022259025b9d187c
DIST usb-modeswitch-2.2.3.tar.bz2 263038 SHA256 d1a0d9a9e7411f07796611881a8f264daa946e2a28418abed34639b3583d7593 SHA512 f6d30e251bd4a1d6459cb7ac3594d204c21e0ca22ab0fa44ea675176751e4a2f08a4f42ce2ec0d2caf0bbca56438800327f7e5e16832e383263a4002941fa869 WHIRLPOOL c8a0c1c7bad335da8a9c2d87202ba5ac897d1d469c95c45c1677c41d04256dd97a4577eafd48104d135c5d15cda7c9bc287ecf38b457d4b2d4cce29471931a6e
-DIST usb-modeswitch-data-20130807.tar.bz2 23890 SHA256 a3114e2c1f38eed3ad0067df30e53a96313908a9539a8ea5d94a4d35651699eb SHA512 179669c3ac9077d1727298f55500e886386bb4b01d4f8fe6425bde2ec4f1f394fa0a16a4cc8e91a6a5a82e804b5fa10af2009db1bc7c34bfb759202e63574cd9 WHIRLPOOL 0794dd0a90104425a8cc790d9059f4fc3c874819c67663f7e541bac165b2420c20acca1b9e5275acb68d091c0c493f32934acb75a0a5993cd1e6fdc364065308
-DIST usb-modeswitch-data-20140129.tar.bz2 24189 SHA256 1ce641a76ab01b155beeec9ead3427a5f52b798af197024fdfb3d0190f5feb0d SHA512 74bf90f69ea4e5c1b94de0629e82c1bdf056afec96f152ac35874beafd4cbd0d6b6a0868a6aa72e3064a87fc7e3a58ff56f477649cd6e570782290191accaf2c WHIRLPOOL 86651bc9055e8c4107ce72bf5d54820aa09cc5b1cf51daebca6c5b817ea255b070d9249744f07b03306940259e93a57a91c74dcecc63195f33dbb2db0e6d70f5
-DIST usb-modeswitch-data-20140327.tar.bz2 24273 SHA256 8f9f53c0871239b41d9cf377f528c9de8feddc31c391bd2ed903e17a28e983c7 SHA512 de499f3381a470d73c4781f2f24e0c9d9e059a6f3dd3a73a72125719bb8ce6b687d611f6300531407d2815ea10867cd3a3d2b99bfbf489bc6ac47a0665f8d0fd WHIRLPOOL b4ebca281c626a762c040b15b131b43fbb9732b550620619af418781ea1242ea8e57fa4fb8de36d6c992ebdf8a78f973d1d7fb41482d179d5da88b0c5380071c
+DIST usb-modeswitch-2.2.5.tar.bz2 263335 SHA256 8b2340303732aabc8c8e1cdd7d4352f61dcb942839f58ce22ba0ecfa122426d5 SHA512 007c14fbf64b17b422be4e54baa0f345f03dd322871886d1200e76d3af623fa78b130f66869be1e8e8f2a16f0350b4be8b9e8d7ea416af0b4c2730ab440d7023 WHIRLPOOL 0a6723f4a08293a366f3a063fe045224ca802b4c2cb8b9f7ae431fa41249a6ba937669a273ab6cd2e989e8a977ffaea386d2c7285289ca140c0619c5d75be0ea
DIST usb-modeswitch-data-20140529.tar.bz2 27383 SHA256 53889157937109e04dafe897c098ec94f3f44f9c0c83fc6ec8417aa9a587e536 SHA512 e0ac311ae09dcf41b45e9434bf43e7964ec0a32ac68024216ddfb6d6fd9d3b484cbe663ec081841e11a4af80e50fce12f1a06e0249aa229558085886c0f25809 WHIRLPOOL 64c4f5c63a85a55ca21f530c3bd3eb50756c5a596f96f85bbadf152e34becf90cc29a2b368a77f3e65bbfff36241ffdd6c09cf50692f730c62567162ab200102
DIST usb-modeswitch-data-20150627.tar.bz2 29918 SHA256 826096cb35a487c6e924b1318074988457220b5e72812e5393597950dd9eefc2 SHA512 0d1f7a5844d5a8d50e03b842adc2add5c3c4025fd034df6355312b399e714c7df2f5cd01c497e36c6a09744c4376bf4e2af6eef2aebaa1154086fce57a0bce62 WHIRLPOOL cdbd9489a1674645b6d2db2ace43353e813e30d10d30439aac87b232a0496d2424ecafb04faa1ca514be27cbd408880f1b5c323df3ed046e071d87a2091236f8
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.2.7_p20130807.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.2.7_p20130807.ebuild
deleted file mode 100644
index 529dd75..0000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-1.2.7_p20130807.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info toolchain-funcs udev
-
-MY_PN=${PN/_/-}
-MY_P=${MY_PN}-${PV/_p*}
-DATA_VER=${PV/*_p}
-
-DESCRIPTION="USB_ModeSwitch is a tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/ http://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
- http://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="jimtcl"
-
-COMMON_DEPEND="virtual/udev
- virtual/libusb:0
- !<sys-apps/kmod-12-r1"
-RDEPEND="${COMMON_DEPEND}
- jimtcl? ( dev-lang/jimtcl )
- !jimtcl? ( dev-lang/tcl:0 )" # usb_modeswitch script is tcl
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~USB_SERIAL"
-
-src_prepare() {
- sed -i -e '/install.*BIN/s:-s::' Makefile || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- UDEVDIR="${D}/$(get_udevdir)" \
- $(usex jimtcl install-shared install)
-
- dodoc ChangeLog README
-
- pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
- emake \
- DESTDIR="${D}" \
- RULESDIR="${D}/$(get_udevdir)/rules.d" \
- files-install db-install
- docinto data
- dodoc ChangeLog README
- popd >/dev/null
-}
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.1.0_p20140129.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.1.0_p20140129.ebuild
deleted file mode 100644
index 7bebe27..0000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.1.0_p20140129.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info toolchain-funcs udev systemd
-
-MY_PN=${PN/_/-}
-MY_P=${MY_PN}-${PV/_p*}
-DATA_VER=${PV/*_p}
-
-DESCRIPTION="USB_ModeSwitch is a tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/ http://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
- http://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="jimtcl"
-
-COMMON_DEPEND="virtual/udev
- virtual/libusb:1"
-RDEPEND="${COMMON_DEPEND}
- jimtcl? ( dev-lang/jimtcl )
- !jimtcl? ( dev-lang/tcl:0 )" # usb_modeswitch script is tcl
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~USB_SERIAL"
-
-src_prepare() {
- sed -i -e '/install.*BIN/s:-s::' Makefile || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- SYSDIR="${D}/$(systemd_get_unitdir)" \
- UDEVDIR="${D}/$(get_udevdir)" \
- $(usex jimtcl install-shared install)
-
- # Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary,
- # which is why we need to force the .service file to be installed:
- systemd_dounit ${PN}@.service
-
- dodoc ChangeLog README
-
- pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
- emake \
- DESTDIR="${D}" \
- RULESDIR="${D}/$(get_udevdir)/rules.d" \
- files-install db-install
- docinto data
- dodoc ChangeLog README
- popd >/dev/null
-}
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.1.1_p20140327.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.1.1_p20140327.ebuild
deleted file mode 100644
index 909a6bb..0000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.1.1_p20140327.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info toolchain-funcs udev systemd
-
-MY_PN=${PN/_/-}
-MY_P=${MY_PN}-${PV/_p*}
-DATA_VER=${PV/*_p}
-
-DESCRIPTION="USB_ModeSwitch is a tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/ http://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
- http://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="jimtcl"
-
-COMMON_DEPEND="virtual/udev
- virtual/libusb:1"
-RDEPEND="${COMMON_DEPEND}
- jimtcl? ( dev-lang/jimtcl )
- !jimtcl? ( dev-lang/tcl:0 )" # usb_modeswitch script is tcl
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~USB_SERIAL"
-
-src_prepare() {
- sed -i -e '/install.*BIN/s:-s::' Makefile || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- SYSDIR="${D}/$(systemd_get_unitdir)" \
- UDEVDIR="${D}/$(get_udevdir)" \
- $(usex jimtcl install-shared install)
-
- # Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary,
- # which is why we need to force the .service file to be installed:
- systemd_dounit ${PN}@.service
-
- dodoc ChangeLog README
-
- pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
- emake \
- DESTDIR="${D}" \
- RULESDIR="${D}/$(get_udevdir)/rules.d" \
- files-install db-install
- docinto data
- dodoc ChangeLog README
- popd >/dev/null
-}
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.2.5.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.2.5.ebuild
new file mode 100644
index 0000000..b95a44f
--- /dev/null
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.2.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils linux-info toolchain-funcs udev systemd
+
+MY_PN=${PN/_/-}
+MY_P=${MY_PN}-${PV/_p*}
+#DATA_VER=${PV/*_p}
+DATA_VER="20150627"
+
+DESCRIPTION="USB_ModeSwitch is a tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
+HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/ http://www.draisberghof.de/usb_modeswitch/device_reference.txt"
+SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
+ http://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="jimtcl"
+
+COMMON_DEPEND="
+ virtual/udev
+ virtual/libusb:1
+"
+RDEPEND="${COMMON_DEPEND}
+ jimtcl? ( dev-lang/jimtcl )
+ !jimtcl? ( dev-lang/tcl:0 )" # usb_modeswitch script is tcl
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+CONFIG_CHECK="~USB_SERIAL"
+
+src_prepare() {
+ sed -i -e '/install.*BIN/s:-s::' Makefile || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ SYSDIR="${D}/$(systemd_get_unitdir)" \
+ UDEVDIR="${D}/$(get_udevdir)" \
+ $(usex jimtcl install-shared install)
+
+ # Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary,
+ # which is why we need to force the .service file to be installed:
+ systemd_dounit ${PN}@.service
+
+ dodoc ChangeLog README
+
+ pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
+ emake \
+ DESTDIR="${D}" \
+ RULESDIR="${D}/$(get_udevdir)/rules.d" \
+ files-install db-install
+ docinto data
+ dodoc ChangeLog README
+ popd >/dev/null
+}
diff --git a/sys-apps/util-linux/util-linux-2.26.2.ebuild b/sys-apps/util-linux/util-linux-2.26.2.ebuild
index 27d8e18..3f58b43 100644
--- a/sys-apps/util-linux/util-linux-2.26.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.26.2.ebuild
@@ -16,7 +16,7 @@
inherit git-2 autotools
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
else
- KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
fi
diff --git a/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild b/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild
new file mode 100644
index 0000000..3ff36a3
--- /dev/null
+++ b/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils linux-info pam
+
+MY_PN=ConsoleKit2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
+HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 http://www.freedesktop.org/wiki/Software/ConsoleKit"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_0.4.6-4.debian.tar.gz" # for logrotate file"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+IUSE="acl cgroups debug doc kernel_linux pam policykit selinux test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
+ >=sys-devel/gettext-0.19
+ sys-apps/dbus
+ sys-libs/zlib:=
+ x11-libs/libX11:=
+ acl? (
+ sys-apps/acl:=
+ >=virtual/udev-200
+ )
+ cgroups? (
+ app-admin/cgmanager
+ >=sys-libs/libnih-1.0.2[dbus]
+ )
+ pam? ( virtual/pam )
+ policykit? ( >=sys-auth/polkit-0.110 )"
+RDEPEND="${COMMON_DEPEND}
+ kernel_linux? ( sys-apps/coreutils[acl?] )
+ selinux? ( sec-policy/selinux-consolekit )"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ virtual/pkgconfig
+ doc? ( app-text/xmlto )
+ test? (
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/xmlto
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
+
+pkg_setup() {
+ if use kernel_linux; then
+ # This is from https://bugs.gentoo.org/376939
+ use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
+ # This is required to get login-session-id string with pam_ck_connector.so
+ use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
+}
+
+src_configure() {
+ econf \
+ XMLTO_FLAGS='--skip-validation' \
+ --libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
+ --localstatedir="${EPREFIX}"/var \
+ $(use_enable pam pam-module) \
+ $(use_enable doc docbook-docs) \
+ $(use_enable test docbook-docs) \
+ $(use_enable debug) \
+ $(use_enable policykit polkit) \
+ $(use_enable acl udev-acl) \
+ $(use_enable cgroups) \
+ $(use_enable test tests) \
+ --with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
+ --with-pam-module-dir="$(getpam_mod_dir)" \
+ --with-xinitrc-dir=/etc/X11/xinit/xinitrc.d \
+ --without-systemdsystemunitdir
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ install
+
+ dosym /usr/lib/ConsoleKit /usr/lib/${PN}
+
+ dodoc AUTHORS HACKING NEWS README TODO
+
+ newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
+
+ keepdir /usr/lib/ConsoleKit/run-seat.d
+ keepdir /usr/lib/ConsoleKit/run-session.d
+ keepdir /etc/ConsoleKit/run-session.d
+ keepdir /var/log/ConsoleKit
+
+ exeinto /etc/X11/xinit/xinitrc.d
+ newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
+
+ prune_libtool_files --all # --all for pam_ck_connector.la
+
+ rm -rf "${ED}"/var/run || die # let the init script create the directory
+
+ insinto /etc/logrotate.d
+ newins "${WORKDIR}"/debian/${PN}.logrotate ${PN} #374513
+}
+
+pkg_postinst() {
+ elog "For suspend/hibernate support, please emerge"
+ elog " sys-power/pm-utils"
+}
diff --git a/sys-auth/consolekit/consolekit-1.0.0.ebuild b/sys-auth/consolekit/consolekit-1.0.0.ebuild
index e8f027f..e84b8f3 100644
--- a/sys-auth/consolekit/consolekit-1.0.0.ebuild
+++ b/sys-auth/consolekit/consolekit-1.0.0.ebuild
@@ -15,7 +15,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
IUSE="acl cgroups debug doc kernel_linux pam policykit selinux test"
COMMON_DEPEND=">=dev-libs/glib-2.40:2=
diff --git a/sys-auth/ykpers/Manifest b/sys-auth/ykpers/Manifest
index 0b72836..09ed597 100644
--- a/sys-auth/ykpers/Manifest
+++ b/sys-auth/ykpers/Manifest
@@ -1,2 +1,3 @@
DIST ykpers-1.16.2.tar.gz 502198 SHA256 2b2da737d5353ff5c9002cad41c2f5d0af381f55a880ccf920cee8855b8b8120 SHA512 3fa1c18d306c4e5ca3f2b938cf4a1c9d1fbfcbaf9fdc1d5d601fb57ca11cd0caf680b0288bb37f27bb0e377a30bdc860f04d8c62254e9ccb4e78d60b60163799 WHIRLPOOL a2e045560cbeae600fc7c112105f3caa1f5e5cc26ce4ea12448cb451c1e6de3853f553c2a37a8b9138763e58795bf1896c1f3b3f0c4a3ebf8ddf95f758531694
DIST ykpers-1.17.1.tar.gz 504827 SHA256 556baec2bbc94bae01293e64dc3873d68f880119ea5c3772737e4f3dc44f69c4 SHA512 9f8cabb1082babc3214dda85300c1b3413d4664b9b5d32b266e3a640e1644ccf1a09964107f14eef831fef413fa65125551c40954a4973997b3e3cadb185bf70 WHIRLPOOL 75d430b41aa6dfca32db854278fa3dabea1a7048738b7274f787b2c2c81cf69e678ac7515cdc59295a764c8bf44773c247f51d4ccbb657c8c035055e51dcf468
+DIST ykpers-1.17.2.tar.gz 505396 SHA256 704a12410da22f37d69fd337511e74b61f876f841d52f13e87971c0adb5ddefc SHA512 b2da72c9032639450a91495766a828052d2a48c51ec151eedf61c3276f07feb8a7a5a0faf59179b314814fd6552de5f36e27494419cf7d2803d8471565a85690 WHIRLPOOL 2f0d59bc8487ca7b959502f7465c12a208726ce7356588d1c6378fcde87cc17d7c8a3141be447d3a401f799f51c1282f79b25db66412b2904c5a8c4fd3841c49
diff --git a/sys-auth/ykpers/ykpers-1.17.2.ebuild b/sys-auth/ykpers/ykpers-1.17.2.ebuild
new file mode 100644
index 0000000..ef4e2a8
--- /dev/null
+++ b/sys-auth/ykpers/ykpers-1.17.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils udev
+
+DESCRIPTION="Library and tool for personalization of Yubico's YubiKey"
+SRC_URI="http://yubico.github.io/yubikey-personalization/releases/${P}.tar.gz"
+HOMEPAGE="https://github.com/Yubico/yubikey-personalization"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="BSD-2"
+IUSE="static-libs consolekit"
+
+RDEPEND="
+ >=sys-auth/libyubikey-1.6
+ virtual/libusb:1"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ consolekit? ( sys-auth/consolekit[acl] )"
+
+src_install() {
+ DOCS=( doc/. AUTHORS ChangeLog NEWS README )
+ autotools-utils_src_install
+
+ use consolekit && udev_dorules *.rules
+}
diff --git a/sys-auth/yubikey-personalization-gui/Manifest b/sys-auth/yubikey-personalization-gui/Manifest
index c73daba..c6726f8 100644
--- a/sys-auth/yubikey-personalization-gui/Manifest
+++ b/sys-auth/yubikey-personalization-gui/Manifest
@@ -1,3 +1,4 @@
DIST yubikey-personalization-gui-3.1.18.tar.gz 1450161 SHA256 83e375bff4844ebebf473dfa9f62526689cb5160f7a8dca56896c8f47e3cb1cb SHA512 039b27f6b475d63fb0bc5de8dfaa1f8b86652a483c2a2930d74fc7ae1105232146283071fe1e6b0225e85397fcae46a7724e7f0e5c8f20685c6b18d0dced95c8 WHIRLPOOL 83176c32fc6d252d675124a7b0a16e7be49bea758bae4dc512b2f7e14ad27bc59bdec521882863c0b77ccd6c19c36a5cce24fa9b07ffa7ad636d120fee9539b5
DIST yubikey-personalization-gui-3.1.20.tar.gz 1458155 SHA256 70e31105900b571792de8ccd41ac4b080a10ecd8c7268c44b4676752d350f994 SHA512 d8b9165ade8f9a8be24d3aabd1b5096c01842e719bf7b70d46a54fd809d2fcbbf515ef95759f00601cf9fa6dcc01aa0e0de802da643c306eacdf7c1a1a576081 WHIRLPOOL 0c9589424a2fa51558d90bf7ee5410746683f57949836fd7c16f89f164c8eb4c60dc9386b5403f78187254d838e5eecaca8188b560a391e7da449e49e8377dfe
DIST yubikey-personalization-gui-3.1.21.tar.gz 1876316 SHA256 155cdf25088ffd5f6fdca4fa7433b23a9c30bfd778b5cffb70654839a071b5ac SHA512 4fa48fbc306c0488941a5151f91f2b00f05a5e917d664197e92d9d50f6ffc01874f85f7a37ff1fdad0f322c279ebf44deaebd75fb4671653ad7ec4cc9735571a WHIRLPOOL 2ff0619e54a4198cc916cfe24969f1a83572adebfe8ec3c0638fd3cddd898a9011a9eb32d1ea51ad2e4cceb3c59b1a32fc42d37ccd1a9c552d482e4a766c2f64
+DIST yubikey-personalization-gui-3.1.23.tar.gz 1450340 SHA256 80747cca7c77c384f175b92ea360955c034dcff8f7552dae080ad2b70ff81897 SHA512 912bcbcac5cad285c43995f646de6aa68cc99a4d047b7632786cd93e38c031e2fb8dcc4f57f45647ba3e276de03aaea6ed9757f72ec2c42a43780c19edcca51b WHIRLPOOL fdc625fa4fd2a34a79c45209e274a1ddaf2934e3bf4301a790b8c1b22f4d8032f62362a31ed188025f8676d2b4f5c92270b8c0007045664af1c4d02b948ad696
diff --git a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.23.ebuild b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.23.ebuild
new file mode 100644
index 0000000..eb899ab
--- /dev/null
+++ b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.23.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qmake-utils
+
+DESCRIPTION="GUI for personalization of Yubico's YubiKey"
+SRC_URI="http://yubico.github.io/yubikey-personalization-gui/releases/${P}.tar.gz"
+HOMEPAGE="https://github.com/Yubico/yubikey-personalization-gui"
+
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="BSD-2"
+IUSE="debug"
+
+RDEPEND="
+ >=sys-auth/ykpers-1.14.0
+ >=sys-auth/libyubikey-1.6
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qttest:4
+ dev-libs/glib:2
+ virtual/libusb:1"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( NEWS README )
+
+src_configure() {
+ eqmake4 YKPersonalization.pro
+}
+
+src_install() {
+ dobin build/release/yubikey-personalization-gui
+ doman resources/lin/yubikey-personalization-gui.1
+ domenu resources/lin/yubikey-personalization-gui.desktop
+ doicon resources/lin/yubikey-personalization-gui.xpm
+ doicon -s 128 resources/lin/yubikey-personalization-gui.png
+}
diff --git a/sys-block/fio/fio-2.2.9.ebuild b/sys-block/fio/fio-2.2.9.ebuild
index e9421a2..d2b335e 100644
--- a/sys-block/fio/fio-2.2.9.ebuild
+++ b/sys-block/fio/fio-2.2.9.ebuild
@@ -15,7 +15,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ppc64 x86"
IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
DEPEND="aio? ( dev-libs/libaio )
diff --git a/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch b/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch
new file mode 100644
index 0000000..2a5a231
--- /dev/null
+++ b/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch
@@ -0,0 +1,64 @@
+From 1e9e770f4bc7f3d80e09ecd1df58575fad064163 Mon Sep 17 00:00:00 2001
+From: Mike Fleetwood <mike.fleetwood@googlemail.com>
+Date: Sun, 28 Sep 2014 15:15:48 +0000
+Subject: lib-fs-resize: Prevent crash resizing FAT16 file systems
+
+Resizing FAT16 file system crashes in libparted/fs/r/fat/resize.c
+create_resize_context() because it was dereferencing NULL pointer
+fs_info->info_sector to copy the info_sector.
+
+Only FAT32 file systems have info_sector populated by fat_open() ->
+fat_info_sector_read(). FAT12 and FAT16 file systems don't have an
+info_sector so pointer fs_info->info_sector remains assigned NULL from
+fat_alloc(). When resizing a FAT file system create_resize_context()
+was always dereferencing fs_info->info_sector to memory copy the
+info_sector, hence it crashed for FAT12 and FAT16.
+
+Make create_resize_context() only copy the info_sector for FAT32 file
+systems.
+
+Reported by Christian Hesse in
+https://bugzilla.gnome.org/show_bug.cgi?id=735669
+---
+diff --git a/NEWS b/NEWS
+index 297b0a5..da7db50 100644
+--- a/NEWS
++++ b/NEWS
+@@ -2,6 +2,10 @@ GNU parted NEWS -*- outline -*-
+
+ * Noteworthy changes in release ?.? (????-??-??) [?]
+
++** Bug Fixes
++
++ libparted-fs-resize: Prevent crash resizing FAT16 file systems.
++
+
+ * Noteworthy changes in release 3.2 (2014-07-28) [stable]
+
+diff --git a/libparted/fs/r/fat/resize.c b/libparted/fs/r/fat/resize.c
+index 919acf0..bfe60a0 100644
+--- a/libparted/fs/r/fat/resize.c
++++ b/libparted/fs/r/fat/resize.c
+@@ -668,11 +668,17 @@ create_resize_context (PedFileSystem* fs, const PedGeometry* new_geom)
+
+ /* preserve boot code, etc. */
+ new_fs_info->boot_sector = ped_malloc (new_geom->dev->sector_size);
+- new_fs_info->info_sector = ped_malloc (new_geom->dev->sector_size);
+ memcpy (new_fs_info->boot_sector, fs_info->boot_sector,
+ new_geom->dev->sector_size);
+- memcpy (new_fs_info->info_sector, fs_info->info_sector,
+- new_geom->dev->sector_size);
++ new_fs_info->info_sector = NULL;
++ if (fs_info->fat_type == FAT_TYPE_FAT32)
++ {
++ PED_ASSERT (fs_info->info_sector != NULL);
++ new_fs_info->info_sector =
++ ped_malloc (new_geom->dev->sector_size);
++ memcpy (new_fs_info->info_sector, fs_info->info_sector,
++ new_geom->dev->sector_size);
++ }
+
+ new_fs_info->logical_sector_size = fs_info->logical_sector_size;
+ new_fs_info->sector_count = new_geom->length;
+--
+cgit v0.9.0.2
diff --git a/sys-block/parted/parted-3.2-r1.ebuild b/sys-block/parted/parted-3.2-r1.ebuild
new file mode 100644
index 0000000..e48c620
--- /dev/null
+++ b/sys-block/parted/parted-3.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
+HOMEPAGE="https://www.gnu.org/software/parted"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+debug device-mapper nls readline selinux static-libs"
+RESTRICT="test"
+
+# specific version for gettext needed
+# to fix bug 85999
+RDEPEND="
+ >=sys-fs/e2fsprogs-1.27
+ >=sys-libs/ncurses-5.7-r7:0=
+ device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+ readline? ( >=sys-libs/readline-5.2:0= )
+ selinux? ( sys-libs/libselinux )
+"
+DEPEND="
+ ${RDEPEND}
+ nls? ( >=sys-devel/gettext-0.12.1-r2 )
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-3.2-devmapper.patch \
+ "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch \
+ "${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable debug) \
+ $(use_enable device-mapper) \
+ $(use_enable nls) \
+ $(use_enable selinux) \
+ $(use_enable static-libs static) \
+ $(use_with readline) \
+ --disable-rpath \
+ --disable-silent-rules
+}
+
+DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 2300cc3..6b16974 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,2 +1,3 @@
DIST os-prober_1.65.tar.xz 24712 SHA256 c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512 64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53 WHIRLPOOL 397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e
DIST os-prober_1.66.tar.xz 24904 SHA256 ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057 SHA512 6aaa2787be9ea522ae71b8c65fc04bb05af233c81e2a8cd0c27b79d6f8c697c5585b5f5fce91c67eab3bbc782e29087fb22db2626609702ab272a398e59ce333 WHIRLPOOL 12d058e78ddd168938b0160b8a2348b497d24c17b99a30a34edcd3e663e8c57eded8d85d02d97c85ad936aadce123387c85dd9c3f0510bf200a9fbf632fd95bf
+DIST os-prober_1.67.tar.xz 25092 SHA256 69d5b5f5ab9182025fda9cfd9f09be20f28ed6fe7ea07c26664d5e571ed355aa SHA512 bc05256d9e1ef808ccaf5a95e23a811f3086ad5b54b444b30b9b21e0c56c71f5c4a7dc69b5d2604ec90209f9a0ef1e00286da016f953f430a5c269a6dc75a718 WHIRLPOOL 5b88ed969d64555ee663a19572bfeaff8ecd3ca750765133791fe597f953394630b3a631c49733142775291ad61fedccec0090f26ab3017f0df2607fc49ad6ca
diff --git a/sys-boot/os-prober/os-prober-1.67.ebuild b/sys-boot/os-prober/os-prober-1.67.ebuild
new file mode 100644
index 0000000..1163bc0
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.67.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="http://packages.debian.org/source/sid/os-prober"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+ # Fix references to grub-mount
+ sed -i -e 's:grub-mount:grub2-mount:g' \
+ common.sh \
+ linux-boot-probes/common/50mounted-tests \
+ os-probes/common/50mounted-tests
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/$dir
+ doexe $dir/common/*
+ if [[ -d $dir/$debarch ]]; then
+ doexe $dir/$debarch/*
+ fi
+ if [[ -d $dir/$debarch/efi ]]; then
+ exeinto /usr/lib/$dir/efi
+ doexe $dir/$debarch/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ dodoc README TODO debian/changelog
+}
+
+pkg_postinst() {
+ elog "If you intend for os-prober to detect versions of Windows installed on"
+ elog "NTFS-formatted partitions, your system must be capable of reading the"
+ elog "NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g"
+}
diff --git a/sys-cluster/csync2/csync2-2.0.ebuild b/sys-cluster/csync2/csync2-2.0.ebuild
index 3c9e937..441bf41 100644
--- a/sys-cluster/csync2/csync2-2.0.ebuild
+++ b/sys-cluster/csync2/csync2-2.0.ebuild
@@ -11,7 +11,7 @@
SRC_URI="http://oss.linbit.com/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="mysql postgres sqlite ssl xinetd"
@@ -39,7 +39,8 @@
}
src_install() {
- emake DESTDIR="${D}" install
+ # Parallel install fails, bug #561382
+ emake -j1 DESTDIR="${D}" install
if use xinetd ; then
insinto /etc/xinetd.d
diff --git a/sys-cluster/gearmand/gearmand-0.34-r1.ebuild b/sys-cluster/gearmand/gearmand-0.34-r1.ebuild
index 9a36a6c..54ce112 100644
--- a/sys-cluster/gearmand/gearmand-0.34-r1.ebuild
+++ b/sys-cluster/gearmand/gearmand-0.34-r1.ebuild
@@ -52,6 +52,9 @@
append-cppflags -DDEBUG
fi
+ # Explicitly enable c++11 mode
+ append-cxxflags -std=c++11
+
autotools-utils_src_configure
}
diff --git a/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild
index b21ad7a..2081eb2 100644
--- a/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild
@@ -12,7 +12,7 @@
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
RDEPEND="emacs? ( virtual/emacs )
diff --git a/sys-cluster/libcircle/Manifest b/sys-cluster/libcircle/Manifest
index 28bac28..2aea371 100644
--- a/sys-cluster/libcircle/Manifest
+++ b/sys-cluster/libcircle/Manifest
@@ -1 +1,2 @@
DIST libcircle-0.2.0_rc1.tar.gz 351901 SHA256 59ed75c0bdf2b24f96fbc0230848a5aab57d4eab5a68895489d59a7f68ddd2ee SHA512 1ce07ae012c281fe3e6fbae29bf48e1079768ed5f92f9375c3be02880bed1b1feee6630b31560d7129f76640990e94da1753f55b11a0a8977adaaf9e51144044 WHIRLPOOL 984713d28ee80f686daea7d419a1135360bcda542f904a1aa4ea0ef03b87482e60c2c0858a9e6fd85d7bde1ef557bd61c717ba924f942dfd82d7cbeb9a2e0359
+DIST libcircle-0.2.1_rc1.tar.gz 354251 SHA256 a0d0d75db2be9e47045572ad40f7e1077b7c3540f79180ad1db265ca89438db3 SHA512 9a125bc9f95b1dfb1c777dece4310a709cec46f820651216cd3a34486260f80221e564b82dfaf1ba58b8091b18c6d6b87b0c64d24a940cae6593dc144426fb54 WHIRLPOOL ec77f629c8d5b2391a8f25aa888e0606a0d0240ccf86e6bbe5ba8a04c5e411a6d3f077777da6cdd7badaa87c40b44b6a67b7b901ceb94fb3bec3b118b8465a0a
diff --git a/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild b/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild
new file mode 100644
index 0000000..c702e273
--- /dev/null
+++ b/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="git://github.com/hpc/${PN}.git https://github.com/hpc/${PN}.git"
+ inherit git-2
+ KEYWORDS=""
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/hpc/${PN}/archive/${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="an API for distributing embarrassingly parallel workloads using self-stabilization"
+HOMEPAGE="https://github.com/hpc/libcircle"
+
+SLOT="0"
+LICENSE="BSD"
+IUSE="doc test"
+
+RDEPEND="virtual/mpi"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-libs/check )"
+
+DOCS=( HACKING.md README.md )
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable test tests)
+ $(use_enable doc doxygen)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ use doc && HTML_DOCS=( "${BUILD_DIR}/doc/html/" )
+ autotools-utils_src_install
+}
diff --git a/sys-cluster/libquo/Manifest b/sys-cluster/libquo/Manifest
index 63f28a2..9551aa7 100644
--- a/sys-cluster/libquo/Manifest
+++ b/sys-cluster/libquo/Manifest
@@ -1,3 +1,4 @@
DIST libquo-1.2.2.tar.gz 711528 SHA256 fb1231bde16b5e669caf23f5bfed4c77643cd3d4ae2ae755cfe258610a70667a SHA512 1aad84e65ba9167656ba6ffd53859816ea396239781b51846992766be7d01e33af732ac9c2ddda5839ec518bf304b4882a73f884c714c6e8eb9dc6884a9a6b11 WHIRLPOOL c5d28ddebaf98912b7ee92ab9e765cbff91ad1a29b323babc9db2d534f4261127377906ffbf670a4e38e65b248d4a56c8435290f4b64f39aae7e27b3d6ebaeb7
DIST libquo-1.2.3.tar.gz 727836 SHA256 8f359b6f9efe0d38d2a7b6999b801297d80cebbf74b30de7b124bccbd77ae04e SHA512 d937253f1444723631439a78e5533d9ce4c8772f04f7c3475fe48c63d0dd827d5d73c4a925efec614a36d1c9680e9d93d53617ac12c00fce65b922fa69cd8c5b WHIRLPOOL 4d35a9e806184051ae56fc5c8f1454e73fa4dfb96b181b13753ac09d8f654f7f1154ca8008514aea0fc2b46bad8011d6a27e022c9811eb852d4e6c78b6041951
+DIST libquo-1.2.4.tar.gz 714871 SHA256 a7324c5e7faa6f99e14e7565d19a657e21e686dd039d8519fad48890bbb6ce18 SHA512 a8b6ab6bcaab3f22cc707ee85ea41c8b8f345bf11319a12bc1e4bceed15577f339b7c797ecee4301d0ba8b8c5ebb7af5961d19982261e41192c3fc777cbfecfe WHIRLPOOL eef090a00843a37a0f9823973bc26220416a0bb6f2db1f727ef964ce8f8b0d664c7703b6fff4e2357cc1d7fd9deca527f4cdd2b368e56ffe9c175df613446df4
DIST libquo-1.2.tar.gz 710465 SHA256 accd7b5fd1d7118897d98929245b8a91baf3d00e477769df66322a7feeed352d SHA512 c9c087490c01af51f47490635dbf42d5433719931afbaa89dfe91bfe812e09e468649cf5a7703b6c3d5b0c0d6d6318731dcff4928a52017505f814750131c75b WHIRLPOOL a209676d6bc8d0b012e8797d5600ec812b35aeae06391b6f3cc5b7bac743198fc17726187d199988fb75e8c5a33706921982b35c8094dee6fef303e57fd5be96
diff --git a/sys-cluster/libquo/libquo-1.2.4-r1.ebuild b/sys-cluster/libquo/libquo-1.2.4-r1.ebuild
new file mode 100644
index 0000000..6f4ed94
--- /dev/null
+++ b/sys-cluster/libquo/libquo-1.2.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit autotools-utils fortran-2
+
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="git://github.com/losalamos/${PN}.git https://github.com/losalamos/${PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+ AUTOTOOLS_AUTORECONF=1
+else
+ SRC_URI="http://losalamos.github.io/${PN}/dists/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="run-time tuning of process binding policies made easy"
+HOMEPAGE="http://losalamos.github.io/libquo/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="fortran static-libs"
+
+DEPEND="
+ virtual/mpi[fortran?]
+ sys-process/numactl
+ sys-apps/hwloc[numa,xml]
+ "
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ autotools-utils_src_configure CC=mpicc FC=$(usex fortran mpif90 false)
+}
diff --git a/sys-cluster/ploop/Manifest b/sys-cluster/ploop/Manifest
index 056d0d0..e48d97d 100644
--- a/sys-cluster/ploop/Manifest
+++ b/sys-cluster/ploop/Manifest
@@ -1 +1,2 @@
DIST ploop-1.13.2.tar.bz2 122821 SHA256 c1705c3bebd4f0f8860fecadf57cca457216b2abad880eb36098351244f9c1c3 SHA512 85a3314dc1114b692cd98290412fd2ea78c516964c712487dd72f8347fd583172d8836f997d63ccade89ee39be031669074d9bc957926b97175e659ec505ddfb WHIRLPOOL aea714ec18aa82cce2fcffa9aafdfe0e627ed83db9b8eaf0621b2dddb58fd300fdd9a3896e2e5192154cc5e0b6b11668128ed2e66fd04c1daae84e23d41c7a99
+DIST ploop-1.14.1.tar.bz2 123962 SHA256 841fde81c46632072ff8bcc29a4074a15b3c8359967254deeba51f0af34a6c0e SHA512 7a235865f071de6e2762923d6591c8c6ee00d0d05ec80c6a2a1332f5b6881ccf827f7ddc40dfe1d663b8abf492a188a23f7d28a43dd553d6e37c8091cb3bc484 WHIRLPOOL 8e80385233cbd5be0a26a20fb5442f82fa57adffe22f78a1207c73ece65822091c7fbbf90b59b97b8cf6ff760447a93c391e828af5402ecdc59285a74c114332
diff --git a/sys-cluster/ploop/files/disable_create_run_dir.patch b/sys-cluster/ploop/files/disable_create_run_dir.patch
new file mode 100644
index 0000000..7260949
--- /dev/null
+++ b/sys-cluster/ploop/files/disable_create_run_dir.patch
@@ -0,0 +1,21 @@
+--- lib/Makefile.old 2015-10-10 15:49:25.377235002 +0300
++++ lib/Makefile 2015-10-10 15:49:50.021464544 +0300
+@@ -76,17 +76,13 @@
+ .depend: $(filter-out $(GENERATED),$(SOURCES))
+ -include .depend
+
+-install-lockdir:
+- $(Q) $(INSTALL) -d $(DESTDIR)$(LOCKDIR)
+-.PHONY: install-lockdir
+-
+ install-pc: $(PC)
+ $(E) " INSTALL " $(PC)
+ $(Q) $(INSTALL) -d $(DESTDIR)$(PCDIR)
+ $(Q) $(INSTALL) $(PC) $(DESTDIR)$(PCDIR)
+ .PHONY: install-pc
+
+-install: all install-lockdir install-pc
++install: all install-pc
+ $(Q) $(INSTALL) -d $(DESTDIR)$(LIBDIR)
+ $(E) " INSTALL " $(LIBPLOOP)
+ $(Q) $(INSTALL) -m 644 $(LIBPLOOP) $(DESTDIR)$(LIBDIR)
diff --git a/sys-cluster/ploop/ploop-1.14.1.ebuild b/sys-cluster/ploop/ploop-1.14.1.ebuild
new file mode 100644
index 0000000..00858bd
--- /dev/null
+++ b/sys-cluster/ploop/ploop-1.14.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib systemd
+
+DESCRIPTION="openvz tool and a library to control ploop block devices"
+HOMEPAGE="http://wiki.openvz.org/Download/ploop"
+SRC_URI="http://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug static-libs"
+
+DEPEND="
+ dev-libs/libxml2
+ virtual/pkgconfig
+ "
+
+RDEPEND="dev-libs/libxml2
+ !<sys-cluster/vzctl-4.8
+ sys-block/parted
+ sys-fs/e2fsprogs
+ sys-process/lsof
+ sys-apps/findutils
+ "
+
+DOCS=( tools/README )
+
+src_prepare() {
+ epatch "${FILESDIR}/disable_create_run_dir.patch"
+
+ # Respect CFLAGS and CC, do not add debug by default
+ sed -i \
+ -e 's|CFLAGS =|CFLAGS +=|' \
+ -e '/CFLAGS/s/-g -O0 //' \
+ -e '/CFLAGS/s/-O2//' \
+ -e 's|CC=|CC?=|' \
+ -e 's/-Werror//' \
+ -e '/DEBUG=yes/d' \
+ -e '/LOCKDIR/s/var/run/' \
+ Makefile.inc || die 'sed on Makefile.inc failed'
+ # Avoid striping of binaries
+ sed -e '/INSTALL/{s: -s::}' -i tools/Makefile || die 'sed on tools/Makefile failed'
+
+ # respect AR and RANLIB, bug #452092
+ tc-export AR RANLIB
+ sed -i -e 's/ranlib/$(RANLIB)/' lib/Makefile || die 'sed on lib/Makefile failed'
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" V=1 $(usex debug 'DEBUG' '' '=yes' '')
+}
+
+src_install() {
+ default
+ ldconfig -n "${D}/usr/$(get_libdir)/" || die
+}
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 5f51ec9..40007f7 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -1,2 +1,2 @@
DIST swift-2.3.0.tar.gz 1346492 SHA256 7225061f92597e7eaf6196c9336c5e590c7626b7e84126c51e8ca5bf5b7bdae1 SHA512 cf8e1e640f1f679516ce1af772c93f860d7d1f1b6712fa9b89dda1688a4b02cd3fdadc443f4911be5927544f0cffe365ff4174ef6e44d118cb56c7b05cd630b9 WHIRLPOOL aade05a7b8f23e680aa932150e8edbc2e9b6bb83528ffa62becdf4d29c8597b20e873017c3c6a95e66448c13c60531abee6ed0bd9b524b6319642c0436ad5e4c
-DIST swift-2.4.0.tar.gz 1418193 SHA256 082b436e58684b5cf7682a175e56c3d7dbd24d72c0251ddf3074a8596e4abd40 SHA512 f4ac4f0f866106d2c2bb8f38c0c3810efebf47738c000488041722250745e4d3f4d4a4c710388021c1cc44b6b372a5f6fd03fe9670e005345669bf6199e6e311 WHIRLPOOL e3293d304a8a52146efa04d7fadd0ab11fed5d62127e1757b8701452719fa2839dbfe7a452e0677071c78eb32b832a732c978f6229b8c927c76632df4df44990
+DIST swift-2.5.0.tar.gz 1524422 SHA256 ede167854a47577ebd98765cf31476f79045f0739fab65f59b37e0ec184d4a42 SHA512 770d1aeb62803288b29edbac7576a8e870f09df5d111ba29d4845c755d65d66b501c9e95d6468e0c635625f04b7009fa2b6d769307348b66984f5cf5ea3481ed WHIRLPOOL ba00f4350c0f2b645f595b1dde8974dfdadcd66f33184776f478db123ec4dd5bb3c1e6cbe42b8cfb856391ceb6da3d1f212ceb3428280195c1993d2146ece435
diff --git a/sys-cluster/swift/swift-2.4.0.ebuild b/sys-cluster/swift/swift-2.4.0.ebuild
deleted file mode 100644
index e8772d4..0000000
--- a/sys-cluster/swift/swift-2.4.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="proxy account container object test +memcached"
-REQUIRED_USE="|| ( proxy account container object )"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
- <dev-python/pbr-1.0[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/nosexcover[${PYTHON_USEDEP}]
- dev-python/nosehtmloutput[${PYTHON_USEDEP}]
- dev-python/oslo-sphinx[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.2[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0[${PYTHON_USEDEP}]
- dev-python/python-swiftclient[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/bandit-0.10.1[${PYTHON_USEDEP}]
- )"
-
-RDEPEND="
- >=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
- >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
- >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
- !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
- !~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
- >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
- >=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- dev-python/pyxattr[${PYTHON_USEDEP}]
- ~dev-python/PyECLib-1.0.7[${PYTHON_USEDEP}]
- memcached? ( net-misc/memcached )
- net-misc/rsync[xattr]"
-
-CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-~ZFS"
-
-PATCHES=(
-)
-
-pkg_setup() {
- enewuser swift
- enewgroup swift
-}
-
-src_prepare() {
- sed -i 's/xattr/pyxattr/g' swift.egg-info/requires.txt || die
- sed -i 's/xattr/pyxattr/g' requirements.txt || die
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-src_test () {
- # https://bugs.launchpad.net/swift/+bug/1249727
- find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
- SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
-}
-
-python_install() {
- distutils-r1_python_install
- keepdir /etc/swift
- insinto /etc/swift
-
- newins "etc/swift.conf-sample" "swift.conf"
- newins "etc/rsyncd.conf-sample" "rsyncd.conf"
- newins "etc/mime.types-sample" "mime.types-sample"
- newins "etc/memcache.conf-sample" "memcache.conf-sample"
- newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
- newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
- if use proxy; then
- newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
- newins "etc/proxy-server.conf-sample" "proxy-server.conf"
- if use memcached; then
- sed -i '/depend/a\
- need memcached' "${D}/etc/init.d/swift-proxy"
- fi
- fi
- if use account; then
- newinitd "${FILESDIR}/swift-account.initd" "swift-account"
- newins "etc/account-server.conf-sample" "account-server.conf"
- fi
- if use container; then
- newinitd "${FILESDIR}/swift-container.initd" "swift-container"
- newins "etc/container-server.conf-sample" "container-server.conf"
- fi
- if use object; then
- newinitd "${FILESDIR}/swift-object.initd" "swift-object"
- newins "etc/object-server.conf-sample" "object-server.conf"
- newins "etc/object-expirer.conf-sample" "object-expirer.conf"
- fi
-
- fowners swift:swift "/etc/swift" || die "fowners failed"
-}
-
-pkg_postinst() {
- elog "Openstack swift will default to using insecure http unless a"
- elog "certificate is created in /etc/swift/cert.crt and the associated key"
- elog "in /etc/swift/cert.key. These can be created with the following:"
- elog " * cd /etc/swift"
- elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
diff --git a/sys-cluster/swift/swift-2.5.0.ebuild b/sys-cluster/swift/swift-2.5.0.ebuild
new file mode 100644
index 0000000..a5018b9
--- /dev/null
+++ b/sys-cluster/swift/swift-2.5.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
+HOMEPAGE="https://launchpad.net/swift"
+SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="proxy account container object test +memcached"
+REQUIRED_USE="|| ( proxy account container object )"
+
+CDEPEND="
+ >=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+ <dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ test? (
+ ${RDEPEND}
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/nosexcover[${PYTHON_USEDEP}]
+ dev-python/nosehtmloutput[${PYTHON_USEDEP}]
+ dev-python/oslo-sphinx[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0[${PYTHON_USEDEP}]
+ dev-python/python-swiftclient[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/bandit-0.10.1[${PYTHON_USEDEP}]
+ )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
+ >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+ >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
+ !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+ !~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
+ >=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ dev-python/pyxattr[${PYTHON_USEDEP}]
+ ~dev-python/PyECLib-1.0.7[${PYTHON_USEDEP}]
+ memcached? ( net-misc/memcached )
+ net-misc/rsync[xattr]"
+
+CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
+~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
+~ZFS"
+
+PATCHES=(
+)
+
+pkg_setup() {
+ enewuser swift
+ enewgroup swift
+}
+
+src_prepare() {
+ sed -i 's/xattr/pyxattr/g' swift.egg-info/requires.txt || die
+ sed -i 's/xattr/pyxattr/g' requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+src_test () {
+ # https://bugs.launchpad.net/swift/+bug/1249727
+ find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
+ SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
+}
+
+python_install() {
+ distutils-r1_python_install
+ keepdir /etc/swift
+ insinto /etc/swift
+
+ newins "etc/swift.conf-sample" "swift.conf"
+ newins "etc/rsyncd.conf-sample" "rsyncd.conf"
+ newins "etc/mime.types-sample" "mime.types-sample"
+ newins "etc/memcache.conf-sample" "memcache.conf-sample"
+ newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
+ newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
+
+ if use proxy; then
+ newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
+ newins "etc/proxy-server.conf-sample" "proxy-server.conf"
+ if use memcached; then
+ sed -i '/depend/a\
+ need memcached' "${D}/etc/init.d/swift-proxy"
+ fi
+ fi
+ if use account; then
+ newinitd "${FILESDIR}/swift-account.initd" "swift-account"
+ newins "etc/account-server.conf-sample" "account-server.conf"
+ fi
+ if use container; then
+ newinitd "${FILESDIR}/swift-container.initd" "swift-container"
+ newins "etc/container-server.conf-sample" "container-server.conf"
+ fi
+ if use object; then
+ newinitd "${FILESDIR}/swift-object.initd" "swift-object"
+ newins "etc/object-server.conf-sample" "object-server.conf"
+ newins "etc/object-expirer.conf-sample" "object-expirer.conf"
+ fi
+
+ fowners swift:swift "/etc/swift" || die "fowners failed"
+}
+
+pkg_postinst() {
+ elog "Openstack swift will default to using insecure http unless a"
+ elog "certificate is created in /etc/swift/cert.crt and the associated key"
+ elog "in /etc/swift/cert.key. These can be created with the following:"
+ elog " * cd /etc/swift"
+ elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
+}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild
index 95aa233..4273a03 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild
@@ -22,8 +22,7 @@
CDEPEND="dev-libs/beecrypt
net-firewall/iptables
net-misc/vconfig
- sys-apps/iproute2
- || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )"
+ sys-apps/iproute2"
DEPEND=">=dev-libs/dietlibc-0.33_pre20110403
${CDEPEND}"
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3062.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3062.ebuild
index 96af5e6..cb91836 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3062.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3062.ebuild
@@ -22,8 +22,7 @@
CDEPEND="dev-libs/beecrypt
net-firewall/iptables
net-misc/vconfig
- sys-apps/iproute2
- sys-apps/coreutils"
+ sys-apps/iproute2"
DEPEND=">dev-libs/dietlibc-0.33
${CDEPEND}"
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
index 6a706d8..79bea53 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
@@ -22,8 +22,7 @@
CDEPEND="dev-libs/beecrypt
net-firewall/iptables
net-misc/vconfig
- sys-apps/iproute2
- sys-apps/coreutils"
+ sys-apps/iproute2"
DEPEND=">dev-libs/dietlibc-0.33
${CDEPEND}"
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 3a3c408..3c4f93e 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,3 +1,2 @@
DIST vzctl-4.9.1.tar.bz2 517940 SHA256 b15f4b4eacd88d2a5e745f556dfe6ae079a77c0d3f0fa818674bc98715ad7d72 SHA512 998882a1f628104a9e0c6a598ee84046fb03da03b7b2ce703396659cf7d7bd0bb67bf1590596e5e43ff1223ef23078fb7cab2228e768e79d3c3136b1ba418e50 WHIRLPOOL feff55376fa5f470627f7fcbd4e9a0c24e04b8575219d33ffa5eb4a67d79e64682975b89fbf06953d4d88044e1771c9dfef3a5b578914900e5f88f59eb2d3895
-DIST vzctl-4.9.2.tar.bz2 549613 SHA256 a345719d47e8a3f96c5af4c86b58a9677848eee6f4777403b447eff2c9320cae SHA512 c2ab45eb8f8f80c8b044f652c68c1c816b3df85f3aca5fe33b385dea4b6addeb8e6ebe6232342454efc4c683e8433149828dffdbcb181af6bfcb68d8b5a86ef1 WHIRLPOOL 42919c1096133250787996071f1d16e0d6bce542760c58a4d6af019960b6db7df4636d0735f21ffda95032fbabb4cf6709da532bee96e9e7775bf665049cbc46
-DIST vzctl-4.9.3.tar.bz2 549543 SHA256 c2fe73928933609893e99b16405f9da6a2d19e43a1164e7448bea81eb47355a0 SHA512 4c4fb69c217b403668a6ec64189eaf23d3ecaadc6ad9f09127a4c2b6d3dc88ac4c73ba182f99f5e1e9c64161a285d83421bb81343fbb83481c46a8489ac99819 WHIRLPOOL 546865b8b8bac4c5a95b191a283080965e1f3bfd51cdc09d4b36a0ac97df9339e8fb2a495df60290b0d92d2a3750d97a27cbb02b1de46c715b8784e1dea3e3f5
+DIST vzctl-4.9.4.tar.bz2 550370 SHA256 bc3c63841b5244181e71bd1daf7c9aca6df3d42ed886a161fa5ba4b1b4520420 SHA512 651aa7882ba77442666a09441769f821a7374f417199380667b27c9980203597575dfe12ad5c261da22941b6a2bc6e032d3f9c2d88dcb03af6412634cc5b4706 WHIRLPOOL ed3c2531919b68fc2ae8acd9ac7b582b91f0eb6976155f12e2b35dbb236044c538e6499129aca579f9bc7697379c323bc6b32d0796a74a28b816a2dfb188c84f
diff --git a/sys-cluster/vzctl/vzctl-4.9.2.ebuild b/sys-cluster/vzctl/vzctl-4.9.2.ebuild
deleted file mode 100644
index 2ec6e8f..0000000
--- a/sys-cluster/vzctl/vzctl-4.9.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit base bash-completion-r1 eutils toolchain-funcs udev
-
-DESCRIPTION="OpenVZ ConTainers control utility"
-HOMEPAGE="http://openvz.org/"
-SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 -amd64-fbsd -sparc-fbsd -x86-fbsd"
-IUSE="+ploop +vzmigrate"
-
-RDEPEND="net-firewall/iptables
- sys-apps/ed
- >=sys-apps/iproute2-3.3.0
- >=sys-fs/vzquota-3.1
- ploop? (
- >=sys-cluster/ploop-1.13
- sys-block/parted
- sys-fs/quota
- dev-libs/libxml2
- )
- >=dev-libs/libcgroup-0.38
- vzmigrate? (
- net-misc/openssh
- net-misc/rsync[xattr,acl]
- app-arch/tar[xattr,acl]
- net-misc/bridge-utils
- virtual/awk
- )
- virtual/udev
- sys-apps/attr
- "
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- "
-
-src_prepare() {
-
- # Set default OSTEMPLATE on gentoo
- sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed'
- # Set proper udev directory
- sed -i -e "s:/lib/udev:$(get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
-}
-
-src_configure() {
-
- econf \
- --localstatedir=/var \
- --enable-udev \
- --enable-bashcomp \
- --enable-logrotate \
- --with-vz \
- $(use_with ploop) \
- --with-cgroup
-}
-
-src_install() {
-
- emake DESTDIR="${D}" udevdir="$(get_udevdir)"/rules.d install install-gentoo
-
- # install the bash-completion script into the right location
- rm -rf "${ED}"/etc/bash_completion.d
- newbashcomp etc/bash_completion.d/vzctl.sh ${PN}
-
- # We need to keep some dirs
- keepdir /vz/{dump,lock,root,private,template/cache}
- keepdir /etc/vz/names /var/lib/vzctl/veip
-}
-
-pkg_postinst() {
- einfo "This vzctl release required kernel above 2.6.32.92"
-
- einfo "If you have checkpoint suspend/restore feature in vanilla kernel"
- einfo "please install "sys-process/criu" "
- einfo "This is experimental and not stable ( in gentoo ) now"
-
- einfo "if you have work with .xz compressed template, please install app-arch/xz-utils"
- einfo "if you have check signature donwloaded template - install gpg "
-}
diff --git a/sys-cluster/vzctl/vzctl-4.9.3.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
similarity index 100%
rename from sys-cluster/vzctl/vzctl-4.9.3.ebuild
rename to sys-cluster/vzctl/vzctl-4.9.4.ebuild
diff --git a/sys-devel/binutils/binutils-2.25.1-r1.ebuild b/sys-devel/binutils/binutils-2.25.1-r1.ebuild
index f761283..772def6 100644
--- a/sys-devel/binutils/binutils-2.25.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.25.1-r1.ebuild
@@ -8,4 +8,4 @@
ELF2FLT_VER=""
inherit toolchain-binutils
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
diff --git a/sys-devel/byfl/Manifest b/sys-devel/byfl/Manifest
index 397ac74..d42b968 100644
--- a/sys-devel/byfl/Manifest
+++ b/sys-devel/byfl/Manifest
@@ -1 +1 @@
-DIST byfl-1.3-llvm-3.6.2.tar.gz 529494 SHA256 07f6973eeea94a988c64157e312aaaa372a3aa5b64895c85d050d23eb306d321 SHA512 548439726ccac6472075b6bae5c145e4d796725c034fdf517a94683a22806e2ca90bda4e69dcbba03b665c2ff13af0f5e49a247f3280205d147514019184cd94 WHIRLPOOL bc89b6bd1f727fd9566e76119e0e5b3c932f94a5bf6b6752aa1d2ce4034ce94e9a3983d6702566ff188888e677c1d1442cf1f353abf8eebc77126e1afd6d177d
+DIST byfl-1.4-llvm-3.7.0.tar.gz 544669 SHA256 b523a28fb05cb8f0f7641a326c08074306a38a3dcd61c95e69049a98a7ae0cce SHA512 6fb204cf704d3f20e3d408f4cbe8071e1198b75615757c1877a8886753ff9087d9ff04a8279540b26805ed9a0e7cea6543a08de491990c9c912b40f1984bdcb4 WHIRLPOOL 63504c5bda6bd4b9f2cb84ca4f6c0aae2f6b24186d7487c670df4e6d217367e2d794ecda9c8811f6c7db70dc848dfa7ebc9cf09a331bb6b8929cd1af6f143ac2
diff --git a/sys-devel/byfl/byfl-1.3.ebuild b/sys-devel/byfl/byfl-1.3.ebuild
deleted file mode 100644
index 740d6dd..0000000
--- a/sys-devel/byfl/byfl-1.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic
-
-if [ "${PV}" = "9999" ]; then
- LLVM_VERSION="3.6.2"
- EGIT_REPO_URI="git://github.com/losalamos/${PN^b}.git https://github.com/losalamos/${PN}.git"
- inherit git-2
- KEYWORDS=""
- AUTOTOOLS_AUTORECONF=1
-else
- LLVM_VERSION="3.6.2"
- MY_P="${P}-llvm-${LLVM_VERSION}"
- SRC_URI="https://github.com/losalamos/Byfl/releases/download/v${MY_P#${PN}-}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~amd64-linux"
-fi
-
-DESCRIPTION="Compiler-based Application Analysis"
-HOMEPAGE="https://github.com/losalamos/Byfl"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="dragonegg hdf5 static-libs sqlite"
-
-RDEPEND="dragonegg? ( >=sys-devel/dragonegg-${LLVM_VERSION} )
- >=sys-devel/clang-${LLVM_VERSION}
- >=sys-devel/llvm-${LLVM_VERSION}
- sys-devel/binutils:0
- dev-lang/perl:=
- dev-perl/Switch
- hdf5? ( sci-libs/hdf5[cxx] )
- sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- append-cxxflags -std=c++11
- use dragonegg || export ax_cv_file_dragonegg_so=no
- use sqlite || export ac_cv_lib_sqlite3_sqlite3_errstr=no
- autotools-utils_src_configure H5CXX=$(usex hdf5 h5c++ no)
-}
diff --git a/sys-devel/byfl/byfl-1.4.ebuild b/sys-devel/byfl/byfl-1.4.ebuild
new file mode 100644
index 0000000..e57a7ea
--- /dev/null
+++ b/sys-devel/byfl/byfl-1.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils flag-o-matic
+
+if [ "${PV}" = "9999" ]; then
+ LLVM_VERSION="3.7.0"
+ EGIT_REPO_URI="git://github.com/losalamos/${PN^b}.git https://github.com/losalamos/${PN}.git"
+ inherit git-2
+ KEYWORDS=""
+ AUTOTOOLS_AUTORECONF=1
+else
+ LLVM_VERSION="3.7.0"
+ MY_P="${P}-llvm-${LLVM_VERSION}"
+ SRC_URI="https://github.com/losalamos/Byfl/releases/download/v${MY_P#${PN}-}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~amd64-linux"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Compiler-based Application Analysis"
+HOMEPAGE="https://github.com/losalamos/Byfl"
+
+SLOT="0"
+LICENSE="BSD"
+IUSE="hdf5 static-libs sqlite"
+
+RDEPEND="
+ >=sys-devel/clang-${LLVM_VERSION}
+ >=sys-devel/llvm-${LLVM_VERSION}
+ sys-devel/binutils:0
+ dev-lang/perl:=
+ dev-perl/Switch
+ hdf5? ( sci-libs/hdf5[cxx] )
+ sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ append-cxxflags -std=c++11
+ use sqlite || export ac_cv_lib_sqlite3_sqlite3_errstr=no
+ autotools-utils_src_configure H5CXX=$(usex hdf5 h5c++ no)
+}
diff --git a/sys-devel/byfl/byfl-9999.ebuild b/sys-devel/byfl/byfl-9999.ebuild
index 740d6dd..e57a7ea 100644
--- a/sys-devel/byfl/byfl-9999.ebuild
+++ b/sys-devel/byfl/byfl-9999.ebuild
@@ -7,16 +7,17 @@
inherit autotools-utils flag-o-matic
if [ "${PV}" = "9999" ]; then
- LLVM_VERSION="3.6.2"
+ LLVM_VERSION="3.7.0"
EGIT_REPO_URI="git://github.com/losalamos/${PN^b}.git https://github.com/losalamos/${PN}.git"
inherit git-2
KEYWORDS=""
AUTOTOOLS_AUTORECONF=1
else
- LLVM_VERSION="3.6.2"
+ LLVM_VERSION="3.7.0"
MY_P="${P}-llvm-${LLVM_VERSION}"
SRC_URI="https://github.com/losalamos/Byfl/releases/download/v${MY_P#${PN}-}/${MY_P}.tar.gz"
KEYWORDS="~amd64 ~amd64-linux"
+ S="${WORKDIR}/${MY_P}"
fi
DESCRIPTION="Compiler-based Application Analysis"
@@ -24,9 +25,9 @@
SLOT="0"
LICENSE="BSD"
-IUSE="dragonegg hdf5 static-libs sqlite"
+IUSE="hdf5 static-libs sqlite"
-RDEPEND="dragonegg? ( >=sys-devel/dragonegg-${LLVM_VERSION} )
+RDEPEND="
>=sys-devel/clang-${LLVM_VERSION}
>=sys-devel/llvm-${LLVM_VERSION}
sys-devel/binutils:0
@@ -38,7 +39,6 @@
src_configure() {
append-cxxflags -std=c++11
- use dragonegg || export ax_cv_file_dragonegg_so=no
use sqlite || export ac_cv_lib_sqlite3_sqlite3_errstr=no
autotools-utils_src_configure H5CXX=$(usex hdf5 h5c++ no)
}
diff --git a/sys-devel/byfl/metadata.xml b/sys-devel/byfl/metadata.xml
index 38efabe..aef6d70 100644
--- a/sys-devel/byfl/metadata.xml
+++ b/sys-devel/byfl/metadata.xml
@@ -5,9 +5,6 @@
<email>ottxor@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
- <use>
- <flag name="dragonegg">Add support for non C languages through <pkg>sys-devel/dragonegg</pkg></flag>
- </use>
<upstream>
<remote-id type="github">losalamos/Byfl</remote-id>
</upstream>
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 321688d..ee59deb 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -73,7 +73,7 @@
DIST gcc-4.9.2-piepatches-v0.6.2.tar.bz2 14278 SHA256 f8876b172c2b4c5936b2cb18d3f092bfda8891bcdedcb569b63272a8530d81d0 SHA512 3f2d48743abba258ee6e298fc085f38d54c7b4cf4d431fe2efb83f718bdac3be916e67a3273aff1573db076decefbf4de3c4f706e102e6aafbce2371256048d8 WHIRLPOOL 76bbecad6d23793139040446721a5fb4711a9e272cf12545c51dd85c2d900e09e34dc0c260b80ad190a8072b475d779f5c6dd6b7891124bc4963b366f40989d3
DIST gcc-4.9.2-uclibc-patches-1.0.tar.bz2 2540 SHA256 3ca63cba5edb01367352fcd558890a838630deb4c30f82f4c7e8074ad75e57fc SHA512 69f6f80e23efee0b937fca0f2056e17b4fe643817d2394bbfd16cbb453d74c76a0bb8727815f689a795897d9cd5e06ecc74d3d9ad45175fe837ad008eee09706 WHIRLPOOL 3946513e83960fe891267e103e434cae0616cd45b5e7eaff5f4f671741c1445941cf80b7497231cf50f137941c01859dbbac0a95745fb7ae663a3ee512bd7162
DIST gcc-4.9.2.tar.bz2 89939747 SHA256 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd SHA512 e96cba06d572dbe7f382a2b00fd9297dcf9f9219d46a9ad0bd904dc36d5e7db3335e422640b79a27fed6fde91b0731732b94a0e2fbcd47344d6779f8ba1f4f9c WHIRLPOOL c4afdd0ec98e6f903044f1d3061fd96cf1e9bcbe2f90c388f5bc9ff8b2493b94367e84fdff7c2075ba37e2f950ecf2dba7c11786c653c2c7e86a5e8ff7d98e85
-DIST gcc-4.9.3-patches-1.2.tar.bz2 23657 SHA256 1eb0b19e9f048ba30b897154aa51d4c84e5c65eeaa35faa2614af5219b06529b SHA512 05eeb60c7b8a99f3b283caea06a8e1a015c41756496b67ed912467cb437dcb9d3bcefc235e6e1dd79c6f7364f378af6a3ebf52b333610a25a6f85cb10c4394b6 WHIRLPOOL d457b4fe4257cc4ef57317187b979d0a97f5c55d8ba4ddd2133e37d1f63299bfe35c3e11ab4efecc5c4f0361789773e5035b216d7fbbe4cdf4bc0c41be0aa655
+DIST gcc-4.9.3-patches-1.3.tar.bz2 23643 SHA256 a686a3097b6075fd40e25cde70ad881f22758565112395f03890c2f455f6b998 SHA512 d75960e64a52e0cea60eec863b7caaa434a07c25d410f78d9580f9890406aff5a648a61e718b2b812b4c5fc798ccbb82e9a16f05bc991af69f5a311795100ab9 WHIRLPOOL f98dbd2b587d292e0589b7dfe3a9d9ac5a2eb9b964bb7d1da75b5d958b11d5155b7604b6c1006def09c66045a8fc23379496bd0fd7909629d0e004ecf60aed66
DIST gcc-4.9.3-piepatches-v0.6.3.tar.bz2 14388 SHA256 268fd94cf905c9a9b95a259378c54a50763d1e13cc833cb0fc84ba33f0da78c4 SHA512 7e08934c729d06b578c420dcc845cb5fe274cb3f1f6eea8ba83a5031f0ba5f2c811e6b8fe5c2a72682030a71bf4134fd0e0d151452145899a7ae0318ebaf058a WHIRLPOOL 8f8d20c70061cd446d7c39d0f638c15ffaa64bc1cabc0f14c3f3632c76e432a3c4794cdb33799cacee754530876543902f53bca4465fca7d51c73f07eded9fe3
DIST gcc-4.9.3-uclibc-patches-1.0.tar.bz2 2515 SHA256 dd19904d4ab005ef142056228f326e75b3d4d79b8056189a505129b5940a575c SHA512 825092620a3c554ef06219fd1152c3677f1456315563b9e65282a73096e75600389e93298ed76cad41ce3eeecc6a7009ca722585b93c04095bd2d0a06c4404e6 WHIRLPOOL 0c184a5cc74f80a61f354ee85bc5a0f5b44d93bc9fa2e1892fbfe899958cfa5263b8b72cc4f905bc69bd1cc90cf870a6056c4003ec493b815646a72a0fe2e44e
DIST gcc-4.9.3.tar.bz2 90006707 SHA256 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e SHA512 9ac57377a6975fc7adac704ec81355262b9f537def6955576753b87715470a20ee6a2a3144a79cc8fcba3443f7b44c7337d79d704b522d053f54f79aa6b442df WHIRLPOOL 085e4cc1825b031652cbe9e098671f761acfeca64c6cc9b8ad2a8961c13fcac9e02b4538b44dc38181a355266f2c55c99ce5a1bff3f2860b870285cf3f0e84a5
@@ -81,7 +81,7 @@
DIST gcc-5.1.0-piepatches-v0.6.4.tar.bz2 14504 SHA256 9006fedb3b6c7eb92cd7eb7e65ac6d7d15b390086b75c53ef663cb647bc50689 SHA512 1b633bf017fb24047538e46a39ff85235849cc6f7394bb1798193f971746ab598a343ee997bbc2663dfa7860016fa1aff4e1a70e3f52465edf6a77b57327cfc0 WHIRLPOOL a2441860443a4a7436fe1a61d161a94d6037b92ac76ee558115020c91774b8bf126771cce45d946123c7a40f3eb8d4da13563f90f4564b78bcbbe42b64469084
DIST gcc-5.1.0-uclibc-patches-1.0.tar.bz2 2531 SHA256 1e8557d6b9952ff3e16d16b11b8e5dbae33bd37539d24d771436a7dc3a6e948f SHA512 e90aa58111368d5e6fbeb4818ecf5485ea4cefe5f3c4906c207c977b93e2b182f26987e955d03f988f59e5f056cdd71dde65f50ddb9909f8d1fac92383a3a6cf WHIRLPOOL bc04762db9b1324bd837c1e3fe440f787a7e38dae0e7eee099eefadda6a927f894246586608520a11fab138ffc825084b9d03e6e2065f8860accc2d3c803d778
DIST gcc-5.1.0.tar.bz2 94954411 SHA256 b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad SHA512 30f6a94d3adb25bc51fcaddf32a6c41429f569eeb9ed64330445b1296f99998fbfa03277b375be4f7b2b80f519910ef88e4149db7cd9031e2c61a49f501bde94 WHIRLPOOL c824ab1b4a801d11ca184ab93b3d7ec195dc0d869204cda08d6239b22832b597431f7eac3e22ffb1f13c2e4a6ef85edb3a954ad5b7754c447aa3fa6fccc21e63
-DIST gcc-5.2.0-patches-1.1.tar.bz2 21254 SHA256 2be83a3a257b53e9ea637f765714f045807329137bdb3747d7ee028c3f28a699 SHA512 7c16b21d64be7884799b8d23b1664138e7ed5e26f9d1a621670c6806632e7f62ccc202dbb8fc2dad8020053f5cee31280ec6214af3cc9394a968af88817db846 WHIRLPOOL 1b95839cae1e6ce38380d4a9a815c907a05f602e252d59ec36f0da43b95ca1ffa7f6e553a1179ca44d099047ae5401e804cd7769a383cdc5f9af15589ee61c03
+DIST gcc-5.2.0-patches-1.2.tar.bz2 22422 SHA256 5226c0a7dab2c51e712a33a731faf1bb7c225b5781cb862987d39ef9e5a0eec0 SHA512 d90ae0c8d020ade65fdc29f50bda554454fca68633a2fb93e5fc573f696d6eb14cb15fe0492ebd8644a4c8ed6382a09ea9799db71ae8c2ab276fdf09bb456234 WHIRLPOOL 4d6a3902a18b28c794d85bcd1e6791338e1bcff3b677911ff60ab31c8ecd1a3e7d2885c0ac04e83f85d6aa62ac481d065cf4273e7e1d5a01381ea4751e94707a
DIST gcc-5.2.0-piepatches-v0.6.4.tar.bz2 14482 SHA256 439297c8cd4d0511036d41b909dd45d55b60a61d029b7903431d6873a0cc248c SHA512 af2f8e436909eb87c90869e4d28376ac24b3d1edd7cd8e6ecaeb81ebe53aa585c4f04f288755ef122724594ee33a29cac4ca2233be971f6d959a99ad38b0d9b7 WHIRLPOOL 8269f23bf9ca82081097892fb3181f71180fea0029ac9595969e178c0afd7b1179c43f1fb7d35a45851cfc5ff003fc4bc20063e4e6de507d3c99926b971faa3c
DIST gcc-5.2.0-uclibc-patches-1.0.tar.bz2 2540 SHA256 ea39ee6ec3453039884c5e2bdfadc5a2848c8e7e72b5e4e54987a75808efac5d SHA512 50ff10d7dd1830a82fe7b35d28b626ab78a6c30c719a8a4940acf04b64269f5a6e3aa71bb3ea5a2aec17f898c10f30b4a29570ce23d3b996c52b4bc5c451f8eb WHIRLPOOL b200b0dca6485e2485d64cc4fd6896be0aee2727ee4a524b4411cf5d8b22fe5788615ecb162f5dd263822c1cdecf0959ea134ad10a19750ee78874e24b518a47
DIST gcc-5.2.0.tar.bz2 95221552 SHA256 5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad SHA512 844120349ec04465dcea52d8ec747f1cbbc9d76a39fe3d8ef5e6b93614e63d718862d60d0a1c1cbf59ffc7815562287d0a2e536a6b220cebcd0b8de4ba35e715 WHIRLPOOL 17cb8627c970d58b2526b01125a4578602bd3b5ba92b66395ffd9b4c6823eb412ea9d8a2995603d645d0f69d000e6e3f626b1467c4c31185a887cacf3a71429b
diff --git a/sys-devel/gcc/gcc-4.9.3.ebuild b/sys-devel/gcc/gcc-4.9.3.ebuild
index e93dd13..5d2355c 100644
--- a/sys-devel/gcc/gcc-4.9.3.ebuild
+++ b/sys-devel/gcc/gcc-4.9.3.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-PATCH_VER="1.2"
+PATCH_VER="1.3"
UCLIBC_VER="1.0"
# Hardened gcc 4 stuff
@@ -22,7 +22,7 @@
inherit eutils toolchain
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-5.2.0.ebuild b/sys-devel/gcc/gcc-5.2.0.ebuild
index 3de7f31..732716f 100644
--- a/sys-devel/gcc/gcc-5.2.0.ebuild
+++ b/sys-devel/gcc/gcc-5.2.0.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-PATCH_VER="1.1"
+PATCH_VER="1.2"
UCLIBC_VER="1.0"
# Hardened gcc 4 stuff
diff --git a/sys-devel/gdb/gdb-7.10-r1.ebuild b/sys-devel/gdb/gdb-7.10-r1.ebuild
index ec3031d..9e9dde1 100644
--- a/sys-devel/gdb/gdb-7.10-r1.ebuild
+++ b/sys-devel/gdb/gdb-7.10-r1.ebuild
@@ -143,6 +143,8 @@
--enable-64-bit-bfd
--disable-install-libbfd
--disable-install-libiberty
+ # Disable guile for now as it requires guile-2.x #562902
+ --without-guile
# This only disables building in the readline subdir.
# For gdb itself, it'll use the system version.
--disable-readline
diff --git a/sys-devel/gdb/gdb-7.8.2.ebuild b/sys-devel/gdb/gdb-7.8.2.ebuild
index 46bdbb4..8fe989b 100644
--- a/sys-devel/gdb/gdb-7.8.2.ebuild
+++ b/sys-devel/gdb/gdb-7.8.2.ebuild
@@ -128,6 +128,8 @@
--enable-64-bit-bfd
--disable-install-libbfd
--disable-install-libiberty
+ # Disable guile for now as it requires guile-2.x #562902
+ --without-guile
# This only disables building in the readline subdir.
# For gdb itself, it'll use the system version.
--disable-readline
diff --git a/sys-devel/gdb/gdb-7.9.1.ebuild b/sys-devel/gdb/gdb-7.9.1.ebuild
index 0f5a4d9..965d89b 100644
--- a/sys-devel/gdb/gdb-7.9.1.ebuild
+++ b/sys-devel/gdb/gdb-7.9.1.ebuild
@@ -142,6 +142,8 @@
--enable-64-bit-bfd
--disable-install-libbfd
--disable-install-libiberty
+ # Disable guile for now as it requires guile-2.x #562902
+ --without-guile
# This only disables building in the readline subdir.
# For gdb itself, it'll use the system version.
--disable-readline
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index ec3031d..9e9dde1 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -143,6 +143,8 @@
--enable-64-bit-bfd
--disable-install-libbfd
--disable-install-libiberty
+ # Disable guile for now as it requires guile-2.x #562902
+ --without-guile
# This only disables building in the readline subdir.
# For gdb itself, it'll use the system version.
--disable-readline
diff --git a/sys-devel/gettext/gettext-0.19.4.ebuild b/sys-devel/gettext/gettext-0.19.4.ebuild
index de130c1..6ceb3e7 100644
--- a/sys-devel/gettext/gettext-0.19.4.ebuild
+++ b/sys-devel/gettext/gettext-0.19.4.ebuild
@@ -4,16 +4,16 @@
EAPI="4"
-inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
+inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
DESCRIPTION="GNU locale utilities"
HOMEPAGE="https://www.gnu.org/software/gettext/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3 LGPL-2"
+LICENSE="GPL-3+ LGPL-2.1+"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
# only runtime goes multilib
DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
@@ -25,11 +25,7 @@
RDEPEND="${DEPEND}
!git? ( cvs? ( dev-vcs/cvs ) )
git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r11
- )"
+ java? ( >=virtual/jre-1.4 )"
PDEPEND="emacs? ( app-emacs/po-mode )"
MULTILIB_WRAPPED_HEADERS=(
@@ -37,6 +33,11 @@
/usr/include/gettext-po.h
)
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
src_prepare() {
java-pkg-opt-2_src_prepare
epunt_cxx
@@ -68,9 +69,6 @@
fi
use cxx || export CXX=$(tc-getCC)
- # Should be able to drop this hack in next release. #333887
- tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
-
local ECONF_SOURCE=${S}
if ! multilib_is_native_abi ; then
# for non-native ABIs, we build runtime only
diff --git a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild b/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild
index dc2e22a..b6fb8a8 100644
--- a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild
@@ -4,16 +4,16 @@
EAPI="4"
-inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
+inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
DESCRIPTION="GNU locale utilities"
HOMEPAGE="https://www.gnu.org/software/gettext/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3 LGPL-2"
+LICENSE="GPL-3+ LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
# only runtime goes multilib
DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
@@ -25,11 +25,7 @@
RDEPEND="${DEPEND}
!git? ( cvs? ( dev-vcs/cvs ) )
git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r11
- )"
+ java? ( >=virtual/jre-1.4 )"
PDEPEND="emacs? ( app-emacs/po-mode )"
MULTILIB_WRAPPED_HEADERS=(
@@ -37,6 +33,11 @@
/usr/include/gettext-po.h
)
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
src_prepare() {
java-pkg-opt-2_src_prepare
@@ -74,9 +75,6 @@
fi
use cxx || export CXX=$(tc-getCC)
- # Should be able to drop this hack in next release. #333887
- tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
-
local ECONF_SOURCE=${S}
if ! multilib_is_native_abi ; then
# for non-native ABIs, we build runtime only
diff --git a/sys-devel/gettext/gettext-0.19.5.ebuild b/sys-devel/gettext/gettext-0.19.5.ebuild
index 9e7d153..0b284dd 100644
--- a/sys-devel/gettext/gettext-0.19.5.ebuild
+++ b/sys-devel/gettext/gettext-0.19.5.ebuild
@@ -4,16 +4,16 @@
EAPI="4"
-inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
+inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
DESCRIPTION="GNU locale utilities"
HOMEPAGE="https://www.gnu.org/software/gettext/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3 LGPL-2"
+LICENSE="GPL-3+ LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
# only runtime goes multilib
DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
@@ -25,11 +25,7 @@
RDEPEND="${DEPEND}
!git? ( cvs? ( dev-vcs/cvs ) )
git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r11
- )"
+ java? ( >=virtual/jre-1.4 )"
PDEPEND="emacs? ( app-emacs/po-mode )"
MULTILIB_WRAPPED_HEADERS=(
@@ -37,6 +33,11 @@
/usr/include/gettext-po.h
)
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
src_prepare() {
java-pkg-opt-2_src_prepare
epunt_cxx
@@ -68,9 +69,6 @@
fi
use cxx || export CXX=$(tc-getCC)
- # Should be able to drop this hack in next release. #333887
- tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
-
local ECONF_SOURCE=${S}
if ! multilib_is_native_abi ; then
# for non-native ABIs, we build runtime only
diff --git a/sys-devel/gettext/gettext-0.19.6-r1.ebuild b/sys-devel/gettext/gettext-0.19.6-r1.ebuild
new file mode 100644
index 0000000..7677f88
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.19.6-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Note: Keep version bumps in sync with dev-libs/libintl.
+
+EAPI="5"
+
+inherit eutils mono-env libtool java-pkg-opt-2 multilib-minimal
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+# Only libasprintf is under the LGPL (and libintl is in a sep package),
+# so put that license behind USE=cxx.
+LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
+
+# only runtime goes multilib
+# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
+# would depend on older subslots if they were available (based on the ABIs that
+# are explicitly handled), but expat doesn't currently use subslots.
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+ dev-libs/libxml2:=
+ dev-libs/expat
+ acl? ( virtual/acl )
+ ncurses? ( sys-libs/ncurses:0= )
+ java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}
+ !git? ( cvs? ( dev-vcs/cvs ) )
+ git? ( dev-vcs/git )
+ java? ( >=virtual/jre-1.4 )"
+PDEPEND="emacs? ( app-emacs/po-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # only installed for native ABI
+ /usr/include/gettext-po.h
+)
+
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ java-pkg-opt-2_src_prepare
+
+ epunt_cxx
+ elibtoolize
+}
+
+multilib_src_configure() {
+ local myconf=(
+ # switches common to runtime and top-level
+ --cache-file="${BUILD_DIR}"/config.cache
+ --docdir="/usr/share/doc/${PF}"
+
+ # Emacs support is now in a separate package
+ --without-emacs
+ --without-lispdir
+ # glib depends on us so avoid circular deps
+ --with-included-glib
+ # libcroco depends on glib which ... ^^^
+ --with-included-libcroco
+ # this will _disable_ libunistring (since it is not bundled),
+ # see bug #326477
+ --with-included-libunistring
+ # Never build libintl since it's in dev-libs/libintl now.
+ --without-included-gettext
+
+ $(use_enable acl)
+ $(use_enable cxx c++)
+ $(use_enable cxx libasprintf)
+ $(use_with git)
+ $(usex git --without-cvs $(use_with cvs))
+ $(use_enable java)
+ $(use_enable ncurses curses)
+ $(use_enable nls)
+ $(use_enable openmp)
+ $(use_enable static-libs static)
+ )
+
+ local ECONF_SOURCE=${S}
+ if ! multilib_is_native_abi ; then
+ # for non-native ABIs, we build runtime only
+ ECONF_SOURCE+=/gettext-runtime
+ fi
+
+ econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi ; then
+ dosym msgfmt /usr/bin/gmsgfmt #43435
+ dobin gettext-tools/misc/gettextize
+ fi
+}
+
+multilib_src_install_all() {
+ use nls || rm -r "${D}"/usr/share/locale
+ use static-libs || prune_libtool_files --all
+
+ rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
+
+ if use java ; then
+ java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
+ rm -f "${D}"/usr/share/${PN}/*.jar
+ rm -f "${D}"/usr/share/${PN}/*.class
+ if use doc ; then
+ java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
+ rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
+ fi
+ fi
+
+ if use doc ; then
+ dohtml "${D}"/usr/share/doc/${PF}/*.html
+ else
+ rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
+ fi
+ rm -f "${D}"/usr/share/doc/${PF}/*.html
+
+ dodoc AUTHORS ChangeLog NEWS README THANKS
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
diff --git a/sys-devel/gettext/gettext-0.19.6.ebuild b/sys-devel/gettext/gettext-0.19.6.ebuild
index c024c12..0f921c0 100644
--- a/sys-devel/gettext/gettext-0.19.6.ebuild
+++ b/sys-devel/gettext/gettext-0.19.6.ebuild
@@ -4,16 +4,16 @@
EAPI="4"
-inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
+inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
DESCRIPTION="GNU locale utilities"
HOMEPAGE="https://www.gnu.org/software/gettext/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3 LGPL-2"
+LICENSE="GPL-3+ LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
# only runtime goes multilib
DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
@@ -25,11 +25,7 @@
RDEPEND="${DEPEND}
!git? ( cvs? ( dev-vcs/cvs ) )
git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r11
- )"
+ java? ( >=virtual/jre-1.4 )"
PDEPEND="emacs? ( app-emacs/po-mode )"
MULTILIB_WRAPPED_HEADERS=(
@@ -37,6 +33,11 @@
/usr/include/gettext-po.h
)
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
src_prepare() {
java-pkg-opt-2_src_prepare
@@ -69,9 +70,6 @@
fi
use cxx || export CXX=$(tc-getCC)
- # Should be able to drop this hack in next release. #333887
- tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
-
local ECONF_SOURCE=${S}
if ! multilib_is_native_abi ; then
# for non-native ABIs, we build runtime only
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch
new file mode 100644
index 0000000..c0f3a5f
--- /dev/null
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch
@@ -0,0 +1,12 @@
+--- tools/lldb/cmake/LLDBDependencies.cmake 2015/09/16 20:13:53 247841
++++ tools/lldb/cmake/LLDBDependencies.cmake 2015/09/16 20:14:01 247842
+@@ -141,6 +141,9 @@
+ endif()
+ if (NOT LLDB_DISABLE_CURSES)
+ list(APPEND LLDB_SYSTEM_LIBS panel ncurses)
++ if(LLVM_ENABLE_TERMINFO AND HAVE_TERMINFO)
++ list(APPEND LLDB_SYSTEM_LIBS ${TERMINFO_LIBS})
++ endif()
+ endif()
+ endif()
+ # On FreeBSD backtrace() is provided by libexecinfo, not libc.
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch
new file mode 100644
index 0000000..d53ce19
--- /dev/null
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch
@@ -0,0 +1,12 @@
+diff -Naur llvm-3.7.0.src.orig/docs/CMakeLists.txt llvm-3.7.0.src/docs/CMakeLists.txt
+--- llvm-3.7.0.src.orig/docs/CMakeLists.txt 2015-08-18 18:48:44.000000000 +0200
++++ llvm-3.7.0.src/docs/CMakeLists.txt 2015-10-12 14:40:00.985384589 +0200
+@@ -115,7 +115,7 @@
+ endif()
+
+ list(FIND LLVM_BINDINGS_LIST ocaml uses_ocaml)
+-if( NOT uses_ocaml LESS 0 )
++if( NOT uses_ocaml LESS 0 AND LLVM_BUILD_DOCS )
+ set(doc_targets
+ ocaml_llvm
+ ocaml_llvm_all_backends
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
index caba3d1..024bad7 100644
--- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
@@ -14,13 +14,13 @@
install(FILES ${install_files}
- DESTINATION lib/ocaml)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
install(FILES ${install_shlibs}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE
- DESTINATION lib/ocaml)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
foreach( install_file ${install_files} ${install_shlibs} )
get_filename_component(filename "${install_file}" NAME)
@@ -31,7 +31,7 @@
install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}"
- DESTINATION lib/ocaml)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
endforeach()
--- llvm-3.7.0rc3.src-orig/bindings/ocaml/llvm/CMakeLists.txt 2014-12-30 14:24:07.000000000 +1100
+++ llvm-3.7.0rc3.src/bindings/ocaml/llvm/CMakeLists.txt 2015-08-30 19:23:43.561583624 +1000
@@ -40,4 +40,4 @@
install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm"
- DESTINATION lib/ocaml)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
diff --git a/sys-devel/llvm/files/llvm-3.7-lldb_python.patch b/sys-devel/llvm/files/llvm-3.7-lldb_python.patch
new file mode 100644
index 0000000..1a95827
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-3.7-lldb_python.patch
@@ -0,0 +1,23 @@
+diff -Naur llvm-3.7.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py llvm-3.7.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py
+--- llvm-3.7.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2015-06-04 05:12:37.000000000 +0200
++++ llvm-3.7.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2015-10-11 19:19:54.074935710 +0200
+@@ -371,14 +371,14 @@
+ strLibFileExtn = ".dylib";
+ else:
+ strLibFileExtn = ".so";
+- strSrc = os.path.join("lib", "liblldb" + strLibFileExtn);
++ strSrc = os.path.join("GENTOO_LIBDIR", "liblldb" + strLibFileExtn);
+
+- if eOSType != utilsOsType.EnumOsType.Windows:
++# if eOSType != utilsOsType.EnumOsType.Windows:
+ # Create a symlink to the "lib" directory, to ensure liblldb's RPATH is
+ # effective.
+- bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, "lib", os.path.join("../lib") );
+- if not bOk:
+- return (bOk, strErrMsg)
++# bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, "lib", os.path.join("../lib") );
++# if not bOk:
++# return (bOk, strErrMsg)
+
+ bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget );
+
diff --git a/sys-devel/llvm/llvm-3.7.0-r2.ebuild b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
new file mode 100644
index 0000000..82c0d64
--- /dev/null
+++ b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
@@ -0,0 +1,511 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit check-reqs cmake-utils eutils flag-o-matic multilib \
+ multilib-minimal python-r1 toolchain-funcs pax-utils
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="http://llvm.org/"
+SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
+ clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
+ http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
+ http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
+ lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz )
+ !doc? ( http://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.bz2 )"
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml
+ python +static-analyzer test xml video_cards_radeon kernel_Darwin"
+
+COMMON_DEPEND="
+ sys-libs/zlib:0=
+ clang? (
+ python? ( ${PYTHON_DEPS} )
+ static-analyzer? (
+ dev-lang/perl:*
+ ${PYTHON_DEPS}
+ )
+ xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+ )
+ gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+ libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+ libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+ ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+ ocaml? (
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/findlib
+ dev-ml/ocaml-ctypes
+ !!<=sys-devel/llvm-3.7.0-r2[ocaml] )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${COMMON_DEPEND}
+ dev-lang/perl
+ >=sys-devel/make-3.81
+ >=sys-devel/flex-2.5.4
+ >=sys-devel/bison-1.875d
+ || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
+ ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
+ )
+ || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
+ kernel_Darwin? ( sys-libs/libcxx )
+ clang? ( xml? ( virtual/pkgconfig ) )
+ doc? ( dev-python/sphinx )
+ gold? ( sys-libs/binutils-libs )
+ libffi? ( virtual/pkgconfig )
+ lldb? ( dev-lang/swig )
+ !!<dev-python/configparser-3.3.0.2
+ ocaml? ( test? ( dev-ml/ounit ) )
+ ${PYTHON_DEPS}"
+RDEPEND="${COMMON_DEPEND}
+ clang? ( !<=sys-devel/clang-${PV}-r99 )
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+
+# pypy gives me around 1700 unresolved tests due to open file limit
+# being exceeded. probably GC does not close them fast enough.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ lldb? ( clang )
+ test? ( || ( $(python_gen_useflags 'python*') ) )"
+
+S=${WORKDIR}/${P/_}.src
+
+pkg_pretend() {
+ # in megs
+ # !clang !debug !multitarget -O2 400
+ # !clang !debug multitarget -O2 550
+ # clang !debug !multitarget -O2 950
+ # clang !debug multitarget -O2 1200
+ # !clang debug multitarget -O2 5G
+ # clang !debug multitarget -O0 -g 12G
+ # clang debug multitarget -O2 16G
+ # clang debug multitarget -O0 -g 14G
+
+ local build_size=550
+ use clang && build_size=1200
+
+ if use debug; then
+ ewarn "USE=debug is known to increase the size of package considerably"
+ ewarn "and cause the tests to fail."
+ ewarn
+
+ (( build_size *= 14 ))
+ elif is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn "The C++ compiler -g option is known to increase the size of the package"
+ ewarn "considerably. If you run out of space, please consider removing it."
+ ewarn
+
+ (( build_size *= 10 ))
+ fi
+
+ # Multiply by number of ABIs :).
+ local abis=( $(multilib_get_enabled_abis) )
+ (( build_size *= ${#abis[@]} ))
+
+ local CHECKREQS_DISK_BUILD=${build_size}M
+ check-reqs_pkg_pretend
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ echo 'int main() {return 0;}' > "${T}"/test.cxx || die
+ ebegin "Trying to build a C++11 test program"
+ if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
+ eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
+ eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
+ eerror "to gcc-4.7 or an equivalent version supporting C++11."
+ die "Currently active compiler does not support -std=c++11"
+ fi
+ eend ${?}
+ fi
+}
+
+pkg_setup() {
+ pkg_pretend
+}
+
+src_unpack() {
+ default
+
+ if use clang; then
+ mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \
+ || die "clang source directory move failed"
+ mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \
+ || die "compiler-rt source directory move failed"
+ mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \
+ || die "clang-tools-extra source directory move failed"
+ fi
+
+ if use lldb; then
+ mv "${WORKDIR}"/lldb-${PV/_}.src "${S}"/tools/lldb \
+ || die "lldb source directory move failed"
+ fi
+}
+
+src_prepare() {
+ # Make ocaml warnings non-fatal, bug #537308
+ sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die
+ # Fix libdir for ocaml bindings install, bug #559134
+ epatch "${FILESDIR}"/cmake/${P}-ocaml-multilib.patch
+ # Do not build/install ocaml docs with USE=-doc, bug #562008
+ epatch "${FILESDIR}"/cmake/${P}-ocaml-build_doc.patch
+
+ # Make it possible to override Sphinx HTML install dirs
+ # https://llvm.org/bugs/show_bug.cgi?id=23780
+ epatch "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+
+ # Prevent race conditions with parallel Sphinx runs
+ # https://llvm.org/bugs/show_bug.cgi?id=23781
+ epatch "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+
+ # Prevent installing libgtest
+ # https://llvm.org/bugs/show_bug.cgi?id=18341
+ epatch "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
+
+ if use clang; then
+ # Automatically select active system GCC's libraries, bugs #406163 and #417913
+ epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+
+ epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch
+
+ sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
+ tools/clang/tools/scan-build/scan-build || die
+
+ # Install clang runtime into /usr/lib/clang
+ # https://llvm.org/bugs/show_bug.cgi?id=23792
+ epatch "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+ epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+
+ # Make it possible to override CLANG_LIBDIR_SUFFIX
+ # (that is used only to find LLVMgold.so)
+ # https://llvm.org/bugs/show_bug.cgi?id=23793
+ epatch "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+
+ # Fix WX sections, bug #421527
+ find "${S}"/projects/compiler-rt/lib/builtins -type f -name \*.S -exec sed \
+ -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
+ -i {} \; || die
+ fi
+
+ if use lldb; then
+ # Do not install dummy readline.so module from
+ # https://llvm.org/bugs/show_bug.cgi?id=18841
+ sed -e 's/add_subdirectory(readline)/#&/' \
+ -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
+
+ # Fix Python paths, bugs #562436 and #562438
+ epatch "${FILESDIR}"/${PN}-3.7-lldb_python.patch
+ sed -e "s/GENTOO_LIBDIR/$(get_libdir)/" \
+ -i tools/lldb/scripts/Python/finishSwigPythonLLDB.py || die
+
+ # Fix build with ncurses[tinfo], #560474
+ # http://llvm.org/viewvc/llvm-project?view=revision&revision=247842
+ epatch "${FILESDIR}"/cmake/${P}-lldb_tinfo.patch
+ fi
+
+ # User patches
+ epatch_user
+
+ python_setup
+
+ # Native libdir is used to hold LLVMgold.so
+ NATIVE_LIBDIR=$(get_libdir)
+}
+
+multilib_src_configure() {
+ local targets
+ if use multitarget; then
+ targets=all
+ else
+ targets='host;CppBackend'
+ use video_cards_radeon && targets+=';AMDGPU'
+ fi
+
+ local ffi_cflags ffi_ldflags
+ if use libffi; then
+ ffi_cflags=$(pkg-config --cflags-only-I libffi)
+ ffi_ldflags=$(pkg-config --libs-only-L libffi)
+ fi
+
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ "${mycmakeargs[@]}"
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=ON
+ -DLLVM_ENABLE_TIMESTAMPS=OFF
+ -DLLVM_TARGETS_TO_BUILD="${targets}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ -DLLVM_ENABLE_FFI=$(usex libffi)
+ -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DWITH_POLLY=OFF # TODO
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ -DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+ -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+
+ -DHAVE_HISTEDIT_H=$(usex libedit)
+ )
+
+ if use lldb; then
+ mycmakeargs+=(
+ -DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+ -DLLDB_DISABLE_CURSES=$(usex !ncurses)
+ -DLLDB_ENABLE_TERMINFO=$(usex ncurses)
+ )
+ fi
+
+ if ! multilib_is_native_abi || ! use ocaml; then
+ mycmakeargs+=(
+ -DOCAMLFIND=NO
+ )
+ fi
+# Note: go bindings have no CMake rules at the moment
+# but let's kill the check in case they are introduced
+# if ! multilib_is_native_abi || ! use go; then
+ mycmakeargs+=(
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+ )
+# fi
+
+ if multilib_is_native_abi; then
+ mycmakeargs+=(
+ -DLLVM_BUILD_DOCS=$(usex doc)
+ -DLLVM_ENABLE_SPHINX=$(usex doc)
+ -DLLVM_ENABLE_DOXYGEN=OFF
+ -DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
+ -DSPHINX_WARNINGS_AS_ERRORS=OFF
+ -DLLVM_INSTALL_UTILS=ON
+ )
+
+ if use clang; then
+ mycmakeargs+=(
+ -DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang"
+ )
+ fi
+
+ if use gold; then
+ mycmakeargs+=(
+ -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+ )
+ fi
+
+ if use lldb; then
+ mycmakeargs+=(
+ -DLLDB_DISABLE_PYTHON=$(usex !python)
+ )
+ fi
+
+ else
+ if use clang; then
+ mycmakeargs+=(
+ # disable compiler-rt on non-native ABI because:
+ # 1. it fails to configure because of -m32
+ # 2. it is shared between ABIs so no point building
+ # it multiple times
+ -DLLVM_EXTERNAL_COMPILER_RT_BUILD=OFF
+ -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF
+ )
+ fi
+ if use lldb; then
+ mycmakeargs+=(
+ # only run swig on native abi
+ -DLLDB_DISABLE_PYTHON=ON
+ )
+ fi
+ fi
+
+ if use clang; then
+ mycmakeargs+=(
+ -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+ -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+ -DCLANG_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}"
+ )
+
+ # -- not needed when compiler-rt is built with host compiler --
+ # cmake passes host C*FLAGS to compiler-rt build
+ # which is performed using clang, so we need to filter out
+ # some flags clang does not support
+ # (if you know some more flags that don't work, let us know)
+ #filter-flags -msahf -frecord-gcc-switches
+ fi
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ # TODO: not sure why this target is not correctly called
+ multilib_is_native_abi && use doc && use ocaml && cmake-utils_src_make docs/ocaml_doc
+
+ pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+ pax-mark m "${BUILD_DIR}"/bin/lli
+ pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+ if use test; then
+ pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+ pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+ pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+ fi
+}
+
+multilib_src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ local test_targets=( check )
+ # clang tests won't work on non-native ABI because we skip compiler-rt
+ multilib_is_native_abi && use clang && test_targets+=( check-clang )
+ cmake-utils_src_make "${test_targets[@]}"
+}
+
+src_install() {
+ local MULTILIB_CHOST_TOOLS=(
+ /usr/bin/llvm-config
+ )
+
+ local MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/llvm/Config/config.h
+ /usr/include/llvm/Config/llvm-config.h
+ )
+
+ if use clang; then
+ # note: magic applied in multilib_src_install()!
+ CLANG_VERSION=${PV%.*}
+
+ MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/clang
+ /usr/bin/clang++
+ /usr/bin/clang-cl
+ /usr/bin/clang-${CLANG_VERSION}
+ /usr/bin/clang++-${CLANG_VERSION}
+ /usr/bin/clang-cl-${CLANG_VERSION}
+ )
+
+ MULTILIB_WRAPPED_HEADERS+=(
+ /usr/include/clang/Config/config.h
+ )
+ fi
+
+ multilib-minimal_src_install
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+
+ if multilib_is_native_abi; then
+ # Install man pages.
+ use doc || doman "${WORKDIR}"/${P}-manpages/*.1
+
+ # Symlink the gold plugin.
+ if use gold; then
+ dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
+ dosym "../../../../$(get_libdir)/LLVMgold.so" \
+ "/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
+ fi
+ fi
+
+ # apply CHOST and CLANG_VERSION to clang executables
+ # they're statically linked so we don't have to worry about the lib
+ if use clang; then
+ local clang_tools=( clang clang++ clang-cl )
+ local i
+
+ # cmake gives us:
+ # - clang-X.Y
+ # - clang -> clang-X.Y
+ # - clang++, clang-cl -> clang
+ # we want to have:
+ # - clang-X.Y
+ # - clang++-X.Y, clang-cl-X.Y -> clang-X.Y
+ # - clang, clang++, clang-cl -> clang*-X.Y
+ # so we need to fix the two tools
+ for i in "${clang_tools[@]:1}"; do
+ rm "${ED%/}/usr/bin/${i}" || die
+ dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}"
+ dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}"
+ done
+
+ # now prepend ${CHOST} and let the multilib-build.eclass symlink it
+ if ! multilib_is_native_abi; then
+ # non-native? let's replace it with a simple wrapper
+ for i in "${clang_tools[@]}"; do
+ rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die
+ cat > "${T}"/wrapper.tmp <<-_EOF_
+ #!${EPREFIX}/bin/sh
+ exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}"
+ _EOF_
+ newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}"
+ done
+ fi
+ fi
+}
+
+multilib_src_install_all() {
+ insinto /usr/share/vim/vimfiles
+ doins -r utils/vim/*/
+ # some users may find it useful
+ dodoc utils/vim/vimrc
+
+ if use clang; then
+ pushd tools/clang >/dev/null || die
+
+ if use static-analyzer ; then
+ pushd tools/scan-build >/dev/null || die
+
+ dobin ccc-analyzer scan-build
+ dosym ccc-analyzer /usr/bin/c++-analyzer
+ doman scan-build.1
+
+ insinto /usr/share/llvm
+ doins scanview.css sorttable.js
+
+ popd >/dev/null || die
+ fi
+
+ python_inst() {
+ if use static-analyzer ; then
+ pushd tools/scan-view >/dev/null || die
+
+ python_doscript scan-view
+
+ touch __init__.py || die
+ python_moduleinto clang
+ python_domodule *.py Resources
+
+ popd >/dev/null || die
+ fi
+
+ if use python ; then
+ pushd bindings/python/clang >/dev/null || die
+
+ python_moduleinto clang
+ python_domodule *.py
+
+ popd >/dev/null || die
+ fi
+
+ # AddressSanitizer symbolizer (currently separate)
+ python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
+ }
+ python_foreach_impl python_inst
+ popd >/dev/null || die
+ fi
+}
+
+pkg_postinst() {
+ if use clang; then
+ elog "To enable OpenMP support in clang, install sys-libs/libomp"
+ elog "and use the '-fopenmp=libomp' command line option"
+ fi
+}
diff --git a/sys-devel/prelink/files/prelink-20130503-libiberty-md5.patch b/sys-devel/prelink/files/prelink-20130503-libiberty-md5.patch
index 36b8bce..5a9fffb 100644
--- a/sys-devel/prelink/files/prelink-20130503-libiberty-md5.patch
+++ b/sys-devel/prelink/files/prelink-20130503-libiberty-md5.patch
@@ -8,7 +8,7 @@
Current libiberty md5 code triggers these warnings with gcc-4.7.1 for me:
-libiberty/md5.c: In function âmd5_finish_ctxâ:
+libiberty/md5.c: In function ‘md5_finish_ctx’:
libiberty/md5.c:117:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
libiberty/md5.c:118:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 6604433..e341564 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -6,3 +6,4 @@
DIST aufs3-standalone-3_p20150525.tar.xz 2988108 SHA256 117be76206e67425c4144174afaa347c4f9e9414200899b5c43a8ec0b91c7d03 SHA512 ea6031ff9231ce68b95450e428989ad81b1c6ce4a9a21f718f73dbafd3aa1e12191d7abd57829e0f80cc0cf0aa412e35b2cad4e14430078b88b2e17312d7b708 WHIRLPOOL 81aeff069ebc6122856c74fcdd38784bd7a231c99726a73ddaad04f145978053fd3ff8b788ac0995fa261cfbf62d461c43f8dca887525df887fdb0011a417f40
DIST aufs3-standalone-3_p20150608.tar.xz 3015460 SHA256 cdf92d07f45becfeb70ea3314e554ea9c8766a2815c3aa6c8d634b5307c76d5d SHA512 4d29d2d4908cd7a4471bc3efe5c23e57d41765937c700eee8593a5c07d7e84e12e6093ef4338b6bd4e9e6f0e44674557a659fd5fa5257a79b381385d208c2209 WHIRLPOOL ccf68e64eb5bc1893c2e5d50c6fc3eaf4e71fd06949ae16e4343734dca39f7f016ab0a08796d444efe55947a8645193979c0dccce702d8c38e46207bfde4f1ad
DIST aufs3-standalone-3_p20150622.tar.xz 3063280 SHA256 2fa44f9df9d58df7a5251ebd2cec206fa90ca8e110c1f657df18e62adb170517 SHA512 fe7a62249130d68f72b14f21b57e5d6db402f56637afc876068d916e78884d08476c804ac58ef06eeb9e13e0a2e1cb75ac782f83054f1c06cb85c74a3c48ba01 WHIRLPOOL 7f85a5324d51e148c97109357c13fcab76121d25ee006211d2212f9c6d352330be110569848c8ca96421bc4582025c73030329d7e501837e4d18cafd6002f153
+DIST aufs3-standalone-3_p20151012.tar.xz 3122148 SHA256 f54f1f19bec26f653939e00b30007a465a1f555356ec3886f2a5970276494d0e SHA512 fcf251f358c0dfb66387744d1a1339b2bbcc979c7cc86d01068d108abd6a765c69ecce56cc182d385006febf5abf093fb2c2af77e4cc149134ac413a26b4118f WHIRLPOOL 06be7483792bceea58b26d733c1eed6f69ddd81cd49617550c3414e1800964690b69c1ee9f12b1d48887d051d6b0488a009a56aec0df7cbcc5625ca27f9043f8
diff --git a/sys-fs/aufs3/aufs3-3_p20151012.ebuild b/sys-fs/aufs3/aufs3-3_p20151012.ebuild
new file mode 100644
index 0000000..9930d1e
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20151012.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=19
+# highest supported version
+KERN_MAX_VER=20
+# lowest supported version
+KERN_MIN_VER=14
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+ dev-util/patchutils
+ dev-vcs/git"
+RDEPEND="
+ sys-fs/aufs-util
+ !sys-fs/aufs
+ !sys-fs/aufs2
+ !sys-fs/aufs4"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+ CONFIG_CHECK+=" !AUFS_FS"
+ use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+ use nfs && CONFIG_CHECK+=" EXPORTFS"
+ use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+ use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+ use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+ # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+ [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+ get_version
+ kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+ kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+ linux-mod_pkg_setup
+
+ if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+ PATCH_BRANCH="x-rcN"
+ elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
+ PATCH_BRANCH="${KV_MINOR}".21+
+ elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+ PATCH_BRANCH="${KV_MINOR}".1+
+ else
+ PATCH_BRANCH="${KV_MINOR}"
+ fi
+
+ case ${KV_EXTRA} in
+ "")
+ elog "It seems you are using vanilla-sources with aufs3"
+ elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+ elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+ ;;
+ "-gentoo")
+ elog "It seems you are using gentoo-sources with aufs3"
+ elog "Please use sys-kernel/aufs-sources"
+ elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+ ;;
+ esac
+
+ pushd "${T}" &> /dev/null
+ unpack ${A}
+ cd ${PN}-standalone || die
+ local module_branch=origin/${PN}.${PATCH_BRANCH}
+ einfo "Using ${module_branch} as patch source"
+ git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+ combinediff ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
+ combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+ if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+ if use kernel-patch; then
+ cd ${KV_DIR}
+ ewarn "Patching your kernel..."
+ patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+ epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+ ewarn "You need to compile your kernel with the applied patch"
+ ewarn "to be able to load and use the aufs kernel module"
+ else
+ eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+ eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+ eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+ die "missing kernel patch, please apply it first"
+ fi
+ fi
+ popd &> /dev/null
+ export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+ for option in $*; do
+ grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+ sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+ done
+}
+
+src_prepare() {
+ local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+ einfo "Using for module creation branch ${module_branch}"
+ git checkout -q -b local-gentoo ${module_branch} || die
+
+ # All config options to off
+ sed "s:= y:=:g" -i config.mk || die
+
+ set_config RDU BRANCH_MAX_127 SBILIST
+
+ use debug && set_config DEBUG
+ use fuse && set_config BR_FUSE POLL
+ use hfs && set_config BR_HFSPLUS
+ use inotify && set_config HNOTIFY HFSNOTIFY
+ use nfs && set_config EXPORT
+ use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+ use ramfs && set_config BR_RAMFS
+
+ if use pax_kernel; then
+ if kernel_is ge 3 11; then
+ epatch "${FILESDIR}"/pax-3.11.patch
+ else
+ epatch "${FILESDIR}"/pax-3.patch
+ fi
+ fi
+
+ sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+ local ARCH=x86
+
+ emake \
+ CC=$(tc-getCC) \
+ LD=$(tc-getLD) \
+ LDFLAGS="$(raw-ldflags)" \
+ ARCH=$(tc-arch-kernel) \
+ CONFIG_AUFS_FS=m \
+ KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+ linux-mod_src_install
+
+ insinto /usr/share/doc/${PF}
+
+ use doc && doins -r Documentation
+
+ use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+ dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_pkg_postinst
+ linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs3/metadata.xml b/sys-fs/aufs3/metadata.xml
index 1a39d4b..f2a4b5a 100644
--- a/sys-fs/aufs3/metadata.xml
+++ b/sys-fs/aufs3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
index 59823a5..86af950 100644
--- a/sys-fs/aufs4/Manifest
+++ b/sys-fs/aufs4/Manifest
@@ -1,4 +1,4 @@
-DIST aufs4-standalone-0_pre20150420.tar.xz 424400 SHA256 7d96ee8bb16a4b72d60bfbab2955f5e68aec5a01d61a0a4870bb90f69099ad0f SHA512 71e460c582591861a1042fe628b186f081581f61fef61ccdc1ddb98ae7ee289ae58922c9df1549109f4351c8de3858fb3b2eb040f7e1da488f05f5b954468311 WHIRLPOOL f6b324404a62b465cd8a2d677000c4b4c7f951fa502f7ed6e5634d4a39dc90bb87e245a7f7036379a02d8e7f8a9fc64801c33e86ceb747b63912b8509d68a925
+DIST aufs4-standalone-0_pre20150420.tar.xz 424360 SHA256 b570006f74faffa91906091ae07dd0441b57f0a1b90f3cbce3585d2b601c98b8 SHA512 51aff25489299e3c59457eea6076e15fb1179233292ad799b4b755368925500fe57fd336361f0cfe7f2d3b8d5469693c1049b8528038a5f0f1baa07b665af9ac WHIRLPOOL 7bd4f604613b3afa94b57eb273fa074334aa0273d21b9db139c8ad13e138defe9f86334d0784c2c3072f86cfcbdcaa5baaea621e72550524248ec1a733dba9e1
DIST aufs4-standalone-0_pre20150504.tar.xz 466636 SHA256 b14bba141ead117ff9193a8a896a2bcefc418e11e642eb8547d4785833d70261 SHA512 c1299eb6ca179e60e60be2f7792001e2277f9507fd416994abd41c43e066be46ea508eaface45740153e4c34ccfcdcb3aa6a6118c840786fb1abf5aa56d6cc63 WHIRLPOOL 37bf469947c8ef5e0724e37fa40ec9535ff4065f81e64d45d924c16bb1d059d526ae853d0a73cd67de2aeacd3c41444a3a51545e9a12d08c0b8b27b526fa4dff
DIST aufs4-standalone-0_pre20150511.tar.xz 501548 SHA256 a26e5e684c1878d0bd8e18c512979a6d0cccd9b1c8219746fe3d93ab1448f1be SHA512 da123ea8da38c840de76201284bf6846d794421e38e6193206ac753380eab3ecea33724c23c7b25d62f933c0c3d1e67082d17c1e702eefdb24c722808b88a69d WHIRLPOOL c7d2c81119933a55f0aa357fbc840f4a60597144386150c45260f2c7b99a0722d362595558df4b0db146c0fe65fb6886b002186e15a5e8cea00b3a04075a5500
DIST aufs4-standalone-0_pre20150518.tar.xz 515624 SHA256 e2c2aeb02dce4f2b15da8459e92e90896c0fc795d6df829e2cab4eb2a82174a1 SHA512 4188d4d7928e1ee8ce88a7a079ee75c0ab9695c3e23db66952ff9d276ad3cfa5dbed1585dabe05856c5f3417d436fa3a1f93645ee68ebaa65a21610de8e34aca WHIRLPOOL 013672a12293ffe9067013d0295f6d797fafafa9f1ca49eb37a831fb77addac52dee804b9c809eadf4d18205a81e419be0b0b273d875a0f04e657498ccf95af8
@@ -6,4 +6,5 @@
DIST aufs4-standalone-0_pre20150608.tar.xz 532144 SHA256 8aaa1f348de3b6cfa86f21539d0ec44e5d0d18c27f0645719e3140462522a4e7 SHA512 1abd663b5f7997b93a865bf478c2900a3f69aff1d25149be683f8fd0f7362eaeccb7cdd9ce91ff08d1c4f2660414e03b7c9170fb7818c0839176b94c720d2896 WHIRLPOOL 36fa2691e8f5f27be41463c67df10d0e467892151e50df6f8396293c2572ad3d9229f00302bc47d816b48a08bdb64c92926381ba9d00c150dfb9f445dba8aeeb
DIST aufs4-standalone-0_pre20150622.tar.xz 543932 SHA256 28de7f6968c62a48b78f4b6c9234dd4b7b134632e1d4e7d50e87da9e05c06343 SHA512 82f130ed3b43e2bfe42079c96dca70e868d7ce1df5511f68e7b85d343105d452c334fe7a15c1cd4e01450ca39dd527123c060b98b396d13c4250541ec464c2fc WHIRLPOOL e46a01857f2cbd52e6a3717bc5d076197443146fa9eab3b542aeb2698da652a45e8d40e1f9f50d9d4c3fc34d9a6da225712ac32f27f15eded4e8e3f23e113de8
DIST aufs4-standalone-0_pre20150629.tar.xz 547808 SHA256 7c1d9a815c73e8cb1c9f909eee8f6945486c8e8feeea9cae4b3865b6032f17e5 SHA512 b7c734fb83515790b58a81b904acb286ef52124e0799dad1c7900dc8af3e0dc6f2875ba86805f1f39b8d04ce6660bf0c0307e4bbc1b58f2ca6171ead5e668a94 WHIRLPOOL b39f2cdeffd20b636c4a3aa5ec8e87cd6b1c8bdfdab071d1cabf53e10629beebffc919abf5fc90915ec0c14f4b4c45a510bbd303765564348a0e2d1688ddf79b
-DIST aufs4-standalone-0_pre20150928.tar.xz 649696 SHA256 3d8b5a31c7ebc26da0670927c778404f8820071dc559a8eef8bfd38a366d9a8e SHA512 a45a94d67dbd785d732bc9c257a722cd11acccab4b318647af226cf0a593768d47fd107e07b6f5ca7907ccb1e920bdc74c7d4b12b715a5fd3be103f1b7bd8605 WHIRLPOOL 8fa2f64821b9aea7e4dddc75deaca45bf954f97becbfffe313a0caceb51b7d915f35610544964229c5dd0a80f28d44ea817724aad50d297e7acd6ce52209d8da
+DIST aufs4-standalone-0_pre20150928.tar.xz 649700 SHA256 614a7d36577d9c432deba647ae925a05f05468fcf9af54c84c553ee9f4b4ccb8 SHA512 69182e8ef0cd8bb251bd579e18aea1fdc5b38d16f9bd8a7dd23eaf84ae86bb24dd011871f90a0d0c1434a6136b9dcc70ed07b6f8301344d13083cd6a755c75ba WHIRLPOOL b43eb05904917f74ea38bd148543552dc1d40eb590cf5059a884dcba909e76943cb9e2d1b873300701ffbc6061beeb3efb76f8014e08a8742c48c38cd6c5fe53
+DIST aufs4-standalone-0_pre20151012.tar.xz 651492 SHA256 3cb564a71a4d4fe4f16c9412b5c714645739beea9471db421d76f1af2af86d83 SHA512 abf1833a4902dc95cce203607cd715b6794b13e064c073139bc06facfd86ceb817d00d7bed0f5420d8f8f7c9205524a8ffc9431dc1c0d2da1e73393b7d89d33d WHIRLPOOL a8cb9e8fc4449dbc54e1bfab1c9acb61e7dc31c33c62d8a2e2feb407bc6d4a2ceb502fd85ac7519af1e9b028603525ee26763438e04736fee138420796c13e90
diff --git a/sys-fs/aufs4/aufs4-0_pre20151012.ebuild b/sys-fs/aufs4/aufs4-0_pre20151012.ebuild
new file mode 100644
index 0000000..e9d57d6
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20151012.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=2
+# highest supported version
+KERN_MAX_VER=3
+# lowest supported version
+KERN_MIN_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+ dev-util/patchutils
+ dev-vcs/git"
+RDEPEND="
+ sys-fs/aufs-util
+ !sys-fs/aufs
+ !sys-fs/aufs2
+ !sys-fs/aufs3"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+ CONFIG_CHECK+=" !AUFS_FS"
+ use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+ use nfs && CONFIG_CHECK+=" EXPORTFS"
+ use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+ use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+ use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+ # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+ [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+ get_version
+ kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+ kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+ linux-mod_pkg_setup
+
+ if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+ PATCH_BRANCH="x-rcN"
+ else
+ PATCH_BRANCH="${KV_MINOR}"
+ fi
+
+ case ${KV_EXTRA} in
+ "")
+ elog "It seems you are using vanilla-sources with aufs4"
+ elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+ elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+ ;;
+ "-gentoo")
+ elog "It seems you are using gentoo-sources with aufs4"
+ elog "Please use sys-kernel/aufs-sources"
+ elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+ ;;
+ esac
+
+ pushd "${T}" &> /dev/null
+ unpack ${A}
+ cd ${PN}-standalone || die
+ local module_branch=origin/${PN}.${PATCH_BRANCH}
+ einfo "Using ${module_branch} as patch source"
+ git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+ combinediff ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
+ combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+ if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+ if use kernel-patch; then
+ cd ${KV_DIR}
+ ewarn "Patching your kernel..."
+ patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+ epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+ ewarn "You need to compile your kernel with the applied patch"
+ ewarn "to be able to load and use the aufs kernel module"
+ else
+ eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+ eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+ eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+ die "missing kernel patch, please apply it first"
+ fi
+ fi
+ popd &> /dev/null
+ export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+ for option in $*; do
+ grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+ sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+ done
+}
+
+src_prepare() {
+ local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+ einfo "Using for module creation branch ${module_branch}"
+ git checkout -q -b local-gentoo ${module_branch} || die
+
+ # All config options to off
+ sed "s:= y:=:g" -i config.mk || die
+
+ set_config RDU BRANCH_MAX_127 SBILIST
+
+ use debug && set_config DEBUG
+ use fuse && set_config BR_FUSE POLL
+ use hfs && set_config BR_HFSPLUS
+ use inotify && set_config HNOTIFY HFSNOTIFY
+ use nfs && set_config EXPORT
+ use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+ use ramfs && set_config BR_RAMFS
+
+ if use pax_kernel; then
+ epatch "${FILESDIR}"/pax-4.patch
+ fi
+
+ sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+ local ARCH=x86
+
+ emake \
+ CC=$(tc-getCC) \
+ LD=$(tc-getLD) \
+ LDFLAGS="$(raw-ldflags)" \
+ ARCH=$(tc-arch-kernel) \
+ CONFIG_AUFS_FS=m \
+ KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+ linux-mod_src_install
+
+ insinto /usr/share/doc/${PF}
+
+ use doc && doins -r Documentation
+
+ use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+ dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_pkg_postinst
+ linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs4/metadata.xml b/sys-fs/aufs4/metadata.xml
index 1a39d4b..f2a4b5a 100644
--- a/sys-fs/aufs4/metadata.xml
+++ b/sys-fs/aufs4/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest
index 216ceb4..4cbcd0f 100644
--- a/sys-fs/bcache-tools/Manifest
+++ b/sys-fs/bcache-tools/Manifest
@@ -1,3 +1,2 @@
-DIST bcache-tools-0_pre20130627.tar.xz 17812 SHA256 aca02134fa3e18b27020e6500a21ff017fecadd3d64acbadc419efccc4abeacc SHA512 b3167ba61560f17ff5d1ac9e8514c9b7b5f02cc97500a5d68885bb4a04f92c50621095c922fdca1f6ff4d79955b3cd77dc42c5cda08525ad32468f8e80a5d85b WHIRLPOOL f9d335555419def9d9d8995a8b1ea7f3df78a23a13a5c818bc4d8d2cecbdd22a7f220e49c72446ea2ffa0eb3d49518dab9b2ff4ab0083df9b3d02537795c9c8d
-DIST bcache-tools-1.0.4.tgz 21683 SHA256 102ffc3a8389180f4b491188c3520f8a4b1a84e5a7ca26d2bd6de1821f4d913d SHA512 d3f325519c67ee43c2f4c690fe666dbba97c9ba06ee091f15ad082fb193895aac322b82843447205ae0eb909a520d93e0ce2dd6207707021e087dedf16d7b273 WHIRLPOOL 2c46e01dee2d8d431d83c6d6797a3fca392970819a795124d452366c12e665fe8e7467375fc537af9ac6b06c8dc650d1009e15d64d109c28d7d27e1c7061c8a1
DIST bcache-tools-1.0.5.tgz 21934 SHA256 1449294ef545b3dc6f715f7b063bc2c8656984ad73bcd81a0dc048cbba416ea9 SHA512 aaf27e4cc3037d482cb14c8bb083c1ce5cda5641a19cec67ca1ad22cde71ce035e49701145c6d920b4d62058897c4b7d29d341b3b8bd436c9c51e2f8bdb5c568 WHIRLPOOL 7c2dd6919ba7cc7eebab0c90b517cd73ab4b7e02aedf4c998d95681e3feeedf5368fa5edf58a6a3e079fd7ad3ae5040fe6f02c743132f054c7f56fbad9c44f4b
+DIST bcache-tools-1.0.8.tgz 22153 SHA256 d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc WHIRLPOOL 7fada61d2bce55755dd75a1d5518c264c0470b071b6a3c6a003bb3016554eba5715014edfda1a05597d3dca1b557fd7eaea19df467c6c503ad1a52b9664657ef
diff --git a/sys-fs/bcache-tools/bcache-tools-0_pre20130627-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-0_pre20130627-r1.ebuild
deleted file mode 100644
index 2a661ef..0000000
--- a/sys-fs/bcache-tools/bcache-tools-0_pre20130627-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="http://bcache.evilpiepirate.org/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-src_prepare() {
- tc-export CC
- sed \
- -e '/^CFLAGS/d' \
- -i Makefile || die
-}
-
-src_install() {
- into /
- dosbin make-bcache probe-bcache bcache-super-show
- doman *.8
-
- insinto /etc/initramfs-tools/hooks/bcache
- doins initramfs/hook
-
- udev_dorules 61-bcache.rules
-
- exeinto $(get_udevdir)
- doexe bcache-register
-
- dodoc README
-}
-
-pkg_postinst() {
- udev_reload
-}
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.4.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.4.ebuild
deleted file mode 100644
index 8d4dd2b..0000000
--- a/sys-fs/bcache-tools/bcache-tools-1.0.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="http://bcache.evilpiepirate.org/"
-SRC_URI="https://github.com/g2p/bcache-tools/archive/v1.0.4.tar.gz -> ${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=sys-apps/util-linux-2.24"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- tc-export CC
- sed \
- -e '/^CFLAGS/s:-O2::' \
- -e '/^CFLAGS/s:-g::' \
- -i Makefile || die
-}
-
-src_install() {
- into /
- dosbin make-bcache bcache-super-show
-
- exeinto $(get_udevdir)
- doexe bcache-register probe-bcache
-
- udev_dorules 69-bcache.rules
-
- insinto /etc/initramfs-tools/hooks/bcache
- doins initramfs/hook
-
- # that is what dracut does
- insinto /usr/lib/dracut/modules.d/90bcache
- doins dracut/module-setup.sh
-
- doman *.8
-
- dodoc README
-}
-
-pkg_postinst() {
- udev_reload
-}
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild
new file mode 100644
index 0000000..72946fa
--- /dev/null
+++ b/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="Tools for bcachefs"
+HOMEPAGE="http://bcache.evilpiepirate.org/"
+SRC_URI="https://github.com/g2p/bcache-tools/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=sys-apps/util-linux-2.24"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ tc-export CC
+ sed \
+ -e '/^CFLAGS/s:-O2::' \
+ -e '/^CFLAGS/s:-g::' \
+ -i Makefile || die
+}
+
+src_install() {
+ into /
+ dosbin make-bcache bcache-super-show
+
+ exeinto $(get_udevdir)
+ doexe bcache-register probe-bcache
+
+ udev_dorules 69-bcache.rules
+
+ insinto /etc/initramfs-tools/hooks/bcache
+ doins initramfs/hook
+
+ # that is what dracut does
+ insinto /usr/lib/dracut/modules.d/90bcache
+ doins dracut/module-setup.sh
+
+ doman *.8
+
+ dodoc README
+}
+
+pkg_postinst() {
+ udev_reload
+}
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 9be8a95..5d96b66 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -7,4 +7,5 @@
DIST btrfs-progs-v4.0.tar.xz 1102500 SHA256 179cf1acc1b0061548b8f1d9cf973a8338bf96f192cecad99ecdace9ae065a1f SHA512 895d6c27bd82c4b320c705c32613b28e601f316c0881080d8c376d0045162eaab6c91431dee73b391fc608e6d7c16f3a744ef6b9c85adb4beaa4376fbbe36d9a WHIRLPOOL cf71cc4ab6c85e8673143bb779c7b252caf1bfabc14fb2d7dd3477bd842b491ac3d7f121c3dcbecec023c5873c4b4400a5f2087e55bbee14217982f9712d5c2f
DIST btrfs-progs-v4.1.2.tar.xz 1123080 SHA256 62db60c6a0868afb6302112cea54c756873bc30b826696b167ec03ecd61b2f12 SHA512 dd159bcc3adb65efd4f612d75f5a6b30df8ad9fa06ef952dd03dac965256de37eab26f4cc2fb3840178403ccbb7368cae11638e27eadb9b1835b636c4b126e2e WHIRLPOOL 819e6d61ecbb0f2d099abcda70ae9ab53b3311a28131fdedbbad7cc033c4984309a460f704d2f2ce7cf36cf0e034e82618c1b45002fdfbb5eced648883e12a29
DIST btrfs-progs-v4.1.tar.xz 1119564 SHA256 abc6ff9dbbf948e7358edd34db32103cba8b86c5cb9e3ed7eb3b5630e2feb7e8 SHA512 0c596bab3276d1dc6de010ce94a1d7758c80fe21d540b2d4b3487e0a5cf0a63b27fdba3e1af42aa349447a0be459f2087f9b4ae03fdc0dfcc4f316e570893346 WHIRLPOOL 97ae77f578f162ec114e137899f195ec0e28097902e2f2ae5e1f37db359cd6c1bae2f0fb6641b0365df80defb844d58603623db27dc63c1576437efcaf19d3e6
+DIST btrfs-progs-v4.2.2.tar.xz 1143760 SHA256 5d87e4ebb2a3a288c167791e489bfa484034d185c704870c484cb0771d921316 SHA512 2ad23546b3bb421faad1f67da37566b6ae1887c5340c0f1d06ca59fc0cd0fb1060d92e74e36ba7bfd85b0aff30811525654cd03b7d3570b0b51c2d8e2d6d9a76 WHIRLPOOL 5051f232bf5d6c2d19bc0fba9f2653546fc09000279863637a7ab44ff5c8bd107e5307aef3d2fbc7113581df3c224965f882045153eb9fa10da5b34cc4318188
DIST btrfs-progs-v4.2.tar.xz 1130488 SHA256 25233c3e94c52bf433e8749c17dad2acd8004c6dbc93e2bff9397c4e9fa58fbe SHA512 ba322478c1ce4df5548a953de581053c9fb9d60d1626639dc543065847a0c92ea6712728479dcb59487e02ab6aaea9f688fe1e3ef5087517e55d346b02d36065 WHIRLPOOL 54cd45554c15bedac3baac6939e6e91965b59c1c6cc0b7ca10d4c910dfe56811a278f9ee6026a9cc61286544370a45f0c0ccccfb08d7958d7a0c4b2964751bd4
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.2.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.2.2.ebuild
new file mode 100644
index 0000000..4f0cc37
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.2.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 eutils multilib toolchain-funcs
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+ MY_PV=v${PV}
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+ S="${WORKDIR}"/${PN}-${MY_PV}
+else
+ WANT_LIBTOOL=none
+ inherit autotools git-r3
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
+ https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
+ EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+ dev-libs/lzo:2=
+ sys-libs/zlib:0=
+ convert? (
+ sys-fs/e2fsprogs:0=
+ sys-libs/e2fsprogs-libs:0=
+ )
+"
+DEPEND="${RDEPEND}
+ convert? ( sys-apps/acl )
+ app-text/asciidoc
+ app-text/docbook-xml-dtd:4.5
+ app-text/xmlto
+"
+
+if [[ ${PV} == 9999 ]]; then
+ DEPEND+=" sys-devel/gnuconfig"
+fi
+
+src_prepare() {
+ epatch_user
+ if [[ ${PV} == 9999 ]]; then
+ eautoreconf
+ mkdir config || die
+ local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+ [[ -e ${automakedir} ]] || die "Could not locate automake directory"
+ ln -s "${automakedir}"/install-sh config/install-sh || die
+ ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+ ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ --bindir="${EPREFIX}"/sbin
+ $(use_enable convert)
+ $(use_enable elibc_glibc backtrace)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake V=1
+}
+
+src_install() {
+ default
+ newbashcomp btrfs-completion btrfs
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 4f0cc37..6f72426 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -16,8 +16,7 @@
else
WANT_LIBTOOL=none
inherit autotools git-r3
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
- https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
+ EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
EGIT_BRANCH="devel"
fi
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.8-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.8-r1.ebuild
new file mode 100644
index 0000000..e264629
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.6.8-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit autotools python-single-r1 linux-info libtool eutils versionator
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
+SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} libressl nls pwquality python reencrypt static static-libs udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ static? ( !gcrypt )" #496612
+
+LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
+ dev-libs/popt[static-libs(+)]
+ sys-apps/util-linux[static-libs(+)]
+ gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+ nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+ openssl? (
+ !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+ libressl? ( dev-libs/libressl:=[static-libs(+)] )
+ )
+ pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+ sys-fs/lvm2[static-libs(+)]
+ udev? ( virtual/libudev[static-libs(+)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+ ${LIB_DEPEND//\[static-libs\(+\)\]}
+ python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ static? ( ${LIB_DEPEND} )"
+
+pkg_setup() {
+ local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
+ local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+ local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+ local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+ check_extra_config
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+ epatch_user && eautoreconf
+}
+
+src_configure() {
+ if use kernel ; then
+ ewarn "Note that kernel backend is very slow for this type of operation"
+ ewarn "and is provided mainly for embedded systems wanting to avoid"
+ ewarn "userspace crypto libraries."
+ fi
+
+ econf \
+ --sbindir=/sbin \
+ --enable-shared \
+ $(use_enable static static-cryptsetup) \
+ $(use_enable static-libs static) \
+ $(use_enable nls) \
+ $(use_enable pwquality) \
+ $(use_enable python) \
+ $(use_enable reencrypt cryptsetup-reencrypt) \
+ $(use_enable udev) \
+ $(use_enable !urandom dev-random) \
+ --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+}
+
+src_test() {
+ if [[ ! -e /dev/mapper/control ]] ; then
+ ewarn "No /dev/mapper/control found -- skipping tests"
+ return 0
+ fi
+ local p
+ for p in /dev/mapper /dev/loop* ; do
+ addwrite ${p}
+ done
+ default
+}
+
+src_install() {
+ default
+ if use static ; then
+ mv "${ED}"/sbin/cryptsetup{.static,} || die
+ mv "${ED}"/sbin/veritysetup{.static,} || die
+ use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
+ fi
+ prune_libtool_files --modules
+
+ newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+ newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+}
diff --git a/sys-fs/encfs/encfs-1.7.5.ebuild b/sys-fs/encfs/encfs-1.7.5.ebuild
index 07f9147..bfe3032 100644
--- a/sys-fs/encfs/encfs-1.7.5.ebuild
+++ b/sys-fs/encfs/encfs-1.7.5.ebuild
@@ -15,7 +15,7 @@
IUSE="xattr"
RDEPEND="dev-libs/boost:=
- dev-libs/openssl:=
+ dev-libs/openssl:0
>=dev-libs/rlog-1.4
>=sys-fs/fuse-2.7.0
sys-libs/zlib"
diff --git a/sys-fs/encfs/encfs-1.8.1.ebuild b/sys-fs/encfs/encfs-1.8.1.ebuild
index 4e99e0a..b05a3cb 100644
--- a/sys-fs/encfs/encfs-1.8.1.ebuild
+++ b/sys-fs/encfs/encfs-1.8.1.ebuild
@@ -15,7 +15,7 @@
IUSE="xattr nls"
RDEPEND="dev-libs/boost:=
- dev-libs/openssl:=
+ dev-libs/openssl:0
>=dev-libs/rlog-1.3
>=sys-fs/fuse-2.5
sys-libs/zlib"
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index b4fbd0b..1bf3355 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -1,7 +1,3 @@
DIST eudev-1.10.tar.gz 1776717 SHA256 401eeb29147d3e24d87849a8006df62eadeb369d913484d59e9e35f3f73a20d1 SHA512 76ba9e3c732a6baad448500ef72368e985e0edf45b80d920e23432b5ee2da3e841c5faf2cc281af6432625758608c31eb441c6af9e2161d4e7264348e33e086f WHIRLPOOL d3251a1ef18e46e000a0941156ca4daa33b54a6147fece4cee6d863f86c98068e88bc11bc8a90f45c578ed62338218c5c8b4b06bb6132610e3d4a30bf79fe192
-DIST eudev-1.3.tar.gz 1679385 SHA256 6f1f0b15971a53c7070a44c902c7c1303f952927aa6370dbdf4d84d8bc09fac2 SHA512 5e0016fbe15eebfa68bb04fa7b5aedd7edc7a508afdc030adb7cbec4e9eca84fe16119ca73f5724ec290ad4bba179b42d2d0bc56f3aaf2a07e3c48b18374b3b3 WHIRLPOOL db748742f9149b7a232b0d630a8734e81fb1077ed581fcde88f57f299b6746bcadec0bdd9e7ad914dae848ace9199c7d664006003dc4999af3bfa1e14099f366
-DIST eudev-1.5.3.tar.gz 1724415 SHA256 8e4362979572719562f600bfd7decd42d4e21506db5483e3d2e88f725396c57b SHA512 c00f34d76d76ebd5c2862310a2ba3d7bf2f8d348a96e0120ed02aa9014857df736e3a2280a4478e50f2537cabc9082b8f5f5e57ef7b3cf925fae6dc3a4688ddb WHIRLPOOL b3fc943f6c3eaeba92aed72dee417738a840f4176182e08f7564a1fd34baa3cf2a52787ac8e936f74f6c13b7896eb929a2f83cf087b8b09e5b8c7d7858471dd5
DIST eudev-1.9.tar.gz 1762520 SHA256 8f17e92f1177ce9352bde00360e227a7cbb3b97ac8816174bee34be80e44cef0 SHA512 13bd7df42d686818f499856d260e5dfaf10425f06e05449bf4cc8318667b166e2ae9c5e8b519008285aeaab9284ec5fde1f9f19e536dd4bae09a5439c86336b3 WHIRLPOOL d0504f05e191e94229bf60a497cab82fe461f52072ba7ed2171654e684397e4ffa9ba47c8b18cd0cc6d0168701dcac3b7d4b6c73168382e2432c7c229b2d0293
-DIST eudev-2.1.1.tar.gz 1786403 SHA256 6aef101c5496a2dc45e669307d478dbccb0ee0462a285512edcda51ff12e0e6a SHA512 b3fb6d80ef94f124e7c23d7df61ed65c298e58f400d8df6b38fb1cea1da6cd387a17866dd54e12c8160214a496dab5d55b2e40ab1a6142a332f951cd3525d490 WHIRLPOOL 2c1ea2463ea7f1a72071866795609f75021abd81d9ab36298238dc481586de5d71864467b5da04546d0e1a1e0abf9ac1386bda2140ed1b5d277ae13baaf0a7d5
-DIST eudev-3.0.tar.gz 1835636 SHA256 74db8aaf13cc392edfb821291783ecd64d815e6f81409f57e290d3017750db29 SHA512 a0cfbbd5b1e59dafaf0ba2e321756bb7bff3d1a92e09ab0fca674adc80911e55aec29ed0b74262846516443d344cf044a0cfffb9e1d1caeb2f145da8d1a5327f WHIRLPOOL e08dcdd18bc6a8f4df2d66099e2ff90abb6bf62f75af81fb98c90261ce254eba986a6742eeca5d673818c2098d8a335ce9212aa3f1be5e1495ac05a397fe3f7a
DIST eudev-3.1.2.tar.gz 1858004 SHA256 4393b69e93dd8117defde6519b199d479f9d051f52061157a1a7a41b8fe10273 SHA512 d9aeb37a163ce4a0c116f75a927b4b99f8445d06624fbb3c28ade18f3effd8c54af5a4a52477c31a0452822a3dc0901468263195256e9dbf79d2ef08cf46f2b6 WHIRLPOOL 2249128672d2adfa968c123a2538063331348bc8e8481ad9c25bf8d9fb4d2d3c8a05417439f155d9ababe657b19a595c18c6ba60ad0d5584a8ead86220b39577
diff --git a/sys-fs/eudev/eudev-1.3.ebuild b/sys-fs/eudev/eudev-1.3.ebuild
deleted file mode 100644
index c370dfd..0000000
--- a/sys-fs/eudev/eudev-1.3.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-KV_min=2.6.31
-
-inherit autotools eutils multilib linux-info multilib-minimal
-
-if [[ ${PV} = 9999* ]]
-then
- EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
- inherit git-2
-else
- SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="ia64"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev hwdb kmod introspection keymap +modutils +openrc +rule-generator selinux static-libs test"
-
-COMMON_DEPEND="gudev? ( dev-libs/glib:2 )
- kmod? ( sys-apps/kmod )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
- selinux? ( sys-libs/libselinux )
- >=sys-apps/util-linux-2.20
- !<sys-libs/glibc-2.11
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-DEPEND="${COMMON_DEPEND}
- keymap? ( dev-util/gperf )
- >=dev-util/intltool-0.40.0
- virtual/pkgconfig
- virtual/os-headers
- !<sys-kernel/linux-headers-${KV_min}
- doc? ( dev-util/gtk-doc )
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
- !sys-fs/udev
- !sys-apps/coldplug
- !sys-apps/systemd
- !<sys-fs/lvm2-2.02.97
- !sys-fs/device-mapper
- !<sys-fs/udev-init-scripts-18
- gudev? ( !dev-libs/libgudev )"
-
-PDEPEND="hwdb? ( >=sys-apps/hwids-20130717-r1[udev] )
- keymap? ( >=sys-apps/hwids-20130717-r1[udev] )
- openrc? ( >=sys-fs/udev-init-scripts-18 )"
-
-REQUIRED_USE="keymap? ( hwdb )"
-
-pkg_pretend()
-{
- if ! use rule-generator; then
- ewarn
- ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
- ewarn "as described in the URL below:"
- ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
- ewarn
- ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
- ewarn "between the default or user-modified choice of sys-fs/udev. If you wish to disable"
- ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn "exists:"
- ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn
- ewarn "We are working on a better solution for the next beta release."
- ewarn
- fi
-}
-
-pkg_setup()
-{
- linux-info_pkg_setup
- get_running_version
-
- # These are required kernel options, but we don't error out on them
- # because you can build under one kernel and run under another.
- CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
-
- if kernel_is lt ${KV_min//./ }; then
- ewarn
- ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
- ewarn "Make sure to run udev under kernel version ${KV_min} or above."
- ewarn
- fi
-}
-
-src_prepare()
-{
- # change rules back to group uucp instead of dialout for now
- sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
- || die "failed to change group dialout to uucp"
-
- epatch "${FILESDIR}"/${PN}-selinux-timespan.patch
-
- epatch_user
-
- if [[ ! -e configure ]]
- then
- if use doc
- then
- gtkdocize --docdir docs || die "gtkdocize failed"
- else
- echo 'EXTRA_DIST =' > docs/gtk-doc.make
- fi
- eautoreconf
- else
- elibtoolize
- fi
-}
-
-multilib_src_configure()
-{
- local econf_args
-
- econf_args=(
- ac_cv_search_cap_init=
- ac_cv_header_sys_capability_h=yes
- DBUS_CFLAGS=' '
- DBUS_LIBS=' '
- --with-rootprefix=
- --docdir=/usr/share/doc/${PF}
- --libdir=/usr/$(get_libdir)
- --with-firmware-path="${EPREFIX}usr/lib/firmware/updates:${EPREFIX}usr/lib/firmware:${EPREFIX}lib/firmware/updates:${EPREFIX}lib/firmware"
- --with-html-dir="/usr/share/doc/${PF}/html"
- --enable-split-usr
- --exec-prefix=/
- )
-
- # Only build libudev for non-native_abi, and only install it to libdir,
- # that means all options only apply to native_abi
- if multilib_is_native_abi; then econf_args+=(
- --with-rootlibdir=/$(get_libdir)
- $(use_enable doc gtk-doc)
- $(use_enable gudev)
- $(use_enable introspection)
- $(use_enable keymap)
- $(use_enable kmod libkmod)
- $(usex kmod --enable-modules $(use_enable modutils modules))
- $(use_enable static-libs static)
- $(use_enable selinux)
- $(use_enable rule-generator)
- )
- else econf_args+=(
- $(echo --disable-{gtk-doc,gudev,introspection,keymap,libkmod,modules,static,selinux,rule-generator})
- )
- fi
- ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile()
-{
- if ! multilib_is_native_abi; then
- cd src/libudev || die "Could not change directory"
- fi
- emake
-}
-
-multilib_src_install()
-{
- if ! multilib_is_native_abi; then
- cd src/libudev || die "Could not change directory"
- fi
- emake DESTDIR="${D}" install
-}
-
-multilib_src_test()
-{
- # make sandbox get out of the way
- # these are safe because there is a fake root filesystem put in place,
- # but sandbox seems to evaluate the paths of the test i/o instead of the
- # paths of the actual i/o that results.
- # also only test for native abi
- if multilib_is_native_abi; then
- addread /sys
- addwrite /dev
- addwrite /run
- default_src_test
- fi
-}
-
-# disable header checks because we only install libudev headers for non-native abi
-multilib_check_headers()
-{
- :
-}
-
-multilib_src_install_all()
-{
- prune_libtool_files --all
- rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
- use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount
-
- # drop distributed hwdb files, they override sys-apps/hwids
- rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
-}
-
-pkg_preinst()
-{
- local htmldir
- for htmldir in gudev libudev; do
- if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]
- then
- rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
- fi
- if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]
- then
- dosym ../../doc/${PF}/html/${htmldir} \
- /usr/share/gtk-doc/html/${htmldir}
- fi
- done
-}
-
-pkg_postinst()
-{
- mkdir -p "${EROOT}"run
-
- # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
- # So try to remove it here (will only work if empty).
- rmdir "${EROOT}"dev/loop 2>/dev/null
- if [[ -d ${EROOT}dev/loop ]]
- then
- ewarn "Please make sure you remove /dev/loop, else losetup"
- ewarn "may be confused when looking for unused devices."
- fi
-
- # 64-device-mapper.rules now gets installed by sys-fs/device-mapper
- # remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
- if [[ -f ${EROOT}etc/udev/rules.d/64-device-mapper.rules ]] &&
- ! has_version sys-fs/device-mapper
- then
- rm -f "${EROOT}"etc/udev/rules.d/64-device-mapper.rules
- einfo "Removed unneeded file 64-device-mapper.rules"
- fi
-
- if use hwdb && has_version 'sys-apps/hwids[udev]'; then
- udevadm hwdb --update --root="${ROOT%/}"
-
- # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
- # reload database after it has be rebuilt, but only if we are not upgrading
- # also pass if we are -9999 since who knows what hwdb related changes there might be
- if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
- [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
- udevadm control --reload
- fi
- fi
-
- ewarn
- ewarn "You need to restart eudev as soon as possible to make the"
- ewarn "upgrade go into effect:"
- ewarn "\t/etc/init.d/udev --nodeps restart"
-
- if use rule-generator && use openrc; then
- ewarn
- ewarn "Please add the udev-postmount init script to your default runlevel"
- ewarn "to ensure the legacy rule-generator functionality works as reliably"
- ewarn "as possible."
- ewarn "\trc-update add udev-postmount default"
- fi
-
- elog
- elog "For more information on eudev on Gentoo, writing udev rules, and"
- elog "fixing known issues visit:"
- elog " https://www.gentoo.org/doc/en/udev-guide.xml"
- elog
-}
diff --git a/sys-fs/eudev/eudev-1.5.3-r1.ebuild b/sys-fs/eudev/eudev-1.5.3-r1.ebuild
deleted file mode 100644
index 341faeb..0000000
--- a/sys-fs/eudev/eudev-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-KV_min=2.6.31
-
-inherit autotools eutils multilib linux-info multilib-minimal
-
-if [[ ${PV} = 9999* ]]
-then
- EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
- inherit git-2
-else
- SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="alpha"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev +hwdb kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test"
-
-COMMON_DEPEND="gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- kmod? ( sys-apps/kmod )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
- selinux? ( sys-libs/libselinux )
- >=sys-apps/util-linux-2.20
- !<sys-libs/glibc-2.11
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-DEPEND="${COMMON_DEPEND}
- keymap? ( dev-util/gperf )
- >=dev-util/intltool-0.40.0
- virtual/pkgconfig
- virtual/os-headers
- !<sys-kernel/linux-headers-${KV_min}
- doc? ( dev-util/gtk-doc )
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
- !sys-fs/udev
- !sys-apps/coldplug
- !sys-apps/systemd
- !<sys-fs/lvm2-2.02.97
- !sys-fs/device-mapper
- !<sys-fs/udev-init-scripts-18
- gudev? ( !dev-libs/libgudev )"
-
-PDEPEND="hwdb? ( >=sys-apps/hwids-20130717-r1[udev] )
- keymap? ( >=sys-apps/hwids-20130717-r1[udev] )
- openrc? ( >=sys-fs/udev-init-scripts-18 )"
-
-REQUIRED_USE="keymap? ( hwdb )"
-
-pkg_pretend()
-{
- if ! use rule-generator; then
- ewarn
- ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
- ewarn "as described in the URL below:"
- ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
- ewarn
- ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
- ewarn "between the default or user-modified choice of sys-fs/udev. If you wish to disable"
- ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn "exists:"
- ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn
- ewarn "We are working on a better solution for the next beta release."
- ewarn
- fi
-}
-
-pkg_setup()
-{
- linux-info_pkg_setup
- get_running_version
-
- # These are required kernel options, but we don't error out on them
- # because you can build under one kernel and run under another.
- CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
-
- if kernel_is lt ${KV_min//./ }; then
- ewarn
- ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
- ewarn "Make sure to run udev under kernel version ${KV_min} or above."
- ewarn
- fi
-}
-
-src_prepare()
-{
- # change rules back to group uucp instead of dialout for now
- sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
- || die "failed to change group dialout to uucp"
-
- epatch_user
-
- if [[ ! -e configure ]]
- then
- if use doc
- then
- gtkdocize --docdir docs || die "gtkdocize failed"
- else
- echo 'EXTRA_DIST =' > docs/gtk-doc.make
- fi
- eautoreconf
- else
- elibtoolize
- fi
-}
-
-multilib_src_configure()
-{
- local econf_args
-
- econf_args=(
- ac_cv_search_cap_init=
- ac_cv_header_sys_capability_h=yes
- DBUS_CFLAGS=' '
- DBUS_LIBS=' '
- --with-rootprefix=
- --docdir=/usr/share/doc/${PF}
- --libdir=/usr/$(get_libdir)
- --with-firmware-path="${EPREFIX}usr/lib/firmware/updates:${EPREFIX}usr/lib/firmware:${EPREFIX}lib/firmware/updates:${EPREFIX}lib/firmware"
- --with-html-dir="/usr/share/doc/${PF}/html"
- --enable-split-usr
- --exec-prefix=/
-
- $(use_enable gudev)
- )
-
- # Only build libudev for non-native_abi, and only install it to libdir,
- # that means all options only apply to native_abi
- if multilib_is_native_abi; then econf_args+=(
- --with-rootlibdir=/$(get_libdir)
- $(use_enable doc gtk-doc)
- $(use_enable introspection)
- $(use_enable keymap)
- $(use_enable kmod libkmod)
- $(usex kmod --enable-modules $(use_enable modutils modules))
- $(use_enable static-libs static)
- $(use_enable selinux)
- $(use_enable rule-generator)
- )
- else econf_args+=(
- $(echo --disable-{gtk-doc,introspection,keymap,libkmod,modules,static,selinux,rule-generator})
- )
- fi
- ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile()
-{
- if multilib_is_native_abi; then
- emake
- else
- emake -C src/libudev
- use gudev && emake -C src/gudev
- fi
-}
-
-multilib_src_install()
-{
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
- else
- emake -C src/libudev DESTDIR="${D}" install
- use gudev && emake -C src/gudev DESTDIR="${D}" install
- fi
-}
-
-multilib_src_test()
-{
- # make sandbox get out of the way
- # these are safe because there is a fake root filesystem put in place,
- # but sandbox seems to evaluate the paths of the test i/o instead of the
- # paths of the actual i/o that results.
- # also only test for native abi
- if multilib_is_native_abi; then
- addread /sys
- addwrite /dev
- addwrite /run
- default_src_test
- fi
-}
-
-# disable header checks because we only install libudev headers for non-native abi
-multilib_check_headers()
-{
- :
-}
-
-multilib_src_install_all()
-{
- prune_libtool_files --all
- rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
- use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount
-
- # drop distributed hwdb files, they override sys-apps/hwids
- rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
-
- insinto /lib/udev/rules.d
- doins "${FILESDIR}"/40-gentoo.rules
-}
-
-pkg_preinst()
-{
- local htmldir
- for htmldir in gudev libudev; do
- if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]
- then
- rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
- fi
- if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]
- then
- dosym ../../doc/${PF}/html/${htmldir} \
- /usr/share/gtk-doc/html/${htmldir}
- fi
- done
-}
-
-pkg_postinst()
-{
- mkdir -p "${EROOT}"run
-
- # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
- # So try to remove it here (will only work if empty).
- rmdir "${EROOT}"dev/loop 2>/dev/null
- if [[ -d ${EROOT}dev/loop ]]
- then
- ewarn "Please make sure you remove /dev/loop, else losetup"
- ewarn "may be confused when looking for unused devices."
- fi
-
- # 64-device-mapper.rules now gets installed by sys-fs/device-mapper
- # remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
- if [[ -f ${EROOT}etc/udev/rules.d/64-device-mapper.rules ]] &&
- ! has_version sys-fs/device-mapper
- then
- rm -f "${EROOT}"etc/udev/rules.d/64-device-mapper.rules
- einfo "Removed unneeded file 64-device-mapper.rules"
- fi
-
- if use hwdb && has_version 'sys-apps/hwids[udev]'; then
- udevadm hwdb --update --root="${ROOT%/}"
-
- # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
- # reload database after it has be rebuilt, but only if we are not upgrading
- # also pass if we are -9999 since who knows what hwdb related changes there might be
- if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
- [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
- udevadm control --reload
- fi
- fi
-
- ewarn
- ewarn "You need to restart eudev as soon as possible to make the"
- ewarn "upgrade go into effect:"
- ewarn "\t/etc/init.d/udev --nodeps restart"
-
- if use rule-generator && use openrc && \
- [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
- ewarn
- ewarn "Please add the udev-postmount init script to your default runlevel"
- ewarn "to ensure the legacy rule-generator functionality works as reliably"
- ewarn "as possible."
- ewarn "\trc-update add udev-postmount default"
- fi
-
- elog
- elog "For more information on eudev on Gentoo, writing udev rules, and"
- elog "fixing known issues visit:"
- elog " https://www.gentoo.org/doc/en/udev-guide.xml"
- elog
-}
diff --git a/sys-fs/eudev/eudev-2.1.1.ebuild b/sys-fs/eudev/eudev-2.1.1.ebuild
deleted file mode 100644
index e681d7c..0000000
--- a/sys-fs/eudev/eudev-2.1.1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-KV_min=2.6.39
-WANT_AUTOMAKE=1.13
-
-inherit autotools eutils linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
- inherit git-2
-else
- SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection +keymap +modutils +rule-generator selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
- gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.38 )
- kmod? ( >=sys-apps/kmod-16 )
- selinux? ( >=sys-libs/libselinux-2.1.9 )
- !<sys-libs/glibc-2.11
- !sys-apps/gentoo-systemd-integration
- !sys-apps/systemd
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-DEPEND="${COMMON_DEPEND}
- keymap? ( dev-util/gperf )
- virtual/os-headers
- virtual/pkgconfig
- >=sys-devel/make-3.82-r4
- >=sys-kernel/linux-headers-${KV_min}
- doc? ( >=dev-util/gtk-doc-1.18 )
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=dev-util/intltool-0.50
- test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
- !<sys-fs/lvm2-2.02.103
- !<sec-policy/selinux-base-2.20120725-r10
- !sys-fs/udev
- !sys-apps/systemd
- gudev? ( !dev-libs/libgudev )"
-
-PDEPEND=">=sys-fs/udev-init-scripts-26
- hwdb? ( >=sys-apps/hwids-20140304[udev] )
- keymap? ( >=sys-apps/hwids-20140304[udev] )"
-
-REQUIRED_USE="keymap? ( hwdb )"
-
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
-
-pkg_pretend() {
- if ! use rule-generator; then
- ewarn
- ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
- ewarn "as described in the URL below:"
- ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
- ewarn
- ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
- ewarn "between the default or user-modified choice of sys-fs/udev. If you wish to disable"
- ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn "exists:"
- ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn
- ewarn "We are working on a better solution for the next beta release."
- ewarn
- fi
-}
-
-pkg_setup() {
- CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET"
- linux-info_pkg_setup
- get_running_version
-
- # These are required kernel options, but we don't error out on them
- # because you can build under one kernel and run under another.
- if kernel_is lt ${KV_min//./ }; then
- ewarn
- ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
- ewarn "Make sure to run udev under kernel version ${KV_min} or above."
- ewarn
- fi
-}
-
-src_prepare() {
- # change rules back to group uucp instead of dialout for now
- sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
- || die "failed to change group dialout to uucp"
-
- epatch_user
-
- if use doc; then
- gtkdocize --docdir docs || die "gtkdocize failed"
- else
- echo 'EXTRA_DIST =' > docs/gtk-doc.make
- fi
- eautoreconf
-}
-
-multilib_src_configure() {
- tc-export CC #463846
- export cc_cv_CFLAGS__flto=no #502950
-
- # Keep sorted by ./configure --help and only pass --disable flags
- # when *required* to avoid external deps or unnecessary compile
- local econf_args
- econf_args=(
- ac_cv_search_cap_init=
- ac_cv_header_sys_capability_h=yes
- DBUS_CFLAGS=' '
- DBUS_LIBS=' '
- --with-rootprefix=
- --docdir=/usr/share/doc/${PF}
- --libdir=/usr/$(get_libdir)
- --with-rootlibexecdir=/lib/udev
- --with-html-dir="/usr/share/doc/${PF}/html"
- --enable-split-usr
- --exec-prefix=/
-
- $(use_enable gudev)
- )
-
- # Only build libudev for non-native_abi, and only install it to libdir,
- # that means all options only apply to native_abi
- if multilib_is_native_abi; then
- econf_args+=(
- --with-rootlibdir=/$(get_libdir)
- $(use_enable doc gtk-doc)
- $(use_enable introspection)
- $(use_enable keymap)
- $(use_enable kmod libkmod)
- $(usex kmod --enable-modules $(use_enable modutils modules))
- $(use_enable static-libs static)
- $(use_enable selinux)
- $(use_enable rule-generator)
- )
- else
- econf_args+=(
- --disable-static
- --disable-gtk-doc
- --disable-introspection
- --disable-keymap
- --disable-libkmod
- --disable-modules
- --disable-selinux
- --disable-rule-generator
- )
- fi
- ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- emake -C src/shared
- emake -C src/libudev
- use gudev && emake -C src/gudev
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
- else
- emake -C src/libudev DESTDIR="${D}" install
- use gudev && emake -C src/gudev DESTDIR="${D}" install
- fi
-}
-
-multilib_src_test() {
- # make sandbox get out of the way
- # these are safe because there is a fake root filesystem put in place,
- # but sandbox seems to evaluate the paths of the test i/o instead of the
- # paths of the actual i/o that results.
- # also only test for native abi
- if multilib_is_native_abi; then
- addread /sys
- addwrite /dev
- addwrite /run
- default_src_test
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
- use rule-generator && doinitd "${FILESDIR}"/udev-postmount
-
- # drop distributed hwdb files, they override sys-apps/hwids
- rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
-
- insinto /lib/udev/rules.d
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto /usr/share/doc/${PF}/html/gudev
- doins "${S}"/docs/gudev/html/*
-
- insinto /usr/share/doc/${PF}/html/libudev
- doins "${S}"/docs/libudev/html/*
-}
-
-pkg_preinst() {
- local htmldir
- for htmldir in gudev libudev; do
- if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
- rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
- fi
- if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
- dosym ../../doc/${PF}/html/${htmldir} \
- /usr/share/gtk-doc/html/${htmldir}
- fi
- done
-}
-
-pkg_postinst() {
- mkdir -p "${EROOT}"run
-
- # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
- # So try to remove it here (will only work if empty).
- rmdir "${EROOT}"dev/loop 2>/dev/null
- if [[ -d ${EROOT}dev/loop ]]; then
- ewarn "Please make sure your remove /dev/loop,"
- ewarn "else losetup may be confused when looking for unused devices."
- fi
-
- if use hwdb && has_version 'sys-apps/hwids[udev]'; then
- udevadm hwdb --update --root="${ROOT%/}"
-
- # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
- # reload database after it has be rebuilt, but only if we are not upgrading
- # also pass if we are -9999 since who knows what hwdb related changes there might be
- if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
- [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
- udevadm control --reload
- fi
- fi
-
- ewarn
- ewarn "You need to restart eudev as soon as possible to make the"
- ewarn "upgrade go into effect:"
- ewarn "\t/etc/init.d/udev --nodeps restart"
-
- if use rule-generator && \
- [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
- ewarn
- ewarn "Please add the udev-postmount init script to your default runlevel"
- ewarn "to ensure the legacy rule-generator functionality works as reliably"
- ewarn "as possible."
- ewarn "\trc-update add udev-postmount default"
- fi
-
- elog
- elog "For more information on eudev on Gentoo, writing udev rules, and"
- elog "fixing known issues visit:"
- elog " https://www.gentoo.org/doc/en/udev-guide.xml"
- elog
-
- # http://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
- # https://bugs.gentoo.org/246847
- # https://bugs.gentoo.org/514174
- enewgroup input
-
- # Update hwdb database in case the format is changed by udev version.
- if has_version 'sys-apps/hwids[udev]'; then
- udevadm hwdb --update --root="${ROOT%/}"
- # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
- if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
- return 0
- fi
- udevadm control --reload
- fi
- fi
-}
diff --git a/sys-fs/eudev/eudev-3.0.ebuild b/sys-fs/eudev/eudev-3.0.ebuild
deleted file mode 100644
index c32ab95..0000000
--- a/sys-fs/eudev/eudev-3.0.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-KV_min=2.6.39
-WANT_AUTOMAKE=1.13
-
-inherit autotools eutils linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
- inherit git-2
-else
- SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
- gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.38 )
- kmod? ( >=sys-apps/kmod-16 )
- selinux? ( >=sys-libs/libselinux-2.1.9 )
- !<sys-libs/glibc-2.11
- !sys-apps/gentoo-systemd-integration
- !sys-apps/systemd
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-DEPEND="${COMMON_DEPEND}
- dev-util/gperf
- virtual/os-headers
- virtual/pkgconfig
- >=sys-devel/make-3.82-r4
- >=sys-kernel/linux-headers-${KV_min}
- doc? ( >=dev-util/gtk-doc-1.18
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- )
- >=dev-util/intltool-0.50
- test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
- !<sys-fs/lvm2-2.02.103
- !<sec-policy/selinux-base-2.20120725-r10
- !sys-fs/udev
- !sys-apps/systemd
- gudev? ( !dev-libs/libgudev )"
-
-PDEPEND=">=sys-fs/udev-init-scripts-26
- hwdb? ( >=sys-apps/hwids-20140304[udev] )"
-
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
-
-pkg_pretend() {
- ewarn
- ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
- ewarn "as described in the URL below:"
- ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
- ewarn
- ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
- ewarn "between the default or user-modified choice of sys-fs/udev. If you wish to disable"
- ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn
-}
-
-pkg_setup() {
- CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET"
- linux-info_pkg_setup
- get_running_version
-
- # These are required kernel options, but we don't error out on them
- # because you can build under one kernel and run under another.
- if kernel_is lt ${KV_min//./ }; then
- ewarn
- ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
- ewarn "Make sure to run udev under kernel version ${KV_min} or above."
- ewarn
- fi
-}
-
-src_prepare() {
- # change rules back to group uucp instead of dialout for now
- sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
- || die "failed to change group dialout to uucp"
-
- epatch_user
-
- if use doc; then
- gtkdocize --docdir docs || die "gtkdocize failed"
- else
- echo 'EXTRA_DIST =' > docs/gtk-doc.make
- fi
- eautoreconf
-}
-
-multilib_src_configure() {
- tc-export CC #463846
- export cc_cv_CFLAGS__flto=no #502950
-
- # Keep sorted by ./configure --help and only pass --disable flags
- # when *required* to avoid external deps or unnecessary compile
- local econf_args
- econf_args=(
- ac_cv_search_cap_init=
- ac_cv_header_sys_capability_h=yes
- DBUS_CFLAGS=' '
- DBUS_LIBS=' '
- --with-rootprefix=
- --docdir=/usr/share/doc/${PF}
- --libdir=/usr/$(get_libdir)
- --with-rootlibexecdir=/lib/udev
- --with-html-dir="/usr/share/doc/${PF}/html"
- --enable-split-usr
- --exec-prefix=/
-
- $(use_enable gudev)
- )
-
- # Only build libudev for non-native_abi, and only install it to libdir,
- # that means all options only apply to native_abi
- if multilib_is_native_abi; then
- econf_args+=(
- --with-rootlibdir=/$(get_libdir)
- $(use_enable doc gtk-doc)
- $(use_enable introspection)
- $(use_enable kmod)
- $(use_enable static-libs static)
- $(use_enable selinux)
- )
- else
- econf_args+=(
- --disable-static
- --disable-gtk-doc
- --disable-introspection
- --disable-kmod
- --disable-selinux
- )
- fi
- ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- emake -C src/shared
- emake -C src/libudev
- use gudev && emake -C src/gudev
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
- else
- emake -C src/libudev DESTDIR="${D}" install
- use gudev && emake -C src/gudev DESTDIR="${D}" install
- fi
-}
-
-multilib_src_test() {
- # make sandbox get out of the way
- # these are safe because there is a fake root filesystem put in place,
- # but sandbox seems to evaluate the paths of the test i/o instead of the
- # paths of the actual i/o that results.
- # also only test for native abi
- if multilib_is_native_abi; then
- addread /sys
- addwrite /dev
- addwrite /run
- default_src_test
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
- # drop distributed hwdb files, they override sys-apps/hwids
- rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
-
- insinto /lib/udev/rules.d
- doins "${FILESDIR}"/40-gentoo.rules
-
- if ! [[ ${PV} = 9999* ]]; then
- insinto /usr/share/doc/${PF}/html/gudev
- doins "${S}"/docs/gudev/html/*
-
- insinto /usr/share/doc/${PF}/html/libudev
- doins "${S}"/docs/libudev/html/*
- fi
-}
-
-pkg_preinst() {
- local htmldir
- for htmldir in gudev libudev; do
- if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
- rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
- fi
- if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
- dosym ../../doc/${PF}/html/${htmldir} \
- /usr/share/gtk-doc/html/${htmldir}
- fi
- done
-}
-
-pkg_postinst() {
- mkdir -p "${EROOT}"run
-
- # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
- # So try to remove it here (will only work if empty).
- rmdir "${EROOT}"dev/loop 2>/dev/null
- if [[ -d ${EROOT}dev/loop ]]; then
- ewarn "Please make sure your remove /dev/loop,"
- ewarn "else losetup may be confused when looking for unused devices."
- fi
-
- if use hwdb && has_version 'sys-apps/hwids[udev]'; then
- udevadm hwdb --update --root="${ROOT%/}"
-
- # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
- # reload database after it has be rebuilt, but only if we are not upgrading
- # also pass if we are -9999 since who knows what hwdb related changes there might be
- if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
- [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
- udevadm control --reload
- fi
- fi
-
- ewarn
- ewarn "You need to restart eudev as soon as possible to make the"
- ewarn "upgrade go into effect:"
- ewarn "\t/etc/init.d/udev --nodeps restart"
-
- elog
- elog "For more information on eudev on Gentoo, writing udev rules, and"
- elog "fixing known issues visit:"
- elog " https://www.gentoo.org/doc/en/udev-guide.xml"
- elog
-
- # http://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
- # https://bugs.gentoo.org/246847
- # https://bugs.gentoo.org/514174
- enewgroup input
-
- # Update hwdb database in case the format is changed by udev version.
- if has_version 'sys-apps/hwids[udev]'; then
- udevadm hwdb --update --root="${ROOT%/}"
- # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
- if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
- return 0
- fi
- udevadm control --reload
- fi
- fi
-}
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index baf44a1..f090a05 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -14,7 +14,7 @@
inherit git-2
else
SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -22,10 +22,9 @@
LICENSE="LGPL-2.1 MIT GPL-2"
SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection selinux static-libs test"
+IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
COMMON_DEPEND=">=sys-apps/util-linux-2.20
- gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
introspection? ( >=dev-libs/gobject-introspection-1.38 )
kmod? ( >=sys-apps/kmod-16 )
selinux? ( >=sys-libs/libselinux-2.1.9 )
@@ -42,12 +41,6 @@
virtual/pkgconfig
>=sys-devel/make-3.82-r4
>=sys-kernel/linux-headers-${KV_min}
- doc? ( >=dev-util/gtk-doc-1.18
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- )
>=dev-util/intltool-0.50
test? ( app-text/tree dev-lang/perl )"
@@ -55,8 +48,7 @@
!<sys-fs/lvm2-2.02.103
!<sec-policy/selinux-base-2.20120725-r10
!sys-fs/udev
- !sys-apps/systemd
- gudev? ( !dev-libs/libgudev )"
+ !sys-apps/systemd"
PDEPEND=">=sys-fs/udev-init-scripts-26
hwdb? ( >=sys-apps/hwids-20140304[udev] )"
@@ -100,12 +92,6 @@
|| die "failed to change group dialout to uucp"
epatch_user
-
- if use doc; then
- gtkdocize --docdir docs || die "gtkdocize failed"
- else
- echo 'EXTRA_DIST =' > docs/gtk-doc.make
- fi
eautoreconf
}
@@ -123,16 +109,12 @@
DBUS_LIBS=' '
--with-rootprefix=
--with-rootrundir=/run
- --docdir=/usr/share/doc/${PF}
--libdir=/usr/$(get_libdir)
--with-rootlibexecdir=/lib/udev
- --with-html-dir="/usr/share/doc/${PF}/html"
--enable-split-usr
--enable-manpages
--disable-hwdb
--exec-prefix=/
-
- $(use_enable gudev)
)
# Only build libudev for non-native_abi, and only install it to libdir,
@@ -140,19 +122,19 @@
if multilib_is_native_abi; then
econf_args+=(
--with-rootlibdir=/$(get_libdir)
- $(use_enable doc gtk-doc)
$(use_enable introspection)
$(use_enable kmod)
$(use_enable static-libs static)
$(use_enable selinux)
+ $(use_enable rule-generator)
)
else
econf_args+=(
--disable-static
- --disable-gtk-doc
--disable-introspection
--disable-kmod
--disable-selinux
+ --disable-rule-generator
)
fi
ECONF_SOURCE="${S}" econf "${econf_args[@]}"
@@ -164,7 +146,6 @@
else
emake -C src/shared
emake -C src/libudev
- use gudev && emake -C src/gudev
fi
}
@@ -173,7 +154,6 @@
emake DESTDIR="${D}" install
else
emake -C src/libudev DESTDIR="${D}" install
- use gudev && emake -C src/gudev DESTDIR="${D}" install
fi
}
@@ -193,31 +173,11 @@
multilib_src_install_all() {
prune_libtool_files --all
- rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
insinto /lib/udev/rules.d
doins "${FILESDIR}"/40-gentoo.rules
- if ! [[ ${PV} = 9999* ]]; then
- insinto /usr/share/doc/${PF}/html/gudev
- doins "${S}"/docs/gudev/html/*
-
- insinto /usr/share/doc/${PF}/html/libudev
- doins "${S}"/docs/libudev/html/*
- fi
-}
-
-pkg_preinst() {
- local htmldir
- for htmldir in gudev libudev; do
- if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
- rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
- fi
- if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
- dosym ../../doc/${PF}/html/${htmldir} \
- /usr/share/gtk-doc/html/${htmldir}
- fi
- done
+ use rule-generator && doinitd "${FILESDIR}"/udev-postmount
}
pkg_postinst() {
@@ -248,6 +208,15 @@
ewarn "upgrade go into effect:"
ewarn "\t/etc/init.d/udev --nodeps restart"
+ if use rule-generator && \
+ [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
+ ewarn
+ ewarn "Please add the udev-postmount init script to your default runlevel"
+ ewarn "to ensure the legacy rule-generator functionality works as reliably"
+ ewarn "as possible."
+ ewarn "\trc-update add udev-postmount default"
+ fi
+
elog
elog "For more information on eudev on Gentoo, writing udev rules, and"
elog "fixing known issues visit:"
diff --git a/sys-fs/lvm2/lvm2-2.02.116-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r1.ebuild
new file mode 100644
index 0000000..de2a96a
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.116-r1.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://sources.redhat.com/lvm2/"
+SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+ ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
+ systemd? ( udev )"
+
+DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
+ readline? ( sys-libs/readline:0= )
+ udev? ( >=virtual/libudev-208:=[static-libs?] )"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="${DEPEND_COMMON}
+ >=sys-apps/baselayout-2.2
+ !<sys-apps/openrc-0.11
+ !<sys-fs/cryptsetup-1.1.2
+ !!sys-fs/clvm
+ !!sys-fs/lvm-user
+ >=sys-apps/util-linux-2.16
+ lvm2create_initrd? ( sys-apps/makedev )
+ thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+# USE 'static' currently only works with eudev, bug 520450
+DEPEND="${DEPEND_COMMON}
+ virtual/pkgconfig
+ >=sys-devel/binutils-2.20.1-r1
+ static? (
+ selinux? ( sys-libs/libselinux[static-libs] )
+ udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
+ >=sys-apps/util-linux-2.16[static-libs]
+ )"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+pkg_setup() {
+ local CONFIG_CHECK="~SYSVIPC"
+
+ if use udev; then
+ local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+ if linux_config_exists; then
+ local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+ if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+ ewarn "It's recommended to set an empty value to the following kernel config option:"
+ ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+ fi
+ fi
+ fi
+
+ check_extra_config
+
+ # 1. Genkernel no longer copies /sbin/lvm blindly.
+ if use static; then
+ elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+ elog "their static versions. If you need the static binaries,"
+ elog "you must append .static to the filename!"
+ fi
+}
+
+src_prepare() {
+ # Gentoo specific modification(s):
+ epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch
+
+ sed -i \
+ -e "1iAR = $(tc-getAR)" \
+ -e "s:CC ?= @CC@:CC = $(tc-getCC):" \
+ make.tmpl.in || die #444082
+
+ sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
+
+ if use udev && ! use device-mapper-only; then
+ sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
+ elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
+ elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
+ elog "if it was previously disabled."
+ fi
+
+ sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
+
+ # For upstream -- review and forward:
+ epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+ epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+ epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+ epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+ epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
+ epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
+ epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid
+ epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
+
+ # Without thin-privision-tools, there is nothing to install for target install_man7:
+ use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; }
+
+ eautoreconf
+}
+
+src_configure() {
+ filter-flags -flto
+ local myconf
+ local buildmode
+
+ myconf="${myconf} $(use_enable !device-mapper-only dmeventd)"
+ myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
+ myconf="${myconf} $(use_enable !device-mapper-only applib)"
+ myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
+ myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
+ use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs"
+
+ # Most of this package does weird stuff.
+ # The build options are tristate, and --without is NOT supported
+ # options: 'none', 'internal', 'shared'
+ if use static; then
+ buildmode="internal"
+ # This only causes the .static versions to become available
+ myconf="${myconf} --enable-static_link"
+ else
+ buildmode="shared"
+ fi
+ dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
+
+ # dmeventd requires mirrors to be internal, and snapshot available
+ # so we cannot disable them
+ myconf="${myconf} --with-mirrors=${dmbuildmode}"
+ myconf="${myconf} --with-snapshots=${dmbuildmode}"
+ if use thin; then
+ myconf="${myconf} --with-thin=internal --with-cache=internal"
+ local texec
+ for texec in check dump repair restore; do
+ myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
+ myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
+ done
+ else
+ myconf="${myconf} --with-thin=none --with-cache=none"
+ fi
+
+ if use lvm1; then
+ myconf="${myconf} --with-lvm1=${buildmode}"
+ else
+ myconf="${myconf} --with-lvm1=none"
+ fi
+
+ # disable O_DIRECT support on hppa, breaks pv detection (#99532)
+ use hppa && myconf="${myconf} --disable-o_direct"
+
+ if use clvm; then
+ myconf="${myconf} --with-cluster=${buildmode}"
+ # 4-state! Make sure we get it right, per bug 210879
+ # Valid options are: none, cman, gulm, all
+ #
+ # 2009/02:
+ # gulm is removed now, now dual-state:
+ # cman, none
+ # all still exists, but is not needed
+ #
+ # 2009/07:
+ # TODO: add corosync and re-enable ALL
+ local clvmd=""
+ use cman && clvmd="cman"
+ #clvmd="${clvmd/cmangulm/all}"
+ [ -z "${clvmd}" ] && clvmd="none"
+ myconf="${myconf} --with-clvmd=${clvmd}"
+ myconf="${myconf} --with-pool=${buildmode}"
+ else
+ myconf="${myconf} --with-clvmd=none --with-cluster=none"
+ fi
+
+ econf \
+ $(use_enable readline) \
+ $(use_enable selinux) \
+ --enable-pkgconfig \
+ --with-confdir="${EPREFIX}"/etc \
+ --exec-prefix="${EPREFIX}" \
+ --sbindir="${EPREFIX}/sbin" \
+ --with-staticdir="${EPREFIX}"/sbin \
+ --libdir="${EPREFIX}/$(get_libdir)" \
+ --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+ --with-default-dm-run-dir=/run \
+ --with-default-run-dir=/run/lvm \
+ --with-default-locking-dir=/run/lock/lvm \
+ --with-default-pid-dir=/run \
+ $(use_enable udev udev_rules) \
+ $(use_enable udev udev_sync) \
+ $(use_with udev udevdir "$(get_udevdir)"/rules.d) \
+ $(use_enable systemd udev-systemd-background-jobs) \
+ "$(systemd_with_unitdir)" \
+ ${myconf} \
+ CLDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+ pushd include >/dev/null
+ emake
+ popd >/dev/null
+
+ if use device-mapper-only ; then
+ emake device-mapper
+ else
+ emake
+ emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
+ fi
+}
+
+src_install() {
+ local inst
+ INSTALL_TARGETS="install install_systemd_units install_systemd_generators install_tmpfiles_configuration"
+ use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
+ for inst in ${INSTALL_TARGETS}; do
+ emake DESTDIR="${D}" ${inst}
+ done
+
+ newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+ newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+ if use !device-mapper-only ; then
+ newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
+ newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm
+ newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
+
+ newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
+ newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad
+ fi
+
+ if use clvm; then
+ newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
+ newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
+ fi
+
+ if use static-libs; then
+ dolib.a libdm/ioctl/libdevmapper.a
+ dolib.a libdaemon/client/libdaemonclient.a #462908
+ #gen_usr_ldscript libdevmapper.so
+ dolib.a daemons/dmeventd/libdevmapper-event.a
+ #gen_usr_ldscript libdevmapper-event.so
+ else
+ rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+ fi
+
+ if use lvm2create_initrd; then
+ dosbin scripts/lvm2create_initrd/lvm2create_initrd
+ doman scripts/lvm2create_initrd/lvm2create_initrd.8
+ newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+ fi
+
+ insinto /etc
+ doins "${FILESDIR}"/dmtab
+
+ dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_postinst() {
+ ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+ ewarn "# rc-update add lvm boot"
+ ewarn
+ ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
+ ewarn "to enable lvm autoactivation and metadata caching."
+}
+
+src_test() {
+ einfo "Tests are disabled because of device-node mucking, if you want to"
+ einfo "run tests, compile the package and see ${S}/tests"
+}
diff --git a/sys-fs/lvm2/lvm2-2.02.116.ebuild b/sys-fs/lvm2/lvm2-2.02.116.ebuild
index 3c94e8d..9d841f7 100644
--- a/sys-fs/lvm2/lvm2-2.02.116.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.116.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
systemd? ( udev )
diff --git a/sys-fs/udev/udev-216.ebuild b/sys-fs/udev/udev-216.ebuild
index 65484b5..5f05596 100644
--- a/sys-fs/udev/udev-216.ebuild
+++ b/sys-fs/udev/udev-216.ebuild
@@ -14,10 +14,10 @@
patchset=2
SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
if [[ -n "${patchset}" ]]; then
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
- https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
- fi
+ SRC_URI+="
+ https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+ fi
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
fi
diff --git a/sys-fs/udev/udev-217.ebuild b/sys-fs/udev/udev-217.ebuild
index 72c6089..a55cf51 100644
--- a/sys-fs/udev/udev-217.ebuild
+++ b/sys-fs/udev/udev-217.ebuild
@@ -14,10 +14,10 @@
patchset=1
SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
if [[ -n "${patchset}" ]]; then
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
- https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
- fi
+ SRC_URI+="
+ https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+ fi
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
diff --git a/sys-fs/udev/udev-218.ebuild b/sys-fs/udev/udev-218.ebuild
index 4fe0753..b805dda 100644
--- a/sys-fs/udev/udev-218.ebuild
+++ b/sys-fs/udev/udev-218.ebuild
@@ -14,10 +14,10 @@
patchset=1
SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
if [[ -n "${patchset}" ]]; then
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
- https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
- fi
+ SRC_URI+="
+ https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+ fi
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
diff --git a/sys-fs/udev/udev-219.ebuild b/sys-fs/udev/udev-219.ebuild
index f0cd6cf..def594a 100644
--- a/sys-fs/udev/udev-219.ebuild
+++ b/sys-fs/udev/udev-219.ebuild
@@ -14,10 +14,10 @@
patchset=
SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
if [[ -n "${patchset}" ]]; then
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
- https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
- fi
+ SRC_URI+="
+ https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+ fi
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
diff --git a/sys-fs/udev/udev-220-r3.ebuild b/sys-fs/udev/udev-220-r3.ebuild
index 322f82e..e311f19 100644
--- a/sys-fs/udev/udev-220-r3.ebuild
+++ b/sys-fs/udev/udev-220-r3.ebuild
@@ -14,10 +14,10 @@
patchset=4
SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
if [[ -n "${patchset}" ]]; then
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
- https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
- fi
+ SRC_URI+="
+ https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+ fi
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
diff --git a/sys-fs/udev/udev-222.ebuild b/sys-fs/udev/udev-222.ebuild
index ce7fec1..bd34bc6 100644
--- a/sys-fs/udev/udev-222.ebuild
+++ b/sys-fs/udev/udev-222.ebuild
@@ -13,10 +13,10 @@
patchset=
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
if [[ -n "${patchset}" ]]; then
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
- https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
- fi
+ SRC_URI+="
+ https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+ fi
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
diff --git a/sys-fs/udev/udev-224-r1.ebuild b/sys-fs/udev/udev-224-r1.ebuild
index 6dc09d1..1602746 100644
--- a/sys-fs/udev/udev-224-r1.ebuild
+++ b/sys-fs/udev/udev-224-r1.ebuild
@@ -13,10 +13,10 @@
patchset=
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
if [[ -n "${patchset}" ]]; then
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
- https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
- fi
+ SRC_URI+="
+ https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+ fi
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
diff --git a/sys-fs/udev/udev-224-r2.ebuild b/sys-fs/udev/udev-224-r2.ebuild
index 85f15a8..66493c9 100644
--- a/sys-fs/udev/udev-224-r2.ebuild
+++ b/sys-fs/udev/udev-224-r2.ebuild
@@ -13,10 +13,10 @@
patchset=
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
if [[ -n "${patchset}" ]]; then
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
- https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
- fi
+ SRC_URI+="
+ https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+ fi
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
diff --git a/sys-fs/udev/udev-224.ebuild b/sys-fs/udev/udev-224.ebuild
index 01e4a0a..39dea9a 100644
--- a/sys-fs/udev/udev-224.ebuild
+++ b/sys-fs/udev/udev-224.ebuild
@@ -13,10 +13,10 @@
patchset=
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
if [[ -n "${patchset}" ]]; then
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
- https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
- fi
+ SRC_URI+="
+ https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+ fi
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
diff --git a/sys-fs/udev/udev-225.ebuild b/sys-fs/udev/udev-225.ebuild
index 96cc496..d173c0f 100644
--- a/sys-fs/udev/udev-225.ebuild
+++ b/sys-fs/udev/udev-225.ebuild
@@ -13,10 +13,10 @@
patchset=
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
if [[ -n "${patchset}" ]]; then
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
- https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
- fi
+ SRC_URI+="
+ https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+ fi
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 96cc496..d173c0f 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -13,10 +13,10 @@
patchset=
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
if [[ -n "${patchset}" ]]; then
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
- https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
- fi
+ SRC_URI+="
+ https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+ fi
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index a3e609f..32a81b0 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -5,9 +5,6 @@
DIST zfs-0.6.3-patches-r1.tar.xz 87852 SHA256 71b5286f77cb6a6c2b97cee406dfd4788f7b40b6675c4a56fc630a47e90d5280 SHA512 e2fa573c7b30a3811e9e1596d35b65f5d013ed5bac43e364b44ffab734398a3294979c152a80ec9a722611cc7c971aec217d8e1a37cc9240a3fa2dddb5b90e3b WHIRLPOOL f2da02d5c7d2385e7de1e858c31d299632ca864d422f0c94e5d3b8674d24beeb073ad2600698350306a9e70dbeef390f0e513d19c126502fceec18795c203d50
DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe
DIST zfs-0.6.4.2.tar.gz 1738601 SHA256 26af2924cbb891b79203a31827cba4cdc310162d5f7b9e2d643eb6576aa19015 SHA512 87a28997b8f9d36e189410171db583402418a55782b7b7f333993e98c5e17ccc4b6cd5825f38b904294c87e3dfdfb7748bd71cc371589c1358f16c942e0c18db WHIRLPOOL 1700de7da56311a7b608c99a821e2fa97a6145ccc88f3d8eff12f778421ba7b7b9cc5f5fbe5f1acd2ea2fd1db778c200a2ea961e3859a8fc89d80474894293f1
-DIST zfs-0.6.4.tar.gz 1735736 SHA256 7f37aaaa1fc15201dde58bb84e0f191ccac462f19ffec0c889b6f6ed3f73a804 SHA512 cf47cbf5fa8dff75f5e9d81b323f5745d7b210266ba9e6ccab16bbf0e2b055aa1168bad94a77a4bc56c6fbe0391593f210bd4c74f7a8d0d99385ac4dd61e5622 WHIRLPOOL 1b0cc8a9727b57f2e63bd106cd94780002a068b31668b9dc103dbc0b48858a380d7c228f39f0526fc84b9d10aca1bd376ace0346a2ef4306a9d164c2d56606f1
DIST zfs-0.6.5.2.tar.gz 1817267 SHA256 aecd2bc5189f2a71a45eb222230146bed231af4f35af5ec7af83a74987c3d595 SHA512 7f0b20feca91d5ab952c1d49ae94d241f8868825b163a3d5f2ad0fd7adcac3ab246a3e6a755019a833be553fbbfd6609828d8123f49a43b42bf76cfd64f234ec WHIRLPOOL 00fd628ef2267366b6f0705e6436ac55b260aabc3588c7f58a7042dfbfe95a0478740b4579326638d28f10ffc8f2d5b3ed21b9f8297e72344ec439fe30310634
DIST zfs-0.6.5.tar.gz 1816180 SHA256 542121940122c922c9d21a2bb39bca4e4a9db2f6bbfd2e576630840e256d4c82 SHA512 58480ee9b0780f1f21d12504abc226be3e6df1939214f6a8f245315d1fa0b9da56b3a744df26426ee78f13684a4ca288df6dddc50f8f91d9d0b4c542980a9c53 WHIRLPOOL fdb5580ec8d4abe57069ce453c1d91225019758ecf5d31856a7897ac7e4b51c6a8ae3258e822f684fbd70a0a7d7410c65c37a569f37d132767522118c587cc24
DIST zfs-kmod-0.6.2-p2.tar.xz 28636 SHA256 12882463a38a5a57cf2bb3c14c5783f9511f6dc7b163a47575f2f3dcc24f26f6 SHA512 5792660ae8f5013d12e70d608e9cffa92a8c4089a88a5e78728ee88204b3f970d452d5b0b3874e02be49ebbc139e07139be7b5a86ca40bc8b23cb11a7198a9a8 WHIRLPOOL 0e4c57b363cdd3d736efbd1355567b18e22439bd3b20ef40b27f6b97ad4570c7cc99a11b196ac25359d1966c1a70e178f4fd1687b60450f148ccda47b07282a9
-DIST zfs-kmod-0.6.2-p3.tar.xz 45988 SHA256 4af06d1472f5d24e01d147b6fec5c78fbbd9739d1259bd3fbf57af66c99b9bcb SHA512 eddf67c0aa49d42f663f98dc721bac75e8d0521df5ae174cd6aeee0a935a71b49e06961404eb6c71a09cd239358868a2fe49de4f1d26776948f8fe7fc943165c WHIRLPOOL 5634a92f6f322f67edef95ad121b0b1699e520ca8beb05b3385dc7e20198dd45d337731bf7df69d1b1c552ed0b78d54b15bc9c9e76b694ae4c8d360892b9d764
-DIST zfs-kmod-0.6.2-p4.tar.xz 63984 SHA256 9167edc4be86e3fcda6b3c198e51f92ab0c95ac5baca11666c28029a628cdac9 SHA512 13e4ec415c35d2f268d89565745f5898c0943423577a2ba6714b3a069c5a80f244cd06dff91464f38dd4ed60673d1145ead080bb03a56d4be33e328f948ffa64 WHIRLPOOL 8c399ec67119ed4fbebb5599d00f888918678bc4e4ea369b4bdc5c75bfc90fc76396087624c8011de370a54ff103bccaa8922d05ac7ccebb2b3481bbbcf44b19
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r4.ebuild
deleted file mode 100644
index 9bbb3fd..0000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r4.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2
- MY_PV=9999
- EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz
- https://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p3.tar.xz"
- S="${WORKDIR}/zfs-zfs-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="test"
-
-DEPEND="
- =sys-kernel/spl-${PV}*
- dev-lang/perl
- virtual/awk
-"
-
-RDEPEND="${DEPEND}
- !sys-fs/zfs-fuse
-"
-
-pkg_setup() {
- linux-info_pkg_setup
- CONFIG_CHECK="!DEBUG_LOCK_ALLOC
- BLK_DEV_LOOP
- EFI_PARTITION
- IOSCHED_NOOP
- MODULES
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- use rootfs && \
- CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD
- DEVTMPFS"
-
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
- [ ${PV} != "9999" ] && \
- { kernel_is le 3 14 || die "Linux 3.14 is the latest supported version."; }
-
- check_extra_config
-}
-
-src_prepare() {
- # Remove GPLv2-licensed ZPIOS unless we are debugging
- use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
-
- if [ ${PV} != "9999" ]
- then
- # Apply patch set
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
- fi
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- filter-ldflags -Wl,*
-
- set_arch_to_kernel
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=kernel
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- $(use_enable debug)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # Remove old modules
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
- then
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
- ewarn "Automatically removing old modules to avoid problems."
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
- fi
-
- if use x86 || use arm
- then
- ewarn "32-bit kernels will likely require increasing vmalloc to"
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
- fi
-
- ewarn "This version of ZFSOnLinux includes support for features flags."
- ewarn "If you upgrade your pools to make use of feature flags, you will lose"
- ewarn "the ability to import them using older versions of ZFSOnLinux."
- ewarn "Any new pools will be created with feature flag support and will"
- ewarn "not be compatible with older versions of ZFSOnLinux. To create a new"
- ewarn "pool that is backward compatible, use zpool create -o version=28 ..."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r5.ebuild
deleted file mode 100644
index 16ed1ed..0000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r5.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2
- MY_PV=9999
- EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz
- https://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p4.tar.xz"
- S="${WORKDIR}/zfs-zfs-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="test"
-
-DEPEND="
- =sys-kernel/spl-${PV}*
- dev-lang/perl
- virtual/awk
-"
-
-RDEPEND="${DEPEND}
- !sys-fs/zfs-fuse
-"
-
-pkg_setup() {
- linux-info_pkg_setup
- CONFIG_CHECK="!DEBUG_LOCK_ALLOC
- BLK_DEV_LOOP
- EFI_PARTITION
- IOSCHED_NOOP
- MODULES
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- use rootfs && \
- CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD
- DEVTMPFS"
-
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
- [ ${PV} != "9999" ] && \
- { kernel_is le 3 14 || die "Linux 3.14 is the latest supported version."; }
-
- check_extra_config
-}
-
-src_prepare() {
- # Remove GPLv2-licensed ZPIOS unless we are debugging
- use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
-
- if [ ${PV} != "9999" ]
- then
- # Apply patch set
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
- fi
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- filter-ldflags -Wl,*
-
- set_arch_to_kernel
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=kernel
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- $(use_enable debug)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # Remove old modules
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
- then
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
- ewarn "Automatically removing old modules to avoid problems."
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
- fi
-
- if use x86 || use arm
- then
- ewarn "32-bit kernels will likely require increasing vmalloc to"
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
- fi
-
- ewarn "This version of ZFSOnLinux includes support for features flags."
- ewarn "If you upgrade your pools to make use of feature flags, you will lose"
- ewarn "the ability to import them using older versions of ZFSOnLinux."
- ewarn "Any new pools will be created with feature flag support and will"
- ewarn "not be compatible with older versions of ZFSOnLinux. To create a new"
- ewarn "pool that is backward compatible, use zpool create -o version=28 ..."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild
deleted file mode 100644
index 9cce1c3..0000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2
- MY_PV=9999
- EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz"
- S="${WORKDIR}/zfs-zfs-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="debug? ( strip ) test"
-
-DEPEND="
- =sys-kernel/spl-${PV}*
- dev-lang/perl
- virtual/awk
-"
-
-RDEPEND="${DEPEND}
- !sys-fs/zfs-fuse
-"
-
-pkg_setup() {
- linux-info_pkg_setup
- CONFIG_CHECK="!DEBUG_LOCK_ALLOC
- BLK_DEV_LOOP
- EFI_PARTITION
- IOSCHED_NOOP
- MODULES
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- !PAX_RANDKSTACK
- !PAX_USERCOPY_SLABS
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- use debug && CONFIG_CHECK="${CONFIG_CHECK}
- FRAME_POINTER
- DEBUG_INFO
- !DEBUG_INFO_REDUCED
- "
-
- use rootfs && \
- CONFIG_CHECK="${CONFIG_CHECK}
- BLK_DEV_INITRD
- DEVTMPFS
- "
-
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
- [ ${PV} != "9999" ] && \
- { kernel_is le 3 16 || die "Linux 3.16 is the latest supported version."; }
-
- check_extra_config
-}
-
-src_prepare() {
- # Remove GPLv2-licensed ZPIOS unless we are debugging
- use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
-
- # Set module revision number
- [ ${PV} != "9999" ] && \
- { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
- use custom-cflags || strip-flags
- filter-ldflags -Wl,*
-
- set_arch_to_kernel
- local myeconfargs=(${myeconfargs}
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=kernel
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-spl="${EROOT}usr/src/${SPL_PATH}"
- --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
- $(use_enable debug)
- )
-
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
- dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # Remove old modules
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
- then
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
- ewarn "Automatically removing old modules to avoid problems."
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
- fi
-
- if use x86 || use arm
- then
- ewarn "32-bit kernels will likely require increasing vmalloc to"
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
- fi
-
- ewarn "This version of ZFSOnLinux includes support for features flags."
- ewarn "If you upgrade your pools to make use of feature flags, you will lose"
- ewarn "the ability to import them using older versions of ZFSOnLinux."
- ewarn "Any new pools will be created with feature flag support and will"
- ewarn "not be compatible with older versions of ZFSOnLinux. To create a new"
- ewarn "pool that is backward compatible, use zpool create -o version=28 ..."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.4.ebuild
deleted file mode 100644
index bad8018..0000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.4.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2
- EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-else
- inherit eutils versionator
- SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${PV}.tar.gz"
- S="${WORKDIR}/zfs-zfs-${PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="debug? ( strip ) test"
-
-DEPEND="
- =sys-kernel/spl-${PV}*
- dev-lang/perl
- virtual/awk
-"
-
-RDEPEND="${DEPEND}
- !sys-fs/zfs-fuse
-"
-
-pkg_setup() {
- linux-info_pkg_setup
- CONFIG_CHECK="!DEBUG_LOCK_ALLOC
- BLK_DEV_LOOP
- EFI_PARTITION
- IOSCHED_NOOP
- MODULES
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- !PAX_USERCOPY_SLABS
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- use debug && CONFIG_CHECK="${CONFIG_CHECK}
- FRAME_POINTER
- DEBUG_INFO
- !DEBUG_INFO_REDUCED
- "
-
- use rootfs && \
- CONFIG_CHECK="${CONFIG_CHECK}
- BLK_DEV_INITRD
- DEVTMPFS
- "
-
- kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
-
- [ ${PV} != "9999" ] && \
- { kernel_is le 4 0 || die "Linux 4.0 is the latest supported version."; }
-
- check_extra_config
-}
-
-src_prepare() {
- # Remove GPLv2-licensed ZPIOS unless we are debugging
- use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
-
- # Set module revision number
- [ ${PV} != "9999" ] && \
- { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
- use custom-cflags || strip-flags
- filter-ldflags -Wl,*
-
- set_arch_to_kernel
- local myeconfargs=(${myeconfargs}
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=kernel
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-spl="${EROOT}usr/src/${SPL_PATH}"
- --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
- $(use_enable debug)
- )
-
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
- dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # Remove old modules
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
- then
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
- ewarn "Automatically removing old modules to avoid problems."
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
- fi
-
- if use x86 || use arm
- then
- ewarn "32-bit kernels will likely require increasing vmalloc to"
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
- fi
-
- ewarn "This version of ZFSOnLinux includes support for new feature flags"
- ewarn "that are incompatible with ZFSOnLinux 0.6.3 and GRUB2 support for"
- ewarn "/boot with the new feature flags is not yet available."
- ewarn "Do *NOT* upgrade root pools to use the new feature flags."
- ewarn "Any new pools will be created with the new feature flags by default"
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
- ewarn "create a newpool that is backward compatible, use "
- ewarn "zpool create -o version=28 ..."
- ewarn "Then explicitly enable older features. Note that the LZ4 feature has"
- ewarn "been upgraded to support metadata compression and has not been"
- ewarn "tested against the older GRUB2 code base. GRUB2 support will be"
- ewarn "updated as soon as the GRUB2 developers and Open ZFS community write"
- ewarn "GRUB2 patchese that pass mutual review."
-}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 9294320..7a69a00 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -5,11 +5,5 @@
DIST zfs-0.6.3-patches-r1.tar.xz 87852 SHA256 71b5286f77cb6a6c2b97cee406dfd4788f7b40b6675c4a56fc630a47e90d5280 SHA512 e2fa573c7b30a3811e9e1596d35b65f5d013ed5bac43e364b44ffab734398a3294979c152a80ec9a722611cc7c971aec217d8e1a37cc9240a3fa2dddb5b90e3b WHIRLPOOL f2da02d5c7d2385e7de1e858c31d299632ca864d422f0c94e5d3b8674d24beeb073ad2600698350306a9e70dbeef390f0e513d19c126502fceec18795c203d50
DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe
DIST zfs-0.6.4.2.tar.gz 1738601 SHA256 26af2924cbb891b79203a31827cba4cdc310162d5f7b9e2d643eb6576aa19015 SHA512 87a28997b8f9d36e189410171db583402418a55782b7b7f333993e98c5e17ccc4b6cd5825f38b904294c87e3dfdfb7748bd71cc371589c1358f16c942e0c18db WHIRLPOOL 1700de7da56311a7b608c99a821e2fa97a6145ccc88f3d8eff12f778421ba7b7b9cc5f5fbe5f1acd2ea2fd1db778c200a2ea961e3859a8fc89d80474894293f1
-DIST zfs-0.6.4.tar.gz 1735736 SHA256 7f37aaaa1fc15201dde58bb84e0f191ccac462f19ffec0c889b6f6ed3f73a804 SHA512 cf47cbf5fa8dff75f5e9d81b323f5745d7b210266ba9e6ccab16bbf0e2b055aa1168bad94a77a4bc56c6fbe0391593f210bd4c74f7a8d0d99385ac4dd61e5622 WHIRLPOOL 1b0cc8a9727b57f2e63bd106cd94780002a068b31668b9dc103dbc0b48858a380d7c228f39f0526fc84b9d10aca1bd376ace0346a2ef4306a9d164c2d56606f1
DIST zfs-0.6.5.2.tar.gz 1817267 SHA256 aecd2bc5189f2a71a45eb222230146bed231af4f35af5ec7af83a74987c3d595 SHA512 7f0b20feca91d5ab952c1d49ae94d241f8868825b163a3d5f2ad0fd7adcac3ab246a3e6a755019a833be553fbbfd6609828d8123f49a43b42bf76cfd64f234ec WHIRLPOOL 00fd628ef2267366b6f0705e6436ac55b260aabc3588c7f58a7042dfbfe95a0478740b4579326638d28f10ffc8f2d5b3ed21b9f8297e72344ec439fe30310634
-DIST zfs-0.6.5.tar.gz 1816180 SHA256 542121940122c922c9d21a2bb39bca4e4a9db2f6bbfd2e576630840e256d4c82 SHA512 58480ee9b0780f1f21d12504abc226be3e6df1939214f6a8f245315d1fa0b9da56b3a744df26426ee78f13684a4ca288df6dddc50f8f91d9d0b4c542980a9c53 WHIRLPOOL fdb5580ec8d4abe57069ce453c1d91225019758ecf5d31856a7897ac7e4b51c6a8ae3258e822f684fbd70a0a7d7410c65c37a569f37d132767522118c587cc24
-DIST zfs-kmod-0.6.2-p0.tar.xz 8244 SHA256 84456e1d52c6d44cc377d131ee34c042c289d00f74e7a9b521d8ef82bdfcf369 SHA512 ff29830e44aeb537d82d2c34070a245271b51013131f9191d03ab35eff2b86559c4bdadd3cf21f7aa7bec07c3556ef712db9cca2beedd1288036c29d750567e2 WHIRLPOOL 62b9a920a832f5715a24c2a0cdc914a5e77700b0e8723df868b1bf8b8a7ecec6f7df14cb294dfb4f4f219cc8253615c594b609a117b57b576e1796b8042bfdc5
-DIST zfs-kmod-0.6.2-p1.tar.xz 15988 SHA256 0d5ee6d53f6ba694937a9c1f009a0c18519e56cfcd328e5a42a0486f967608e5 SHA512 77b4f167073fa1be2501889f6795972a370c90b58dca121c95c38d98b37fa092ad043e5ab447e677f2207da7119b9fd2c940990bec83118edf18daff2eccaa16 WHIRLPOOL 730347f5d6c7449f309f6b53cdbcbb77b94c35385cebdb5a953f851f01d26c87d615b8ef673a7346f8351e01237833e18ed2fc7cca78bb200e7537222b3e46e2
-DIST zfs-kmod-0.6.2-p2.tar.xz 28636 SHA256 12882463a38a5a57cf2bb3c14c5783f9511f6dc7b163a47575f2f3dcc24f26f6 SHA512 5792660ae8f5013d12e70d608e9cffa92a8c4089a88a5e78728ee88204b3f970d452d5b0b3874e02be49ebbc139e07139be7b5a86ca40bc8b23cb11a7198a9a8 WHIRLPOOL 0e4c57b363cdd3d736efbd1355567b18e22439bd3b20ef40b27f6b97ad4570c7cc99a11b196ac25359d1966c1a70e178f4fd1687b60450f148ccda47b07282a9
-DIST zfs-kmod-0.6.2-p3.tar.xz 45988 SHA256 4af06d1472f5d24e01d147b6fec5c78fbbd9739d1259bd3fbf57af66c99b9bcb SHA512 eddf67c0aa49d42f663f98dc721bac75e8d0521df5ae174cd6aeee0a935a71b49e06961404eb6c71a09cd239358868a2fe49de4f1d26776948f8fe7fc943165c WHIRLPOOL 5634a92f6f322f67edef95ad121b0b1699e520ca8beb05b3385dc7e20198dd45d337731bf7df69d1b1c552ed0b78d54b15bc9c9e76b694ae4c8d360892b9d764
DIST zfs-kmod-0.6.2-p4.tar.xz 63984 SHA256 9167edc4be86e3fcda6b3c198e51f92ab0c95ac5baca11666c28029a628cdac9 SHA512 13e4ec415c35d2f268d89565745f5898c0943423577a2ba6714b3a069c5a80f244cd06dff91464f38dd4ed60673d1145ead080bb03a56d4be33e328f948ffa64 WHIRLPOOL 8c399ec67119ed4fbebb5599d00f888918678bc4e4ea369b4bdc5c75bfc90fc76396087624c8011de370a54ff103bccaa8922d05ac7ccebb2b3481bbbcf44b19
diff --git a/sys-fs/zfs/zfs-0.6.2-r1.ebuild b/sys-fs/zfs/zfs-0.6.2-r1.ebuild
deleted file mode 100644
index b5d8952..0000000
--- a/sys-fs/zfs/zfs-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2 linux-mod
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz
- https://dev.gentoo.org/~ryao/dist/${PN}-kmod-${MY_PV}-p0.tar.xz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="bash-completion custom-cflags kernel-builtin +rootfs selinux test-suite static-libs"
-RESTRICT="test"
-
-COMMON_DEPEND="
- selinux? ( sys-libs/libselinux )
- sys-apps/util-linux[static-libs?]
- sys-libs/zlib[static-libs(+)?]
- virtual/awk
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
- !=sys-apps/grep-2.13*
- !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
- !sys-fs/zfs-fuse
- !prefix? ( virtual/udev )
- test-suite? (
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- virtual/modutils
- )
- rootfs? (
- app-arch/cpio
- app-misc/pax-utils
- !<sys-boot/grub-2.00-r2:2
- )
-"
-
-pkg_setup() {
- :
-}
-
-src_prepare() {
- if [ ${PV} != "9999" ]
- then
- # Apply patch set
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/${PN}-kmod-${MY_PV}-patches"
- fi
-
- # Update paths
- sed -e "s|/sbin/lsmod|/bin/lsmod|" \
- -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
- -e "s|/sbin/parted|/usr/sbin/parted|" \
- -i scripts/common.sh.in
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=user
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="$(get_udevdir)"
- --with-blkid
- $(use_with selinux)
- )
- autotools-utils_src_configure
-
- # prepare systemd unit and helper script
- cat "${FILESDIR}/zfs.service.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs.service" || die
- cat "${FILESDIR}/zfs-init.sh.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs-init.sh" || die
-}
-
-src_install() {
- autotools-utils_src_install
- gen_usr_ldscript -a uutil nvpair zpool zfs
- rm -rf "${ED}usr/lib/dracut"
- use test-suite || rm -rf "${ED}usr/share/zfs"
-
- use bash-completion && newbashcomp "${FILESDIR}/bash-completion" zfs
-
- exeinto /usr/libexec
- doexe "${T}/zfs-init.sh"
- systemd_dounit "${T}/zfs.service"
-}
-
-pkg_postinst() {
-
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- einfo "Adding ${P} to the module database to ensure that the"
- einfo "kernel modules and userland utilities stay in sync."
- update_moduledb
- fi
-
- [ -e "${EROOT}etc/runlevels/boot/zfs" ] \
- || ewarn 'You should add zfs to the boot runlevel.'
-
- if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
- then
- einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
- rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
- fi
-
-}
-
-pkg_postrm() {
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- remove_moduledb
- fi
-}
diff --git a/sys-fs/zfs/zfs-0.6.2-r2.ebuild b/sys-fs/zfs/zfs-0.6.2-r2.ebuild
deleted file mode 100644
index 9b9b1f6..0000000
--- a/sys-fs/zfs/zfs-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2 linux-mod
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz
- https://dev.gentoo.org/~ryao/dist/${PN}-kmod-${MY_PV}-p1.tar.xz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="bash-completion custom-cflags kernel-builtin +rootfs selinux test-suite static-libs"
-RESTRICT="test"
-
-COMMON_DEPEND="
- selinux? ( sys-libs/libselinux )
- sys-apps/util-linux[static-libs?]
- sys-libs/zlib[static-libs(+)?]
- virtual/awk
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
- !=sys-apps/grep-2.13*
- !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
- !sys-fs/zfs-fuse
- !prefix? ( virtual/udev )
- test-suite? (
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- virtual/modutils
- )
- rootfs? (
- app-arch/cpio
- app-misc/pax-utils
- !<sys-boot/grub-2.00-r2:2
- )
-"
-
-pkg_setup() {
- :
-}
-
-src_prepare() {
- if [ ${PV} != "9999" ]
- then
- # Apply patch set
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/${PN}-kmod-${MY_PV}-patches"
- fi
-
- # Update paths
- sed -e "s|/sbin/lsmod|/bin/lsmod|" \
- -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
- -e "s|/sbin/parted|/usr/sbin/parted|" \
- -i scripts/common.sh.in
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=user
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="$(get_udevdir)"
- --with-blkid
- $(use_with selinux)
- )
- autotools-utils_src_configure
-
- # prepare systemd unit and helper script
- cat "${FILESDIR}/zfs.service.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs.service" || die
- cat "${FILESDIR}/zfs-init.sh.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs-init.sh" || die
-}
-
-src_install() {
- autotools-utils_src_install
- gen_usr_ldscript -a uutil nvpair zpool zfs
- rm -rf "${ED}usr/lib/dracut"
- use test-suite || rm -rf "${ED}usr/share/zfs"
-
- use bash-completion && newbashcomp "${FILESDIR}/bash-completion" zfs
-
- exeinto /usr/libexec
- doexe "${T}/zfs-init.sh"
- systemd_dounit "${T}/zfs.service"
-}
-
-pkg_postinst() {
-
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- einfo "Adding ${P} to the module database to ensure that the"
- einfo "kernel modules and userland utilities stay in sync."
- update_moduledb
- fi
-
- [ -e "${EROOT}etc/runlevels/boot/zfs" ] \
- || ewarn 'You should add zfs to the boot runlevel.'
-
- if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
- then
- einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
- rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
- fi
-
-}
-
-pkg_postrm() {
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- remove_moduledb
- fi
-}
diff --git a/sys-fs/zfs/zfs-0.6.2-r3.ebuild b/sys-fs/zfs/zfs-0.6.2-r3.ebuild
deleted file mode 100644
index d15d9b4..0000000
--- a/sys-fs/zfs/zfs-0.6.2-r3.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-r1
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2 linux-mod
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz
- https://dev.gentoo.org/~ryao/dist/${PN}-kmod-${MY_PV}-p2.tar.xz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL bash-completion? ( MIT )"
-SLOT="0"
-IUSE="bash-completion custom-cflags kernel-builtin +rootfs selinux test-suite static-libs"
-RESTRICT="test"
-
-COMMON_DEPEND="
- selinux? ( sys-libs/libselinux )
- sys-apps/util-linux[static-libs?]
- sys-libs/zlib[static-libs(+)?]
- virtual/awk
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
- !=sys-apps/grep-2.13*
- !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
- !sys-fs/zfs-fuse
- !prefix? ( virtual/udev )
- test-suite? (
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- virtual/modutils
- )
- rootfs? (
- app-arch/cpio
- app-misc/pax-utils
- !<sys-boot/grub-2.00-r2:2
- )
-"
-
-pkg_setup() {
- :
-}
-
-src_prepare() {
- if [ ${PV} != "9999" ]
- then
- # Apply patch set
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/${PN}-kmod-${MY_PV}-patches"
- fi
-
- # Update paths
- sed -e "s|/sbin/lsmod|/bin/lsmod|" \
- -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
- -e "s|/sbin/parted|/usr/sbin/parted|" \
- -i scripts/common.sh.in
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=user
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="$(get_udevdir)"
- --with-blkid
- $(use_with selinux)
- )
- autotools-utils_src_configure
-
- # prepare systemd unit and helper script
- cat "${FILESDIR}/zfs.service.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs.service" || die
- cat "${FILESDIR}/zfs-init.sh.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs-init.sh" || die
-}
-
-src_install() {
- autotools-utils_src_install
- gen_usr_ldscript -a uutil nvpair zpool zfs
- rm -rf "${ED}usr/lib/dracut"
- use test-suite || rm -rf "${ED}usr/share/zfs"
-
- use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-
- exeinto /usr/libexec
- doexe "${T}/zfs-init.sh"
- systemd_dounit "${T}/zfs.service"
-}
-
-pkg_postinst() {
-
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- einfo "Adding ${P} to the module database to ensure that the"
- einfo "kernel modules and userland utilities stay in sync."
- update_moduledb
- fi
-
- [ -e "${EROOT}etc/runlevels/boot/zfs" ] \
- || ewarn 'You should add zfs to the boot runlevel.'
-
- if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
- then
- einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
- rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
- fi
-
-}
-
-pkg_postrm() {
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- remove_moduledb
- fi
-}
diff --git a/sys-fs/zfs/zfs-0.6.2-r4.ebuild b/sys-fs/zfs/zfs-0.6.2-r4.ebuild
deleted file mode 100644
index 8070a53..0000000
--- a/sys-fs/zfs/zfs-0.6.2-r4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-r1
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2 linux-mod
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz
- https://dev.gentoo.org/~ryao/dist/${PN}-kmod-${MY_PV}-p3.tar.xz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL bash-completion? ( MIT )"
-SLOT="0"
-IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs selinux test-suite static-libs"
-RESTRICT="test"
-
-COMMON_DEPEND="
- selinux? ( sys-libs/libselinux )
- sys-apps/util-linux[static-libs?]
- sys-libs/zlib[static-libs(+)?]
- virtual/awk
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
- !=sys-apps/grep-2.13*
- !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
- !sys-fs/zfs-fuse
- !prefix? ( virtual/udev )
- test-suite? (
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- virtual/modutils
- )
- rootfs? (
- app-arch/cpio
- app-misc/pax-utils
- !<sys-boot/grub-2.00-r2:2
- )
-"
-
-pkg_setup() {
- :
-}
-
-src_prepare() {
- if [ ${PV} != "9999" ]
- then
- # Apply patch set
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/${PN}-kmod-${MY_PV}-patches"
- fi
-
- # Update paths
- sed -e "s|/sbin/lsmod|/bin/lsmod|" \
- -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
- -e "s|/sbin/parted|/usr/sbin/parted|" \
- -i scripts/common.sh.in
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=user
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="$(get_udevdir)"
- --with-blkid
- $(use_enable debug)
- $(use_with selinux)
- )
- autotools-utils_src_configure
-
- # prepare systemd unit and helper script
- cat "${FILESDIR}/zfs.service.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs.service" || die
- cat "${FILESDIR}/zfs-init.sh.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs-init.sh" || die
-}
-
-src_install() {
- autotools-utils_src_install
- gen_usr_ldscript -a uutil nvpair zpool zfs
- rm -rf "${ED}usr/lib/dracut"
- use test-suite || rm -rf "${ED}usr/share/zfs"
-
- use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-
- exeinto /usr/libexec
- doexe "${T}/zfs-init.sh"
- systemd_dounit "${T}/zfs.service"
-}
-
-pkg_postinst() {
-
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- einfo "Adding ${P} to the module database to ensure that the"
- einfo "kernel modules and userland utilities stay in sync."
- update_moduledb
- fi
-
- [ -e "${EROOT}etc/runlevels/boot/zfs" ] \
- || ewarn 'You should add zfs to the boot runlevel.'
-
- if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
- then
- einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
- rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
- fi
-
-}
-
-pkg_postrm() {
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- remove_moduledb
- fi
-}
diff --git a/sys-fs/zfs/zfs-0.6.2.ebuild b/sys-fs/zfs/zfs-0.6.2.ebuild
deleted file mode 100644
index 2b9ac7d..0000000
--- a/sys-fs/zfs/zfs-0.6.2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2 linux-mod
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="bash-completion custom-cflags kernel-builtin +rootfs selinux test-suite static-libs"
-RESTRICT="test"
-
-COMMON_DEPEND="
- selinux? ( sys-libs/libselinux )
- sys-apps/util-linux[static-libs?]
- sys-libs/zlib[static-libs(+)?]
- virtual/awk
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
- !=sys-apps/grep-2.13*
- !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
- !sys-fs/zfs-fuse
- !prefix? ( virtual/udev )
- test-suite? (
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- virtual/modutils
- )
- rootfs? (
- app-arch/cpio
- app-misc/pax-utils
- !<sys-boot/grub-2.00-r2:2
- )
-"
-
-pkg_setup() {
- :
-}
-
-src_prepare() {
- # Update paths
- sed -e "s|/sbin/lsmod|/bin/lsmod|" \
- -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
- -e "s|/sbin/parted|/usr/sbin/parted|" \
- -i scripts/common.sh.in
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=user
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="$(get_udevdir)"
- $(use_with selinux)
- )
- autotools-utils_src_configure
-
- # prepare systemd unit and helper script
- cat "${FILESDIR}/zfs.service.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs.service" || die
- cat "${FILESDIR}/zfs-init.sh.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs-init.sh" || die
-}
-
-src_install() {
- autotools-utils_src_install
- gen_usr_ldscript -a uutil nvpair zpool zfs
- rm -rf "${ED}usr/lib/dracut"
- use test-suite || rm -rf "${ED}usr/share/zfs"
-
- use bash-completion && newbashcomp "${FILESDIR}/bash-completion" zfs
-
- exeinto /usr/libexec
- doexe "${T}/zfs-init.sh"
- systemd_dounit "${T}/zfs.service"
-}
-
-pkg_postinst() {
-
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- einfo "Adding ${P} to the module database to ensure that the"
- einfo "kernel modules and userland utilities stay in sync."
- update_moduledb
- fi
-
- [ -e "${EROOT}etc/runlevels/boot/zfs" ] \
- || ewarn 'You should add zfs to the boot runlevel.'
-
- if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
- then
- einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
- rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
- fi
-
-}
-
-pkg_postrm() {
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- remove_moduledb
- fi
-}
diff --git a/sys-fs/zfs/zfs-0.6.3.ebuild b/sys-fs/zfs/zfs-0.6.3.ebuild
deleted file mode 100644
index ea2577e..0000000
--- a/sys-fs/zfs/zfs-0.6.3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-r1
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2 linux-mod
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL bash-completion? ( MIT )"
-SLOT="0"
-IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
-RESTRICT="test"
-
-COMMON_DEPEND="
- sys-apps/util-linux[static-libs?]
- sys-libs/zlib[static-libs(+)?]
- virtual/awk
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
- !=sys-apps/grep-2.13*
- !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
- !sys-fs/zfs-fuse
- !prefix? ( virtual/udev )
- test-suite? (
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- virtual/modutils
- )
- rootfs? (
- app-arch/cpio
- app-misc/pax-utils
- !<sys-boot/grub-2.00-r2:2
- )
-"
-
-pkg_setup() {
- :
-}
-
-src_prepare() {
- # Update paths
- sed -e "s|/sbin/lsmod|/bin/lsmod|" \
- -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
- -e "s|/sbin/parted|/usr/sbin/parted|" \
- -i scripts/common.sh.in
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=user
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="$(get_udevdir)"
- --with-blkid
- $(use_enable debug)
- )
- autotools-utils_src_configure
-
- # prepare systemd unit and helper script
- cat "${FILESDIR}/zfs.service.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs.service" || die
- cat "${FILESDIR}/zfs-init.sh.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs-init.sh" || die
-}
-
-src_install() {
- autotools-utils_src_install
- gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
- rm -rf "${ED}usr/lib/dracut"
- use test-suite || rm -rf "${ED}usr/share/zfs"
-
- use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-
- exeinto /usr/libexec
- doexe "${T}/zfs-init.sh"
- systemd_dounit "${T}/zfs.service"
-}
-
-pkg_postinst() {
-
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- einfo "Adding ${P} to the module database to ensure that the"
- einfo "kernel modules and userland utilities stay in sync."
- update_moduledb
- fi
-
- [ -e "${EROOT}etc/runlevels/boot/zfs" ] \
- || ewarn 'You should add zfs to the boot runlevel.'
-
- if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
- then
- einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
- rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
- fi
-
-}
-
-pkg_postrm() {
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- remove_moduledb
- fi
-}
diff --git a/sys-fs/zfs/zfs-0.6.4.ebuild b/sys-fs/zfs/zfs-0.6.4.ebuild
deleted file mode 100644
index f3d5411..0000000
--- a/sys-fs/zfs/zfs-0.6.4.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-r1
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2 linux-mod
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL bash-completion? ( MIT )"
-SLOT="0"
-IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
-RESTRICT="test"
-
-COMMON_DEPEND="
- sys-apps/util-linux[static-libs?]
- sys-libs/zlib[static-libs(+)?]
- virtual/awk
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
- !=sys-apps/grep-2.13*
- !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
- !sys-fs/zfs-fuse
- !prefix? ( virtual/udev )
- test-suite? (
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- virtual/modutils
- )
- rootfs? (
- app-arch/cpio
- app-misc/pax-utils
- !<sys-boot/grub-2.00-r2:2
- )
-"
-
-pkg_setup() {
- :
-}
-
-src_prepare() {
- # Update paths
- sed -e "s|/sbin/lsmod|/bin/lsmod|" \
- -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
- -e "s|/sbin/parted|/usr/sbin/parted|" \
- -i scripts/common.sh.in
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=user
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="$(get_udevdir)"
- --with-blkid
- $(use_enable debug)
- )
- autotools-utils_src_configure
-
- # prepare systemd unit and helper script
- cat "${FILESDIR}/zfs.service.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs.service" || die
- cat "${FILESDIR}/zfs-init.sh.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs-init.sh" || die
-}
-
-src_install() {
- autotools-utils_src_install
- gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
- rm -rf "${ED}usr/lib/dracut"
- use test-suite || rm -rf "${ED}usr/share/zfs"
-
- use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-
- exeinto /usr/libexec
- doexe "${T}/zfs-init.sh"
- systemd_dounit "${T}/zfs.service"
- doinitd "${FILESDIR}/zed"
-}
-
-pkg_postinst() {
-
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- einfo "Adding ${P} to the module database to ensure that the"
- einfo "kernel modules and userland utilities stay in sync."
- update_moduledb
- fi
-
- [ -e "${EROOT}etc/runlevels/boot/zfs" ] \
- || ewarn 'You should add zfs to the boot runlevel.'
-
- if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
- then
- einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
- rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
- fi
-
-}
-
-pkg_postrm() {
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- remove_moduledb
- fi
-}
diff --git a/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild b/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild
index 83049e7..d8d2c64 100644
--- a/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild
@@ -63,7 +63,7 @@
"
pkg_setup() {
- if use kernel_linux; then
+ if use kernel_linux && use test-suite; then
linux-info_pkg_setup
if ! linux_config_exists; then
ewarn "Cannot check the linux kernel configuration."
diff --git a/sys-fs/zfs/zfs-0.6.5.ebuild b/sys-fs/zfs/zfs-0.6.5.ebuild
deleted file mode 100644
index 9c9e1be..0000000
--- a/sys-fs/zfs/zfs-0.6.5.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-r1
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2 linux-mod
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz"
- S="${WORKDIR}/${PN}-${P}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL bash-completion? ( MIT )"
-SLOT="0"
-IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
-RESTRICT="test"
-
-COMMON_DEPEND="
- sys-apps/util-linux[static-libs?]
- sys-libs/zlib[static-libs(+)?]
- virtual/awk
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
- !=sys-apps/grep-2.13*
- !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
- !sys-fs/zfs-fuse
- !prefix? ( virtual/udev )
- test-suite? (
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- virtual/modutils
- )
- rootfs? (
- app-arch/cpio
- app-misc/pax-utils
- !<sys-boot/grub-2.00-r2:2
- )
- !>=sys-fs/udev-init-scripts-28
-"
-
-pkg_setup() {
- :
-}
-
-src_prepare() {
- # Update paths
- sed -e "s|/sbin/lsmod|/bin/lsmod|" \
- -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
- -e "s|/sbin/parted|/usr/sbin/parted|" \
- -i scripts/common.sh.in
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=user
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="$(get_udevdir)"
- --with-blkid
- $(use_enable debug)
- )
- autotools-utils_src_configure
-
- # prepare systemd unit and helper script
- cat "${FILESDIR}/zfs.service.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs.service" || die
- cat "${FILESDIR}/zfs-init.sh.in" | \
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
- > "${T}/zfs-init.sh" || die
-}
-
-src_install() {
- autotools-utils_src_install
- gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
- rm -rf "${ED}usr/lib/dracut"
- use test-suite || rm -rf "${ED}usr/share/zfs"
-
- use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-
- exeinto /usr/libexec
- doexe "${T}/zfs-init.sh"
- systemd_dounit "${T}/zfs.service"
- doinitd "${FILESDIR}/zed"
-}
-
-pkg_postinst() {
-
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- einfo "Adding ${P} to the module database to ensure that the"
- einfo "kernel modules and userland utilities stay in sync."
- update_moduledb
- fi
-
- if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
- then
- einfo 'The zfs boot script has been split into the zfs-import,'
- einfo 'zfs-mount and zfs-share scripts, with zed being added in the'
- einfo 'form of a fourth script.'
- einfo
- einfo 'You had the zfs script in your boot runlevel. For your'
- einfo 'convenience, it has been automatically removed and the three'
- einfo 'scripts that replace it have been configured to start.'
- einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
- einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
- rm "${EROOT}etc/runlevels/boot/zfs"
- ln -snf "${EROOT}etc/init.d/zfs-import" \
- "${EROOT}etc/runlevels/boot/zfs-import"
- ln -snf "${EROOT}etc/init.d/zfs-mount" \
- "${EROOT}etc/runlevels/boot/zfs-mount"
- ln -snf "${EROOT}etc/init.d/zfs-share" \
- "${EROOT}etc/runlevels/default/zfs-share"
- else
- [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
- einfo "You should add zfs-import to the boot runlevel."
- [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
- einfo "You should add zfs-mount to the boot runlevel."
- [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
- einfo "You should add zfs-share to the default runlevel."
- fi
-
- [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
- einfo "You should add zfs-zed to the default runlevel."
-
- if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
- then
- einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
- rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
- fi
-
-}
-
-pkg_postrm() {
- if ! use kernel-builtin && [ ${PV} = "9999" ]
- then
- remove_moduledb
- fi
-}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 54dd341..8bb60aa 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -63,7 +63,7 @@
"
pkg_setup() {
- if use kernel_linux; then
+ if use kernel_linux && use test-suite; then
linux-info_pkg_setup
if ! linux_config_exists; then
ewarn "Cannot check the linux kernel configuration."
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 39ecb3b..1f30d4a 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -4,7 +4,9 @@
DIST aufs-sources-4.0_p20150629.tar.xz 166624 SHA256 af28e0752a1f9c0edf34519b58ed4aaea9e3538a3041110061d1fa55e25acfca SHA512 c68c077bf399d188c72f8c2c6ca4ce634fa710b84296275529f1a8a20c3c923ca7d418cd564d66651b5dbc3544bc556f763a5c3687e3fede55e36b13223a2bec WHIRLPOOL e3590e5da82ae5252c1e318dd775d950a14c3ac0f6235552cef0943f304361299ed33731e7365f6ef586e02e7d23be5dfdc613b40f48a042655b2a110638ca3e
DIST aufs-sources-4.1_p20150629.tar.xz 166912 SHA256 b9927b15bfc6be7b72206529402b33ceb32b72fd36c84e28f34fb73218575cd0 SHA512 6514479c83e04fe22c7d753bc351e77e9d84cc012eb590e0e463f639bd1ac4dd5cecc0f5b6046d7f721a4a90b6f492e015faadc392af2664f4bcfa9a860bec56 WHIRLPOOL e68b9da85b2abc7b6b42777e23d49c93e550e2cdd330a140f4471888e0bab5dafb5cddf2b1263b12a74098ef3d817f3270b92898137948ae76152104db5d8621
DIST aufs-sources-4.1_p20150928.tar.xz 166712 SHA256 56b6b9c40a32eab3402444ca136d01e5ee8d00438d8679b730ce97912749bcae SHA512 c88ec4cb67293f392fbfd496e3bfed0836cc2bfbc53ab4f3af0e6929181e9f60d9dca30bfa10d3e7806edacdcb0a819ba2f83d48f9f08bedc06f27146a9e4a15 WHIRLPOOL 96cdbf312cbce9d484b59ec852d31726c7c79dec68c90137f0459b5f481f56c488d63a6756538c494df065e21e70c5c87650108f7213374bba066e16972796fc
+DIST aufs-sources-4.1_p20151012.tar.xz 166736 SHA256 05c5f7e565d58b98db443752c1f7b085be2ea6b3328a7ad43ad764c72c58c9be SHA512 95f43145dea8b2068319453450de434b44b1d07b947b1ca795e7ca44e8d2c5bfb619aeb1fc8eb2085351a4a078c30b5641716def5703c9e651613f4761404d78 WHIRLPOOL 05ea5374ff905113ffbda7b17964f82ea7f2a5df0126af887cb7524d68661c8e381d094c02e2592ae4ab7c97f553d866be988adf1c938fe1acf1eca253e03db4
DIST aufs-sources-4.2_p20150928.tar.xz 166932 SHA256 fc04eaf2973ae8ba3e7bf9d68ee58a24c30a6c97e50c6666ec335b39a14438cc SHA512 2c539d77d2af8541991f19f52b8186a68484453874c864bb67163680409bd22a98e902f3a719cf0f0b583978f2bda3d4b97fe78bdcc3ebbdb7f152c13a3b8d14 WHIRLPOOL e65cbf9d55909d0e5dc28c96fb96bc51d20a210579fdebb7387d5ebf3bf66274872717a3e17b80033a799e01d5892228b41728a5cf49914f15d2cb8a8fc2715c
+DIST aufs-sources-4.2_p20151012.tar.xz 166928 SHA256 2f3b5c79bc28a9b609cd7def95420af033ea016eb8f11c0675c40a4b7dd03055 SHA512 cd17fd9baee5cb1186df59131c861f96901fef6d87696c61743d454b15a33d9383dbe69de8d6f520072063891cc6813e4489e6a177079c6f6ad903a6f6d856e5 WHIRLPOOL 6a9814d33a80576bd6f302384ed6f37eed74d64be30389e61f2b060c1e3b0784c4116b1318a60d116c961bf2782fadefbb784a965c4e5e1c440c7e2b66af779c
DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831
DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8
DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e
@@ -32,15 +34,18 @@
DIST genpatches-4.1-12.base.tar.xz 266104 SHA256 d99620d6fa052732357a9b050a878d6ed7f1f3b03c1ae59d99132db8244829cc SHA512 4128fd323a7451692b512b249226f25ed5a0d5aebdf48832495d3d72351ccf61b7d7ecbccdd85915eff023fcb9fcbb408a1c01f2bb58535434153ca00d5ef0a3 WHIRLPOOL 2c9d9f8c989a319fb1b06ff8f2e29feeabed05c41546eb91a0bfa5bf2d586a7ef39c01d1e100519c844e419c92ece745b7192f3e3839c2fcf9dd08d971143c35
DIST genpatches-4.1-12.experimental.tar.xz 215960 SHA256 8d0659bda61873ce16612e919b7ba6ccb8b5b9b5362ab218a886bf2ccb2684c8 SHA512 b1392299fed208e973eed70174f55ab6e70c0f5c7cbe5e29a12dc27ca9fdb09448314fd3a32b1d4abfa529065d76e7ddbc66cc60019b1d9c66d1b96d0d146dd9 WHIRLPOOL 4e7189dae91ffcf37d70dd9d2547a8e2092cece356e004e9282d5c0aa3d5d992cb7423496ef9f28503e687052b21468e456f83772989a023fe0f8d33a2bdf00a
DIST genpatches-4.1-12.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3
-DIST genpatches-4.1-13.base.tar.xz 311220 SHA256 da5df39634a32c9da405258e947a23dff4d3d108df3533852c2be9b555060fa0 SHA512 f2e17dfe8fd8b572890129ee2dc4bae15ceca0f695fcd2b0c216bb755fd3031979b18a41aec32d24a2cc81dd2bb85b7f3050d18b7bc6615c925906f08cc2586b WHIRLPOOL 70a669cfd26ac756bce5d90087d7aadc9311140eb162c1108d414e0cce3bb4e43243057dc0e81765df4b2c95b3c99cad2a5ea2a802d02d4236b95c6e39cad077
-DIST genpatches-4.1-13.experimental.tar.xz 215988 SHA256 3b58f4e8e4867bb7eac7acc78954824f79d0e4260ab5b21d73d30ee617287708 SHA512 bed868ee20616194dfd314705234348f1a860a2163c886470a16e387940a48dfa78e1cd0e2a6b4a827b9c664fa37586d0a52925ad7502e2ca4e15e94fd33c2b3 WHIRLPOOL 2ff84c87619e2dea27886d1bf7e94753187e2f1b07c71b4b5ebbbaa3ead391c0d3a14431a67b3707ceda05d26b86598f1bfbe1beadb63285614e77b3e76102af
-DIST genpatches-4.1-13.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd
+DIST genpatches-4.1-14.base.tar.xz 311648 SHA256 e3a959d79834266bd4760d806598b7e9b982823e9b177219f0e385482380aa25 SHA512 b2626d0b45da547a293ba233a4c33c30aa4f7b9ff1d2c3a3aea664f9d99e272b5c9aeba6abc63f27930771b9c282184501c62a987985e23c53471ca5feb260d2 WHIRLPOOL 5db2f30fe0f30cd1161cfbd7d7a8a7cb6815ece833874e303782bf28afc25d11568d48372816e9736d39c781635d5ba91b3f80817552485ddf1c945c40aec01a
+DIST genpatches-4.1-14.experimental.tar.xz 215988 SHA256 3b58f4e8e4867bb7eac7acc78954824f79d0e4260ab5b21d73d30ee617287708 SHA512 bed868ee20616194dfd314705234348f1a860a2163c886470a16e387940a48dfa78e1cd0e2a6b4a827b9c664fa37586d0a52925ad7502e2ca4e15e94fd33c2b3 WHIRLPOOL 2ff84c87619e2dea27886d1bf7e94753187e2f1b07c71b4b5ebbbaa3ead391c0d3a14431a67b3707ceda05d26b86598f1bfbe1beadb63285614e77b3e76102af
+DIST genpatches-4.1-14.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd
DIST genpatches-4.2-3.base.tar.xz 44600 SHA256 ba1a0d8d9e1a139da388d44085a1011d760231467cef4ea9a87633673560e3dc SHA512 60367b50a40c60e6659cf11db99d4124b86fd7afa1bb8e5c3aac38b3025015f56f880e34250d1267ec4f295da38f656708ed2c6b46aa5b56f72503ed34b0e8c3 WHIRLPOOL 6dc72908e0ea0b4084d919f1049169fbe98153f85ae1bc87f3c3eef061b3cbefd427d87fef541299cf0bc48faea79b4a39e5dfb94dfdeedb4be7f53248ff3f9f
DIST genpatches-4.2-3.experimental.tar.xz 216620 SHA256 b038447b1d8129229469dfa3898b42374233ee00c65ea4728abaf632657f431d SHA512 17c13d9669596a34a85a844e38886099ff717248183104e3b02c438de4f1916886afea9db985b5c56170917901611331ef5038777eed2a4019811f98a75d399c WHIRLPOOL 9547278a329049d20a73e31e6bd5d6bf0270a2b3c7c02ce51163f4f91da18d74820f782e2c7ff66cd1e7f4075e088013def679568043d800c89c601a1cc4cce2
DIST genpatches-4.2-3.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3
DIST genpatches-4.2-4.base.tar.xz 44440 SHA256 439b89a4722bbc9c1ae72a17917d8923aa3447a16420674f12d22d6579571057 SHA512 526655ca30663fa2937ed784bcba1f89d3ffe8b5e9fe6e6134c40d42d698465bc6e266d73f1f35836b9ad94030aa4bbcef35aacd7145026bb158fe78f117a1b7 WHIRLPOOL 84bc29d2fcb171645f442eb13827764e1532451be808d9eba5393d81fe21ddfccc3167a027a31a334b9185f96b4b07507ee01643adcff60a7dac21bfe4f1e371
DIST genpatches-4.2-4.experimental.tar.xz 161676 SHA256 55687ed45c227be95df64f8bdeee322a3262424af4c72307c80aa0213971ac0a SHA512 722caebf457c370e0d75ea2c8f3861500f1f910a09c1e10b5c34847b94313e698f8abe4d2b5a604d35b5b8f324bd87b20b078904b80a16dd704e4d113a977a49 WHIRLPOOL d5c9d808d9aa340e912272f0d0b0e58b8f39c8a6c75b2b7294609dde43140397e0325d178815bd19425a2e885cf23e9c8b5cb889bcb84b6c4b6a1625f669daf5
DIST genpatches-4.2-4.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3
+DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f
+DIST genpatches-4.2-6.experimental.tar.xz 216008 SHA256 ce3ab8bec66d7e9bcf1ecd6f6e9925f8863869e09073cb76e6f4e1d9b6b65eb5 SHA512 1dec060dab9c942b154ea468e0cebae16a5a63844be3576a1300a1263e1b38e45b230faa2dabe020c0c32431b4c2025b38dd8fe866eef102359d81a3fd23f66f WHIRLPOOL 53396343aad281e3cdf36dbe4c0714723688b7e6a9938b8a8efdb1d6cf447e075f7d6cf503b5cef922f2a03ee2d85661011d0fba68c5a4a66853862bc5e1f378
+DIST genpatches-4.2-6.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd
DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001
DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.9-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.9-r1.ebuild
new file mode 100644
index 0000000..389ea8b
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.1.9-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="14"
+K_DEBLOB_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=4.1_p20151012
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
+SRC_URI="
+ ${KERNEL_URI}
+ ${ARCH_URI}
+ ${AUFS_URI}
+ !vanilla? ( ${GENPATCHES_URI} )
+ "
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+ if use vanilla; then
+ unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+ ewarn "You are using USE=vanilla"
+ ewarn "This will drop all support from the gentoo kernel security team"
+ fi
+
+ UNIPATCH_LIST="
+ "${WORKDIR}"/aufs4-kbuild.patch
+ "${WORKDIR}"/aufs4-base.patch
+ "${WORKDIR}"/aufs4-mmap.patch"
+
+ use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+ unpack ${AUFS_TARBALL}
+
+ einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+ kernel-2_src_unpack
+}
+
+src_prepare() {
+ if ! use module; then
+ sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+ fi
+ cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+ cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+ kernel-2_src_install
+ dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+ docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+ has_version sys-fs/aufs-util || \
+ elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+ readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.9.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.9.ebuild
deleted file mode 100644
index 76c6cc7..0000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.1.9.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="13"
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.1_p20150928
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
- ${KERNEL_URI}
- ${ARCH_URI}
- ${AUFS_URI}
- !vanilla? ( ${GENPATCHES_URI} )
- "
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
- if use vanilla; then
- unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
- ewarn "You are using USE=vanilla"
- ewarn "This will drop all support from the gentoo kernel security team"
- fi
-
- UNIPATCH_LIST="
- "${WORKDIR}"/aufs4-kbuild.patch
- "${WORKDIR}"/aufs4-base.patch
- "${WORKDIR}"/aufs4-mmap.patch"
-
- use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
- unpack ${AUFS_TARBALL}
-
- einfo "Using aufs4 version: ${AUFS_VERSION}"
-
- kernel-2_src_unpack
-}
-
-src_prepare() {
- if ! use module; then
- sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
- fi
- cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
- cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
- kernel-2_src_install
- dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
- docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- kernel-2_pkg_postinst
- einfo "For more info on this patchset, and how to report problems, see:"
- einfo "${HOMEPAGE}"
- has_version sys-fs/aufs-util || \
- elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
- readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
- kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.2.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.2.3.ebuild
new file mode 100644
index 0000000..bff0187
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.2.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="6"
+K_DEBLOB_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=4.2_p20151012
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
+SRC_URI="
+ ${KERNEL_URI}
+ ${ARCH_URI}
+ ${AUFS_URI}
+ !vanilla? ( ${GENPATCHES_URI} )
+ "
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+ if use vanilla; then
+ unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+ ewarn "You are using USE=vanilla"
+ ewarn "This will drop all support from the gentoo kernel security team"
+ fi
+
+ UNIPATCH_LIST="
+ "${WORKDIR}"/aufs4-kbuild.patch
+ "${WORKDIR}"/aufs4-base.patch
+ "${WORKDIR}"/aufs4-mmap.patch"
+
+ use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+ unpack ${AUFS_TARBALL}
+
+ einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+ kernel-2_src_unpack
+}
+
+src_prepare() {
+ if ! use module; then
+ sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+ fi
+ cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+ cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+ kernel-2_src_install
+ dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+ docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+ has_version sys-fs/aufs-util || \
+ elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+ readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/metadata.xml b/sys-kernel/aufs-sources/metadata.xml
index 96688c5..d7e0f20 100644
--- a/sys-kernel/aufs-sources/metadata.xml
+++ b/sys-kernel/aufs-sources/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
diff --git a/sys-kernel/genkernel-next/genkernel-next-63.ebuild b/sys-kernel/genkernel-next/genkernel-next-63.ebuild
index 84e2e10..ca1c7ac 100644
--- a/sys-kernel/genkernel-next/genkernel-next-63.ebuild
+++ b/sys-kernel/genkernel-next/genkernel-next-63.ebuild
@@ -13,9 +13,9 @@
inherit bash-completion-r1 eutils
if [[ "${PV}" == "9999" ]]; then
- KEYWORDS="ia64 ppc"
+ KEYWORDS="ia64 ppc x86"
else
- KEYWORDS="~alpha amd64 ~arm ia64 ppc ~x86"
+ KEYWORDS="~alpha amd64 ~arm ia64 ppc x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts, reloaded"
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index cf8b41a..594a33a 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -50,6 +50,9 @@
DIST genpatches-3.18-21.base.tar.xz 632956 SHA256 f657997b05dc52e215c22fde16cb227895d072ac2716d25481654849a9e373f1 SHA512 f1dac401caf1cd6282fc47670ad9e3540855542d7eee77f27231bdb9679d3da07b7b09f675ce5998aa777024817546ba8747c7d75aa45cbeb2789dbabf5c5602 WHIRLPOOL 26d19e9302ffd72123c897f7012ae6d81cbab7a7d1b498d10b6aef27fd5e7f4d466fb510c6e72ef3c5f855eb9c88e80f8adbf436e80d52dcbcf1ac1f3e1bf684
DIST genpatches-3.18-21.experimental.tar.xz 61600 SHA256 ebee995e505d68dcf95f39986b73185b353cc64627b048f230e755195a910094 SHA512 d7866e7948e8d6c83a452f99ca50ed06951f68b7552d9dc182c5686d43abe3dc76e3773c8325a87b65e8bf1fa4c09db75fc1af27b7837bb60918e82273cc17e4 WHIRLPOOL 01f897a369a036624364de57b1ea213b8bbe1b1e9bea792e45e0e5b921c3cff0a88174c3284359466059e3dc3793a51ea92a1aa4a5c7b0dd79d98e99693ccd80
DIST genpatches-3.18-21.extras.tar.xz 16192 SHA256 76e21081cdcb3c1b38632ec5375b456287ed572c1a3cb64cc036471a4ae4f726 SHA512 c1e98a5d2350b07a5d939863386027765c8820e32a45a9c68201beb6de811aadcd32c82ef8ef0627290f6fef7ad5751418b2aa7ab4e2d8f3e5b6683e40fbc80a WHIRLPOOL b39979d760f0695fb2632bf7fbed16070e24efa03992c0575bbd13185ab33f0e2d05e35071e9f352f0eaa83e15015550229c33df2294beebe2ef6d24fa2b755e
+DIST genpatches-3.18-22.base.tar.xz 651380 SHA256 9c866ac44e0c716a5292c3ec907fc52edfce1a32d75cbc63e51f2adbd10067d0 SHA512 d1183150a2ee641714dc85c873713936d862688d4314a6906a25943bbfb34566fe5d0e838d61eba2fc369a657aa762f6276a2a31a5c4e2e9429db4330a0fa03a WHIRLPOOL 22d358be0bfd836ded82b5fc347f5bc266186ee0374120f2def7e6d8c4e87c43ab364eb64c6b141ee8d0705912ebc12f5525694c7d6fcbc9da38c0012ed09da2
+DIST genpatches-3.18-22.experimental.tar.xz 61604 SHA256 a216f6a678d83ca91283adddaef52face5980718cc7eae9d8764f782422771c8 SHA512 aa2819419490a7ea0ac06179c07a2139e671877b4a5109c019c8931f21069e4d313c75279b679a76ead8381bc1f709a77b8eb19da27f3d5e8d4d4fb97a0ae5c3 WHIRLPOOL fb4364fc476edac40019c1215c5ba94e29ffd003aae37cb8bb642008e2f0a853ec174c4495699a2c7984dd190d895aeab17cae3ab6c6045ff497c07716a46939
+DIST genpatches-3.18-22.extras.tar.xz 16196 SHA256 deeab880c0705b9a02492e2e73152614b7c7dd9f213303fd5284ee07debf0416 SHA512 5ba6d42c5973daa52a54bc77f3f13312d9c6f496e002ab2ad613a08f18ee64dad39472ec0cdb0e545b2c95aee0d69fd30c38877d15f266768a22fabb8a06e2a3 WHIRLPOOL 84092c11122198958498e26d3c4fccbf06451ff9c880510f763968644d03c30160f01090c2bc5b411cb813715083682b90b750401ffd7c8f011ae24f203e90c0
DIST genpatches-3.4-90.base.tar.xz 1325696 SHA256 77764d0afc0e3a9db3b4e3314c86505ed8703834f8364fabf7bc21004d14425b SHA512 df2583e5a939a2ae9a2fade243b128ad3b1d4f7370407bca15ad1dca2defde271ede16daa8c01f844053af5da7a5cfbb7ea04839fe93a4a21fe87d1d8551374f WHIRLPOOL 17050e7e73b15106fb1831290a685810e65e41a345669e401ab324a3fa27576d02cb17e22b3f8c36961b501b31254cef82d849cac005504b8feb5b4113d9cbc3
DIST genpatches-3.4-90.extras.tar.xz 18236 SHA256 787d5a43bbadfcb40ac5f7aed21aca6bba239bcf495b0d051380f675487ecb42 SHA512 9917f83e64c0705e0c810723ada2f14109d29cee03576027fb234229796c024d8092abbb91406e2ff9594e9e1840f718885e9e0ff294cdb2bfb0ef76fbcfde0d WHIRLPOOL 255b4f46bd3f0685f6903eb04be187dfa3f821318c7bb8ae48fb17c35eabd88d0f14684f6031326cea4935246acd0766abe6e7363f1a527af686c7fa965cf9d3
DIST genpatches-3.4-91.base.tar.xz 1363016 SHA256 14bf3a56d4444ae5a9c307c2bbf2cccda44b5bb8f7c460ef9711b858bc8475b0 SHA512 f28f86bb302313b13c2de08d227e0bd0ca93ab5dd2071b6c0797c9b7e29f84b7abe2266c93bba15789a51d6d77c70b749105b5d4a1f7053b041ebd9eb5a80df5 WHIRLPOOL 8535d191d5482773a6d9aa8d45a6b8614b3ba936fc043e7ae5d52ee676ff89a65457c531bb14ce2ea447cb26083efc50c6748c04412b7d6b1a1c76d1d52a2ed6
@@ -89,6 +92,9 @@
DIST genpatches-4.2-5.base.tar.xz 87104 SHA256 e05455d88ad940a71a73dab090900d76c03b858d3e59aa0479b546be0efe6b67 SHA512 7689caf2bcc558ae2f3857bc0ae152e664b00e440da27aa11ee5c4a4f09b73deb967e7703b93d7d640fccd4f867691145f567944d9dcd5ec5f4a626ac255f603 WHIRLPOOL d963fd0e5e14960ddcbcec98253446d6ed0b70fb4a0f3506346547a4d60a5a18ba628e88b809371bc7b545fa4ef37de6503545295b770c78a46d231dc6e34b59
DIST genpatches-4.2-5.experimental.tar.xz 216004 SHA256 33b4a2fec7233a19ec0b95f02104ee5871cc3b2f9fa172e04d608153cd706228 SHA512 0d745905c5dec9ec479e2b7a8bace60941eb9f2c8bfa8d7ffae2ee697e11a6ff3482b1eb934b14a458c534f58a94773cd6dc419e89b120e81da54e0ccbb46307 WHIRLPOOL dff64ad62e3c555a65963ca42f1b2803e663c927eb2394ba3b3d2fa21c0937ddc9bac694295b6ef22d3b0b070b985d2b2088a11632ac432d1e59d08509128502
DIST genpatches-4.2-5.extras.tar.xz 16184 SHA256 39b8e65faed938ba3002c6113815f65a73ed2270a0b7f323a051780ee5728e69 SHA512 6745ce29d2f2398d8acfdd9b0171f117c078acd16b77dd041c8c02e51e3b387e669e2e10903dc72b6814ccd78c7e087fbd681325f598c2a1d7bf7acf8c9b434b WHIRLPOOL 4cec746f0dd4f6843d16f8e2dcd35466bb8847197497ebdfd47a86d335c3fedf148c08d01a3cf0e0c13e4d812c6585dcf5bd137476bb9ead0fb3ea28f84bc709
+DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f
+DIST genpatches-4.2-6.experimental.tar.xz 216008 SHA256 ce3ab8bec66d7e9bcf1ecd6f6e9925f8863869e09073cb76e6f4e1d9b6b65eb5 SHA512 1dec060dab9c942b154ea468e0cebae16a5a63844be3576a1300a1263e1b38e45b230faa2dabe020c0c32431b4c2025b38dd8fe866eef102359d81a3fd23f66f WHIRLPOOL 53396343aad281e3cdf36dbe4c0714723688b7e6a9938b8a8efdb1d6cf447e075f7d6cf503b5cef922f2a03ee2d85661011d0fba68c5a4a66853862bc5e1f378
+DIST genpatches-4.2-6.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd
DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.22.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.22.ebuild
new file mode 100644
index 0000000..f533e8d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.18.22.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="22"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.2.3.ebuild
new file mode 100644
index 0000000..b52a666
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.2.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="6"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 162e54e..6acbc62 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -2,3 +2,5 @@
DIST patch-4.3-rc1.xz 6171956 SHA256 5248a8e4fcf347cd918622b8f17057b50a8c367758fd4aed9b9e9dff0ad6a8d0 SHA512 d5ca7d7aff66305c4ad0b478b670a6c8bc880dfa9ca5e40b2df98eb814c529e18b0b130fe8100747588a02326fbd31d1b3a1b205616368a473e5ce11ee965114 WHIRLPOOL 9529ff348dc69bf224fc38b69dc8edb56ea982443382aadb98f753d16a8b819af04705b94f4a64b219d1584d4800df3b64f0d795842adb35ea01b4547dabc4db
DIST patch-4.3-rc2.xz 6285616 SHA256 b467915f75047d805d5b9da01d416c420aea353321146e52540fcec83c3daeab SHA512 8b218328ac376d7144df179632e839184ef616c3f9f58232cc76155c15852634ddd3a8dcd995395bdd48510d9f4364bc7198e0b9e709754dd74a91c1d46a6799 WHIRLPOOL 8da044d955e1ac9ec78422c853533f071a80680cb5cf914de19858d2cb42cbc25cea857e62b5847f09570a89a96c618389d5cb1f2a35481e4846c57196cd402b
DIST patch-4.3-rc3.xz 6370684 SHA256 5fb1f48e05e7523223498dcb319cfbdb5de8211713fae3bab17f75239afc13ab SHA512 937352ac6ad4e003938635d9fb3fcb8c8c78268b1f9fb55b09623530391ca9f089b64537422dd7f1a3b0d7bb24bbc0ca896532318067a9e5c1e6904dfef8d65d WHIRLPOOL ea98b91bfefc9f1d3b71c9c3cbf8c2b23ef0a1e3092a05bbe3a7d4dcceb1073e9d361b07bb669fb50e92ae875e230148a66a67c265e6db1ff00c7836bf44e3ed
+DIST patch-4.3-rc4.xz 6415156 SHA256 8ca3c9cefc9fff22ebe8cd8dba1100fa053ecc2d6197156bf3fe6aeca1570e97 SHA512 dfc14556e14a0b3ac786b189ede36e79b71ab8711cf635b0be5793d293447d7e45e59dfeed562a3295149a7a23cb03ee6713e35d511a8285d21b7a65e758e356 WHIRLPOOL 4251e94d6c31f530bd577cdbdd21f5c79f99a5a3ee124d36bbe347766e380e79e3f5e5585787bf8a808de4c964c799ca2a7f6af853941f0ac50599566fd563b7
+DIST patch-4.3-rc5.xz 6432572 SHA256 b77ae187707167ac73363ca9ef34dd38552ff0a08d5dc0467460a16bd41582c6 SHA512 c07c4cd33a3cebb616a35d1aab69d70d046c60f82e317fe2ead733e632ef22e93a39e5181dc3f6261665cc0ec80535246b47e7d37fcb46dc4891efe8bbed4258 WHIRLPOOL 7de2dc159da2ee66e2438bd0744210586596e7f6565a97bc61cd0c975e389c23036b206f394404999f985a4393f4d5d5e453933f5a2962e0f9500c0efa4004db
diff --git a/sys-kernel/git-sources/git-sources-4.3_rc4.ebuild b/sys-kernel/git-sources/git-sources-4.3_rc4.ebuild
new file mode 100644
index 0000000..13457db
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.3_rc4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_BASE_VER="4.2"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ >=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+ postinst_sources
+}
diff --git a/sys-kernel/git-sources/git-sources-4.3_rc5.ebuild b/sys-kernel/git-sources/git-sources-4.3_rc5.ebuild
new file mode 100644
index 0000000..13457db
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.3_rc5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_BASE_VER="4.2"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ >=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+ postinst_sources
+}
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 1365791..8bc6a7c 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,30 +1,21 @@
DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c
DIST deblob-3.2 107195 SHA256 2e8a59bf7f18425652050a1b9f2fe2e8d1f09b50b33ee633771ac03943345e81 SHA512 8de24b5dade9256caf20215692f2e53e403f99d3d1e81b301263ae5f8ce667780a1df7917094155fb47210f22e7839e3d08e4f3a84c86ae6bf582227b938229d WHIRLPOOL f7abda0702c9b038ee82b462d1de30bd21b28d591058f417aa399581e93ba35638f476544e6acfb12760d672dab067916e4c68275c91f4c01d3bef7f685ed67b
-DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8
DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e
+DIST deblob-4.2 134706 SHA256 fc6f631436d0a8ce8ef338a6ff5e612cd1bec679386f7129e70e4dc09c7aa9da SHA512 83ee4763e7eae7549a81f1ea9c2a549a36d57288acea15a228d5bb1aea0316b96f8622fe6729a3dec23714443711ad9959e899a8da962c56af8956a87d3263a1 WHIRLPOOL 1e6212af3d7244139b4fea1ef3fc705d6eb695d9902bae561a5b700ef335254cb50a4ee500f241669e0fafcfab752cf7df663d02ee2663e6ee7282008871da22
DIST deblob-check-3.14 613905 SHA256 4c69ea1c225b1a84c41e75392dcaa94f77dd8e647aff3afe52f1ab16ac99c5e5 SHA512 4dd7e785727ce29d78f5f68431fcb6ea9dfda5221dc8e699f40d13e3c85411707b13c288d23f8baa6b3c47f5a67ac58da0a7f1a51c4d9fdda82a7428ead88cf4 WHIRLPOOL de1b67955662f072193f58b7e7dbd98c6680958c2d65632bfb831dc0681945a4d1c27abe978e6ee687ae8f48773eb71c2f9026f461377b28235e7f7e39832a67
DIST deblob-check-3.2 557345 SHA256 60d05db20e7b50919ca44487d05e8faa9cca830318bd8d96625f0f75b252eeed SHA512 6b857380d495261c4d356639157f99f3ca3412388fd3b1c72b566c3bb6453c5a22ab7716e3b24e64a9b63dab912b07baccccfd0fca806ac0e0620efeef777b6a WHIRLPOOL 877c2c9b813466f9aa5cfecdc9ab93247bd2cdead457c9e0bd97da49d042d0a52262f9b4f8e9c83e397b57c5bb5a8fe2b61bb5f44d5a178a579cc9fff990941a
-DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebebf424f778eb08fa359bc SHA512 a27e3530cd3028041445cf8c5f49ad7827a7cf2b511de28851d2b09c28347cf2be667a7494bd698939c007fb77595699c1f61fb76249ae87658e1d12e855d2a1 WHIRLPOOL 953d8e6eed10971ed67a4573449b9a536ad693a2130153a6fc7cc9ea3e2daea21ca002c8df80126f7e318f75bec82c3f6e99fe43155817e2e2a52b5949dc5d2d
DIST deblob-check-4.1 674781 SHA256 54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33 WHIRLPOOL d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0
-DIST genpatches-3.14-53.base.tar.xz 993468 SHA256 1787942a9d4aa6ee5b8e27c40320380c58e39c19179ea9114cae3f439551092d SHA512 7eeb1924211620ae9d656b05141d7b9de803c52631c1b230de349d6b867ad6bf19a468df96ff1a349362163ff28b7ddf776ac78ae5438f0f3b3701f11a5f3f10 WHIRLPOOL da3a93ba3542c33f7153f791b981ad10924220f4b5bf1e9ff450cec782ae75b87998588b03d6b53c9676559b7fbdd42d24764b74429d81798bba4e032fbf6463
+DIST deblob-check-4.2 681496 SHA256 8b72723b3f5c651ba45017f557372dd25a43a1ce1b9ba622948399c20a5c318f SHA512 63e86dc0a4e676b4d0d4497d275e9885bda57ee63453a4e9e08fa4327f51b10b80da70d3f1d688e7c447632b31a388eed98470d88f88f60b50c0d53f4803cd94 WHIRLPOOL 4ad1b38354e7ed7e5c82f348956bda5cfa704b21e6f395a3b53a7ae61806c9df593ee9e560d4ad60d1501f6c5381dc6d79194b4aed6810908616e795fc757fc9
DIST genpatches-3.14-56.base.tar.xz 1032792 SHA256 8f227c2a9d1c6945604b67708088484fcfeb3075a4ea984495f8b1bec5a62476 SHA512 3ed7b6b68756b7f2abbeb78e50a9735a06d4d6d5b099edfa990cc26c3894731da97df37b580d469f48f5758eab5d3aa70e4efb9300f6daacee2d8def7a918fbb WHIRLPOOL c8a55f43db1fb4a28eb87f4e5eb50d98d0c0caa76a47b06f26be0e4a2e08d8c54282a5ca46e7e89ff1c8b6d9ada44bfe319b717e76683b8fb1e68822bbb1f816
DIST genpatches-3.2-16.base.tar.xz 410332 SHA256 d3ad97b119c5b8cfd8e34f1cf118dc7d5bbe61fe908a5627f8ab6365517d7190 SHA512 6c917efbdd26dada3e68241c4d55833968e8ee7044ea7fa2edeffdd4d7eb0edac157057abb75da09ac6d2b5368d228ecd1c2ac6006a9d45b91dbb264eae33625 WHIRLPOOL 155a5b3297ec53a6bdb76e20c8c89d4f4c35ed2bb47e20281ce305bf9edd413e4d89168e250a699ace0561c151ef2f484c05e59013dbd971d43184c5f072a71a
DIST genpatches-3.2-16.extras.tar.xz 16764 SHA256 c3f5adba6f1700c716354b91bc624115c6f5cae6f8fbdc51d07a76d4546bacaa SHA512 e3245c05f3385bb27852c00a39a898c91b3c0006e19c5db561f3e41f9bef7e97012ed29ddf9b0e2bd1ba1fa16590e516fb00ce754a84dd5c653c046b9f4e63f9 WHIRLPOOL 3c1ee6db88607ed91366067217d4a556fb5516ce8bee2859e97be7e214a05609e2d36ec27ec413154baa432a984f53cf69cfb94ae65ec4b8d2e9a86641d77a0b
-DIST genpatches-4.0-9.base.tar.xz 193344 SHA256 9d7c65367c1d2f24c6e4c8f8b4b9170a7ddeaa24d6563c5ba5dc41201a7b6e17 SHA512 646814e63b3b1d78adc172c6f8c0c2605cc9f368bb368be72e169049938617c5c6e738ddcfcbe1e10b58ccd3f9fa09984b03f70076ce0b15137f376594b9066a WHIRLPOOL 0eecbfe1b2b02f00edcab0c975b06bd69a5ff1032fe0c4249d79de555f92f2375d337b2417bddb566e9a1fc66859918b6cbfff6c2c73aea02818434213b0cda1
-DIST genpatches-4.1-10.base.tar.xz 210140 SHA256 d0ac2a9175fe72d0ddf23307a9c8d06102f48220886468e4c19c92855024d829 SHA512 fadf51efbda55e959cd4636e88c2a159ed967156acbe719b15056e9e56cf01652b0ac6b515203d4821853939fe8dc4dfb6e075e55530489d5a96e44e6dfe1be7 WHIRLPOOL e384c68de2b4a4e23934cdaba6f8d02942931ea721b1730bd6e99e02547c28f6219bb6a38425c5c04bd1ee13afbf091dcb9eedadc2aca2246e05e465c07cb974
DIST genpatches-4.1-11.base.tar.xz 233284 SHA256 4189cfd2c7d1a1d7f28c8a596ad36741ce087c7c4cfbe0d5d20a0ee889328d18 SHA512 e5944edf832070d6072ab8efc242165afcfb689874687196c96389c6176ca9772e72e82836aba40ad05840536acae6efd6e72890efd692d903018d47489a90f8 WHIRLPOOL 13cb400b330443025f77dee6c710ca9886991a7032fa3ff925d53ed4fc03d07ece5647dca65de1a149073362db1d7a0b374a21d980eafcae09a4b01584c64cb6
-DIST genpatches-4.1-9.base.tar.xz 177624 SHA256 ebb16ec588dfc98222f5a5298de76e693e9d24ac8905af4b1d022b13e3fb9734 SHA512 59de6e58d054ae5b9ed096d800b8ba8323f8595f505dcae235d88deb6dba5b063239c3d2f9e08092a0c70f14d029936066765b680c44286caa2ea4f10b640bae WHIRLPOOL 1dc51a7a931a0744f824fdab9a463de7cd08127da0bd3424900c2b61f6c78feec2ae83ae4ec9558ad5a74c21e3ddd6a7b7f69c0af3b5f183671e3570c681a0c7
-DIST hardened-patches-3.14.49-1.extras.tar.bz2 1092342 SHA256 e1509dac4ca2ec00cf2c7c3ccd67b6240c6e9324f1d2dcf948a4238c6d856c2d SHA512 5471118ee9742af0d00d0f5437ee183ccc413e2770a8137c3c9b49cde14c9f8746e641367543c9ce9259504fc25e9fe5f462332ab45232598b92cad7573daa15 WHIRLPOOL 1633fc9b9300d6dd8acbd0d5f5227477db63ac6138f92162f47eabc32c48a7b7c8352110c05efce47da19e51ad6e82d3c7f1d8c0157c1fa3eb4898c922ed640d
+DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f
DIST hardened-patches-3.14.51-1.extras.tar.bz2 1062069 SHA256 38f6ddc19d9c6e713786beaa044b70754187e798e3786e8283c4774d543deae1 SHA512 cefbd8c08305c94e3dea3aa45e54b5aa84a0f2b3f3430609f6051d3205404f5f16c6f224781dad14d3ad992f3f5fbe19a452c7d23f462f05432c044a811e1c7e WHIRLPOOL 3404a171473c11dbff323fc777850cb982c68bbb52a2fed593eac9687da77a7932f76d3193d3c34f5c873148dad1d6c025370600601236c627b9ee1ffe44fdb6
-DIST hardened-patches-3.2.69-14.extras.tar.bz2 2314416 SHA256 224d23d37d00fc0532d459f5460144797f8ddb58075cc8bb71fbbe2fe211e20c SHA512 a462e6c8710b1b1e91a29e24d74e6918f93379c1af42788cbc0151c9ef39fff35c7ac60af1a923cbcf96ad5c6a8ccd549210013fbd32f2d47cf38c84506bb7f6 WHIRLPOOL b58c2c83416a787fecf5399e176ffb2774092ce72a2d923ba180010c70beec122c46a4966c62c0e2ab6e341bd8163cbfe18d1a4995ce898609873aeec3ee9726
DIST hardened-patches-3.2.71-1.extras.tar.bz2 2369201 SHA256 3155d9f47b14a1970f3770d3978adfac67fc54bd178e8c02f101c0700a45baab SHA512 350e402b25297d53f25a5db4aafada3415a726d36df4eb11d700152c049f491e95cab48d88da23465628d9beee923edcbec7c1a12eb11103722aef98d8bd72f3 WHIRLPOOL 9fc84a2844471c23341f573f8cf1fef886bcfe2d11f9279e3a8f0bd529304a6865b7ce68d7b1869d7e0c68dccfaa85802088ec280acdbf37d68366a1057657ea
-DIST hardened-patches-4.0.8-1.extras.tar.bz2 1366743 SHA256 765a06197afb4b7f268778b5ba2a6ca438b20bf900ca97cbc17b47570cf1dd0e SHA512 782a7883e055173a1cf6be76e8d99a56757f5576c09fb80c295e6bc926d7dd8e6fbfc4fd09c38e0e95d4f0317808b68a9fbb0e9b59a9a3f27b89f906f375e619 WHIRLPOOL ea95c5d29801759d2ed247885095c914ee07c4b800cb9a2f5f1c4b7b79347d2853ae56f64ad732c6aa8972a43e8993fdcfabf5e244d5994fa7998a382faebfe7
-DIST hardened-patches-4.1.6-1.extras.tar.bz2 1459744 SHA256 2dd45dabeff383ca257922442b0ab6724d3e02e0f771bafc5656fff4a6f77782 SHA512 8d45a0a728880bc056d85fcd28baab5cbcb257514e6b8c6f3099267821fd8d1084599746afbc3f8460e16f1b17e6da3f3b899dc767de7b3f5946d41476ee5e0d WHIRLPOOL 38736710cb65b20d24297fb54a51d17ed264d57a35fc9136e1579dca7a06016879b37c9829f248f7b9e22600e34db49dc8a4ca1c094ab80316e23b63ccfc1ec6
-DIST hardened-patches-4.1.6-2.extras.tar.bz2 1457264 SHA256 16d0ded5de82a1b35ae8b33ea6d6177a0242b05abd9d05058987af11f59af126 SHA512 6822224760cc51adba54eb763a877ba9739b0b4d9a534dd308570a8ab8770649f30c8a81d05460a7855fc984f0a65a256bb94689e7f4e648dff0a0870e52327c WHIRLPOOL a1743f91eb0603056aeffa46feb85e5b108782ede77b6162c5046fbdc419a93aace7d17ee33e5d43388f3c48745a4f32c10186cc8b098c03744180ff79ba8bb3
-DIST hardened-patches-4.1.6-3.extras.tar.bz2 1420666 SHA256 d19a4878f6003bbc74dc549e1441db92260257513d18a45f90b59415ee95f3b7 SHA512 4dcaafc74a1a611a574b765ac6b476f43fb334dbad910e5f6775440c3f183f6c3da688476833860684a305a173e4cfd4bfa7d83a3caae3430438664460c865a7 WHIRLPOOL 5d44f46db5860da387d6ecec2cd10ed25803d96087bf80c08f1440e03bcf848452d49faee1c35fcd5c073f7b9d0b22db16ba816ded220ab1321628f1be7267ad
-DIST hardened-patches-4.1.7-1.extras.tar.bz2 1418849 SHA256 2789e35771f93db1bdcff11fb4754c6854c45d1ef7b5d7a1bfd03f5161f11a53 SHA512 d1c82400462ce02e4cbbbb99224edb29bd96e199936a4a9f0a650713d619f518c248f41a1104a2e0bc1e9a89e5778a355d7b8745e583d35759e47198edfb47f8 WHIRLPOOL d828b7fdd7429ff44b1fd613ed18a0cec2af01971d460bd2e4b9ce021768836e4184a542c7e5576e1762e9aadd4d405ebdabe0d09078bb2b100a46dd6be0be52
DIST hardened-patches-4.1.7-2.extras.tar.bz2 1419438 SHA256 c8c0fc29c39eafbcea107b8237087fd0e185297e2df9ffeaafc6b3a4736b7a45 SHA512 dac324e265174777d8b9c2369f57e52833b4228b3291e41952a9791ce41b9abf378e1d9a0521566c3a0e42de15a16afa5fe379985b7fee78b1b2b3b815d7cdd4 WHIRLPOOL 7638001f1b95e4af1d051b13648f486aa0eca524157e1a46dd2023fbd86313e0a5e8043653d7388b7286d42cc6e7c0f07cde2de3d5aee6cc058d12538a0980c1
+DIST hardened-patches-4.2.3-2.extras.tar.bz2 1458438 SHA256 1bcf0ff6d229f7a2cb652e03d3d0262dee8375ca4dc8de7133ccc553f8007929 SHA512 20ff44e95066d1c659503d49b2af6fc9e1617e37f8a2048cbea19b5cdc10e8222aba749255981f0d313814d5afce00aaabb616134947ecd49fda52759ccdca6d WHIRLPOOL 3c2cc9ec78dc2afdf88b3f2ded3f31f9de477be8ca344c0fd1723cb8f17b4636284e52144de32f37f433c7d36576733b3e8d82c28b5dfa597a4b430b81ed7c56
DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
-DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001
DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
+DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.14.49.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.49.ebuild
deleted file mode 100644
index 006e3b5..0000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.14.49.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="53"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="https://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
- 1500_XATTR_USER_PREFIX.patch
- 2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
- kernel-2_pkg_postinst
-
- local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
- ewarn
- ewarn "Users of grsecurity's RBAC system must ensure they are using"
- ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
- ewarn "It is strongly recommended that the following command is issued"
- ewarn "prior to booting a ${PF} kernel for the first time:"
- ewarn
- ewarn "emerge -na =${GRADM_COMPAT}"
- ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.69-r13.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.69-r13.ebuild
deleted file mode 100644
index 6202c2a..0000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.69-r13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-14"
-HGPV_URI="https://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
- kernel-2_pkg_postinst
-
- local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
- ewarn
- ewarn "Users of grsecurity's RBAC system must ensure they are using"
- ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
- ewarn "It is strongly recommended that the following command is issued"
- ewarn "prior to booting a ${PF} kernel for the first time:"
- ewarn
- ewarn "emerge -na =${GRADM_COMPAT}"
- ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.0.8.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.0.8.ebuild
deleted file mode 100644
index b883013..0000000
--- a/sys-kernel/hardened-sources/hardened-sources-4.0.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="9"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="https://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
- 1500_XATTR_USER_PREFIX.patch
- 2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
- kernel-2_pkg_postinst
-
- local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
- ewarn
- ewarn "Users of grsecurity's RBAC system must ensure they are using"
- ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
- ewarn "It is strongly recommended that the following command is issued"
- ewarn "prior to booting a ${PF} kernel for the first time:"
- ewarn
- ewarn "emerge -na =${GRADM_COMPAT}"
- ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.1.6-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.1.6-r1.ebuild
deleted file mode 100644
index 7ff4c74..0000000
--- a/sys-kernel/hardened-sources/hardened-sources-4.1.6-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="9"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
- 1500_XATTR_USER_PREFIX.patch
- 2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
- kernel-2_pkg_postinst
-
- local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
- ewarn
- ewarn "Users of grsecurity's RBAC system must ensure they are using"
- ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
- ewarn "It is strongly recommended that the following command is issued"
- ewarn "prior to booting a ${PF} kernel for the first time:"
- ewarn
- ewarn "emerge -na =${GRADM_COMPAT}"
- ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.1.6-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.1.6-r2.ebuild
deleted file mode 100644
index 80c60bb..0000000
--- a/sys-kernel/hardened-sources/hardened-sources-4.1.6-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="10"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
- 1500_XATTR_USER_PREFIX.patch
- 2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
- kernel-2_pkg_postinst
-
- local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
- ewarn
- ewarn "Users of grsecurity's RBAC system must ensure they are using"
- ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
- ewarn "It is strongly recommended that the following command is issued"
- ewarn "prior to booting a ${PF} kernel for the first time:"
- ewarn
- ewarn "emerge -na =${GRADM_COMPAT}"
- ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.1.6.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.1.6.ebuild
deleted file mode 100644
index b883013..0000000
--- a/sys-kernel/hardened-sources/hardened-sources-4.1.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="9"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="https://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
- 1500_XATTR_USER_PREFIX.patch
- 2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
- kernel-2_pkg_postinst
-
- local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
- ewarn
- ewarn "Users of grsecurity's RBAC system must ensure they are using"
- ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
- ewarn "It is strongly recommended that the following command is issued"
- ewarn "prior to booting a ${PF} kernel for the first time:"
- ewarn
- ewarn "emerge -na =${GRADM_COMPAT}"
- ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.1.7-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.1.7-r1.ebuild
index 9175aa0..fae1b43 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.1.7-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.1.7-r1.ebuild
@@ -25,7 +25,7 @@
HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
IUSE="deblob"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND=">=sys-devel/gcc-4.5"
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.1.7.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.1.7.ebuild
deleted file mode 100644
index cb51e76..0000000
--- a/sys-kernel/hardened-sources/hardened-sources-4.1.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="11"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
- 1500_XATTR_USER_PREFIX.patch
- 2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
- kernel-2_pkg_postinst
-
- local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
- ewarn
- ewarn "Users of grsecurity's RBAC system must ensure they are using"
- ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
- ewarn "It is strongly recommended that the following command is issued"
- ewarn "prior to booting a ${PF} kernel for the first time:"
- ewarn
- ewarn "emerge -na =${GRADM_COMPAT}"
- ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.2.3-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.2.3-r1.ebuild
new file mode 100644
index 0000000..aa0e2a0
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-4.2.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="6"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+ 1500_XATTR_USER_PREFIX.patch
+ 2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+
+ local GRADM_COMPAT="sys-apps/gradm-3.1*"
+
+ ewarn
+ ewarn "Users of grsecurity's RBAC system must ensure they are using"
+ ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+ ewarn "It is strongly recommended that the following command is issued"
+ ewarn "prior to booting a ${PF} kernel for the first time:"
+ ewarn
+ ewarn "emerge -na =${GRADM_COMPAT}"
+ ewarn
+}
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index 25aca6c..b86203d 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -1,4 +1,4 @@
DIST linux-2.6.32.tar.xz 52620720 SHA256 723106c298c5ba8733bb51ecc106b05e332a18490edc5f61cc6e57dbb36dcc46 SHA512 f8570daf2806eb191fce54cc7358577b0571bb295a75bd86db630d6136b328ae48e4732554b2d1886c64b0a0018bf0b9105dcface978a5005d1b77789aa40312 WHIRLPOOL bfcb4b186f7c4b60e69674a85d20a8e92b5efd05941b550401ef446cc6b20c9ed197f920d1cd9250c0e518c05308b9225f7ababe41cdfc83570412117b2ee555
DIST patch-042stab108.5-combined.gz 52741774 SHA256 9909c8565b17fdd5f0f6694ea1e5cfb16bba7008cd57171297dd9136fc18ea19 SHA512 ff48ccd0bb83f6ba2810dbdbb13b66b710882384d16e441ac8a8447dc1a6d2171b84a4e494fde32b5b95de73a652f74e4a8b698ccd6716e402c64b983faa593a WHIRLPOOL da80e16b2c9cc803aaa5c46175adb81f81d7b688b4360f4002ad1513217f40103465948e99417e25e046bb4b8feb725b5d53f165981f6a213997d5f40dfd3274
DIST patch-042stab108.8-combined.gz 52745522 SHA256 3a08fe55caf39a012e00f434bbcc2fa590728186eeac4843d2937d1cd983c6a0 SHA512 dc2b8e11084d3f11fb8b9f37f1a0d444881558982c1d9d4d7716c8bbe1ca5f594d2be0954ad57d8413075e431020b87eef2d11e9783f4dc22276b9ac892368c5 WHIRLPOOL 540a101279087c9cb992803188371e2082fe3d107b8c106a2dcd82bbc3c8895388c3fb15788e71d3b3438c0830da1c7f923a547fdcabf2b867aff4ecaa83bfe7
-DIST patch-042stab111.11-combined.gz 52812759 SHA256 8b7a6218e76f5a359b853e53ecf1833d5402e100545faa2bc62299009fb6a7a5 SHA512 104ed00e89cafc7b41d9f56e0eec28b156e3e101168f4bd63f10eb860d88e164bcc20bbbb5766e19f0313003f4d98eeae32c34deeb9a08372a351e4c5578e3e0 WHIRLPOOL 026bdbdbd5e7c504f3263f798f3c49482870ed9d716f793357ce7f619321971a30c5b0013fff2efde4bb85ff02e809ea8df16b986b776f625f02bc57a90344c4
+DIST patch-042stab111.12-combined.gz 52812755 SHA256 d427fb467f6ee2eb895c6ec54f3c7ef674a525e5e68f2c850763bb5e7916710c SHA512 6cf071a8d7fe405e9a4907b2c8577c663cca3f799d3a4c03d79aea1ceec264abe336bf21e8f115a2ee13f4ba1b11abc1157cf231dcf55c4c89689985a07a86bf WHIRLPOOL d1d2b435ca53377adfe0dc85b040415928ce93cde33bc628fa0683824d8090238f8cb682fcac12b1f834edc3220a07486ddb9c63a0c8f3e9061829a49111b10e
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.32.111.11.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.32.111.12.ebuild
similarity index 100%
rename from sys-kernel/openvz-sources/openvz-sources-2.6.32.111.11.ebuild
rename to sys-kernel/openvz-sources/openvz-sources-2.6.32.111.12.ebuild
diff --git a/sys-kernel/pf-sources/files/2100_proc-mem-handling-fix.patch b/sys-kernel/pf-sources/files/2100_proc-mem-handling-fix.patch
index ef86a3b..c32934d 100644
--- a/sys-kernel/pf-sources/files/2100_proc-mem-handling-fix.patch
+++ b/sys-kernel/pf-sources/files/2100_proc-mem-handling-fix.patch
@@ -10,7 +10,7 @@
commit e268337dfe26dfc7efd422a804dbb27977a3cccc upstream.
-Jüri Aedla reported that the /proc/<pid>/mem handling really isn't very
+Jüri Aedla reported that the /proc/<pid>/mem handling really isn't very
robust, and it also doesn't match the permission checking of any of the
other related files.
@@ -29,7 +29,7 @@
actually usefully access the fd across a VM change simply because all
the offsets for IO would have changed too.
-Reported-by: Jüri Aedla <asd@ut.ee>
+Reported-by: Jüri Aedla <asd@ut.ee>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/sys-kernel/spl/spl-0.6.2-r1.ebuild b/sys-kernel/spl/spl-0.6.2-r1.ebuild
deleted file mode 100644
index 68021bc..0000000
--- a/sys-kernel/spl/spl-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-2
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz
- https://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p0.tar.xz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="test"
-
-COMMON_DEPEND="dev-lang/perl
- virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
- !sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
- linux-info_pkg_setup
- CONFIG_CHECK="
- !DEBUG_LOCK_ALLOC
- !GRKERNSEC_HIDESYM
- MODULES
- KALLSYMS
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
- [ ${PV} != "9999" ] && \
- { kernel_is le 3 11 || die "Linux 3.11 is the latest supported version."; }
-
- check_extra_config
-}
-
-src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
- if [ ${PV} != "9999" ]
- then
- # Apply patch set
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
- fi
-
- # splat is unnecessary unless we are debugging
- use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- filter-ldflags -Wl,*
-
- set_arch_to_kernel
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=all
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- $(use_enable debug)
- $(use_enable debug-log)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- dodoc AUTHORS DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # Remove old modules
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
- then
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
- ewarn "Automatically removing old modules to avoid problems."
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
- fi
-}
diff --git a/sys-kernel/spl/spl-0.6.2-r2.ebuild b/sys-kernel/spl/spl-0.6.2-r2.ebuild
deleted file mode 100644
index 0482412..0000000
--- a/sys-kernel/spl/spl-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-2
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz
- https://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p1.tar.xz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="test"
-
-COMMON_DEPEND="dev-lang/perl
- virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
- !sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
- linux-info_pkg_setup
- CONFIG_CHECK="
- !DEBUG_LOCK_ALLOC
- !GRKERNSEC_HIDESYM
- MODULES
- KALLSYMS
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
- [ ${PV} != "9999" ] && \
- { kernel_is le 3 12 || die "Linux 3.12 is the latest supported version."; }
-
- check_extra_config
-}
-
-src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
- if [ ${PV} != "9999" ]
- then
- # Apply patch set
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
- fi
-
- # splat is unnecessary unless we are debugging
- use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- filter-ldflags -Wl,*
-
- set_arch_to_kernel
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=all
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- $(use_enable debug)
- $(use_enable debug-log)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- dodoc AUTHORS DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # Remove old modules
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
- then
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
- ewarn "Automatically removing old modules to avoid problems."
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
- fi
-}
diff --git a/sys-kernel/spl/spl-0.6.2-r3.ebuild b/sys-kernel/spl/spl-0.6.2-r3.ebuild
deleted file mode 100644
index 8f22ebc..0000000
--- a/sys-kernel/spl/spl-0.6.2-r3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-2
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz
- https://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p2.tar.xz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="test"
-
-COMMON_DEPEND="dev-lang/perl
- virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
- !sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
- linux-info_pkg_setup
- CONFIG_CHECK="
- !DEBUG_LOCK_ALLOC
- !GRKERNSEC_HIDESYM
- MODULES
- KALLSYMS
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
- [ ${PV} != "9999" ] && \
- { kernel_is le 3 13 || die "Linux 3.13 is the latest supported version."; }
-
- check_extra_config
-}
-
-src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
- if [ ${PV} != "9999" ]
- then
- # Apply patch set
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
- fi
-
- # splat is unnecessary unless we are debugging
- use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- filter-ldflags -Wl,*
-
- set_arch_to_kernel
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=all
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- $(use_enable debug)
- $(use_enable debug-log)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- dodoc AUTHORS DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # Remove old modules
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
- then
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
- ewarn "Automatically removing old modules to avoid problems."
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
- fi
-}
diff --git a/sys-kernel/spl/spl-0.6.2-r4.ebuild b/sys-kernel/spl/spl-0.6.2-r4.ebuild
deleted file mode 100644
index da76bd8..0000000
--- a/sys-kernel/spl/spl-0.6.2-r4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-2
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz
- https://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p3.tar.xz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="test"
-
-COMMON_DEPEND="dev-lang/perl
- virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
- !sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
- linux-info_pkg_setup
- CONFIG_CHECK="
- !DEBUG_LOCK_ALLOC
- !GRKERNSEC_HIDESYM
- MODULES
- KALLSYMS
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
- [ ${PV} != "9999" ] && \
- { kernel_is le 3 14 || die "Linux 3.14 is the latest supported version."; }
-
- check_extra_config
-}
-
-src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
- if [ ${PV} != "9999" ]
- then
- # Apply patch set
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
- fi
-
- # splat is unnecessary unless we are debugging
- use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- filter-ldflags -Wl,*
-
- set_arch_to_kernel
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=all
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- $(use_enable debug)
- $(use_enable debug-log)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- dodoc AUTHORS DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # Remove old modules
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
- then
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
- ewarn "Automatically removing old modules to avoid problems."
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
- fi
-}
diff --git a/sys-kernel/spl/spl-0.6.2.ebuild b/sys-kernel/spl/spl-0.6.2.ebuild
deleted file mode 100644
index d85a170..0000000
--- a/sys-kernel/spl/spl-0.6.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-2
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="test"
-
-COMMON_DEPEND="dev-lang/perl
- virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
- !sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
- linux-info_pkg_setup
- CONFIG_CHECK="
- !DEBUG_LOCK_ALLOC
- !GRKERNSEC_HIDESYM
- MODULES
- KALLSYMS
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
- [ ${PV} != "9999" ] && \
- { kernel_is le 3 11 || die "Linux 3.11 is the latest supported version."; }
-
- check_extra_config
-}
-
-src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
- if [ ${PV} != "9999" ]
- then
- # Be more like FreeBSD and Illumos when handling hostids
- epatch "${FILESDIR}/${PN}-0.6.0_rc14-simplify-hostid-logic.patch"
- fi
-
- # splat is unnecessary unless we are debugging
- use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- filter-ldflags -Wl,*
-
- set_arch_to_kernel
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=all
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- $(use_enable debug)
- $(use_enable debug-log)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- dodoc AUTHORS DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # Remove old modules
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
- then
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
- ewarn "Automatically removing old modules to avoid problems."
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
- fi
-}
diff --git a/sys-kernel/spl/spl-0.6.3.ebuild b/sys-kernel/spl/spl-0.6.3.ebuild
deleted file mode 100644
index 03171e0..0000000
--- a/sys-kernel/spl/spl-0.6.3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-2
- EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
- virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
- !sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
- linux-info_pkg_setup
- CONFIG_CHECK="
- !DEBUG_LOCK_ALLOC
- !GRKERNSEC_HIDESYM
- MODULES
- KALLSYMS
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- !PAX_SIZE_OVERFLOW
- !PAX_RANDKSTACK
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- use debug && CONFIG_CHECK="${CONFIG_CHECK}
- FRAME_POINTER
- DEBUG_INFO
- !DEBUG_INFO_REDUCED
- "
-
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
- [ ${PV} != "9999" ] && \
- { kernel_is le 3 16 || die "Linux 3.16 is the latest supported version."; }
-
- check_extra_config
-}
-
-src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
- die "Cannot patch check.sh"
-
- # splat is unnecessary unless we are debugging
- use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
-
- # Set module revision number
- [ ${PV} != "9999" ] && \
- { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- filter-ldflags -Wl,*
-
- set_arch_to_kernel
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=all
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- $(use_enable debug)
- $(use_enable debug-log)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
- dodoc AUTHORS DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # Remove old modules
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
- then
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
- ewarn "Automatically removing old modules to avoid problems."
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
- fi
-}
diff --git a/sys-kernel/spl/spl-0.6.4.ebuild b/sys-kernel/spl/spl-0.6.4.ebuild
deleted file mode 100644
index f1fb322..0000000
--- a/sys-kernel/spl/spl-0.6.4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-2
- EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz"
- S="${WORKDIR}/${PN}-${P}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
- virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
- !sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
- linux-info_pkg_setup
- CONFIG_CHECK="
- !DEBUG_LOCK_ALLOC
- !GRKERNSEC_HIDESYM
- MODULES
- KALLSYMS
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- !PAX_SIZE_OVERFLOW
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- use debug && CONFIG_CHECK="${CONFIG_CHECK}
- FRAME_POINTER
- DEBUG_INFO
- !DEBUG_INFO_REDUCED
- "
-
- kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
-
- [ ${PV} != "9999" ] && \
- { kernel_is le 4 20 || die "Linux 4.0 is the latest supported version."; }
-
- check_extra_config
-}
-
-src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
- die "Cannot patch check.sh"
-
- # splat is unnecessary unless we are debugging
- use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
-
- # Set module revision number
- [ ${PV} != "9999" ] && \
- { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- filter-ldflags -Wl,*
-
- set_arch_to_kernel
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=all
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- $(use_enable debug)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
- dodoc AUTHORS DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # Remove old modules
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
- then
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
- ewarn "Automatically removing old modules to avoid problems."
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
- fi
-}
diff --git a/sys-kernel/spl/spl-0.6.5.ebuild b/sys-kernel/spl/spl-0.6.5.ebuild
deleted file mode 100644
index f9edbd8..0000000
--- a/sys-kernel/spl/spl-0.6.5.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-2
- EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz"
- S="${WORKDIR}/${PN}-${P}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
- virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
- !sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
- linux-info_pkg_setup
- CONFIG_CHECK="
- !DEBUG_LOCK_ALLOC
- !GRKERNSEC_HIDESYM
- MODULES
- KALLSYMS
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- !PAX_SIZE_OVERFLOW
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- use debug && CONFIG_CHECK="${CONFIG_CHECK}
- FRAME_POINTER
- DEBUG_INFO
- !DEBUG_INFO_REDUCED
- "
-
- kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
-
- [ ${PV} != "9999" ] && \
- { kernel_is le 4 2 || die "Linux 4.2 is the latest supported version."; }
-
- check_extra_config
-}
-
-src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
- die "Cannot patch check.sh"
-
- # splat is unnecessary unless we are debugging
- use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
-
- # Set module revision number
- [ ${PV} != "9999" ] && \
- { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- filter-ldflags -Wl,*
-
- set_arch_to_kernel
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=all
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- $(use_enable debug)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
- dodoc AUTHORS DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # Remove old modules
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
- then
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
- ewarn "Automatically removing old modules to avoid problems."
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
- fi
-}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index b26c3a6..7d92969 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -17,9 +17,9 @@
DIST patch-3.10.90.xz 1183364 SHA256 dbc5e7fab6d1d0cd44eacd7a69c1802f29a4863f47959c3bdc4b56b9e79b7dbe SHA512 65ef2f586493117830b76cb8f767ec022e1f9fba3479ea246ee1638a87c28545ecf8f3517da65d9f72120555a360ffd80ddf3c10157686f2400a4bf5bb93b7a6 WHIRLPOOL 01736fc9c917057918964582f6ec0bef09bf0fd8c5e520ccd372e5a178e296a3190d9f7d3e33c96457d9044ee8c90808413712c563e108d6271f1ef079d431a5
DIST patch-3.12.48.xz 1342140 SHA256 5a4707787f301a54e636f6f230dea1076adc04272b9a4e5fa77094d84c3ea053 SHA512 00c270064df94ab1c5661f27647e2302b3dcb7ed866bbb3053f77063a8282c9e8f58664384f4f58f37860f5b12411cda1f7a67cd39bb4384e465cd1401d48d8b WHIRLPOOL 440c3ec8e5b713bca86bb26bdfd6eea27bca1aafda659dd7905b49532463b0f4d35675a629ab8e74c26971c72a2f6d91effbf9073eaa8fcd629513078c1d9fd1
DIST patch-3.14.54.xz 1006852 SHA256 cd9463f0b8d561b9fac22f6528fa20e9dd0f03ba1fa80752d6ea74feb59e1b5c SHA512 36874d66d0a028f0c9ce8eeefdba9a9c0a09286a49a83001743505af1a9fcf21429b3dfb5a5b66ddfc98dfe6d27b780e8ddbfaa0580bd7bb7683f08cb9f95521 WHIRLPOOL 1dab7e6017a26d7819ba0718ffff394d8946b328132d13ebfa32206f1a1d32eee3e9e67823d588b140b5abb9bab1dbb5d70ab77dd1f73e9c45614b3c8d27ba87
-DIST patch-3.18.21.xz 605060 SHA256 fef6b8507c4a88b5b579016773faf1f4b1c78b2cc627e31101f244eeb1cf1895 SHA512 b82d6f79d59c9d949a149a351ba2c77d334df83d66491a7776d909badff800ed2431ec6216adc7df3c2315886088a659450bc8e1a8d141d2e173a8a4e2492c8d WHIRLPOOL 1ca1e8b9c31ec273e6b8465eba857a537ec0f0c3c8246a232449632fc819a8e19c3d991cf3c96b093be683c4784abdf9a02cef24e35b064fbe18518e84134bf7
+DIST patch-3.18.22.xz 622064 SHA256 370993a59dc24aff4e7428b9c701aaf7fc9ea05fc5f1dd55f2dc93464a7a982c SHA512 281ae98feed012f43fc5b125c6d695ca59fc2f0472e757cfc1cbba3254c456c3312b468e7cf419e35ba9086f3be81feb54577b5ac56a3438bc6374f2c73e8be3 WHIRLPOOL 0df342c9af62eb0a96028bc734e8323d061af3aa4d79a8b004b4b002cb7f950fcd16097f1631faf53887c6fba9ee69387be7f02f7dd3bf7a180fac3df9015c85
DIST patch-3.2.71.xz 1456808 SHA256 24160af70c29320d74429717d5dfa3cd3547586f558890533a28dc19bc7caa0c SHA512 e953df5d59270abeb4c72fc3a2a660cade1a8b5768d5dd00c11f5b3580c65e8c8ccfb814b5bf591900c35e72c1b3aee91819d1c9ddf9aab0dce44b45750f9578 WHIRLPOOL 8377da2ff6427888db1eb670f677f6bc71f4db46244ced8a2f849b0250cd9deb8d183556987c892f88011b7c5645838048c11e214c7e2026e7f12efad31ad8b4
DIST patch-3.4.109.xz 1280036 SHA256 607e19a90fa320b3336c6d6002c84820724a3c1f9e2fdf6ab63f46fcd2ff26b3 SHA512 80ac925c6277a25c8fbb9feae24b075f2734b1e3e7bafb195def81ae0c2daaeb79ff2f4331a60013cb4adce5b1a3852be55b7cb5d10c4034149239788dd55ab8 WHIRLPOOL bda61064a40079a2313b6063ab8b10e921da1295981506458062f9c3f5084acd0effaf50135ae343a97351d236139b43c70059c0aafd1059ffd07fc0cacc6781
DIST patch-4.1.8.xz 256048 SHA256 4373af2baaae5429be37e5257a22454d468f36b1322f784bb91a608c80ed52a1 SHA512 1ba853bd1a4da73563e1f9c3bc01436274d63b77a577d6789843c7e5236158d204f333275c5a95be52c4ae1e26f6b813e58ae5fbdaee6b1cc53942273c8fbaf1 WHIRLPOOL 2d3dcd938c5758afb020c83cf3a1b08acbb321a2be2e3ef6bf47de3f09944e0551d337f53d8ccff1b98e38296dbbd04e274a7eb86aa1a21ecc4a5d094a1c9913
-DIST patch-4.1.9.xz 298752 SHA256 9912a9ce6aa47d96c526214349daf439d05c59015270dc64e19b065b309be107 SHA512 79ecd1c4c00fd52b89795f89d07c520c585733f1641a59045de44dea6a913c94de6b9f33fd8f7a146b68c57ade4107dedc2f8790d4bcec96a0f89812dc7f90fa WHIRLPOOL afb0f488aa9b67d48de5925bcb9fbc5e8c09dc274ec3be5401d39921da5ef80382072079e316d14909c70a3b2359006be9fe9ad1142116c1111c0d9a9a06c538
DIST patch-4.2.2.xz 82480 SHA256 8b4578f1e1dcfbef1e39c39b861d4715aa99917af0b7c2dc324622d65884dcb5 SHA512 b37c71cb46cdbf3b7d2dac84ebf3e09d4e5e2433b150078e0e40ea881296401954b359d7bba6e9358957260cb0ccabafc0579feaef19c949d02ac9cfb48a3002 WHIRLPOOL 011d18a6099c75e0eb6de3d863089704ca811dfefafa0d92864dc8702566cd0776d2491fa2c3f17c50e76eb9e394d1ff4926b07e1f534af513293092c4e65c4d
+DIST patch-4.2.3.xz 94380 SHA256 e0e066f3fc5f310644e9f3f3ede47db7ac040f44782f0a5cf75ce2c940444972 SHA512 08ea0f7da5892ab564310562d511c631a41a06681a0bc602176cdae0827c762bc33804970f66185f4ba27af6eaaf9f0297d5e81fdb0c7705fd8c2df4539d0186 WHIRLPOOL cbbbcd9fa1b06e7ec1eb06e87f2da4736aaa40821ebd62d8e5284c989c432053b40ed58c7b07e88e3fa58bbd398446613a8f11dc9562394c3b3eefb09b6fe5d5
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.18.21.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.18.22.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.18.21.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.18.22.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.1.9.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.1.9.ebuild
deleted file mode 100644
index aba0a80..0000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.1.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="0"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.2.3.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.2.3.ebuild
new file mode 100644
index 0000000..d49630d
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.2.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="0"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index 965c81d..a3cb255 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -1,3 +1 @@
-DIST efivar-0.15.tar.bz2 26936 SHA256 08251e10dbee8a5a9851d859b98fc6cb479acfced38695a101bd8ed2a447051e SHA512 f6fbc71fa892366933f11f230f662ff7af515bcee3d4eb0279a3aeb6aa5bf21d86f86db928ff3cb4ed3366f52bd3fb8b959752759277ed4bf368a5fc223d62e9 WHIRLPOOL 8fd6a689b14aed7d8a9ed7d17fe4206416d5bb72d04843dab7de22c513cc0ad639daa8dad0de4c87e60164092d3c31c8d25973be03e20add99018c9a122bb9be
-DIST efivar-0.20.tar.bz2 66165 SHA256 cf699c1406c6d012ab0665f653b2f1a14d99edd8e2bf06f5ac2caa1b10e030a9 SHA512 c50de9cb8bad49eeaf00721c1bcea060a5c3486574bbba891a51eaff81bd12e764bf42b56c94c8b483359e082365848198a88d67b7c82df4c39c09fb47ce7474 WHIRLPOOL af760446f24832702f6b6d65dd6bbb9ccfede45680aac7bd9700619522bb5e774b1d24386aa74a879cd4cf6fdfa7362bb19b390aa519b3b9e8fc651b5af20951
DIST efivar-0.21.tar.bz2 66677 SHA256 04b9b9de9d9a1a013395400438a033daf4a4290f497ec5be04a120e2ac535094 SHA512 851b5e29c2dab213bb81c6ea5c5c211d36fb6846de8aa1086b0657f06917c2f93bf154aa3a4c2dda22103bdf1d67ca877f9771dc3f979c9311ca24e0bc09492a WHIRLPOOL d6cdb2e2f047a22677d046581490ee4e64a2ac0631be8e41bf6250241b2554f62ddf81226fa3970ee80ebb9ec62665ca21f4fec94cc5ebe05414b0c674ad38dd
diff --git a/sys-libs/efivar/efivar-0.15.ebuild b/sys-libs/efivar/efivar-0.15.ebuild
deleted file mode 100644
index 77e7c4c..0000000
--- a/sys-libs/efivar/efivar-0.15.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Tools and library to manipulate EFI variables"
-HOMEPAGE="https://github.com/rhinstaller/efivar"
-SRC_URI="https://github.com/rhinstaller/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- tc-export CC
- export libdir="/usr/$(get_libdir)"
-}
diff --git a/sys-libs/efivar/efivar-0.20.ebuild b/sys-libs/efivar/efivar-0.20.ebuild
deleted file mode 100644
index 5a1e5d2..0000000
--- a/sys-libs/efivar/efivar-0.20.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Tools and library to manipulate EFI variables"
-HOMEPAGE="https://github.com/rhinstaller/efivar"
-SRC_URI="https://github.com/rhinstaller/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- tc-export CC
- export libdir="/usr/$(get_libdir)"
-}
diff --git a/sys-libs/efivar/efivar-0.21.ebuild b/sys-libs/efivar/efivar-0.21.ebuild
index 315212d..29fb870 100644
--- a/sys-libs/efivar/efivar-0.21.ebuild
+++ b/sys-libs/efivar/efivar-0.21.ebuild
@@ -24,4 +24,5 @@
src_configure() {
tc-export CC
export libdir="/usr/$(get_libdir)"
+ unset LIBS # Bug 562004
}
diff --git a/sys-libs/glibc/glibc-2.20-r2.ebuild b/sys-libs/glibc/glibc-2.20-r2.ebuild
index aba23a7..8280980 100644
--- a/sys-libs/glibc/glibc-2.20-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.20-r2.ebuild
@@ -10,7 +10,7 @@
HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="alpha amd64 arm arm64 -hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 -hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
RESTRICT="strip" # strip ourself #46186
EMULTILIB_PKG="true"
diff --git a/sys-libs/glibc/glibc-2.22.ebuild b/sys-libs/glibc/glibc-2.22.ebuild
index a706597..baa1223 100644
--- a/sys-libs/glibc/glibc-2.22.ebuild
+++ b/sys-libs/glibc/glibc-2.22.ebuild
@@ -155,15 +155,20 @@
eblit-src_unpack-pre() {
[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
+ # Bug 558636 we don't applY the pie works around for 2.22. It shoud have the support.
+ GLIBC_PATCH_EXCLUDE+=" 00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch"
+ GLIBC_PATCH_EXCLUDE+=" 00_all_0009-arm-fix-PIC-vs-SHARED-typos.patch"
+ GLIBC_PATCH_EXCLUDE+=" 00_all_0012-disable-PIE-when-checking-for-PIC-default.patch"
}
eblit-src_prepare-post() {
cd "${S}"
if use hardened ; then
- einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
- gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
- epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
+ # Bug 558636 we don't applY the pie works around for 2.22. It shoud have the support.
+ # einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
+ # gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
+ # epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
# We don't enable these for non-hardened as the output is very terse --
# it only states that a crash happened. The default upstream behavior
diff --git a/sys-libs/libselinux/libselinux-2.4.ebuild b/sys-libs/libselinux/libselinux-2.4.ebuild
index 02d7690..642336e 100644
--- a/sys-libs/libselinux/libselinux-2.4.ebuild
+++ b/sys-libs/libselinux/libselinux-2.4.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
USE_RUBY="ruby19 ruby20"
# No, I am not calling ruby-ng
@@ -78,7 +78,7 @@
building() {
einfo "Calling rubywrap for ${1}"
# Clean up .lo file to force rebuild
- test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo
+ rm -f src/selinuxswig_ruby_wrap.lo || die
emake \
CC="$(tc-getCC)" \
RUBY=${1} \
@@ -125,18 +125,18 @@
done
fi
- use static-libs || rm "${D}"/usr/lib*/*.a
+ use static-libs || rm "${D}"/usr/lib*/*.a || die
}
pkg_postinst() {
# Fix bug 473502
for POLTYPE in ${POLICY_TYPES};
do
- mkdir -p /etc/selinux/${POLTYPE}/contexts/files
- touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local
+ mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
+ touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
# Fix bug 516608
for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
- sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE};
+ sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} || die "Failed to recompile contexts"
done
done
}
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index d78ace2..1f1d1d2 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
USE_RUBY="ruby19 ruby20"
# No, I am not calling ruby-ng
@@ -88,7 +88,7 @@
building() {
einfo "Calling rubywrap for ${1}"
# Clean up .lo file to force rebuild
- test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo
+ rm -f src/selinuxswig_ruby_wrap.lo || die
emake \
CC="$(tc-getCC)" \
RUBY=${1} \
@@ -135,18 +135,18 @@
done
fi
- use static-libs || rm "${D}"/usr/lib*/*.a
+ use static-libs || rm "${D}"/usr/lib*/*.a || die
}
pkg_postinst() {
# Fix bug 473502
for POLTYPE in ${POLICY_TYPES};
do
- mkdir -p /etc/selinux/${POLTYPE}/contexts/files
- touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local
+ mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
+ touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
# Fix bug 516608
for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
- sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE};
+ sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} || die "Failed to recompile contexts"
done
done
}
diff --git a/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild b/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild
index 5e14e7d..b949d14 100644
--- a/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild
@@ -18,7 +18,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="python"
RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
diff --git a/sys-libs/pam/metadata.xml b/sys-libs/pam/metadata.xml
index 4ee5aec..f69d9e3 100644
--- a/sys-libs/pam/metadata.xml
+++ b/sys-libs/pam/metadata.xml
@@ -6,8 +6,6 @@
<email>pam-bugs@gentoo.org</email>
</maintainer>
<use>
- <flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
-
<flag name="berkdb">
Build the pam_userdb module, that allows to authenticate users
against a Berkeley DB file. Please note that enabling this USE
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 61338b4..0221b9c 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,12 +1,6 @@
-DIST tzcode2015a.tar.gz 182993 SHA256 885bab11f286852f34030d7a86ede7d4126319ca74b8ee22be8ca7c17d72dd19 SHA512 80d3bd3aeb70e21552a599c6203670fe742ca8d270c3fc430a3045d8e8a6610ebfe74941532c0791d5a99d6e4bf5fbdf62918de57d377d3fd26e7f7f786c66a4 WHIRLPOOL de4d9ea9611cc47e71f6e64fc4b0f6c45e5b3c995268d6244ed58fdc9b5e6d896c0e3ce1299e04ae018681523dc1e57f2dfcd0fb7f03423a93282123eb8a0376
-DIST tzcode2015b.tar.gz 183630 SHA256 e668f1235b998c90e43ecc93c8535728c65bb01d6bb93d22467e04b5ffa35d76 SHA512 d9b56c8ec98d9158d10cf80df0181864c467a4387b8ced5701f466c40885ea524bc1d49b0e17c0a18d8006a423da1c1b9a7e74626c4a916dd37cbb85e04b2b0a WHIRLPOOL 9e57737318d00470a6315cda75ed0cc3b4bb7f57de4c60b0d3b527be12164ec7c390f285dde23102c764e2ff6b9473d2e4762642f7a3e716e746bcacb931eaad
-DIST tzcode2015c.tar.gz 184278 SHA256 7feeb1a60dff8b179c884f6e3aa7684606f4eaeb7f7ecc61a6bb81e3e38af42e SHA512 01f57e27c1031434e7da8876f30084dfef9dbe36988539c857f71f86c0ab1995f82c9fe5dad32ded12185c53433b7f1a0553d8848a2d97529981021ffd70dfb1 WHIRLPOOL b2dff9985ad6845ad368a35e471890e99c69f03cf6d92da9d0da362af1d0545e30485a7be1ca159444d49c148c2f1588b8fa3fd1161859cfa566365fb45ba341
-DIST tzcode2015d.tar.gz 184178 SHA256 221af54ec5c42eaf0101159ffe1256a883d1c14c46228d42774c656a56317128 SHA512 2cb4faced839d02e6313a7aacca4d2dfe6454186d9864ee4aa034f7280442e6a751cec2285bde2d5712962b733e107a46f2282469f6510b42d93972d6c34424a WHIRLPOOL d5760e6530f65a4aac86258cbec62b27c86952d0f5896fbc1f567af6aef025e453f455ba94805069706981ecd4806a22e09581dd38cfba18f892343eb2038e3d
DIST tzcode2015e.tar.gz 185129 SHA256 b5a217b55847fb56f470a7738939c36f3a520d6cc12342d965cfcf848e59ada0 SHA512 fdc568a68f4876b967b39e21fa53f063dc5756e886e2a273cc046d5a014eb517e9c91eb6e03d18c94a89ce48578868aed710790415c500188fce4e4add0ce7ca WHIRLPOOL d3fde26e0b0ebe98d7de0c2a666a79dd6020e471b647de2b61a89dc1eeba61e8928c7dcb2e1b15d867e8e81b5e33321a288a2b94e713deaf5579e00b6082e7b8
DIST tzcode2015f.tar.gz 180742 SHA256 0c95e0a42bb61141f790f4f5f204b954d7654c894aa54a594a215d6f38de84ae SHA512 5cfbebde8a0be57e8388a7b6d35aeba99130a72c1a41f9bbd5d5864511a473aa5e9320ab21055b4383e64b3b9d7682c0d30377ce8407619987be672436014710 WHIRLPOOL c657f8d6a77cd96f6fed296bc905fd5690abe47f7cf25d99ea6802d61cee619c75e70ea006a77a0680d4c46ea43f8fb509bbb32b7ecc0323996e44b462e17845
-DIST tzdata2015a.tar.gz 292131 SHA256 c52490917d00a8e7fc9b5f0b1b65ef6ec76d612b5b20c81bf86a04147af18e4c SHA512 ff36feb437238ba42fe67257e81ade0a2179d11f6c6449146e28e4b6553c62348b4131af75e440b4467109c9edba13e25ddaf701f2fcebb2a258b4ac9b57293c WHIRLPOOL 22d42c60e87948c691255282aea9e4c9d69b46db8c19ef1c06a262b5e6054e45fec39c5fa8d1dc24ad121ed70bd3dfa24ea61fe97961938b733262238d74b5bb
-DIST tzdata2015b.tar.gz 293482 SHA256 556ac1a5b3a371adc1ad4e77138f78ddd7f8ddd7bc2b52545924598c7dc8ad62 SHA512 767782b87e62a8f7a4dbcae595d16a54197c9e04ca974d7016d11f90ebaf2537b804d111f204af9052c68d4670afe0af0af9e5b150867a357fc199bb541368d0 WHIRLPOOL e6d7bd671dd17c44b9d51744bda2283b42d5e4b9b673e693976af2f52f2a03a9571d6604a30b88701ed11f69a3a797429c72274126c0f45e5a4b9637b589a632
-DIST tzdata2015c.tar.gz 294353 SHA256 860fac5f5f57f7a2dfc1ba682dbd1f5c0f0b597f761571277b6ed6561e22365a SHA512 ca89c2041c8420e7b154660e227211b60ba20e8d70b6870b5c0a149838c588d13065202b1266c59caf22a99df2387da95ac04049b9ecb7939cd406c7f007a73e WHIRLPOOL e5806b47d3082b260837c675ac267a99ec45549070c66b5cbd6a51b7fe57802a555bfd54918093e83447089d965fe2459c5e9c6ea12c333080add280b012182f
-DIST tzdata2015d.tar.gz 296131 SHA256 8b9f5008277f09e251e97dba7813f56168d691115bda90ade4638d72f296d531 SHA512 37b5aa3c5e0d601c8b20fac08d7267c398a836e4190ef85625d5e86a806ba1baceb2315ba81a9a6c854eae4fce40e9c8f90cf5adade3f48ad443f77c221d8983 WHIRLPOOL c42972f20c8815557a9545f73bf3ff3b10a0148168a229641cb8e436da8ec337c5fc968acacfbd4d5beeae0fb183c5b6d54fe4240539352a9c3ce2b2f2318824
+DIST tzcode2015g.tar.gz 181695 SHA256 18e402ef24bfad2ded38643c9a7a9a580f940a729cb47d983052fc28ff0c7ec4 SHA512 44da833da3afdb82636a953785372bb4c765e61e40d700da40b46ab70007ebdbde4d480e10b87cbb36c45eaaffcaa6b9894375e2f553b7d16655dc167cd4a11f WHIRLPOOL 7c71471ba122865710ec6c71e443dab7db8fd6f43cf4348dd02438129d9c80dcfb3d6da3cdb3b04efeabcc5debba35a78d0b946b6b9e98caa5d7ddefbbe600e4
DIST tzdata2015e.tar.gz 296773 SHA256 ffc9b5d38abda8277aa479e3f75aa7668819d0977cd1a0c8ef3b09128334ba6f SHA512 86498190a20c5c67827aa75f7e9c6aa6c19d58a88a70425ce70d5ae7cea42dc7386eb2867fa455fcfcdedc6a105ad70fbbdc7c27c7a58a51bd21d76a135983ce WHIRLPOOL aaf2f2009f451beaf178d1ee622ebacdd04f1795e07a606b61620cac8faf74a63e1ea3f75ef58b846a6093922cba9df764ed1929e70d1f0be5181fdc25901282
DIST tzdata2015f.tar.gz 298815 SHA256 959f81b541e042ecb13c50097d264ae92ff03a57979c478dbcf24d5da242531d SHA512 d86e6c9e4c6d9cd5de30762723d7a90ac697feeb6dd1f04649f6a35e4e1dc638261c32066db4aeafa767ac339ccd100c38dde044ceadd61e95cb3d39c27f977e WHIRLPOOL 0b56e3ae620bed60d37abb195e8c4add8f5a00114422e91f2e533fce8c0091bdd681ff5c682e929e5af45202afde838fcc1ae14b7865f6f83a126c647e56d6a4
+DIST tzdata2015g.tar.gz 300363 SHA256 b923cdbf078491696b17bc8d069c74bce73fabc5774629da2f410c9b31576161 SHA512 ad7de0e3e8753861d260f0fcbcbca327516a4dc826f7659370a7fb979e6154f1a26b23d2609acf6e1790c8c59da0b76c42f4a94bf361409c1460f6a8ffa6f879 WHIRLPOOL 3af55fc43133ef3c03b734d8db35feda760feb5ad3adf0e763337fcf4ad7057231f5a24ddf68fdac9ae4014d31675d6a51c29f14b987118daad7f691f7e3fe98
diff --git a/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch
deleted file mode 100644
index 2153d76..0000000
--- a/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch
+++ /dev/null
@@ -1,113 +0,0 @@
- - Fix up default paths
- - Support env CC
- - Don't build/install libtz.a
- - Don't install man-pages provided by sys-apps/man-pages
- - Move zic, zdump to sbin and tzselect to bin ala glibc
- - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc
- - Install leaps zoneinfo into zoneinfo/right/ ala glibc
- - Do not run network based unittests
-
---- a/Makefile
-+++ b/Makefile
-@@ -45,21 +45,21 @@ POSIXRULES= America/New_York
-
- # Everything gets put in subdirectories of. . .
-
--TOPDIR= /usr/local
-+TOPDIR= /usr
-
- # "Compiled" time zone information is placed in the "TZDIR" directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
-
- TZDIR_BASENAME= zoneinfo
--TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME)
-+TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME)
-
- # Types to try, as an alternative to time_t. int64_t should be first.
- TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
-
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
-
--ETCDIR= $(TOPDIR)/etc
-+SBINDIR= $(TOPDIR)/sbin
-
- # If you "make INSTALL", the "date" command gets installed in. . .
-
-@@ -67,7 +67,7 @@ BINDIR= $(TOPDIR)/bin
-
- # Manual pages go in subdirectories of. . .
-
--MANDIR= $(TOPDIR)/man
-+MANDIR= $(TOPDIR)/share/man
-
- # Library functions are put in an archive in LIBDIR.
-
-@@ -298,8 +298,10 @@ GZIPFLAGS= -9n
-
- ###############################################################################
-
--cc= cc
--CC= $(cc) -DTZDIR=\"$(TZDIR)\"
-+CPPFLAGS+= -DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CPPFLAGS+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
-
- AR= ar
-
-@@ -352,17 +354,14 @@ ALL: all date
- install: all $(DATA) $(REDO) $(MANS)
- mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
-- $(DESTDIR)$(LIBDIR) \
-+ $(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \
- $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
- $(DESTDIR)$(MANDIR)/man8
- $(ZIC) -y $(YEARISTYPE) \
- -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
-- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
-+ cp zic zdump $(DESTDIR)$(SBINDIR)/.
-+ cp tzselect $(DESTDIR)$(BINDIR)/.
-- cp libtz.a $(DESTDIR)$(LIBDIR)/.
-- $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
- cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
-- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
-- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
-
- INSTALL: ALL install date.1
- mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
-@@ -406,18 +408,18 @@ right_only: zic leapseconds $(TDATA)
- # to using them, or vice versa.
- right_posix: right_only leapseconds
- rm -fr $(DESTDIR)$(TZDIR)-leaps
-- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
-+ ln -s . $(DESTDIR)$(TZDIR)/right || \
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
- -L leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
- -L /dev/null $(TDATA)
-
- posix_right: posix_only leapseconds
- rm -fr $(DESTDIR)$(TZDIR)-posix
-- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-+ ln -s . $(DESTDIR)$(TZDIR)/posix || \
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
- -L /dev/null $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
- -L leapseconds $(TDATA)
-
- posix_packrat: posix_only backzone
-@@ -440,7 +442,7 @@ tzselect: tzselect.ksh
- chmod +x $@
-
- check: check_character_set check_white_space check_links check_sorted \
-- check_tables check_web
-+ check_tables
-
- check_character_set: $(ENCHILADA)
- LC_ALL=en_US.utf8 && export LC_ALL && \
diff --git a/sys-libs/timezone-data/metadata.xml b/sys-libs/timezone-data/metadata.xml
index 5417711..96d5c97 100644
--- a/sys-libs/timezone-data/metadata.xml
+++ b/sys-libs/timezone-data/metadata.xml
@@ -12,9 +12,5 @@
when counting seconds since the epoch (while POSIX does not) as they are
based on the TAI (International Atomic Time) clock
</flag>
- <flag name='right_timezone'>
- Install the set of "right" timezones; these timezones include leap seconds
- when counting seconds since the epoch (while posix does not)
- </flag>
</use>
</pkgmetadata>
diff --git a/sys-libs/timezone-data/timezone-data-2015a.ebuild b/sys-libs/timezone-data/timezone-data-2015a.ebuild
deleted file mode 100644
index 8ddb089..0000000
--- a/sys-libs/timezone-data/timezone-data-2015a.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
- http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls right_timezone elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-pkg_setup() {
- # Deal with the case where older timezone-data installed a
- # dir here, but newer one installs symlinks. Portage will
- # barf when you try to transition file types.
- if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then
- # In case of a failed upgrade, clean up the symlinks #506570
- if [ -L .gentoo-upgrade ] ; then
- rm -rf posix .gentoo-upgrade
- fi
- if [ -d posix ] ; then
- rm -rf .gentoo-upgrade #487192
- mv posix .gentoo-upgrade || die
- ln -s .gentoo-upgrade posix || die
- fi
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2015a-makefile.patch
- tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-_emake() {
- emake \
- TOPDIR="${EPREFIX}/usr" \
- REDO=$(usex right_timezone posix_right posix_only) \
- "$@"
-}
-
-src_compile() {
- local LDLIBS
- tc-export CC
- if use elibc_FreeBSD || use elibc_Darwin ; then
- append-cppflags -DSTD_INSPIRED #138251
- fi
- export NLS=$(usex nls 1 0)
- if use nls && ! use elibc_glibc ; then
- LDLIBS+=" -lintl" #154181
- fi
- # TOPDIR is used in some utils when compiling.
- _emake \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- RANLIB="$(tc-getRANLIB)" \
- CFLAGS="${CFLAGS} -std=gnu99" \
- LDFLAGS="${LDFLAGS}" \
- LDLIBS="${LDLIBS}"
- if tc-is-cross-compiler ; then
- _emake -C "${S}"-native \
- CC="$(tc-getBUILD_CC)" \
- CFLAGS="${BUILD_CFLAGS}" \
- CPPFLAGS="${BUILD_CPPFLAGS}" \
- LDFLAGS="${BUILD_LDFLAGS}" \
- LDLIBS="${LDLIBS}" \
- zic
- fi
-}
-
-src_install() {
- local zic=""
- tc-is-cross-compiler && zic="zic=${S}-native/zic"
- _emake install ${zic} DESTDIR="${D}"
- dodoc CONTRIBUTING README NEWS Theory
- dohtml *.htm
-
- # install the symlink by hand to not break existing timezones
- if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then
- dosym . /usr/share/zoneinfo/posix
- fi
-}
-
-get_TIMEZONE() {
- local tz src="${EROOT}etc/timezone"
- if [[ -e ${src} ]] ; then
- tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
- else
- tz="FOOKABLOIE"
- fi
- [[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
- local tz=$(get_TIMEZONE)
- if ! use right_timezone && [[ ${tz} == right/* ]] ; then
- eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone."
- die "Please fix your USE or timezone"
- fi
-}
-
-pkg_config() {
- # make sure the /etc/localtime file does not get stale #127899
- local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
-
- tz=$(get_TIMEZONE) || return 0
- if [[ ${tz} == "FOOKABLOIE" ]] ; then
- elog "You do not have TIMEZONE set in ${src}."
-
- if [[ ! -e ${etc_lt} ]] ; then
- # if /etc/localtime is a symlink somewhere, assume they
- # know what they're doing and they're managing it themselves
- if [[ ! -L ${etc_lt} ]] ; then
- cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
- elog "Setting ${etc_lt} to Factory."
- else
- elog "Assuming your ${etc_lt} symlink is what you want; skipping update."
- fi
- else
- elog "Skipping auto-update of ${etc_lt}."
- fi
- return 0
- fi
-
- if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
- elog "You have an invalid TIMEZONE setting in ${src}"
- elog "Your ${etc_lt} has been reset to Factory; enjoy!"
- tz="Factory"
- fi
- if [[ -L ${etc_lt} ]]; then
- einfo "Skipping symlinked ${etc_lt}"
- else
- einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
- cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
- fi
-}
-
-pkg_postinst() {
- rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
- pkg_config
- wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2015b.ebuild b/sys-libs/timezone-data/timezone-data-2015b.ebuild
deleted file mode 100644
index 8ddb089..0000000
--- a/sys-libs/timezone-data/timezone-data-2015b.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
- http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls right_timezone elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-pkg_setup() {
- # Deal with the case where older timezone-data installed a
- # dir here, but newer one installs symlinks. Portage will
- # barf when you try to transition file types.
- if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then
- # In case of a failed upgrade, clean up the symlinks #506570
- if [ -L .gentoo-upgrade ] ; then
- rm -rf posix .gentoo-upgrade
- fi
- if [ -d posix ] ; then
- rm -rf .gentoo-upgrade #487192
- mv posix .gentoo-upgrade || die
- ln -s .gentoo-upgrade posix || die
- fi
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2015a-makefile.patch
- tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-_emake() {
- emake \
- TOPDIR="${EPREFIX}/usr" \
- REDO=$(usex right_timezone posix_right posix_only) \
- "$@"
-}
-
-src_compile() {
- local LDLIBS
- tc-export CC
- if use elibc_FreeBSD || use elibc_Darwin ; then
- append-cppflags -DSTD_INSPIRED #138251
- fi
- export NLS=$(usex nls 1 0)
- if use nls && ! use elibc_glibc ; then
- LDLIBS+=" -lintl" #154181
- fi
- # TOPDIR is used in some utils when compiling.
- _emake \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- RANLIB="$(tc-getRANLIB)" \
- CFLAGS="${CFLAGS} -std=gnu99" \
- LDFLAGS="${LDFLAGS}" \
- LDLIBS="${LDLIBS}"
- if tc-is-cross-compiler ; then
- _emake -C "${S}"-native \
- CC="$(tc-getBUILD_CC)" \
- CFLAGS="${BUILD_CFLAGS}" \
- CPPFLAGS="${BUILD_CPPFLAGS}" \
- LDFLAGS="${BUILD_LDFLAGS}" \
- LDLIBS="${LDLIBS}" \
- zic
- fi
-}
-
-src_install() {
- local zic=""
- tc-is-cross-compiler && zic="zic=${S}-native/zic"
- _emake install ${zic} DESTDIR="${D}"
- dodoc CONTRIBUTING README NEWS Theory
- dohtml *.htm
-
- # install the symlink by hand to not break existing timezones
- if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then
- dosym . /usr/share/zoneinfo/posix
- fi
-}
-
-get_TIMEZONE() {
- local tz src="${EROOT}etc/timezone"
- if [[ -e ${src} ]] ; then
- tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
- else
- tz="FOOKABLOIE"
- fi
- [[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
- local tz=$(get_TIMEZONE)
- if ! use right_timezone && [[ ${tz} == right/* ]] ; then
- eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone."
- die "Please fix your USE or timezone"
- fi
-}
-
-pkg_config() {
- # make sure the /etc/localtime file does not get stale #127899
- local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
-
- tz=$(get_TIMEZONE) || return 0
- if [[ ${tz} == "FOOKABLOIE" ]] ; then
- elog "You do not have TIMEZONE set in ${src}."
-
- if [[ ! -e ${etc_lt} ]] ; then
- # if /etc/localtime is a symlink somewhere, assume they
- # know what they're doing and they're managing it themselves
- if [[ ! -L ${etc_lt} ]] ; then
- cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
- elog "Setting ${etc_lt} to Factory."
- else
- elog "Assuming your ${etc_lt} symlink is what you want; skipping update."
- fi
- else
- elog "Skipping auto-update of ${etc_lt}."
- fi
- return 0
- fi
-
- if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
- elog "You have an invalid TIMEZONE setting in ${src}"
- elog "Your ${etc_lt} has been reset to Factory; enjoy!"
- tz="Factory"
- fi
- if [[ -L ${etc_lt} ]]; then
- einfo "Skipping symlinked ${etc_lt}"
- else
- einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
- cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
- fi
-}
-
-pkg_postinst() {
- rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
- pkg_config
- wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2015c-r1.ebuild b/sys-libs/timezone-data/timezone-data-2015c-r1.ebuild
deleted file mode 100644
index 0ba7909..0000000
--- a/sys-libs/timezone-data/timezone-data-2015c-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
- http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls leaps_timezone elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2015c-makefile.patch
- tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-_emake() {
- emake \
- TOPDIR="${EPREFIX}/usr" \
- REDO=$(usex leaps_timezone posix_right posix_only) \
- "$@"
-}
-
-src_compile() {
- local LDLIBS
- tc-export CC
- if use elibc_FreeBSD || use elibc_Darwin ; then
- append-cppflags -DSTD_INSPIRED #138251
- fi
- export NLS=$(usex nls 1 0)
- if use nls && ! use elibc_glibc ; then
- LDLIBS+=" -lintl" #154181
- fi
- # TOPDIR is used in some utils when compiling.
- _emake \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- RANLIB="$(tc-getRANLIB)" \
- CFLAGS="${CFLAGS} -std=gnu99" \
- LDFLAGS="${LDFLAGS}" \
- LDLIBS="${LDLIBS}"
- if tc-is-cross-compiler ; then
- _emake -C "${S}"-native \
- CC="$(tc-getBUILD_CC)" \
- CFLAGS="${BUILD_CFLAGS}" \
- CPPFLAGS="${BUILD_CPPFLAGS}" \
- LDFLAGS="${BUILD_LDFLAGS}" \
- LDLIBS="${LDLIBS}" \
- zic
- fi
-}
-
-src_install() {
- local zic=""
- tc-is-cross-compiler && zic="zic=${S}-native/zic"
- _emake install ${zic} DESTDIR="${D}"
- dodoc CONTRIBUTING README NEWS Theory
- dohtml *.htm
-}
-
-get_TIMEZONE() {
- local tz src="${EROOT}etc/timezone"
- if [[ -e ${src} ]] ; then
- tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
- else
- tz="FOOKABLOIE"
- fi
- [[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
- local tz=$(get_TIMEZONE)
- if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
- eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
- eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the"
- eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not"
- eerror "be using right/xxx for the system timezone as it breaks programs."
- die "Please fix your timezone setting"
- fi
-
- # Trim the symlink by hand to avoid portage's automatic protection checks.
- rm -f "${EROOT}"/usr/share/zoneinfo/posix
-
- if has_version "<=${CATEGORY}/${PN}-2015c" ; then
- elog "Support for accessing posix/ and right/ directly has been dropped to match"
- elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
- elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post"
- elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
- fi
-}
-
-pkg_config() {
- # make sure the /etc/localtime file does not get stale #127899
- local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
-
- tz=$(get_TIMEZONE) || return 0
- if [[ ${tz} == "FOOKABLOIE" ]] ; then
- elog "You do not have TIMEZONE set in ${src}."
-
- if [[ ! -e ${etc_lt} ]] ; then
- # if /etc/localtime is a symlink somewhere, assume they
- # know what they're doing and they're managing it themselves
- if [[ ! -L ${etc_lt} ]] ; then
- cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
- elog "Setting ${etc_lt} to Factory."
- else
- elog "Assuming your ${etc_lt} symlink is what you want; skipping update."
- fi
- else
- elog "Skipping auto-update of ${etc_lt}."
- fi
- return 0
- fi
-
- if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
- elog "You have an invalid TIMEZONE setting in ${src}"
- elog "Your ${etc_lt} has been reset to Factory; enjoy!"
- tz="Factory"
- fi
- if [[ -L ${etc_lt} ]]; then
- einfo "Skipping symlinked ${etc_lt}"
- else
- einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
- cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
- fi
-}
-
-pkg_postinst() {
- pkg_config
-}
diff --git a/sys-libs/timezone-data/timezone-data-2015c.ebuild b/sys-libs/timezone-data/timezone-data-2015c.ebuild
deleted file mode 100644
index f0f999a..0000000
--- a/sys-libs/timezone-data/timezone-data-2015c.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
- http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls right_timezone elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-pkg_setup() {
- # Deal with the case where older timezone-data installed a
- # dir here, but newer one installs symlinks. Portage will
- # barf when you try to transition file types.
- if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then
- # In case of a failed upgrade, clean up the symlinks #506570
- if [ -L .gentoo-upgrade ] ; then
- rm -rf posix .gentoo-upgrade
- fi
- if [ -d posix ] ; then
- rm -rf .gentoo-upgrade #487192
- mv posix .gentoo-upgrade || die
- ln -s .gentoo-upgrade posix || die
- fi
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2015a-makefile.patch
- tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-_emake() {
- emake \
- TOPDIR="${EPREFIX}/usr" \
- REDO=$(usex right_timezone posix_right posix_only) \
- "$@"
-}
-
-src_compile() {
- local LDLIBS
- tc-export CC
- if use elibc_FreeBSD || use elibc_Darwin ; then
- append-cppflags -DSTD_INSPIRED #138251
- fi
- export NLS=$(usex nls 1 0)
- if use nls && ! use elibc_glibc ; then
- LDLIBS+=" -lintl" #154181
- fi
- # TOPDIR is used in some utils when compiling.
- _emake \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- RANLIB="$(tc-getRANLIB)" \
- CFLAGS="${CFLAGS} -std=gnu99" \
- LDFLAGS="${LDFLAGS}" \
- LDLIBS="${LDLIBS}"
- if tc-is-cross-compiler ; then
- _emake -C "${S}"-native \
- CC="$(tc-getBUILD_CC)" \
- CFLAGS="${BUILD_CFLAGS}" \
- CPPFLAGS="${BUILD_CPPFLAGS}" \
- LDFLAGS="${BUILD_LDFLAGS}" \
- LDLIBS="${LDLIBS}" \
- zic
- fi
-}
-
-src_install() {
- local zic=""
- tc-is-cross-compiler && zic="zic=${S}-native/zic"
- _emake install ${zic} DESTDIR="${D}"
- dodoc CONTRIBUTING README NEWS Theory
- dohtml *.htm
-
- # install the symlink by hand to not break existing timezones
- if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then
- dosym . /usr/share/zoneinfo/posix
- fi
-}
-
-get_TIMEZONE() {
- local tz src="${EROOT}etc/timezone"
- if [[ -e ${src} ]] ; then
- tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
- else
- tz="FOOKABLOIE"
- fi
- [[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
- local tz=$(get_TIMEZONE)
- if ! use right_timezone && [[ ${tz} == right/* ]] ; then
- eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone."
- die "Please fix your USE or timezone"
- fi
-}
-
-pkg_config() {
- # make sure the /etc/localtime file does not get stale #127899
- local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
-
- tz=$(get_TIMEZONE) || return 0
- if [[ ${tz} == "FOOKABLOIE" ]] ; then
- elog "You do not have TIMEZONE set in ${src}."
-
- if [[ ! -e ${etc_lt} ]] ; then
- # if /etc/localtime is a symlink somewhere, assume they
- # know what they're doing and they're managing it themselves
- if [[ ! -L ${etc_lt} ]] ; then
- cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
- elog "Setting ${etc_lt} to Factory."
- else
- elog "Assuming your ${etc_lt} symlink is what you want; skipping update."
- fi
- else
- elog "Skipping auto-update of ${etc_lt}."
- fi
- return 0
- fi
-
- if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
- elog "You have an invalid TIMEZONE setting in ${src}"
- elog "Your ${etc_lt} has been reset to Factory; enjoy!"
- tz="Factory"
- fi
- if [[ -L ${etc_lt} ]]; then
- einfo "Skipping symlinked ${etc_lt}"
- else
- einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
- cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
- fi
-}
-
-pkg_postinst() {
- rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
- pkg_config
- wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2015d.ebuild b/sys-libs/timezone-data/timezone-data-2015d.ebuild
deleted file mode 100644
index 0ba7909..0000000
--- a/sys-libs/timezone-data/timezone-data-2015d.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
- http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls leaps_timezone elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2015c-makefile.patch
- tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-_emake() {
- emake \
- TOPDIR="${EPREFIX}/usr" \
- REDO=$(usex leaps_timezone posix_right posix_only) \
- "$@"
-}
-
-src_compile() {
- local LDLIBS
- tc-export CC
- if use elibc_FreeBSD || use elibc_Darwin ; then
- append-cppflags -DSTD_INSPIRED #138251
- fi
- export NLS=$(usex nls 1 0)
- if use nls && ! use elibc_glibc ; then
- LDLIBS+=" -lintl" #154181
- fi
- # TOPDIR is used in some utils when compiling.
- _emake \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- RANLIB="$(tc-getRANLIB)" \
- CFLAGS="${CFLAGS} -std=gnu99" \
- LDFLAGS="${LDFLAGS}" \
- LDLIBS="${LDLIBS}"
- if tc-is-cross-compiler ; then
- _emake -C "${S}"-native \
- CC="$(tc-getBUILD_CC)" \
- CFLAGS="${BUILD_CFLAGS}" \
- CPPFLAGS="${BUILD_CPPFLAGS}" \
- LDFLAGS="${BUILD_LDFLAGS}" \
- LDLIBS="${LDLIBS}" \
- zic
- fi
-}
-
-src_install() {
- local zic=""
- tc-is-cross-compiler && zic="zic=${S}-native/zic"
- _emake install ${zic} DESTDIR="${D}"
- dodoc CONTRIBUTING README NEWS Theory
- dohtml *.htm
-}
-
-get_TIMEZONE() {
- local tz src="${EROOT}etc/timezone"
- if [[ -e ${src} ]] ; then
- tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
- else
- tz="FOOKABLOIE"
- fi
- [[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
- local tz=$(get_TIMEZONE)
- if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
- eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
- eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the"
- eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not"
- eerror "be using right/xxx for the system timezone as it breaks programs."
- die "Please fix your timezone setting"
- fi
-
- # Trim the symlink by hand to avoid portage's automatic protection checks.
- rm -f "${EROOT}"/usr/share/zoneinfo/posix
-
- if has_version "<=${CATEGORY}/${PN}-2015c" ; then
- elog "Support for accessing posix/ and right/ directly has been dropped to match"
- elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
- elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post"
- elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
- fi
-}
-
-pkg_config() {
- # make sure the /etc/localtime file does not get stale #127899
- local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
-
- tz=$(get_TIMEZONE) || return 0
- if [[ ${tz} == "FOOKABLOIE" ]] ; then
- elog "You do not have TIMEZONE set in ${src}."
-
- if [[ ! -e ${etc_lt} ]] ; then
- # if /etc/localtime is a symlink somewhere, assume they
- # know what they're doing and they're managing it themselves
- if [[ ! -L ${etc_lt} ]] ; then
- cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
- elog "Setting ${etc_lt} to Factory."
- else
- elog "Assuming your ${etc_lt} symlink is what you want; skipping update."
- fi
- else
- elog "Skipping auto-update of ${etc_lt}."
- fi
- return 0
- fi
-
- if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
- elog "You have an invalid TIMEZONE setting in ${src}"
- elog "Your ${etc_lt} has been reset to Factory; enjoy!"
- tz="Factory"
- fi
- if [[ -L ${etc_lt} ]]; then
- einfo "Skipping symlinked ${etc_lt}"
- else
- einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
- cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
- fi
-}
-
-pkg_postinst() {
- pkg_config
-}
diff --git a/sys-libs/timezone-data/timezone-data-2015f.ebuild b/sys-libs/timezone-data/timezone-data-2015f.ebuild
index fdeb523..0aaa757 100644
--- a/sys-libs/timezone-data/timezone-data-2015f.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2015f.ebuild
@@ -15,7 +15,7 @@
LICENSE="BSD public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="nls leaps_timezone elibc_FreeBSD elibc_glibc"
RDEPEND="!sys-libs/glibc[vanilla(+)]"
diff --git a/sys-libs/timezone-data/timezone-data-2015g.ebuild b/sys-libs/timezone-data/timezone-data-2015g.ebuild
new file mode 100644
index 0000000..fdeb523
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2015g.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV}
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
+SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
+ http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="nls leaps_timezone elibc_FreeBSD elibc_glibc"
+
+RDEPEND="!sys-libs/glibc[vanilla(+)]"
+
+S=${WORKDIR}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2015c-makefile.patch
+ tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+_emake() {
+ emake \
+ TOPDIR="${EPREFIX}/usr" \
+ REDO=$(usex leaps_timezone posix_right posix_only) \
+ "$@"
+}
+
+src_compile() {
+ local LDLIBS
+ tc-export CC
+ if use elibc_FreeBSD || use elibc_Darwin ; then
+ append-cppflags -DSTD_INSPIRED #138251
+ fi
+ export NLS=$(usex nls 1 0)
+ if use nls && ! use elibc_glibc ; then
+ LDLIBS+=" -lintl" #154181
+ fi
+ # TOPDIR is used in some utils when compiling.
+ _emake \
+ AR="$(tc-getAR)" \
+ CC="$(tc-getCC)" \
+ RANLIB="$(tc-getRANLIB)" \
+ CFLAGS="${CFLAGS} -std=gnu99" \
+ LDFLAGS="${LDFLAGS}" \
+ LDLIBS="${LDLIBS}"
+ if tc-is-cross-compiler ; then
+ _emake -C "${S}"-native \
+ CC="$(tc-getBUILD_CC)" \
+ CFLAGS="${BUILD_CFLAGS}" \
+ CPPFLAGS="${BUILD_CPPFLAGS}" \
+ LDFLAGS="${BUILD_LDFLAGS}" \
+ LDLIBS="${LDLIBS}" \
+ zic
+ fi
+}
+
+src_install() {
+ local zic=""
+ tc-is-cross-compiler && zic="zic=${S}-native/zic"
+ _emake install ${zic} DESTDIR="${D}"
+ dodoc CONTRIBUTING README NEWS Theory
+ dohtml *.htm
+}
+
+get_TIMEZONE() {
+ local tz src="${EROOT}etc/timezone"
+ if [[ -e ${src} ]] ; then
+ tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
+ else
+ tz="FOOKABLOIE"
+ fi
+ [[ -z ${tz} ]] && return 1 || echo "${tz}"
+}
+
+pkg_preinst() {
+ local tz=$(get_TIMEZONE)
+ if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
+ eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
+ eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the"
+ eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not"
+ eerror "be using right/xxx for the system timezone as it breaks programs."
+ die "Please fix your timezone setting"
+ fi
+
+ # Trim the symlink by hand to avoid portage's automatic protection checks.
+ rm -f "${EROOT}"/usr/share/zoneinfo/posix
+
+ if has_version "<=${CATEGORY}/${PN}-2015c" ; then
+ elog "Support for accessing posix/ and right/ directly has been dropped to match"
+ elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
+ elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post"
+ elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
+ fi
+}
+
+pkg_config() {
+ # make sure the /etc/localtime file does not get stale #127899
+ local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
+
+ # If it's a symlink, assume the user knows what they're doing and
+ # they're managing it themselves. #511474
+ if [[ -L ${etc_lt} ]] ; then
+ einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
+ return 0
+ fi
+
+ tz=$(get_TIMEZONE) || return 0
+ if [[ ${tz} == "FOOKABLOIE" ]] ; then
+ elog "You do not have TIMEZONE set in ${src}."
+
+ if [[ ! -e ${etc_lt} ]] ; then
+ cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
+ elog "Setting ${etc_lt} to Factory."
+ else
+ elog "Skipping auto-update of ${etc_lt}."
+ fi
+ return 0
+ fi
+
+ if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
+ elog "You have an invalid TIMEZONE setting in ${src}"
+ elog "Your ${etc_lt} has been reset to Factory; enjoy!"
+ tz="Factory"
+ fi
+ einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
+ cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
+}
+
+pkg_postinst() {
+ pkg_config
+}
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 937904d..49ce463 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,4 +1,2 @@
-DIST acpid-2.0.20.tar.xz 151380 SHA256 6a1ebaf52c6bef0f3d6da24a364e5f9401004d60ef4f42ec2a23057799fcf750 SHA512 f1c1a91cd5db45c1da6b3f698671bb55b629eb149e09a680cc061a7cf921499f8486ce471d4789dd98f548247ecf1afffc0127fdfb120b3d3adfe0cfa35d172b WHIRLPOOL b22e1578b337e69e6ebbecd3a5e9fdcef9ba0a87e3364e23545f9db2a91bf77a40e70f8e772f85dbdda574c06efdf65848ca7dc75bb773f410a679c73fea4f9e
-DIST acpid-2.0.21.tar.xz 152968 SHA256 c4e67e59888ccb43e6b8f01efb794945356aecdff86155c6a5b0f371d1ff636f SHA512 c449a234f04e8d2e1c7a3eac7e36c020c829e5cd00de3e8716c7645c7e53d8fd4d430f862cb320ed536918fff190b6582f932feff315b0cb117ef89d9fec274e WHIRLPOOL b7162e6f6d00cb2495bb61112e26cfd2c0c27567f35d6329b9f4c953ad74b189ba0141253517b24af447ef3b4352ab00cfeb067e2f779694397d0788bd1edc3f
-DIST acpid-2.0.22.tar.xz 153596 SHA256 3d11454f4283c8f771d8dbd5eb6b5f2bbd9d94d9f77d68bab89e35d98b67ab31 SHA512 ed52d80a17bca082cfe8d14acd4e9f736337f43c3c5c1e90b9fd5c4e8bfc2525dd0992d47230f0cae65e0eac1b2454adb350024f2955e82ffa7125e6eabf4f6a WHIRLPOOL 18acb58b2f454ed15fb024005e2bbb42550b9c283c1a1514cd08c2db8d2daccab2509871c956ea0f528519aa8896748119cc7a972c3d1216600f3fa8353761ac
DIST acpid-2.0.23.tar.xz 154504 SHA256 4396aaec13510c3a1faa941a15a4b5335b6ae4fbec8438b9249b88c3b66187ee SHA512 b2f01f04a9c5370608016c16ecfbc5b503170c2686e6557ab1463e25d56a3ef1d2093d4701205ec1261564b1073653b404d0ae278c0bd8c8496606be1785963f WHIRLPOOL b9c7d4d64e663ffb9c58d2129b4f599453b4da0111b244269cf89ca50cc2de7ecdbea361825724963ee0b93294cadde12dee06c4816f5b709a23e7d443df0afd
+DIST acpid-2.0.25.tar.xz 154124 SHA256 0b700a8072bec162c512f72cbe419195601ab3e0ffd2138f9bd95ed3097a5c68 SHA512 8a2561549aa05d1dd763a973145b37bedf935df1d73310b09bd52473b51fdc14bbb10da6e4bd1c2086962d92bd12f3a03924cfe75b2d50bf95b50ded9b67b05f WHIRLPOOL 0431f03df75334731ca40310a579eecac87b4023818eb9ca26b2e7152a74417fae9426efc2389688e5456b4d666f6aa191272bf956bfef21f9667f41e476c17a
diff --git a/sys-power/acpid/acpid-2.0.20.ebuild b/sys-power/acpid/acpid-2.0.20.ebuild
deleted file mode 100644
index f66e5be..0000000
--- a/sys-power/acpid/acpid-2.0.20.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit systemd
-
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="http://sourceforge.net/projects/acpid2"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-apm )"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-3"
-
-src_configure() {
- econf --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- newdoc kacpimon/README README.kacpimon
- dodoc -r samples
- rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
-
- exeinto /etc/acpi
- newexe "${FILESDIR}"/${PN}-1.0.6-default.sh default.sh
- exeinto /etc/acpi/actions
- newexe samples/powerbtn/powerbtn.sh powerbtn.sh
- insinto /etc/acpi/events
- newins "${FILESDIR}"/${PN}-1.0.4-default default
-
- newinitd "${FILESDIR}"/${PN}-2.0.16-init.d ${PN}
- newconfd "${FILESDIR}"/${PN}-2.0.16-conf.d ${PN}
-
- systemd_dounit "${FILESDIR}"/systemd/${PN}.{service,socket}
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog
- elog "You may wish to read the Gentoo Linux Power Management Guide,"
- elog "which can be found online at:"
- elog "https://www.gentoo.org/doc/en/power-management-guide.xml"
- elog
- fi
-
- # files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
- mkdir -p "${ROOT}"/run
-
- if ! grep -qs "^tmpfs.*/run " "${ROOT}"/proc/mounts ; then
- echo
- ewarn "You should reboot the system now to get /run mounted with tmpfs!"
- fi
-}
diff --git a/sys-power/acpid/acpid-2.0.21.ebuild b/sys-power/acpid/acpid-2.0.21.ebuild
deleted file mode 100644
index 91fb794..0000000
--- a/sys-power/acpid/acpid-2.0.21.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit systemd
-
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="http://sourceforge.net/projects/acpid2"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-apm )"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-3"
-
-src_configure() {
- econf --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- newdoc kacpimon/README README.kacpimon
- dodoc -r samples
- rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
-
- exeinto /etc/acpi
- newexe "${FILESDIR}"/${PN}-1.0.6-default.sh default.sh
- exeinto /etc/acpi/actions
- newexe samples/powerbtn/powerbtn.sh powerbtn.sh
- insinto /etc/acpi/events
- newins "${FILESDIR}"/${PN}-1.0.4-default default
-
- newinitd "${FILESDIR}"/${PN}-2.0.16-init.d ${PN}
- newconfd "${FILESDIR}"/${PN}-2.0.16-conf.d ${PN}
-
- systemd_dounit "${FILESDIR}"/systemd/${PN}.{service,socket}
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog
- elog "You may wish to read the Gentoo Linux Power Management Guide,"
- elog "which can be found online at:"
- elog "https://www.gentoo.org/doc/en/power-management-guide.xml"
- elog
- fi
-
- # files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
- mkdir -p "${ROOT}"/run
-
- if ! grep -qs "^tmpfs.*/run " "${ROOT}"/proc/mounts ; then
- echo
- ewarn "You should reboot the system now to get /run mounted with tmpfs!"
- fi
-}
diff --git a/sys-power/acpid/acpid-2.0.22.ebuild b/sys-power/acpid/acpid-2.0.22.ebuild
deleted file mode 100644
index 9c21b10..0000000
--- a/sys-power/acpid/acpid-2.0.22.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit linux-info systemd
-
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="http://sourceforge.net/projects/acpid2"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-apm )"
-DEPEND=">=sys-kernel/linux-headers-3"
-
-pkg_pretend() {
- local CONFIG_CHECK="~INPUT_EVDEV"
- local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
- [[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
-}
-
-pkg_setup() { :; }
-
-src_configure() {
- econf --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- newdoc kacpimon/README README.kacpimon
- dodoc -r samples
- rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
-
- exeinto /etc/acpi
- newexe "${FILESDIR}"/${PN}-1.0.6-default.sh default.sh
- exeinto /etc/acpi/actions
- newexe samples/powerbtn/powerbtn.sh powerbtn.sh
- insinto /etc/acpi/events
- newins "${FILESDIR}"/${PN}-1.0.4-default default
-
- newinitd "${FILESDIR}"/${PN}-2.0.16-init.d ${PN}
- newconfd "${FILESDIR}"/${PN}-2.0.16-conf.d ${PN}
-
- systemd_dounit "${FILESDIR}"/systemd/${PN}.{service,socket}
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog
- elog "You may wish to read the Gentoo Linux Power Management Guide,"
- elog "which can be found online at:"
- elog "https://www.gentoo.org/doc/en/power-management-guide.xml"
- elog
- fi
-
- # files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
- mkdir -p "${ROOT%/}"/run
-
- if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
- echo
- ewarn "You should reboot the system now to get /run mounted with tmpfs!"
- fi
-}
diff --git a/sys-power/acpid/acpid-2.0.25.ebuild b/sys-power/acpid/acpid-2.0.25.ebuild
new file mode 100644
index 0000000..6563669
--- /dev/null
+++ b/sys-power/acpid/acpid-2.0.25.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils linux-info systemd
+
+DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
+HOMEPAGE="http://sourceforge.net/projects/acpid2"
+SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-apm )"
+DEPEND=">=sys-kernel/linux-headers-3"
+
+pkg_pretend() {
+ local CONFIG_CHECK="~INPUT_EVDEV"
+ local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
+ [[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
+}
+
+pkg_setup() { :; }
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.0.25-kde4.patch #515088
+ epatch "${FILESDIR}"/${PN}-2.0.25-add_mate-power-manager.patch #538590
+}
+
+src_configure() {
+ econf --docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ newdoc kacpimon/README README.kacpimon
+ dodoc -r samples
+ rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
+
+ exeinto /etc/acpi
+ newexe "${FILESDIR}"/${PN}-1.0.6-default.sh default.sh
+ exeinto /etc/acpi/actions
+ newexe samples/powerbtn/powerbtn.sh powerbtn.sh
+ insinto /etc/acpi/events
+ newins "${FILESDIR}"/${PN}-1.0.4-default default
+
+ newinitd "${FILESDIR}"/${PN}-2.0.16-init.d ${PN}
+ newconfd "${FILESDIR}"/${PN}-2.0.16-conf.d ${PN}
+
+ systemd_dounit "${FILESDIR}"/systemd/${PN}.{service,socket}
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog
+ elog "You may wish to read the Gentoo Linux Power Management Guide,"
+ elog "which can be found online at:"
+ elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
+ elog
+ fi
+
+ # files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
+ mkdir -p "${ROOT%/}"/run
+
+ if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
+ echo
+ ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+ fi
+}
diff --git a/sys-power/acpid/files/acpid-2.0.25-add_mate-power-manager.patch b/sys-power/acpid/files/acpid-2.0.25-add_mate-power-manager.patch
new file mode 100644
index 0000000..7061744
--- /dev/null
+++ b/sys-power/acpid/files/acpid-2.0.25-add_mate-power-manager.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/538590
+
+--- acpid-2.0.25/samples/powerbtn/powerbtn.sh
++++ acpid-2.0.25/samples/powerbtn/powerbtn.sh
+@@ -51,7 +51,7 @@
+ getXconsole
+
+ # A list of power management system process names.
+-PMS="gnome-power-manager kpowersave xfce4-power-manager"
++PMS="gnome-power-manager kpowersave xfce4-power-manager mate-power-manager"
+ PMS="$PMS guidance-power-manager.py dalston-power-applet"
+
+ # If one of those is running or any of several others,
diff --git a/sys-power/acpid/files/acpid-2.0.25-kde4.patch b/sys-power/acpid/files/acpid-2.0.25-kde4.patch
new file mode 100644
index 0000000..1a91bb9
--- /dev/null
+++ b/sys-power/acpid/files/acpid-2.0.25-kde4.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/515088
+
+--- acpid-2.0.25/samples/powerbtn/powerbtn.sh
++++ acpid-2.0.25/samples/powerbtn/powerbtn.sh
+@@ -57,7 +57,7 @@
+ # If one of those is running or any of several others,
+ if pidof x $PMS > /dev/null ||
+ ( test "$XUSER" != "" && pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop --user $XUSER kded kded loadedModules | grep -q klaptopdaemon) ||
+- ( test "$XUSER" != "" && test -x /usr/bin/qdbus && test -r /proc/$(pidof kded4)/environ && su - $XUSER -c "eval $(echo -n 'export '; cat /proc/$(pidof kded4)/environ |tr '\0' '\n'|grep DBUS_SESSION_BUS_ADDRESS); qdbus org.kde.kded" | grep -q powerdevil) ; then
++ ( test "$XUSER" != "" && test -x /usr/bin/qdbus && test -r /proc/$(pgrep -n kded4)/environ && su - $XUSER -c "eval $(echo -n 'export '; cat /proc/$(pgrep -n kded4)/environ |tr '\0' '\n'|grep DBUS_SESSION_BUS_ADDRESS); qdbus org.kde.kded" | grep -q powerdevil) ; then
+ # Get out as the power manager that is running will take care of things.
+ exit
+ fi
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 4fda2d0..02bfa5e 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,3 @@
DIST criu-1.5.2.tar.bz2 457573 SHA256 e8226018ac6c4094d61a1c002543e2b2253b4041a8edb24d4c1eaa41ce5ab345 SHA512 c7916fde1f63cb66a89e71867c204a251dfa2b9de703ac467bc460c6f0d895947996fd466c17cb529d2502aba7b75b8b30162baf3944fefebb71625fb88e5458 WHIRLPOOL c951692e684bd1b032bde1b534a4f4bd4b769a1e73afc56c74711ac943da907f638489205e8be2c68bbc345c1da8b641a7175dccd34aad907ca3251c3f2156a0
DIST criu-1.6.1.tar.bz2 484598 SHA256 c74810383b7e524be0d909b9a6c1805e0887ac93cf1bfa28f00a87f395879e18 SHA512 59de498035970decc5181c3e464ccf686fce34e9fa5285d0c6777849013b8441a4338ef7f89339953ff83dcaf1b7e95dbbd54432f61a28665fbde979df5e31e8 WHIRLPOOL 07fa8490bca046a17476b59e375a287dacbb13c1a99ac0a05166c5925d997748ca506c1cf3bab2bdae832010f6d87e7aa6f4b4371ce7c7d630120a0f47f1ae23
-DIST criu-1.6.tar.bz2 484513 SHA256 35ba6f5df90bfb8a25ae5e53459272bb37b8a69790e084f86d7a9ffa0df35993 SHA512 0672c7342ffed7c23fdb747b7bd3b08f205a4bf3965577991d007f71e70be5243247e52ad823f0099713f7977f6f4be5403ea2073a840b5024b6a0f240f65bdc WHIRLPOOL da5a767b3f89efdd2cda21331cc60e60e0cdbab163a55ef1a3080d3601df924688d612c7e76000c3d383cdb22002b16c28ad2740b7bc6aba784021f31ebc54c4
+DIST criu-1.7.tar.bz2 507224 SHA256 977cf03d94415c2858581bb9894cfb90ac0c0b4b045e9bfa7c04c230aae01a21 SHA512 2d270ae68daa7ff96e5765220ee43b42f8cbbc7e6e2013209dbf69f6bcfba6ca89a632f70734e30fbc9d2985566913d0cae7b28ef6fb4f8aacb3badef2f8e69c WHIRLPOOL 66324e4161bbe879c5cf1e7e94868bfa65007556aa5c24b8d1dcb09b6ac4731190cf178b70ef66e090e774492f3c8e465277a744b0a61a2ef6c1f30217ea76b3
diff --git a/sys-process/criu/criu-1.6-r1.ebuild b/sys-process/criu/criu-1.6-r1.ebuild
deleted file mode 100644
index 3806853..0000000
--- a/sys-process/criu/criu-1.6-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs linux-info flag-o-matic
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="http://criu.org/"
-SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="setproctitle"
-
-RDEPEND="dev-libs/protobuf-c
- setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
- app-text/asciidoc
- app-text/xmlto"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
- ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
-
-RESTRICT="test"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.3.1-flags.patch
- epatch "${FILESDIR}"/${PN}-1.3.1-makefile.patch
- epatch "${FILESDIR}"/${PN}-1.5-automagic-libbsd.patch
-}
-
-criu_arch() {
- # criu infers the arch from $(uname -m). We never want this to happen.
- case ${ARCH} in
- amd64) echo "x86_64";;
- arm64) echo "aarch64";;
- x86) echo "i386";;
- *) echo "${ARCH}";;
- esac
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- LD="$(tc-getLD)" \
- OBJCOPY="$(tc-getOBJCOPY)" \
- ARCH="$(criu_arch)" \
- V=1 WERROR=0 \
- SETPROCTITLE=$(usex setproctitle) \
- all docs
-}
-
-src_test() {
- # root privileges are required to dump all necessary info
- if [[ ${EUID} -eq 0 ]] ; then
- emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
- fi
-}
-
-src_install() {
- emake \
- ARCH="$(criu_arch)" \
- PREFIX="${EPREFIX}"/usr \
- LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
- DESTDIR="${D}" \
- install
-
- dodoc CREDITS README.md
-}
diff --git a/sys-process/criu/criu-1.7.ebuild b/sys-process/criu/criu-1.7.ebuild
new file mode 100644
index 0000000..23070e8
--- /dev/null
+++ b/sys-process/criu/criu-1.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs linux-info flag-o-matic
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="http://criu.org/"
+SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="setproctitle"
+
+RDEPEND="dev-libs/protobuf-c
+ setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ app-text/xmlto"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
+ ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
+
+RESTRICT="test"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.3.1-flags.patch
+ epatch "${FILESDIR}"/${PN}-1.3.1-makefile.patch
+ epatch "${FILESDIR}"/${PN}-1.7-automagic-libbsd.patch
+}
+
+criu_arch() {
+ # criu infers the arch from $(uname -m). We never want this to happen.
+ case ${ARCH} in
+ amd64) echo "x86_64";;
+ arm64) echo "aarch64";;
+ x86) echo "i386";;
+ *) echo "${ARCH}";;
+ esac
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ OBJCOPY="$(tc-getOBJCOPY)" \
+ ARCH="$(criu_arch)" \
+ V=1 WERROR=0 \
+ SETPROCTITLE=$(usex setproctitle) \
+ all docs
+}
+
+src_test() {
+ # root privileges are required to dump all necessary info
+ if [[ ${EUID} -eq 0 ]] ; then
+ emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
+ fi
+}
+
+src_install() {
+ emake \
+ ARCH="$(criu_arch)" \
+ PREFIX="${EPREFIX}"/usr \
+ LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
+ DESTDIR="${D}" \
+ install
+
+ dodoc CREDITS README.md
+}
diff --git a/sys-process/criu/files/criu-1.7-automagic-libbsd.patch b/sys-process/criu/files/criu-1.7-automagic-libbsd.patch
new file mode 100644
index 0000000..4dadf95
--- /dev/null
+++ b/sys-process/criu/files/criu-1.7-automagic-libbsd.patch
@@ -0,0 +1,29 @@
+diff --git a/Makefile.config b/Makefile.config
+index ce4b8d8..2ef64d3 100644
+--- a/Makefile.config
++++ b/Makefile.config
+@@ -3,10 +3,12 @@ include scripts/feature-tests.mak
+
+ CONFIG := include/config.h
+
++ifeq ($(SETPROCTITLE),yes)
+ ifeq ($(call try-cc,$(LIBBSD_DEV_TEST),-lbsd),y)
+ LIBS += -lbsd
+ DEFINES += -DCONFIG_HAS_LIBBSD
+ endif
++endif
+
+ ifeq ($(call pkg-config-check,libselinux),y)
+ LIBS := -lselinux $(LIBS)
+@@ -38,9 +40,11 @@ endif
+ ifeq ($(VDSO),y)
+ $(Q) @echo '#define CONFIG_VDSO' >> $@
+ endif
++ifeq ($(SETPROCTITLE),yes)
+ ifeq ($(call try-cc,$(SETPROCTITLE_INIT_TEST),-lbsd),y)
+ $(Q) @echo '#define CONFIG_HAS_SETPROCTITLE_INIT' >> $@
+ endif
++endif
+ ifeq ($(piegen-y),y)
+ $(Q) @echo '#define CONFIG_PIEGEN' >> $@
+ endif
diff --git a/virtual/libintl/libintl-0-r2.ebuild b/virtual/libintl/libintl-0-r2.ebuild
new file mode 100644
index 0000000..1f9f73f
--- /dev/null
+++ b/virtual/libintl/libintl-0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for the GNU Internationalization Library"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="elibc_glibc elibc_musl elibc_uclibc"
+
+# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
+# that and gcc. And don't force uClibc to dep on this.
+RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libintl[${MULTILIB_USEDEP}] ) ) )"
diff --git a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild
index 66bfc70..1463b5c 100644
--- a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild
+++ b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild
@@ -11,7 +11,7 @@
LICENSE="BSD openafs-krb5-a HPND"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="virtual/krb5"
diff --git a/www-apache/mod_rpaf/files/003_ipv6.patch b/www-apache/mod_rpaf/files/003_ipv6.patch
index 67edd55..49554ef 100644
--- a/www-apache/mod_rpaf/files/003_ipv6.patch
+++ b/www-apache/mod_rpaf/files/003_ipv6.patch
@@ -1,6 +1,6 @@
Description: ipv6 fixes
Author: Piotr Roszatycki <dexter@debian.org>
-Reviewed-by: Sergey B Kirpichev <skirpichev@gmail.com>
+Reviewed-by: Sergey B Kirpichev <skirpichev@gmail.com>
Bug-Debian: http://bugs.debian.org/726529
---
diff --git a/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch b/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch
index 250a23b..b31f91d 100644
--- a/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch
+++ b/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch
@@ -1,4 +1,4 @@
-Description: Add missing header for inet_addr
+Description: Add missing header for inet_addr
Author: Sergey B Kirpichev <skirpichev@gmail.com>
---
diff --git a/www-apache/passenger/passenger-5.0.20-r1.ebuild b/www-apache/passenger/passenger-5.0.20-r1.ebuild
index 140bd12..a9c600a 100644
--- a/www-apache/passenger/passenger-5.0.20-r1.ebuild
+++ b/www-apache/passenger/passenger-5.0.20-r1.ebuild
@@ -1,4 +1,3 @@
-
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/www-apache/passenger/passenger-5.0.20.ebuild b/www-apache/passenger/passenger-5.0.20.ebuild
index 989ba35..b385fee 100644
--- a/www-apache/passenger/passenger-5.0.20.ebuild
+++ b/www-apache/passenger/passenger-5.0.20.ebuild
@@ -1,4 +1,3 @@
-
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild b/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild
new file mode 100644
index 0000000..6fc2284
--- /dev/null
+++ b/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit git-2
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-pnp4nagios.git"
+EGIT_BRANCH="master"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS=""
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+ >=www-apps/icingaweb2-2.0.0"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ mkdir -p "${D}/usr/share/icingaweb2/modules/pnp4nagios"
+ cp -R "${S}"/* "${D}/usr/share/icingaweb2/modules/pnp4nagios"
+}
diff --git a/www-apps/icingaweb2-module-pnp4nagios/metadata.xml b/www-apps/icingaweb2-module-pnp4nagios/metadata.xml
new file mode 100644
index 0000000..d5dfd32
--- /dev/null
+++ b/www-apps/icingaweb2-module-pnp4nagios/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
+ <longdescription lang="en">
+ </longdescription>
+</pkgmetadata>
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
new file mode 100644
index 0000000..ef3ac07
--- /dev/null
+++ b/www-apps/icingaweb2/Manifest
@@ -0,0 +1 @@
+DIST icingaweb2-2.0.0.tar.gz 9854668 SHA256 a6a5383049e632108ce19b4b85f16a7fdd2f5acb3a6d2af3935254e2bc7fb2e6 SHA512 fb0094b19429d7da533f05ffcb601b47a231e0d5af076775ea8a7c487b0584884172041f443851132bc27634de341190a97e76c750b529dc91b23d166e70ed58 WHIRLPOOL 2d88174296a29b576ba1d4bcf0bcf5a75d166e41c0972327c4c418d3e7bb54ebd74d5d59318c40dc9767d2271954750f9f7248072c8cced6c892a96e5ff5900a
diff --git a/www-apps/icingaweb2/icingaweb2-2.0.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.0.0.ebuild
new file mode 100644
index 0000000..5ba2df2
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.0.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit depend.apache eutils multilib user
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 ldap mysql nginx postgres"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+ dev-lang/php:*[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
+ dev-php/pecl-imagick
+ apache2? ( >=www-servers/apache-2.4.0 )
+ nginx? ( >=www-servers/nginx-1.7.0:* )"
+RDEPEND="${DEPEND}"
+
+use apache2 && want_apache2
+
+pkg_setup() {
+ if use apache2 ; then
+ depend.apache_pkg_setup
+ fi
+
+ enewgroup icingaweb2
+ enewgroup icingacmd
+ use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+ use apache2 && usermod -a -G icingacmd,icingaweb2 apache2
+}
+
+pkg_config() {
+ if [[ -d /etc/icingaweb2 ]] ; then
+ einfo "Updating existing installation ..."
+ else
+ einfo "Running first time setup ..."
+ einfo "Creating configuration directory ..."
+ /usr/share/${PN}/bin/icingacli setup config directory
+ einfo "Creating authentication token for web setup ..."
+ /usr/share/${PN}/bin/icingacli setup token create
+ if use apache2 ; then
+ einfo "The following might be useful for your Apache2 configuration:"
+ /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+ fi
+ if use nginx ; then
+ einfo "The following might be useful for your NGinx configuration:"
+ /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+ fi
+ fi
+ einfo "All done."
+}
+
+src_install() {
+ mkdir -p "${D}/usr/share/${PN}"
+ cp -R "${S}"/* "${D}/usr/share/${PN}"
+ chmod -R a+rX "${D}/usr/share/${PN}/public"
+}
+
+pkg_postinst() {
+ einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/icingaweb2/metadata.xml b/www-apps/icingaweb2/metadata.xml
new file mode 100644
index 0000000..ff36ae7
--- /dev/null
+++ b/www-apps/icingaweb2/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
+ <longdescription lang="en">
+ Icinga Web 2 - Frontend for icinga2
+ </longdescription>
+ <use>
+ <flag name="nginx">Adds support for nginx</flag>
+ </use>
+</pkgmetadata>
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 43c63ca..70bc366 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -1,2 +1,2 @@
-DIST otrs-3.2.12.tar.bz2 18866640 SHA256 f69e4ffc10dc4ecf733a20ed79e1c65e03bbe01e7adb937af8f6ceb47a5b0709 SHA512 f3caceb239d11803b595ab654558d5f25e49b9444ce988d9350064c7a2a1a655fd271cbd1ddb8041e9fb8d11f3297301ba8621cc5f5e56866a7ac5320ff123af WHIRLPOOL a13db5c8720e9a43d6d1d72528459c7f517e2d528425c91e7890fcfeacd2a38f4c35ed2919395b714f4398e24295b51e65bb8b8561761b74131425673d122e13
DIST otrs-4.0.12.tar.bz2 14373765 SHA256 ea0a7b2019c46108f78d2329aa40ec5024405f08b586b6b33a6fca6a31ca9880 SHA512 17177b42c3768d271388fbe7abef033553fa524ba819a903b3f151b560de31183c5a1d975f8eb75f755b8bbf99331808309002f38cf3f469b22eadc8fefaa911 WHIRLPOOL 07b3d81c36e10f89ba1498c8d80845f53fc44feab25903addb8c3e6fa567633ec9938115859b5b81bc74efaa7c65286a1f501d6472737e00c47cfa48b77b2ac4
+DIST otrs-4.0.13.tar.bz2 14376200 SHA256 1c663c264043b65369f5608f9c5fcfc90938147053b14581db306df0c5e3e9ff SHA512 fb6156385643c838f46f80eeb8db2777ed426bca10df0ea94654df80b84e6dfd320a1ef6e43312edfcdb1a735e592cc49707a9507a47f2a5e3f5c80d9e0ccdc4 WHIRLPOOL ff8654485bf69ea08abd97e08dcaf68633f16242afc9beb169b0682a2155e4e4e89f5776d36eaaf15ab2ecde0717fb9c85676a3120ee01a21d3c70068605d669
diff --git a/www-apps/otrs/otrs-3.2.12.ebuild b/www-apps/otrs/otrs-3.2.12.ebuild
deleted file mode 100644
index 6ba2fd1..0000000
--- a/www-apps/otrs/otrs-3.2.12.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit eutils confutils user
-
-DESCRIPTION="OTRS is an Open source Ticket Request System"
-HOMEPAGE="http://otrs.org/"
-SRC_URI="http://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
-
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
-SLOT="0"
-#WEBAPP_MANUAL_SLOT="yes"
-
-# FIXME add oracle/mssql/DB2 DB support
-# FIXME #cjk? ( >=dev-perl/Encode-HanExtra-0.23 ) unsatisfied dep
-
-DEPEND=""
-RDEPEND="${DEPEND}
- dev-perl/Authen-SASL
- dev-perl/Crypt-PasswdMD5
- dev-perl/CSS-Minifier
- dev-perl/Date-Pcalc
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- dev-perl/DBI
- gd? ( dev-perl/GD
- dev-perl/GDTextUtil
- dev-perl/GDGraph )
- dev-perl/IO-Socket-SSL
- >=dev-perl/JavaScript-Minifier-1.05
- >=dev-perl/JSON-2.21
- dev-perl/JSON-XS
- dev-perl/LWP-UserAgent-Determined
- dev-perl/Mail-POP3Client
- dev-perl/MailTools
- >=dev-perl/MIME-tools-5.427
- dev-perl/NetxAP
- dev-perl/Net-IMAP-Simple-SSL
- >dev-perl/Net-DNS-0.60
- dev-perl/Net-SMTP-SSL
- dev-perl/Net-SMTP-TLS
- dev-perl/IO-stringy
- pdf? ( >=dev-perl/PDF-API2-0.73
- virtual/perl-Compress-Raw-Zlib )
- ldap? ( dev-perl/perl-ldap )
- soap? (
- dev-perl/SOAP-Lite
- !=dev-perl/SOAP-Lite-0.711
- !=dev-perl/SOAP-Lite-0.712 )
- dev-perl/Text-CSV
- dev-perl/Text-CSV_XS
- dev-perl/TimeDate
- dev-perl/XML-Parser
-
- virtual/perl-MIME-Base64
- >=dev-perl/CGI-3.33
- virtual/perl-libnet
- virtual/perl-Digest-MD5
- >=virtual/perl-Digest-SHA-5.48
-
- virtual/mta
-
- apache2? ( mod_perl? ( www-servers/apache:2
- =www-apache/libapreq2-2* www-apache/mod_perl )
- fastcgi? ( || ( www-apache/mod_fcgid www-apache/mod_fastcgi )
- www-servers/apache:2[suexec] )
- !fastcgi? (
- !mod_perl? ( www-servers/apache:2[suexec] ) )
- )
- fastcgi? ( dev-perl/FCGI virtual/httpd-fastcgi )
- !fastcgi? (
- !apache2? ( virtual/httpd-cgi ) )"
-
-# dev-perl/libwww-perl
-
-OTRS_HOME="/var/lib/otrs"
-
-pkg_setup() {
- # The enewuser otrs will fail if apache isn't there, but it's an optional dep
- # so we create the apache user here just in case
- enewgroup apache 81
- enewuser apache 81 -1 /var/www apache
- enewuser otrs -1 -1 ${OTRS_HOME} apache
- confutils_require_any mysql postgres
-}
-
-src_prepare() {
- rm -fr "${S}/scripts"/{auto_*,redhat*,suse*,*.spec} || die
- cp Kernel/Config.pm{.dist,} || die
- # procmail/fetchmail/mailfilter
-# local mailrc=".fetchmailrc .mailfilter .procmailrc"
-# for i in ${mailrc}; do
-# mv ${i}{.dist,} || die
-# done
-# fperms 600 ${mailrc} || die
-# fowners otrs ${mailrc} || die
-
- sed -i -e "s:/opt/otrs:${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
- || die "sed failed"
-
- grep -lR "/opt" "${S}"/scripts | \
- xargs sed -i -e "s:/opt/otrs:${OTRS_HOME}:g" \
- || die "sed failed"
-
- cd Kernel/Config/ || die
- for i in *.dist; do
- cp ${i} $(basename ${i} .dist) || die
- done
-
- perl "${S}"/bin/otrs.SetPermissions.pl \
- --otrs-user=otrs \
- --web-user=apache \
- --otrs-group=apache \
- --web-group=apache "${S}" \
- || die "Could not set permissions"
-
- echo "CONFIG_PROTECT=\"${OTRS_HOME}/Kernel/Config.pm \
- ${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}"
-
-}
-
-src_install() {
- dodoc CHANGES.md README* \
- doc/X-OTRS-Headers.txt || die
-
- dodoc doc/manual/en/otrs_admin_book.pdf
-
- insinto "${OTRS_HOME}"
- doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
- Custom Kernel bin scripts var || die "doins failed"
-
- cat "${S}"/var/cron/*.dist > crontab
- insinto /usr/share/doc/${PF}/
- doins crontab
-
- for a in article log pics/images pics/stats pics sessions spool tmp tmp/CacheFileStorable; do
- keepdir "${OTRS_HOME}/var/${a}"
- done
- doenvd "${T}/50${PN}" || die
-}
-
-# This is too automagic, either einfo telling user or installing to /etc/cron.d/ should be preferred
-pkg_config() {
- einfo "Installing cronjobs"
- crontab -u otrs /usr/share/doc/${PF}/crontab
-}
-
-pkg_postinst() {
- elog "Enable cronjobs with the following command:"
- elog "crontab -u otrs crontab"
-}
diff --git a/www-apps/otrs/otrs-4.0.13.ebuild b/www-apps/otrs/otrs-4.0.13.ebuild
new file mode 100644
index 0000000..ff592b2
--- /dev/null
+++ b/www-apps/otrs/otrs-4.0.13.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils confutils user
+
+DESCRIPTION="OTRS is an Open source Ticket Request System"
+HOMEPAGE="http://otrs.org/"
+SRC_URI="http://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
+
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
+SLOT="0"
+
+DEPEND="media-libs/libpng"
+
+RDEPEND="dev-perl/Apache-Reload
+ dev-perl/Archive-Zip
+ dev-perl/DBI
+ dev-perl/IO-Socket-SSL
+ dev-perl/JSON-XS
+ dev-perl/LWP-UserAgent-Determined
+ dev-perl/Mail-POP3Client
+ dev-perl/Mail-IMAPClient
+ >dev-perl/Net-DNS-0.60
+ dev-perl/Template-Toolkit
+ dev-perl/Text-CSV_XS
+ dev-perl/TimeDate
+ dev-perl/XML-Parser
+ dev-perl/YAML-LibYAML
+ apache2? ( mod_perl? ( www-servers/apache:2
+ =www-apache/libapreq2-2* www-apache/mod_perl )
+ !fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) ) )
+ fastcgi? ( dev-perl/FCGI virtual/httpd-fastcgi )
+ !fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
+ gd? ( dev-perl/GD
+ dev-perl/GDTextUtil
+ dev-perl/GDGraph )
+ ldap? ( dev-perl/perl-ldap )
+ mysql? ( dev-perl/DBD-mysql )
+ postgres? ( dev-perl/DBD-Pg )
+ pdf? ( >=dev-perl/PDF-API2-0.73
+ virtual/perl-Compress-Raw-Zlib )
+ soap? (
+ dev-perl/SOAP-Lite
+ !=dev-perl/SOAP-Lite-0.711
+ !=dev-perl/SOAP-Lite-0.712 )
+ "
+
+OTRS_HOME="/var/lib/otrs"
+
+pkg_setup() {
+ # The enewuser otrs will fail if apache isn't there, but it's an optional dep
+ # so we create the apache user here just in case
+ enewgroup apache 81
+ enewuser apache 81 -1 /var/www apache
+ enewuser otrs -1 -1 ${OTRS_HOME} apache
+ confutils_require_any mysql postgres
+}
+
+src_prepare() {
+ rm -fr "${S}/scripts"/{auto_*,redhat*,suse*,*.spec} || die
+ cp Kernel/Config.pm{.dist,} || die
+
+ # Fix broken png files
+ pngfix -q --out=out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png"
+ mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
+
+ sed -i -e "s:/opt/otrs:${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+ || die "sed failed"
+
+ grep -lR "/opt" "${S}"/scripts | \
+ xargs sed -i -e "s:/opt/otrs:${OTRS_HOME}:g" \
+ || die "sed failed"
+
+ cd Kernel/Config/ || die
+ for i in *.dist; do
+ cp ${i} $(basename ${i} .dist) || die
+ done
+
+ echo "CONFIG_PROTECT=\"${OTRS_HOME}/Kernel/Config.pm \
+ ${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}"
+}
+
+# This is too automagic, either einfo telling user or installing to /etc/cron.d/ should be preferred
+pkg_config() {
+ einfo "Installing cronjobs"
+ crontab -u otrs /usr/share/doc/${PF}/crontab
+}
+
+src_install() {
+ dodoc CHANGES.md README*
+
+ insinto "${OTRS_HOME}"
+ doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
+ Custom Kernel bin scripts var
+
+ cat "${S}"/var/cron/*.dist > crontab
+ insinto /usr/share/doc/${PF}/
+ doins crontab
+
+ for a in article log pics/images pics/stats pics sessions spool tmp tmp/CacheFileStorable
+ do
+ keepdir "${OTRS_HOME}/var/${a}"
+ done
+ doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+ einfo "Setting correct permissions ..."
+ /usr/bin/env perl "${OTRS_HOME}"/bin/otrs.SetPermissions.pl "${OTRS_HOME}" \
+ --otrs-user=otrs \
+ --web-group=apache \
+ || die "Could not set permissions"
+
+ einfo "Rebuilding config ..."
+ /usr/bin/env perl "${OTRS_HOME}"/bin/otrs.RebuildConfig.pl \
+ || die "Could not rebuild config"
+
+ einfo "Deleting cache ..."
+ /usr/bin/env perl "${OTRS_HOME}"/bin/otrs.DeleteCache.pl \
+ || die "Could not delete cache"
+
+ einfo "Installation done!"
+
+ elog "Enable cronjobs with the following command:"
+ elog "crontab -u otrs crontab"
+}
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index bef6e44..37c0d1f 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1 +1,2 @@
DIST postfixadmin-2.3.7.tar.gz 1600662 SHA256 761074e711ab618deda425dc013133b9d5968e0859bb883f10164061fd87006e SHA512 2d217874832bb3e70b200d7ddadcfdc81f0e9d3119bb54070fd645e055e4fd69b8fd9470b88af630a38c4053f4dd132425448b0dbe6525966aa5a4a2d8a1e7d0 WHIRLPOOL 7726aa7157834efcde5ac81f62c92db53b8931e868824cd48e43c541921d18908484291a6c5711a40609ad5e8dded954e8edffbdf0b5673d7cd49d647644bf50
+DIST postfixadmin-2.3.8.tar.gz 1600215 SHA256 8969b3312935c6e94ff17508f5b7e78b65828cd52d371adde3bfd9206597d94a SHA512 96cd4212109a9459344dc017a397b0d6abcb8653c7aae4f40f913e9a49581d7f74bd92500046f8758e195bd24e63a3b2373c461edc96c67fa1d01f91f4f489c6 WHIRLPOOL 4c98ad01a69708abf10970dd437f15945d02c0ccf8e3563051369f39be6b78eba0f7d7bd09b1784e73e65976b7454ae419571b77c0142477790e320710f3de21
diff --git a/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild b/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild
new file mode 100644
index 0000000..6c16e99
--- /dev/null
+++ b/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit user webapp
+
+DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
+HOMEPAGE="http://postfixadmin.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+mysql postgres +vacation xmlrpc"
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="vacation? ( dev-perl/DBI
+ virtual/perl-MIME-Base64
+ dev-perl/MIME-EncWords
+ dev-perl/Email-Valid
+ dev-perl/Mail-Sender
+ dev-perl/Log-Dispatch
+ dev-perl/Log-Log4perl
+ dev-perl/MIME-Charset
+ mysql? ( dev-perl/DBD-mysql )
+ postgres? ( dev-perl/DBD-Pg ) )
+ xmlrpc? ( dev-php/ZendFramework[-minimal] )
+ dev-lang/php[unicode,imap,postgres?,xmlrpc?]"
+
+RDEPEND="${DEPEND}
+ virtual/httpd-php
+ mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )"
+
+need_httpd_cgi
+
+pkg_setup() {
+ webapp_pkg_setup
+
+ if use vacation; then
+ enewgroup vacation
+ enewuser vacation -1 -1 -1 vacation
+ fi
+}
+
+src_install() {
+ webapp_src_preinst
+
+ if use vacation; then
+ insinto /var/spool/vacation
+ newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
+ fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
+ fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
+ dodoc VIRTUAL_VACATION/FILTER_README
+ newdoc VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT
+ rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.TXT,tests,FILTER_README} || die
+ fi
+
+ insinto /usr/share/doc/${PF}/
+ doins -r ADDITIONS
+
+ local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
+ dodoc ${docs}
+
+ rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
+
+ insinto "${MY_HTDOCSDIR}"
+ doins -r .
+
+ webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
+
+ webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
+ webapp_src_install
+}
+
+pkg_postinst() {
+ webapp_pkg_postinst
+ if use vacation; then
+ # portage does not update owners of directories (feature :)
+ chown vacation:vacation "${ROOT}"/var/spool/vacation/
+ einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
+ einfo "/var/spool/vacation/vacation.pl-${SLOT}"
+ ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
+ fi
+}
+
+pkg_postrm() {
+ # Make sure we don't leave broken vacation.pl symlink
+ find -L "${ROOT}"/var/spool/vacation/ -type l -delete
+ if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl ]] &&
+ path_exists "${ROOT}"/var/spool/vacation/vacation.pl-*; then
+ ln -s $(LC_ALL=C ls -1 /var/spool/vacation/vacation.pl-* | tail -n1) \
+ "${ROOT}"/var/spool/vacation/vacation.pl || die
+ ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
+ ewarn "recent verion, but please, do your own checks"
+ fi
+}
diff --git a/www-apps/sugarcrm/metadata.xml b/www-apps/sugarcrm/metadata.xml
index 4ec5631..a6e3b05 100644
--- a/www-apps/sugarcrm/metadata.xml
+++ b/www-apps/sugarcrm/metadata.xml
@@ -8,7 +8,7 @@
</maintainer>
<maintainer>
<email>maksbotan@gentoo.org</email>
- <name>Maxim Koltsov</name>
+ <name>Maxim Koltsov</name>
</maintainer>
<use>
<flag name="json">Add JSON (JavaScript Object Notation) support</flag>
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 53fd1ca..836fcdc 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,5 +2,5 @@
DIST chromium-45.0.2454.85-lite.tar.xz 242569440 SHA256 fafb4792c69c235d6ea85e904df68a64c51783cb338b783a1092b4ea6c888e71 SHA512 04f482ef18cddaf140224a98189ebd565416e3fe617877d58b2e691fb6030a3c9248720efcb7285cd18a034c345f9a65c677489d8a49f1ac95deafecb9b7d82a WHIRLPOOL 86b382b4dd2406559cef76ae260fcfe26e376bd957be3381b9822f706e8a5fb0ac7240fb00d64858ee1262eec17fadd253acae2b8a9318d3d996fb5d596de665
DIST chromium-46.0.2490.22-lite.tar.xz 261632508 SHA256 23a7448cfca032c240262a8d5760f23d9e89bf783ef54467353297856620edb6 SHA512 8d4f8c4cb2c7a4c3c9fb557b4fb2d34c5d7313a82c84fce340254ae59b5fcbc21b2d7b7723d8dd3f7b717175ac12e87373d0889397f01ce189c5718a7deb6de4 WHIRLPOOL dc1fee05d0acc46f9842281e475d1f9d006216c8d8e264ea3eecee63eb14054ff94ed6dd15e6d690305b08670516888a3361f5a3be8f0189c41472d77f0172bb
DIST chromium-46.0.2490.42-lite.tar.xz 261753316 SHA256 8d24a64af63f88d2654141f2db843dbd6a58c3de5a44b31a34e64813080d9501 SHA512 58681cbc0a99b5c299ea1d17bd8a1681c1c14297fd8d30155b7d1234536791b89f0202de1787c79ff03d978ddc270dc3d9f26fc2fb9cf0aa2a60bd7bf1b9571e WHIRLPOOL 8331c494bdfe793f9a777b30c316321ff40a67d3212f56f12b90568b21dc7f1f9273b0a82e38cdf74387335724047103ec85280320c6965f778e8d18190c7313
-DIST chromium-47.0.2516.0-lite.tar.xz 269320024 SHA256 ce90b6e6c99e661853946c992fdc8d88a3676a5f8cad318f887bee1950fb6da8 SHA512 47a62cd7013921ab46f00416cf4442c4550b1b38090ecc502c194e1f2822e07586e35ccb252f04968f4e2e8359bd472c2e12c7af71f2ba41be97839c1bae6941 WHIRLPOOL 877085833ea36f5ddd560563c1a90f31233b3fc81c5ee5ece7c8d50d16fdb979c42a8a7f86595e260632b134164f79eb7d260ee2be4a7b57abfc3a8b06417a5b
DIST chromium-47.0.2522.1-lite.tar.xz 303952732 SHA256 f20a0ffc2c9c1e0c6bbe546967fe281bf3367402154744838da624ec54d65d54 SHA512 afcf1379bff6cef3d71781fc83014496d191baa3f7eb0934da775ed2ac85cc9ff5ef18556abfe8204452ebccfd31ff1d37108df66b53f270e6863f82bb987097 WHIRLPOOL 6c6d10c5331dc3559887fd5e2e3adcab1261414fd6a94bfa740d671ca684f2d467ad804501d586d45c24fbf62b0d72a906dc11d4edab484a96bd65deb672990d
+DIST chromium-47.0.2526.6-lite.tar.xz 302688196 SHA256 c794fa33f97b0ab9b77a9438d8ba86cd1311d18241acd53a6f23df058f051279 SHA512 838ca886e78e03e53bc8c6c9d0bd89d04004a8befc5021cc13cc1ac0b30620cac88d543353518a413ea94be503fcb64c0810b8bd24c706afa64c5e4425e4827e WHIRLPOOL ee7636c223d63bd46f65da05839af4da369445afe427eefb268066a86c5819385c75cdc1abb8ec9506defe631b0e1ef29b6e71a1d8d7331edc63c3be3a90a82a
diff --git a/www-client/chromium/chromium-47.0.2516.0.ebuild b/www-client/chromium/chromium-47.0.2516.0.ebuild
deleted file mode 100644
index e8acf4a..0000000
--- a/www-client/chromium/chromium-47.0.2516.0.ebuild
+++ /dev/null
@@ -1,644 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
- hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
- sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
- portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
-
-LICENSE="BSD hotwording? ( no-source-code )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups gnome gnome-keyring gtk3 hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc widevine"
-RESTRICT="proprietary-codecs? ( bindist )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
- app-arch/bzip2:=
- app-arch/snappy:=
- cups? ( >=net-print/cups-1.3.11:= )
- >=dev-libs/elfutils-0.149
- dev-libs/expat:=
- dev-libs/glib:=
- >=dev-libs/icu-55.1:=
- >=dev-libs/jsoncpp-0.5.0-r1:=
- >=dev-libs/libevent-1.4.13:=
- dev-libs/libxml2:=[icu]
- dev-libs/libxslt:=
- dev-libs/nspr:=
- >=dev-libs/nss-3.14.3:=
- dev-libs/re2:=
- gnome? ( >=gnome-base/gconf-2.24.0:= )
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
- >=media-libs/alsa-lib-1.0.19:=
- media-libs/flac:=
- media-libs/fontconfig:=
- media-libs/freetype:=
- media-libs/harfbuzz:=[icu(+)]
- media-libs/libexif:=
- >=media-libs/libjpeg-turbo-1.2.0-r1:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.4.0:=
- media-libs/speex:=
- pulseaudio? ( media-sound/pulseaudio:= )
- sys-apps/dbus:=
- sys-apps/pciutils:=
- >=sys-libs/libcap-2.22:=
- sys-libs/zlib:=[minizip]
- virtual/udev
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:=
- gtk3? ( x11-libs/gtk+:3= )
- !gtk3? ( x11-libs/gtk+:2= )
- x11-libs/libdrm
- x11-libs/libX11:=
- x11-libs/libXcomposite:=
- x11-libs/libXcursor:=
- x11-libs/libXdamage:=
- x11-libs/libXext:=
- x11-libs/libXfixes:=
- >=x11-libs/libXi-1.6.0:=
- x11-libs/libXinerama:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libXScrnSaver:=
- x11-libs/libXtst:=
- x11-libs/pango:=
- kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
- !arm? (
- dev-lang/yasm
- )
- dev-lang/perl
- dev-perl/JSON
- >=dev-util/gperf-3.0.3
- dev-util/ninja
- sys-apps/hwids[usb(+)]
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- virtual/pkgconfig"
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
- !=www-client/chromium-9999
- !<www-plugins/chrome-binary-plugins-37
- x11-misc/xdg-utils
- virtual/opengl
- virtual/ttf-fonts
- selinux? ( sec-policy/selinux-chromium )
- tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
- widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
- dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/ply[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
- has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
- has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \
- has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \
- has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
- has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
- has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-apps/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
- if [[ $(tc-getCC)$ == *gcc* ]] && \
- [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
- die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
- fi
-
- # Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="3G"
- CHECKREQS_DISK_BUILD="5G"
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- CHECKREQS_DISK_BUILD="25G"
- fi
- eshopts_pop
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- if [[ "${SLOT}" == "0" ]]; then
- CHROMIUM_SUFFIX=""
- else
- CHROMIUM_SUFFIX="-${SLOT}"
- fi
- CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
- # Make sure the build system will use the right python, bug #344367.
- python-any-r1_pkg_setup
-
- chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
- # if ! use arm; then
- # mkdir -p out/Release/gen/sdk/toolchain || die
- # # Do not preserve SELinux context, bug #460892 .
- # cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
- # out/Release/gen/sdk/toolchain/linux_x86_newlib || die
- # touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
- # fi
-
- epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
- epatch "${FILESDIR}/chromium-widevine-r1.patch"
-
- epatch_user
-
- # Remove most bundled libraries. Some are still needed.
- build/linux/unbundle/remove_bundled_libraries.py \
- 'base/third_party/dmg_fp' \
- 'base/third_party/dynamic_annotations' \
- 'base/third_party/icu' \
- 'base/third_party/nspr' \
- 'base/third_party/superfasthash' \
- 'base/third_party/symbolize' \
- 'base/third_party/valgrind' \
- 'base/third_party/xdg_mime' \
- 'base/third_party/xdg_user_dirs' \
- 'breakpad/src/third_party/curl' \
- 'chrome/third_party/mozilla_security_manager' \
- 'courgette/third_party' \
- 'crypto/third_party/nss' \
- 'net/third_party/mozilla_security_manager' \
- 'net/third_party/nss' \
- 'third_party/WebKit' \
- 'third_party/analytics' \
- 'third_party/angle' \
- 'third_party/angle/src/third_party/compiler' \
- 'third_party/boringssl' \
- 'third_party/brotli' \
- 'third_party/cacheinvalidation' \
- 'third_party/catapult' \
- 'third_party/catapult/tracing/third_party/components/polymer' \
- 'third_party/catapult/tracing/third_party/d3' \
- 'third_party/catapult/tracing/third_party/gl-matrix' \
- 'third_party/catapult/tracing/third_party/jszip' \
- 'third_party/catapult/tracing/third_party/tvcm' \
- 'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
- 'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
- 'third_party/cld_2' \
- 'third_party/cros_system_api' \
- 'third_party/cython/python_flags.py' \
- 'third_party/devscripts' \
- 'third_party/dom_distiller_js' \
- 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
- 'third_party/ffmpeg' \
- 'third_party/fips181' \
- 'third_party/flot' \
- 'third_party/google_input_tools' \
- 'third_party/google_input_tools/third_party/closure_library' \
- 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
- 'third_party/hunspell' \
- 'third_party/iccjpeg' \
- 'third_party/jstemplate' \
- 'third_party/khronos' \
- 'third_party/leveldatabase' \
- 'third_party/libXNVCtrl' \
- 'third_party/libaddressinput' \
- 'third_party/libjingle' \
- 'third_party/libphonenumber' \
- 'third_party/libsecret' \
- 'third_party/libsrtp' \
- 'third_party/libudev' \
- 'third_party/libusb' \
- 'third_party/libvpx_new' \
- 'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
- 'third_party/libxml/chromium' \
- 'third_party/libwebm' \
- 'third_party/libyuv' \
- 'third_party/lss' \
- 'third_party/lzma_sdk' \
- 'third_party/mesa' \
- 'third_party/modp_b64' \
- 'third_party/mojo' \
- 'third_party/mt19937ar' \
- 'third_party/npapi' \
- 'third_party/openmax_dl' \
- 'third_party/opus' \
- 'third_party/ots' \
- 'third_party/pdfium' \
- 'third_party/pdfium/third_party/agg23' \
- 'third_party/pdfium/third_party/base' \
- 'third_party/pdfium/third_party/bigint' \
- 'third_party/pdfium/third_party/freetype' \
- 'third_party/pdfium/third_party/lcms2-2.6' \
- 'third_party/pdfium/third_party/libjpeg' \
- 'third_party/pdfium/third_party/libopenjpeg20' \
- 'third_party/pdfium/third_party/zlib_v128' \
- 'third_party/polymer' \
- 'third_party/protobuf' \
- 'third_party/qcms' \
- 'third_party/readability' \
- 'third_party/sfntly' \
- 'third_party/skia' \
- 'third_party/smhasher' \
- 'third_party/sqlite' \
- 'third_party/tcmalloc' \
- 'third_party/usrsctp' \
- 'third_party/web-animations-js' \
- 'third_party/webdriver' \
- 'third_party/webrtc' \
- 'third_party/widevine' \
- 'third_party/x86inc' \
- 'third_party/zlib/google' \
- 'url/third_party/mozilla' \
- 'v8/src/third_party/fdlibm' \
- 'v8/src/third_party/valgrind' \
- --do-remove || die
-}
-
-src_configure() {
- local myconf=""
-
- # Never tell the build system to "enable" SSE2, it has a few unexpected
- # additions, bug #336871.
- myconf+=" -Ddisable_sse2=1"
-
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
- myconf+=" -Ddisable_nacl=1"
-
- # Disable glibc Native Client toolchain, we don't need it (bug #417019).
- # myconf+=" -Ddisable_glibc=1"
-
- # TODO: also build with pnacl
- # myconf+=" -Ddisable_pnacl=1"
-
- # It would be awkward for us to tar the toolchain and get it untarred again
- # during the build.
- # myconf+=" -Ddisable_newlib_untar=1"
-
- # Make it possible to remove third_party/adobe.
- echo > "${T}/flapper_version.h" || die
- myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
- # Use system-provided libraries.
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_libsrtp (bug #459932).
- # TODO: use_system_libusb (http://crbug.com/266149).
- # TODO: use_system_libvpx (http://crbug.com/494939).
- # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
- # TODO: use_system_protobuf (bug #525560).
- # TODO: use_system_ssl (http://crbug.com/58087).
- # TODO: use_system_sqlite (http://crbug.com/22208).
- myconf+="
- -Duse_system_bzip2=1
- -Duse_system_flac=1
- -Duse_system_harfbuzz=1
- -Duse_system_icu=1
- -Duse_system_jsoncpp=1
- -Duse_system_libevent=1
- -Duse_system_libjpeg=1
- -Duse_system_libpng=1
- -Duse_system_libwebp=1
- -Duse_system_libxml=1
- -Duse_system_libxslt=1
- -Duse_system_minizip=1
- -Duse_system_nspr=1
- -Duse_system_re2=1
- -Duse_system_snappy=1
- -Duse_system_speex=1
- -Duse_system_xdg_utils=1
- -Duse_system_zlib=1"
-
- # Needed for system icu - we don't need additional data files.
- myconf+=" -Dicu_use_data_file_flag=0"
-
- # TODO: patch gyp so that this arm conditional is not needed.
- if ! use arm; then
- myconf+="
- -Duse_system_yasm=1"
- fi
-
- # Optional dependencies.
- # TODO: linux_link_kerberos, bug #381289.
- myconf+="
- $(gyp_use cups)
- $(gyp_use gnome use_gconf)
- $(gyp_use gnome-keyring use_gnome_keyring)
- $(gyp_use gnome-keyring linux_link_gnome_keyring)
- $(gyp_use gtk3)
- $(gyp_use hidpi enable_hidpi)
- $(gyp_use hotwording enable_hotwording)
- $(gyp_use kerberos)
- $(gyp_use pulseaudio)
- $(gyp_use tcmalloc use_allocator tcmalloc none)
- $(gyp_use widevine enable_widevine)"
-
- # Use explicit library dependencies instead of dlopen.
- # This makes breakages easier to detect by revdep-rebuild.
- myconf+="
- -Dlinux_link_gsettings=1
- -Dlinux_link_libpci=1
- -Dlinux_link_libspeechd=1
- -Dlibspeechd_h_prefix=speech-dispatcher/"
-
- # TODO: use the file at run time instead of effectively compiling it in.
- myconf+="
- -Dusb_ids_path=/usr/share/misc/usb.ids"
-
- # Save space by removing DLOG and DCHECK messages (about 6% reduction).
- myconf+="
- -Dlogging_like_official_build=1"
-
- if [[ $(tc-getCC) == *clang* ]]; then
- myconf+=" -Dclang=1"
- else
- myconf+=" -Dclang=0"
- fi
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- myconf+="
- -Dclang_use_chrome_plugins=0
- -Dhost_clang=0
- -Dlinux_use_bundled_binutils=0
- -Dlinux_use_bundled_gold=0
- -Dlinux_use_gold_flags=0"
-
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
- myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
- # Note: these are for Gentoo use ONLY. For your own distribution,
- # please get your own set of keys. Feel free to contact chromium@gentoo.org
- # for more info.
- myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
- -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
- -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
- local myarch="$(tc-arch)"
- if [[ $myarch = amd64 ]] ; then
- target_arch=x64
- ffmpeg_target_arch=x64
- elif [[ $myarch = x86 ]] ; then
- target_arch=ia32
- ffmpeg_target_arch=ia32
- elif [[ $myarch = arm ]] ; then
- target_arch=arm
- ffmpeg_target_arch=$(usex neon arm-neon arm)
- # TODO: re-enable NaCl (NativeClient).
- local CTARGET=${CTARGET:-${CHOST}}
- if [[ $(tc-is-softfloat) == "no" ]]; then
-
- myconf+=" -Darm_float_abi=hard"
- fi
- filter-flags "-mfpu=*"
- use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
- if [[ ${CTARGET} == armv[78]* ]]; then
- myconf+=" -Darmv7=1"
- else
- myconf+=" -Darmv7=0"
- fi
- myconf+=" -Dsysroot=
- $(gyp_use neon arm_neon)
- -Ddisable_nacl=1"
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- myconf+=" -Dtarget_arch=${target_arch}"
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf+=" -Dwerror="
-
- # Disable fatal linker warnings, bug 506268.
- myconf+=" -Ddisable_fatal_linker_warnings=1"
-
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
-
- # Prevent linker from running out of address space, bug #471810 .
- if use x86; then
- filter-flags "-g*"
- fi
-
- # Prevent libvpx build failures. Bug 530248, 544702, 546984.
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
- fi
- fi
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX NM
-
- # Tools for building programs to be executed on the build system, bug #410883.
- if tc-is-cross-compiler; then
- export AR_host=$(tc-getBUILD_AR)
- export CC_host=$(tc-getBUILD_CC)
- export CXX_host=$(tc-getBUILD_CXX)
- export NM_host=$(tc-getBUILD_NM)
- fi
-
- # Bug 491582.
- export TMPDIR="${WORKDIR}/temp"
- mkdir -p -m 755 "${TMPDIR}" || die
-
- local build_ffmpeg_args=""
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
- build_ffmpeg_args+=" --disable-asm"
- fi
-
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
- einfo "Configuring bundled ffmpeg..."
- pushd third_party/ffmpeg > /dev/null || die
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
- chromium/scripts/copy_config.sh || die
- chromium/scripts/generate_gyp.py || die
- popd > /dev/null || die
-
- third_party/libaddressinput/chromium/tools/update-strings.py || die
-
- touch chrome/test/data/webui/i18n_process_css_test.html || die
-
- einfo "Configuring Chromium..."
- build/linux/unbundle/replace_gyp_files.py ${myconf} || die
- egyp_chromium ${myconf} || die
-}
-
-eninja() {
- if [[ -z ${NINJAOPTS+set} ]]; then
- local jobs=$(makeopts_jobs)
- local loadavg=$(makeopts_loadavg)
-
- if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
- NINJAOPTS+=" -j ${jobs}"
- fi
- if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
- NINJAOPTS+=" -l ${loadavg}"
- fi
- fi
- set -- ninja -v ${NINJAOPTS} "$@"
- echo "$@"
- "$@"
-}
-
-src_compile() {
- local ninja_targets="chrome chrome_sandbox chromedriver"
-
- # Build mksnapshot and pax-mark it.
- eninja -C out/Release mksnapshot || die
- pax-mark m out/Release/mksnapshot
-
- # Even though ninja autodetects number of CPUs, we respect
- # user's options, for debugging with -j 1 or any other reason.
- eninja -C out/Release ${ninja_targets} || die
-
- pax-mark m out/Release/chrome
-}
-
-src_install() {
- exeinto "${CHROMIUM_HOME}"
- doexe out/Release/chrome || die
-
- newexe out/Release/chrome_sandbox chrome-sandbox || die
- fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
- doexe out/Release/chromedriver || die
- use widevine && doexe out/Release/libwidevinecdmadapter.so
-
- # if ! use arm; then
- # doexe out/Release/nacl_helper{,_bootstrap} || die
- # insinto "${CHROMIUM_HOME}"
- # doins out/Release/nacl_irt_*.nexe || die
- # doins out/Release/libppGoogleNaClPluginChrome.so || die
- # fi
-
- local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
- if [[ -n ${CHROMIUM_SUFFIX} ]]; then
- sedargs+=(
- -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
- -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
- -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
- )
- fi
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
- doexe chromium-launcher.sh
-
- # It is important that we name the target "chromium-browser",
- # xdg-utils expect it; bug #355517.
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
- # keep the old symlink around for consistency
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
- dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
- # Allow users to override command-line options, bug #357629.
- dodir /etc/chromium || die
- insinto /etc/chromium
- newins "${FILESDIR}/chromium.default" "default" || die
-
- pushd out/Release/locales > /dev/null || die
- chromium_remove_language_paks
- popd
-
- insinto "${CHROMIUM_HOME}"
- doins out/Release/*.bin || die
- doins out/Release/*.pak || die
-
- doins -r out/Release/locales || die
- doins -r out/Release/resources || die
-
- newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
- newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
- # Install icons and desktop entry.
- local branding size
- for size in 16 22 24 32 48 64 128 256 ; do
- case ${size} in
- 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
- *) branding="chrome/app/theme/chromium" ;;
- esac
- newicon -s ${size} "${branding}/product_logo_${size}.png" \
- chromium-browser${CHROMIUM_SUFFIX}.png
- done
-
- local mime_types="text/html;text/xml;application/xhtml+xml;"
- mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
- mime_types+="x-scheme-handler/ftp;" # bug #412185
- mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
- make_desktop_entry \
- chromium-browser${CHROMIUM_SUFFIX} \
- "Chromium${CHROMIUM_SUFFIX}" \
- chromium-browser${CHROMIUM_SUFFIX} \
- "Network;WebBrowser" \
- "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
- sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
- # Install GNOME default application entry (bug #303100).
- if use gnome; then
- dodir /usr/share/gnome-control-center/default-apps || die
- insinto /usr/share/gnome-control-center/default-apps
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
- if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
- sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
- "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
- fi
- fi
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-47.0.2526.6.ebuild b/www-client/chromium/chromium-47.0.2526.6.ebuild
new file mode 100644
index 0000000..293c378
--- /dev/null
+++ b/www-client/chromium/chromium-47.0.2526.6.ebuild
@@ -0,0 +1,654 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+ hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+ sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+ portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cups gnome gnome-keyring gtk3 hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+ app-arch/bzip2:=
+ app-arch/snappy:=
+ cups? ( >=net-print/cups-1.3.11:= )
+ >=dev-libs/elfutils-0.149
+ dev-libs/expat:=
+ dev-libs/glib:=
+ >=dev-libs/icu-55.1:=
+ >=dev-libs/jsoncpp-0.5.0-r1:=
+ >=dev-libs/libevent-1.4.13:=
+ dev-libs/libxml2:=[icu]
+ dev-libs/libxslt:=
+ dev-libs/nspr:=
+ >=dev-libs/nss-3.14.3:=
+ dev-libs/re2:=
+ gnome? ( >=gnome-base/gconf-2.24.0:= )
+ gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+ >=media-libs/alsa-lib-1.0.19:=
+ media-libs/flac:=
+ media-libs/fontconfig:=
+ media-libs/freetype:=
+ media-libs/harfbuzz:=[icu(+)]
+ media-libs/libexif:=
+ >=media-libs/libjpeg-turbo-1.2.0-r1:=
+ media-libs/libpng:0=
+ >=media-libs/libwebp-0.4.0:=
+ media-libs/speex:=
+ pulseaudio? ( media-sound/pulseaudio:= )
+ system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] )
+ sys-apps/dbus:=
+ sys-apps/pciutils:=
+ >=sys-libs/libcap-2.22:=
+ sys-libs/zlib:=[minizip]
+ virtual/udev
+ x11-libs/cairo:=
+ x11-libs/gdk-pixbuf:=
+ gtk3? ( x11-libs/gtk+:3= )
+ !gtk3? ( x11-libs/gtk+:2= )
+ x11-libs/libdrm
+ x11-libs/libX11:=
+ x11-libs/libXcomposite:=
+ x11-libs/libXcursor:=
+ x11-libs/libXdamage:=
+ x11-libs/libXext:=
+ x11-libs/libXfixes:=
+ >=x11-libs/libXi-1.6.0:=
+ x11-libs/libXinerama:=
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
+ x11-libs/libXScrnSaver:=
+ x11-libs/libXtst:=
+ x11-libs/pango:=
+ kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+ !arm? (
+ dev-lang/yasm
+ )
+ dev-lang/perl
+ dev-perl/JSON
+ >=dev-util/gperf-3.0.3
+ dev-util/ninja
+ sys-apps/hwids[usb(+)]
+ >=sys-devel/bison-2.4.3
+ sys-devel/flex
+ virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+ !=www-client/chromium-9999
+ !<www-plugins/chrome-binary-plugins-37
+ x11-misc/xdg-utils
+ virtual/opengl
+ virtual/ttf-fonts
+ selinux? ( sec-policy/selinux-chromium )
+ tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+ widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+ dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/ply[${PYTHON_USEDEP}]
+ dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+ has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+ has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \
+ has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \
+ has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+ has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+ has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+ EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-apps/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+ if [[ $(tc-getCC)$ == *gcc* ]] && \
+ [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+ die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+ fi
+
+ # Check build requirements, bug #541816 and bug #471810 .
+ CHECKREQS_MEMORY="3G"
+ CHECKREQS_DISK_BUILD="5G"
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ CHECKREQS_DISK_BUILD="25G"
+ fi
+ eshopts_pop
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ if [[ "${SLOT}" == "0" ]]; then
+ CHROMIUM_SUFFIX=""
+ else
+ CHROMIUM_SUFFIX="-${SLOT}"
+ fi
+ CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+ # Make sure the build system will use the right python, bug #344367.
+ python-any-r1_pkg_setup
+
+ chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+ # if ! use arm; then
+ # mkdir -p out/Release/gen/sdk/toolchain || die
+ # # Do not preserve SELinux context, bug #460892 .
+ # cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+ # out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+ # touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+ # fi
+
+ epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
+ epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+ epatch "${FILESDIR}/chromium-widevine-r1.patch"
+
+ epatch_user
+
+ local conditional_bundled_libraries=""
+ if ! use system-ffmpeg; then
+ conditional_bundled_libraries+=" third_party/ffmpeg"
+ fi
+
+ # Remove most bundled libraries. Some are still needed.
+ build/linux/unbundle/remove_bundled_libraries.py \
+ ${conditional_bundled_libraries} \
+ 'base/third_party/dmg_fp' \
+ 'base/third_party/dynamic_annotations' \
+ 'base/third_party/icu' \
+ 'base/third_party/nspr' \
+ 'base/third_party/superfasthash' \
+ 'base/third_party/symbolize' \
+ 'base/third_party/valgrind' \
+ 'base/third_party/xdg_mime' \
+ 'base/third_party/xdg_user_dirs' \
+ 'breakpad/src/third_party/curl' \
+ 'chrome/third_party/mozilla_security_manager' \
+ 'courgette/third_party' \
+ 'crypto/third_party/nss' \
+ 'net/third_party/mozilla_security_manager' \
+ 'net/third_party/nss' \
+ 'third_party/WebKit' \
+ 'third_party/analytics' \
+ 'third_party/angle' \
+ 'third_party/angle/src/third_party/compiler' \
+ 'third_party/boringssl' \
+ 'third_party/brotli' \
+ 'third_party/cacheinvalidation' \
+ 'third_party/catapult' \
+ 'third_party/catapult/tracing/third_party/components/polymer' \
+ 'third_party/catapult/tracing/third_party/d3' \
+ 'third_party/catapult/tracing/third_party/gl-matrix' \
+ 'third_party/catapult/tracing/third_party/jszip' \
+ 'third_party/catapult/tracing/third_party/tvcm' \
+ 'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
+ 'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
+ 'third_party/cld_2' \
+ 'third_party/cros_system_api' \
+ 'third_party/cython/python_flags.py' \
+ 'third_party/devscripts' \
+ 'third_party/dom_distiller_js' \
+ 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+ 'third_party/fips181' \
+ 'third_party/flot' \
+ 'third_party/google_input_tools' \
+ 'third_party/google_input_tools/third_party/closure_library' \
+ 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+ 'third_party/hunspell' \
+ 'third_party/iccjpeg' \
+ 'third_party/jstemplate' \
+ 'third_party/khronos' \
+ 'third_party/leveldatabase' \
+ 'third_party/libXNVCtrl' \
+ 'third_party/libaddressinput' \
+ 'third_party/libjingle' \
+ 'third_party/libphonenumber' \
+ 'third_party/libsecret' \
+ 'third_party/libsrtp' \
+ 'third_party/libudev' \
+ 'third_party/libusb' \
+ 'third_party/libvpx_new' \
+ 'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
+ 'third_party/libxml/chromium' \
+ 'third_party/libwebm' \
+ 'third_party/libyuv' \
+ 'third_party/lss' \
+ 'third_party/lzma_sdk' \
+ 'third_party/mesa' \
+ 'third_party/modp_b64' \
+ 'third_party/mojo' \
+ 'third_party/mt19937ar' \
+ 'third_party/npapi' \
+ 'third_party/openmax_dl' \
+ 'third_party/opus' \
+ 'third_party/ots' \
+ 'third_party/pdfium' \
+ 'third_party/pdfium/third_party/agg23' \
+ 'third_party/pdfium/third_party/base' \
+ 'third_party/pdfium/third_party/bigint' \
+ 'third_party/pdfium/third_party/freetype' \
+ 'third_party/pdfium/third_party/lcms2-2.6' \
+ 'third_party/pdfium/third_party/libjpeg' \
+ 'third_party/pdfium/third_party/libopenjpeg20' \
+ 'third_party/pdfium/third_party/zlib_v128' \
+ 'third_party/polymer' \
+ 'third_party/protobuf' \
+ 'third_party/qcms' \
+ 'third_party/readability' \
+ 'third_party/sfntly' \
+ 'third_party/skia' \
+ 'third_party/smhasher' \
+ 'third_party/sqlite' \
+ 'third_party/tcmalloc' \
+ 'third_party/usrsctp' \
+ 'third_party/web-animations-js' \
+ 'third_party/webdriver' \
+ 'third_party/webrtc' \
+ 'third_party/widevine' \
+ 'third_party/x86inc' \
+ 'third_party/zlib/google' \
+ 'url/third_party/mozilla' \
+ 'v8/src/third_party/fdlibm' \
+ 'v8/src/third_party/valgrind' \
+ --do-remove || die
+}
+
+src_configure() {
+ local myconf=""
+
+ # Never tell the build system to "enable" SSE2, it has a few unexpected
+ # additions, bug #336871.
+ myconf+=" -Ddisable_sse2=1"
+
+ # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+ myconf+=" -Ddisable_nacl=1"
+
+ # Disable glibc Native Client toolchain, we don't need it (bug #417019).
+ # myconf+=" -Ddisable_glibc=1"
+
+ # TODO: also build with pnacl
+ # myconf+=" -Ddisable_pnacl=1"
+
+ # It would be awkward for us to tar the toolchain and get it untarred again
+ # during the build.
+ # myconf+=" -Ddisable_newlib_untar=1"
+
+ # Make it possible to remove third_party/adobe.
+ echo > "${T}/flapper_version.h" || die
+ myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+ # Use system-provided libraries.
+ # TODO: use_system_hunspell (upstream changes needed).
+ # TODO: use_system_libsrtp (bug #459932).
+ # TODO: use_system_libusb (http://crbug.com/266149).
+ # TODO: use_system_libvpx (http://crbug.com/494939).
+ # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+ # TODO: use_system_protobuf (bug #525560).
+ # TODO: use_system_ssl (http://crbug.com/58087).
+ # TODO: use_system_sqlite (http://crbug.com/22208).
+ myconf+="
+ -Duse_system_bzip2=1
+ -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
+ -Duse_system_flac=1
+ -Duse_system_harfbuzz=1
+ -Duse_system_icu=1
+ -Duse_system_jsoncpp=1
+ -Duse_system_libevent=1
+ -Duse_system_libjpeg=1
+ -Duse_system_libpng=1
+ -Duse_system_libwebp=1
+ -Duse_system_libxml=1
+ -Duse_system_libxslt=1
+ -Duse_system_minizip=1
+ -Duse_system_nspr=1
+ -Duse_system_re2=1
+ -Duse_system_snappy=1
+ -Duse_system_speex=1
+ -Duse_system_xdg_utils=1
+ -Duse_system_zlib=1"
+
+ # Needed for system icu - we don't need additional data files.
+ myconf+=" -Dicu_use_data_file_flag=0"
+
+ # TODO: patch gyp so that this arm conditional is not needed.
+ if ! use arm; then
+ myconf+="
+ -Duse_system_yasm=1"
+ fi
+
+ # Optional dependencies.
+ # TODO: linux_link_kerberos, bug #381289.
+ myconf+="
+ $(gyp_use cups)
+ $(gyp_use gnome use_gconf)
+ $(gyp_use gnome-keyring use_gnome_keyring)
+ $(gyp_use gnome-keyring linux_link_gnome_keyring)
+ $(gyp_use gtk3)
+ $(gyp_use hidpi enable_hidpi)
+ $(gyp_use hotwording enable_hotwording)
+ $(gyp_use kerberos)
+ $(gyp_use pulseaudio)
+ $(gyp_use tcmalloc use_allocator tcmalloc none)
+ $(gyp_use widevine enable_widevine)"
+
+ # Use explicit library dependencies instead of dlopen.
+ # This makes breakages easier to detect by revdep-rebuild.
+ myconf+="
+ -Dlinux_link_gsettings=1
+ -Dlinux_link_libpci=1
+ -Dlinux_link_libspeechd=1
+ -Dlibspeechd_h_prefix=speech-dispatcher/"
+
+ # TODO: use the file at run time instead of effectively compiling it in.
+ myconf+="
+ -Dusb_ids_path=/usr/share/misc/usb.ids"
+
+ # Save space by removing DLOG and DCHECK messages (about 6% reduction).
+ myconf+="
+ -Dlogging_like_official_build=1"
+
+ if [[ $(tc-getCC) == *clang* ]]; then
+ myconf+=" -Dclang=1"
+ else
+ myconf+=" -Dclang=0"
+ fi
+
+ # Never use bundled gold binary. Disable gold linker flags for now.
+ # Do not use bundled clang.
+ myconf+="
+ -Dclang_use_chrome_plugins=0
+ -Dhost_clang=0
+ -Dlinux_use_bundled_binutils=0
+ -Dlinux_use_bundled_gold=0
+ -Dlinux_use_gold_flags=0"
+
+ ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+ myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+ # Note: these are for Gentoo use ONLY. For your own distribution,
+ # please get your own set of keys. Feel free to contact chromium@gentoo.org
+ # for more info.
+ myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+ -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+ -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ local myarch="$(tc-arch)"
+ if [[ $myarch = amd64 ]] ; then
+ target_arch=x64
+ ffmpeg_target_arch=x64
+ elif [[ $myarch = x86 ]] ; then
+ target_arch=ia32
+ ffmpeg_target_arch=ia32
+ elif [[ $myarch = arm ]] ; then
+ target_arch=arm
+ ffmpeg_target_arch=$(usex neon arm-neon arm)
+ # TODO: re-enable NaCl (NativeClient).
+ local CTARGET=${CTARGET:-${CHOST}}
+ if [[ $(tc-is-softfloat) == "no" ]]; then
+
+ myconf+=" -Darm_float_abi=hard"
+ fi
+ filter-flags "-mfpu=*"
+ use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+ if [[ ${CTARGET} == armv[78]* ]]; then
+ myconf+=" -Darmv7=1"
+ else
+ myconf+=" -Darmv7=0"
+ fi
+ myconf+=" -Dsysroot=
+ $(gyp_use neon arm_neon)
+ -Ddisable_nacl=1"
+ else
+ die "Failed to determine target arch, got '$myarch'."
+ fi
+
+ myconf+=" -Dtarget_arch=${target_arch}"
+
+ # Make sure that -Werror doesn't get added to CFLAGS by the build system.
+ # Depending on GCC version the warnings are different and we don't want
+ # the build to fail because of that.
+ myconf+=" -Dwerror="
+
+ # Disable fatal linker warnings, bug 506268.
+ myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+ # Avoid CFLAGS problems, bug #352457, bug #390147.
+ if ! use custom-cflags; then
+ replace-flags "-Os" "-O2"
+ strip-flags
+
+ # Prevent linker from running out of address space, bug #471810 .
+ if use x86; then
+ filter-flags "-g*"
+ fi
+
+ # Prevent libvpx build failures. Bug 530248, 544702, 546984.
+ if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+ filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+ fi
+ fi
+
+ # Make sure the build system will use the right tools, bug #340795.
+ tc-export AR CC CXX NM
+
+ # Tools for building programs to be executed on the build system, bug #410883.
+ if tc-is-cross-compiler; then
+ export AR_host=$(tc-getBUILD_AR)
+ export CC_host=$(tc-getBUILD_CC)
+ export CXX_host=$(tc-getBUILD_CXX)
+ export NM_host=$(tc-getBUILD_NM)
+ fi
+
+ # Bug 491582.
+ export TMPDIR="${WORKDIR}/temp"
+ mkdir -p -m 755 "${TMPDIR}" || die
+
+ if ! use system-ffmpeg; then
+ local build_ffmpeg_args=""
+ if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+ build_ffmpeg_args+=" --disable-asm"
+ fi
+
+ # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+ einfo "Configuring bundled ffmpeg..."
+ pushd third_party/ffmpeg > /dev/null || die
+ chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+ --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+ chromium/scripts/copy_config.sh || die
+ chromium/scripts/generate_gyp.py || die
+ popd > /dev/null || die
+ fi
+
+ third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+ touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+ einfo "Configuring Chromium..."
+ build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+ egyp_chromium ${myconf} || die
+}
+
+eninja() {
+ if [[ -z ${NINJAOPTS+set} ]]; then
+ local jobs=$(makeopts_jobs)
+ local loadavg=$(makeopts_loadavg)
+
+ if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+ NINJAOPTS+=" -j ${jobs}"
+ fi
+ if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+ NINJAOPTS+=" -l ${loadavg}"
+ fi
+ fi
+ set -- ninja -v ${NINJAOPTS} "$@"
+ echo "$@"
+ "$@"
+}
+
+src_compile() {
+ local ninja_targets="chrome chrome_sandbox chromedriver"
+
+ # Build mksnapshot and pax-mark it.
+ eninja -C out/Release mksnapshot || die
+ pax-mark m out/Release/mksnapshot
+
+ # Even though ninja autodetects number of CPUs, we respect
+ # user's options, for debugging with -j 1 or any other reason.
+ eninja -C out/Release ${ninja_targets} || die
+
+ pax-mark m out/Release/chrome
+}
+
+src_install() {
+ exeinto "${CHROMIUM_HOME}"
+ doexe out/Release/chrome || die
+
+ newexe out/Release/chrome_sandbox chrome-sandbox || die
+ fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+ doexe out/Release/chromedriver || die
+ use widevine && doexe out/Release/libwidevinecdmadapter.so
+
+ # if ! use arm; then
+ # doexe out/Release/nacl_helper{,_bootstrap} || die
+ # insinto "${CHROMIUM_HOME}"
+ # doins out/Release/nacl_irt_*.nexe || die
+ # doins out/Release/libppGoogleNaClPluginChrome.so || die
+ # fi
+
+ local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+ if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+ sedargs+=(
+ -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+ -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+ -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+ )
+ fi
+ sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+ doexe chromium-launcher.sh
+
+ # It is important that we name the target "chromium-browser",
+ # xdg-utils expect it; bug #355517.
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+ # keep the old symlink around for consistency
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+ dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+ # Allow users to override command-line options, bug #357629.
+ dodir /etc/chromium || die
+ insinto /etc/chromium
+ newins "${FILESDIR}/chromium.default" "default" || die
+
+ pushd out/Release/locales > /dev/null || die
+ chromium_remove_language_paks
+ popd
+
+ insinto "${CHROMIUM_HOME}"
+ doins out/Release/*.bin || die
+ doins out/Release/*.pak || die
+
+ doins -r out/Release/locales || die
+ doins -r out/Release/resources || die
+
+ newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+ newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+ # Install icons and desktop entry.
+ local branding size
+ for size in 16 22 24 32 48 64 128 256 ; do
+ case ${size} in
+ 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+ *) branding="chrome/app/theme/chromium" ;;
+ esac
+ newicon -s ${size} "${branding}/product_logo_${size}.png" \
+ chromium-browser${CHROMIUM_SUFFIX}.png
+ done
+
+ local mime_types="text/html;text/xml;application/xhtml+xml;"
+ mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+ mime_types+="x-scheme-handler/ftp;" # bug #412185
+ mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+ make_desktop_entry \
+ chromium-browser${CHROMIUM_SUFFIX} \
+ "Chromium${CHROMIUM_SUFFIX}" \
+ chromium-browser${CHROMIUM_SUFFIX} \
+ "Network;WebBrowser" \
+ "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+ sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+ # Install GNOME default application entry (bug #303100).
+ if use gnome; then
+ dodir /usr/share/gnome-control-center/default-apps || die
+ insinto /usr/share/gnome-control-center/default-apps
+ newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+ if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+ sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+ "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+ fi
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 2208094..b4aa59b 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -9,6 +9,7 @@
<flag name="hotwording">Enable voice-recognition support (Ok Google)</flag>
<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag>
+ <flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc</flag>
<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
</use>
diff --git a/www-client/dillo/dillo-3.0.5.ebuild b/www-client/dillo/dillo-3.0.5.ebuild
index f3bb038..2006ff9 100644
--- a/www-client/dillo/dillo-3.0.5.ebuild
+++ b/www-client/dillo/dillo-3.0.5.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd"
IUSE="doc +gif ipv6 +jpeg +png ssl"
RDEPEND="
diff --git a/www-client/elinks/elinks-0.12_pre6-r1.ebuild b/www-client/elinks/elinks-0.12_pre6-r1.ebuild
new file mode 100644
index 0000000..a9ffcf6
--- /dev/null
+++ b/www-client/elinks/elinks-0.12_pre6-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils autotools flag-o-matic
+
+MY_P="${P/_/}"
+DESCRIPTION="Advanced and well-established text-mode web browser"
+HOMEPAGE="http://elinks.or.cz/"
+SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
+ https://dev.gentoo.org/~axs/distfiles/${PN}-0.12_pre5-js185-patches.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
+ javascript lua +mouse nls nntp perl ruby samba ssl unicode X zlib"
+RESTRICT="test"
+
+DEPEND="dev-libs/boehm-gc
+ >=dev-libs/expat-1.95.4
+ bzip2? ( >=app-arch/bzip2-1.0.2 )
+ ssl? ( >=dev-libs/openssl-0.9.6g:0 )
+ X? ( x11-libs/libX11 x11-libs/libXt )
+ zlib? ( >=sys-libs/zlib-1.1.4 )
+ lua? ( >=dev-lang/lua-5:0 )
+ gpm? ( >=sys-libs/ncurses-5.2:0 >=sys-libs/gpm-1.20.0-r5 )
+ guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
+ idn? ( net-dns/libidn )
+ perl? ( dev-lang/perl )
+ ruby? ( dev-lang/ruby dev-ruby/rubygems )
+ samba? ( net-fs/samba )
+ javascript? ( dev-lang/spidermonkey:0 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ cd "${WORKDIR}"
+ epatch "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
+ mv "${PN}-0.10.4.conf" "${PN}.conf"
+ if ! use ftp ; then
+ sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf
+ fi
+ sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf
+ cd "${S}"
+
+ if use lua && has_version ">=dev-lang/lua-5.1"; then
+ epatch "${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
+ fi
+
+ epatch "${FILESDIR}"/${PN}-9999-parallel-make.patch
+ epatch "${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
+
+ if use javascript ; then
+ if has_version ">=dev-lang/spidermonkey-1.8"; then
+ if has_version ">=dev-lang/spidermonkey-1.8.5"; then
+ epatch "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-1-heartbeat.patch
+ epatch "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-2-up.patch
+ epatch "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-3-histback.patch
+ epatch "${FILESDIR}"/${PN}-0.12_pre5-sm185-jsval-fixes.patch
+# if has_version ">=dev-lang/spidermonkey-1.8.7"; then
+# # fix lib order in configure check and add mozjs187
+# # (these seds are necessary so that @preserved-libs copies are not used)
+# sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs187 mozjs185 mozjs js smjs; do:' \
+# configure.in || die
+# else
+ # fix lib order in configure check
+ # (these seds are necessary so that @preserved-libs copies are not used)
+ sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs185 mozjs js smjs; do:' \
+ configure.in || die
+# fi
+ else
+ # fix lib order in configure check
+ # (these seds are necessary so that @preserved-libs copies are not used)
+ epatch "${FILESDIR}"/${MY_P}-spidermonkey-callback.patch
+ sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs js smjs; do:' \
+ configure.in || die
+ fi
+ fi
+ fi
+ epatch "${FILESDIR}"/${PN}-0.12_pre5-ruby-1.9.patch
+ # Regenerate acinclude.m4 - based on autogen.sh.
+ cat > acinclude.m4 <<- _EOF
+ dnl Automatically generated from config/m4/ files.
+ dnl Do not modify!
+ _EOF
+ cat config/m4/*.m4 >> acinclude.m4
+
+ sed -i -e 's/-Werror//' configure*
+
+ eautoreconf
+}
+
+src_configure() {
+ # NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
+ # As GNUTLS is not yet 100% stable and its support in ELinks is not so well
+ # tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
+ local myconf=""
+
+ if use debug ; then
+ myconf="--enable-debug"
+ else
+ myconf="--enable-fastmem"
+ fi
+
+ if use ssl ; then
+ myconf="${myconf} --with-openssl=${EPREFIX}/usr"
+ else
+ myconf="${myconf} --without-openssl --without-gnutls"
+ fi
+
+ econf \
+ --sysconfdir="${EPREFIX}"/etc/elinks \
+ --enable-leds \
+ --enable-88-colors \
+ --enable-256-colors \
+ --enable-true-color \
+ --enable-html-highlight \
+ $(use_with gpm) \
+ $(use_with zlib) \
+ $(use_with bzip2 bzlib) \
+ $(use_with X x) \
+ $(use_with lua) \
+ $(use_with guile) \
+ $(use_with perl) \
+ $(use_with ruby) \
+ $(use_with idn) \
+ $(use_with javascript spidermonkey) \
+ $(use_enable bittorrent) \
+ $(use_enable nls) \
+ $(use_enable ipv6) \
+ $(use_enable ftp) \
+ $(use_enable gopher) \
+ $(use_enable nntp) \
+ $(use_enable finger) \
+ $(use_enable samba smb) \
+ $(use_enable mouse) \
+ ${myconf}
+}
+
+src_compile() {
+ emake V=1
+}
+
+src_install() {
+ emake V=1 DESTDIR="${D}" install
+
+ insopts -m 644 ; insinto /etc/elinks
+ doins "${WORKDIR}"/elinks.conf
+ newins contrib/keybind-full.conf keybind-full.sample
+ newins contrib/keybind.conf keybind.conf.sample
+
+ dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
+ docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
+ insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
+ insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
+ insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
+
+ # Remove some conflicting files on OSX. The files provided by OSX 10.4
+ # are more or less the same. -- Fabian Groffen (2005-06-30)
+ rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias || die
+}
+
+pkg_postinst() {
+ einfo "This ebuild provides a default config for ELinks."
+ einfo "Please check /etc/elinks/elinks.conf"
+ einfo
+ einfo "You may want to convert your html.cfg and links.cfg of"
+ einfo "Links or older ELinks versions to the new ELinks elinks.conf"
+ einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
+ einfo
+ einfo "Please have a look at /etc/elinks/keybind-full.sample and"
+ einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
+ einfo
+ einfo "You will have to set your TERM variable to 'xterm-256color'"
+ einfo "to be able to use 256 colors in elinks."
+ echo
+}
diff --git a/www-client/elinks/elinks-0.12_pre6.ebuild b/www-client/elinks/elinks-0.12_pre6.ebuild
deleted file mode 100644
index 7697bee..0000000
--- a/www-client/elinks/elinks-0.12_pre6.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils autotools flag-o-matic
-
-MY_P="${P/_/}"
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
- https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
- https://dev.gentoo.org/~axs/distfiles/${PN}-0.12_pre5-js185-patches.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
- javascript lua +mouse nls nntp perl ruby samba ssl unicode X zlib"
-RESTRICT="test"
-
-DEPEND="dev-libs/boehm-gc
- >=dev-libs/expat-1.95.4
- bzip2? ( >=app-arch/bzip2-1.0.2 )
- ssl? ( >=dev-libs/openssl-0.9.6g )
- X? ( x11-libs/libX11 x11-libs/libXt )
- zlib? ( >=sys-libs/zlib-1.1.4 )
- lua? ( >=dev-lang/lua-5 )
- gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
- guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
- idn? ( net-dns/libidn )
- perl? ( dev-lang/perl )
- ruby? ( dev-lang/ruby dev-ruby/rubygems )
- samba? ( net-fs/samba )
- javascript? ( dev-lang/spidermonkey:0 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- cd "${WORKDIR}"
- epatch "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
- mv "${PN}-0.10.4.conf" "${PN}.conf"
- if ! use ftp ; then
- sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf
- fi
- sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf
- cd "${S}"
-
- if use lua && has_version ">=dev-lang/lua-5.1"; then
- epatch "${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
- fi
-
- epatch "${FILESDIR}"/${PN}-9999-parallel-make.patch
- epatch "${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
-
- if use javascript ; then
- if has_version ">=dev-lang/spidermonkey-1.8"; then
- if has_version ">=dev-lang/spidermonkey-1.8.5"; then
- epatch "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-1-heartbeat.patch
- epatch "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-2-up.patch
- epatch "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-3-histback.patch
- epatch "${FILESDIR}"/${PN}-0.12_pre5-sm185-jsval-fixes.patch
-# if has_version ">=dev-lang/spidermonkey-1.8.7"; then
-# # fix lib order in configure check and add mozjs187
-# # (these seds are necessary so that @preserved-libs copies are not used)
-# sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs187 mozjs185 mozjs js smjs; do:' \
-# configure.in || die
-# else
- # fix lib order in configure check
- # (these seds are necessary so that @preserved-libs copies are not used)
- sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs185 mozjs js smjs; do:' \
- configure.in || die
-# fi
- else
- # fix lib order in configure check
- # (these seds are necessary so that @preserved-libs copies are not used)
- epatch "${FILESDIR}"/${MY_P}-spidermonkey-callback.patch
- sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs js smjs; do:' \
- configure.in || die
- fi
- fi
- fi
- epatch "${FILESDIR}"/${PN}-0.12_pre5-ruby-1.9.patch
- # Regenerate acinclude.m4 - based on autogen.sh.
- cat > acinclude.m4 <<- _EOF
- dnl Automatically generated from config/m4/ files.
- dnl Do not modify!
- _EOF
- cat config/m4/*.m4 >> acinclude.m4
-
- sed -i -e 's/-Werror//' configure*
-
- eautoreconf
-}
-
-src_configure() {
- # NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
- # As GNUTLS is not yet 100% stable and its support in ELinks is not so well
- # tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
- local myconf=""
-
- if use debug ; then
- myconf="--enable-debug"
- else
- myconf="--enable-fastmem"
- fi
-
- if use ssl ; then
- myconf="${myconf} --with-openssl=${EPREFIX}/usr"
- else
- myconf="${myconf} --without-openssl --without-gnutls"
- fi
-
- econf \
- --sysconfdir="${EPREFIX}"/etc/elinks \
- --enable-leds \
- --enable-88-colors \
- --enable-256-colors \
- --enable-true-color \
- --enable-html-highlight \
- $(use_with gpm) \
- $(use_with zlib) \
- $(use_with bzip2 bzlib) \
- $(use_with X x) \
- $(use_with lua) \
- $(use_with guile) \
- $(use_with perl) \
- $(use_with ruby) \
- $(use_with idn) \
- $(use_with javascript spidermonkey) \
- $(use_enable bittorrent) \
- $(use_enable nls) \
- $(use_enable ipv6) \
- $(use_enable ftp) \
- $(use_enable gopher) \
- $(use_enable nntp) \
- $(use_enable finger) \
- $(use_enable samba smb) \
- $(use_enable mouse) \
- ${myconf}
-}
-
-src_compile() {
- emake V=1
-}
-
-src_install() {
- emake V=1 DESTDIR="${D}" install
-
- insopts -m 644 ; insinto /etc/elinks
- doins "${WORKDIR}"/elinks.conf
- newins contrib/keybind-full.conf keybind-full.sample
- newins contrib/keybind.conf keybind.conf.sample
-
- dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
- docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
- insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
- insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
- insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
-
- # Remove some conflicting files on OSX. The files provided by OSX 10.4
- # are more or less the same. -- Fabian Groffen (2005-06-30)
- rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias || die
-}
-
-pkg_postinst() {
- einfo "This ebuild provides a default config for ELinks."
- einfo "Please check /etc/elinks/elinks.conf"
- einfo
- einfo "You may want to convert your html.cfg and links.cfg of"
- einfo "Links or older ELinks versions to the new ELinks elinks.conf"
- einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
- einfo
- einfo "Please have a look at /etc/elinks/keybind-full.sample and"
- einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
- einfo
- einfo "You will have to set your TERM variable to 'xterm-256color'"
- einfo "to be able to use 256 colors in elinks."
- echo
-}
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index cc62902..476a621 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -24,15 +24,15 @@
DEPEND="dev-libs/boehm-gc
>=dev-libs/expat-1.95.4
bzip2? ( >=app-arch/bzip2-1.0.2 )
- ssl? ( >=dev-libs/openssl-0.9.6g )
+ ssl? ( >=dev-libs/openssl-0.9.6g:0= )
X? ( x11-libs/libX11 x11-libs/libXt )
zlib? ( >=sys-libs/zlib-1.1.4 )
- lua? ( >=dev-lang/lua-5 )
- gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
+ lua? ( >=dev-lang/lua-5:0= )
+ gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
idn? ( net-dns/libidn )
perl? ( dev-lang/perl:= )
- ruby? ( dev-lang/ruby dev-ruby/rubygems )
+ ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
samba? ( net-fs/samba )
javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )"
RDEPEND="${DEPEND}"
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index a85b05c..9d96374 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,3 +1,2 @@
DIST epiphany-3.14.2.tar.xz 3063764 SHA256 cc69403b3b7addf30dd6eb703265a77102b8ab3c6194678ad0d2433f251492d0 SHA512 895f70768c4c765fdc221b2d44bfbb6e7599b0231b0af1a7a8a869fd461db6a09cbdd7a0120bda5dfd583d1d667391c574f18caf1aef5971b474d34911581dc7 WHIRLPOOL 0e235b3190b0ef42a9caa241258060dd5db1e8db07275102ec50b5223931badc56b6ad0c7ec32ccf27d74308845d4d9aef736775bbf6e5290a5d9275bd5c669a
-DIST epiphany-3.16.2.tar.xz 3084952 SHA256 a621b5f443bc168980d12452f1a031e0a50d99ffc825989a38b14d398def73e6 SHA512 424408e24bf69f8ad62e4c384d916890e128d164c8ab0c2932fa143f2989f017eb56d0b4a9c5e77518124c1e6d233df152ab6b85e3a1f26f28ddc97200c5aa83 WHIRLPOOL 2c970e2b22742193f7c2e9fd17a55f528132eb77dea0b3c8f83faf3c3f7d530343ccc26de51871a98fb92ab185b691b1d5dab49853b8415852c7b8b8518e6635
DIST epiphany-3.16.3.tar.xz 3082680 SHA256 d527f1770779ec22d955aeb13b148a846a26144e433ff0480c981af80e2390b1 SHA512 68f4dc0e299b929f244818d93a9af14f48ef2c3a93813fe5457c11d37ddb5a5e2b5ae3f93f0d41e8095590f87d8679d2cee5b6298c128475a9ad9eb6aa3c8bae WHIRLPOOL c82ff5051ac3c1ac2480b846f77893f39f52517f0aa0f7a6084e8b24e98f490264a6adecd89671d89719da835ca84f0613019e281280380bb20d980c2294afe9
diff --git a/www-client/epiphany/epiphany-3.14.2.ebuild b/www-client/epiphany/epiphany-3.14.2.ebuild
index 154e4c3..874cc66 100644
--- a/www-client/epiphany/epiphany-3.14.2.ebuild
+++ b/www-client/epiphany/epiphany-3.14.2.ebuild
@@ -50,6 +50,7 @@
DEPEND="${COMMON_DEPEND}
>=gnome-base/gnome-common-3.6
>=dev-util/intltool-0.50
+ dev-util/itstool
sys-apps/paxctl
sys-devel/gettext
virtual/pkgconfig
@@ -72,8 +73,7 @@
--disable-static \
--with-distributor-name=Gentoo \
$(use_enable nss) \
- $(use_enable test tests) \
- ITSTOOL=$(type -P true)
+ $(use_enable test tests)
}
src_compile() {
diff --git a/www-client/epiphany/epiphany-3.16.2.ebuild b/www-client/epiphany/epiphany-3.16.2.ebuild
deleted file mode 100644
index eee9b2f..0000000
--- a/www-client/epiphany/epiphany-3.16.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-#inherit autotools eutils gnome2 pax-utils versionator virtualx
-inherit eutils gnome2 pax-utils versionator virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-# TODO: coverage
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+jit +nss test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-COMMON_DEPEND="
- >=app-crypt/gcr-3.5.5
- >=app-crypt/libsecret-0.14
- >=app-text/iso-codes-0.35
- >=dev-libs/glib-2.38:2[dbus]
- >=dev-libs/libxml2-2.6.12:2
- >=dev-libs/libxslt-1.1.7
- >=gnome-base/gsettings-desktop-schemas-0.0.1
- >=net-dns/avahi-0.6.22[dbus]
- >=net-libs/webkit-gtk-2.7.4:4[jit?]
- >=net-libs/libsoup-2.48:2.4
- >=x11-libs/gtk+-3.13:3
- >=x11-libs/libnotify-0.5.1:=
- gnome-base/gnome-desktop:3=
-
- dev-db/sqlite:3
- x11-libs/libwnck:3
- x11-libs/libX11
-
- x11-themes/gnome-icon-theme
- x11-themes/gnome-icon-theme-symbolic
-
- nss? ( dev-libs/nss )
-"
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works
-RDEPEND="${COMMON_DEPEND}
- !www-client/epiphany-extensions
-"
-# paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
-DEPEND="${COMMON_DEPEND}
- >=gnome-base/gnome-common-3.6
- >=dev-util/intltool-0.50
- sys-apps/paxctl
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Fix missing symbol in webextension.so, https://bugzilla.gnome.org/show_bug.cgi?id=728972
- # FIXME: More information needed per https://bugzilla.gnome.org/show_bug.cgi?id=728972#c5
- # If you are able to reproduce the failure, please provide it. Thanks
-# epatch "${FILESDIR}"/${PN}-3.14.0-missing-symbol.patch
-
- # Fix unittests
- # https://bugzilla.gnome.org/show_bug.cgi?id=751591
- epatch "${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=751593
- epatch "${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
-
-# eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --enable-shared \
- --disable-static \
- --with-distributor-name=Gentoo \
- $(use_enable nss) \
- $(use_enable test tests)
-}
-
-src_compile() {
- # needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
- unset DISPLAY
- gnome2_src_compile
-}
-
-src_test() {
- # FIXME: this should be handled at eclass level
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
- unset DISPLAY
- GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
- gnome2_src_install
- use jit && pax-mark m "${ED}usr/bin/epiphany"
-}
diff --git a/www-client/epiphany/epiphany-3.16.3.ebuild b/www-client/epiphany/epiphany-3.16.3.ebuild
index e0ee495..d1a927b 100644
--- a/www-client/epiphany/epiphany-3.16.3.ebuild
+++ b/www-client/epiphany/epiphany-3.16.3.ebuild
@@ -50,6 +50,7 @@
DEPEND="${COMMON_DEPEND}
>=gnome-base/gnome-common-3.6
>=dev-util/intltool-0.50
+ dev-util/itstool
sys-apps/paxctl
sys-devel/gettext
virtual/pkgconfig
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 6b83527..e7a9325 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -302,89 +302,89 @@
DIST firefox-38.3.0esr-vi.xpi 467505 SHA256 c24aa36964a321b9cab209a0ba851ccc268db3114f9209ff742c4ec0f4e4c8c8 SHA512 0536c4d48ee8ccce997e4f0302390af29ea63dab9152ec68baba4e6001510c1a003cdeaf8e96d6fe117039100f51a18f1c14e96908debdc7c30e627ba4e24cdf WHIRLPOOL 97911daa9241dcc9e844998eeaa6f0ace8084167ada3a94771f40fdb26650afb030075ef10e086a5ab79afdb4d54a53dec2aa459b82744a585fe9eed65781607
DIST firefox-38.3.0esr-zh-CN.xpi 488277 SHA256 1c1def4062ce15660670d7d31ee7672359fc50e9fe4b1f8d80e96f0d8adda199 SHA512 e9fa12f7b3fe537e82e93d9435f64d235c6f9c48b2a13c5fc43c8912c9fa6989eb28d69ea80abc55890f0e706490da56194af3a3af2133aecb4ffe8aa4bc2440 WHIRLPOOL 9de780fa30840d1193bf498cca66f81419c3e8526d1156d3629efc837855c2a771415ad8172bd24a85bcc64733da34a62f39a6f686b22cf8fabf9539d7cf9ccb
DIST firefox-38.3.0esr-zh-TW.xpi 467844 SHA256 1dbaae6ea46991f5298bb5c03f0926b48d77c058ff07c44601377ecbe9837be3 SHA512 2a1b70a5199826983f877e1b435a650150533caa708e43b437ad41ea0f67d48225a54ad6980515eeacbda843c1a901fe0556b7e2362afdc3d63b67831b6b566b WHIRLPOOL 77f09701a72ddfb7610c842c97efef613cad31c573a3b8b4277f15f2c64e01423b2800dd5237b529a8a00b8aec876998a2f7c66d8ccbcc95880e3edc86cfdaf4
-DIST firefox-41.0-af.xpi 486121 SHA256 9a81d311727c1b393eb5a1d420c77a26cc01327b3c326a935b8b31b426977ab0 SHA512 7360b653fba4002ff08e19f955947ac4e5a581ddd93174ad468d1c53caaccf48596a9cc0d50455d2eaace12d8384955c50c23a84423221153c747b85f93a6d91 WHIRLPOOL 9766bc2c596e70f3bd7a672ba534c29d81aafa6f9f8f123d4dfb6ebb379a3767700a992142186840beb764046d77f4ee2fb5121442379830b0b99d0f53bdb485
-DIST firefox-41.0-ar.xpi 521159 SHA256 bb9ee3d703c10f9bc3e12e9f62ea95511955239a20fae81918f0c0529685baf8 SHA512 22a3e417d2cd1ff62e6e05929a1a6318074d3328b57abc34ed5ef07a3b634715d8b8a60092d7548c1ba34f1a63aff4213621b6cf0928ac52b28669ada270b01b WHIRLPOOL ce8a9a7dff478541577d52f84f6d0fbab59cde374e03878500b3976a2336b33a81f10e72d9e4fafa0a1d40e052250823d377973ee3e678c74fad8668f1a1c2de
-DIST firefox-41.0-as.xpi 511219 SHA256 2bb52d1a41ca3955a460f0f2d48efe3e2c99ab579d72f1c183faed70403bb869 SHA512 10f501ad24a4a94b154130f8edc1535e4cd8f0445255df7efe79daa5e0a57225a7a08709f94d6420076a9b417cf5eae9908fed34867eb2387eb86aaeb62647e1 WHIRLPOOL 7365bb0e4bf7647522cb3406a48c651b03479686583dc99d4f2ddcb05e863ea567dc95d2b0c0686442c794b7cb817c99e3b9101d976c2f0105d219ab7256a4d1
-DIST firefox-41.0-ast.xpi 399122 SHA256 2be891b76d75d39310f35c290a7d93aab8b6d4cde87e65f0820760fd230c7985 SHA512 34ab36df4257cd9020502c3598cdcd3b9e2dac62c0b6ccb894b4b2090f652fbdf9e5cdee704ae3c900166c2e4b910db35bd1fc1c1a4debb4ee3425a8f15dba14 WHIRLPOOL ac63e2585a58c599c00c0fb0116aa50640280d16557f1c54e6a916de37ffcad8aa45cceeba319dbcc1c538151f504b291350bf5e224525fd49fd9bd993b6b21d
-DIST firefox-41.0-be.xpi 453403 SHA256 3611cb1cecd6fd6ddfcc57ef936a351704299a54362d000c16779aab7f7399ec SHA512 497daabf1aaec05fb0ce31acd0cad0e4a924c3077bdc2c77ef63d7ad9532681611310ff5716c04d529677526e90baa19fc82c9e5e5496914857a9382be29f2ef WHIRLPOOL 9b3a13ca04ba8e7dc73a723b71ec33502c26ad41a03023d97031d8de9435c54651e88828c68255413f5f2a8d6132ca923afe4a810b6338b6c30f5b4fdc51ccfe
-DIST firefox-41.0-bg.xpi 492965 SHA256 45842f478fbac439a828950fd8a708352e6f249c967d71def55eeae0ec49c78f SHA512 caa8f7da30e3b4eab19e4f33b2e8cc2aa7b1a67a908eb061a3feca2ba9c4fd68c0a577ccff1dd6f025ba963dfcedd46ea0ce555f75914e0dcd2887ac82c2e4eb WHIRLPOOL de8e489948a1095b3fc3ddcc0cb2bcd6a77002326b3cfe168e62996c68d68a442f5a8ca6de9e7c5e872f1789f522a496442a0a38094d3cc6a4e36a15b61e50ba
-DIST firefox-41.0-bn-BD.xpi 527570 SHA256 de27686738705b1291118126d87f9f6f60075a35abc3651ebbe8c62d3624f8ba SHA512 ad44ca81bbcf4f3861736dd688ba17b70b9897f6332db4d4d8ca6c86f98e35817971697302a15964afda7dfc2323e353405e1b4d82a74785d12a22d4b6aa11f0 WHIRLPOOL d2c813aa0f9ee56df5ca82e4b082b71fb4baf2f8d458e26a5277579c250191d1e9869f1ba05d2156f5936d8a0ed3abfe1421b202837646766ffd085d57d2b3d2
-DIST firefox-41.0-bn-IN.xpi 530267 SHA256 bc94787dc80a9afd100c0b784374aae1bdb03e03e496ce6f6cd5b7e3d254056b SHA512 3c4842d8b21718179249d6a849e10c4a0ce69e892bb0abfbb459c1e2679ba248549d04f48fddd24782ed04f45348be951b5858615f1ff4bf2a6e8dc41e672e32 WHIRLPOOL 49baa57523d50a3d789909588c3707b2a5cf9e90dc9fe4b79683b6e310faddbaa038775f2e757a1c47bee27dd2fa943501056fbc62a072f0ceee5e6817fc3ba6
-DIST firefox-41.0-br.xpi 444530 SHA256 98db3d58490a3bd71ef114a8d066fa8515450b6d85c8474316f46cf7e4c0a3be SHA512 93bd12eedd8a87d68523f8f556c918dacdc54260f9f6b5a496fb63981460687ab614f15a3e9585926bcaec9fbe1430290461f788582e4ce005774dc571bfe359 WHIRLPOOL 5bb77519e61adf4c3fab68af264209ac294083adc864052f41be199867de48181a472cb53809193a689970c891189dcb44273a6595ba2758887ea60de7e38bfc
-DIST firefox-41.0-bs.xpi 486281 SHA256 20bb1ecb9f4aa63163c6121e74a25b5d6b55c33b2dbe13531962df1dc52dad10 SHA512 67bb9bcd6f5c8ba7a07f5481eb32d7b836af83e704a831c176f9ef2bae0285ca5f1f6af9126326abeac2365e6e94a890d12e6c40c1985f01818abef953520548 WHIRLPOOL c82de7434d1c78c577b0615b98e3c4a2689f63c429fb8a28e2cf8e98207e59a5bfd8c7f7ba647dc4853e8e9633ee65d64dc331fbdbc8a96b3672d66aae95dce8
-DIST firefox-41.0-ca.xpi 461321 SHA256 4921859dd265dad50f39187b7036e9154a73d4d32d5153f2c55cf529fee38e57 SHA512 36697ba92a072c5fbd3375d4dd6e9be6e4743ea3bd927489d8334aab54347a133cf1f7103173c478e1b8de3fbe2864e41d1ea3ce919c11bb672e1fff3e275101 WHIRLPOOL 893552baaf7c5366713cdcfdccbeab90e924a86c75680df9725eaeb22d131b9b948d4266fc67b207c49a8f8908d47b09d9d5cb7db1b39c71e505b6b74ab3d9be
-DIST firefox-41.0-cs.xpi 450333 SHA256 5fc00e06ade7de4ab82d93fb87f698c990f3764fbe56ea2780ce06af0b752413 SHA512 d5a2fb52ab68de7ed45b4567d80a0d92149a352d12b37463629ea09a523664bee31cb681a732cacc42166ce308bd6ff67ec2194a628f554c3547e8b097228a65 WHIRLPOOL f28f199edecbb84359df9bfe7c9cb2fc161edabf2c1f89903d7c22c4362340753d480b9e2155d82e63bce0132a3ab205c5017ab7b5b65b3df61800977922d60b
-DIST firefox-41.0-cy.xpi 448183 SHA256 25c0e0d472878821b3c45867f910ba90414ee419894f7f01dd9484ff9ff7e973 SHA512 96ab90a1722ca702e6d3a23733769f8fe78cd04c7f3113ae2c2bc58dca27beef42d7185d8b2cee03fea6182abdf0ee97b4400539612b1217f00d69cee6497d11 WHIRLPOOL a0122ce73c5d241a5b0832435c4d4fc7e602c9ee867a1d2e65c5375d4008b928eabedf9a42fd8173de3583d378c2ed33d10ac21636f95880a070a81a17497433
-DIST firefox-41.0-da.xpi 453403 SHA256 96d7193c09620bfe570ae37deaaf356d182399057ecd70341c2777188496e64e SHA512 b552670bf54f2ad316aa3c9ed8c45ec5c2c3d22f0c7b906d0832dd3d29a78614aaf038772ce0cecc92e9d85e29b9258cb1775e28f0c23efc81dd79c46e43b424 WHIRLPOOL 8e73524f09af961f7f3b59e2c8c233115bafca53a75637cb32b2c482711c03a56eb4d9d31e78b0f7920ed9acca575629f4929c94b2f862fd3f6b5435e5df4e9b
-DIST firefox-41.0-de.xpi 455710 SHA256 5a28c5751581e669d0979c62217cbf7b9ac61995dcc35a53ab675e241e374c7f SHA512 1cb61cfaa38326f3b27cf137e41813232839c09981e5979b8921ea7c1d4572ed058e496a621859004b5b088acad064a6553766eaf1fecef66d621ef95501c845 WHIRLPOOL 9ca448a7353a34f178a06fbc69ecf1f814cd0b9cca274ba9bbac7cd0f7d2636c29b8e0acf10bd2af0c49d299437191f70994d2fd4d815276ec316cb17dbf49ac
-DIST firefox-41.0-el.xpi 501619 SHA256 f1437c41e2450d5101c3fe2b5e128157d33f5b93336483db36314f3a5e3c9f96 SHA512 0d76c3d5ea7b32f8873571794abbfba055db6cc7e97ec1ded1e7bb95a997aab01c1e4b134fcc2ad3ad97020d4ddc5ffb0602ee3111bacdd46db50f134504bf8d WHIRLPOOL 4c587afe61c6a2ec680cc017eaff5c2de0933e2ed5f1a89ba02a517c195e5764856bac2de27663d79bf7dddb3fc379a8311fc7617802bade7ea0d93881b35621
-DIST firefox-41.0-en-GB.xpi 441098 SHA256 a419880aa591291868e86d15dd0af1fe20f55cf18e62cfe272e71bf09b2e6b7b SHA512 4c410f1a284feeea914a490211a932185f1c397e8ebfddbaa5d887b8059896f69299ecf14d88da7cdf9ffb2729858d135ff9fa108a33cde91de30d82943f41db WHIRLPOOL e30ecac6cf747e9e3f6d04d987894a802e35da284e241b319c8004302e8a6bf7e8af41424493564df276deff8f4fbf31b09f72027bfcdfbe638b788456e481d5
-DIST firefox-41.0-en-ZA.xpi 444145 SHA256 5dc4e9357ad6f826572f96305ca8d1c5fa74a4c9c82fcbb78b3a7f34d9ecb242 SHA512 4d5e35e2e60e18c64ca235612039de0ebaa067acc76d8fefbd80000fb975445d5a7fe986a2a85f2709ce4de5de46cd469b428d7092a13d01707c3820b47473ef WHIRLPOOL 26817dce4d8fb2b854661d57f9ca16cd3b6cb9b9f108ad82be596b71cdda872721fcd7e48f5409930811f9c3f572db7edde5c8bab3c84b00ca28508c5e8e56b6
-DIST firefox-41.0-eo.xpi 487994 SHA256 15ec1dcf88b51b671e2369346e87a0503b2b1ff8c32b9e91389816a4eadbc8e9 SHA512 c801ba5d8cac36932e2fae88496c16f3623f4511ddecdefd81b5d99f4602927d17835d0a9d3456d167fe88935dd3b3ffac14f76708f871a519efa06f3048b838 WHIRLPOOL fa4d6a37b437ac2f62f779927722c4687a58842d9cdc70fff4832f35b3dda7ff49f8324018bda4f87a3b04a8767d5e8c4bf56e6ebbd80392b4ab4e4fddf10dbf
-DIST firefox-41.0-es-AR.xpi 456517 SHA256 535f578884c390698c97db2717dd91f3d948fb135b8ba4f1b5ec09d796092ce5 SHA512 b104e011d8655c6f884af6e1aadf22eda9505bfec3f8daa12a408670f6a3e8f37bbbf43e33fb9b630ba2c0d810981e98f7ae6f3a31ada727c9321fcd76b32096 WHIRLPOOL 6fe88da24b22b9ebbc9f367b135a7b458d39b5deeeecb7a47cef4e776ae82e2319e21bf912b19b3719955cd57aeba9101361a61e2a1bf4309107f33ea09a5b54
-DIST firefox-41.0-es-CL.xpi 381632 SHA256 b65d4c72e66642d5188bf12686f2541d2b5178be83ee2fb727d82877aa1aaa3a SHA512 afd83956a754af7de3babf4f829e204cc91cea2b3b9490dbd0457a45f85ecc5d892f947dcd343949806a79caecf239051d57ba927cafbd710e4358a9f6b64825 WHIRLPOOL af6da1a91197878f08aee00eaa9dde7afd5eb872cbc43d3412fd6b7ad84e12bd8788bbc68c54194fba33275014585b187d238e238c265d08729271604e374adc
-DIST firefox-41.0-es-ES.xpi 370111 SHA256 ca7968f53f99bcf8e5369926b0e8b23ca7272e54bd15447fa42d8588fdbcdbd6 SHA512 e0a79f007f655d80fd4bb665e6e1d6e91eeb6d7330771764475e17a7539d5770f7c51d7eb66ad906ead815d672d456dbd27712a7ce392de7143ab976dbfbb36d WHIRLPOOL ce903e4dc39c2c9174f3f14dfe36883c870ba32500173f9d6eacb1a3cf92d6d53d9aa3a93e18897fdccd7b2a18258acb10a55c8d1110e95ed61d0b7606784f13
-DIST firefox-41.0-es-MX.xpi 460283 SHA256 a6384d393b6c82d29834089db412c98de0ce58ef7293c59166b6675f236ba0ef SHA512 635cd6c7aa1894d7e0f1277f6910d3f83848133cad8e4e1c885edaab49c43690629942a11c038ea7947f72d84aa3a46999823c067c47be1cf8aa7d5f7444bcdc WHIRLPOOL 69b3fbe36f5307a8e5df9302ef2140633956da6692b8c73ea244a5dca4c01d72d1bdaf8de4d22aa5fa67dd7e423ccc825b243db87e701c1cbfa76c3b4b572596
-DIST firefox-41.0-et.xpi 445439 SHA256 71db72097253d9eb7964e220ac7d559d34dbf0e1214715814349ab5fbcbd2046 SHA512 52ab6237a77bd914bad894707bfb2e2ef85b03f568c5c4d6ba91f889fc7e7fe6645caa2239b431122f4bcdb9699e0e5ccb950bd5c8bb8487a6e514cf69872402 WHIRLPOOL ae0d8c78f79297cd22aa49f4adf5de14e6e4dc3663511c0e99b6bd2bfb7eae815358e739c6405ca1c2276cfbfdf04d37af162dda14e0dfd3dff2e4e85ff223cd
-DIST firefox-41.0-eu.xpi 469716 SHA256 47cc5e46baad2e03a17cdfeb054d0d3f102094b4e9dcb1c8a49d104324f6115d SHA512 253191ce3a5d69a8ee35405c227432c966680a2c543ef7de4db10a32f10c4745fc3d4c007acf9cb7f357127a65cedc5ef0077551c2c8ae8d8239060d04abe6d5 WHIRLPOOL f93d58cbc4c228c317797beebc03b938c6bcafe3182873fd4dce8660170c790e5d39fdab0f012f990725e09dbb9dd7dce465bec34c07fac144e4569a18b91c37
-DIST firefox-41.0-fa.xpi 516157 SHA256 d3c1491021de3477709b2f77a2ed95e4a4b37fdadf37dce2892edf689cbc015b SHA512 2382628af646d24931d313cf8f2a5b2a6d70e33cbeb06da4a3ad6bbb5e867c4adef7339f6a8e80332485636a06332ac0d272e6c0d355c7537ef0e8d4c93ec7a3 WHIRLPOOL 8ec6dfafb853434affbc876e63c827d4195f32e0a9544e1cd562453746c130b019af4bce165980b0ebf4f5043484a4ed7555617e4d42c8f109126a7d3d6477b3
-DIST firefox-41.0-fi.xpi 447174 SHA256 0c919f496c2a0e1503a8f37ded5938100680e810f6025cea0e84ae27f70b06ee SHA512 aa5740c3cf004660e20b12ebac6f23c36c0246e1ee3806a89444d86bfd81e5d3609b4a5a12dd988b55feeec2a78ea8f905fd8c9708def684efc4b68fb98e9d9e WHIRLPOOL fb2ade664af6934dc5282ca1c317af4921225850e7dc1f289f2df814a792397c88c42b93c599498f1c96684bcf552f6f3b3b074d58a170e719962401b3153f27
-DIST firefox-41.0-fr.xpi 465091 SHA256 df5faa391722a201d6f6ecf08de01d393ce96dd122f378434f11440f825e5b10 SHA512 f924b0b4907b0761bb78cd3f2cf9fffb758493b5c0d1c73f8f0487176c006a42291b4ad308493fb2af5d9ae12b4e7ffbd448ef103f8bb1f5ccbe607356e81624 WHIRLPOOL 51b2e33708783aa68b3d66f85898aa9957115af217a6ee50f8be7f810bab98bcd85136b8832288a3480a0e61a053de06034e6900af2ab9ffcb3b39d855762501
-DIST firefox-41.0-fy-NL.xpi 458775 SHA256 8aea345024bd99ceb013899e839170b61e6ae6e1bbb5b9c65cbf92f2f610f35a SHA512 6537659614e3722268f02a61a558da1d9105d0150a07e9bae8f40b50dadcda73a04ea2b2deddb2800509306191c2a38c6b670eaf3b15f4a7195fab6bce3c5b01 WHIRLPOOL ad7ce9a8cf2f2541dd89781453288343b02fd68aaa3e9a60d78d0d27d6b29b5d0cc289a320f642da160146a52b4a6aac10f32a38f540d039c5f605013e18ca3e
-DIST firefox-41.0-ga-IE.xpi 473255 SHA256 ccb6e56af07c093f77db2224abefa80a77690f955d6d54f77a6d857fb672429d SHA512 873447d1dfc39861933f3a0c65958ea3692aeb78bb16be04d18879130b654857aadd61618b30d2785d6cd7afee594722881f8dd5b693c17d2658ee1acaae17da WHIRLPOOL 0c627d36058f310e5ea093123327f0925e8ab52161730b51f172cd501b97ddde46a4be8d7b51b678cea27b9f11c20a4ac5ef4deb27109e77a49a3a0bf5aa8756
-DIST firefox-41.0-gd.xpi 457498 SHA256 12ec59d2dd84dbd1e9efbb6accbda523d93845b1198ed54ed4a1712bd50268ff SHA512 d4d3dd06ae3f2aa815f5578ef7012cca9f8f4ee272a9cbe4ac05690f80902e58c4273a88b0f4e090d822a3af58e2c97a76c835491f7391ccc316895d76c3c8b6 WHIRLPOOL f9386eb4f34ab9273d60c259ed0a3438767176e747db7017f09f09537a3ff437efac26e59cc0f9636f388b7c2eb70c349817e166245a550963b4a893dbd7bf6f
-DIST firefox-41.0-gl.xpi 452610 SHA256 db9f28f2202dc2cbe96729d1afe9cf41ab94ada69e5f1305c4c15d2d0cc6416d SHA512 a6d48410ae15e1dc0b63928fcdbac8491a418d4afebae2d207f6f6b2329b6e153d7fd8443d87250cbbfdb0b1b3e9987e1417336890a23e7a15ae0a3312d01260 WHIRLPOOL 387dbc1a2cbe5572b92e1e063a5df99e4fa749bafd4716f515b1466614eaa4010f0385fcba9817ac6fcc20ebda392a3c2406424c5967cbc7b6dcb79b295e4e66
-DIST firefox-41.0-gu-IN.xpi 487514 SHA256 53463a96319f19c4966cbef96f2a6fdbabe6e7e8f77473e74541e26724516a92 SHA512 2a4018346569539d938ad7ae00a9cf99af2fd1cf34e94edc76f45a5bc87a449e8b4287716fe21dd55c4273780c38d919dede43574df2198456ff4a2d465b432b WHIRLPOOL b2fefa07a638e0aadf30f5d30cf146c6934b1482d4ae06a41db14d7bb92599f1f63fcaf1c87a957fa384b17013ac68f7c50bb57ed53e8e0f1727fde5a7e73265
-DIST firefox-41.0-he.xpi 486489 SHA256 21d0550c2c7a3f017f4e1f83859387929c41f7f1df06db3b073852ac436fc435 SHA512 c1b5bd6ad7cc3235b342a168e94a15de5bafcd5ab369782e442e5cc456e5028061136c4bdc8de6ac310b230524de0e64230eb2c9f79f78506181e1743fdc29a8 WHIRLPOOL 77ad65be57b093b1092b7c36f4b5d87ea6e0749fc1b5a489b270a690b304db5b520e908d92092cbabea4c68892eff1430e7954c30a7a8d0553c82b6f1621f8a0
-DIST firefox-41.0-hi-IN.xpi 509161 SHA256 b15756e16e5998219c2505e06d5a05aa291cfbb73bf31556d55ce57284c535f6 SHA512 616f9194a0334a9ed0298b82bdf2835f0dc6a963d364c452b5657ecb77ef5ec43640815df288afd1ff1ab9e4383018301349a6b967ad6be18344c6432b43763f WHIRLPOOL 4268d599415f8b965bf6f5c5c21c6ed227cd2954641b1509fce8b28c851ac98570249ffd0fab82ca9dd3241f7c2e1870804edd756192f0f4eced078ef526edd7
-DIST firefox-41.0-hr.xpi 481334 SHA256 b7fda3f4bc5a7d6476f8ea5cd4e7f9d9445133dfc21f9257a802e75792543e21 SHA512 38cf93ab0c588fac022a68e10f018cbd2e336ea6236e62357dbf89eb05af0c1e89afeb218f291c654cd3efdfb91394541266c58f188a9498b8d81e18c7328cc7 WHIRLPOOL c6b45d99245ccc62cf146926131947cde793744975ee559813a035edf7b026619a47c59a8ae465b51bad5198b79edef05ed05e0af70d049f8b8cfb1cdd142a9b
-DIST firefox-41.0-hu.xpi 457034 SHA256 ac254be8aae3d7feeb7e871f76d315a0d498bfc18ea706c5d51fad200554d86c SHA512 f4877411b3a14f9460cfb31b8f46fd6841175f6d7c5422fbaf520944aa40a9efda6635977db27ec963f228aa7c4b85db901c53c15107332ae5605f0180abd1e3 WHIRLPOOL e0c4449778d47e7fc6a6ded2ae88ec378b143aa0dc52d32f53d8b647b86e4ee226254779c2da03567e2a918640f8fe750ade895f021c9b295a06cc22657b67ae
-DIST firefox-41.0-hy-AM.xpi 538340 SHA256 86019023a1bba2985fd44dc18fe6eca18faccee769d2702ed4f5be6ee68cd0d2 SHA512 4b36e4ceb71ee5287b8d92ad51027253eab19b1e4c180bf0581547722c4736643d64c4e335e581c8493c74c09c8251275b2a810c99194b86febed04fa36360fd WHIRLPOOL dbe2d6532b05faa9d48593288d5fb10ae068aeebf7f2470b9791322f955a010dd25af244fa752984574e71b0370810ea0ecd990b2b02475424a34a29f31474a9
-DIST firefox-41.0-id.xpi 433970 SHA256 64ba7710b02a8454892dbb2de437e11a1e0ce660a6c072c54f3f2788aaf9ab0d SHA512 c7d7a10670935f47d8cd66ff15a105e9f1e4757bef3e2ad6d22caf710720aa8a40aaf69e8e688fff988a9dfd14976f895dd89101791593255786b5bd9cedb7ef WHIRLPOOL 35130da5afd30b7f72c507758dcf2b02618a6c8013f11e7b7b011cdfd6b6bd6c02e7f37a02a1f7baca32f2325bcff71e929c6424f4e2114407853f79e34255ad
-DIST firefox-41.0-is.xpi 488111 SHA256 ea2916c2eec477ea0baac33c5b506f2cbcee0e4023cf4d96d3a927470c40be5c SHA512 23326bbb11a426831f9e67dc11392624b5b6309e3e1b294059b2584280e2747336c70b7b4f4aecab3285145fbb5dc5844bc4491d27308d1b090e3fe4348d2b34 WHIRLPOOL 52701b4d2e5b18b81f2a25d54de8cde73a376d1cb014cc3772128a5ff7fabe60462bddee7a0caabda82e1f9345c48bf3e7ce97358eb62bf071149246c43b8bf6
-DIST firefox-41.0-it.xpi 363984 SHA256 81c0df60bd9a20f1f3bf6861b085a5172b398fc0dcdfc603e34ce306f80f37e0 SHA512 d5c8a3e3244f7be5f27785fc17552d4ac5a4c9521eea9191edaf39da79b5983e853dcaa7ff5732aba2d67695a89a7897bcaa2c052663ac6e34e0842286761262 WHIRLPOOL 4fc2a4951fa0efa79e4bee5f2c9af44ecb62207b0f755ac77ecd206fb7165c4d587eb61c9c957bc9b33c476e62514e71ecf0b25d2496b0eb790067d885b651c4
-DIST firefox-41.0-ja.xpi 483302 SHA256 32386da85ad191fc2c445759649d929fd7eab3940daea328dd3e1a56533a7c37 SHA512 75faf6e6aa8674893c58432aca01c10a9b53ccdecd331a8d9d65d95838d719a5697d3ec2cf4051c8c985136d6466e06ef1d105511159d134498baa411dce3ab7 WHIRLPOOL 8482142b6a596fbb8864b8784024d3d885c10ca36df2b1e6060ae63504549ef18b8d418a49e7eb92b34d1c057a63dd7d7e4e062120dc3e6b8bf09f5ebaba2264
-DIST firefox-41.0-kk.xpi 508364 SHA256 98e27a0caa00137e3a7908a18220af0b5447371875be40a20caf22678adba9d2 SHA512 2b3e4b70635eac7b1729c7f83ee7736c3ed5aa2c2535af2b0d7566e2325a0d27b352851cafce7787d92b45f802b8c31f2aa16ea5eaba917a31865fc59e4c17ce WHIRLPOOL 9e9b40489503e782ac7a2ce4a9600536788fa640d3644d2afbc41af995c797801eaf1995cd5b0e0afa6a9d05c92801f5747aa1c39e2869e50c9f42f2b1e0968c
-DIST firefox-41.0-kn.xpi 539237 SHA256 87c7e4b1b00499929fa89cff96ee7b2040bc3b2fa39da43d913b460730e9837a SHA512 40d5e9eb858fd32007b5a6d5eedb6561d63dda615d6c7586e2e902ab4eff49445dbffaf2f4f366a90eb65a6b794b4a76f3f1e4f2f6ae6c0e924feb449951cc1c WHIRLPOOL ce17c4de5b929720e7fd4aa0217ff2f890c294c2baabe1e1e7e4b1ef1eca1a5803a5dcd0c3f50f0f7f754dde861b8aa87311ced2a0ec0be3eed949b25db498c3
-DIST firefox-41.0-ko.xpi 464904 SHA256 bfd714e03b16a6e4e440bd1907186a9856780be70cd0af9daca3374a7a2006ce SHA512 7327fb21b853840e8e783e3206ad0c39af74ec6b07f798b5b2eded4ec496c0093683002264034010ec6cd888c4058864125d280cb805bb874afb5210b38116d4 WHIRLPOOL 6a4a4558770d3b5a48087bbe6407dee8e12658dd8468d54400f130af537f207dfaebadbbe83a885d15e07d0e086bddfdf5630676719c9cd8e5dcd3ed4e01f4b8
-DIST firefox-41.0-lt.xpi 490118 SHA256 46d2bcc9842f74d1a78e41ce470d2197fc8e5243886c0b4b62535ed930c2a01f SHA512 37d6e6714c9100418522f967da7fb28375bc77da513ec98d8e3f942af1d2d66b3bedec9e3529266fcbbc01a30823d86aee599648303e841d6d09c6e06f779576 WHIRLPOOL 53746c2cd388a49bd6e0b35f89a059a4a6cc181ac404848b318e5b23bbdbe45d7d6b8d25d86f03c3478be1fcd340179cd2e8520dfbd4caddfdf1543669dd1f68
-DIST firefox-41.0-lv.xpi 470364 SHA256 9f01b6c0c4647981f595c2827453e1209587c34ca947a5879f6b8fe9707c707f SHA512 135c85f2769353d11316345bf8b33f414cfce65fd9fa356b473718d37945a9c67131c726eb5036d6eddeee66443e3c7f00ba8eae8f50a6fd722588d21b687766 WHIRLPOOL 9b98bcf1f9fa8ac8fdba252d499c0d50b3fd95da9112e279162ef01c42fc8b978fbcfc1acc954dd0edc4620efb782ad8f7d2384785c72f5c45d4ce2f9970a472
-DIST firefox-41.0-mai.xpi 517160 SHA256 f3ececf56f634f8dcf3950d4bf9a7a21508021a45b99dff045135c1c037266c7 SHA512 f95cd6e8d6d47eae36769128da95574248722d1db3bfa7d23e1434113379621e983d8bb908cd7954bfb1e8f80dc0e419c254daea2e80eed3d5fc249c86745dc0 WHIRLPOOL 965f30fd54cf0558f0b48450ac7b02b00af9b5bfc256bfc76404b3d8fa284bb4e849ce8435de38307d27c44354ad45bb6fdfd6c51c2ec494af5a458a3f45784f
-DIST firefox-41.0-mk.xpi 530865 SHA256 1b8e4d2d5cfd8c8768b42b6d394b9132dc806672cab3d3f0acdd475e73d6abd3 SHA512 46a90188559048ef98dc49beba3579d39ca1b535afc5a4da255d84853e230b845be6cde35f57b0ca777274ed6d71005728843c9dc645462922dbc9ce124443b7 WHIRLPOOL fdc80c85875dfc67894a0b9cd2c65bd51a3131bbecc37244dc403bbe89103938be6208145c833a6fefb345ef68df2a3f20d0c8fcceb6503c79074ff15778e27e
-DIST firefox-41.0-ml.xpi 529030 SHA256 602b9759448353e33b8800fb392bc2e3785058d1ec2331528abc91a1021bbabc SHA512 bbcb0ea2fa1237503f49be1b8e8ede709c67e194a9229fb7ef95860669b767e93602011dfff7fc74493e309aa39193533e449bc7ffd543db3f9b6d249b41401f WHIRLPOOL 1a5ee0f39ca5f51bfa6a59fe9c034bfbf800dcfa793177a1fa2b21627922e4072cb386c0a1359bb923205b28dc561b61dd492f0c41489a788fb875cf6571cf42
-DIST firefox-41.0-mr.xpi 511323 SHA256 dbea36f8a4869cf15db2ae9a324d43297295d63c1a3dd8e45dfc4997e5d6676d SHA512 aca504bfa82aac7b5a448b2176f1dcac0f94f13895c707581a3adb54555a24b267d4e3de0c09fd7a29b41fd8ef8062847d2e63d70412f82abc4b0564879f25e5 WHIRLPOOL 1d6146beaacec918e83087f2e526629ecac912409c565d4c3a8eeefe963e39f733f9769220b1cb4cc5e21083ed15722b32de951b1b50397d45c688fcdc9f68d6
-DIST firefox-41.0-nb-NO.xpi 446371 SHA256 b70ff1288f2ebd217c67f0b4fa1c48dcd6800d98ebca03d880d01592eb1f9fe8 SHA512 1fa7a464d38f736aa8b70f8fcbdf46e88f9461f91d56863ae8ed8a6b186be55ee27e85db85c940b21c1903f4c56dad45c495ce34238590da24caacd90b6edc33 WHIRLPOOL 44752ad9b6a5da83a8770f712bdda672c94d22f579e2f22692e9192f873e8346ef1b0c031adcf3706ea702c2f84387756c0b4039cd0ca6e380d6d53318493a1b
-DIST firefox-41.0-nl.xpi 446545 SHA256 82998109c104b4277a54a9c6aad3caca8d40e89290ca33f18e876e85158ad428 SHA512 4d760d5e05c90347bc593eb11129ab18d79ee4c7c5a0f52209114c33d9614b4cb953f277c567277a12df5da176faebc05a32b44f7e3a96d417ce44d015139614 WHIRLPOOL c2e53b6e25c72ab609763ededddedc02ab3008dbc6e27b7758bdb637351243a6d68bf515460d2b85f3ef66d7d0dfc96c7003bae8549ffa87ae2a00e529c9842d
-DIST firefox-41.0-nn-NO.xpi 442561 SHA256 6f39bbb77c7c07bcc5612b1715262f94d4d962b5148384ab2ec052e1a4b64eeb SHA512 8d5a90b95abbb4a2b3d693b90742a9a4b626b665989b0b0af5683cf7070740c4566c33cdaae98599852dfc84269f89f107a57bf5c1ee5a57887039e92b7c954a WHIRLPOOL 00d013308ff1922accb18f2d2f5a2c311633d8bb83f6f8d4a1d66723aa2db0f789852b817b93bd9e64eecfd0102861a31dc4b401d7cc6bc7decff5451922cb41
-DIST firefox-41.0-or.xpi 528104 SHA256 c4fd3a8b1fbc8b79612b3d24b556419acce11a7836e21e7196dbe4e9eb0b4799 SHA512 262a3d43ba4c554de8506227fee57af053c30edea5a58377b05b19f1661d1dc33790267077ddca7b58c32942a2a0a2e72c40e9b59b59bf727d8c921cda8a12db WHIRLPOOL 99e5bad1d719668e0110ac91d75f003c43c5b78d8dfb5ef7292a60b975db16d3035abf2d5f5809a08847e7c19cc07f76dc276ea0293050a0358fa04e0d61f626
-DIST firefox-41.0-pa-IN.xpi 498581 SHA256 5ccc34672873d883693412696e0538dc16b96a712e0decad211fee4de5a2485f SHA512 b19c466277899b568c990dc56dc94cb753e5630d7801c53f27ccf5c8e9920e3708ee943b036cca3d6ba18faf5bd995e5f434343f1b246681079238ca965575ff WHIRLPOOL 029567ffe1aa3944cec7adad55ed64407266561f9c9435df0e264170c4ab9badb1ce0c15f2cd829119497d6b4edb153e122a4c559888ee047f0abdaa0a5bee36
-DIST firefox-41.0-pl.xpi 400465 SHA256 757411d39b98fbfb71a7e502e44c27f64f01f8a3936bbb84b08f2a33ccf0c2b8 SHA512 24b9851ca85e139266243bddfdf078fcca61af8982f5208c4a874e589dd0c7d0a688ae8a82ea95d110dedce62bd36815f648f92bb1cd14b04796fca593dc1a9b WHIRLPOOL 10ef0929b8cd97e6df4a093a267b963b590f287fad52d52a5edcbf34352e4751a3ce9967a127c7836647e74741046c9bc88715077ba2866acc6625da8ac97492
-DIST firefox-41.0-pt-BR.xpi 463057 SHA256 65ae606a712e05cfffcd2f48a352c6b1b5abf17af7bac53c33a4877957566149 SHA512 9a9e243982ca133e3cd01d4f9b6efdce44a2a5278aac28fea040c8acc64ba67ca2eadf38e92152427009800bc9037adba6a3da8eec14cfeb1c03b85c66be5c73 WHIRLPOOL c5c6358d48e16b5a4de9b178dade343d6af5c474b4d4478d9863b39f7873c9490c16ab4b8b0098dfbca7d3a9d0f5b6d4e0e65e99e4632699590b137f3f5d701f
-DIST firefox-41.0-pt-PT.xpi 443381 SHA256 550605379e3224bc792a9d0c892dfa78253f075fb127779500d36ca17c6f393e SHA512 74300e6d7f18c643dab3aaeca526b91424ded241634f3db981a3203c90b89634d530d8009f9d16a0771cb8626d8dc1262f541ecbb87779b9b9e8c1723288cd72 WHIRLPOOL 0e81c2bdab588eba3fa886a9ceae0c5a6685037da307fd4cdfa0378d7934db7219d35a7f2dd2b6f1aea6e973755f3e3111722270323b7562a91ee6486dd6c6d0
-DIST firefox-41.0-rm.xpi 450638 SHA256 55d2765289fb4c58c9563136f2fcf56f15e955c42a3bf13252aefb3f6545cb28 SHA512 de4062f7ca583aeefec0bc5e0bcbb58d8d30eb61456e2b7efcb70d6ef3192cdea520597b666ebe9726e4ec9546c13e39ebe775271a45e333e58d77d439dc2f37 WHIRLPOOL 84fab748f16b6d71a99faad471424a6c7b5a09e284b86d62d7c96b2f50008adf350255f01ab024b0f7a9365e5d135c114348f021a10836e37c6c1f672360f3a3
-DIST firefox-41.0-ro.xpi 497506 SHA256 4bad82622089310900ce2bb8c51aa9706ead23e5db1f143f2f672ad203777d9f SHA512 4cf069ce082071db014c96e7ca83887be8b740a2d5e14bcfce6b27f8fe098f4a8afd512bee2834b22023e55abb84d0e7d6cda750d88fee4549258e00d415829e WHIRLPOOL 2d65faaa2e559d360455f2119470e5621790a0de7fbdb84553b99409e3ac41de5c467ec947ee118e39c4872d0550fa9cf7547dd8070496ef9cc7bb76c6123363
-DIST firefox-41.0-ru.xpi 412445 SHA256 ecc0253088e310b0c696a6d371f4ba8418c35b9a37af89e6ba6594b458ec289b SHA512 993ca37613ffdb41c0adfe8779abf26934e2e1ef8d4bab6ce4f1518ecf6fde4f1ce3888dd14696a784dfa9b86c09f9d55f7c831b82c8853c8eb7d10e25b6d472 WHIRLPOOL d82b46ca86f28e77375438de982472f618c1d3034ffd3628ef5ef944a8cacbba78fde88732176a404086bfa4bca5e01750ee6ec9c359625f1824c4b3170eaf8a
-DIST firefox-41.0-si.xpi 537933 SHA256 635a596421c06dd5d5b00906fefc46462ffc8124b5dda2bd409bdcf188921e70 SHA512 df3eee2c864cc4fda3f4356460fd6ccaf43733b0445b1bd94feff8477f12e420bdcd5d8bbf2f2ad2a0febc9911a94ccf510db5f22dd0101a3686c3b80aec0fae WHIRLPOOL 52e9a5841835682cafeff0473da9620cace542589c3a1dd120ae4536be130a345626b726ebff295c155533d8aefc36312a575ae0289781e40c122fd4668c4359
-DIST firefox-41.0-sk.xpi 472933 SHA256 c3936ccbc02c6ce91d2f8ad339489ddca1840e7f3d8b17bd22a7dc41a4e11992 SHA512 4902b822938e02e2083ca4d35db1295f7f721f88dbdbbc48e2ae7f16926d5b2000a90991c57d5d77773b1284136b35d106ba7d55e44c0fd3db185a2b40cc1e29 WHIRLPOOL e06f1f128ff8da0d5943fb424d501ddce97e8e47e90d030bca80123b595b402228d0bfb1b3808cb649895c8703f35f20b6752628e1b485b758db7f1decc04b30
-DIST firefox-41.0-sl.xpi 445744 SHA256 38cba1c04cf4f67d1dd5ff906cea46d85f7de0267f16abe6c3d4c907beccd2f9 SHA512 520399638ca7300056be08b639cc3e1b8eaa8e867ce7814274a3d3ec022775e1b52a11da0d36808eb5d831968d5d31c69805654ba7762479814b532a76143db8 WHIRLPOOL 9e2c0a2a7e7925bfb6554f5502fe1c90684cf91bf246df865b309873783473714b51700d3690ebb8623ff8f1e1be28c4d151863f964fc1e59c6dda9245162064
-DIST firefox-41.0-son.xpi 453251 SHA256 24ad972e0cf7101962340eca64fdc56851699f207c629d5ed33dfe425b6d14a7 SHA512 73a35345b7fd828f47da9d887b49fd1c2b84f85e18ba904107e04eb6c285c583f4f8d6f88b52887df5fe9ca75311737f050da0d3d4fbed7c251a9fd42b8f434b WHIRLPOOL 6e6fe9e04c9b110a216d05623ed2c8446147e027dc4fe9fd24544629901cfe8a22882a38a34a1e399ae958441dd5bf9b42363d5a9bfc14160bfc7486335577ec
-DIST firefox-41.0-sq.xpi 491167 SHA256 ca0bd383ad3c871e52e0006ec7489ef590edf72f4894ebea75edb6b52b567953 SHA512 d654bc636058388e1c535bc0fa3dfa223ba3979f0a7c86dec38829ad52ce22054b2113adbeaa0adbfbdf07c6952fff2bec619fa1f7e55102cf964ecbf704542c WHIRLPOOL 1e86939786d34923919613b1dc6fc3db81b712f2d98aaf970932311e22c7d6a050d4c7da24befb595ce3cd4c9a65e9f11d9627f1d0892bb702459422f6d7f829
-DIST firefox-41.0-sr.xpi 482969 SHA256 59be1f67f0de0daa1800f806ec5760e6df852b46a65c4d99ead16dab6d35bab7 SHA512 1e9efb27efcbccfa41152a51179c732446176b279916098ac84d0e954db4a08e247cbde1f544da012d0c76b4e471dceb395cdcf467e1b77a7bf405ed3479913c WHIRLPOOL 70913e6114d11b9134e920758579f17b1a11735d9cbacf829f62fbea7311eaaab6e28b8d1ee87095094f0df3b452577edb61a6dc0e88e5680c6da06b6daa3841
-DIST firefox-41.0-sv-SE.xpi 455381 SHA256 949e99a51e305e35e310b3bb6ce77f57ea9e67adc9609704b240dadeaffc4351 SHA512 fae329b95c99782011ab8425a4722d82e25fba0e63553e5d9aab825cf15347076d5009d7dfe71abebb08ce9fe085b6c4d1688c8438baf875b9d310f48a18ccb2 WHIRLPOOL aa6d9b3e8e18f51e9caeb9c1d2771d51c3c4106f80dc604308f844200d13f0b842081959961b7178f0f4f68a7ee06437604d85def878b9a0484f7a629e2862bd
-DIST firefox-41.0-ta.xpi 509543 SHA256 38b8529a311078571bb3d876576c788b9b299f5d167e2a6820919238c23de979 SHA512 8730793ab21010b7066af29930544068735a9a11970d80d02974d5285989f1da21d9a7691748c90f6e7f06e0509dd9343b7ae03fae91d0b8fefdad440fad5921 WHIRLPOOL 5dbe96f30157e1281206babb199ba152329a4a13b08542d7fbafdb216af97e609c875769c9a82db0e1a8d5d421693fa1c5aaedeb4a2ea3ef2ed8963b673d1802
-DIST firefox-41.0-te.xpi 530202 SHA256 658c162206d3545f59f2b1847e4635a80211cb76bdb9d040e53bcaf52a6fed48 SHA512 87e245dc6eb52ea4a8fec025393fc3690cf97f53db5063d00cc8bc309ec59fe746de39511cedecdcea64ceefc59d6627cdc7b974b25cd3fb935982cef0a686bb WHIRLPOOL fa0bc19f68dea83aaf84d93597179f6640047255a4c7557db4aceb028e05d3ecbee298e8cee0c908fbd30ad0ffd5c2b092cc12da3fbd3c40d5700e7f0690a9c2
-DIST firefox-41.0-tr.xpi 484231 SHA256 65e7b4601f9dc50dea179b0eaf3e6a41a4634d43c667e2d84eb0b85dd11e5302 SHA512 dc00f3c1faa9166bcacb1a5fae06fb5c9c1f1bed520715ed2ed726bedef77ff511e505ee84be78743210c9159ba4e53196069b098878dbe8bbb766cfe44eef5e WHIRLPOOL 4cec7be98d753dc919a4661b2d1080e1890df43fd006dde9e888a5f4ffcd938dff4100db4357d782d4b5ad2b706d678836e8c9c1e50be8eb9b5d394aa117075a
-DIST firefox-41.0-uk.xpi 500109 SHA256 b53435b077205b2c7455b139f4555251da3df4dbe072e9ce779b72a8d8c19d47 SHA512 e29283e547bbac4fa5bef0bef26bc9fd17cfeb8a9ffdc0ad4d936b7d4eee5bb72e5bb731faa35001be7606b1428d47806432a96e83ea292f6d4606211b455c71 WHIRLPOOL e8a819a06fda3c83a43595b7f932ceea9784605486b44062836b6c5181803c95860f462c0f3e06b652bcb8a4892ba9ce48bffc7d23a3000b8e183ec4eb26d9de
-DIST firefox-41.0-vi.xpi 470334 SHA256 ea794e879c90d30185f61f744490fd29b706334b4d9068b7e65002ca5a51909c SHA512 52d8d1f947e1a85c3f07b049fe4f1d0a93a46fa1736713bca80ef37cb983cfdfc5449ede9247742b35f1fd7b59bd1b65168f4975d6529878db563a8be361266c WHIRLPOOL 16f70be133af5ecb7de7321b05bb7d7f3a82b586f5f2354251e281a96e17ccb67ef987f670f512130c0913c8e5c0ac6164f8d8b529291f884741629f9d5c9e97
-DIST firefox-41.0-zh-CN.xpi 486220 SHA256 47fe8497bf214ab2275e5be325edba33c96c28a015f8d450f1be9b57710c8ab8 SHA512 2395908e7082e5f539f9a113b013ff923fa81c49bbc65168eecd50acbe53bd5dbfb3344a8d0d38b5e0cee2a2eb86c4296153a4d4f5db0ac9b73a55a0bca82b69 WHIRLPOOL 879a3a7910258b2e23ee69996f826194bda9719a37bb3dc3b830101c71874b7497135f61dc699f77b1193850929b762d557b643fade7214ff23a9fadb1f0ae29
-DIST firefox-41.0-zh-TW.xpi 479031 SHA256 c0163e959663dfcdb977f5fc87af13d4129b61a4b8d73889cd830f8f9d16ca29 SHA512 5eae24397cdbdff99f960c058d4f1483e31c5563a97bd1f648f55a00e5c780c0d0df59b45faf7e36271971a6a074a168b2b973cc0bdc02e8256208e352f50b39 WHIRLPOOL f8e0462e81ec6fb4db9f59ed75a382e09dc14db06af3fb15712ddca09e7ed3782248c9af716f193d840e2b23078507ae137f4bb584fbeaf29c5f6d121e7f00b0
+DIST firefox-41.0.1-af.xpi 486122 SHA256 97350ade6c4b818a13c884c2840c196825d246386f11cef04fa7d45eab6329f3 SHA512 11357e648f080a1c9b9f04dc3171adfcc0922aba8dfa631d1b9d3488425218c7c69e293f8692dcfa4d1db911777def9d11acf7a511b97d7da9380ccd56de4f2b WHIRLPOOL 26f49c422c4887f5cd4d4efbc671ab452972d9a49ccf952d95f30bf89370c783d033f96a735c9761167d398e3ad5db5e1055c5bd68dd0147ea1e45a33457d01b
+DIST firefox-41.0.1-ar.xpi 521161 SHA256 53d3aeb3303c1e0f73538a1af76617912c4faf78b5a463b9075c7fb9748bdf04 SHA512 ff099ecbf2778833fdad5b8990cfb148d1657143d665fb8914c53dc3c98379bb369af57726a7da5733bb0050f675eded31a5bca2bca2487bb5c6ff7206c18198 WHIRLPOOL 464874052f0fa19eab547f1c7c7b02f7496e4c9e26a2ba9d91c9f8610a525bbb90ae76919a0a4cc95e3f9b328c431399766f2de1ed5417ec7c9d509eff1da4ad
+DIST firefox-41.0.1-as.xpi 511220 SHA256 12319363d20ae2d4338ef2faefd196c1aa79354266aaa96d5969365b27cf83aa SHA512 6ab50bbdcd7073ec2ecb59a3b95f6c4e5b0606fa9abc60e140baf74e4e8f125d43563c8975418545553da573ac15514a2fbebdfb11af50508238e88076e14846 WHIRLPOOL aee288fe315af256f8cc24096bfd486a970636767d48be2c19580ab20026136da85658e5122bc4fbf97e273d7ebdfcb75fad9644ec71da2917d425d139413947
+DIST firefox-41.0.1-ast.xpi 399124 SHA256 df0b1298c2bd9f6d2957357a5600fca58a5f370fdd9fdb3bc34d4308fe3ef8c5 SHA512 c3989a871b3c6fbf08590260c5c7af4073644d16f9cd4c997e0f1bc26471dd9e0622c54cdae0ed9b9d1ab25333fec172b477814c3282e81a86b592404fd4f2ab WHIRLPOOL 5d96386d9050542551d7a316228fdc0789f0babc53263b3192e26bc1e6812ade738d17b43317e0cae80a3ca7e1f3424762eb0b61744fa4ac70f3b9508f4c42ac
+DIST firefox-41.0.1-be.xpi 453405 SHA256 bdf4c9737194edec2f44b810d9fc5059e9afff25993064edfca55f06d184df86 SHA512 698d890cad57a1d9001ecd5ec33d7286a3459aa510ce8671ec8d09bfbc44b0990ab021be23e9b57f8f1dfe0e856334eda7bb3ce15d21cb5e664086b7b4093511 WHIRLPOOL 052d83a88850583c2f3f886e83a8dc1bf32f71f3675c2cca5596497e5ca7b38033c9a6c81ea0e09eb096c2ae04e1db5326aa90e4f706069b1b8e4409120e6626
+DIST firefox-41.0.1-bg.xpi 492967 SHA256 b367bc4054df488173e914b3e872305f62ea9284ebf5b21828fa7f177c82883c SHA512 cf624a528fa6727a03ac453005d426319f1f0e40ea638149d611e43e4d31a8ef8a5be45f53502f5348866fe3a88f3ced8d9347302d90a6e2852158958df8859f WHIRLPOOL 98d6be18a84da6ae3b33322f2fd291c15866670fc39037b98954cc119875b43aea35da767bb66e2fc9515a1a475cb468a94e319eea865f8c7ed2b10d9eceb7dc
+DIST firefox-41.0.1-bn-BD.xpi 527572 SHA256 8ed5167d4e7fc2a50e4af4da10e1bcf09cc8fbd850fa7ac481fb1654c10be945 SHA512 7abc61d0f7f127678c3ed9ace810845d3449ae313804c0daafeb5b98fdb9bd2d0ff67b821f622642756e9185add03f17f2cdd2dd3eea11332f137f46ef5bd7ce WHIRLPOOL 86252140dbed9d2c18135e4fe6af0d80c268095ff5a82d43b47ef10e112426fa735008018ff817d0b0fdce7155fb9154a9f928cba8acec8124f93c35ed140629
+DIST firefox-41.0.1-bn-IN.xpi 530270 SHA256 1cfd6cea984e69066fea5817366dd64ac491e5f9438b161aae64b427bcd90ca9 SHA512 4e114a8e2319662144a8f080ccab756ef63cdf150d03a343fc530183b41e24e4d76531701c0fe0d8856c1f23b5c1d7ad9bdac4155b192b6e66eca123d06162b0 WHIRLPOOL 14d022a559b3ce0d824483b50fdc3aa851d4ca10546abb3b76c37123d6f62438589929e6a254ff26b94eae123ed7e18b346105aa742c001abb373efd1af6386f
+DIST firefox-41.0.1-br.xpi 444532 SHA256 f8e0b8d5f3c84a40df2661e7a6a2b6c3ae33016136a627454466020626b90a42 SHA512 b169df043f8770d0c9ef64298e4b2313e8c307d3420e64e5f09eee65689f2b8c3ea4b0ae5b078e86802108fc7d834ffe62d1048d80f256f6cab2e4930b49cf45 WHIRLPOOL 7320046b17a8317bbc4ce5e9df2e13a6a9f359216717da3cdeec7778de0eacda58429d84dca9a177ccf5aefdbbc358644bb21b7199a8130ae113f02228bc805f
+DIST firefox-41.0.1-bs.xpi 486282 SHA256 6e5cd1996bc7483cd9e5f2bb7e3064c4f5ebce3cec4425a95269894865cbe70b SHA512 233ec1885ac0c7eea1e1efaa0770217e5936e3b047fde0050a509d1d97ee9ed62c08b6f36f06248398b510b6a85a7e1f1474a54b4be6053728f865b7f524c09a WHIRLPOOL b1434db7d4d234ef461adbcbde702dcfe75b8cb1a3be572079d347f5cd7d38f43409d49a58cee7de005fcb58c8a659fab9eed413026ebce127b509a40ebb5d18
+DIST firefox-41.0.1-ca.xpi 461322 SHA256 8b70cac78f887946d5d50116844c5aa68c979bfc6f2739808d4710eb5694d1ad SHA512 4c8a67bbd8fc3a42b1b496a3b4969602a7774b8c1d56f9600f0129a4479e33cb37883f400d5130c2077c7a4ff3353fbc4fee6724046bfa972c960318a35525d9 WHIRLPOOL 3ab2f6007d173629f232368cf0eedd161a32587bb8006e77fca7ceea12d0399caa4ab0184141b39db6f100f20854e966b71e696ce76bddd09c0d6541d8a992f0
+DIST firefox-41.0.1-cs.xpi 450334 SHA256 514f7c3b1c5d4fdce48fea2e4510999bdc79e21093c665ae8290c0eef00b4539 SHA512 4fcc41f8200ce7560fccd5610a0d10ac445ec4000d428aa78547db08ea8f7c6193f3703d59ddf11d0c49eb41f351a65de2fd57db3c9f0b444e808fbb357bd094 WHIRLPOOL e6ed4b8626201f97f796a1b428650440bb8a140bdb99c5260c8c2ebfa6def2c30df3e263ca4c8e80038d34960fc013aac5d45d4406a930cc4384b5347579730a
+DIST firefox-41.0.1-cy.xpi 448184 SHA256 b9c010802272a374282400216a37690cef3488ab6cd78778241a1039ce9b15a5 SHA512 d68fcf8b86d2629ad9f331e02c2a0de50fffabc651c05ae66cad2db155dac7f3e71099bb0941bd8dca3bc33098d243a1e235b6a4430cd47ec29081e4e5a6d2f4 WHIRLPOOL f19c272d30ee1320bcd0fbdaa36e65f5d26cc8a75471e939e047063faa6ef935f4a4378cc4121f55959e0c9f9e20d69b958d9dcab5aecf6ca988bfdf2dcbd9da
+DIST firefox-41.0.1-da.xpi 453405 SHA256 1aed18769fbd440e811d2893fdbcf48b3f82ada7c2accc2777b4c8128f0e6678 SHA512 88f7cb1f05ecc3a278aaaf7816cfbcfaf514ba29661d2e006e05c6958fdaeb7cf2093d8dc67b607be4396f2fc51f20d3f5f4a7644d055e5eba02a77a7f48931b WHIRLPOOL 3515d4a6f3d00cec65e748988a6b95ab49a7b56cb5dc889e63fc87efcd2a1564aea26eea160ee94e26537377f661ee7e9b7f076cba099ba14b0eaef42e1258c3
+DIST firefox-41.0.1-de.xpi 455711 SHA256 cfd357e6a681f84f7a42db2097f7df5bb8d99cbc72bc6b5d5e7f7af731b26c34 SHA512 56d3f46b1e43dd2eff3a27b7edbccaa28a6d197d0e671e2c0c7fb513feaf2df6bd2e8bb4f42731fa87bd7d09e4731dac79bb8a13450364584202bbff859b3d38 WHIRLPOOL dabf69b91eacfbef4bc6454b6a89f55e100d5f1c3b5500451d02acd25b69edf71d7aaeddf038cfc1ce86de8478fb4652dc1d961f3e08388ad930c90aa69b63fc
+DIST firefox-41.0.1-el.xpi 501621 SHA256 84e9c334fb97228e153801abebb364b140c8d83b5c0c74821a469d41cf1d2f63 SHA512 034a352845db91f6acc2ea2a85ba3feb154aabe7b2ee5db41a3e4671e909fb3f65b51fc033ff405b06f607aa7fd8f30b3308f4886b31746b9ef8c6c47bb9be10 WHIRLPOOL 57d8700f7b46374381b38b120ff43ff3abc365a9e4e938f7c61bc0c7eae115aad68d5eb2e9f1e248311c312561f748fb97098dbba26187c8a57cc0420a507073
+DIST firefox-41.0.1-en-GB.xpi 441100 SHA256 cf29e810731e19fcffb1175f45dc2ade21cfc0fdcd96dc5176b83dccbc685767 SHA512 06526e9bf229f07fc0740ad88be7094aaf20ce5da1ca050f80a8e069560927f82c5ad66ffd7b99f4996439c4c6d1e3fcbddf1b0050b496330898b35a1f0c2313 WHIRLPOOL cf0ed5fcfce3eff1590d03f53fed3521e382ecd6f1ac12f7fc902f8f00b534b8707cb3e364bf500298d2df4d4b5615fefb4fbfad76a34e238aa3332788f9c02b
+DIST firefox-41.0.1-en-ZA.xpi 444146 SHA256 968c4df0bde7ffb93247b0dfb301efe60027cd75e1ed55a07471776615122572 SHA512 33c794b41934630b0e75e024396d73918a258fcacc1cb19d1f667c5d586d3cbf0aeaf8b03b93a8ac9311b6e12a37747d9a1aa7df8bd9da494527c41b59dda99b WHIRLPOOL dd97a0e569330411c487ee12ea195bb7b91aa4895858bbca4d814888026edca12902c1643a747b61f3ed74336f3997cc2bc8809fdfddadceb20250a04da0590a
+DIST firefox-41.0.1-eo.xpi 487996 SHA256 b132eb82edc724df6a52169e443f1e625c615fabbc2de144f58cd11d597908e5 SHA512 bd587376330dfc6be88a15da00ca105c3ca0aa6dcb51c1ed75f9e5e2d75a4265be0a3f40a2e76acc7bafd4df085fbf7fdd769253f61188cd95ebbc4e64ac3258 WHIRLPOOL 96f3281c5b56c7d92329b3c90d46e2af05310d8afe9988e97615408d9dcf69a79193ad075be92c5cd6a68201a964025742d8dce0fb761d945940e334b92282ec
+DIST firefox-41.0.1-es-AR.xpi 456519 SHA256 9652be3eae31056f27e3b6fdcecedded4b0a095721c2fb762f6d1c6c4c50e57c SHA512 82a91c33ca4b73c98e3c78c025c529e832cc8d13b89ae6bede95af874598239e04be9cd65dd5c133ed2b83e6a81a7961581f0ef0f2c3fad0c781ce42859d1807 WHIRLPOOL 9ff76ca69c76086d7d2b469c334908df51b410c12e06c6bbb89051b2f304cfa334a65136206893a5dd14a40f7067360f1e081773bd8ae57a22559b3f94392ec9
+DIST firefox-41.0.1-es-CL.xpi 381634 SHA256 0efc3546792328ab46d5772b10a02c43430be0ffed4e64a4cccd563ccfc84b12 SHA512 6ecc80d07a788bedacce8a2cb23779a900d0d9b703f6b4290cd29960554dd770b3c03f50881ec014d6604dfc56eeb8822fca619d1146c6a48d8d7ccc7ef45366 WHIRLPOOL 54b16167c5ef6e0b6f8faf6d2d4077a267bf8157bf14791b22a4d2649a65a01e21f16f898836db89dab08c11afcc78782644e4686bbb0394f0ea9341db8ca563
+DIST firefox-41.0.1-es-ES.xpi 370112 SHA256 a6542c99b51a1661d1ffaa51e48c3d60b97ef2881bbff2fbeefca581fa5f5046 SHA512 7e0c3bf26563b18d266c7a32567a11b06f4d6709938284c75669a4792c527d66b26885741d819efb566737c5999587091fa41fd6e99c9db3ba7f99945ae7aa7c WHIRLPOOL 10b427ef192cb006148cb203592fcbc9800a85ce9d1c9a0f505dba17ce46e4ba6bb4dbb785c7b35ccfbe53b4375374e3c072bfc0ec8541795cd140ab95a32929
+DIST firefox-41.0.1-es-MX.xpi 460285 SHA256 ace4555517392aedd9a03b20a4f2caa2efc426e2042c91e83b83290cc5f3ac9b SHA512 04259ad63d20bafa6c82ba7b3e16c6aa0d893a7d01c597b5f6b37e0dd55e9bcc5557e78f50b28f266fca7a154834e7e8bfc4f2a076964501bf8f516956d3a54c WHIRLPOOL aa3679e5d4c0edb6bf66ed5e40ef2d0dc15f48d18076965a11c75e11bf9f9034aaae96626ddb5a3763536b102088815837c6cc1e540102d04ab79b421ae86e5f
+DIST firefox-41.0.1-et.xpi 445440 SHA256 c90315bd392a6300942d399ca3faa19fe93e18718661e6f6e088eb671c481ecd SHA512 86f5c813d4ca220a65b61a30165146390a5915f3bd252cc006392432917623313964f9fff378d04ca171b4dffdf7ad2df2c3e2c7cf99338676cc8694967b2d99 WHIRLPOOL 01651ba6524803839a177af6625268e4b20563ac3d4c6ce82a99c9cc243b412075228bf6c999f9132449418a172ca60cb6d2bf90b1f7d464bd54bc04badcc25a
+DIST firefox-41.0.1-eu.xpi 469718 SHA256 810e08f3fcac50e287fe4fdefeca3c76407b25b1147c08a850ac830f7b3c2027 SHA512 b4fcc753e2f4b408cfe788a744f05c75b21c24ba25e3cb3bb031a4c9bc70d1ff5ce494a26faf6eb94c71d63f8e793a1011dff93ee5155f1ada86f282f6006ae7 WHIRLPOOL 38f032d3ab975357ee90a7e897d409ae52e8c4b796081fabd697e95b8904d36876888f59e5a069cf371de993ed01dfe5c01d8dbb54c11841e34b8d456576de9c
+DIST firefox-41.0.1-fa.xpi 516159 SHA256 ebfd410f2ad1d12ff076ece62c665a7c25b97db8aa2fde3c16c0ac8964ad032e SHA512 6962e09f8e77f6b2a4d6197dbbfd0db02960c4f5a66df490bae4a9c775c4367db4ab1d75006fee5aa0cd56109897050a58fccfa22674f98ba55706e6865d7671 WHIRLPOOL a7b614fd1c0e21e30fdf5d790278fa0461d81779efae18f3cf9e420e5113148582a4896e06331cfda0901554ea50233a5371482099b0d766f170ced9e4ff7928
+DIST firefox-41.0.1-fi.xpi 447176 SHA256 3384c59af108f186f6787291726216fdeabbba9837707139744f4a2336bb7b9c SHA512 e7583a9ea4d62c85fae3022a66e09d9c7d6c97f9602ed4ed961918b611c7fa5d90fbeb56bfdc931266ff0f0685d09ee48848922e4d74c1fc3187c7a9e12a35b5 WHIRLPOOL b17ab200b5431cc665b9ee4d3a06cba5aafe0ddc66c4a5b484bb8bb79474dc9e88d49a74178c3e4c95f9a06bdacfa70bf1ee8fed315029d8740a7204811c28be
+DIST firefox-41.0.1-fr.xpi 465093 SHA256 418a9119af70f689eba32e8a45bae02b2c27bd37cc439f58293d9d5e5bdfdfaa SHA512 b812853fe7e7a0d79feebe566c57fb7c2f6cc11556410b783c584efebefa12758ee892a794f1a268bc2a0cbf02c40095a42cb3b0ed936506b2cc7f38c2f6611e WHIRLPOOL 8053721de33654fcc5d2dd8995339a7d16055d7dc5e598bbc06fa17b735f96aaacc9a957befca49dcbdbeda56a2448c1512ccbabe3266a13ee7b6d83ae6769b7
+DIST firefox-41.0.1-fy-NL.xpi 458776 SHA256 65622f493c782108b259e384c6af1d5bfd17701f0f350c35c4de465cd617951d SHA512 092544e8ccf4ef28d4999e47b03824c6df291b9d91de3f908f1533abb1d1146bd281388d1082cab64855256194bd4aeb092b91284db5940e41a20dd17de91cf6 WHIRLPOOL 990bba15eae60aa263de9b7162816e9a039cca7390aba2dbdb86c2be5c124aee5e2b608e734b62b9035feadb2b24f0825952992fd6ea05707f89f139c7b7adbf
+DIST firefox-41.0.1-ga-IE.xpi 473257 SHA256 de10c4a3136b24412a926c72836eabf982b51158f2257f1703d06782ff4a2acd SHA512 41fadf56b3272df3042f37f2f59206fd0d706266c63f5cddfb17396aaf8e09fbdeb5659f1f7a3a181407a41560c56297ff22f77b5074ee5996a1a212bc8abd8b WHIRLPOOL a2f969930f35133d26576a20450a3e2b68095cdd1352c53142e2ea6302b830c647b6a92c115e1362f5347d1fd701eb4cef0bc54de352de2cb21c0081f72ea134
+DIST firefox-41.0.1-gd.xpi 457500 SHA256 bd5bb07fdaf9dc081d4135590862f929f88166e25cb29692627a6aad07c8dcaf SHA512 f8b32da1129920a12fb2676548a9b5ea24ba619af678e244e326bdc11e585478e73567250b75f0b5d54dde07eb3c04fb7ec8e7e1a8e0649f911f3e3499ee52a2 WHIRLPOOL a1a90f0b5c20871ca171ce8e6e053572c0b79f2ce5a27f87c18a0ee44f9da2527030a91fbed7a5ba755d69e654934315711c35666e4c483c933121a6bd4e2612
+DIST firefox-41.0.1-gl.xpi 452612 SHA256 54ca7876a1ce3c9add20e1f0434da6e130c69ac6009e6704d1df18fd644f0e9e SHA512 f108d0b2cf8eab8e36640e21380a887deccbfd9bfd935c1e84559430ac5b0b432615a6ee93c3826430dc7ce21bef3ab1c6f3b7bdd6075a7ba508820a505357d1 WHIRLPOOL 357c5227d80dbddb7286c393c56d02a88b0bcfd1c662b4dfcc65e97edf812fe0fb08767180bd0d5ff3b1a74f191bf168704cebb91cc59c938c70f1d6ad4095b8
+DIST firefox-41.0.1-gu-IN.xpi 487516 SHA256 e055bba4858a257f7562b32ed3eb316d42b5afca98f92cd3b5f42b336db3482b SHA512 261ef5555df2c8da8d0bbc345e6b704576e8278fb2537547be0eae8b3659fd67751fbae01b3163252d470d2ebc89a9d77873c68eb49f6b93929152c2ad9787cd WHIRLPOOL 92fa956d41bc53eddac0d1162c4803065e4527f6defed6ea442cd90482d5c51dc8e40e9b3eb4f4b0677ff267a33c15dbd2c5134ca4bb6db8abaf58ed33d00ea2
+DIST firefox-41.0.1-he.xpi 486490 SHA256 fc4ec10279c6cd322e31cb43904667247c3b69aa7a1cc9f9354da307a06cf1c4 SHA512 610599bc66f04f3bc43217590741bfd1d785e0beafd8cfdea1a4abcd4829b650893c5d4bfe5b3c387fa0c09fb5d8d5a8b598092651ac719521a32719e28454ea WHIRLPOOL 36676ae697567104774eac136790f9577a3f72f2270ef743a96d8310c0e96643bb512de1a07994d8a0d374714777cc51908e3232936de3665dfe4e23f918b805
+DIST firefox-41.0.1-hi-IN.xpi 509163 SHA256 45a4656849c4367a545c6e1aedbcaee9a2e2d7312a64c6e7f56f95615f50ff0e SHA512 03a4ee95d2d1a9060c212d58ca94508ff14a1f46d5bca5c6acdf0463b3bdb3f8d34a0432fa2b1e100cd258e85ccec1d44082fe4664ee37ccda38ac941e65408d WHIRLPOOL a0c8c06e9f3911186c9bffd069b51199d3c36240d532fec59a0536bfd7d35e3334b5f3cb6c7d8f5c2f6f35241d5525c7b29b8f7497550ba09a8f8f6a2bd2ef11
+DIST firefox-41.0.1-hr.xpi 481336 SHA256 81e5cf9a8c318fdd46570284a324ec8f52dc172f0b2d583478375af27c497ecb SHA512 7b1afb4483af4c678a9be7b60c32c4f2ceb5c1c7b767fa8da90c5955db4314d8c86bd7bcc79944f439818f3614cf6ebf11e4e435c91fb676ead4eef329659069 WHIRLPOOL d874fb4f3ec21130f6245db06468189799d5d6331c42d0810b85f83eb4c77574af76a4d9f3ef7f37ad0b9bb9c5d52e589e02df1a28858e8109ad226dcd92bd4e
+DIST firefox-41.0.1-hu.xpi 457035 SHA256 1b088745a37f2c29e384cb370c6fec7eb2dbdb4ec9698d2a7908daaedabf961a SHA512 bea3ef784d7c0efd52deb986f1bd037b02b7106a083abc377dafa18ae5e85a819b0d1420a4aadc5452ff5764c87fa46f8136bda5af97add3ebb595af36fbbe47 WHIRLPOOL 15b866153e2ff7c6a16f6bb7c8e6f4bb3d1fb328b80e7a5619822d6dce991a78a7995291d56c41b5532eb643dd0014ac2be26b3ca34d5cfd67ab2e1d8d9497f2
+DIST firefox-41.0.1-hy-AM.xpi 538341 SHA256 cc6ca6d9035244c85fcc6cfb6c9df05b4b93614ddd7d015688c83d70cf686686 SHA512 522406730390c88c4e770ed76ead91c3370ca877b48edc1a7a27232e9523f8c11251bde2df3eca044dc3b5a9b9aad67200c0052c1dc90e90916cc3771535dcc9 WHIRLPOOL 147faadd1c2510156d8205db09722259079e959f549da57d7068300d2b6416e5b22f6cf9a2003113164a4c3468788bc48849c53441ad367a80f86f3d37ef9917
+DIST firefox-41.0.1-id.xpi 433972 SHA256 fe3dfe15e08da87a913c6483689870b5a7e64393b792e8bca9daf0692193682f SHA512 d80889c905cd7c260e357c3aecceae4850d9f8c6e245abd55be9292f68620a5a4514d91fbc900e0896735e32f0227456c3ccbd1d1778955ec717b9c694aac756 WHIRLPOOL c3172071211e77cfc00b2f41dd5495df6e372b8c8ef8f3082f1a45ed5122159981ec1ca70db7977fe12fd8eb02a2945c54ed94f811fbb731ccec19f294aabdd2
+DIST firefox-41.0.1-is.xpi 488113 SHA256 7ca5c3d7506328b7e2cc92b2f631c97bcac87869f983318cf5b1f99384424e6d SHA512 f1d094a506cececc6e6384f66b098d3ed3fb2c7896bce3cd24ef5ee5e1a4859c36a14eb47116834e570dcbf1e63bb7da7069b7b37d1ab0abcbcea9b12d02d6b7 WHIRLPOOL 1c3f2db4e92b9a8e8c13f2b97ae27146778aa87e5e44ee640b0ee22e5c7933cee19b034e3bf773b102a3591fe6f939d36b904a83cd2c77327c8333a1c6a51519
+DIST firefox-41.0.1-it.xpi 363986 SHA256 5755fe268cb7f79120abb5c49143b6f00e4830b4adb296bcaf797feca9cb158a SHA512 869cbbeb144f5e1856cfe31ea79b726395fb743856a3e6ca6241ead5f64c2f0f2b5be996217f8e412b0333647cb564a96cb5cb3663bdce967f72ea3d980e75b0 WHIRLPOOL 1449dd76dd956e5c0b7d05315c4a92953c61f081f19a52235d11203afdd299370e6928ea2ba086b74349e1840eab5ea02a9ae240787f5b65dd35eab003a196e2
+DIST firefox-41.0.1-ja.xpi 483304 SHA256 33fef07433a939b9d53ab18638c31676df709538c747ff72fd889c4fc940c61a SHA512 b04163cc4426adfe56714fce2e0ddb40a42d6f671a0f51340b255b2f9a932891b0e5fac89f39888c2b3cdf7b36286a31cb4c2ea4a583dd64dd54f603a1f989dc WHIRLPOOL 8894737478a61852e306741ae78805fbcce084ed32fb21618e3f347d9ef7257aea72d8250f124e199987c7f3d44b864a26c200581f34b0e7df719d739984c66b
+DIST firefox-41.0.1-kk.xpi 508365 SHA256 64fbfa53fed92d8e456b1bfbb2eee8116596de671521ffa623b8997711860d0f SHA512 5c3bed894f7a8e34bea9d0a348ce46fab62abbaa9eec7300b3b6dd1bdf264dff21d8b298e9155e747ef2a8edc2e4a96ef40bc8813935f18c558cafc00f7c2218 WHIRLPOOL 386a0eef2f9c6350fcee270dcf46a9ad046c5e1a46ba9358ba8b0f804f25539f81e24d90e90f7bd0c450431bc0e5ac2eb3b20ccb603d4a8e7b330d68cd1417d9
+DIST firefox-41.0.1-kn.xpi 539239 SHA256 a6399f7890d658b6f808cbbb65ba7f3ee3f746bb3b30410a79cf9623936a35b9 SHA512 1934e327ae43e1f4b99bd61befcb238f2ecda9c4a198fe51eba31c102d3d1989a668c578c2c44d20cc1f783b1c94845403b97e3dd38559cf41ceb842fe843eec WHIRLPOOL 9c66321bb07d7c5a15300f2f0a807c77eafa2d8c8ef03444ae27dd57b1c98f76445f9be4183dc8658d11c0709ec273b5e9b51517eb908daed4f4063ad270947b
+DIST firefox-41.0.1-ko.xpi 464905 SHA256 0a32fd625b1d6254b7cc11839ddda1d354d65188cf79e4a695a9f72ed71d77a7 SHA512 73b5e74c2c9103daa46685262f421291a094154b5a073a3cd2e70d12fed641e10c0982b57267f69c867e697a64edb77e74e6cae48b6ebfdd2d6f16596f8cf4aa WHIRLPOOL 4a57a729544a49f97c0357204ad0761422b5b10c1eafe305d838c18b04e4372c2a3572178e12ed792182cfac609616dcf999b9741ced3d7a47f977a0b24b57d3
+DIST firefox-41.0.1-lt.xpi 490119 SHA256 a9255f0f3ee96e5a0779a72b68b5c55fd3de773803ef0a5ad3a78ed2461733b7 SHA512 0215b43cf71d069fd7b0dafe970f79ffda909527bee5eda79909165bb52ec5063c5cd43493c32a3419ce5c4287d832d315635457b4c7a2e6790674e683ce403b WHIRLPOOL 8217f6e19f4b418866f1ad7853253e587e7fcf488012b538ccd959a9d9e83b9d6e87572ed37ad0d18ea2619c4cf7eb2695fb5b3e90e5f743db12fdb2bd8f60fa
+DIST firefox-41.0.1-lv.xpi 470365 SHA256 57ab2c15cd4b40aa551ea1d7574108f16742fec42d7bb2022f096fddfe130f95 SHA512 7e8c85f3bd4dddc2b0882cfd2a06441f221cf7918363827dd793c1f82f75fce0c2493998537799df94ad9cb343ce6eb6031ca4266f95c498363d736aaeb4ae3f WHIRLPOOL a3ac1c37715002297b4a094cb1197d6f31b97449725af39068ff01ee3b84a0d5fbe52fd259fafd09709a006f3797379ea890555824705c478733eb08a2756c28
+DIST firefox-41.0.1-mai.xpi 517161 SHA256 1fb55aaeee4a2a9b46f375940383c59c827aae1ffab508276c4b90969f695ccd SHA512 f814113da490c3ae8116ca99f488172a8cafda0181bd52a0cdfe917140b60533a443455bad7f013b67b742df5be4329811e8af400d1342f4e759731ff5c83ccd WHIRLPOOL 15847223b34c900ef19be4ccab0753d351faef99ee202e4cf4e7e7e985d3b64a97ae4ac313eda419057ad2dcc4c34cb49de62d2cd326a30d43b45c5da213df95
+DIST firefox-41.0.1-mk.xpi 530866 SHA256 39113b209f9e17825d87253dcb77101fc4e4d18f67ba5b0efc32077894a64c29 SHA512 212adbe4575012a5b470f655ad4dc2262a655337bf733182a440dd0b7dc4c8e0112ce9eb94c4db92431db2d2bb4ea07f41e98fd601367aaa1bf84a99e10e6f61 WHIRLPOOL eaa1f04a580670c266aeae09ae2a6ba014ef0b4d4dbdf75f329ea48bdd7796c33555425572e37ce0dead12e5137991bd1070917bab1218ea09e07545c1cfd322
+DIST firefox-41.0.1-ml.xpi 529032 SHA256 d52d8c7d614a0454ffe10c040b2a939ba428dee68d20d87005a50e9d7e67923b SHA512 f7285a684ae7eaa01a2f31604ad8a60e90cd71f083f62ac034e5e417ecf1b4d862124ee48afabe005646b9e25cde723578bc7c271dbe569be0eac4a32afe4c2f WHIRLPOOL 81b412173dfd6ada2eb4724299b1b6c48ed818f2d8034ffae5ae9e4c25dbc7217edfc153238644f52dc852ea21f945b9059514ecaa92abcbf1f72212c38bdff2
+DIST firefox-41.0.1-mr.xpi 511325 SHA256 61fafdbfa825d695d6c5d38512c4ebf1559f7b39ad71de2351ea0584de965125 SHA512 98622a1c2c2ee8b993895e8022a5d140a4d51aeec7b0af9e5ca57a3f968e13b45787210dcd65164de1b032b4210d695f6420563f48c540f1dcb7d4a5d25628f3 WHIRLPOOL 4dc77d38dafb6e6b754130171548d33a1bf11c56311e52c9d605be6d4e47c3622b2e5dbdef95a0b25d3905bdb3a41ac29da7118d0110de8f35f1822bd2ab2263
+DIST firefox-41.0.1-nb-NO.xpi 446372 SHA256 09c2e095dc6ee63dfbae0122c47d28e39b2764c398bb08d432253c1d123cb43e SHA512 f2038f1c786d4e0751a1f5cee1147dedc882a168ca0a7c0e387a573c3a21bef695ace1905d91b279e82e39ce624b89cee723ab28f26761b1aaf634005d1c0032 WHIRLPOOL 623f7a89b88ade29885902f92c483cd457fb489b2df09231b9baac04a4ec4adb3799cc0865e49a108509a584f6c26a9d212d04dd182fa428db78b7e48b45b60c
+DIST firefox-41.0.1-nl.xpi 446548 SHA256 8c0a359d85490b71af556e095592c466896b7d4cc80ad59c21a5bff67737c24b SHA512 1d50484df9920c2a10c72ff59ea9a30a0fc891da11c67bfbe5e92515493b8743379ed8b2481d65e7aa799636e0a201e3f3797f7bea2f19265aa3f8e2896b4e15 WHIRLPOOL 8c47616f306ee672147ed37367acc90465ef50747b388fb29a5f478ee92112ac447cd812b877c634aa8d5cb3fa65bbfb7bd68380986e76032132fef793337e5a
+DIST firefox-41.0.1-nn-NO.xpi 442563 SHA256 cd1ea65e70986de0bf36ca8ce68c822def20bf67c1aab1086902fd5a3193f76a SHA512 5561db96ad40d9a858aa40a7a6e16137faba3528348be89b0fe43a0a217577378474e2a515ccb9ee0d745133e57bbcb82bca0e41f9b94050cd6811ed518d4fb0 WHIRLPOOL 856a1ece57fe581ed5ae8a463169d0fc6ac6ffb6723963a7e918ef92c1ab280a04716d3e24d1b52602cbafbc7e890b6ebfd9efaf54d4fb8f6d5b9281416ecc66
+DIST firefox-41.0.1-or.xpi 528106 SHA256 274c5f764c47d357104acb27baf52546307ebefb649e0b99731863a91094ad47 SHA512 16b5d39a57b64500af4555ac4e87dd2eafd04272f5a7b5dbbb9ea3e2aaf55d40742122510bd54e6c925bd52c17b097b806d42b41ce1b9463d416b8a5c9b4e41e WHIRLPOOL 3b68943aa100bc85f1b855b8d0e3ebde870cae934a933b3b4b87d261464d7a69abb267cac5a72c276095e2c3fb9d774f34219974c59978da4e0f2a8ffa3e8f88
+DIST firefox-41.0.1-pa-IN.xpi 498583 SHA256 7ae13e9687eb86499a624d72f71cc37e43a2346517be4b0f7319270495906fc4 SHA512 316b4b51329e19becbf3e7f1c0dd12a4a022fc58962ea1ba9073342fd485eb72d47ca24ce83dfeb815aa2a2c9b5f00ad332d2ec02ac2745bba198c380a4d8b99 WHIRLPOOL 0d790329962177100d229f31acef40660c2779bf9c7889a4757bd1abe00c2e11ccd2ec4d52d08414c4408bc7ecdee1089775da0c6a4e9a02a846c7212a2a9fe2
+DIST firefox-41.0.1-pl.xpi 400466 SHA256 fad85972b99e17b959cdc0f79786f6900b9719e9c8bf503e746e53313d72ef8a SHA512 9e2050c61ce1138631646ae318b5426f525bc93946710d02dec6876ee3222aa15d604d636b6990da52571058454fa0db971f04ce75761987b700b42e8f24a1ca WHIRLPOOL 4ed8336fbb6dadd4e945bffd655b6b932ad58fcf9aaa86b2a67363595e34c45b57f7e6be4b140a596ac295e66228eb32846c784de694631df9ddd7eb5ecee51d
+DIST firefox-41.0.1-pt-BR.xpi 463059 SHA256 ad65a013ef7044cc7946f31b6d4c81b287250c59165317107b591b9add998c8c SHA512 a35bd63b1d4632806f7a430f5977ef4a24d595ce77ab8850f1a1b28e58d07b33f3dda336e9f3e40e80a11c5d35c6bee10ec92f8698949d0394bb0b1282cede4c WHIRLPOOL b98b092d6fdee8dd7bc406d701966fb42b6b3832d7f6fe8a52fa79abffad7d302852cc7255134075e7254ab14eb587be935af69f993d6c7355b0eb347c6a3502
+DIST firefox-41.0.1-pt-PT.xpi 443383 SHA256 f30c6297d6446087a6d1466b15e9f21ffbab89508ab0b4bdde3bf22f779fcd6f SHA512 bf0e898100d2f577b3600f01d2d1756497f73633388ddf3ae00b57171e53131f9496a556a89bf2650be41bc0e73a43a3d7034a5798604b91ed4b9674bb5391b3 WHIRLPOOL 29e976fcee01c7bf56ea2573cc57af707f3c96cfb6338661356dd35f1760e97d4d97ef8e885c40464980936534fba66e9fc36966c9a2c6cc25033c710d312a69
+DIST firefox-41.0.1-rm.xpi 450640 SHA256 8dcc565897afa57fb7c4e53aa3eff9abd4522a11be5ad4924a9dbe2e83bf7b42 SHA512 54a9c6fe5173a03041a1b3d67bc27fd7ef5b6f925a011a0540bf1fb11a979507783f367ac395f9eeebcc6c233f0cf48bca661d84650f761124101c6b69052709 WHIRLPOOL 94ea4f8ddb72678e34ccb261d0a17ee4912cda3e62b8bc09225e481b2573880bbb86e0b98813467b8fb45cd3cc89f5c1380cc7634654948ba0d789688e730d3b
+DIST firefox-41.0.1-ro.xpi 497507 SHA256 0bbb369d396282e79b111398733174a84bc6c92268bbf3e040d0c8a363e05a50 SHA512 f0984e7e2abb52c039d5ce07c22ff9c7a7c908f23dd799de06b46d04bf1b38dc17ef5309e37b4de21eb9534e43f45ccbbb1906919e5e9feed8578cb1ef8966d6 WHIRLPOOL 4f68127b69c2a901b50ce28e1fbfac39128f621b281a2b5fc97a921e9d6319bd2eff8ab93cf2d7c79f9144ed02da0a3c7d133089e401ff333cc1a78db9ce5d58
+DIST firefox-41.0.1-ru.xpi 412447 SHA256 824111f820b81de57bbdbde11ea18bc590c1b35b6a90c857129eacd9fc12226a SHA512 67d4c2b039f7f4a618473f1213d889083a0f07c08fd0f900925e255589a4593227c4b0a9382d8c22595fad4aa5b2ed0f1e3f46d582931a825f06b04706623667 WHIRLPOOL b84dd312855ae39a343e1b8d8ec7cec550d27e8bff9e270da505fcab820a226c96df99bcdb3c6d17265f8af504dc84e19088c5f60b737d566d363e8723865e75
+DIST firefox-41.0.1-si.xpi 537934 SHA256 1c133f62d128f647b361cbb9e717009855908893b5bc6da869812a7e2cf48a79 SHA512 b8dc930643becd16cf29f13b1f0f9e5fa97eb9b75739aba2529b1b8d70974ca90d13abea515b0391f466dd354ea0f16e72ce35d3003eff08c2b5ea8678b91770 WHIRLPOOL 23bf5f9fa6947fb98e42d1d64c55be07ac47b70eacbce573829bc08112b50931ef9127aeefc25e11297263f52799e90324d996969754d5ceaf13bc366d2b42ed
+DIST firefox-41.0.1-sk.xpi 472935 SHA256 05108f1c11115fba1c4271103b9466ae8cf357516c42f4a273f8b3b9de087063 SHA512 45bd6f53ae9ce41cc106e365ff3503791727c774bcf66648a4e5aa29ee83581d2db498b55778e8eb5e9cc3da88e03a414f91104dd2d9e50c8e6251868e9df6ac WHIRLPOOL 52b918a6cc4c6956dac7a7a8a441a5bccd6d3bc60171f6bc7319c71f543e6b98d4465f429fc74581da8d6dc30c3c76cb9ca067ead2be14be5a5a27695ac92490
+DIST firefox-41.0.1-sl.xpi 445746 SHA256 3ce7b9d2517dadd947f1849d58edeacea42a8c7a68ec1ef86f06e7111006c0c3 SHA512 9dd2b3647f4c5fcaef37bdd68bc8f0ebdec878852dffdcbeb50c5922897930ce5d779a4a7f4c1bb3591798cc8ee42cefd3828f307c499c8ab91e594eeaba19d2 WHIRLPOOL 7c4eb60843373e1c9f3c7476e8728771044af6a06a3feefc25bf70177883f5d2b42e5d2dd89b824e3927c3b7a9897007f5f8c6bc3e0ed15f453b4757258a521d
+DIST firefox-41.0.1-son.xpi 453253 SHA256 66daa25c3f9e448ff9b9906fd5ff17393d8aa31ae68109a35d376a2c28e31b6c SHA512 e4642c9f559fa514409a607a7b49535ea86492f84718cf18e6cc5e42e30024541b26f9aa30795ce9be2baa36ac4a6a083aa2f102713898c6b9839f733393dbb3 WHIRLPOOL fa27e970c92ae3b53e62cde975e5257b2ec1415743367115e0187721c9141895f285cf824702a531e11d6701693c41d4c622dab50d85859a87a73dd5cd0fbb81
+DIST firefox-41.0.1-sq.xpi 491168 SHA256 e764b9cb6583aebf52e071f539237bbfe535a715d1939d5a664b60c35b0f668e SHA512 6870aca0663dda06a04d65e0628af910687eebb26c9edbb795015fe973e35919bf898d87c8ce4d2c6977575dc6a8f3d2dbad22c0a63fc614a581dad6cdeb1765 WHIRLPOOL 7fcda6a1f70a8f311916e6b6869047ba8316dd8889d80012663e5385338b9fe2b426ad42b1f90785ecab62f8c49bc80f3b19ebb49bbbfd908f12ee2d9c60232b
+DIST firefox-41.0.1-sr.xpi 482971 SHA256 e39ee04fc8ca4fe6543708ec3a5e49fc99b8801de4e323e33e8f5c3f11842c12 SHA512 fed8d4df627cda627660766f7cbbd4e9fd91f926454c578390823d8f273e972ebe71b1417f3366272efd308822b5ea4098eabf818609e75471804ffcab1f4371 WHIRLPOOL 36f3e52a4674895754b9d0b122c29a30b6fe40432b175493853550e30b960cc40c8af0e935aa9e265b69b87928ac9547e304a3af7c15d0fad91c0a7cf94fa6ac
+DIST firefox-41.0.1-sv-SE.xpi 455382 SHA256 447097907572849eab9b8ca1a60d87fc7df071808cac82297f8ea5f2ac46b0f4 SHA512 92525ed16457cf0612abb5c30c70ef27aa29b1c4ae58a97ac2b3e75e43374ff294e1150821b70523fbed6865a043e4998e1921a01a0fb8ce6e9786525f07329b WHIRLPOOL ff7570dfbbefdf89509655456347cbf950fcd45c676314c76cbf832da3929562a26a44df742129aec12e0d7ec85e5a3bc44716e0c0df5922c41b3e074815f831
+DIST firefox-41.0.1-ta.xpi 509545 SHA256 ce187fb6594319345a668607ee36436384e06b0908086d2e89e801b27fe478ad SHA512 384a00c1e7d9270abfda711a7b424baf8d4e388b213c51b888e07848bfaf38d303de5d9a5129568243e2d9ed00a3ccfa7f66dbe823ae672b44c23df765d932e7 WHIRLPOOL 1523fa41bd638779486db98c7a81d8bc596d64243f9ff6f79e5533e2b8457ca34b811cb03d115f78ae29e05c7fe6dbebffadabb9adae5e07f6157b6e47f5dc47
+DIST firefox-41.0.1-te.xpi 530204 SHA256 a0290f5bd0b877433a4afcc2b447f96c14087c1b6e143dc5962d7da4a10dc6b3 SHA512 6f5b2e586bdacded503c719a49ec079e85f07f1f351f16acc8702f8993ceea8a6ede7d34b91c13bfc4615060394e4b57a3bfe47fc36235282e5bf3b5dea9bb03 WHIRLPOOL 43e005c5170791508c906532c9f0f216c2465c0ada0c292015084f8d5b1daf92bbdfe4e4a35a5bb187fdf36eff84e876700a11c4b38bf167eae02f947c2ab477
+DIST firefox-41.0.1-tr.xpi 484232 SHA256 56250792a6768763153178be68998bd912cc6d2d33366023e83a92cfafc4bb85 SHA512 93b569600faaece6e2a8a2206da3b37107a9d38976454dd880cbc19ab3a6673ecfa6729d86933d96cf35aef014970b4d738e6db44fcd7c4f318ec8f1dc6d2e36 WHIRLPOOL 612b2283ab66a6e515ae472c3813dec5e7508e8401f71478577669ed0726a2a47397a0a29b53028d58124cfcb03b009085e67c143e75287a53bf1071075ea146
+DIST firefox-41.0.1-uk.xpi 500110 SHA256 bfc13862f69b9270ec45595e5f42cbd2ac893a06d193c1e57b6bcfe0a47928c1 SHA512 db7f93108e01bb32cc39a09b87a219fd99ed48d38c014894702800caddcb2bf83b8ef2e2ed8db515c359be7b2712f902a33dc54ab51c2f7ab6820f3ae178dd96 WHIRLPOOL a74da8ed2a7389f0011d4bb1961c0d7b6c0ac49a8e87dc7d7e49d9936deb37dd0b5fe1b29a112c6361fe269fad447cecdcc2f711ebbf90811e0d596518f48253
+DIST firefox-41.0.1-vi.xpi 470336 SHA256 949eca406e118a6508912d379babde3cde6d20154da59260e760c1ef07d2dbb3 SHA512 113abac652fdc9396bb7166955864fb61cabc9d0211e241958ed4d0e237bba7671159533cb2cbff4661dd1af96f5adf71a1d602aa865d2f123ab5b4a9fda6d64 WHIRLPOOL d7e3bd146dc9398e87adeaa6f399938633fe33ef5c85e1560f2236791bdb3febdbc4020098bd015157126df1ebf6062da5a23ef63f5949977b5c3081a043e2f8
+DIST firefox-41.0.1-zh-CN.xpi 486222 SHA256 6719c7ab93c9ccba84630247ab33c4f61971e8052bb73442ea196e37de90d7cc SHA512 3e50ce9ac5aa6f0b62b857b7af41db726de418ef6be580d0fc6155fcd5cb22889a7d53db043748f55b7b72420c605c74247f36428e6c183a0ba9921f3a7e7b7c WHIRLPOOL f655c89388bdcf65f4daa0eabd680b65005317c28d09f7ac9168cd8ae64f4097d52143a2cb87db0d490f4fcd2a040f3d5162a1277d8ab1373bf17fead639c8ed
+DIST firefox-41.0.1-zh-TW.xpi 479033 SHA256 c14373d6b8d5e978864a29ce35d50d2c0430d12befd9cc284dd8b63f86356b1b SHA512 01793e9e081892f0c8cda34dad5433df8ad7d4a8a6e41302e6d299c2c7a7b5900521b57a4cb2d17bba7a965796d1015c535186bb81d48d2d355be59fac5dcdd4 WHIRLPOOL b9be1364acd8a902629c5051164422ee3a3a65b0972e59e586f1821bee5e9ccedd1914c74e972194e79e244008494362a39aed417165d8eac31e8cfafd7383c7
DIST firefox-bin_i686-38.1.1.tar.bz2 47101577 SHA256 bc8cbd59821ff0dcb91d6efd8a097ec82f795569f9ecd19c34d672bbdfd77da1 SHA512 1d4ec08755ff70c36d9e5dc65bc7cb80356af3dfa129c64f1b07fd704c6e6be15a69a7b828f69a46fbe50602103da0feabe22b9281798e8af37f06e58eafc257 WHIRLPOOL bd5870254feeeef5cc6e015b2502203774a1aeb4003b81fe9614cf069a2f9d189f1351055fa21d307c2007341f40bfea6fe358ddf91b0ae332853b59de2c0d1b
DIST firefox-bin_i686-38.2.0.tar.bz2 47110789 SHA256 98476c33b8f62a8cb49b4978e53ea43203898efbe2a92785dba1b0b0a2754b2f SHA512 2aac61a85ee8120c3fe6d6884ef30cc46a2cad4ff141d1fd307bf44871c0e7bae78f8bdf246ee62816b6d6871ff8939adb912afe7fb35390ccf1b25633a3486b WHIRLPOOL 7b9c4c523fb7bed5c618354ff72e724bf430c44a3306c3086aa685113930a022a2692525aabcb8a160f3e7d54016c108ce716da5f8440f25ae60653982e403e3
DIST firefox-bin_i686-38.2.1.tar.bz2 47109722 SHA256 8ad08cd1e6ac3d15e6a13dc137c17028ce34dd9b411177a7560fdbe6127fb4b3 SHA512 659986f4c359793213aa8eb88754a5ad7d2fe86e5168a5d589778faa07898ff269f5afaf42b9fb75674c5ebfebc0a49dab055b89ca9a87ca00337780b77a0142 WHIRLPOOL 7dee8a9c53c44825ddb70cb36e8fbb5153ddcdca8cdcd43440bd057e2ad0af8cb7343032f71b98591124cdc283fdc62f1e5c2c8c2645018207d31ca72ebf879b
DIST firefox-bin_i686-38.3.0.tar.bz2 47185391 SHA256 a57e32293bf2e29e0911339d15ebe5f72e9df9d18d17dfd550a69a5ea43c2d87 SHA512 d34573554b9ab2b8cc366898dd98317983cd68430f8cd2e43c87e5f1a656637bbcb0b1fa072ae898436f7fe710f96a83da9c11c89e84fbc0980440fe1dba4015 WHIRLPOOL c7d83984408fadfaccd1929c3ba67f1da049c229e635784f142f103a7bf38a31bad0d9d82f459ef244cd792b1b902cd41917e9f77fc415f86d02a0e46bbdc90c
-DIST firefox-bin_i686-41.0.tar.bz2 50258692 SHA256 8033d8dc316d3a1008ea4caa1fe78aa6f6d4964c69e1c75b70ce9d561e0b02ff SHA512 5f372d5f599afe32bedee27e58311f686d5b1fe50043131e49a58e5946033508d0f4289dd44c5455db4c5d3a81ac34b8e4c655cf35e36a95af38040eab705ae3 WHIRLPOOL e86c16240f7e9d719eb09a0ec38056509fd18405ec734571a55eb8623fa0573950eff2c2508cd7741345caba2a2e2e936c282348c56326a7b7a52a2d98008205
+DIST firefox-bin_i686-41.0.1.tar.bz2 50258849 SHA256 cbe196b4e7adf2e2b5011a1de629cc0d47924f20acd740f46b80d6fc12b85b18 SHA512 d77856089b67cbc15f46fb3217acda0acb459163e95580ea67e20c0bb8bbc4daa412e61db1449939bcc26aa5cddbf3bd28a3eb30ee4a437a3d8194306d272916 WHIRLPOOL cf6887492566428cc8f7345b0c5675caa53380f812d8fc00ed8a5a72be3613018c495576a45bda54734efa6564872e349c11c69c0f29c7351eecaa4a56c59e86
DIST firefox-bin_x86_64-38.1.1.tar.bz2 46257356 SHA256 9d2277b66d6bc28869cdc1ffea94ea14e35443adc61ad643e52a5e027f0c3034 SHA512 9e5814eda9e8b24514eba88201597d61f8abe1169dd26c578459b781db0a21a1aadbef13b03bdf6430bcf509787bbf337c6f599f705fb08e7a04fef7a94521a9 WHIRLPOOL 1da8affacddcba854e862508567195d7caf940149bc2bc52714b8710ec2a00b77194afad523f26c5564f9cbd061860fa2967beb17ad230c50c49204d1da2f350
DIST firefox-bin_x86_64-38.2.0.tar.bz2 46271009 SHA256 872fc255ca93a61e5048d2ac18c3f381cbd729e72a01dead7e773b5feede1266 SHA512 50586323f887cc31c6924359ad7c402c757b93b91a5e4deb2347921802fab3ef5296cfa48d0b85602042916b3966ef804718a3a3458e5fef0509e8e9f1eb64ad WHIRLPOOL e385843b58187f00f2a3d24f6a7641bf4bcc82f53b6d357d3fa5a6a0051f9b3b5eab1225b60500eb335c61f0d6b9e5d1b1247476efcdf3cc18dd13d426a8cae8
DIST firefox-bin_x86_64-38.2.1.tar.bz2 46283451 SHA256 52cda3f53abeea17cb70044059a12d42680ea34cb636a620fb02ca5f7b8d1eb4 SHA512 98a4eb3bf63f09dc1769863919d06829223c40063d209d0bed79dd648a001429f048b98db88185062a0cdc2ef3fac2bd4db8ffb231be5c9f1bd4d30e11c8f81f WHIRLPOOL 35d1e5d875442abbeb755c11f65a5536f235d98f028400004dc35c977c74aba36b86d0dc02da861b0f80348e3125d1f67947f80e14dcef5be3d9c98c0f3e9086
DIST firefox-bin_x86_64-38.3.0.tar.bz2 46238561 SHA256 a42b2a604efe4b74d85e36c4fbaa1678d289f9219e47cdb04116282dbfeee591 SHA512 e98d03c20cfc186a3853f54b13d7156b8c55d80e82bafa280c000b3aedbb6565584ec8ce023aac00dc6fd9034d1a4a727b176f043deebd4d3be9da733e1d9b39 WHIRLPOOL 6b3b0c3dc256827ccd690e8e6626216c1d348ecb61f4bf424329b30c76f6db2d60ea3887a53ee55042802f54e3ddec7e6b28303e27c6677aa81a6d482e0f37f9
-DIST firefox-bin_x86_64-41.0.tar.bz2 49326885 SHA256 da950f4dda07884c0681219b2638977d80b9e4330fe040f32b488e66459f4a70 SHA512 967380b30527cf272dfae862b6a7c5aa748b962756fb04032bc4adf19652c5e17f7d65df255b3f8f0fcc8542e947b369ad56a252ce9273f4bd47f33ddbb688aa WHIRLPOOL efba0638bc927dad348372ff25f2af00160dcc4285aacc68a85e8a22b5267ec73763293655d1df86a53ebfaa99d3a45a31493426138f9a157b83856f487948c5
+DIST firefox-bin_x86_64-41.0.1.tar.bz2 49326984 SHA256 320e29d5000410d6db313c7672e9acce1703ec190d2cc46345cd50af45898264 SHA512 fde60fdcd945555ed90a100fca4e45b983ccd54320fd2da8328bc4feac0cd82d8e735d4fc0d1b4900fa922d173ada5b56b4afce0818f69966ed45bff01fea842 WHIRLPOOL 9a85e4c55625f275e7fafbfbb18b0aef0d7115b9edc9a24d5fed6e9bef0d37bffec19caf196e0f347b039da2b2f6370e7142116a23d250a45132a00fdd57f8ca
diff --git a/www-client/firefox-bin/firefox-bin-41.0.ebuild b/www-client/firefox-bin/firefox-bin-41.0.1.ebuild
similarity index 100%
rename from www-client/firefox-bin/firefox-bin-41.0.ebuild
rename to www-client/firefox-bin/firefox-bin-41.0.1.ebuild
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 8440136..b4134b7 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,4 +1,5 @@
DIST firefox-38.0-patches-0.3.tar.xz 4796 SHA256 bfbef81748f76f5f80c3ce6e6b810b65f6266f71da02722b1e8c9fad865b02bd SHA512 a974e33759246153db7d83488f1326275efd12c44a6c8c539cbc35709b4dbd27e848bda32f302ac2baa5d8729ba20579ebc7f643419757f542972ca1a264d520 WHIRLPOOL 3549239db380c02a1575ff407ea684a14827f2250d991b5eb6c8a341ceebaca57cd2cc422e160f00dfab933385d677574cd84947da07bd282c68bb84c40fa42b
+DIST firefox-38.0-patches-04.tar.xz 5572 SHA256 501bd1cbd0ac7239674df4f7424e0dd57cab9ede47e18af0c99a8b8e04aa5ccc SHA512 311d494ba2a4219c88eea651e617aa776d6aa8ff68092302b76e9ff4e3e348c7197ec583923188e39973b7bd14f94df19756daf2495d9b0fe44aeaa3dcd19100 WHIRLPOOL 6605eaa0b80c97d2d5d23a23f7b8d92e7ed875787b932adf14622eb3fb5f5ccdebe8a094d78b3518d874b8819724af94100fd1728074ba4a5c426bbd91eeb722
DIST firefox-38.2.0esr-af.xpi 483326 SHA256 4d822352bd0dbaa73dd547602e20ccdccb62b3ef9bdeccc03f172511e18b41ed SHA512 908819290fb01ebe28aa24202f1d48e38a4cd0d9777dbf148239b5a16873392f8bb102041429dc894789724eb2e2a362592e9d56ced2756afd316d60dcebb025 WHIRLPOOL 566efef045ade62dce1ef92e4e7638cbe553d10a981b8f207a97d4f5c331f2f1ac9494bb5c2405f09b3577f4ab3daac1056af839c64d40510b2ce7e4ff710891
DIST firefox-38.2.0esr-ar.xpi 516496 SHA256 5e5e573f9cf9bb050ac9e94311887b83684c9933c8ba36021010b093b69c667b SHA512 77019b15769825e1734f10619928551efcbdfcfb691edd1bf1f6de23ff705d6cb1ccd79829edf6f59251bd4f2e6dfdb52f6e85ba07fe3fb1b246e5446e44c60c WHIRLPOOL f0d7d3e85f77ae10a013676fa65305a3effc63a76d0ed03c2c0af322b4f95ddd31e4556e35db4605f1e5cd5272d8720ad6f93d3d8025b771e645546f5d510621
DIST firefox-38.2.0esr-as.xpi 509574 SHA256 690987405cf31ba44a2bc52a040f79e07bdca5e1a68bccb65a94f608dd32a168 SHA512 ec636f22e614e2fa239c58731f0008b7c7bd0749752de17bb3a7cf718809a4bc5ef7cbbde177db2109bfd3b7ceae7e3c1b65d9a4cda6a83afc0c0ba7686d0e36 WHIRLPOOL 5588b6dad6be0e397bdb0d28543c67b42ab56557597b125275850c70487026379f5024c17d6d34bcee5be50a94a453fa6b34769b22cc796edd084e2ae927622f
@@ -79,86 +80,6 @@
DIST firefox-38.2.0esr-zh-CN.xpi 488277 SHA256 6b58c8a6fd5e62933d8ec42758a6fc7dd4794b7f659855331debc876e8b80bec SHA512 f17a3d9160a907c5d135d1e66f5a114b6580c34e4da57faa7b55af6d8910bce2d37845489e203fb906e2f124eb1bc874c32018458c349230b23f0363370453e4 WHIRLPOOL eacb3d22b097b05dcbff08078ad534e89fcb4184641b502fac3aea6d7ac73fc0b581b8edbc7b53fa93c883aff09ce1ed115997347a7261928a689e4979b05c5a
DIST firefox-38.2.0esr-zh-TW.xpi 467844 SHA256 bb22672b52104fd11c28d5609d2c039dd0b3636445b091523dfb90538cf84e94 SHA512 e29a7bfbd03629eaf3bd9a51224e5caf6042febb6e5861435e11a2d16673f1db4b862867e5016c2465ea2445efa5ab9f6a07d3719cd79e5be749c8302893e8c7 WHIRLPOOL f8488aa526c7c1e99e49bba22ccc67ec2f180dd339e72411a458cbb68a7080bbf65187ecb01a41742cbb1b23ece00f9db3f70350d4c5a3901a21c44165bb4e28
DIST firefox-38.2.0esr.source.tar.bz2 180722192 SHA256 55867254f21cfc610aa63c8aa0d7156df6eb4c0cb37ebac30259e4890170aacb SHA512 65df7ea87b6a48d328096a26bfc6e2d19d9fa45c35cc576f401e2266f884708d5fd4cc6cd1344b70a8c9bd611a439df11ea1a978bf1d9f1719a240b109489b1f WHIRLPOOL f001d27a402f5fee5ed1500fad61dab07468e315e353598107f638bee08e4b2be63715fd1ad7b6527a0d289a855a520201c753636a45842ff1329efc6f2ecf3c
-DIST firefox-38.2.1esr-af.xpi 483326 SHA256 2939af5389d2d480ad9b0b5fd4e13d725a07b47f1e025d7abe232e25bd6f93f3 SHA512 6a55abc6fa0b27a0029b7693d7b8e15105ab40f3e28e905f268ebf172963f2678bda470277144eae2c54eb99ebe9b31a41a7b4965ff546f103cec75cf3713e74 WHIRLPOOL c87f75bc984de737d89c5ddf6dcebd95dedf67d6bff96db0ccff3a3bbf95a070c27cc1e59ff9e617213cb90f15f57d0e3c394c31e0187e671d779d0172a7a2b3
-DIST firefox-38.2.1esr-ar.xpi 516495 SHA256 840e732a96c8478d0815888c79496d1c62dcbd6133d2304b0920f93d0f6eb3db SHA512 51d47bc01f197c07464e19a7f7d8c1c978415d76b1734bba7fba2c56736f980d6fc1def6c8bd91a9dd213bd4d55cbc82968b2e04df56761abb232aa40b8512b1 WHIRLPOOL 7ed57f922148ee417a6aa0dcf1c4272febd662333923e4a17218a3e00a612757bae6c9e9cab19f75b3318dc94af9decaaaad9c434082e7135e74c602f209541d
-DIST firefox-38.2.1esr-as.xpi 509574 SHA256 3aad4f54d6b17a1e50ecff8f88d43723fa7d423ef5523a01e80b2eedd4d40ca4 SHA512 87c427da29d9ab579e036cc83e29926b2dd75dd362c84dde8e380cf46a482041b0226b7bcc037fabd41720e8f19b184f83776be35879178078a3f2663049e40f WHIRLPOOL be532efabfbf65852bc153aff5e9a5f29786578724cd0434d11178bfa9763cab96202e20d05fea0419e34d6f94c4508ccf7aee444ccc218603494d2c91212c48
-DIST firefox-38.2.1esr-ast.xpi 397202 SHA256 9a3dad64dd09a11293936ad421d9cf54a112363497fcf2263e56fe4dc059b648 SHA512 99977baab4d1f6bb474cbd1a41ba93bb91e31c49de58078f76164f66b1c7ef9c1b398bc0e81ca0b832aaba736c402e4d28e6e2495500fb8906054a5e251b79f0 WHIRLPOOL e7c3ad01756599f497b26e5d791a75f5f728ecdb6f7b15ab8f5e684cebe4b3494a6a6212761beb35ca5d754a5894c4469629ec980403b2cd26f8a3490d458647
-DIST firefox-38.2.1esr-be.xpi 441057 SHA256 fd6d9e058da409985c1f9e04b608c897e3ccf81cff733029c4c6571e7d128022 SHA512 118f0efb28216d03ef7dfc17f82e5d085ca407a21cd071072c4cbd766759c398e4d274bcb4c0c51912eaf848baf418c0af7fbeedbf44e2ba2f2ae3ac545f0a81 WHIRLPOOL caffc0685b15291779fdaee15a239c954b7fe4bfcd4ceb0a07fe9c9105fe9deb3dddf2b050d9c2b9a4c89bd97dbb9af3c0e05c2c805602bff14f2b97e665fe70
-DIST firefox-38.2.1esr-bg.xpi 487819 SHA256 389edc15450db4664667237ce42a7f207278777bf13fb7531ebba54a09df460d SHA512 06c8c37ec7ad1424bb2e5a1d893095174491db9046a6dc91ed655af243b94b374a765dfccd461e719faea5786c5082a201479b48167cf0c6e8605552f68e51c7 WHIRLPOOL 996c9166e026ca61f0ea28943b3e2a0823d31156ccc177ae37a114a0f6be526ff055ee863a207b201cdab7dc9c24b12397d7d6686a3cfd04f311caf913348a46
-DIST firefox-38.2.1esr-bn-BD.xpi 528690 SHA256 8acb41f8dce61a494f04e2d3f43eb0a23e7f21179928b803d6f0fac42ee1b4a3 SHA512 b0b2118f4ba9f24811b51a19cd14a5f18a805cb333f004519717a3da9d9b462c0949d414e3e4baa418c87ff38b6e42edd607176deed0ac7b315d3f5ff9860dfa WHIRLPOOL 12e74c874490a890b99de0bcc974b9a8e64e07b609f792dffca5922358d384d7a03b42e39100794db16ab97880465a0e45c41aa676f50d3b29a29a8d47afbfb0
-DIST firefox-38.2.1esr-bn-IN.xpi 527927 SHA256 bab25d7ce5747110b39b2b99685853a5931f340daa2cb88a4d53b01b0534f211 SHA512 0d2fb6f9a27c16b0dcb41e11e9cb3e09c7afda5aacadaf7337ad81070891af0c8440444ed2bffa856cb468748db90d42f4bd078e52166aa5ef03d66164b9381e WHIRLPOOL a3d87fa4421a5da9a2367b9ec9d396fdb1a0207d5bde817f65dfa30f2dcbe57cfaf85407fa12aa1a970eb443aced092b1119b97ddc9ff8633acd44bfb2430a30
-DIST firefox-38.2.1esr-br.xpi 441961 SHA256 a5cbd1cbacdd7d17c7f0d5d62583a0174e69e0905ffb22d0b7a4e936729862c7 SHA512 f56235cf4cb32eb62be80f36b4fc31424c5049ffefadacc6fbe02d49c547b0c2bfd20fedce10abab987d2ea02d646801705a6aa5623a7319adf4e8523e6459a8 WHIRLPOOL 7e0071b9343def033fed4a6c9d57cf617b676097e1a9d65c6ab111e309746dc866359008299d42ac57fd320b9e39336b6b6ac99c993ae05623a25b517ad81bb7
-DIST firefox-38.2.1esr-bs.xpi 485305 SHA256 0b2752ae75b2306d5b01731cf470cc02da75b759ac7fd4b0bfbad76e85214b50 SHA512 b3d08689d30a98585db65fc9ccf3958c6427b056a5dd779cdee8cb459623ef5d874b9c659750ea1ad3c6ee30296a7099a646eb1c632260f531beeae07d5060b8 WHIRLPOOL 4887bbfd4109bf6bea1eac5d49e94a33eb824813c5102e24ff0d3ec7136e403f0eccfa3171cf09a865b74beeaa3669f44d94ab1c6634d4fdf4ec819df874f8d7
-DIST firefox-38.2.1esr-ca.xpi 458091 SHA256 9a7838b932bf3c356da9af568718ab058c86076e435f5d0be4a082bbaff190bf SHA512 f5dc9cde4bba17550129e5ffbd33bed1a5e670e6b1348080b6aba9a7ba4f725011ca72bd00421a971aca1ff667b4ab7a06902a02667b7962623f3f9e4506533b WHIRLPOOL ffb19b22b6edcd80d0b2ecbc5bce77da27d3d5ea541974e9059b6149973af8d4d62b0d3cb62d615ecb946668c83b83c6723ce5495a186db0a76b35d6a74e5dce
-DIST firefox-38.2.1esr-cs.xpi 446725 SHA256 d8c4ba79e4725029dc4073e065c65a8ba1d97fca9e2ab53f7147184211801178 SHA512 18522211818d16a2c9abafba8c8dfec8a57375adda4b4b5e26c2976cc29b03ea082c5f4b681ca8fb644f16a368210f1a264c618c66489eccba7ae06f7bfbff0e WHIRLPOOL 272361f5edf81e15937e6ec9201b00e1119b85856c57214077d98278da559356309bece1fcec653d1eda232c877de98df29d9ddfd18e5ed48e4d8082f0625fa0
-DIST firefox-38.2.1esr-cy.xpi 444384 SHA256 8916066abc92d6ddff59b248ffe79bc09e42ae2e553abee68cd96f81f7c9881f SHA512 08b13deef1ff247956883be89f5d74166e28e2bec30eb9a3457f4ec8b1041251b493c719035e967bb95d3bbb6a9377419022929c91757068b96c48176c9b0927 WHIRLPOOL 948ffe8d363cc48760c196ebed89b3ca379bdfcce20eff4f162cebdb1c8ee6ba7857c3bce314d83d692483c6be034a1d1a51975d0aa5a76ba362edc745cca164
-DIST firefox-38.2.1esr-da.xpi 450762 SHA256 269107b93e0f7df8b9860672ae5cddeb816bc184d8b083dbb0c12af4723da666 SHA512 07cc34e151e9c0d6fc83d7fc2939b1f592dd5888f0a949572c0037be22b57626fd5ec33e2a57dd2a32a9cdd54730682a8dabae752c8888f4de4a5ce053ec298d WHIRLPOOL 22c6f25f0fb099188d5cbec9bd00559f4db13a4ed6e263e8f8fa98c9a0557cf27b37a6e8563db8fe91404dec4fea9801d0638eac938b989b480a6bef870288b1
-DIST firefox-38.2.1esr-de.xpi 451628 SHA256 3875513fb280bf215f37062078f3dee9e19b49cf43db4a1722975d086700fb9e SHA512 7371b4a258a4dc14e3a8af8e5e06d7eaa88d8e63e8a46da8cda458fa21584cd7afb05a0858179744c156b5ba9544aa21cbef1c9c7d61fca7f68162e412a024d3 WHIRLPOOL a3dfdac96d5b3f37c094f217d5400c9c4de1b2f58aecd22b7466a827bebb0c8910f324c26dc0bdd276f206dd860b512a774f0de11e34eecdb9e2b89d737f0021
-DIST firefox-38.2.1esr-el.xpi 498370 SHA256 b0bece2e1762b042044e676b13ab33b5d8dc6397c84974ba485e656bfa859fed SHA512 0388ac0273f7e9450dd611902025080a1c98ece4f88da9d11a18475542949789d8f684fc2fc1af93c18c0d1dc860f0cda3952bce5ca5c53bbb960e7e46ce88e3 WHIRLPOOL 650c3af1124a227327d1824c38e5f4464ad66446d6ada449a39a543f111a53f206455abfb6fa7e836775ab2f0d034cd4acfa7845952115e7c8b7878400b64e02
-DIST firefox-38.2.1esr-en-GB.xpi 437846 SHA256 8f5dbb40d08afd368f74204ace917bc13e384fa305b5a588f87aabd7da741177 SHA512 3360afbe9ac551595bd0de14d5362bb36a5ad9f0c119b70dcb920de19df098ca951b7f0877dfd6996682386ae168f1b8d9491190a263062008b49c5267d07181 WHIRLPOOL b4efb6c1733f523acd08dc5fa418cc05ed2ae22dca2b7bc18c3262b287c2c99fee8d45ade0ebcb0c26864de5e47e5bc70ba7f217b53b2ba91d5e5e69960d8096
-DIST firefox-38.2.1esr-en-ZA.xpi 439926 SHA256 d4d06c2c80202f06a837dcea7e0431f8556a58e7a97e5e1bdd41ef8cd575f8db SHA512 2b3411197fbb87b324cadf89c3d793c01bdff28b6b03990e0ca40ef1762c47562a9bbb850568439178880bd52d99fc929af3f9efc451320b925003dba012bcef WHIRLPOOL ab1eff69233928dcd0933cfa97a0cd5ce1d87d1a14cba2ce301dbcf99a6aaaf23668cf406819c9076ee74ff3e0afadb4260646e2523f5f7116adbea72f8ac6c9
-DIST firefox-38.2.1esr-eo.xpi 488370 SHA256 34d5455052f0f7e43561795998b9a9f20683bbdac54d740e2ccc952dbe35840a SHA512 7ccab0f98c30df0bfeeeb278c7e5e9bd1181e394d931dc035700909c794143df277344f78c49c9b3452ee7f83cc9d47403ac9e8d98f5828eadcb5c35f075f788 WHIRLPOOL b1e9e293138cf02a5b8ec861556cbaf17123b87bdb0d3c62bbf31727dce546660f941c30316d440d2b214aa62cef4074b41d980b13d2ffa9521bc541c04b4459
-DIST firefox-38.2.1esr-es-AR.xpi 453983 SHA256 1539d6b82a8a475fab958de03819b9ab866531d826248882f70dbedb52caa095 SHA512 822acb3209e36954546ac945c2b136b189fa43d87b814a377ab046486a826bab08ce9a8499b1129f6fb8024014bbfd34df7053adf6b7182ecad5b9edaec40f2b WHIRLPOOL df36245571f7ccfa3f19dc56eb09ec7331bd70f1585ac82ea371d98e9582b2f744fcb89158445e15d75bc3ad893a9595a49e7281ae95eae6d3faf0d92df7d186
-DIST firefox-38.2.1esr-es-CL.xpi 384679 SHA256 987c370767ef39c784977f15768a79833052cfccf53b90ab0ade524270fc299a SHA512 e01aaa24200f8c2864f77e29d3504b1949288338b6785f36116c4aa34de8ae2b3974b6c7bc52cab6de95239dfb2f358f159c496c4339070692d32ae2e85de6a4 WHIRLPOOL 4d1c4bbabe2d5d088ec518cefe87b76dd90b570049b01d0e6eac4f33e76c069a743aa3b4d45c7ac1098e0a02a880cee87ce00d2bea629ef6b6c895ab2cb68b11
-DIST firefox-38.2.1esr-es-ES.xpi 374073 SHA256 db861b6fb4eb4b46cf21e3fc56ec3ba98303cf0aa8c2d5c1fa4efacc93342400 SHA512 60ca1010f9b21957b0e487827f458e51c9c8dbe2122153df7054e04f3b65fe9e2afead5b7d22810b04388d94b1993ccda4e5e928ef765da0e60326bd2298c190 WHIRLPOOL 938f3948e4b1e01f1adbc36972ccdf9c2111ee5f99022fefba62cb178592191ced5e3ab4296aea7fe2f577d208ae1b8c00b5f9f93e7d8c4918c0d86f26bcea14
-DIST firefox-38.2.1esr-es-MX.xpi 457049 SHA256 b78492a8826850ef2a3f7d7c192c15af573b59c64871a2b849c98277eea28234 SHA512 352df2f6384a0b5eb5771ff8fc9318227ed2a2a9ba02cd548f6f35db3edf5cce71424baa5c99339dc983b8bc2fbbabbf4db4404db37718e2dbeefc2ea985457b WHIRLPOOL c705c81fa380faaf70bf1fdb5055cdcf80a39c5c5544926091c7aeeabb40d502861327cbf4e483a862615f518987a6c75ef9b469664e49dedf6a61413e92b5bb
-DIST firefox-38.2.1esr-et.xpi 443228 SHA256 fe133da93e7c1e88f1c39321de56f679db228e7a0b7c6cd08ccbec09579cb9ac SHA512 873f3f8183e770a01151fd693f28654a0e34f0fe730105b3b72369b6ea6689ab16730b1d67f52f4747bd68976f0f80485d9a876414c6565a4859ab758f8ad7c4 WHIRLPOOL 71cf51dcdf8d0af53a52c8f06ff504ec98ddb1d9daf5b3a84bdb6a02b07d2d2d141c2314c3ac043999f24024fd3b4f4ca4e1f0b4fd7ccc3808f6ca9356416557
-DIST firefox-38.2.1esr-eu.xpi 466555 SHA256 4b34e8fcc664fc47de1ee7fe1b8c4054a8416288a89198f1e772d37bdb0d6dad SHA512 204bd942ba9360aacb5bcccda9f9d76b289cd9d73fa19f7146e6b2b89db9c9ec993d8e49a2d32924be35efd82aa200c6a27074c36cd694c4b85df03e3fd46d23 WHIRLPOOL 6535aa3f3f217efe443320af4c437a0bd96eafb33f7a3471e1c942229094c1713e221cb73ae89536c9ac43c586e90a944f18b8c952ff4a98869a18f73fe80623
-DIST firefox-38.2.1esr-fa.xpi 518282 SHA256 6525afff18f0e5e76ba8daa67ee86121998ba3fa199215aa207b83759a7ca616 SHA512 f7eb334dfed0cf60dbcd5001c10537a0f8cd238d4c7a27f74f44f38af985cfe172eea8db58075d484880058131e9772db1d110d1609ad65a7f96fa464255c135 WHIRLPOOL 66ca74b443ddfbcb3e7eea3012f9841f9420149e574ea907c5ca27782605ef4723aa2cfd928a9349f23d928e9454b8d122572b960f69f57efd253c6c3335a696
-DIST firefox-38.2.1esr-fi.xpi 444852 SHA256 0930c3a33eb29d31789e7a880a018912da6ca4e9a51013e08bc311d775f4021a SHA512 d61836aa42232a05bd8cf9b6d7e88fa4a550c1e201a090fd337c8afbc45c495ec88cf9fe23ffa27fee52f3782e894c0568adc496c243e06fceddf738ab498100 WHIRLPOOL 990b43ea313b88598d0268a1d902f928823aba4dbf3adb71485234514e3d82bc542c1f8847e0fe4b5611f77a831b4ca7f7107f0c31da32b66fc19068647c05af
-DIST firefox-38.2.1esr-fr.xpi 461401 SHA256 459b100943ac236091e5945aa84047c7a0b540769c8d63cf2f527cbbf645b401 SHA512 dc744452636a15cfa1863ace47dc8cdb9e8115034a7a4e9772089bc26c62d95039b62291524ac83f1810df11163c7609b59c954e1b935e5dc0aca5f368e5c9d5 WHIRLPOOL 1133254e25da32ce1412d63133f55a0e336d279db082a7fe4a6915761ae70d076dfcebe1afcf8d5d3d24c7715c78aa3cf0f47dbc2404e0f77e550f3decd9bfa7
-DIST firefox-38.2.1esr-fy-NL.xpi 455538 SHA256 23cc544e74606aa72e9ad2d9c3bc2ae835c82a2bec5787a531e5913dce110d18 SHA512 c36b37593bcff2575ffa453d4e7e0b15c22f343a9faaf388c5bd4fa96a8db099c25c568eff2c1e7841f52d421064339c2588f7ee5f0238e03c67baf195dded17 WHIRLPOOL a50a4988d8e589dd8e44a3c418b88d5812a142b64e31b60036971d58a1f8ffb0ca7e5c07bb2d9cec73ff2482443840e219d36e5a07a9b6bff97a32a4d1757ec1
-DIST firefox-38.2.1esr-ga-IE.xpi 469623 SHA256 0e45539bd39deb9315070726b44c01a8c12c9edb0d1773dc62bc606c45263500 SHA512 037808cf9b106b7c3716d1a8e0c2ef000fbad1011ccdf9030489b52ec9df157d588d60c8d33a9182a4dcbac0c460b5ce5b87c63639839f73418a0b5cf1709ebb WHIRLPOOL 9005b19a658394fe6239e6289f89fba0126454d067f0139f4ef808973b2340aa32ffcd159c7aa7eafa71b9923faa770eea8cde986b559f09398c9ee31371f93b
-DIST firefox-38.2.1esr-gd.xpi 454616 SHA256 7d0af6433a55c2b066f136de7cb2e19182f2357d7e48ac7711dc0dea17c27f8e SHA512 968d7ed84537baed632bd07d24a6528ac68ef1d00c2a3d51aae3f025c8ee9c6380ba5e21fe55cc80bd6d637e38e6387c919afbb0a08c9efe9985ec2451a798eb WHIRLPOOL ef737729d81f8901bfc514d25c3264a30dc546088ea400ee21923e7f62480046a8b9ff1bde5fc61c3b08832acbdd81c9f3e960d2f7677da7f4cb6717b60c8bc7
-DIST firefox-38.2.1esr-gl.xpi 448923 SHA256 9253cb864e13ad8f86350e3560a08705e3b411f5afb69b66fcc739571a5a9697 SHA512 6139e627e838442f6f1c6717d1af70c52be5f0d3b3acf0300866176e26475224a3b5998d5fdff47293542b28ccf6d282267bc939ecc0fa36e9b9e7ff781c9ccc WHIRLPOOL d1700b5d77b6ae0fd69521b7bea7c8c66e509bc1211f026a673fbae627d1e2a1ab1198d256e697d543cd023517ab5d7a029fc72009aa1594bcf3153fc98f56a1
-DIST firefox-38.2.1esr-gu-IN.xpi 477979 SHA256 e926a61de3fbc8f7120bb07fb0450cce81d9da6842bcd5fa7a8df1499fa11013 SHA512 528b2c1987f006e7315fb4bea331409b1eca4898a9345e53400bb0473043f9be5a850014c3acdb24317cdb56e956b8c9d7c28a1a4e0280db5dce38b3f7a518a2 WHIRLPOOL 292c4d011db7b26f1883fcfa817ffb4c7848657abc2491b37d845141a77b6c291001490a7f383ff25c191c9899257cf857bc3ebccbe749ed1b022b36a2bd89f4
-DIST firefox-38.2.1esr-he.xpi 486784 SHA256 b14462221fde67c0fffd2fa0469e6c5a476540111088456842a59809e1e6812d SHA512 9c6f99daff72d884f760204c00b2eef1b8cc6953a5daf4d8d087cd0f11d37e690b981c090b7d2d649850bbc08b1a9d52e8e682eb3a781572f717f263069f3308 WHIRLPOOL b5aa8d7a0b6277ede69bb24b800ef719f0c22fcca9724e054351c77480cf677c1e38fa60881ce441483d602ec8c1ec1c069ef617eb3a5e27ab261ae181c70456
-DIST firefox-38.2.1esr-hi-IN.xpi 508166 SHA256 df8683b412ccb2d4142099354b0759e59306eb96be12760c7c0f58b7b48d9411 SHA512 ebc56a532892f46a2207f903ebd646297d87659537d9f82df79310af4eb36323b3b806de8e8742353c5b4c3a0de4af88503740560f27b9c684d4858347e7ab8f WHIRLPOOL d00028be489a1b9713c38bad8c304c8c5aa3821349ed929f5f5ca61cf561baf96448ead01068c5b45d4119e63596932d48a3bb517c95a63977481fe7d130d942
-DIST firefox-38.2.1esr-hr.xpi 478270 SHA256 2405e5459c45abbf455845eee66bef90460f4c5c34aa1abede38737d2d8bbbd1 SHA512 e33414e48399d1372233129511b379c1b936310b398dabd11b78986b97a19ed9310c4b6bc4168649293d01b4cbff297b7d3a64bc833fe3f12cea0b60d5437e65 WHIRLPOOL 3d5a733549fdf95df5beed5acdc817b656d7c068cf21c69a722eef38f0bf8243958ae38b6d7eb07384fbdbbbd91f2e4bb7a5ff704397f82ea22672ab420ce1fa
-DIST firefox-38.2.1esr-hu.xpi 453554 SHA256 7dbbebe69ff4ae414909e02eadefd1db7b7585ebbf450c6906e515cd55ef5144 SHA512 11866f61acd467d6367ca1d31cade3efbee840844ab447b657e864fccdc52c4d8dcce87891f0bc590646d56c89330345cad19269236ca1b70f4888dc270d1770 WHIRLPOOL 0e8a90fb62da271f0ff4bc6f979be878c4337c17c7260a92fbe597c0276a0a46bec4f83686fc3a7678f5a3f7475c78e46f008ab0264d699676e92bdc962dc655
-DIST firefox-38.2.1esr-hy-AM.xpi 534264 SHA256 20a4c0b5abad43617850551aeb00c303fb74a11cb0ffc88a5f6a21500e0c707f SHA512 7996eb7d0231caee84f0df345000201b320dfb2221e12a8fda480df9ec1c53b2b52cdf4fea30e79144d0fcf942e98361a19ec21783fbb21ef1fd844bae6b0c19 WHIRLPOOL 8cb33e0a6e3c23e59d683437edadb55f2a205f25492d6e97012a63bd9e9c4322bb6276a8725b865943276d616e3618d9393647d13ef068bd9909878c9f707271
-DIST firefox-38.2.1esr-id.xpi 431488 SHA256 bfc5fe681d846d57ff34b69916a2a67182a020652d7c4949f6835e84ea296f22 SHA512 58c329e027b8d5bbdbee4cfcba44aed6756491be3b2ef48e54a5d9e821dc8791315fa760973a54d169b9b1ec7145f2075d6816ab1d69fa6b7656005cf2a5d575 WHIRLPOOL 3764750f90cf344917e881c32340b54689dd012813834c208558ed25e6bfd86d78be75ed8e30840f8e42de0feab63b9bb2924f6a0f12ca7bc87c89808e617084
-DIST firefox-38.2.1esr-is.xpi 485129 SHA256 7db45517845cb2c10240e8bc208aa98eb59ca9f7e4ac63458ff73b01c6f81feb SHA512 20c99a55e42d0b7d30863e7a191b094bf86c28dc5dc662faae7d87bfcee4e27c71d657a922ee8ef1773a65f86504c602d3675423d64e900df21f2013aa16ee36 WHIRLPOOL 53ae5203ba8407ed500b377ae4e05b8e2af832a47e4ebd2298206919b432ee8c9aa378399bb219eaf0c09118e5cab3c977d00372b9143060d99d665a03132d98
-DIST firefox-38.2.1esr-it.xpi 368409 SHA256 0b34622317c71e5d4ef73a2c91103c81bb93e00ec6745d815f5b5c5e0a4a80a4 SHA512 2de44fca99a2f3637df02c19a7902990a5c7347366ed40b3546c84e62e99c5a746ed49f99bf1d5d0ea7826de096a9a07a8fdf5c1ef638170fad99c12d7c80b42 WHIRLPOOL 0f96187a6a9f7769823fea8a94b44b7bc4ccd6eea287fdafeb674e7bbecef325070281a3c02d3c6cc84bae8c9451bc04173e51539d1d66a35849365e49173977
-DIST firefox-38.2.1esr-ja.xpi 479113 SHA256 7df70432dfaf748eea5edfad608a3fcce377f1c3d06d1012f2fb28042f872ae8 SHA512 5a17aa43fb390f92b703d076aa57cecce9bad443e8aa8ca143755a823994e8fb51b933e628ae39380c9ab063846636bb92a148224701cd8ad0b26ba7e5caaf9e WHIRLPOOL d2a92382f3c9182c8f84f48c403d90ab5a352164176f62a168de1cbb04d0d78a495e5aa1857961e8785c6cea1cc8005085f6a93c7697c3c5416cfcc17d0ef70e
-DIST firefox-38.2.1esr-kk.xpi 503568 SHA256 07131063fc5caa3a3f20d9f6140d3e0640c81e842389cd77c26ed722ddb195b0 SHA512 675a5c52b54a72a228c16bce328a68b9ec6a15621488516011550afd8ab2d7f88615111ec4874c35d8064c9ebc67fca5f24b35a079092428a618cdcc650c7634 WHIRLPOOL 8bf82cba02373201d141c372924236c5c69189199ed374157bcd5e0dcfb1b5aa0b0d1fc10815e51edb830936a2a2e6eb78d14dc0aac7fafeca61d3bce88226b5
-DIST firefox-38.2.1esr-km.xpi 565673 SHA256 35c67ac083036edbc00351f3c75b6bd59a57f49b8f49326b966e49ed1c440769 SHA512 4a4fdb3458145a96f490bea83094e865eadb0ee72a7be6180a7e5f6c9f106a66a38a9fe066076ce3a9b280e9cdbdad86dda1c21aa316a19541740540143ce5ca WHIRLPOOL 84c8aa57d7990f87dd62faddc150d627d35eb996a0f102bfe04cc207b282591e25cd6840c754a36da104a574c3dd1364e749b7b40a81864abd1fb19c9efdd20d
-DIST firefox-38.2.1esr-kn.xpi 533464 SHA256 b88e298f2e884a027a993b1e08bed8d4b693cc86d0cd9593570cc83561e9ebc1 SHA512 26b629eed4b266eb86efc647f55f06f0e8b4f618a6241445b265cee4b99ad42b28ee85c431b2aed23e591fb68224137df42ea64ae26aa828087360ac5aad6131 WHIRLPOOL 726c43e9970cab57d55eb218b88b65777e45ac4269737cdc17e38bbec4cdb113534e556fa7a143955fc83ba679114abac5b9826bea7cc6220781e9a98832a8c6
-DIST firefox-38.2.1esr-ko.xpi 460853 SHA256 bb7f4562361941f1f6cb5f157b52a0c8584e52eb8b1e0d643b00dd7bb0b5c51e SHA512 1d8a6dfc7f45c0e26811c779d61a146388519286e972040a3cba115dad64fda8f0bfe054c08df3c5ffc681a75a8f24a426ef61e7374bb5ad9b1f251685ffc418 WHIRLPOOL 35bd2a3cbd83bdaab2a3ce16041e9e3f0e32660d8166ef69334a5bb3fdbf4e62c6d61e7137bf4c81275fe9e4c3bc6e3f8a4ef456340c72263b3d3c849663e300
-DIST firefox-38.2.1esr-lt.xpi 486452 SHA256 285abdd84d600b7aef0eb17371879573772e357d147178d02cbb9004cfd01d70 SHA512 78b27ca774a685835ea1b78b9175650c643ae8399859f1579fea16d0749a11705a115ec113b0de889cef7657a31d234bf2fd1ee4c4e7af17bc7a93e0fd9a7ca0 WHIRLPOOL 37cbf7ce0589a0111d1ed206e54f0ad4e80439bb427c24860805fe651c3ff6be245429919439297462436cdb17815c08ad4c17a37c7b8f10f2ac184751a0f01e
-DIST firefox-38.2.1esr-lv.xpi 467197 SHA256 b5b427806e1b7172110b0570fe381bd40486790c415dfe8720343c2a34c41a64 SHA512 4e6c32a9ec46416b0427126d45296a1d7a11ef96b281c03cf7ed406fe10d7f18c2282dd3a25e0db2d4a839eab2461ae7e6edaff4604cec433bceda286fe3f0db WHIRLPOOL cd6e0bae9fd9cad9c7c63ec7e2b37fb66457309eae21be46c574cd786a39e0a93e04180e63f38b60589b0fad0bd0e51868e198dfda39d4264a4c7ac51f1536fa
-DIST firefox-38.2.1esr-mai.xpi 514666 SHA256 443c2edd6fec5e81d19552ba514b2dfc8330285fb0f984fc735f4a1b5de6a4f5 SHA512 49a1b13658c7e93608dcc88c991406bb8e4fcb902a5945e569e4402a9b98134293d80716cbb10360e4ca8ea6895c521ee1a48c05dbf7b0f0e208028b50970002 WHIRLPOOL 7a43b1f9c33ff4c6cabe107310d38ca98e35400d9840ccdcceba7cdedfb13d8919b8bb2754188f7c70d65ebc6578943b2f530d63ec9a2d18cb3f2e28c8795275
-DIST firefox-38.2.1esr-mk.xpi 529205 SHA256 b57c5314d1b3824396a0cf6a4bc7d8cb70bc01730443dfa791bb393969841daa SHA512 dfe5bbf05e0187cd42229cf6c441e643d47bee7c56c62f766e7d6bc75494ca86945ab5a4403f54c9f7a81d2837289076066c3831e4dcc99c41d5ecd80e95fadb WHIRLPOOL 2bdc8fe754fe71cb69ddcc6dde7aaa48b5590377a619e6a38de313c1ff11531ca0853bad097f3dd9448164f1ca75db448a59370a67920ab6bbeef4eb63ab5966
-DIST firefox-38.2.1esr-ml.xpi 528919 SHA256 f55fecbcb7a2624dfdb557584c962b04e0b54bede3bb007cfdbb28333022fadb SHA512 b67b03136f329c14cf2e6264a247dfd349f2215b7eceadc01554bd1da6629b5a1a387b1762b4a818617abf1d79cb32eb7370376058df3028930618481281e98a WHIRLPOOL a70648fdd5204566e3491d7990c04f553965c8fe1bb31e0ece0d071017e08aba810ea40244a97beec758938e0177fb515fe2a4566c5de0137cecb538f0961fd2
-DIST firefox-38.2.1esr-mr.xpi 505961 SHA256 16d656c2094e2ef767d4d6a3b6e290d10db4902f71dc8c2e9b1410358bddcac8 SHA512 69ac24a50df53c180e31491a62bf55fcce5a6fd8c5091282d09fa877d69153ddbadfd508ad3fae932c58e26f7a50b615c2e1ec2002faca17ae892c6462688e13 WHIRLPOOL 6ce9c81d8c953f80cd5e454b8dba871544c475f23befcfd1d02ecb0c9e40875042b01099096eaea060c1eb29a3dcffa39c0b73ff1495e0c2cc2eff7c16030c24
-DIST firefox-38.2.1esr-nb-NO.xpi 444177 SHA256 ff22df16587ed823ddbd422ef92492737e5a995a776413017c688f7b2f5cfb6b SHA512 35d7a20f3c115ddd483f78cf75ffa6f612d80bc06932ab6f04bdbc8e27bc3ddc29860db4b9da66dfec600dbf020fdd4c98fe56177600cc2b4aeaa687a683f387 WHIRLPOOL a7ac138b9032778c38b0b7bf6d7c597c05e0067c9fbe928d9deaa32ffe77f89f3c6f64fefcdef8f63180154d1a2f1f45aac22e9132dec7c083a8da994ba35e57
-DIST firefox-38.2.1esr-nl.xpi 443995 SHA256 294d298024e333812504bbd269f104ac362e32f5b71b4bcc21591acd05cb52a1 SHA512 60c8009dcfc2fd913348d8c798548c667149eada33c7804de1466dd070f74bf6cb778113252658bcfa66280be383471d1afe22cd5ca97669f09738601407d17b WHIRLPOOL c76e5c16cb270cd118e88fe817888083b8f409c3f61d030fc2d006c9e47ad13aa8c1ee8d641bfb2bb5e317049a17f609908f09df1a89235b11764909a71b97fd
-DIST firefox-38.2.1esr-nn-NO.xpi 438452 SHA256 c445a5f538cec05c69d2a7838f22e18123f34d7217454984ff9c02a7072364f6 SHA512 1fe34e97d779e9ea4e9d78090e1fc9a28fa82aa29cce9802e0b83e21f7645570bc3c7e8368251f4b7011ec40cb9fd1b9008cedacfb733edd410d57e68ec5e527 WHIRLPOOL 842cc7dcf861bf190e519e2ef2f222e3d909b4c1f6c6b8bb80df4a4fbd9079b989f29db5ae1dd3de4b254176bf9b286ef858126f37398512c49adb692d8e7b9f
-DIST firefox-38.2.1esr-or.xpi 527050 SHA256 af6d63813c6870ac5993860940f06c91611fed21cab87da34f7dc58d566fc751 SHA512 0f1ef04e843768b23966ceb699578c3476b52fb97b8f9fd7babdd0d4ebca95bca8c05178f6b0cf3ff7e3712e6473a48a795476c31d4c48b6dfc6e75a36539fdf WHIRLPOOL 043b5f848601b4944033ad66975087653688b3b290431c8da56dc247a59665fcbf7482ed0bb59cc1a1ab98fefe7116a7aec22edb2d0fd2189043ba67d4d3646e
-DIST firefox-38.2.1esr-pa-IN.xpi 493723 SHA256 adfea7204e49f629aa1432364cbe876b2a40b339e4279fa9801d650d17920aaf SHA512 59c0328b85ce5644ce91b5c0e39e3227557f232fdbcf8632cd338a1ae82d0aef92e90928fe1b55e95f003e1062cde9f269c9ba8985d87e2a509d61784443878a WHIRLPOOL 395df922af6f16e03ad4b5d631524f0f1add6a6349c6c4a3cc5312d4cf1b55f55b938b47f25f2267fe50f906bfb22155427504b7abb1c850406c1b3aa0228af4
-DIST firefox-38.2.1esr-pl.xpi 406567 SHA256 651bdae9f95b09fa28db0dc6c47aec3271d628d2ba508797750a5dfbfdb6af8a SHA512 2202df6adfb7223dc541f19b6213ce42cab32eb0eb5fd0f0af4b6c2110f2e5f01392cd5ee44fc1cdac2a841daeebde06e8c3b89e6c80c86885051eb8de5f29f5 WHIRLPOOL 6acd9f43ba61b10ea702d37260eedebe4327f30d9a8f232ae173b98a84aa472ae164cc3ae2926fe2f6c47fb704029c6c3e7530a326a26eaf95bb49b1399ea127
-DIST firefox-38.2.1esr-pt-BR.xpi 459811 SHA256 c4c0744d55113c5cf6ecf9c4ca2a283f7b63a4d6ebd952b0c271f5932cb50120 SHA512 c69bc4bae982bd1cf9558735dd3a595d63f371421c0804a8f4c3714f6ea4c9bdd798e9afc6289b6035183412d5c02f5c59ad14dcc0de165bf20bccbe8e251d46 WHIRLPOOL df0e5c98f778df426413f5011c9d653fdd9dc3918c35db7d4d2662af7ef93a802060528ec5aaee627650b0db20ff79f08d42198d441a055c6cd7590808f79f6f
-DIST firefox-38.2.1esr-pt-PT.xpi 439976 SHA256 6f950c7eea881dbcd2f4ae4cce41f6ece38add5e511c741a6192c1431b6dc49f SHA512 cd7c6453e9549684f00c66638bafe2d894d370ade0166e0d00523f5323f4dba81e49501b881e7b3d7d36cdba7f2ea90f869f69b42cbcec5ec93fee266b806484 WHIRLPOOL bb956f293f916b70456757f5b50623f64ee8458248e7c441635bde83a886359f9647d9c4714764a001b8047247006675178ce7a95d4fb277b5e07c256bbf8c56
-DIST firefox-38.2.1esr-rm.xpi 446286 SHA256 5beeafba0a7a1cf2bb14de27cac8284ac713712c3584e2d056bda5fa10d754ae SHA512 51224e3b9ba008d57c56c226eeb44ab2d17f44d430e490d94400fbf658d3e5744322b88bf1f4ff6983b8aee08067b93b1d8ea056f4061704210f0fe16d9a95b2 WHIRLPOOL 5499751ab84a665bfb5a112e032f37a86bfa7d732ffd208b3bf30054a32cc41fdf1016e4e6057075269a27b5d2b8d67c222ce8f0404af1c843a1d121a98cd569
-DIST firefox-38.2.1esr-ro.xpi 494080 SHA256 d086f67dc27bb06c194e12bc0f47e52b58584637916da61c42da977204d6739f SHA512 919569660889b56a2302146e6399e199718152b6007c3ac8aa60d12e01a9735d1c6422fa51709347fef21942796160f924ab8d5362907659e376fa69fe1a5050 WHIRLPOOL 7845916c87c2e8d4fa1391f62f75329b103f033094777bfb307ea4f1a9d270d2b5e9c42d8c36de89c506ced7a2dc10a536b2aa294cdd016b05574f85ab144245
-DIST firefox-38.2.1esr-ru.xpi 414418 SHA256 d61806e7f8080d3fe3b57baf9448ccbf74fb9a668365518322b0fd2fe67a75e2 SHA512 b205fc64117b56ac23d843f444ac459da64d6bf28ce0d5d9342ff6a1bc9cf73cdb2cb3cad5dce344fa8715b3f974e8555b0821e5532af818a8eaa645b717515b WHIRLPOOL b25b4d7945bc97d1aaa86db0cd0399faed15af25fe60aca6f00f7ad409ba1a6ee8d040e30e097d31e84ac1b37a51d14a48c0891859edfde33bfabd425d05fa3f
-DIST firefox-38.2.1esr-si.xpi 537394 SHA256 4d48d93f3a97a0b2853c1aacffb726bf49c32822069904fe419ff3fb9f04bcbd SHA512 b32fa1c9321871e0c0f077b9eb48f374b07cb436aef42698a751dc0c606f71a1a3c8dd8f32fffc39ca0c2ea46756134a414dcfc63c3ed39a30a2b4198998de59 WHIRLPOOL 4a6f449c601f4f2893e2a47aa236820ac13ce98f2172538ffd5e8ec03597904e464d45bb1b7df3656fee9cd6ae0bbb76b2a8d44a9179a4b293bee0e79597cb2f
-DIST firefox-38.2.1esr-sk.xpi 469436 SHA256 f1b47a7c848a1d25f5bb3744497a94807e550c96e2ce34f06a07055e0eb5879b SHA512 18ba890e419f5ad7e14ec2f420d00434d08d55c420db9087391b8754653d9c3e4576aa1a2f7359bb43b75b8bf1729b94107fb6ad0739acdd6786da3f99b6c929 WHIRLPOOL daa3bc1009f6a2e165a37ef7940145d546d9b6521e5f54b2e728ad5844dcf3ea505f5f2400cd90866a6f0fb30e6a204e47f612aea2c1ff6020183dbc06eb8f37
-DIST firefox-38.2.1esr-sl.xpi 441594 SHA256 c663bf7ec450a45c3c1ee7a46e89facfc43717831e014f077e4fb994bbcfbd1b SHA512 f7f174786984cb720da815b29345cc42a5c058363fc1240b3a0f3c1e489f25c6b0f03650d12e5f47b8f44d5ee6bda3b3a52c1822fde1be283dd5288183b1024a WHIRLPOOL a3cc71f337b38f5eee83e6f46fb799228f0086f8a8a6a168fe22007e0a41a5e8e6c4652922d1480077f283368aa7e042b6f2bd75b4638ce7f813b4195e94b1ed
-DIST firefox-38.2.1esr-son.xpi 449268 SHA256 305df206828887322e4f3d4c689224e1187e2a13b16dbcad898b2a3aeff5f25e SHA512 8f76bfdd6cb66598fad0708c87ea88f5d0d06a3f9812c98613022d49f86b3c748cccb4f194ba7d434fb083c60036561fe60b20d0c9ee874ee8feb59a51b6c58f WHIRLPOOL a221b92a58cf52bd5551a508cc3573ec4f2f46b673da29eb45ae1da7a6422854d0a14882c3623ba258ebcaa3c8e1ecdff10699b226079f31ffa664ba285704a3
-DIST firefox-38.2.1esr-sq.xpi 486075 SHA256 2674faca4612734588e56946796c58725016082689e026ca8b805249447c97c2 SHA512 af57a7fe4789699e293e5bb660ede5581a774df95f049165099f56e236595ee416268439574638b024e346e1a23a7a012c22ef641a9e84837c47364e955375c0 WHIRLPOOL ec706ff9299b87701c4bfb370357f928c1994bda402b512ab11667cea9a391b144098e904583eb08a1540e2b148a899618b8b14b493ed89cae83bb30f1953946
-DIST firefox-38.2.1esr-sr.xpi 479420 SHA256 499f11c6a5f8dad76dda59bab9007daddae5a878e16e2a6fc4da46319dc66644 SHA512 6f4453398a4b120316988bdae0185673412a4a89d130263006119b1ec1f64fe395aa7294e1cb70485c03f6fe5a0068ccd78915b50a06c7e4b73c3f3c1640cf96 WHIRLPOOL ce5e78a08a642771b336b213704ba314441dc072c7ce3f567eb35745fac52e3afc84cdb2d103baf105d179c0ff2cd870788291e65d4f60ab0ac06ec1323c5bfb
-DIST firefox-38.2.1esr-sv-SE.xpi 452632 SHA256 536084e596a969fc8d26c497b1155a3a41f393cd86fb8c962e75b142247dbe11 SHA512 a5598fbb6bc15ec26c179d27059ad3271d4a29306cd46437ef95bad2a1c14960a18204437271372e8eb79de58e8c8f10fb4a471e2cb7cf246af5320bf3b3b04f WHIRLPOOL 4d35a663f9cfbf62064368726c918570ff490d5559448e1a9222efec4b1b9e28b01684d7038d6ab7e9f2ee68c430e7822a33dc486fd28fe975cd3943326a62cb
-DIST firefox-38.2.1esr-ta.xpi 506607 SHA256 639fb75e4d13ac50db0e70d35a92571353339c004a8bcf2ebb5e348896f57d67 SHA512 6c6fa8cca5d54e96a9049d5b9e614e51d4ebe2d3d27afc6004a6c8f57b6aeb1537e197edca113a8701298f643aa085a1af3da7d1d8f0d86bf44f24b537527404 WHIRLPOOL 5a2fb3a736e57b8ce60ffa7cc9540932f135205f5448a444de7f950c7a614a0a175c41df7370581af06bccb15bba0c1812589b46d15db1c02e45d55323b7fb6e
-DIST firefox-38.2.1esr-te.xpi 526250 SHA256 3b73a6b26d29260599d2d2b24a7bc0809a644de1e8347e60ffd4c5014109d0dc SHA512 bf86775c55b9cef3987cb6f93441ebebf85068abe0eb1a13d02cebeaa9e56c65e28488e36fbb77f9f40df3b7d44ff1ad9d6edf5d46e80c5c26751d0977498348 WHIRLPOOL 81d93405bc95962fb9a1c2c043285a87a281dea8bfee754848b9395fd14c0c5dd9900f131d9ab33b36059afd4916732af29a2d3c50cdbbd166e08eeda57ec4de
-DIST firefox-38.2.1esr-th.xpi 534271 SHA256 a5975df8f977fcfc7e36a2ea53db17d15d1a409f1757922cf02e08895564a054 SHA512 845cba525ea13ff51874d0208fc6d832c894cbacf675bc46cddfed7b50b9cf471476325732a69a7607b64c1da5b4906c0a86632b22ed13fd69c9fccc5c512bfd WHIRLPOOL 9828854023e168058bdfd6014f843dc7c2f13556b85aabbd75faaddaa2671b8d83356abec8b6742ad3883b72423b4c3f02ab00e7b4fe8f651f414b083b707dfc
-DIST firefox-38.2.1esr-tr.xpi 481076 SHA256 9f508923bdcd00b802bb9fb6d20cbd69ca87ba441e9119ffb76b243d7ebb78b4 SHA512 0164b798943f27c2324f7fb12d2ce1239130f024eb32c95f18d0d770387aad78a8639049ffe7f1f4212221780af1b820516593b2c7f9f9ae5685904a31d25525 WHIRLPOOL 662d83b26f9255f4467389898429ac2cbc2305e66d415d53a2a24995b2509198c452c8f2d5debcf5f815ee00010042c9f644df1aac0cdc426ec93c3b5d4f5fa4
-DIST firefox-38.2.1esr-uk.xpi 493314 SHA256 7b7b1216c9a5633ff4b4cb2eabbc3b36c01e81e7a46d3261e9251fef330a8311 SHA512 5f713587feb39a9e6e77d1acc740c09c4cb324fa05000f9145b7110c53d4e3c385c9aad4cd5c38ab51a9ff041dcc48338691f3e868fb5007baee6a0ed3232291 WHIRLPOOL 17cdcd7ac7c29e1baff613ad49a5d206bbf077b79e8d9a5820bd8703daf3a02b6c71e42b141c86bb03dc7a316d5f9b4013ecaf3a8bb105cf9f68f0b80638c963
-DIST firefox-38.2.1esr-vi.xpi 467505 SHA256 99abed00052cce52ddcd65a2edaa95b0311c75d3522b4784760d947ec7c2e41f SHA512 25c1dfc8ca725d2c105048a1a0b545941cc13cf960cdfcb6eee28ec16fe4dc5810ff423561cf65e1aba5a57fc11100423c6197e39da8bbd6935ba17e97976df1 WHIRLPOOL ad2b5a07c40cbaff6021b0785ab9a0976fd6a8f75f03a31568f4d772b4a05b435f9eab3893c54625b192927593eb8e8f9c944ea872bcb07018f0df790b9f99c4
-DIST firefox-38.2.1esr-xh.xpi 450242 SHA256 625db0cf3bc1b23a1fb1b49c21bfbb1671c4fea84db64ca6d0582d817efda419 SHA512 458dc67466df9e9ef512643f06f433cbd6675a874d2255e0b53f7f66bfaab5efc985a59d40a70aa57005e612da34e1ee10b8aa66b540f5e574db1d0e4f8fe839 WHIRLPOOL 01f5278a1748b34f46735cec3fe697b5e44adaf03ac4718b5086ae3e57c9335f112ff294302e85dde485b0d10aafc8da601d6195764689101ca48f3ee2eaf663
-DIST firefox-38.2.1esr-zh-CN.xpi 488276 SHA256 02ac98674f658a239c264b0631d1339e8c454f444fa9261db64f250033eccfac SHA512 c8983ee72715f9efb3506b48e3f9d1c485de8fcc8480ec6c028491e7d405afc570d833382db965be4dbd881358e007f216f152d29ce44bef71e6ff654c4824a3 WHIRLPOOL 92e8a78318267fc053b7867e9bb6e3206d78e0b878d599ea4d79a86cbcd4098345b586e49bde348a39a8da6bd2f8c93376ac8ed99dde8d8ccabc75ca5bcbdb89
-DIST firefox-38.2.1esr-zh-TW.xpi 467845 SHA256 3fe5c8582898d0b7a030028700a58f0d7313a0c9edf88568d176175dd7c3f40c SHA512 c9f79629b47f4de0fc2b595a9d04b7438c99e04cde5be14aa309db5a913eecd4c073aa9beb91968d168aefe5c2858095f49a8641a84c6f00924cc17f55c51d3d WHIRLPOOL d6341ed171ae24e69d6f897b24cd4c6a7be2908294e76d7fcf70b533845eb21db3cdf804a7640568b4ed52262332515488677e8f155ca918d9ff4663edbaf66b
-DIST firefox-38.2.1esr.source.tar.bz2 180722074 SHA256 0143b3f99ccb390949d7f3847215f6f9b4bb7cd692f4f802921d2f9961bf270a SHA512 2cbed7da7c502b8474578d45b5962fb36ba6cba7d7395487a85a4c0274e10ad1834886a4fa5c980c398c2766e57c03512aedd1c82d7500b4206c3e03eefe11c3 WHIRLPOOL 78372824dbf9cfd9041ed79a496c414093d5689dc576eb4bf8ccc7c20e3b22b5936052e50608e5123aeb5669773858c90568e22e1de343f69b80f782e972dce9
DIST firefox-38.3.0esr-af.xpi 483326 SHA256 ffa2d6e68d8c3ca3fe4d36372ac565fd34ad925fdc1f3f46382afa044d8d55fd SHA512 5853f3c47b0a7e3db7cb247363f16c9ea929ad1d401ab5691a6cee2ebd40dbc638d34a10392625bffbf08a7ac80117776c067e10f77dab0e362fb0852f49e9a8 WHIRLPOOL e3b7b1b65d46225d2992b77963876ec6b31465288ee35accd4b12efaff1f9c6ab39dc11cff03268fdd2c7d8b0f2d9d6d0e51f8d4941b5a4874337353b1d4da1c
DIST firefox-38.3.0esr-ar.xpi 516496 SHA256 60fd61bc5ad7db8857232deb0dae2f49882d9803d86d852daabe5debaddac467 SHA512 9d10b77ea9f8c6f67fb0f4e0e57fc7cedd94801ba130264754d4caccf068a0348fe6301aa270c1fbcf27beca69fea44faa9b4dbcc25852d37b82927f84558236 WHIRLPOOL ec0c9ce7c330be79b6a13b323dd9ad313efdca4c947c19862da945e74b70451fc09b6c74a63761f78f23e048563c80b4bad2143f072c6dcbd7df083e87bfed2b
DIST firefox-38.3.0esr-as.xpi 509574 SHA256 14864a2372815dfd2c9bc726571b4d0d68169d55f9d0d150e91dfaa73e4cf8b6 SHA512 b6b8e3a9473446af790de6af814f0f7d7b115a0da4034edcce1f51d6873e88d325519171a681fa21b9c6b236bb5994271a828e61e2a05b044b3c3b23bf531a95 WHIRLPOOL b18f0d72925142a7f636a8bfc2062433dd51212d1d456c4a3b2eef676b0a6b801fd7c5fb6d7610727adf1ea8bdfab892433b9a7f49640daf456a6dbd1fa12342
@@ -239,164 +160,84 @@
DIST firefox-38.3.0esr-zh-CN.xpi 488277 SHA256 1c1def4062ce15660670d7d31ee7672359fc50e9fe4b1f8d80e96f0d8adda199 SHA512 e9fa12f7b3fe537e82e93d9435f64d235c6f9c48b2a13c5fc43c8912c9fa6989eb28d69ea80abc55890f0e706490da56194af3a3af2133aecb4ffe8aa4bc2440 WHIRLPOOL 9de780fa30840d1193bf498cca66f81419c3e8526d1156d3629efc837855c2a771415ad8172bd24a85bcc64733da34a62f39a6f686b22cf8fabf9539d7cf9ccb
DIST firefox-38.3.0esr-zh-TW.xpi 467844 SHA256 1dbaae6ea46991f5298bb5c03f0926b48d77c058ff07c44601377ecbe9837be3 SHA512 2a1b70a5199826983f877e1b435a650150533caa708e43b437ad41ea0f67d48225a54ad6980515eeacbda843c1a901fe0556b7e2362afdc3d63b67831b6b566b WHIRLPOOL 77f09701a72ddfb7610c842c97efef613cad31c573a3b8b4277f15f2c64e01423b2800dd5237b529a8a00b8aec876998a2f7c66d8ccbcc95880e3edc86cfdaf4
DIST firefox-38.3.0esr.source.tar.bz2 181401628 SHA256 809f65502d256568220c52bfe09646588f21653c8c487e8018b10ff87ca67f1c SHA512 e3085663e0692b36cce38ed461d6d0a9b025f7e777aa58a9ee170d904aa1c2de3aa12c480d2d9e37f5d58d4c7d80ad33c913834efc0b350e60b59e55716b180c WHIRLPOOL 1d2aefa907aa19dbd6bdc917cfa615ce6da45e2688d7ff154734e9abdc2c3ebdc497c3dfec9c17b5b5ddfc26d6ee0db9884a969502855cbab9dd0a988a6ee996
-DIST firefox-40.0-patches-0.01.tar.xz 5144 SHA256 072c44c79ba82d04958b3fc3d1c6e90805cf71797a03b96961fd3a16bd14c3a7 SHA512 bb9ca395ee380e6ec21fefadc5c5052ce8490039577ac0245bcee309686e802a654a999b3aeeaf8d97573f102fba3620c9995ec145ddcdded2ee9487490f87f9 WHIRLPOOL e74ed6af06e61baaf0991d23849739fb8c1cb33c800467e76d1c15ae22360c18c757ac9f19d274ca9cc54a6f9a0d17f365bd815b4a35c94766b29980638e8c91
-DIST firefox-40.0.3-af.xpi 498500 SHA256 e6fac0b29616c3924530ea8714cb4bd6d836818b4b23b5fb2a8aa4e80dd1559b SHA512 6d6eaa0dffdcde1a64386b9bcd1c88333b9461c8c538a68c0435a5e62a6ff69fc2f0095b0afd2724bc97bd80f1fadde6105404757955e9da48c64613af5b1a51 WHIRLPOOL ac834163c30852980a512dbce9a30ea4a8086af6522df798fed439a1fced90a05f38093a7f63b30ebe2a7e5d738fbe22e2a070c05929050f100ffa25e083fac8
-DIST firefox-40.0.3-ar.xpi 532106 SHA256 3635e6899a89ee93bc0f5290799471c8c8493782ee2819d47278ed1c385179cd SHA512 87d73ad0a6df4daaacbfa8ae1d97dc9ba679520f13d88b82185f4769ba4b6fe2417f231a520fb815398038810e5def799a3f8c0d6fdd7d3c246665e15f954709 WHIRLPOOL f2eefe9d53dec11e086f9b161f4f0bc1240feb87ab2e939943ac171fffc4e72c8a7635be504b056a19e69d603764436b19e29cbacee430c72f3435d83168da34
-DIST firefox-40.0.3-as.xpi 522246 SHA256 bc13edcbf25ad488b0bcb81987f2c7be90ff38bf3d8abf40e9f14ab7a21b6474 SHA512 6fccd570102fb40f0083353c32b00833a297019f2c32624c37b0d497a22a8f4be767cd7f25863ee35d19ecd23e94bcb4f38e05a54931947279f2df011e735fcb WHIRLPOOL efda4caeec1ed7f2c5b8869ec2828ee176aeeb3b6713f36e7767477189f5b7fa4dd7059627cf5248b59ef1dc9ccbc12f0885238dd0c791a7c400b5a4d424de24
-DIST firefox-40.0.3-ast.xpi 408919 SHA256 c153cf18ab652c5535452ab514ed4288806298f32d8329e3adb8e67e53a025d1 SHA512 5a03314ee95b359c7401b3b0b684a8b2f33b8ec2728787d2ddb658380aeb3849f3fe464469c732369d6ed9b1cf7d08f04c54393b7550b818a5c589e2482ec627 WHIRLPOOL 87c58c81cdc0f87fb50bb512f3c7e294867340a5b4515d60ad50188e3e76282e8b3d44b7885eaacb617f06e80d511b71080d3f79287c8715a5d533ca88f07b2f
-DIST firefox-40.0.3-be.xpi 464201 SHA256 6a91c11e4c0c2e0469b972d80b286fb3bf600fb8eb30184b94a3001972e5b72b SHA512 70f6843cfec35bd5745a21c35209411e55eb291a1503e5b7582428cf4b577dd9c5731ff7d9f6f784b5d6bf927f7ffc007852c035b8588c0cd25e8b5eda6b7f83 WHIRLPOOL 664f4bf32a353b9ee75cbd47efba99b36fdb0e6f9fd606a86560230eace10164b61701554edad0a558aee3266daca3a6aff92c97600a312e0b465d183977ba29
-DIST firefox-40.0.3-bg.xpi 503495 SHA256 0ed54d7e27ffa0040da087d716b1a23f36118e176bceef62becfa73ca3ed8b23 SHA512 6eb63434e0095a5b86c78b6be0891b9824fe4e7506b53f12a65cffa4fba4063a999670edc72100f023dcc3ac1969430ac316843b8f4f91254abdeb2f3df5c70d WHIRLPOOL e00bcd1fbeb2230d9e058896e939eb6cd0836e954dbc497e186790207eba25f997bbbbc314828a4c0a79513557739c1aa95acce87ce31edb6b28fc59acb5e744
-DIST firefox-40.0.3-bn-BD.xpi 538760 SHA256 8a6555682596254f617b41a406b3ea48f74a9c0aa64a180ab9760e66fc0fee35 SHA512 2e145a44a723a2a21cb6adbd25cded38fae91b4b1e5c00cf67f608923860de04567c01e22c6e0cfc309ee3d43bb10a64984afd1c25d8e6ad31f5d74a3904a54b WHIRLPOOL 5d33df8bf4d167df858350dc163d59cf5eaee73baf36b76382dd9b980f211215dde7035b53425087b55c506cc610062a343cf5cb520f7926d132f4954278ad47
-DIST firefox-40.0.3-bn-IN.xpi 541272 SHA256 cc0b8ae6969e5bf09d631dd621ee88bf25755dc0df6b851a4a0116c53a4e7b66 SHA512 0123b3781da314d3931703ac1890247cd6d26c007279189976307ef04e5e6344ef4f455c172985128dbce5efbc24f03cc771120818a125c2cad0d4767857f144 WHIRLPOOL d27b83ff683999a0ba02fde3a92b4384fc8ed3474a72281c146cb68df561efdc3e211203b2df45dda09542dab64411fcb086bad674488bf53832b40de6477403
-DIST firefox-40.0.3-br.xpi 456849 SHA256 54553c59ce2f62e5bed36372decd9e2480c770443011a8713d5cc23605caca0a SHA512 902d4a6cae10ea7f89165a71075609823c54da1f00312b9682c5b5aac3cd6dcc9d1a4cb60b42a34a0f7dc832c6d149167bffceb51ab3865efd411da1c0122636 WHIRLPOOL 6ff7db5a6165036f012c40de8056044b2035a1949ebae69fe15b49337b8035b7a3fb9a44f6becd5c4de772315fcf7dac4c177ecdb0eda0415583034979bb8168
-DIST firefox-40.0.3-bs.xpi 497332 SHA256 187626919baedd3be7d5525bb8114f3c6a2db0dfdec333977f42531ed500c064 SHA512 d68c7b5cde3846c75187619b37a7114984416bf18e55afb4ea7ff5309bf52a24e6886f5b96ad8c5e37984b92655fb8f7ad79e32b2fe4cbf23d0632de890c4e07 WHIRLPOOL 37151d87e8d5d645cf7695843409e1c5740ea4fd45dde3b34ea10b55ed3b8129e015ac57bab8e39a5bc35430f1ad0dd205f58566d90215fd12faf59638c2bf21
-DIST firefox-40.0.3-ca.xpi 474110 SHA256 ee57b8bc19e33a08e89d6a3d028c3da5b7b741ba31eb5bc5ebeaf600bb4b00f3 SHA512 4a769e42b926eee34cd9ee16f88e4a748d39b6b91e540e186ccff401644bbc53bd46388bd7d2ed973ed5d37c872a617b37e6a8739528d3873763605a310a76c3 WHIRLPOOL 69968bc6379dae6f6c2e2ccd226fdca964d8b1b1af8138a139302e39647b63323b431118bf6c08e2547136889f52675683b6e862bba6b8ca42db46fa305f8d7b
-DIST firefox-40.0.3-cs.xpi 462358 SHA256 3a02d4f6a36f882f8c3dac164a2984fdb42b07c6074e4b3c82c7066f6ee8aa34 SHA512 a3c49ad7e71870db9314394cfd2fb471a4cff518cf65483cc65353fa62521975ff5cfd491308060e137a92ef5a45420874fdc89b685832e38440950e5333eadb WHIRLPOOL 9f3a9abca845acbc3574e22e4067195f5e2c9fedf742f0b1f446aac8ac586786e93bc48010c7a1237d61ef3762c45d6e428f756a8d674b44c590434be209a63d
-DIST firefox-40.0.3-cy.xpi 459246 SHA256 6f1f87e2df406b2d8313ad0231751cd5f24e9103a2b5ab368dad23534da0a9ef SHA512 90b6d9cb1fd1dcd0f92f1aec3c7f1b2756f356ea4d54442e01d1e87f38fa73e11b0bb1fc46af0daa6ecfed2f51867e57be1cb8696d886a7a0738e780c1bd9fff WHIRLPOOL ce3c2c732b9918b6d15815616abb3db487a3b51fb6c468a143fac2bafd313cd5b8267aaee43389a91bc83dbb2a7a2925c415a486dc379e73f2b494ffcd71b2f4
-DIST firefox-40.0.3-da.xpi 465572 SHA256 cca57641cc00f92f7152c15363aad38566db57ae3df09e4701f20f2f3836f0ba SHA512 a5dc9a089c6751e8c10615ca28ae05503a80bc0df7538f805d6f556f8f9624de4ed3e033b3351eaab4acdea18aa7c94494aa93610de3c98f8c1a5281da359677 WHIRLPOOL b91023f845471b556352cc65bd6eaeed828d529887979a55f81883a45f1c0890de7d5afef03fdc604995a4ae9560396eaa49e63321ae1c4ced06819c306312ba
-DIST firefox-40.0.3-de.xpi 467233 SHA256 a7f26ebd30781adf98995a48b03b92ea294b9d0d6bb02f3806b8d9b3899a5ade SHA512 c8566a4372033aa9e8153cbd2e42d9d7a94c36f76e40ad33d1a65ac4798454de16cc4b27cf7a622547198afd4b3bf475c0979143963c8374e7bd1c7515936505 WHIRLPOOL ea3477f6fd9adcdeca573bcbebc363665acd1c78cf43ca5b940c02f6543f21a69f6f95fa8fed418be7e25ef87b94ace92eb3c0d48276b2c8af63753252bdbd25
-DIST firefox-40.0.3-el.xpi 513117 SHA256 40d7f63513bb3d0b280bb25813b6a13f52779b0558d75b65b6a8fcb69960e242 SHA512 0061388dafd97dd847b6e1d6ddfc4c44da5c30288097ad4267e982c83c9e7b0d37c494ae99a0b0c8b8500208de180ed2d25a1fe9c72e16bded97eec71dea07c9 WHIRLPOOL 18f31e8bd899fed53ae2036014d03b3dfad75c0ec09437dc55568c81c46176a9adc2ba15a3a9ce8b7059d2e7521d1356c203859ede049674620d8390b9dcb5ea
-DIST firefox-40.0.3-en-GB.xpi 451900 SHA256 e4fc56e6d8ffbd88df62dc5ed94ecf3594efe5157165727b22bbde72fd4dd1a8 SHA512 1c63e10e656cdaf531c80acbb295d28831eb7efd94d11594b2a02759ff8a2dcfa399d7638a8b525e4c3a7b0b18b2d68408cdf61305db2e41fef03f7e78fa1331 WHIRLPOOL 3337905309a1b9f29559c66113886a755b7bd5aaa089e467a42569257043d056dbedcb51ee7d8de5de34a134f9fe2f08338432f6eb9cf822d995bee4ac672e6b
-DIST firefox-40.0.3-en-ZA.xpi 455370 SHA256 13b178fe4562587edb2ef0bfc72ea3daae9488d3125dee1288911d4d78cf8cae SHA512 b70026915ac0b50b0bed7d407a90e204a7eb7de76c421205e0699fc24c118cc97fe30332a42ea1c52e9519489a36302c45ad3938780f717c1b0df7c8f5f4a653 WHIRLPOOL 23a0fd7c32f990d2c13e4eec8f0339a3363391feb2ca13ce0c05e96c1212a175600dc59fb1bb8ab9855e640d3bc9814796f89a32fcc4cdbb918ec72757d60dde
-DIST firefox-40.0.3-eo.xpi 500202 SHA256 993c33ffece8ce4c1e1fe4d931a752033ba191cdce8bef89b4459a1164e16fa8 SHA512 235f869d791017d378f8ed560ccf6b2b949b38cd52484af12ecd772a2448a823fa4a760a7ca6c24bf85400f990870a3acc1c1da10b03b8c5375cd8d6bc2d123b WHIRLPOOL 98a41bedce7f352360a30075617ab5fccb5324579be4f9a92c9ec8de3cdd3c2bd59a2d521aef55373eefadc8c9f3165739605715eb2ef17fae903db53090b8ec
-DIST firefox-40.0.3-es-AR.xpi 468599 SHA256 afdca33ee50fcf90b19a781e3ff59766562c5c4f829c36961122dffcdc20f855 SHA512 3525338c1b8a6932bba661fee1430f5ef9cb9d2cd4111cdebbbd5f0827bd0e40a9b277bd4ee5d8861a15dbacaab2b23264e199a8e2a772e9e470557899290933 WHIRLPOOL ac5fa9fcad8a800c44ab47813217afe4aafaa6a440050119a7db7491a3e85c760b64983f9a5b7a639a18355c49bbc1162b07a1c8f84d4dd2d8bbeaefecefbf39
-DIST firefox-40.0.3-es-CL.xpi 394972 SHA256 f7928068f48d900b73db21ee0599017785eac6b9087364ccce55fc356003a540 SHA512 9cabdeb4c6cebcf35e3ab4bb7db6ae854e68da8543248001c4b71555db09b0eb371c406e09b8768bc4c6c3b6728493dc79ce8d6a9332a865c113a5c9f47dd764 WHIRLPOOL e0c7ce425b239e3d0e48e91b1c6951e1c0e4dc800845b762a580e0ccb59c72f8a436ccf5ef42bda82cc181de6a4183d65c50212e0e02b14e6192eb9ec0ce1991
-DIST firefox-40.0.3-es-ES.xpi 383894 SHA256 fc6564877ca5404395624dbc62e22b22731134c69078e432ffd174fedac8a0de SHA512 abca71301a691f3ec6848b580eae13472a1df07b0a5663eb8bfdbaa7df3bd8b3aad30931a274871da0993dcd298c7b1e6907c1f439ccdd12d0067011f4a9d154 WHIRLPOOL d0aa827b6d112f9f9e247a269863cfee3dc1758e6320b712ec189a613fe4eb1ef71482b364104cd8d15dc2ef00817fa72963ea42db78dc506e70b9ad314d8d10
-DIST firefox-40.0.3-es-MX.xpi 472917 SHA256 de9c338485a5a32bf0e6b9a51fbc948b90006d8cc63e2a7303cda8adc5ed4ff4 SHA512 4550e1d9e6e1f41c76e8118421c51c4062e249c80cf0363aad47ee896af8c45f8a2153f7faf51e7c1ae2d7126edc11988bfc264a0ebe00e8799a2068f240a27e WHIRLPOOL a70c9a3e252c36d0c0cec1acc2b6538dc25447be80aade73fb206b67bb9e2ba062b0631c0f08af2cc527edd3a88baf89b00c5921cb02408454f386e767fced4c
-DIST firefox-40.0.3-et.xpi 457409 SHA256 679dcef606b9091e8018b0aaf40b0285a4557dd56e5dd7132b407d250fc76aa9 SHA512 194d189b77f91ab2ac25abfffe1e6d080c59a76747ac5792a3db448a0a090734b94b7de4f9c08e2e33fb90da009c9170dc1b5025a819cc20a63ff72eb34f1645 WHIRLPOOL 977aad8c0113602e6ee2f8a11683e1dd2e67bd8fd773ebbf4b9f737a8d06583845c278c156c370a38f64457ee0f1f04331669451d05910f0f49a729a57c8c666
-DIST firefox-40.0.3-eu.xpi 481824 SHA256 e33bac2ff93ae3760b95a3a176fd0cc9e1a402fa4f174c10e77e6797d8cd27ce SHA512 ef7af759aa1b7d0d5c20e2138501e668ffef018e4036162e15169f1f056458ff7a1584d7da7271ee66cb5f10019e65591c14ca1a610569275121f3018704ea3d WHIRLPOOL 20a22f93020ad0144fb5a18ce176c774629c646242485f3c5958732d4371a52b7814383fab380aa127e0d64c50ae689849de2140516b6182da0a64d94783cce5
-DIST firefox-40.0.3-fa.xpi 526972 SHA256 e2f4ff8871be1d3a779891ae857e17a45ce92d84405c274862aa125f080624bf SHA512 33cdf2a41efb2999f283dd495031a083660d11209af0b5e3c6861a72e709daf44016a4465c259155f29c280298d4d26082f19632d263f0252487ed3efcfbe344 WHIRLPOOL ddf1533b6559f41aa1097b7d1c44b8b0d033cfa318571c009bf547f3aab2b98c9b8d40f857295df362b39044ef8b07c5f0113577c59931ed91d0dc9de4a2c08b
-DIST firefox-40.0.3-fi.xpi 459382 SHA256 e62fad8b4b2d96fc3f35920c69a7529be6e275e6c63ed293a32acf8f5d2ecf66 SHA512 2bb5193e4a6f114c277126fe32875431c04faf2a5ee7e7db6d065f876292824fde6ade2f4b7f6a631818ff62e79200d2c61201906583c641f69e259d4d9a6d8e WHIRLPOOL 4a038fb2c1d26b306bb2489a48b043c64e431dfe24ab04fe29d853517a9c8060a19bc65e9ae1d0d738ba9a387cbb29e6282204069e677f2b3c1ce15f60d4752e
-DIST firefox-40.0.3-fr.xpi 477148 SHA256 d1daead0f4dddf6b06959e32f601128cb2764fd20a58372c1e587ae9b5f3a754 SHA512 7fcd921a1e40d4caffce7b7e7ff29cc1ffe76575319fe95c87bef7148e33d08fb6182cc143c70c7e02cef571e0589d126cbb435589cf301df4c112d3c86a9e12 WHIRLPOOL ae2050dafd3c890bfd5fc4b6ec6663ecdc30faa3fcbe44f8a5a5d5617bf9b97219bdb4140ba8ad442e1ec281d3edc165fb9fc68d86a7f726029f82c314c05d81
-DIST firefox-40.0.3-fy-NL.xpi 471145 SHA256 511e4b459e7cd38236ef10bebcded90f360a30f08a3594815e298e1383b17453 SHA512 19a9b417506066224c0eba057126f437f4bb43ba0c80840242ab75bc8be799204736664680cf4239fd4677504405c24e99cbf4d76687201429b92aab4812480a WHIRLPOOL 6f04debd89581475c6c5f27f36cff980f8207e78c566271715bb6597ea19db898cf969115f83e88dbb5145ec4850d06b0cb2dd2f52eb59c516926a97010a1c35
-DIST firefox-40.0.3-ga-IE.xpi 485536 SHA256 6a9f8f72d0664c29214a7746aa83ac51fc5bd9c77b56d4048cd92b5bbcfaacf1 SHA512 7ec768eafa26186259aa3d8636fd45c653ca072d0c60fcf4c2a5d21c419aaab99efefd793e8150db8058cfba9c51f449d83db97e67b19c18b7ad2510b20225d6 WHIRLPOOL 3e2746cd3508e8a2980cfd014e98dd3d7c0e879e1970918f52b5d0a647a2affba512927adf12a027e120b9b680af2ace5d52a2e5fd8de90935f282f0382c7760
-DIST firefox-40.0.3-gd.xpi 469750 SHA256 9dc62003d7501e9234145e269d22ae647b9d6309005346294d438977c72be322 SHA512 3c612ea6ce0309d1edbe365c14eb2053176abed66b007b42dcf618e7864e1ce63e2175086ee80e4efe18616bea82c53e9f1bae4c0d307f057b60665724dad527 WHIRLPOOL bf31e36aca956396ceaf2c74678875360f96f2aab08520bdebb78f7c52f1ada57e3ad320fb0558e2188332ecc249eb35d1f5b8447b7464b35d0273874d9895c2
-DIST firefox-40.0.3-gl.xpi 463634 SHA256 59437020832a39a3314e9c6654ea79dd8cad9cb997a23e34e83697c27b92b821 SHA512 f93e162af07efbfa432fda2594a32ecac379b7b00d7aaf46e74ae57bfcc2e69d6589cdd641097ff00b6a83906a85b95fcc5c0d605626f91b44b62e027fb1f63e WHIRLPOOL 23ef0978e262a642f9f027d3749cd5e0c6bf626fe5ce12ec39c7d6649ed9cd45ccc3389ad65edfeaeda5a4b344a7f54c3aba281947fc84cb7f74ae1eea818b38
-DIST firefox-40.0.3-gu-IN.xpi 498591 SHA256 9eaef0ede53a662b592d489ee033c60edf93292adefa3c4ea3d24b5eeaa99ccc SHA512 1b4b50c72757de5b1ce5aa128d82d457864f96b02da302c33e55cafa5d9e7df05f03695de1651434fd9cbc1fb04a2dd7c3b89d455f189124ed63562ea06e47ce WHIRLPOOL 36d8bf04454daf3373b8cb1700aad10e3d0d08b1e38f5a407884f46758546ab80032451f1cb80052da5ebb3b0a6720d4ab603e2d4214bdf1f119af41314ed614
-DIST firefox-40.0.3-he.xpi 497110 SHA256 e058879bdeab1c86fde3e07a7ceb589604c40aaa8319c16b709222ae305d1466 SHA512 28981f412b532e30558d3b5dde02356b38899885b44acbaf11764d2dbab1c986a219388eaf7cb5cf452c5e1d138b171285da0bf64217602f7638bbd664473178 WHIRLPOOL eef94cac28d4abd245de43fd9cb4610f5a84b1dc9908e2c25dbb0367e66c36782092b6bb24fcb07bbc3e1f6ecd8354e0140a88c0bf3f4b4c25ed5a519fa16233
-DIST firefox-40.0.3-hi-IN.xpi 519929 SHA256 edf700377b3d384aacdc8a6a85fb9cad7385593d0689d6b0474b9a81782bbf80 SHA512 3990680b63ace6c44d0fdd3bfd2f95f43ec285e9ec911705d0af2bd5ddfe7268aea431e54ee9e63ad72b784d9c1724de3716f4f17bc4b51406c131576f85a4ef WHIRLPOOL a175bbd55d91a0a2f62d010763e5ae970d5377cbbde228418382a153d12b35636f2a8fd67b6918b19409591d8017ded73c7d742dd1cc11253f542c334f63b64c
-DIST firefox-40.0.3-hr.xpi 494492 SHA256 4b4cf824c97d6c4992905a13bbe4c16338c0524ce8f1ed762dc87dd830e91a55 SHA512 ef482e2bcba3429001b9179fb7809d184a3cdda144000e4c88c28ac28766087a8a3967e0724882cf2824218cd668446c23dca919a42e0c969198ad5994b50759 WHIRLPOOL 55135c162115c97c34132ba6745755d4b838d77eb39dc794022eb90610241e0556581aa73a5e76daca949a142fac831dc77b0f71097e6f3aeabcc6e9cee7b64e
-DIST firefox-40.0.3-hu.xpi 469054 SHA256 f5d5313195455272dba460ee8b29f887ac0acddc14461c69dacde89b884b71d0 SHA512 3c42c1fad403f315a47e9be29a16165e188cefaa9a4119e0552b32fb188b2eb471b698dd393f0e6c7170c74072e2ef8da22ec6245e39a1c24d101e6f130a7d8c WHIRLPOOL be1be6524a79aa67bb1ac2ab61de059e6df39ed20d12f2936bed2b2724242ab03cb127fa729a79a02d87ea45cd4e64074f15d65a27130538ca07d857f4618bdc
-DIST firefox-40.0.3-hy-AM.xpi 550065 SHA256 5a3d889d467a8d13bbe87b2e9fb8baafea19ba6730ce514ea953f52fadbba961 SHA512 f2d6697214c86b8ad704be63d1469146ba6e0342ddad89c5707765788e5d5ec9077f61b2b19434ea7531b17849a673abb772badf568064d6dc3410a1dd71f255 WHIRLPOOL 4d21f47b40dc2fe6c11a07f553cddfd35e1ef88107eb72021db0653a14310b70fa5f92e3f476d18d4e7861d1ec2d2efcb7a569f616649801c6a92d4e01953660
-DIST firefox-40.0.3-id.xpi 446092 SHA256 996a53ac0c9d6c826b0403b1520a1e8ea50b77bbb952784695602b56b0e93861 SHA512 46f4644dcb665a7690461d7b71b2f1e05f3786387c306e8acc2f6f003916e0a67fec015c96b608a8d77409bcb6b0fda337a3c5fd4ad11fc047283424e7d97474 WHIRLPOOL ecf4d85a856a0260d0620386be7bafc929d34315750bab0e5326ea3c2296c0a4621522cc85af48662f5fe6f64e543ad9c434e25bf057c74438133ddcc74182e8
-DIST firefox-40.0.3-is.xpi 499894 SHA256 c2f79f33d52b4d0cee20990cc497727b3cc69b3afa5bc031176d3bfcc8aa136f SHA512 f26440bd51ff9a4a5c19b83c1b0d2db574586157bee1484bda4f26f7535beeba71f1bd5cb58cba1175d6058edbb75c0c88343d3d243522856f0eacbd0cdfd992 WHIRLPOOL 94264b409a1096ec08de89c6e09700a6209be0b0dba60635d88bccb6f7a7f6bbf9aa51fc025e6e3fc98a8363da86f3d13f03010e423ae759d2aba82abecb81c9
-DIST firefox-40.0.3-it.xpi 377833 SHA256 7f2fe994fd74847bbc5de393954a526e9c17cef5089e506a616247541684b9f4 SHA512 e185111aa2453be345616c96dbba26d57bd48de63ecdb9504668018744967798f0dc244964bef8e6d2f80a510e0728fb845f2318bcd886b3e8f161b83e2bf0c5 WHIRLPOOL 57456beb6faf2993671d98e26e899c3262f67d617f1725411a433d6a0d4e6330cf699a55908a4028ca1b7ffab54530e9a4535467687ec53df9321ea63dfe9096
-DIST firefox-40.0.3-ja.xpi 495439 SHA256 6e3f6870ff749e14cf22ad82bdefedbb2b152c802b86ab7f9b588da382f2c88c SHA512 b6c39d1dd5899358fd557f56fd5140955270918e30248782412449fdc56b9674ccbc0205d0b733e71cc925cf52e793691566fdcda7e889594b4c556d67899a56 WHIRLPOOL 497eebd0f7cbaab7861f0f7362980940f87ba2e202bbb97c69fb559c141d377eaa20e4519a08889ed6c4fd417df95e3572ffb3a89147d9ed0a6c419bb3c55ab5
-DIST firefox-40.0.3-kk.xpi 520131 SHA256 dde3b84aab92cadf4b30c279781907fdf12796b7d2a91d4fbc68b2220e267189 SHA512 d2396d646dc568caff24cd559b18d1627bdfd00e2d1edac810e83df2527f066040046159ddbd9bc4c65cc2b361dfbc673ae19d27d5fb3f614c083c98b212aed1 WHIRLPOOL 31bb6c5405e64b93b34b92b064e20e023ec2c88bdee121ff064e587575a451fc4d36102f6e0394702a55c699f95895b34f1e1573962fdbfd80a5f3e2e02c7ae7
-DIST firefox-40.0.3-km.xpi 578734 SHA256 c6c2e8c52afebd11fa20f51e0ab38ed7c0fa08f6f00c31ed8258c322343d2435 SHA512 ac77816042333b3aa2b4fd9d011bdcb2eeb502dc46b902287032aba2d7629b94b81ce1a6236babcd86fed82e2daf59986ec2a7e2c88cf15efcfd6a3d406166ac WHIRLPOOL 72e0f021f6c550dfc8f5f2fd960264577ce2464a154d942d5c1c44ec3597dbd34d5994a2150d907b46afab238252b1dc1b33795fe75b40778472eb292f324b09
-DIST firefox-40.0.3-kn.xpi 550864 SHA256 eb28a17c7c34dba3a4792aacaad8d4b25553ccc4114e4f87e7fdb0de7cccd0b8 SHA512 9866a7b35d45183c4f5e91b964bdcb66fb35a8caf3d44b3c679cf169a28df0b0369c59515821f86a1d65b452ca6fc91919e031594e21662759ddbb6cfcf76e23 WHIRLPOOL 451932082c045c5c5da971bec3e255664cacca6a5f378e7a8e58512c28f4629db310fe3e92e32bb31a1c56100395de40adca552eca7c84fc096957bc77629d2e
-DIST firefox-40.0.3-ko.xpi 476892 SHA256 ac39a4c8ebc3d5b43d00b788bdf62c3de4a6fec74a0f8906d3e6fd14f8f62eac SHA512 1c44206ad054e7c308e664cb29bc8e54d54df8f6de8cf596d4f4ecdceec951c040e797149fb1364fb2b8d4b6dc45c02b7f9070ef36f95a552efa33e326bf11fc WHIRLPOOL 99269ee86ccbb9d808fbc5385ab1f8cb92d4754aab0bf2ff820ecff01931f896aba344cc7541934b3a763d43563aa94fc8fad5a8d5d07b92d917a0f68b347a3e
-DIST firefox-40.0.3-lt.xpi 502211 SHA256 d1c483d45096b8fb00d24057948197d4413c545b0e2a0cacf609fbfbb1f18bad SHA512 c42f69cb23f7ce428592599f87a32e26d7d6f457d7e662dd51ddd9f98ed8ef556ea88ef5392d2597930696335528af3b1b7108fd1f20b89e178adf5f3f10f623 WHIRLPOOL efa846f93260c7ffbb00401ce4103d023998755ca162d442b886fabf1b33ab0f5f898345593ac12142256b138195dfbe9569ce91a93f91abd25889b3dc7feb75
-DIST firefox-40.0.3-lv.xpi 482486 SHA256 1c5a49e3f40456c1a99a60376ec697a19ff82f25b79220df56e8b1c8fc5f9bfb SHA512 396ee47f495bf3fbc49c83ca0e1e774472a3bea88e8698e9e4328117a724fc2d71b4f243efecd2d84bd64f30b937a83610afdc20a8dee8f02ef327873ec024e2 WHIRLPOOL 71659d1c2e2e859c6810ae0bbe34580304f13652df8e2afb783f4817410042609efa98ca418384f901a7c4d638837341f6653bb116866babf65f4df17483015a
-DIST firefox-40.0.3-mai.xpi 527990 SHA256 ff0e82f02ddd321ecc7d0f07a5f5a9b09ed67f27381dc59595dfa27a818ed6ac SHA512 7bd2a2b59701c6bd936e4d1dabeb2afed4b012cd2f0934d5d9dc2bcadc8612b7ae75dd7394dfe8b9b8229d9c2f4f7f758d0e601795ad710bf845e3e53c9c6bbc WHIRLPOOL b076313ce20c8741ac59f5567140f8fcbd9568d441d4afc22f33886d9a8a72c853771e56f2e31d6462ea5542c252e2b27696673926cb88b6a164a7ab227766c5
-DIST firefox-40.0.3-mk.xpi 542563 SHA256 a8b9dd7940f6c269dbd428166bea9e1e71dd99de25756bf0ddacfc2ab2f71549 SHA512 420874421e4564e252c048f135a8a2eac127f86d433891cf7324d2e88567dc1d5ee7649657f0e7f326d8f39b2b26f0b5c3d78e54f653ee5a2ea04d6e0105fc95 WHIRLPOOL 30d8fcfc1c21427f4e49b05d466305b88975a46da584497e3fd1d14c0f3eefc5e5481ff0d022d1ab9a365e44347897a8db4c0ec41d92875745d5db55b7afd849
-DIST firefox-40.0.3-ml.xpi 540383 SHA256 f3d5b491a6c1d664ae1cf0717157e775a73049f457664ca4e131aa851ea02d2f SHA512 dd2f9e371f3629b5be9646b5e3392332627f01c42e4fb240dc56a3b12504d7fafa84cb20bb4d4537b2c5786c9abac6b2396dc45bafc99706a543e7197d65f981 WHIRLPOOL c06613e12aea8395ed4433afbf7c8101c29ce66fedef680cfd4c97467cf98f0ee9865956157a3f06c61a2c0ba1386e1036029793732624fc8da2a174edf318f5
-DIST firefox-40.0.3-mr.xpi 522286 SHA256 23bed23751ed673b6211d1421405b01814e895b341977bbfbcda146f263585a3 SHA512 516a0644e25a1c0aed080300aa9240d9f811de4572c50aaacd2281c7282c96738f08faad2bd706ee1b097d77c862e3af422ac95707632384d652272dea667801 WHIRLPOOL e5901bc84b583e35719df9f9415960785c8b108fd1482c90829be6560e4eb89289dd3f8a818f815202abcaa09001eda393e1ff6e5e6a7b54dd18157934b7c3cb
-DIST firefox-40.0.3-nb-NO.xpi 458941 SHA256 704280dc977a7d32c20416f2e9d7207e7ea05a0deb19368019b3120ddf480bc0 SHA512 31fd2c8bd508d001822c4786d7d05134d77e5d9f44deb7e3d5e32077c3ca050e9b541ef650c891de78dca399b0e6ddfc680af28cc0e2608bc1ddd1ce577c0cd1 WHIRLPOOL 8813a1200f6113454fe17da47afc998b49ba0216d6b35cf4af92b7c699bfee85d005a642165a70cb152e8aa90396df3f9d8b931a2e5bce7247183582e575b911
-DIST firefox-40.0.3-nl.xpi 458630 SHA256 f53d67db63953781fda06b72d3424acde9efdcf47e027316c27189ab5d1ec043 SHA512 2a20a4e974dc6a63fe25ed22d2d2a7f0ce0174741d291b82cca9d344beb482fd5840cfb42acb0c63084eccf278ae4e3a479e2eeec903ff76eb95beb9994a11e3 WHIRLPOOL 1705f7dd42f482ea704ceb245b183db481631679d8c9fc99813c553027cdddb550dadcca17b798d3fb1e1a703ac323567676ebb42a482a67c9dc2c5136d26086
-DIST firefox-40.0.3-nn-NO.xpi 453068 SHA256 362f3f09a036d190156293ffee2d5a548fdb65fb07618bc2f8b5dbf40c6c831a SHA512 02e202956ab80c047384b3d112d0515d5a043e9c7691334842cd82f4aca87130232039bc1adb55d8ae30b15b8e312e16e674369b72b90baaaf2819efc575d4e8 WHIRLPOOL 6f7858c7e613ea0ff197880bac816829596e24ecc1cddd3d689f1e7ea05d9e02507f30ee7fb99c8d499a33c57ac72a498b71e27d5a26b1cf2cd9060bfd928324
-DIST firefox-40.0.3-or.xpi 539212 SHA256 37d119640c4095e3afa53c1df2ca7b548f68793f281894ca47d7457688f55373 SHA512 59dae1f3beb901b3bcb5384d19e24ec4baaa046695ebf7a9cff130430819287921dfd22fc3ece1e8145069c7cc95bd8a0370652d43fd1e07c2701d80f3e08062 WHIRLPOOL 95707a13ec0902fbcd3833674ac761e04e3b5379e0f9886645b2802847e8c2a1767b8d68081dfd70328285bd423277c85ca38e2f7f1f356d051af7db72aa18d8
-DIST firefox-40.0.3-pa-IN.xpi 509122 SHA256 d70277e8b7d3805bb50ab1b6bb69b55dd84c871c567d7484b6c8a095d58730ef SHA512 57e783d06c7aa71ace289c8996c3c9e71c1691ad766b39de9e02136c20fe2d73cd2143cdaf8bd5ce841211d3c7b7c37faa602cb640b86c385e00081dadfa296d WHIRLPOOL 4250a9073cd3661b29084478f522d61206cddb58f83f37dbec9e2180564059b99ed99788d53971c72f81890855ef21d15242e3ea13a6b8388bb3cfe7ea9ec2a5
-DIST firefox-40.0.3-pl.xpi 415191 SHA256 4dca0edaef047cd54689e2ea4296598be5a86e098efb5347ad6fd5e307b6f213 SHA512 72ac25808a0bda95b9472c3a2a6bbfe0531d07b085ba7c298d8b0f2b37690c75b4e58b245bae35a63e55fbb0f7d023c20ae7411890c2b57bc8f911fd09744bfc WHIRLPOOL 5e2903ef36ce31961aaab124e3c7b2c6e13483c7dbeecfdc4d9057409641b47ee654927072221b677b2ab75b866a6d5ce086d1a0143f9c23b0af1ea19c90f169
-DIST firefox-40.0.3-pt-BR.xpi 475443 SHA256 419ebf4fc0d8d23b17b6ff0b971d18f0b94b33267d1bbbc6b4437fb6c3c3150f SHA512 efbd6f0a43b47c29cfec38cd0daccc1ffaea6f10feb0c270a4dd303faadbe52ddb00501e302a81cc86651e08c7336c1fe07661f689b380a96fdbcb70b62b61f1 WHIRLPOOL 96a2c82b7270bf723e579308cc3abc99e1762ea024db85ce3102a5497fa5d5dd685ae21fa82d7b9c88989703d65c8706e23dcfb7be1fe07086f5fd546ab7036f
-DIST firefox-40.0.3-pt-PT.xpi 456035 SHA256 1ba5b9fee35b1d35f4e7f4363056d379c016f1dc60f7ea03412bc29623ef60fc SHA512 5439552d25688eedb21b0391e755ac31f180160811c167fd27478129abe2f6cddc42354145d8bee5cafda713ccad77a041bfed9ddf8c15415cbd496c4f51f7d5 WHIRLPOOL 87a110be4a8add81f0fcbc1fcdf80681ed106db7509f1dcbd814d63303f7250c323b2263a8680381c7fb9b65b37fc258547505438a71d6225b12c50c4301acc8
-DIST firefox-40.0.3-rm.xpi 461466 SHA256 164438a83d9edd555aa39a4fed844c2520351b1ceb6e3a38786c89ff085acd57 SHA512 e6acb90fd24ef4bb252dfc167e3c84624a0ceb1bdc02152235da429356c19c81b2cebca2277845a45913ab40ded736cd79cf2e0b4f66e236e25b166ab0cae6f3 WHIRLPOOL 2b6dc755fd860e682dbe1cd7f0dc2b1aa32f7d227433aa3e3c9536041e4d5b4e4ca9611a28d0f6dc85409cbf498bcba77d993c5f246468d14ef716bceabb976b
-DIST firefox-40.0.3-ro.xpi 509716 SHA256 e6b69e1f86dfed31a103ae5f8b5c5bdc39abae0e10826177ef8d9118e37628ce SHA512 210e3a03eda8fd7a5586db0e89ee8730123487e6db79cac2294234f9e4679c045c026b171d35c57573a2535365041716f1f838e572c7dfcb7a59db4bff0795a9 WHIRLPOOL 26e5c4167cab6c3672d60af6594e4d200be4b9e077f022ace6d77cdea06e9db7a310a4fff5cd278dc09379051d10f6ad8992043a59b9cadb4739841cc52c2d9d
-DIST firefox-40.0.3-ru.xpi 425657 SHA256 2eb09947c80d43bcca12e30ff4320deb1f02dfaad8aa94f746a2088d362c8252 SHA512 25c0a064ecf34f9572bde6b9336e147e316384d735a747e6582ecaaf015d358d3ff801484f23a3c64c421b7ac92c7283e976dd1f025f397b3b6cdbec54ce912b WHIRLPOOL 626ed29554181adb2e60fd05434b170cfcfb7d05079ceb447bef584fa051432f991dcca5e7da759e7942f5da70cfd748290f9fb808bf1384381bd29fbb1b9626
-DIST firefox-40.0.3-si.xpi 548768 SHA256 a3fdc5a4aac6c0e7ded4cfa6a3bf0d84545a44b064c5df736422bc41923e91a0 SHA512 443e2929c4ff6d2d93e6b082eafe4381f37ece515aae8e907e10747c6bea07930b4d284445a6bff25bdc85ed43da73e8fd011b10dad2c8644618adddfa702377 WHIRLPOOL 94af62c8960594b5b3b5291b9e46af0769a0a7d36bf7290dfabfa61c8875d0d89e0e5242c14c91c10418932a1f1d512562e6aa2fd7e2ba2bc23d1b605f417310
-DIST firefox-40.0.3-sk.xpi 485121 SHA256 c379a93e531c2c412aa2e98c06a645c8e0b26b24d80d988966e23b2126c71358 SHA512 32156fde1640f06d5471991252f55303bba80a7e49cc0af141b91bdcf929eeaf081ea30f57bf8cdc1b4b78e2209b99b613387ff2ca84263c49153526d6b55f28 WHIRLPOOL 20457f8bd2276f3092835d32224d38f0ef1752886b20ce47627492b4342015f8aceea73ee758fdc2b0c984a7344e5f4c0abbea597ec9c78588ad23db3ac6e61d
-DIST firefox-40.0.3-sl.xpi 457940 SHA256 8fd09f59342a80843e53c34b0d9d9ca5c347a08c64beccb9386f5ba7cc3637c0 SHA512 643fe3898d52df0069ed9f70a3959013928f33e2a72152599b39b4a40e8f368997c77261f60ef3dadf9b5187ca050d3963af80d43fe7c3b5348a4d33595e1e7e WHIRLPOOL 9365288d0fbac809b53df80e127cdc756de5b2ea23a1863604f03b6bacfd412d5d9af606098affa8384e84c0696af9e1262140ed869d89750b48cbac8bf806e0
-DIST firefox-40.0.3-son.xpi 465948 SHA256 d0265a35389b89f79fe8a92af7eef67160edfc21ccaa9c68c0b71c1bb7d1c8bf SHA512 d3400f88f529c525fa03d9315efcaf4a889d3a531382991a5dcb195ef607d7c235d74c79d439851b37c3e4b358c617cefb4167a7e7470bbade008bdb2266df5b WHIRLPOOL f2137f0dd0d791075184306303f92a387ea528b5a84b7dd0bcdcaa0f622efc6d0820b1c833dbac1ec09bc9ab0de547ab1fa40d6cea21c4d17ddb4f1934b1283c
-DIST firefox-40.0.3-sq.xpi 501445 SHA256 afd42e2a29f28d6c601d962acf709b33a010ee2a7bef4b4e3bcbbb42354cfc07 SHA512 9fbaddb40b3ba2fc0558b66b762c9624271310759dd576a8800618361d298abc3c962ee9b6701b46e3f7c7b2e6061733748517ed554308566578c3cee5c5873c WHIRLPOOL f3ac4ccde5cf8f5e6794e0cc7d9e7e4bdc2b322481c3d9c2098f072abc575406f3c81d69a7e233c3a0391eb65191b87b6356fcb39f8c1860867479345794fc62
-DIST firefox-40.0.3-sr.xpi 494736 SHA256 c5981e3c19480f1fd3c9a4a952c734bf1b300d160fa03f05c56a1622b4676978 SHA512 5e1b58394367f9dfbf9f1390204ef2450617eda6308410e8c0fd057999c5dddff018e738efd1ebda885f7345b05b818c2c51d6574ac587cb0adb63f9a3711856 WHIRLPOOL 8408e2d83710e3a079dd2306771c9481ee83eef5a7f8e6d3864adf8bf5666dcae35585ef71544e82ced7da6de7fdb3ef88c3c29cc08a7814e253df93216e2d21
-DIST firefox-40.0.3-sv-SE.xpi 467791 SHA256 fde03b6f0869804b7624667b01d468503e9cdbc22c9112cef781760712a98298 SHA512 8e19ff0845c9d9eb33b75e5d07cd1ef57e3ca29efa58534e5c214f2d2f825541a8a34a152415091cb81f5cfdf8d4df848982e539f8bfe3e53fe634a95d498f76 WHIRLPOOL a9b6ec717bd6b514be306f93165c0ec3614745fa1ce90ec8e9776945b6ff9d6fb89e2c9969a2561c74ca615b2860e6d519137a2ff24deb26ce63d8c61d77c250
-DIST firefox-40.0.3-ta.xpi 521801 SHA256 18e0e398117e2b1b99431d534c8b709113173b4b57abfd61f66f216f8f7bba11 SHA512 dd08735106616f3b95fd8f4cfef595813f53d260efaf4da840f36e63e955d259a203f1eaa20827ccdbc73f2321885eb6c5bd65f570e58bf75a9347561fc2209a WHIRLPOOL 480d24a53d07a6deea90b4d69e7e09d4a8b22f10429611f8c33d5baf05bfef47ad1f722389311e7069dcb85bcfb1b1cc0c1a265767525e50d3ffdcac10e9a2ba
-DIST firefox-40.0.3-te.xpi 540972 SHA256 92543ca8942593ebc6c2033832136b411fffb3da5278727f766995245ecb6957 SHA512 1645be5a8a8f9d3ea6a8f45f41d7d21516d2af44538ee5df991d74e8f3315ce29cc70271eb43279d83da28befc32c900e7df970b5fa8fdff74356ee4eaf0cb82 WHIRLPOOL 74d74bcb71821cf5731bb19ffc2ca551546d8765472d2f0afd34d0e0f28e58ea39161d2bf67837632085fae0c6594ce6044fc918cbaff31c26d86d5fc8ae6cfa
-DIST firefox-40.0.3-th.xpi 550265 SHA256 24dcadec477da92d757f72598b434a1e59613681ff9bbeca2530d7b28d7227e0 SHA512 7cceb9a96b9317a125e9d0bb3f5e3405f451cf8417d7d1ba99edc873c868a1a5378bb3574be1c7df914ea0d90431ef2df01805afaa111055f4e053b31c420c05 WHIRLPOOL 6807b1880f2551e901926669dfebd304ac62bb3a2965622af2d918185da4054205c51304a1d234c6b45111441d12da077becc1bf04e57d02f3758ae33cf37dbc
-DIST firefox-40.0.3-tr.xpi 496254 SHA256 e0ee75872b49c201eb4b35f4e8bb877255c9b1af010641b3129672a409e64c77 SHA512 8868868a53e61a0745b4ccdf28d8a78016748df74c66e83eceb1be80f56add1b7aa141d872551171e133b07d956e673e1fe100e2d4470afea7f390c066f75b71 WHIRLPOOL 2a7bf357fe108da64f676fcaeb0ce3c6c7b8dc34c03370f40ea1db72d8d7a1ca80f14930e06646fb21185e51a76c27eae3743beb2052504facdadc4a293ebb0e
-DIST firefox-40.0.3-uk.xpi 511145 SHA256 67ab7024c3c29c6ce7e054a9c65362c942557aa636ffa673d05485ab717804fd SHA512 9ca5fb268983712f814baaa71ea16c65fcae8bc2a2ca4ec4dc45ec72a26f1fcf9b29355ecefe01ad331d6f5dcdff64f48160abeebe72c6644789167c4663487c WHIRLPOOL bc1de4395c02c6180a69dbd188dee707af17d607d7b44fecf4143a758bb83c02b54be327555ba2d9889e65e7e1b317407b0bbeadd44330e0969ccd3978d094c0
-DIST firefox-40.0.3-vi.xpi 481059 SHA256 f64479928fd58ebe2bff6d09ac26e54e3f56db7b37a465dbe4e6078a8989a117 SHA512 5fa4df0b9283446f82b317da5d2b2ca709795f6929d8f7344cfc97a46d41d6b66c195b3c0b7406c92217083e6176f9976d6d158ef7fd00a0bf152cbf66c84f12 WHIRLPOOL c9f61117acafc25cc58b86b11d0c1f332dd74db6d5ee98702893625f948f1ae1df855ce1b15b7804d0e2d8017465a2d469c37b5bb4e0c2c1f5a78a03d506cd73
-DIST firefox-40.0.3-xh.xpi 461039 SHA256 54948f041df5be3c074ba2bf2bf7769fa3b45751038dd61b94cf3fa09e0a9d72 SHA512 24cf779a800eb187d68f84b6e8fbabebcaba2787948fd7c2e6b5970a8fe72a6b25b8ff572246d254595dd1097744d079e46629b3ba0a7165b92b55f5b0f07482 WHIRLPOOL 93e7750fd2be27785470d72c52366ed3c21754cdd58fa1a955d991dfa79aace5023e339f53e7c4ad51500805a97ca6c03d9739ae9f6b8f046d57bbc648e5e91d
-DIST firefox-40.0.3-zh-CN.xpi 504409 SHA256 86346005557d217110e624e1d98037a5cf634228b4bd42b38fb2b9ba38411999 SHA512 9f8cdb81ec5851a6b5810be3c5882a24fa5e93b95889e453e97ea7e8de137470e9cb9717b40ee07ae9e930bbe2f5d0c41bd8692220a0256acf6c004909d4380e WHIRLPOOL 4687a90af21051baeb88e0d02cf52d8142d08111f226dbf7a3183408061aee91c7e270d8a7d72bdc20e1b517a81171623de96fa7a00f011d6f05177ba96b176f
-DIST firefox-40.0.3-zh-TW.xpi 491275 SHA256 36be93979c452610d01adafe926b05dd11d7e92211cea9f10bc697b70acb0a52 SHA512 2173044f0964c5237fb0092d0ac39abd175cd408ded2fe5724d72114e67c8a1be4b4e22312c31864cb45af34992bf4bacb104d2cf5a057dcb2e1b544e897d6a1 WHIRLPOOL 3abe8575b8b962b380d915efae52afcdb1cb3a55ae7e5a13c73041889868745d08742c43e13b9145333c0dd0a1c80228892a195441d00d4d94c2bb4d61552985
-DIST firefox-40.0.3.source.tar.bz2 178261482 SHA256 56ab32bfa070a1d86d356ad14ce74252b38dab9307948de8e4a3a2b7f3f22634 SHA512 8f0f3f3a38378b4a5c30e2a41888564f9eed3e8ec3571654849afbd8e8b46532777e15e148eb4820d14647b51adadf86ed77d80b359ebb289431ea31abfc5748 WHIRLPOOL 7816360081c5767b35da1629e9e08c05e645c53dcaad017bdaa5f30b4b321390adeb05d26621131e54a95f8ad1cf9a7a81d1387f430d072a2c92c772e871ece7
-DIST firefox-41.0-af.xpi 486121 SHA256 9a81d311727c1b393eb5a1d420c77a26cc01327b3c326a935b8b31b426977ab0 SHA512 7360b653fba4002ff08e19f955947ac4e5a581ddd93174ad468d1c53caaccf48596a9cc0d50455d2eaace12d8384955c50c23a84423221153c747b85f93a6d91 WHIRLPOOL 9766bc2c596e70f3bd7a672ba534c29d81aafa6f9f8f123d4dfb6ebb379a3767700a992142186840beb764046d77f4ee2fb5121442379830b0b99d0f53bdb485
-DIST firefox-41.0-ar.xpi 521159 SHA256 bb9ee3d703c10f9bc3e12e9f62ea95511955239a20fae81918f0c0529685baf8 SHA512 22a3e417d2cd1ff62e6e05929a1a6318074d3328b57abc34ed5ef07a3b634715d8b8a60092d7548c1ba34f1a63aff4213621b6cf0928ac52b28669ada270b01b WHIRLPOOL ce8a9a7dff478541577d52f84f6d0fbab59cde374e03878500b3976a2336b33a81f10e72d9e4fafa0a1d40e052250823d377973ee3e678c74fad8668f1a1c2de
-DIST firefox-41.0-as.xpi 511219 SHA256 2bb52d1a41ca3955a460f0f2d48efe3e2c99ab579d72f1c183faed70403bb869 SHA512 10f501ad24a4a94b154130f8edc1535e4cd8f0445255df7efe79daa5e0a57225a7a08709f94d6420076a9b417cf5eae9908fed34867eb2387eb86aaeb62647e1 WHIRLPOOL 7365bb0e4bf7647522cb3406a48c651b03479686583dc99d4f2ddcb05e863ea567dc95d2b0c0686442c794b7cb817c99e3b9101d976c2f0105d219ab7256a4d1
-DIST firefox-41.0-ast.xpi 399122 SHA256 2be891b76d75d39310f35c290a7d93aab8b6d4cde87e65f0820760fd230c7985 SHA512 34ab36df4257cd9020502c3598cdcd3b9e2dac62c0b6ccb894b4b2090f652fbdf9e5cdee704ae3c900166c2e4b910db35bd1fc1c1a4debb4ee3425a8f15dba14 WHIRLPOOL ac63e2585a58c599c00c0fb0116aa50640280d16557f1c54e6a916de37ffcad8aa45cceeba319dbcc1c538151f504b291350bf5e224525fd49fd9bd993b6b21d
-DIST firefox-41.0-be.xpi 453403 SHA256 3611cb1cecd6fd6ddfcc57ef936a351704299a54362d000c16779aab7f7399ec SHA512 497daabf1aaec05fb0ce31acd0cad0e4a924c3077bdc2c77ef63d7ad9532681611310ff5716c04d529677526e90baa19fc82c9e5e5496914857a9382be29f2ef WHIRLPOOL 9b3a13ca04ba8e7dc73a723b71ec33502c26ad41a03023d97031d8de9435c54651e88828c68255413f5f2a8d6132ca923afe4a810b6338b6c30f5b4fdc51ccfe
-DIST firefox-41.0-bg.xpi 492965 SHA256 45842f478fbac439a828950fd8a708352e6f249c967d71def55eeae0ec49c78f SHA512 caa8f7da30e3b4eab19e4f33b2e8cc2aa7b1a67a908eb061a3feca2ba9c4fd68c0a577ccff1dd6f025ba963dfcedd46ea0ce555f75914e0dcd2887ac82c2e4eb WHIRLPOOL de8e489948a1095b3fc3ddcc0cb2bcd6a77002326b3cfe168e62996c68d68a442f5a8ca6de9e7c5e872f1789f522a496442a0a38094d3cc6a4e36a15b61e50ba
-DIST firefox-41.0-bn-BD.xpi 527570 SHA256 de27686738705b1291118126d87f9f6f60075a35abc3651ebbe8c62d3624f8ba SHA512 ad44ca81bbcf4f3861736dd688ba17b70b9897f6332db4d4d8ca6c86f98e35817971697302a15964afda7dfc2323e353405e1b4d82a74785d12a22d4b6aa11f0 WHIRLPOOL d2c813aa0f9ee56df5ca82e4b082b71fb4baf2f8d458e26a5277579c250191d1e9869f1ba05d2156f5936d8a0ed3abfe1421b202837646766ffd085d57d2b3d2
-DIST firefox-41.0-bn-IN.xpi 530267 SHA256 bc94787dc80a9afd100c0b784374aae1bdb03e03e496ce6f6cd5b7e3d254056b SHA512 3c4842d8b21718179249d6a849e10c4a0ce69e892bb0abfbb459c1e2679ba248549d04f48fddd24782ed04f45348be951b5858615f1ff4bf2a6e8dc41e672e32 WHIRLPOOL 49baa57523d50a3d789909588c3707b2a5cf9e90dc9fe4b79683b6e310faddbaa038775f2e757a1c47bee27dd2fa943501056fbc62a072f0ceee5e6817fc3ba6
-DIST firefox-41.0-br.xpi 444530 SHA256 98db3d58490a3bd71ef114a8d066fa8515450b6d85c8474316f46cf7e4c0a3be SHA512 93bd12eedd8a87d68523f8f556c918dacdc54260f9f6b5a496fb63981460687ab614f15a3e9585926bcaec9fbe1430290461f788582e4ce005774dc571bfe359 WHIRLPOOL 5bb77519e61adf4c3fab68af264209ac294083adc864052f41be199867de48181a472cb53809193a689970c891189dcb44273a6595ba2758887ea60de7e38bfc
-DIST firefox-41.0-bs.xpi 486281 SHA256 20bb1ecb9f4aa63163c6121e74a25b5d6b55c33b2dbe13531962df1dc52dad10 SHA512 67bb9bcd6f5c8ba7a07f5481eb32d7b836af83e704a831c176f9ef2bae0285ca5f1f6af9126326abeac2365e6e94a890d12e6c40c1985f01818abef953520548 WHIRLPOOL c82de7434d1c78c577b0615b98e3c4a2689f63c429fb8a28e2cf8e98207e59a5bfd8c7f7ba647dc4853e8e9633ee65d64dc331fbdbc8a96b3672d66aae95dce8
-DIST firefox-41.0-ca.xpi 461321 SHA256 4921859dd265dad50f39187b7036e9154a73d4d32d5153f2c55cf529fee38e57 SHA512 36697ba92a072c5fbd3375d4dd6e9be6e4743ea3bd927489d8334aab54347a133cf1f7103173c478e1b8de3fbe2864e41d1ea3ce919c11bb672e1fff3e275101 WHIRLPOOL 893552baaf7c5366713cdcfdccbeab90e924a86c75680df9725eaeb22d131b9b948d4266fc67b207c49a8f8908d47b09d9d5cb7db1b39c71e505b6b74ab3d9be
-DIST firefox-41.0-cs.xpi 450333 SHA256 5fc00e06ade7de4ab82d93fb87f698c990f3764fbe56ea2780ce06af0b752413 SHA512 d5a2fb52ab68de7ed45b4567d80a0d92149a352d12b37463629ea09a523664bee31cb681a732cacc42166ce308bd6ff67ec2194a628f554c3547e8b097228a65 WHIRLPOOL f28f199edecbb84359df9bfe7c9cb2fc161edabf2c1f89903d7c22c4362340753d480b9e2155d82e63bce0132a3ab205c5017ab7b5b65b3df61800977922d60b
-DIST firefox-41.0-cy.xpi 448183 SHA256 25c0e0d472878821b3c45867f910ba90414ee419894f7f01dd9484ff9ff7e973 SHA512 96ab90a1722ca702e6d3a23733769f8fe78cd04c7f3113ae2c2bc58dca27beef42d7185d8b2cee03fea6182abdf0ee97b4400539612b1217f00d69cee6497d11 WHIRLPOOL a0122ce73c5d241a5b0832435c4d4fc7e602c9ee867a1d2e65c5375d4008b928eabedf9a42fd8173de3583d378c2ed33d10ac21636f95880a070a81a17497433
-DIST firefox-41.0-da.xpi 453403 SHA256 96d7193c09620bfe570ae37deaaf356d182399057ecd70341c2777188496e64e SHA512 b552670bf54f2ad316aa3c9ed8c45ec5c2c3d22f0c7b906d0832dd3d29a78614aaf038772ce0cecc92e9d85e29b9258cb1775e28f0c23efc81dd79c46e43b424 WHIRLPOOL 8e73524f09af961f7f3b59e2c8c233115bafca53a75637cb32b2c482711c03a56eb4d9d31e78b0f7920ed9acca575629f4929c94b2f862fd3f6b5435e5df4e9b
-DIST firefox-41.0-de.xpi 455710 SHA256 5a28c5751581e669d0979c62217cbf7b9ac61995dcc35a53ab675e241e374c7f SHA512 1cb61cfaa38326f3b27cf137e41813232839c09981e5979b8921ea7c1d4572ed058e496a621859004b5b088acad064a6553766eaf1fecef66d621ef95501c845 WHIRLPOOL 9ca448a7353a34f178a06fbc69ecf1f814cd0b9cca274ba9bbac7cd0f7d2636c29b8e0acf10bd2af0c49d299437191f70994d2fd4d815276ec316cb17dbf49ac
-DIST firefox-41.0-el.xpi 501619 SHA256 f1437c41e2450d5101c3fe2b5e128157d33f5b93336483db36314f3a5e3c9f96 SHA512 0d76c3d5ea7b32f8873571794abbfba055db6cc7e97ec1ded1e7bb95a997aab01c1e4b134fcc2ad3ad97020d4ddc5ffb0602ee3111bacdd46db50f134504bf8d WHIRLPOOL 4c587afe61c6a2ec680cc017eaff5c2de0933e2ed5f1a89ba02a517c195e5764856bac2de27663d79bf7dddb3fc379a8311fc7617802bade7ea0d93881b35621
-DIST firefox-41.0-en-GB.xpi 441098 SHA256 a419880aa591291868e86d15dd0af1fe20f55cf18e62cfe272e71bf09b2e6b7b SHA512 4c410f1a284feeea914a490211a932185f1c397e8ebfddbaa5d887b8059896f69299ecf14d88da7cdf9ffb2729858d135ff9fa108a33cde91de30d82943f41db WHIRLPOOL e30ecac6cf747e9e3f6d04d987894a802e35da284e241b319c8004302e8a6bf7e8af41424493564df276deff8f4fbf31b09f72027bfcdfbe638b788456e481d5
-DIST firefox-41.0-en-ZA.xpi 444145 SHA256 5dc4e9357ad6f826572f96305ca8d1c5fa74a4c9c82fcbb78b3a7f34d9ecb242 SHA512 4d5e35e2e60e18c64ca235612039de0ebaa067acc76d8fefbd80000fb975445d5a7fe986a2a85f2709ce4de5de46cd469b428d7092a13d01707c3820b47473ef WHIRLPOOL 26817dce4d8fb2b854661d57f9ca16cd3b6cb9b9f108ad82be596b71cdda872721fcd7e48f5409930811f9c3f572db7edde5c8bab3c84b00ca28508c5e8e56b6
-DIST firefox-41.0-eo.xpi 487994 SHA256 15ec1dcf88b51b671e2369346e87a0503b2b1ff8c32b9e91389816a4eadbc8e9 SHA512 c801ba5d8cac36932e2fae88496c16f3623f4511ddecdefd81b5d99f4602927d17835d0a9d3456d167fe88935dd3b3ffac14f76708f871a519efa06f3048b838 WHIRLPOOL fa4d6a37b437ac2f62f779927722c4687a58842d9cdc70fff4832f35b3dda7ff49f8324018bda4f87a3b04a8767d5e8c4bf56e6ebbd80392b4ab4e4fddf10dbf
-DIST firefox-41.0-es-AR.xpi 456517 SHA256 535f578884c390698c97db2717dd91f3d948fb135b8ba4f1b5ec09d796092ce5 SHA512 b104e011d8655c6f884af6e1aadf22eda9505bfec3f8daa12a408670f6a3e8f37bbbf43e33fb9b630ba2c0d810981e98f7ae6f3a31ada727c9321fcd76b32096 WHIRLPOOL 6fe88da24b22b9ebbc9f367b135a7b458d39b5deeeecb7a47cef4e776ae82e2319e21bf912b19b3719955cd57aeba9101361a61e2a1bf4309107f33ea09a5b54
-DIST firefox-41.0-es-CL.xpi 381632 SHA256 b65d4c72e66642d5188bf12686f2541d2b5178be83ee2fb727d82877aa1aaa3a SHA512 afd83956a754af7de3babf4f829e204cc91cea2b3b9490dbd0457a45f85ecc5d892f947dcd343949806a79caecf239051d57ba927cafbd710e4358a9f6b64825 WHIRLPOOL af6da1a91197878f08aee00eaa9dde7afd5eb872cbc43d3412fd6b7ad84e12bd8788bbc68c54194fba33275014585b187d238e238c265d08729271604e374adc
-DIST firefox-41.0-es-ES.xpi 370111 SHA256 ca7968f53f99bcf8e5369926b0e8b23ca7272e54bd15447fa42d8588fdbcdbd6 SHA512 e0a79f007f655d80fd4bb665e6e1d6e91eeb6d7330771764475e17a7539d5770f7c51d7eb66ad906ead815d672d456dbd27712a7ce392de7143ab976dbfbb36d WHIRLPOOL ce903e4dc39c2c9174f3f14dfe36883c870ba32500173f9d6eacb1a3cf92d6d53d9aa3a93e18897fdccd7b2a18258acb10a55c8d1110e95ed61d0b7606784f13
-DIST firefox-41.0-es-MX.xpi 460283 SHA256 a6384d393b6c82d29834089db412c98de0ce58ef7293c59166b6675f236ba0ef SHA512 635cd6c7aa1894d7e0f1277f6910d3f83848133cad8e4e1c885edaab49c43690629942a11c038ea7947f72d84aa3a46999823c067c47be1cf8aa7d5f7444bcdc WHIRLPOOL 69b3fbe36f5307a8e5df9302ef2140633956da6692b8c73ea244a5dca4c01d72d1bdaf8de4d22aa5fa67dd7e423ccc825b243db87e701c1cbfa76c3b4b572596
-DIST firefox-41.0-et.xpi 445439 SHA256 71db72097253d9eb7964e220ac7d559d34dbf0e1214715814349ab5fbcbd2046 SHA512 52ab6237a77bd914bad894707bfb2e2ef85b03f568c5c4d6ba91f889fc7e7fe6645caa2239b431122f4bcdb9699e0e5ccb950bd5c8bb8487a6e514cf69872402 WHIRLPOOL ae0d8c78f79297cd22aa49f4adf5de14e6e4dc3663511c0e99b6bd2bfb7eae815358e739c6405ca1c2276cfbfdf04d37af162dda14e0dfd3dff2e4e85ff223cd
-DIST firefox-41.0-eu.xpi 469716 SHA256 47cc5e46baad2e03a17cdfeb054d0d3f102094b4e9dcb1c8a49d104324f6115d SHA512 253191ce3a5d69a8ee35405c227432c966680a2c543ef7de4db10a32f10c4745fc3d4c007acf9cb7f357127a65cedc5ef0077551c2c8ae8d8239060d04abe6d5 WHIRLPOOL f93d58cbc4c228c317797beebc03b938c6bcafe3182873fd4dce8660170c790e5d39fdab0f012f990725e09dbb9dd7dce465bec34c07fac144e4569a18b91c37
-DIST firefox-41.0-fa.xpi 516157 SHA256 d3c1491021de3477709b2f77a2ed95e4a4b37fdadf37dce2892edf689cbc015b SHA512 2382628af646d24931d313cf8f2a5b2a6d70e33cbeb06da4a3ad6bbb5e867c4adef7339f6a8e80332485636a06332ac0d272e6c0d355c7537ef0e8d4c93ec7a3 WHIRLPOOL 8ec6dfafb853434affbc876e63c827d4195f32e0a9544e1cd562453746c130b019af4bce165980b0ebf4f5043484a4ed7555617e4d42c8f109126a7d3d6477b3
-DIST firefox-41.0-fi.xpi 447174 SHA256 0c919f496c2a0e1503a8f37ded5938100680e810f6025cea0e84ae27f70b06ee SHA512 aa5740c3cf004660e20b12ebac6f23c36c0246e1ee3806a89444d86bfd81e5d3609b4a5a12dd988b55feeec2a78ea8f905fd8c9708def684efc4b68fb98e9d9e WHIRLPOOL fb2ade664af6934dc5282ca1c317af4921225850e7dc1f289f2df814a792397c88c42b93c599498f1c96684bcf552f6f3b3b074d58a170e719962401b3153f27
-DIST firefox-41.0-fr.xpi 465091 SHA256 df5faa391722a201d6f6ecf08de01d393ce96dd122f378434f11440f825e5b10 SHA512 f924b0b4907b0761bb78cd3f2cf9fffb758493b5c0d1c73f8f0487176c006a42291b4ad308493fb2af5d9ae12b4e7ffbd448ef103f8bb1f5ccbe607356e81624 WHIRLPOOL 51b2e33708783aa68b3d66f85898aa9957115af217a6ee50f8be7f810bab98bcd85136b8832288a3480a0e61a053de06034e6900af2ab9ffcb3b39d855762501
-DIST firefox-41.0-fy-NL.xpi 458775 SHA256 8aea345024bd99ceb013899e839170b61e6ae6e1bbb5b9c65cbf92f2f610f35a SHA512 6537659614e3722268f02a61a558da1d9105d0150a07e9bae8f40b50dadcda73a04ea2b2deddb2800509306191c2a38c6b670eaf3b15f4a7195fab6bce3c5b01 WHIRLPOOL ad7ce9a8cf2f2541dd89781453288343b02fd68aaa3e9a60d78d0d27d6b29b5d0cc289a320f642da160146a52b4a6aac10f32a38f540d039c5f605013e18ca3e
-DIST firefox-41.0-ga-IE.xpi 473255 SHA256 ccb6e56af07c093f77db2224abefa80a77690f955d6d54f77a6d857fb672429d SHA512 873447d1dfc39861933f3a0c65958ea3692aeb78bb16be04d18879130b654857aadd61618b30d2785d6cd7afee594722881f8dd5b693c17d2658ee1acaae17da WHIRLPOOL 0c627d36058f310e5ea093123327f0925e8ab52161730b51f172cd501b97ddde46a4be8d7b51b678cea27b9f11c20a4ac5ef4deb27109e77a49a3a0bf5aa8756
-DIST firefox-41.0-gd.xpi 457498 SHA256 12ec59d2dd84dbd1e9efbb6accbda523d93845b1198ed54ed4a1712bd50268ff SHA512 d4d3dd06ae3f2aa815f5578ef7012cca9f8f4ee272a9cbe4ac05690f80902e58c4273a88b0f4e090d822a3af58e2c97a76c835491f7391ccc316895d76c3c8b6 WHIRLPOOL f9386eb4f34ab9273d60c259ed0a3438767176e747db7017f09f09537a3ff437efac26e59cc0f9636f388b7c2eb70c349817e166245a550963b4a893dbd7bf6f
-DIST firefox-41.0-gl.xpi 452610 SHA256 db9f28f2202dc2cbe96729d1afe9cf41ab94ada69e5f1305c4c15d2d0cc6416d SHA512 a6d48410ae15e1dc0b63928fcdbac8491a418d4afebae2d207f6f6b2329b6e153d7fd8443d87250cbbfdb0b1b3e9987e1417336890a23e7a15ae0a3312d01260 WHIRLPOOL 387dbc1a2cbe5572b92e1e063a5df99e4fa749bafd4716f515b1466614eaa4010f0385fcba9817ac6fcc20ebda392a3c2406424c5967cbc7b6dcb79b295e4e66
-DIST firefox-41.0-gu-IN.xpi 487514 SHA256 53463a96319f19c4966cbef96f2a6fdbabe6e7e8f77473e74541e26724516a92 SHA512 2a4018346569539d938ad7ae00a9cf99af2fd1cf34e94edc76f45a5bc87a449e8b4287716fe21dd55c4273780c38d919dede43574df2198456ff4a2d465b432b WHIRLPOOL b2fefa07a638e0aadf30f5d30cf146c6934b1482d4ae06a41db14d7bb92599f1f63fcaf1c87a957fa384b17013ac68f7c50bb57ed53e8e0f1727fde5a7e73265
-DIST firefox-41.0-he.xpi 486489 SHA256 21d0550c2c7a3f017f4e1f83859387929c41f7f1df06db3b073852ac436fc435 SHA512 c1b5bd6ad7cc3235b342a168e94a15de5bafcd5ab369782e442e5cc456e5028061136c4bdc8de6ac310b230524de0e64230eb2c9f79f78506181e1743fdc29a8 WHIRLPOOL 77ad65be57b093b1092b7c36f4b5d87ea6e0749fc1b5a489b270a690b304db5b520e908d92092cbabea4c68892eff1430e7954c30a7a8d0553c82b6f1621f8a0
-DIST firefox-41.0-hi-IN.xpi 509161 SHA256 b15756e16e5998219c2505e06d5a05aa291cfbb73bf31556d55ce57284c535f6 SHA512 616f9194a0334a9ed0298b82bdf2835f0dc6a963d364c452b5657ecb77ef5ec43640815df288afd1ff1ab9e4383018301349a6b967ad6be18344c6432b43763f WHIRLPOOL 4268d599415f8b965bf6f5c5c21c6ed227cd2954641b1509fce8b28c851ac98570249ffd0fab82ca9dd3241f7c2e1870804edd756192f0f4eced078ef526edd7
-DIST firefox-41.0-hr.xpi 481334 SHA256 b7fda3f4bc5a7d6476f8ea5cd4e7f9d9445133dfc21f9257a802e75792543e21 SHA512 38cf93ab0c588fac022a68e10f018cbd2e336ea6236e62357dbf89eb05af0c1e89afeb218f291c654cd3efdfb91394541266c58f188a9498b8d81e18c7328cc7 WHIRLPOOL c6b45d99245ccc62cf146926131947cde793744975ee559813a035edf7b026619a47c59a8ae465b51bad5198b79edef05ed05e0af70d049f8b8cfb1cdd142a9b
-DIST firefox-41.0-hu.xpi 457034 SHA256 ac254be8aae3d7feeb7e871f76d315a0d498bfc18ea706c5d51fad200554d86c SHA512 f4877411b3a14f9460cfb31b8f46fd6841175f6d7c5422fbaf520944aa40a9efda6635977db27ec963f228aa7c4b85db901c53c15107332ae5605f0180abd1e3 WHIRLPOOL e0c4449778d47e7fc6a6ded2ae88ec378b143aa0dc52d32f53d8b647b86e4ee226254779c2da03567e2a918640f8fe750ade895f021c9b295a06cc22657b67ae
-DIST firefox-41.0-hy-AM.xpi 538340 SHA256 86019023a1bba2985fd44dc18fe6eca18faccee769d2702ed4f5be6ee68cd0d2 SHA512 4b36e4ceb71ee5287b8d92ad51027253eab19b1e4c180bf0581547722c4736643d64c4e335e581c8493c74c09c8251275b2a810c99194b86febed04fa36360fd WHIRLPOOL dbe2d6532b05faa9d48593288d5fb10ae068aeebf7f2470b9791322f955a010dd25af244fa752984574e71b0370810ea0ecd990b2b02475424a34a29f31474a9
-DIST firefox-41.0-id.xpi 433970 SHA256 64ba7710b02a8454892dbb2de437e11a1e0ce660a6c072c54f3f2788aaf9ab0d SHA512 c7d7a10670935f47d8cd66ff15a105e9f1e4757bef3e2ad6d22caf710720aa8a40aaf69e8e688fff988a9dfd14976f895dd89101791593255786b5bd9cedb7ef WHIRLPOOL 35130da5afd30b7f72c507758dcf2b02618a6c8013f11e7b7b011cdfd6b6bd6c02e7f37a02a1f7baca32f2325bcff71e929c6424f4e2114407853f79e34255ad
-DIST firefox-41.0-is.xpi 488111 SHA256 ea2916c2eec477ea0baac33c5b506f2cbcee0e4023cf4d96d3a927470c40be5c SHA512 23326bbb11a426831f9e67dc11392624b5b6309e3e1b294059b2584280e2747336c70b7b4f4aecab3285145fbb5dc5844bc4491d27308d1b090e3fe4348d2b34 WHIRLPOOL 52701b4d2e5b18b81f2a25d54de8cde73a376d1cb014cc3772128a5ff7fabe60462bddee7a0caabda82e1f9345c48bf3e7ce97358eb62bf071149246c43b8bf6
-DIST firefox-41.0-it.xpi 363984 SHA256 81c0df60bd9a20f1f3bf6861b085a5172b398fc0dcdfc603e34ce306f80f37e0 SHA512 d5c8a3e3244f7be5f27785fc17552d4ac5a4c9521eea9191edaf39da79b5983e853dcaa7ff5732aba2d67695a89a7897bcaa2c052663ac6e34e0842286761262 WHIRLPOOL 4fc2a4951fa0efa79e4bee5f2c9af44ecb62207b0f755ac77ecd206fb7165c4d587eb61c9c957bc9b33c476e62514e71ecf0b25d2496b0eb790067d885b651c4
-DIST firefox-41.0-ja.xpi 483302 SHA256 32386da85ad191fc2c445759649d929fd7eab3940daea328dd3e1a56533a7c37 SHA512 75faf6e6aa8674893c58432aca01c10a9b53ccdecd331a8d9d65d95838d719a5697d3ec2cf4051c8c985136d6466e06ef1d105511159d134498baa411dce3ab7 WHIRLPOOL 8482142b6a596fbb8864b8784024d3d885c10ca36df2b1e6060ae63504549ef18b8d418a49e7eb92b34d1c057a63dd7d7e4e062120dc3e6b8bf09f5ebaba2264
-DIST firefox-41.0-kk.xpi 508364 SHA256 98e27a0caa00137e3a7908a18220af0b5447371875be40a20caf22678adba9d2 SHA512 2b3e4b70635eac7b1729c7f83ee7736c3ed5aa2c2535af2b0d7566e2325a0d27b352851cafce7787d92b45f802b8c31f2aa16ea5eaba917a31865fc59e4c17ce WHIRLPOOL 9e9b40489503e782ac7a2ce4a9600536788fa640d3644d2afbc41af995c797801eaf1995cd5b0e0afa6a9d05c92801f5747aa1c39e2869e50c9f42f2b1e0968c
-DIST firefox-41.0-km.xpi 571707 SHA256 0391cceb932ff1d7099605e51b8abf9e5cbb311e4fc6d5a0b3f58388428332ca SHA512 53195444765cf8def5ee8b41a7d6963e4958f4208807a5cff3119e1c0c4bf4a78e4cace09eeae107876e755de337a26c2bf8386f1a708a4c6fa97efe93412e5a WHIRLPOOL 50ae47fefbf642e26262d7a6836dd2d61aa077a794b2833db5056271d414d7544ae6d689ec5cffa75d781405b811420ad653665e6e53df66869f8774e1320708
-DIST firefox-41.0-kn.xpi 539237 SHA256 87c7e4b1b00499929fa89cff96ee7b2040bc3b2fa39da43d913b460730e9837a SHA512 40d5e9eb858fd32007b5a6d5eedb6561d63dda615d6c7586e2e902ab4eff49445dbffaf2f4f366a90eb65a6b794b4a76f3f1e4f2f6ae6c0e924feb449951cc1c WHIRLPOOL ce17c4de5b929720e7fd4aa0217ff2f890c294c2baabe1e1e7e4b1ef1eca1a5803a5dcd0c3f50f0f7f754dde861b8aa87311ced2a0ec0be3eed949b25db498c3
-DIST firefox-41.0-ko.xpi 464904 SHA256 bfd714e03b16a6e4e440bd1907186a9856780be70cd0af9daca3374a7a2006ce SHA512 7327fb21b853840e8e783e3206ad0c39af74ec6b07f798b5b2eded4ec496c0093683002264034010ec6cd888c4058864125d280cb805bb874afb5210b38116d4 WHIRLPOOL 6a4a4558770d3b5a48087bbe6407dee8e12658dd8468d54400f130af537f207dfaebadbbe83a885d15e07d0e086bddfdf5630676719c9cd8e5dcd3ed4e01f4b8
-DIST firefox-41.0-lt.xpi 490118 SHA256 46d2bcc9842f74d1a78e41ce470d2197fc8e5243886c0b4b62535ed930c2a01f SHA512 37d6e6714c9100418522f967da7fb28375bc77da513ec98d8e3f942af1d2d66b3bedec9e3529266fcbbc01a30823d86aee599648303e841d6d09c6e06f779576 WHIRLPOOL 53746c2cd388a49bd6e0b35f89a059a4a6cc181ac404848b318e5b23bbdbe45d7d6b8d25d86f03c3478be1fcd340179cd2e8520dfbd4caddfdf1543669dd1f68
-DIST firefox-41.0-lv.xpi 470364 SHA256 9f01b6c0c4647981f595c2827453e1209587c34ca947a5879f6b8fe9707c707f SHA512 135c85f2769353d11316345bf8b33f414cfce65fd9fa356b473718d37945a9c67131c726eb5036d6eddeee66443e3c7f00ba8eae8f50a6fd722588d21b687766 WHIRLPOOL 9b98bcf1f9fa8ac8fdba252d499c0d50b3fd95da9112e279162ef01c42fc8b978fbcfc1acc954dd0edc4620efb782ad8f7d2384785c72f5c45d4ce2f9970a472
-DIST firefox-41.0-mai.xpi 517160 SHA256 f3ececf56f634f8dcf3950d4bf9a7a21508021a45b99dff045135c1c037266c7 SHA512 f95cd6e8d6d47eae36769128da95574248722d1db3bfa7d23e1434113379621e983d8bb908cd7954bfb1e8f80dc0e419c254daea2e80eed3d5fc249c86745dc0 WHIRLPOOL 965f30fd54cf0558f0b48450ac7b02b00af9b5bfc256bfc76404b3d8fa284bb4e849ce8435de38307d27c44354ad45bb6fdfd6c51c2ec494af5a458a3f45784f
-DIST firefox-41.0-mk.xpi 530865 SHA256 1b8e4d2d5cfd8c8768b42b6d394b9132dc806672cab3d3f0acdd475e73d6abd3 SHA512 46a90188559048ef98dc49beba3579d39ca1b535afc5a4da255d84853e230b845be6cde35f57b0ca777274ed6d71005728843c9dc645462922dbc9ce124443b7 WHIRLPOOL fdc80c85875dfc67894a0b9cd2c65bd51a3131bbecc37244dc403bbe89103938be6208145c833a6fefb345ef68df2a3f20d0c8fcceb6503c79074ff15778e27e
-DIST firefox-41.0-ml.xpi 529030 SHA256 602b9759448353e33b8800fb392bc2e3785058d1ec2331528abc91a1021bbabc SHA512 bbcb0ea2fa1237503f49be1b8e8ede709c67e194a9229fb7ef95860669b767e93602011dfff7fc74493e309aa39193533e449bc7ffd543db3f9b6d249b41401f WHIRLPOOL 1a5ee0f39ca5f51bfa6a59fe9c034bfbf800dcfa793177a1fa2b21627922e4072cb386c0a1359bb923205b28dc561b61dd492f0c41489a788fb875cf6571cf42
-DIST firefox-41.0-mr.xpi 511323 SHA256 dbea36f8a4869cf15db2ae9a324d43297295d63c1a3dd8e45dfc4997e5d6676d SHA512 aca504bfa82aac7b5a448b2176f1dcac0f94f13895c707581a3adb54555a24b267d4e3de0c09fd7a29b41fd8ef8062847d2e63d70412f82abc4b0564879f25e5 WHIRLPOOL 1d6146beaacec918e83087f2e526629ecac912409c565d4c3a8eeefe963e39f733f9769220b1cb4cc5e21083ed15722b32de951b1b50397d45c688fcdc9f68d6
-DIST firefox-41.0-nb-NO.xpi 446371 SHA256 b70ff1288f2ebd217c67f0b4fa1c48dcd6800d98ebca03d880d01592eb1f9fe8 SHA512 1fa7a464d38f736aa8b70f8fcbdf46e88f9461f91d56863ae8ed8a6b186be55ee27e85db85c940b21c1903f4c56dad45c495ce34238590da24caacd90b6edc33 WHIRLPOOL 44752ad9b6a5da83a8770f712bdda672c94d22f579e2f22692e9192f873e8346ef1b0c031adcf3706ea702c2f84387756c0b4039cd0ca6e380d6d53318493a1b
-DIST firefox-41.0-nl.xpi 446545 SHA256 82998109c104b4277a54a9c6aad3caca8d40e89290ca33f18e876e85158ad428 SHA512 4d760d5e05c90347bc593eb11129ab18d79ee4c7c5a0f52209114c33d9614b4cb953f277c567277a12df5da176faebc05a32b44f7e3a96d417ce44d015139614 WHIRLPOOL c2e53b6e25c72ab609763ededddedc02ab3008dbc6e27b7758bdb637351243a6d68bf515460d2b85f3ef66d7d0dfc96c7003bae8549ffa87ae2a00e529c9842d
-DIST firefox-41.0-nn-NO.xpi 442561 SHA256 6f39bbb77c7c07bcc5612b1715262f94d4d962b5148384ab2ec052e1a4b64eeb SHA512 8d5a90b95abbb4a2b3d693b90742a9a4b626b665989b0b0af5683cf7070740c4566c33cdaae98599852dfc84269f89f107a57bf5c1ee5a57887039e92b7c954a WHIRLPOOL 00d013308ff1922accb18f2d2f5a2c311633d8bb83f6f8d4a1d66723aa2db0f789852b817b93bd9e64eecfd0102861a31dc4b401d7cc6bc7decff5451922cb41
-DIST firefox-41.0-or.xpi 528104 SHA256 c4fd3a8b1fbc8b79612b3d24b556419acce11a7836e21e7196dbe4e9eb0b4799 SHA512 262a3d43ba4c554de8506227fee57af053c30edea5a58377b05b19f1661d1dc33790267077ddca7b58c32942a2a0a2e72c40e9b59b59bf727d8c921cda8a12db WHIRLPOOL 99e5bad1d719668e0110ac91d75f003c43c5b78d8dfb5ef7292a60b975db16d3035abf2d5f5809a08847e7c19cc07f76dc276ea0293050a0358fa04e0d61f626
-DIST firefox-41.0-pa-IN.xpi 498581 SHA256 5ccc34672873d883693412696e0538dc16b96a712e0decad211fee4de5a2485f SHA512 b19c466277899b568c990dc56dc94cb753e5630d7801c53f27ccf5c8e9920e3708ee943b036cca3d6ba18faf5bd995e5f434343f1b246681079238ca965575ff WHIRLPOOL 029567ffe1aa3944cec7adad55ed64407266561f9c9435df0e264170c4ab9badb1ce0c15f2cd829119497d6b4edb153e122a4c559888ee047f0abdaa0a5bee36
-DIST firefox-41.0-pl.xpi 400465 SHA256 757411d39b98fbfb71a7e502e44c27f64f01f8a3936bbb84b08f2a33ccf0c2b8 SHA512 24b9851ca85e139266243bddfdf078fcca61af8982f5208c4a874e589dd0c7d0a688ae8a82ea95d110dedce62bd36815f648f92bb1cd14b04796fca593dc1a9b WHIRLPOOL 10ef0929b8cd97e6df4a093a267b963b590f287fad52d52a5edcbf34352e4751a3ce9967a127c7836647e74741046c9bc88715077ba2866acc6625da8ac97492
-DIST firefox-41.0-pt-BR.xpi 463057 SHA256 65ae606a712e05cfffcd2f48a352c6b1b5abf17af7bac53c33a4877957566149 SHA512 9a9e243982ca133e3cd01d4f9b6efdce44a2a5278aac28fea040c8acc64ba67ca2eadf38e92152427009800bc9037adba6a3da8eec14cfeb1c03b85c66be5c73 WHIRLPOOL c5c6358d48e16b5a4de9b178dade343d6af5c474b4d4478d9863b39f7873c9490c16ab4b8b0098dfbca7d3a9d0f5b6d4e0e65e99e4632699590b137f3f5d701f
-DIST firefox-41.0-pt-PT.xpi 443381 SHA256 550605379e3224bc792a9d0c892dfa78253f075fb127779500d36ca17c6f393e SHA512 74300e6d7f18c643dab3aaeca526b91424ded241634f3db981a3203c90b89634d530d8009f9d16a0771cb8626d8dc1262f541ecbb87779b9b9e8c1723288cd72 WHIRLPOOL 0e81c2bdab588eba3fa886a9ceae0c5a6685037da307fd4cdfa0378d7934db7219d35a7f2dd2b6f1aea6e973755f3e3111722270323b7562a91ee6486dd6c6d0
-DIST firefox-41.0-rm.xpi 450638 SHA256 55d2765289fb4c58c9563136f2fcf56f15e955c42a3bf13252aefb3f6545cb28 SHA512 de4062f7ca583aeefec0bc5e0bcbb58d8d30eb61456e2b7efcb70d6ef3192cdea520597b666ebe9726e4ec9546c13e39ebe775271a45e333e58d77d439dc2f37 WHIRLPOOL 84fab748f16b6d71a99faad471424a6c7b5a09e284b86d62d7c96b2f50008adf350255f01ab024b0f7a9365e5d135c114348f021a10836e37c6c1f672360f3a3
-DIST firefox-41.0-ro.xpi 497506 SHA256 4bad82622089310900ce2bb8c51aa9706ead23e5db1f143f2f672ad203777d9f SHA512 4cf069ce082071db014c96e7ca83887be8b740a2d5e14bcfce6b27f8fe098f4a8afd512bee2834b22023e55abb84d0e7d6cda750d88fee4549258e00d415829e WHIRLPOOL 2d65faaa2e559d360455f2119470e5621790a0de7fbdb84553b99409e3ac41de5c467ec947ee118e39c4872d0550fa9cf7547dd8070496ef9cc7bb76c6123363
-DIST firefox-41.0-ru.xpi 412445 SHA256 ecc0253088e310b0c696a6d371f4ba8418c35b9a37af89e6ba6594b458ec289b SHA512 993ca37613ffdb41c0adfe8779abf26934e2e1ef8d4bab6ce4f1518ecf6fde4f1ce3888dd14696a784dfa9b86c09f9d55f7c831b82c8853c8eb7d10e25b6d472 WHIRLPOOL d82b46ca86f28e77375438de982472f618c1d3034ffd3628ef5ef944a8cacbba78fde88732176a404086bfa4bca5e01750ee6ec9c359625f1824c4b3170eaf8a
-DIST firefox-41.0-si.xpi 537933 SHA256 635a596421c06dd5d5b00906fefc46462ffc8124b5dda2bd409bdcf188921e70 SHA512 df3eee2c864cc4fda3f4356460fd6ccaf43733b0445b1bd94feff8477f12e420bdcd5d8bbf2f2ad2a0febc9911a94ccf510db5f22dd0101a3686c3b80aec0fae WHIRLPOOL 52e9a5841835682cafeff0473da9620cace542589c3a1dd120ae4536be130a345626b726ebff295c155533d8aefc36312a575ae0289781e40c122fd4668c4359
-DIST firefox-41.0-sk.xpi 472933 SHA256 c3936ccbc02c6ce91d2f8ad339489ddca1840e7f3d8b17bd22a7dc41a4e11992 SHA512 4902b822938e02e2083ca4d35db1295f7f721f88dbdbbc48e2ae7f16926d5b2000a90991c57d5d77773b1284136b35d106ba7d55e44c0fd3db185a2b40cc1e29 WHIRLPOOL e06f1f128ff8da0d5943fb424d501ddce97e8e47e90d030bca80123b595b402228d0bfb1b3808cb649895c8703f35f20b6752628e1b485b758db7f1decc04b30
-DIST firefox-41.0-sl.xpi 445744 SHA256 38cba1c04cf4f67d1dd5ff906cea46d85f7de0267f16abe6c3d4c907beccd2f9 SHA512 520399638ca7300056be08b639cc3e1b8eaa8e867ce7814274a3d3ec022775e1b52a11da0d36808eb5d831968d5d31c69805654ba7762479814b532a76143db8 WHIRLPOOL 9e2c0a2a7e7925bfb6554f5502fe1c90684cf91bf246df865b309873783473714b51700d3690ebb8623ff8f1e1be28c4d151863f964fc1e59c6dda9245162064
-DIST firefox-41.0-son.xpi 453251 SHA256 24ad972e0cf7101962340eca64fdc56851699f207c629d5ed33dfe425b6d14a7 SHA512 73a35345b7fd828f47da9d887b49fd1c2b84f85e18ba904107e04eb6c285c583f4f8d6f88b52887df5fe9ca75311737f050da0d3d4fbed7c251a9fd42b8f434b WHIRLPOOL 6e6fe9e04c9b110a216d05623ed2c8446147e027dc4fe9fd24544629901cfe8a22882a38a34a1e399ae958441dd5bf9b42363d5a9bfc14160bfc7486335577ec
-DIST firefox-41.0-sq.xpi 491167 SHA256 ca0bd383ad3c871e52e0006ec7489ef590edf72f4894ebea75edb6b52b567953 SHA512 d654bc636058388e1c535bc0fa3dfa223ba3979f0a7c86dec38829ad52ce22054b2113adbeaa0adbfbdf07c6952fff2bec619fa1f7e55102cf964ecbf704542c WHIRLPOOL 1e86939786d34923919613b1dc6fc3db81b712f2d98aaf970932311e22c7d6a050d4c7da24befb595ce3cd4c9a65e9f11d9627f1d0892bb702459422f6d7f829
-DIST firefox-41.0-sr.xpi 482969 SHA256 59be1f67f0de0daa1800f806ec5760e6df852b46a65c4d99ead16dab6d35bab7 SHA512 1e9efb27efcbccfa41152a51179c732446176b279916098ac84d0e954db4a08e247cbde1f544da012d0c76b4e471dceb395cdcf467e1b77a7bf405ed3479913c WHIRLPOOL 70913e6114d11b9134e920758579f17b1a11735d9cbacf829f62fbea7311eaaab6e28b8d1ee87095094f0df3b452577edb61a6dc0e88e5680c6da06b6daa3841
-DIST firefox-41.0-sv-SE.xpi 455381 SHA256 949e99a51e305e35e310b3bb6ce77f57ea9e67adc9609704b240dadeaffc4351 SHA512 fae329b95c99782011ab8425a4722d82e25fba0e63553e5d9aab825cf15347076d5009d7dfe71abebb08ce9fe085b6c4d1688c8438baf875b9d310f48a18ccb2 WHIRLPOOL aa6d9b3e8e18f51e9caeb9c1d2771d51c3c4106f80dc604308f844200d13f0b842081959961b7178f0f4f68a7ee06437604d85def878b9a0484f7a629e2862bd
-DIST firefox-41.0-ta.xpi 509543 SHA256 38b8529a311078571bb3d876576c788b9b299f5d167e2a6820919238c23de979 SHA512 8730793ab21010b7066af29930544068735a9a11970d80d02974d5285989f1da21d9a7691748c90f6e7f06e0509dd9343b7ae03fae91d0b8fefdad440fad5921 WHIRLPOOL 5dbe96f30157e1281206babb199ba152329a4a13b08542d7fbafdb216af97e609c875769c9a82db0e1a8d5d421693fa1c5aaedeb4a2ea3ef2ed8963b673d1802
-DIST firefox-41.0-te.xpi 530202 SHA256 658c162206d3545f59f2b1847e4635a80211cb76bdb9d040e53bcaf52a6fed48 SHA512 87e245dc6eb52ea4a8fec025393fc3690cf97f53db5063d00cc8bc309ec59fe746de39511cedecdcea64ceefc59d6627cdc7b974b25cd3fb935982cef0a686bb WHIRLPOOL fa0bc19f68dea83aaf84d93597179f6640047255a4c7557db4aceb028e05d3ecbee298e8cee0c908fbd30ad0ffd5c2b092cc12da3fbd3c40d5700e7f0690a9c2
-DIST firefox-41.0-th.xpi 539599 SHA256 3d6344bf7c129acd3f5527ffdad07c9388e5351966c7eeec919b23e9653bbb64 SHA512 672eba3e49b62bfbb8623eada2d46b96cc2a542ca96b7c5e52347ead0c2f06ffe74d74b9532b64ad05da0a6c98fe880b60416d4c26235483e2b36b05a7a84b40 WHIRLPOOL da7a435a9901b47cc6b5a1c987212cdc28f834858d7e34261726aa15b5912a885d22cdac2e1f12b20c4b68ac4e1d503a8b543740994e730b46a0f90a55fd55fc
-DIST firefox-41.0-tr.xpi 484231 SHA256 65e7b4601f9dc50dea179b0eaf3e6a41a4634d43c667e2d84eb0b85dd11e5302 SHA512 dc00f3c1faa9166bcacb1a5fae06fb5c9c1f1bed520715ed2ed726bedef77ff511e505ee84be78743210c9159ba4e53196069b098878dbe8bbb766cfe44eef5e WHIRLPOOL 4cec7be98d753dc919a4661b2d1080e1890df43fd006dde9e888a5f4ffcd938dff4100db4357d782d4b5ad2b706d678836e8c9c1e50be8eb9b5d394aa117075a
-DIST firefox-41.0-uk.xpi 500109 SHA256 b53435b077205b2c7455b139f4555251da3df4dbe072e9ce779b72a8d8c19d47 SHA512 e29283e547bbac4fa5bef0bef26bc9fd17cfeb8a9ffdc0ad4d936b7d4eee5bb72e5bb731faa35001be7606b1428d47806432a96e83ea292f6d4606211b455c71 WHIRLPOOL e8a819a06fda3c83a43595b7f932ceea9784605486b44062836b6c5181803c95860f462c0f3e06b652bcb8a4892ba9ce48bffc7d23a3000b8e183ec4eb26d9de
-DIST firefox-41.0-vi.xpi 470334 SHA256 ea794e879c90d30185f61f744490fd29b706334b4d9068b7e65002ca5a51909c SHA512 52d8d1f947e1a85c3f07b049fe4f1d0a93a46fa1736713bca80ef37cb983cfdfc5449ede9247742b35f1fd7b59bd1b65168f4975d6529878db563a8be361266c WHIRLPOOL 16f70be133af5ecb7de7321b05bb7d7f3a82b586f5f2354251e281a96e17ccb67ef987f670f512130c0913c8e5c0ac6164f8d8b529291f884741629f9d5c9e97
-DIST firefox-41.0-xh.xpi 450078 SHA256 8bc89179c1e2e298104dd50f383c93e30ae330978abdeaa1869fd2160aea58dd SHA512 1d7094869e88ed103c373c195ec30227a495357915bd72a117af96009013f5513101b3f0e29ec5044a7d5a001fe01fe5f791744975f2eb8c6acbc696fbd427a3 WHIRLPOOL 27bb7e58e76746bb6f133ce12f8b6d68aeb1d4dc618fc6daed7a9a903fde050c7563bff0760b5cab2763cf6d5d85fa84bc45913b2b2d5c589ed37636c4ccdac8
-DIST firefox-41.0-zh-CN.xpi 486220 SHA256 47fe8497bf214ab2275e5be325edba33c96c28a015f8d450f1be9b57710c8ab8 SHA512 2395908e7082e5f539f9a113b013ff923fa81c49bbc65168eecd50acbe53bd5dbfb3344a8d0d38b5e0cee2a2eb86c4296153a4d4f5db0ac9b73a55a0bca82b69 WHIRLPOOL 879a3a7910258b2e23ee69996f826194bda9719a37bb3dc3b830101c71874b7497135f61dc699f77b1193850929b762d557b643fade7214ff23a9fadb1f0ae29
-DIST firefox-41.0-zh-TW.xpi 479031 SHA256 c0163e959663dfcdb977f5fc87af13d4129b61a4b8d73889cd830f8f9d16ca29 SHA512 5eae24397cdbdff99f960c058d4f1483e31c5563a97bd1f648f55a00e5c780c0d0df59b45faf7e36271971a6a074a168b2b973cc0bdc02e8256208e352f50b39 WHIRLPOOL f8e0462e81ec6fb4db9f59ed75a382e09dc14db06af3fb15712ddca09e7ed3782248c9af716f193d840e2b23078507ae137f4bb584fbeaf29c5f6d121e7f00b0
-DIST firefox-41.0.source.tar.xz 159785356 SHA256 18abb95e93770ab1cc0794349125aacf073eb04fd8b8a93c7a58312c94bf16fd SHA512 d280bd3ee4d8e63e9f0585c4c23241945da4fdc1fb4dba853c116aa96671ca3626bef03f2f50b83cbdeb851c82c11bcefec7763b702cc5cc0e0a166dd7173379 WHIRLPOOL b52420265b99113d8de9dcf2b455ac633fea00a11d2d3d72fcb76adbd6363d6f8b920f540206c3d35ca721db05fe3e570917442c6e52918b5c77662dd9e034e9
+DIST firefox-41.0-patches-01.tar.xz 6328 SHA256 408f9a577d698b3713a112d04552e396ff2af7cb9756f87800efef7cc55dcdba SHA512 a9476a658731b5fdd51bb9855bf4292afc8cfb8e4475250b4fac75cb5166a1e9d384a8fd2ceb38d6f2044759bcb895f956c0cfcb361eb4a60d38481a93c546b0 WHIRLPOOL 9420e7757a0f45889dec228ce3d1fedd23ed6ff9cde1f3461ffef577ccd43bc6cdb5ce3a3200f067bfe9203111067467a91bd90c0861bf81d490b022baf087eb
+DIST firefox-41.0.1-af.xpi 486122 SHA256 97350ade6c4b818a13c884c2840c196825d246386f11cef04fa7d45eab6329f3 SHA512 11357e648f080a1c9b9f04dc3171adfcc0922aba8dfa631d1b9d3488425218c7c69e293f8692dcfa4d1db911777def9d11acf7a511b97d7da9380ccd56de4f2b WHIRLPOOL 26f49c422c4887f5cd4d4efbc671ab452972d9a49ccf952d95f30bf89370c783d033f96a735c9761167d398e3ad5db5e1055c5bd68dd0147ea1e45a33457d01b
+DIST firefox-41.0.1-ar.xpi 521161 SHA256 53d3aeb3303c1e0f73538a1af76617912c4faf78b5a463b9075c7fb9748bdf04 SHA512 ff099ecbf2778833fdad5b8990cfb148d1657143d665fb8914c53dc3c98379bb369af57726a7da5733bb0050f675eded31a5bca2bca2487bb5c6ff7206c18198 WHIRLPOOL 464874052f0fa19eab547f1c7c7b02f7496e4c9e26a2ba9d91c9f8610a525bbb90ae76919a0a4cc95e3f9b328c431399766f2de1ed5417ec7c9d509eff1da4ad
+DIST firefox-41.0.1-as.xpi 511220 SHA256 12319363d20ae2d4338ef2faefd196c1aa79354266aaa96d5969365b27cf83aa SHA512 6ab50bbdcd7073ec2ecb59a3b95f6c4e5b0606fa9abc60e140baf74e4e8f125d43563c8975418545553da573ac15514a2fbebdfb11af50508238e88076e14846 WHIRLPOOL aee288fe315af256f8cc24096bfd486a970636767d48be2c19580ab20026136da85658e5122bc4fbf97e273d7ebdfcb75fad9644ec71da2917d425d139413947
+DIST firefox-41.0.1-ast.xpi 399124 SHA256 df0b1298c2bd9f6d2957357a5600fca58a5f370fdd9fdb3bc34d4308fe3ef8c5 SHA512 c3989a871b3c6fbf08590260c5c7af4073644d16f9cd4c997e0f1bc26471dd9e0622c54cdae0ed9b9d1ab25333fec172b477814c3282e81a86b592404fd4f2ab WHIRLPOOL 5d96386d9050542551d7a316228fdc0789f0babc53263b3192e26bc1e6812ade738d17b43317e0cae80a3ca7e1f3424762eb0b61744fa4ac70f3b9508f4c42ac
+DIST firefox-41.0.1-be.xpi 453405 SHA256 bdf4c9737194edec2f44b810d9fc5059e9afff25993064edfca55f06d184df86 SHA512 698d890cad57a1d9001ecd5ec33d7286a3459aa510ce8671ec8d09bfbc44b0990ab021be23e9b57f8f1dfe0e856334eda7bb3ce15d21cb5e664086b7b4093511 WHIRLPOOL 052d83a88850583c2f3f886e83a8dc1bf32f71f3675c2cca5596497e5ca7b38033c9a6c81ea0e09eb096c2ae04e1db5326aa90e4f706069b1b8e4409120e6626
+DIST firefox-41.0.1-bg.xpi 492967 SHA256 b367bc4054df488173e914b3e872305f62ea9284ebf5b21828fa7f177c82883c SHA512 cf624a528fa6727a03ac453005d426319f1f0e40ea638149d611e43e4d31a8ef8a5be45f53502f5348866fe3a88f3ced8d9347302d90a6e2852158958df8859f WHIRLPOOL 98d6be18a84da6ae3b33322f2fd291c15866670fc39037b98954cc119875b43aea35da767bb66e2fc9515a1a475cb468a94e319eea865f8c7ed2b10d9eceb7dc
+DIST firefox-41.0.1-bn-BD.xpi 527572 SHA256 8ed5167d4e7fc2a50e4af4da10e1bcf09cc8fbd850fa7ac481fb1654c10be945 SHA512 7abc61d0f7f127678c3ed9ace810845d3449ae313804c0daafeb5b98fdb9bd2d0ff67b821f622642756e9185add03f17f2cdd2dd3eea11332f137f46ef5bd7ce WHIRLPOOL 86252140dbed9d2c18135e4fe6af0d80c268095ff5a82d43b47ef10e112426fa735008018ff817d0b0fdce7155fb9154a9f928cba8acec8124f93c35ed140629
+DIST firefox-41.0.1-bn-IN.xpi 530270 SHA256 1cfd6cea984e69066fea5817366dd64ac491e5f9438b161aae64b427bcd90ca9 SHA512 4e114a8e2319662144a8f080ccab756ef63cdf150d03a343fc530183b41e24e4d76531701c0fe0d8856c1f23b5c1d7ad9bdac4155b192b6e66eca123d06162b0 WHIRLPOOL 14d022a559b3ce0d824483b50fdc3aa851d4ca10546abb3b76c37123d6f62438589929e6a254ff26b94eae123ed7e18b346105aa742c001abb373efd1af6386f
+DIST firefox-41.0.1-br.xpi 444532 SHA256 f8e0b8d5f3c84a40df2661e7a6a2b6c3ae33016136a627454466020626b90a42 SHA512 b169df043f8770d0c9ef64298e4b2313e8c307d3420e64e5f09eee65689f2b8c3ea4b0ae5b078e86802108fc7d834ffe62d1048d80f256f6cab2e4930b49cf45 WHIRLPOOL 7320046b17a8317bbc4ce5e9df2e13a6a9f359216717da3cdeec7778de0eacda58429d84dca9a177ccf5aefdbbc358644bb21b7199a8130ae113f02228bc805f
+DIST firefox-41.0.1-bs.xpi 486282 SHA256 6e5cd1996bc7483cd9e5f2bb7e3064c4f5ebce3cec4425a95269894865cbe70b SHA512 233ec1885ac0c7eea1e1efaa0770217e5936e3b047fde0050a509d1d97ee9ed62c08b6f36f06248398b510b6a85a7e1f1474a54b4be6053728f865b7f524c09a WHIRLPOOL b1434db7d4d234ef461adbcbde702dcfe75b8cb1a3be572079d347f5cd7d38f43409d49a58cee7de005fcb58c8a659fab9eed413026ebce127b509a40ebb5d18
+DIST firefox-41.0.1-ca.xpi 461322 SHA256 8b70cac78f887946d5d50116844c5aa68c979bfc6f2739808d4710eb5694d1ad SHA512 4c8a67bbd8fc3a42b1b496a3b4969602a7774b8c1d56f9600f0129a4479e33cb37883f400d5130c2077c7a4ff3353fbc4fee6724046bfa972c960318a35525d9 WHIRLPOOL 3ab2f6007d173629f232368cf0eedd161a32587bb8006e77fca7ceea12d0399caa4ab0184141b39db6f100f20854e966b71e696ce76bddd09c0d6541d8a992f0
+DIST firefox-41.0.1-cs.xpi 450334 SHA256 514f7c3b1c5d4fdce48fea2e4510999bdc79e21093c665ae8290c0eef00b4539 SHA512 4fcc41f8200ce7560fccd5610a0d10ac445ec4000d428aa78547db08ea8f7c6193f3703d59ddf11d0c49eb41f351a65de2fd57db3c9f0b444e808fbb357bd094 WHIRLPOOL e6ed4b8626201f97f796a1b428650440bb8a140bdb99c5260c8c2ebfa6def2c30df3e263ca4c8e80038d34960fc013aac5d45d4406a930cc4384b5347579730a
+DIST firefox-41.0.1-cy.xpi 448184 SHA256 b9c010802272a374282400216a37690cef3488ab6cd78778241a1039ce9b15a5 SHA512 d68fcf8b86d2629ad9f331e02c2a0de50fffabc651c05ae66cad2db155dac7f3e71099bb0941bd8dca3bc33098d243a1e235b6a4430cd47ec29081e4e5a6d2f4 WHIRLPOOL f19c272d30ee1320bcd0fbdaa36e65f5d26cc8a75471e939e047063faa6ef935f4a4378cc4121f55959e0c9f9e20d69b958d9dcab5aecf6ca988bfdf2dcbd9da
+DIST firefox-41.0.1-da.xpi 453405 SHA256 1aed18769fbd440e811d2893fdbcf48b3f82ada7c2accc2777b4c8128f0e6678 SHA512 88f7cb1f05ecc3a278aaaf7816cfbcfaf514ba29661d2e006e05c6958fdaeb7cf2093d8dc67b607be4396f2fc51f20d3f5f4a7644d055e5eba02a77a7f48931b WHIRLPOOL 3515d4a6f3d00cec65e748988a6b95ab49a7b56cb5dc889e63fc87efcd2a1564aea26eea160ee94e26537377f661ee7e9b7f076cba099ba14b0eaef42e1258c3
+DIST firefox-41.0.1-de.xpi 455711 SHA256 cfd357e6a681f84f7a42db2097f7df5bb8d99cbc72bc6b5d5e7f7af731b26c34 SHA512 56d3f46b1e43dd2eff3a27b7edbccaa28a6d197d0e671e2c0c7fb513feaf2df6bd2e8bb4f42731fa87bd7d09e4731dac79bb8a13450364584202bbff859b3d38 WHIRLPOOL dabf69b91eacfbef4bc6454b6a89f55e100d5f1c3b5500451d02acd25b69edf71d7aaeddf038cfc1ce86de8478fb4652dc1d961f3e08388ad930c90aa69b63fc
+DIST firefox-41.0.1-el.xpi 501621 SHA256 84e9c334fb97228e153801abebb364b140c8d83b5c0c74821a469d41cf1d2f63 SHA512 034a352845db91f6acc2ea2a85ba3feb154aabe7b2ee5db41a3e4671e909fb3f65b51fc033ff405b06f607aa7fd8f30b3308f4886b31746b9ef8c6c47bb9be10 WHIRLPOOL 57d8700f7b46374381b38b120ff43ff3abc365a9e4e938f7c61bc0c7eae115aad68d5eb2e9f1e248311c312561f748fb97098dbba26187c8a57cc0420a507073
+DIST firefox-41.0.1-en-GB.xpi 441100 SHA256 cf29e810731e19fcffb1175f45dc2ade21cfc0fdcd96dc5176b83dccbc685767 SHA512 06526e9bf229f07fc0740ad88be7094aaf20ce5da1ca050f80a8e069560927f82c5ad66ffd7b99f4996439c4c6d1e3fcbddf1b0050b496330898b35a1f0c2313 WHIRLPOOL cf0ed5fcfce3eff1590d03f53fed3521e382ecd6f1ac12f7fc902f8f00b534b8707cb3e364bf500298d2df4d4b5615fefb4fbfad76a34e238aa3332788f9c02b
+DIST firefox-41.0.1-en-ZA.xpi 444146 SHA256 968c4df0bde7ffb93247b0dfb301efe60027cd75e1ed55a07471776615122572 SHA512 33c794b41934630b0e75e024396d73918a258fcacc1cb19d1f667c5d586d3cbf0aeaf8b03b93a8ac9311b6e12a37747d9a1aa7df8bd9da494527c41b59dda99b WHIRLPOOL dd97a0e569330411c487ee12ea195bb7b91aa4895858bbca4d814888026edca12902c1643a747b61f3ed74336f3997cc2bc8809fdfddadceb20250a04da0590a
+DIST firefox-41.0.1-eo.xpi 487996 SHA256 b132eb82edc724df6a52169e443f1e625c615fabbc2de144f58cd11d597908e5 SHA512 bd587376330dfc6be88a15da00ca105c3ca0aa6dcb51c1ed75f9e5e2d75a4265be0a3f40a2e76acc7bafd4df085fbf7fdd769253f61188cd95ebbc4e64ac3258 WHIRLPOOL 96f3281c5b56c7d92329b3c90d46e2af05310d8afe9988e97615408d9dcf69a79193ad075be92c5cd6a68201a964025742d8dce0fb761d945940e334b92282ec
+DIST firefox-41.0.1-es-AR.xpi 456519 SHA256 9652be3eae31056f27e3b6fdcecedded4b0a095721c2fb762f6d1c6c4c50e57c SHA512 82a91c33ca4b73c98e3c78c025c529e832cc8d13b89ae6bede95af874598239e04be9cd65dd5c133ed2b83e6a81a7961581f0ef0f2c3fad0c781ce42859d1807 WHIRLPOOL 9ff76ca69c76086d7d2b469c334908df51b410c12e06c6bbb89051b2f304cfa334a65136206893a5dd14a40f7067360f1e081773bd8ae57a22559b3f94392ec9
+DIST firefox-41.0.1-es-CL.xpi 381634 SHA256 0efc3546792328ab46d5772b10a02c43430be0ffed4e64a4cccd563ccfc84b12 SHA512 6ecc80d07a788bedacce8a2cb23779a900d0d9b703f6b4290cd29960554dd770b3c03f50881ec014d6604dfc56eeb8822fca619d1146c6a48d8d7ccc7ef45366 WHIRLPOOL 54b16167c5ef6e0b6f8faf6d2d4077a267bf8157bf14791b22a4d2649a65a01e21f16f898836db89dab08c11afcc78782644e4686bbb0394f0ea9341db8ca563
+DIST firefox-41.0.1-es-ES.xpi 370112 SHA256 a6542c99b51a1661d1ffaa51e48c3d60b97ef2881bbff2fbeefca581fa5f5046 SHA512 7e0c3bf26563b18d266c7a32567a11b06f4d6709938284c75669a4792c527d66b26885741d819efb566737c5999587091fa41fd6e99c9db3ba7f99945ae7aa7c WHIRLPOOL 10b427ef192cb006148cb203592fcbc9800a85ce9d1c9a0f505dba17ce46e4ba6bb4dbb785c7b35ccfbe53b4375374e3c072bfc0ec8541795cd140ab95a32929
+DIST firefox-41.0.1-es-MX.xpi 460285 SHA256 ace4555517392aedd9a03b20a4f2caa2efc426e2042c91e83b83290cc5f3ac9b SHA512 04259ad63d20bafa6c82ba7b3e16c6aa0d893a7d01c597b5f6b37e0dd55e9bcc5557e78f50b28f266fca7a154834e7e8bfc4f2a076964501bf8f516956d3a54c WHIRLPOOL aa3679e5d4c0edb6bf66ed5e40ef2d0dc15f48d18076965a11c75e11bf9f9034aaae96626ddb5a3763536b102088815837c6cc1e540102d04ab79b421ae86e5f
+DIST firefox-41.0.1-et.xpi 445440 SHA256 c90315bd392a6300942d399ca3faa19fe93e18718661e6f6e088eb671c481ecd SHA512 86f5c813d4ca220a65b61a30165146390a5915f3bd252cc006392432917623313964f9fff378d04ca171b4dffdf7ad2df2c3e2c7cf99338676cc8694967b2d99 WHIRLPOOL 01651ba6524803839a177af6625268e4b20563ac3d4c6ce82a99c9cc243b412075228bf6c999f9132449418a172ca60cb6d2bf90b1f7d464bd54bc04badcc25a
+DIST firefox-41.0.1-eu.xpi 469718 SHA256 810e08f3fcac50e287fe4fdefeca3c76407b25b1147c08a850ac830f7b3c2027 SHA512 b4fcc753e2f4b408cfe788a744f05c75b21c24ba25e3cb3bb031a4c9bc70d1ff5ce494a26faf6eb94c71d63f8e793a1011dff93ee5155f1ada86f282f6006ae7 WHIRLPOOL 38f032d3ab975357ee90a7e897d409ae52e8c4b796081fabd697e95b8904d36876888f59e5a069cf371de993ed01dfe5c01d8dbb54c11841e34b8d456576de9c
+DIST firefox-41.0.1-fa.xpi 516159 SHA256 ebfd410f2ad1d12ff076ece62c665a7c25b97db8aa2fde3c16c0ac8964ad032e SHA512 6962e09f8e77f6b2a4d6197dbbfd0db02960c4f5a66df490bae4a9c775c4367db4ab1d75006fee5aa0cd56109897050a58fccfa22674f98ba55706e6865d7671 WHIRLPOOL a7b614fd1c0e21e30fdf5d790278fa0461d81779efae18f3cf9e420e5113148582a4896e06331cfda0901554ea50233a5371482099b0d766f170ced9e4ff7928
+DIST firefox-41.0.1-fi.xpi 447176 SHA256 3384c59af108f186f6787291726216fdeabbba9837707139744f4a2336bb7b9c SHA512 e7583a9ea4d62c85fae3022a66e09d9c7d6c97f9602ed4ed961918b611c7fa5d90fbeb56bfdc931266ff0f0685d09ee48848922e4d74c1fc3187c7a9e12a35b5 WHIRLPOOL b17ab200b5431cc665b9ee4d3a06cba5aafe0ddc66c4a5b484bb8bb79474dc9e88d49a74178c3e4c95f9a06bdacfa70bf1ee8fed315029d8740a7204811c28be
+DIST firefox-41.0.1-fr.xpi 465093 SHA256 418a9119af70f689eba32e8a45bae02b2c27bd37cc439f58293d9d5e5bdfdfaa SHA512 b812853fe7e7a0d79feebe566c57fb7c2f6cc11556410b783c584efebefa12758ee892a794f1a268bc2a0cbf02c40095a42cb3b0ed936506b2cc7f38c2f6611e WHIRLPOOL 8053721de33654fcc5d2dd8995339a7d16055d7dc5e598bbc06fa17b735f96aaacc9a957befca49dcbdbeda56a2448c1512ccbabe3266a13ee7b6d83ae6769b7
+DIST firefox-41.0.1-fy-NL.xpi 458776 SHA256 65622f493c782108b259e384c6af1d5bfd17701f0f350c35c4de465cd617951d SHA512 092544e8ccf4ef28d4999e47b03824c6df291b9d91de3f908f1533abb1d1146bd281388d1082cab64855256194bd4aeb092b91284db5940e41a20dd17de91cf6 WHIRLPOOL 990bba15eae60aa263de9b7162816e9a039cca7390aba2dbdb86c2be5c124aee5e2b608e734b62b9035feadb2b24f0825952992fd6ea05707f89f139c7b7adbf
+DIST firefox-41.0.1-ga-IE.xpi 473257 SHA256 de10c4a3136b24412a926c72836eabf982b51158f2257f1703d06782ff4a2acd SHA512 41fadf56b3272df3042f37f2f59206fd0d706266c63f5cddfb17396aaf8e09fbdeb5659f1f7a3a181407a41560c56297ff22f77b5074ee5996a1a212bc8abd8b WHIRLPOOL a2f969930f35133d26576a20450a3e2b68095cdd1352c53142e2ea6302b830c647b6a92c115e1362f5347d1fd701eb4cef0bc54de352de2cb21c0081f72ea134
+DIST firefox-41.0.1-gd.xpi 457500 SHA256 bd5bb07fdaf9dc081d4135590862f929f88166e25cb29692627a6aad07c8dcaf SHA512 f8b32da1129920a12fb2676548a9b5ea24ba619af678e244e326bdc11e585478e73567250b75f0b5d54dde07eb3c04fb7ec8e7e1a8e0649f911f3e3499ee52a2 WHIRLPOOL a1a90f0b5c20871ca171ce8e6e053572c0b79f2ce5a27f87c18a0ee44f9da2527030a91fbed7a5ba755d69e654934315711c35666e4c483c933121a6bd4e2612
+DIST firefox-41.0.1-gl.xpi 452612 SHA256 54ca7876a1ce3c9add20e1f0434da6e130c69ac6009e6704d1df18fd644f0e9e SHA512 f108d0b2cf8eab8e36640e21380a887deccbfd9bfd935c1e84559430ac5b0b432615a6ee93c3826430dc7ce21bef3ab1c6f3b7bdd6075a7ba508820a505357d1 WHIRLPOOL 357c5227d80dbddb7286c393c56d02a88b0bcfd1c662b4dfcc65e97edf812fe0fb08767180bd0d5ff3b1a74f191bf168704cebb91cc59c938c70f1d6ad4095b8
+DIST firefox-41.0.1-gu-IN.xpi 487516 SHA256 e055bba4858a257f7562b32ed3eb316d42b5afca98f92cd3b5f42b336db3482b SHA512 261ef5555df2c8da8d0bbc345e6b704576e8278fb2537547be0eae8b3659fd67751fbae01b3163252d470d2ebc89a9d77873c68eb49f6b93929152c2ad9787cd WHIRLPOOL 92fa956d41bc53eddac0d1162c4803065e4527f6defed6ea442cd90482d5c51dc8e40e9b3eb4f4b0677ff267a33c15dbd2c5134ca4bb6db8abaf58ed33d00ea2
+DIST firefox-41.0.1-he.xpi 486490 SHA256 fc4ec10279c6cd322e31cb43904667247c3b69aa7a1cc9f9354da307a06cf1c4 SHA512 610599bc66f04f3bc43217590741bfd1d785e0beafd8cfdea1a4abcd4829b650893c5d4bfe5b3c387fa0c09fb5d8d5a8b598092651ac719521a32719e28454ea WHIRLPOOL 36676ae697567104774eac136790f9577a3f72f2270ef743a96d8310c0e96643bb512de1a07994d8a0d374714777cc51908e3232936de3665dfe4e23f918b805
+DIST firefox-41.0.1-hi-IN.xpi 509163 SHA256 45a4656849c4367a545c6e1aedbcaee9a2e2d7312a64c6e7f56f95615f50ff0e SHA512 03a4ee95d2d1a9060c212d58ca94508ff14a1f46d5bca5c6acdf0463b3bdb3f8d34a0432fa2b1e100cd258e85ccec1d44082fe4664ee37ccda38ac941e65408d WHIRLPOOL a0c8c06e9f3911186c9bffd069b51199d3c36240d532fec59a0536bfd7d35e3334b5f3cb6c7d8f5c2f6f35241d5525c7b29b8f7497550ba09a8f8f6a2bd2ef11
+DIST firefox-41.0.1-hr.xpi 481336 SHA256 81e5cf9a8c318fdd46570284a324ec8f52dc172f0b2d583478375af27c497ecb SHA512 7b1afb4483af4c678a9be7b60c32c4f2ceb5c1c7b767fa8da90c5955db4314d8c86bd7bcc79944f439818f3614cf6ebf11e4e435c91fb676ead4eef329659069 WHIRLPOOL d874fb4f3ec21130f6245db06468189799d5d6331c42d0810b85f83eb4c77574af76a4d9f3ef7f37ad0b9bb9c5d52e589e02df1a28858e8109ad226dcd92bd4e
+DIST firefox-41.0.1-hu.xpi 457035 SHA256 1b088745a37f2c29e384cb370c6fec7eb2dbdb4ec9698d2a7908daaedabf961a SHA512 bea3ef784d7c0efd52deb986f1bd037b02b7106a083abc377dafa18ae5e85a819b0d1420a4aadc5452ff5764c87fa46f8136bda5af97add3ebb595af36fbbe47 WHIRLPOOL 15b866153e2ff7c6a16f6bb7c8e6f4bb3d1fb328b80e7a5619822d6dce991a78a7995291d56c41b5532eb643dd0014ac2be26b3ca34d5cfd67ab2e1d8d9497f2
+DIST firefox-41.0.1-hy-AM.xpi 538341 SHA256 cc6ca6d9035244c85fcc6cfb6c9df05b4b93614ddd7d015688c83d70cf686686 SHA512 522406730390c88c4e770ed76ead91c3370ca877b48edc1a7a27232e9523f8c11251bde2df3eca044dc3b5a9b9aad67200c0052c1dc90e90916cc3771535dcc9 WHIRLPOOL 147faadd1c2510156d8205db09722259079e959f549da57d7068300d2b6416e5b22f6cf9a2003113164a4c3468788bc48849c53441ad367a80f86f3d37ef9917
+DIST firefox-41.0.1-id.xpi 433972 SHA256 fe3dfe15e08da87a913c6483689870b5a7e64393b792e8bca9daf0692193682f SHA512 d80889c905cd7c260e357c3aecceae4850d9f8c6e245abd55be9292f68620a5a4514d91fbc900e0896735e32f0227456c3ccbd1d1778955ec717b9c694aac756 WHIRLPOOL c3172071211e77cfc00b2f41dd5495df6e372b8c8ef8f3082f1a45ed5122159981ec1ca70db7977fe12fd8eb02a2945c54ed94f811fbb731ccec19f294aabdd2
+DIST firefox-41.0.1-is.xpi 488113 SHA256 7ca5c3d7506328b7e2cc92b2f631c97bcac87869f983318cf5b1f99384424e6d SHA512 f1d094a506cececc6e6384f66b098d3ed3fb2c7896bce3cd24ef5ee5e1a4859c36a14eb47116834e570dcbf1e63bb7da7069b7b37d1ab0abcbcea9b12d02d6b7 WHIRLPOOL 1c3f2db4e92b9a8e8c13f2b97ae27146778aa87e5e44ee640b0ee22e5c7933cee19b034e3bf773b102a3591fe6f939d36b904a83cd2c77327c8333a1c6a51519
+DIST firefox-41.0.1-it.xpi 363986 SHA256 5755fe268cb7f79120abb5c49143b6f00e4830b4adb296bcaf797feca9cb158a SHA512 869cbbeb144f5e1856cfe31ea79b726395fb743856a3e6ca6241ead5f64c2f0f2b5be996217f8e412b0333647cb564a96cb5cb3663bdce967f72ea3d980e75b0 WHIRLPOOL 1449dd76dd956e5c0b7d05315c4a92953c61f081f19a52235d11203afdd299370e6928ea2ba086b74349e1840eab5ea02a9ae240787f5b65dd35eab003a196e2
+DIST firefox-41.0.1-ja.xpi 483304 SHA256 33fef07433a939b9d53ab18638c31676df709538c747ff72fd889c4fc940c61a SHA512 b04163cc4426adfe56714fce2e0ddb40a42d6f671a0f51340b255b2f9a932891b0e5fac89f39888c2b3cdf7b36286a31cb4c2ea4a583dd64dd54f603a1f989dc WHIRLPOOL 8894737478a61852e306741ae78805fbcce084ed32fb21618e3f347d9ef7257aea72d8250f124e199987c7f3d44b864a26c200581f34b0e7df719d739984c66b
+DIST firefox-41.0.1-kk.xpi 508365 SHA256 64fbfa53fed92d8e456b1bfbb2eee8116596de671521ffa623b8997711860d0f SHA512 5c3bed894f7a8e34bea9d0a348ce46fab62abbaa9eec7300b3b6dd1bdf264dff21d8b298e9155e747ef2a8edc2e4a96ef40bc8813935f18c558cafc00f7c2218 WHIRLPOOL 386a0eef2f9c6350fcee270dcf46a9ad046c5e1a46ba9358ba8b0f804f25539f81e24d90e90f7bd0c450431bc0e5ac2eb3b20ccb603d4a8e7b330d68cd1417d9
+DIST firefox-41.0.1-km.xpi 571709 SHA256 4fc735b224cdea455ed105e0d776c0e607503c7f64c1657ef894d943f4ef917a SHA512 62969b0d978734260c43736971f39ab292cc696c160bb4cc4b23c571da0962ae0a2959aa9851045d6cb0f2a41b5dcefd71faaeca6e7c2ed5e8cbb5bc8f34cd4f WHIRLPOOL 9686a3a39a3103269a7c2256c46b76180550dc9c8d75d0f3e95ee17548ec0d9f4b8c0e7eb24e8d11cc5b9e266f4a0d840e5c841289b826234492a88fcdac6600
+DIST firefox-41.0.1-kn.xpi 539239 SHA256 a6399f7890d658b6f808cbbb65ba7f3ee3f746bb3b30410a79cf9623936a35b9 SHA512 1934e327ae43e1f4b99bd61befcb238f2ecda9c4a198fe51eba31c102d3d1989a668c578c2c44d20cc1f783b1c94845403b97e3dd38559cf41ceb842fe843eec WHIRLPOOL 9c66321bb07d7c5a15300f2f0a807c77eafa2d8c8ef03444ae27dd57b1c98f76445f9be4183dc8658d11c0709ec273b5e9b51517eb908daed4f4063ad270947b
+DIST firefox-41.0.1-ko.xpi 464905 SHA256 0a32fd625b1d6254b7cc11839ddda1d354d65188cf79e4a695a9f72ed71d77a7 SHA512 73b5e74c2c9103daa46685262f421291a094154b5a073a3cd2e70d12fed641e10c0982b57267f69c867e697a64edb77e74e6cae48b6ebfdd2d6f16596f8cf4aa WHIRLPOOL 4a57a729544a49f97c0357204ad0761422b5b10c1eafe305d838c18b04e4372c2a3572178e12ed792182cfac609616dcf999b9741ced3d7a47f977a0b24b57d3
+DIST firefox-41.0.1-lt.xpi 490119 SHA256 a9255f0f3ee96e5a0779a72b68b5c55fd3de773803ef0a5ad3a78ed2461733b7 SHA512 0215b43cf71d069fd7b0dafe970f79ffda909527bee5eda79909165bb52ec5063c5cd43493c32a3419ce5c4287d832d315635457b4c7a2e6790674e683ce403b WHIRLPOOL 8217f6e19f4b418866f1ad7853253e587e7fcf488012b538ccd959a9d9e83b9d6e87572ed37ad0d18ea2619c4cf7eb2695fb5b3e90e5f743db12fdb2bd8f60fa
+DIST firefox-41.0.1-lv.xpi 470365 SHA256 57ab2c15cd4b40aa551ea1d7574108f16742fec42d7bb2022f096fddfe130f95 SHA512 7e8c85f3bd4dddc2b0882cfd2a06441f221cf7918363827dd793c1f82f75fce0c2493998537799df94ad9cb343ce6eb6031ca4266f95c498363d736aaeb4ae3f WHIRLPOOL a3ac1c37715002297b4a094cb1197d6f31b97449725af39068ff01ee3b84a0d5fbe52fd259fafd09709a006f3797379ea890555824705c478733eb08a2756c28
+DIST firefox-41.0.1-mai.xpi 517161 SHA256 1fb55aaeee4a2a9b46f375940383c59c827aae1ffab508276c4b90969f695ccd SHA512 f814113da490c3ae8116ca99f488172a8cafda0181bd52a0cdfe917140b60533a443455bad7f013b67b742df5be4329811e8af400d1342f4e759731ff5c83ccd WHIRLPOOL 15847223b34c900ef19be4ccab0753d351faef99ee202e4cf4e7e7e985d3b64a97ae4ac313eda419057ad2dcc4c34cb49de62d2cd326a30d43b45c5da213df95
+DIST firefox-41.0.1-mk.xpi 530866 SHA256 39113b209f9e17825d87253dcb77101fc4e4d18f67ba5b0efc32077894a64c29 SHA512 212adbe4575012a5b470f655ad4dc2262a655337bf733182a440dd0b7dc4c8e0112ce9eb94c4db92431db2d2bb4ea07f41e98fd601367aaa1bf84a99e10e6f61 WHIRLPOOL eaa1f04a580670c266aeae09ae2a6ba014ef0b4d4dbdf75f329ea48bdd7796c33555425572e37ce0dead12e5137991bd1070917bab1218ea09e07545c1cfd322
+DIST firefox-41.0.1-ml.xpi 529032 SHA256 d52d8c7d614a0454ffe10c040b2a939ba428dee68d20d87005a50e9d7e67923b SHA512 f7285a684ae7eaa01a2f31604ad8a60e90cd71f083f62ac034e5e417ecf1b4d862124ee48afabe005646b9e25cde723578bc7c271dbe569be0eac4a32afe4c2f WHIRLPOOL 81b412173dfd6ada2eb4724299b1b6c48ed818f2d8034ffae5ae9e4c25dbc7217edfc153238644f52dc852ea21f945b9059514ecaa92abcbf1f72212c38bdff2
+DIST firefox-41.0.1-mr.xpi 511325 SHA256 61fafdbfa825d695d6c5d38512c4ebf1559f7b39ad71de2351ea0584de965125 SHA512 98622a1c2c2ee8b993895e8022a5d140a4d51aeec7b0af9e5ca57a3f968e13b45787210dcd65164de1b032b4210d695f6420563f48c540f1dcb7d4a5d25628f3 WHIRLPOOL 4dc77d38dafb6e6b754130171548d33a1bf11c56311e52c9d605be6d4e47c3622b2e5dbdef95a0b25d3905bdb3a41ac29da7118d0110de8f35f1822bd2ab2263
+DIST firefox-41.0.1-nb-NO.xpi 446372 SHA256 09c2e095dc6ee63dfbae0122c47d28e39b2764c398bb08d432253c1d123cb43e SHA512 f2038f1c786d4e0751a1f5cee1147dedc882a168ca0a7c0e387a573c3a21bef695ace1905d91b279e82e39ce624b89cee723ab28f26761b1aaf634005d1c0032 WHIRLPOOL 623f7a89b88ade29885902f92c483cd457fb489b2df09231b9baac04a4ec4adb3799cc0865e49a108509a584f6c26a9d212d04dd182fa428db78b7e48b45b60c
+DIST firefox-41.0.1-nl.xpi 446548 SHA256 8c0a359d85490b71af556e095592c466896b7d4cc80ad59c21a5bff67737c24b SHA512 1d50484df9920c2a10c72ff59ea9a30a0fc891da11c67bfbe5e92515493b8743379ed8b2481d65e7aa799636e0a201e3f3797f7bea2f19265aa3f8e2896b4e15 WHIRLPOOL 8c47616f306ee672147ed37367acc90465ef50747b388fb29a5f478ee92112ac447cd812b877c634aa8d5cb3fa65bbfb7bd68380986e76032132fef793337e5a
+DIST firefox-41.0.1-nn-NO.xpi 442563 SHA256 cd1ea65e70986de0bf36ca8ce68c822def20bf67c1aab1086902fd5a3193f76a SHA512 5561db96ad40d9a858aa40a7a6e16137faba3528348be89b0fe43a0a217577378474e2a515ccb9ee0d745133e57bbcb82bca0e41f9b94050cd6811ed518d4fb0 WHIRLPOOL 856a1ece57fe581ed5ae8a463169d0fc6ac6ffb6723963a7e918ef92c1ab280a04716d3e24d1b52602cbafbc7e890b6ebfd9efaf54d4fb8f6d5b9281416ecc66
+DIST firefox-41.0.1-or.xpi 528106 SHA256 274c5f764c47d357104acb27baf52546307ebefb649e0b99731863a91094ad47 SHA512 16b5d39a57b64500af4555ac4e87dd2eafd04272f5a7b5dbbb9ea3e2aaf55d40742122510bd54e6c925bd52c17b097b806d42b41ce1b9463d416b8a5c9b4e41e WHIRLPOOL 3b68943aa100bc85f1b855b8d0e3ebde870cae934a933b3b4b87d261464d7a69abb267cac5a72c276095e2c3fb9d774f34219974c59978da4e0f2a8ffa3e8f88
+DIST firefox-41.0.1-pa-IN.xpi 498583 SHA256 7ae13e9687eb86499a624d72f71cc37e43a2346517be4b0f7319270495906fc4 SHA512 316b4b51329e19becbf3e7f1c0dd12a4a022fc58962ea1ba9073342fd485eb72d47ca24ce83dfeb815aa2a2c9b5f00ad332d2ec02ac2745bba198c380a4d8b99 WHIRLPOOL 0d790329962177100d229f31acef40660c2779bf9c7889a4757bd1abe00c2e11ccd2ec4d52d08414c4408bc7ecdee1089775da0c6a4e9a02a846c7212a2a9fe2
+DIST firefox-41.0.1-pl.xpi 400466 SHA256 fad85972b99e17b959cdc0f79786f6900b9719e9c8bf503e746e53313d72ef8a SHA512 9e2050c61ce1138631646ae318b5426f525bc93946710d02dec6876ee3222aa15d604d636b6990da52571058454fa0db971f04ce75761987b700b42e8f24a1ca WHIRLPOOL 4ed8336fbb6dadd4e945bffd655b6b932ad58fcf9aaa86b2a67363595e34c45b57f7e6be4b140a596ac295e66228eb32846c784de694631df9ddd7eb5ecee51d
+DIST firefox-41.0.1-pt-BR.xpi 463059 SHA256 ad65a013ef7044cc7946f31b6d4c81b287250c59165317107b591b9add998c8c SHA512 a35bd63b1d4632806f7a430f5977ef4a24d595ce77ab8850f1a1b28e58d07b33f3dda336e9f3e40e80a11c5d35c6bee10ec92f8698949d0394bb0b1282cede4c WHIRLPOOL b98b092d6fdee8dd7bc406d701966fb42b6b3832d7f6fe8a52fa79abffad7d302852cc7255134075e7254ab14eb587be935af69f993d6c7355b0eb347c6a3502
+DIST firefox-41.0.1-pt-PT.xpi 443383 SHA256 f30c6297d6446087a6d1466b15e9f21ffbab89508ab0b4bdde3bf22f779fcd6f SHA512 bf0e898100d2f577b3600f01d2d1756497f73633388ddf3ae00b57171e53131f9496a556a89bf2650be41bc0e73a43a3d7034a5798604b91ed4b9674bb5391b3 WHIRLPOOL 29e976fcee01c7bf56ea2573cc57af707f3c96cfb6338661356dd35f1760e97d4d97ef8e885c40464980936534fba66e9fc36966c9a2c6cc25033c710d312a69
+DIST firefox-41.0.1-rm.xpi 450640 SHA256 8dcc565897afa57fb7c4e53aa3eff9abd4522a11be5ad4924a9dbe2e83bf7b42 SHA512 54a9c6fe5173a03041a1b3d67bc27fd7ef5b6f925a011a0540bf1fb11a979507783f367ac395f9eeebcc6c233f0cf48bca661d84650f761124101c6b69052709 WHIRLPOOL 94ea4f8ddb72678e34ccb261d0a17ee4912cda3e62b8bc09225e481b2573880bbb86e0b98813467b8fb45cd3cc89f5c1380cc7634654948ba0d789688e730d3b
+DIST firefox-41.0.1-ro.xpi 497507 SHA256 0bbb369d396282e79b111398733174a84bc6c92268bbf3e040d0c8a363e05a50 SHA512 f0984e7e2abb52c039d5ce07c22ff9c7a7c908f23dd799de06b46d04bf1b38dc17ef5309e37b4de21eb9534e43f45ccbbb1906919e5e9feed8578cb1ef8966d6 WHIRLPOOL 4f68127b69c2a901b50ce28e1fbfac39128f621b281a2b5fc97a921e9d6319bd2eff8ab93cf2d7c79f9144ed02da0a3c7d133089e401ff333cc1a78db9ce5d58
+DIST firefox-41.0.1-ru.xpi 412447 SHA256 824111f820b81de57bbdbde11ea18bc590c1b35b6a90c857129eacd9fc12226a SHA512 67d4c2b039f7f4a618473f1213d889083a0f07c08fd0f900925e255589a4593227c4b0a9382d8c22595fad4aa5b2ed0f1e3f46d582931a825f06b04706623667 WHIRLPOOL b84dd312855ae39a343e1b8d8ec7cec550d27e8bff9e270da505fcab820a226c96df99bcdb3c6d17265f8af504dc84e19088c5f60b737d566d363e8723865e75
+DIST firefox-41.0.1-si.xpi 537934 SHA256 1c133f62d128f647b361cbb9e717009855908893b5bc6da869812a7e2cf48a79 SHA512 b8dc930643becd16cf29f13b1f0f9e5fa97eb9b75739aba2529b1b8d70974ca90d13abea515b0391f466dd354ea0f16e72ce35d3003eff08c2b5ea8678b91770 WHIRLPOOL 23bf5f9fa6947fb98e42d1d64c55be07ac47b70eacbce573829bc08112b50931ef9127aeefc25e11297263f52799e90324d996969754d5ceaf13bc366d2b42ed
+DIST firefox-41.0.1-sk.xpi 472935 SHA256 05108f1c11115fba1c4271103b9466ae8cf357516c42f4a273f8b3b9de087063 SHA512 45bd6f53ae9ce41cc106e365ff3503791727c774bcf66648a4e5aa29ee83581d2db498b55778e8eb5e9cc3da88e03a414f91104dd2d9e50c8e6251868e9df6ac WHIRLPOOL 52b918a6cc4c6956dac7a7a8a441a5bccd6d3bc60171f6bc7319c71f543e6b98d4465f429fc74581da8d6dc30c3c76cb9ca067ead2be14be5a5a27695ac92490
+DIST firefox-41.0.1-sl.xpi 445746 SHA256 3ce7b9d2517dadd947f1849d58edeacea42a8c7a68ec1ef86f06e7111006c0c3 SHA512 9dd2b3647f4c5fcaef37bdd68bc8f0ebdec878852dffdcbeb50c5922897930ce5d779a4a7f4c1bb3591798cc8ee42cefd3828f307c499c8ab91e594eeaba19d2 WHIRLPOOL 7c4eb60843373e1c9f3c7476e8728771044af6a06a3feefc25bf70177883f5d2b42e5d2dd89b824e3927c3b7a9897007f5f8c6bc3e0ed15f453b4757258a521d
+DIST firefox-41.0.1-son.xpi 453253 SHA256 66daa25c3f9e448ff9b9906fd5ff17393d8aa31ae68109a35d376a2c28e31b6c SHA512 e4642c9f559fa514409a607a7b49535ea86492f84718cf18e6cc5e42e30024541b26f9aa30795ce9be2baa36ac4a6a083aa2f102713898c6b9839f733393dbb3 WHIRLPOOL fa27e970c92ae3b53e62cde975e5257b2ec1415743367115e0187721c9141895f285cf824702a531e11d6701693c41d4c622dab50d85859a87a73dd5cd0fbb81
+DIST firefox-41.0.1-sq.xpi 491168 SHA256 e764b9cb6583aebf52e071f539237bbfe535a715d1939d5a664b60c35b0f668e SHA512 6870aca0663dda06a04d65e0628af910687eebb26c9edbb795015fe973e35919bf898d87c8ce4d2c6977575dc6a8f3d2dbad22c0a63fc614a581dad6cdeb1765 WHIRLPOOL 7fcda6a1f70a8f311916e6b6869047ba8316dd8889d80012663e5385338b9fe2b426ad42b1f90785ecab62f8c49bc80f3b19ebb49bbbfd908f12ee2d9c60232b
+DIST firefox-41.0.1-sr.xpi 482971 SHA256 e39ee04fc8ca4fe6543708ec3a5e49fc99b8801de4e323e33e8f5c3f11842c12 SHA512 fed8d4df627cda627660766f7cbbd4e9fd91f926454c578390823d8f273e972ebe71b1417f3366272efd308822b5ea4098eabf818609e75471804ffcab1f4371 WHIRLPOOL 36f3e52a4674895754b9d0b122c29a30b6fe40432b175493853550e30b960cc40c8af0e935aa9e265b69b87928ac9547e304a3af7c15d0fad91c0a7cf94fa6ac
+DIST firefox-41.0.1-sv-SE.xpi 455382 SHA256 447097907572849eab9b8ca1a60d87fc7df071808cac82297f8ea5f2ac46b0f4 SHA512 92525ed16457cf0612abb5c30c70ef27aa29b1c4ae58a97ac2b3e75e43374ff294e1150821b70523fbed6865a043e4998e1921a01a0fb8ce6e9786525f07329b WHIRLPOOL ff7570dfbbefdf89509655456347cbf950fcd45c676314c76cbf832da3929562a26a44df742129aec12e0d7ec85e5a3bc44716e0c0df5922c41b3e074815f831
+DIST firefox-41.0.1-ta.xpi 509545 SHA256 ce187fb6594319345a668607ee36436384e06b0908086d2e89e801b27fe478ad SHA512 384a00c1e7d9270abfda711a7b424baf8d4e388b213c51b888e07848bfaf38d303de5d9a5129568243e2d9ed00a3ccfa7f66dbe823ae672b44c23df765d932e7 WHIRLPOOL 1523fa41bd638779486db98c7a81d8bc596d64243f9ff6f79e5533e2b8457ca34b811cb03d115f78ae29e05c7fe6dbebffadabb9adae5e07f6157b6e47f5dc47
+DIST firefox-41.0.1-te.xpi 530204 SHA256 a0290f5bd0b877433a4afcc2b447f96c14087c1b6e143dc5962d7da4a10dc6b3 SHA512 6f5b2e586bdacded503c719a49ec079e85f07f1f351f16acc8702f8993ceea8a6ede7d34b91c13bfc4615060394e4b57a3bfe47fc36235282e5bf3b5dea9bb03 WHIRLPOOL 43e005c5170791508c906532c9f0f216c2465c0ada0c292015084f8d5b1daf92bbdfe4e4a35a5bb187fdf36eff84e876700a11c4b38bf167eae02f947c2ab477
+DIST firefox-41.0.1-th.xpi 539600 SHA256 67bcf41773e6fd389a96db578029f904d0d54a8ec46086e7382c1eff2eefdc8d SHA512 f47b1d06c540a9816f050b4a3dd5dedc730ab6db7ce64b2de426566965321365106f72997e40f1fcba4f4b72f885995166788d99adfa8e348e4d7dfc833f1002 WHIRLPOOL a8f9b3cbc723b4295a6e4d594b64cfeaacba2e0420738b83557e0c2fa44c2723dcdc778260dae8f8aaa882eed5231c0cd34074ce7d233304c7cf8c87e1c1a2d8
+DIST firefox-41.0.1-tr.xpi 484232 SHA256 56250792a6768763153178be68998bd912cc6d2d33366023e83a92cfafc4bb85 SHA512 93b569600faaece6e2a8a2206da3b37107a9d38976454dd880cbc19ab3a6673ecfa6729d86933d96cf35aef014970b4d738e6db44fcd7c4f318ec8f1dc6d2e36 WHIRLPOOL 612b2283ab66a6e515ae472c3813dec5e7508e8401f71478577669ed0726a2a47397a0a29b53028d58124cfcb03b009085e67c143e75287a53bf1071075ea146
+DIST firefox-41.0.1-uk.xpi 500110 SHA256 bfc13862f69b9270ec45595e5f42cbd2ac893a06d193c1e57b6bcfe0a47928c1 SHA512 db7f93108e01bb32cc39a09b87a219fd99ed48d38c014894702800caddcb2bf83b8ef2e2ed8db515c359be7b2712f902a33dc54ab51c2f7ab6820f3ae178dd96 WHIRLPOOL a74da8ed2a7389f0011d4bb1961c0d7b6c0ac49a8e87dc7d7e49d9936deb37dd0b5fe1b29a112c6361fe269fad447cecdcc2f711ebbf90811e0d596518f48253
+DIST firefox-41.0.1-vi.xpi 470336 SHA256 949eca406e118a6508912d379babde3cde6d20154da59260e760c1ef07d2dbb3 SHA512 113abac652fdc9396bb7166955864fb61cabc9d0211e241958ed4d0e237bba7671159533cb2cbff4661dd1af96f5adf71a1d602aa865d2f123ab5b4a9fda6d64 WHIRLPOOL d7e3bd146dc9398e87adeaa6f399938633fe33ef5c85e1560f2236791bdb3febdbc4020098bd015157126df1ebf6062da5a23ef63f5949977b5c3081a043e2f8
+DIST firefox-41.0.1-xh.xpi 450079 SHA256 791d68f4e7b43201478c4334dea7bd9812f1df2e82a36c6b89af62bf1ca88cd4 SHA512 b4c100ddaedb3aff5ca0457d5236f45a063a33203d835d239931c48290f2b64d4e56d5fdf69e429d61872537f99775a29562c3bf4cdcd64b8bb6a53b87dcb0f4 WHIRLPOOL d05862206e206953e47417bff7053ddb22951f0140812e7ca866b0bb396f196ac773929a262f908d995036028bc8ef4762cc9b6ced7d41b115f29ae0bfcf1841
+DIST firefox-41.0.1-zh-CN.xpi 486222 SHA256 6719c7ab93c9ccba84630247ab33c4f61971e8052bb73442ea196e37de90d7cc SHA512 3e50ce9ac5aa6f0b62b857b7af41db726de418ef6be580d0fc6155fcd5cb22889a7d53db043748f55b7b72420c605c74247f36428e6c183a0ba9921f3a7e7b7c WHIRLPOOL f655c89388bdcf65f4daa0eabd680b65005317c28d09f7ac9168cd8ae64f4097d52143a2cb87db0d490f4fcd2a040f3d5162a1277d8ab1373bf17fead639c8ed
+DIST firefox-41.0.1-zh-TW.xpi 479033 SHA256 c14373d6b8d5e978864a29ce35d50d2c0430d12befd9cc284dd8b63f86356b1b SHA512 01793e9e081892f0c8cda34dad5433df8ad7d4a8a6e41302e6d299c2c7a7b5900521b57a4cb2d17bba7a965796d1015c535186bb81d48d2d355be59fac5dcdd4 WHIRLPOOL b9be1364acd8a902629c5051164422ee3a3a65b0972e59e586f1821bee5e9ccedd1914c74e972194e79e244008494362a39aed417165d8eac31e8cfafd7383c7
+DIST firefox-41.0.1.source.tar.xz 159761132 SHA256 47b2cfc26b17559c26b95a584ab14b6efba132ca371b8aa30da2e2167e0612c3 SHA512 b27b6c240dcad4ef88ef172cf568152e750c648ad3e0636cd5ef1d4198cdd94f607d685d696ac18c3369814ee31dcbf2d6d6c570444b2d8830b457042e2c2a32 WHIRLPOOL 74f00154cf3e72525e0f50dff9d113522e55abfc8546788ceef3a52fc97305b621e27ed6ba6a5d73886dec741cc10384ecb5fc60aa3d99ba35c3b3651bb7c554
diff --git a/www-client/firefox/files/firefox-32.0-hppa-js-configure.patch b/www-client/firefox/files/firefox-32.0-hppa-js-configure.patch
deleted file mode 100644
index c37edda..0000000
--- a/www-client/firefox/files/firefox-32.0-hppa-js-configure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/mozilla-release/js/src/configure.in
-+++ b/mozilla-release/js/src/configure.in
-@@ -958,7 +958,7 @@
- CPU_ARCH=s390x
- ;;
-
--hppa* | parisc)
-+hppa* | parisc*)
- CPU_ARCH=hppa
- ;;
-
-@@ -2009,6 +2009,9 @@
- AC_DEFINE(JS_CPU_MIPS)
- AC_DEFINE(JS_NUNBOX32)
- ;;
-+hppa*)
-+ AC_DEFINE(JS_NUNBOX32)
-+ ;;
- esac
-
- MOZ_ARG_DISABLE_BOOL(ion,
diff --git a/www-client/firefox/files/firefox-38-hppa-js-syntax-error.patch b/www-client/firefox/files/firefox-38-hppa-js-syntax-error.patch
deleted file mode 100644
index 719732e..0000000
--- a/www-client/firefox/files/firefox-38-hppa-js-syntax-error.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Ian Stakenvicius <axs@gentoo.org>
-# Parent 2ee9895e032c492705adaf213706d4260ca172c8
-Fix JS_CHECK_STACK_SIZE define for stack-growing-up case (hppa)
-
-Upstream bug 1189011
-Gentoo bug 556196
-
-diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
---- a/js/src/jsfriendapi.h
-+++ b/js/src/jsfriendapi.h
-@@ -15,17 +15,17 @@
- #include "jsbytecode.h"
- #include "jspubtd.h"
-
- #include "js/CallArgs.h"
- #include "js/CallNonGenericMethod.h"
- #include "js/Class.h"
-
- #if JS_STACK_GROWTH_DIRECTION > 0
--# define JS_CHECK_STACK_SIZE(limit, sp) (MOZ_LIKELY(((uintptr_t)(sp) < (limit)))
-+# define JS_CHECK_STACK_SIZE(limit, sp) (MOZ_LIKELY((uintptr_t)(sp) < (limit)))
- #else
- # define JS_CHECK_STACK_SIZE(limit, sp) (MOZ_LIKELY((uintptr_t)(sp) > (limit)))
- #endif
-
- class JSAtom;
- struct JSErrorFormatString;
- class JSLinearString;
- struct JSJitInfo;
diff --git a/www-client/firefox/firefox-38.2.1.ebuild b/www-client/firefox/firefox-38.2.1.ebuild
deleted file mode 100644
index 2c1fe1f..0000000
--- a/www-client/firefox/firefox-38.2.1.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=1
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-# No official support as of fetch time
-# csb
-MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
-gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
-nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
- # ESR releases have slightly version numbers
- MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-38.0-patches-0.3"
-MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_WIFI=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.38 multilib pax-utils fdo-mime autotools virtualx mozlinguas
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test"
-RESTRICT="!bindist? ( bindist )"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
- https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
- https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND="
- >=dev-libs/nss-3.19.2
- >=dev-libs/nspr-4.10.8
- selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
- pgo? (
- >=sys-devel/gcc-4.5 )
- amd64? ( ${ASM_DEPEND}
- virtual/opengl )
- x86? ( ${ASM_DEPEND}
- virtual/opengl )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
- CHANGESET="8a3042764de7"
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
- S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
-elif [[ ${PV} =~ beta ]]; then
- S="${WORKDIR}/mozilla-release"
- SRC_URI="${SRC_URI}
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
-else
- SRC_URI="${SRC_URI}
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
- if [[ ${MOZ_ESR} == 1 ]]; then
- S="${WORKDIR}/mozilla-esr${PV%%.*}"
- else
- S="${WORKDIR}/mozilla-release"
- fi
-fi
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-pkg_setup() {
- moz_pkgsetup
-
- # Avoid PGO profiling problems due to enviroment leakage
- # These should *always* be cleaned up anyway
- unset DBUS_SESSION_BUS_ADDRESS \
- DISPLAY \
- ORBIT_SOCKETDIR \
- SESSION_MANAGER \
- XDG_SESSION_COOKIE \
- XAUTHORITY
-
- if ! use bindist; then
- einfo
- elog "You are enabling official branding. You may not redistribute this build"
- elog "to any users on your network or the internet. Doing so puts yourself into"
- elog "a legal problem with Mozilla Foundation"
- elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
- fi
-
- if use pgo; then
- einfo
- ewarn "You will do a double build for profile guided optimization."
- ewarn "This will result in your build taking at least twice as long as before."
- fi
-}
-
-pkg_pretend() {
- # Ensure we have enough disk space to compile
- if use pgo || use debug || use test ; then
- CHECKREQS_DISK_BUILD="8G"
- else
- CHECKREQS_DISK_BUILD="4G"
- fi
- check-reqs_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
-
- # Unpack language packs
- mozlinguas_src_unpack
-}
-
-src_prepare() {
- # Apply our patches
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/firefox"
- epatch "${FILESDIR}"/${PN}-38-dont-hardcode-libc-soname.patch
-
- # Allow user to apply any additional patches without modifing ebuild
- epatch_user
-
- # Enable gnomebreakpad
- if use debug ; then
- sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
- "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
- fi
-
- # Ensure that our plugins dir is enabled as default
- sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
- sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
- # Fix sandbox violations during make clean, bug 372817
- sed -e "s:\(/no-such-file\):${T}\1:g" \
- -i "${S}"/config/rules.mk \
- -i "${S}"/nsprpub/configure{.in,} \
- || die
-
- # Don't exit with error when some libs are missing which we have in
- # system.
- sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
- -i "${S}"/browser/installer/Makefile.in || die
-
- # Don't error out when there's no files to be removed:
- sed 's@\(xargs rm\)$@\1 -f@' \
- -i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
- eautoreconf
-
- # Must run autoconf in js/src
- cd "${S}"/js/src || die
- eautoconf
-
- # Need to update jemalloc's configure
- cd "${S}"/memory/jemalloc/src || die
- WANT_AUTOCONF= eautoconf
-}
-
-src_configure() {
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- MEXTENSIONS="default"
- # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
- # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
- # get your own set of keys.
- _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- mozconfig_config
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Add full relro support for hardened
- use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
- if use neon ; then
- mozconfig_annotate '' --with-fpu=neon
- mozconfig_annotate '' --with-thumb=yes
- mozconfig_annotate '' --with-thumb-interwork=no
- fi
-
- if [[ ${CHOST} == armv* ]] ; then
- mozconfig_annotate '' --with-float-abi=hard
- mozconfig_annotate '' --enable-skia
-
- if ! use system-libvpx ; then
- sed -i -e "s|softfp|hard|" \
- "${S}"/media/libvpx/moz.build
- fi
- fi
-
- use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
-
- # Setup api key for location services
- echo -n "${_google_api_key}" > "${S}"/google-api-key
- mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --disable-mailnews
-
- # Other ff-specific settings
- mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
- # Allow for a proper pgo build
- if use pgo; then
- echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
- fi
-
- echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
- # Finalize and report settings
- mozconfig_final
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-cxxflags -fno-stack-protector
- fi
-
- # workaround for funky/broken upstream configure...
- emake -f client.mk configure
-}
-
-src_compile() {
- if use pgo; then
- addpredict /root
- addpredict /etc/gconf
- # Reset and cleanup environment variables used by GNOME/XDG
- gnome2_environment_reset
-
- # Firefox tries to use dri stuff when it's run, see bug 380283
- shopt -s nullglob
- cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -z "${cards}"; then
- cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
- if test -n "${cards}"; then
- # Binary drivers seem to cause access violations anyway, so
- # let's use indirect rendering so that the device files aren't
- # touched at all. See bug 394715.
- export LIBGL_ALWAYS_INDIRECT=1
- fi
- fi
- shopt -u nullglob
- addpredict "${cards}"
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
- Xemake -f client.mk profiledbuild || die "Xemake failed"
- else
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
- emake -f client.mk realbuild
- fi
-
-}
-
-src_install() {
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
- cd "${BUILD_OBJ_DIR}" || die
-
- # Pax mark xpcshell for hardened support, only used for startupcache creation.
- pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
- # Add our default prefs for firefox
- cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- # Set default path to search for dictionaries.
- echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
- >> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- local plugin
- use gmp-autoupdate || for plugin in \
- gmp-gmpopenh264 ; do
- echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
- done
-
- MOZ_MAKE_FLAGS="${MAKEOPTS}" \
- emake DESTDIR="${D}" install
-
- # Install language packs
- mozlinguas_src_install
-
- local size sizes icon_path icon name
- if use bindist; then
- sizes="16 32 48"
- icon_path="${S}/browser/branding/aurora"
- # Firefox's new rapid release cycle means no more codenames
- # Let's just stick with this one...
- icon="aurora"
- name="Aurora"
- else
- sizes="16 22 24 32 256"
- icon_path="${S}/browser/branding/official"
- icon="${PN}"
- name="Mozilla Firefox"
- fi
-
- # Install icons and .desktop for menu entry
- for size in ${sizes}; do
- insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
- newins "${icon_path}/default${size}.png" "${icon}.png"
- done
- # The 128x128 icon has a different name
- insinto "/usr/share/icons/hicolor/128x128/apps"
- newins "${icon_path}/mozicon128.png" "${icon}.png"
- # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
- newicon "${icon_path}/content/icon48.png" "${icon}.png"
- newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
- sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
- "${ED}/usr/share/applications/${PN}.desktop" || die
-
- # Add StartupNotify=true bug 237317
- if use startup-notification ; then
- echo "StartupNotify=true"\
- >> "${ED}/usr/share/applications/${PN}.desktop" \
- || die
- fi
-
- # Required in order to use plugins and even run firefox on hardened.
- if use jit; then
- pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
- else
- pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
- fi
-
- if use minimal; then
- rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
- || die "Failed to remove sdk and headers"
- fi
-
- # very ugly hack to make firefox not sigbus on sparc
- # FIXME: is this still needed??
- use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
- -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
- || die "sparc sed failed"; }
-
- # revdep-rebuild entry
- insinto /etc/revdep-rebuild
- echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
- doins "${T}"/10${PN} || die
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- # Update mimedb for the new .desktop file
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-38.3.0.ebuild b/www-client/firefox/firefox-38.3.0.ebuild
index 7f8531c..2e58da9 100644
--- a/www-client/firefox/firefox-38.3.0.ebuild
+++ b/www-client/firefox/firefox-38.3.0.ebuild
@@ -27,7 +27,7 @@
fi
# Patch version
-PATCH="${PN}-38.0-patches-0.3"
+PATCH="${PN}-38.0-patches-04"
MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"
MOZCONFIG_OPTIONAL_WIFI=1
@@ -38,7 +38,7 @@
DESCRIPTION="Firefox Web Browser"
HOMEPAGE="http://www.mozilla.com/firefox"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
@@ -140,7 +140,6 @@
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/firefox"
- epatch "${FILESDIR}"/${PN}-38-dont-hardcode-libc-soname.patch
# Allow user to apply any additional patches without modifing ebuild
epatch_user
diff --git a/www-client/firefox/firefox-40.0.3.ebuild b/www-client/firefox/firefox-40.0.3.ebuild
deleted file mode 100644
index c71527a..0000000
--- a/www-client/firefox/firefox-40.0.3.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-# No official support as of fetch time
-# csb
-MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
-gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
-nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
- # ESR releases have slightly version numbers
- MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-40.0-patches-0.01"
-
-MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_WIFI=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.40 multilib pax-utils fdo-mime autotools virtualx mozlinguas
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test"
-RESTRICT="!bindist? ( bindist )"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
- https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
- https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND="
- >=dev-libs/nss-3.19.2
- >=dev-libs/nspr-4.10.8
- selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
- pgo? (
- >=sys-devel/gcc-4.5 )
- amd64? ( ${ASM_DEPEND}
- virtual/opengl )
- x86? ( ${ASM_DEPEND}
- virtual/opengl )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
- CHANGESET="8a3042764de7"
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
- S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
-elif [[ ${PV} =~ beta ]]; then
- S="${WORKDIR}/mozilla-release"
- SRC_URI="${SRC_URI}
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
-else
- SRC_URI="${SRC_URI}
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
- if [[ ${MOZ_ESR} == 1 ]]; then
- S="${WORKDIR}/mozilla-esr${PV%%.*}"
- else
- S="${WORKDIR}/mozilla-release"
- fi
-fi
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-pkg_setup() {
- moz_pkgsetup
-
- # Avoid PGO profiling problems due to enviroment leakage
- # These should *always* be cleaned up anyway
- unset DBUS_SESSION_BUS_ADDRESS \
- DISPLAY \
- ORBIT_SOCKETDIR \
- SESSION_MANAGER \
- XDG_SESSION_COOKIE \
- XAUTHORITY
-
- if ! use bindist; then
- einfo
- elog "You are enabling official branding. You may not redistribute this build"
- elog "to any users on your network or the internet. Doing so puts yourself into"
- elog "a legal problem with Mozilla Foundation"
- elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
- fi
-
- if use pgo; then
- einfo
- ewarn "You will do a double build for profile guided optimization."
- ewarn "This will result in your build taking at least twice as long as before."
- fi
-}
-
-pkg_pretend() {
- # Ensure we have enough disk space to compile
- if use pgo || use debug || use test ; then
- CHECKREQS_DISK_BUILD="8G"
- else
- CHECKREQS_DISK_BUILD="4G"
- fi
- check-reqs_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
-
- # Unpack language packs
- mozlinguas_src_unpack
-}
-
-src_prepare() {
- # Apply our patches
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- EPATCH_EXCLUDE="8010_bug114311-freetype26.patch" \
- epatch "${WORKDIR}/firefox"
- epatch "${FILESDIR}"/${PN}-38-hppa-js-syntax-error.patch #556196
- epatch "${FILESDIR}"/${PN}-38-dont-hardcode-libc-soname.patch #557956
- # Allow user to apply any additional patches without modifing ebuild
- epatch_user
-
- # Enable gnomebreakpad
- if use debug ; then
- sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
- "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
- fi
-
- # Ensure that our plugins dir is enabled as default
- sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
- sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
- # Fix sandbox violations during make clean, bug 372817
- sed -e "s:\(/no-such-file\):${T}\1:g" \
- -i "${S}"/config/rules.mk \
- -i "${S}"/nsprpub/configure{.in,} \
- || die
-
- # Don't exit with error when some libs are missing which we have in
- # system.
- sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
- -i "${S}"/browser/installer/Makefile.in || die
-
- # Don't error out when there's no files to be removed:
- sed 's@\(xargs rm\)$@\1 -f@' \
- -i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
- eautoreconf
-
- # Must run autoconf in js/src
- cd "${S}"/js/src || die
- eautoconf
-
- # Need to update jemalloc's configure
- cd "${S}"/memory/jemalloc/src || die
- WANT_AUTOCONF= eautoconf
-}
-
-src_configure() {
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- MEXTENSIONS="default"
- # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
- # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
- # get your own set of keys.
- _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- mozconfig_config
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Add full relro support for hardened
- use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
- if use neon ; then
- mozconfig_annotate '' --with-fpu=neon
- mozconfig_annotate '' --with-thumb=yes
- mozconfig_annotate '' --with-thumb-interwork=no
- fi
-
- if [[ ${CHOST} == armv* ]] ; then
- mozconfig_annotate '' --with-float-abi=hard
- mozconfig_annotate '' --enable-skia
-
- if ! use system-libvpx ; then
- sed -i -e "s|softfp|hard|" \
- "${S}"/media/libvpx/moz.build
- fi
- fi
-
- use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
-
- # Setup api key for location services
- echo -n "${_google_api_key}" > "${S}"/google-api-key
- mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --disable-mailnews
-
- # Other ff-specific settings
- mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
- # Allow for a proper pgo build
- if use pgo; then
- echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
- fi
-
- echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
- # Finalize and report settings
- mozconfig_final
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-cxxflags -fno-stack-protector
- fi
-
- # workaround for funky/broken upstream configure...
- emake -f client.mk configure
-}
-
-src_compile() {
- if use pgo; then
- addpredict /root
- addpredict /etc/gconf
- # Reset and cleanup environment variables used by GNOME/XDG
- gnome2_environment_reset
-
- # Firefox tries to use dri stuff when it's run, see bug 380283
- shopt -s nullglob
- cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -z "${cards}"; then
- cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
- if test -n "${cards}"; then
- # Binary drivers seem to cause access violations anyway, so
- # let's use indirect rendering so that the device files aren't
- # touched at all. See bug 394715.
- export LIBGL_ALWAYS_INDIRECT=1
- fi
- fi
- shopt -u nullglob
- addpredict "${cards}"
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
- Xemake -f client.mk profiledbuild || die "Xemake failed"
- else
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
- emake -f client.mk realbuild
- fi
-
-}
-
-src_install() {
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
- cd "${BUILD_OBJ_DIR}" || die
-
- # Pax mark xpcshell for hardened support, only used for startupcache creation.
- pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
- # Add our default prefs for firefox
- cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- # Set default path to search for dictionaries.
- echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
- >> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- local plugin
- use gmp-autoupdate || for plugin in \
- gmp-gmpopenh264 ; do
- echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
- done
-
- MOZ_MAKE_FLAGS="${MAKEOPTS}" \
- emake DESTDIR="${D}" install
-
- # Install language packs
- mozlinguas_src_install
-
- local size sizes icon_path icon name
- if use bindist; then
- sizes="16 32 48"
- icon_path="${S}/browser/branding/aurora"
- # Firefox's new rapid release cycle means no more codenames
- # Let's just stick with this one...
- icon="aurora"
- name="Aurora"
- else
- sizes="16 22 24 32 256"
- icon_path="${S}/browser/branding/official"
- icon="${PN}"
- name="Mozilla Firefox"
- fi
-
- # Install icons and .desktop for menu entry
- for size in ${sizes}; do
- insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
- newins "${icon_path}/default${size}.png" "${icon}.png"
- done
- # The 128x128 icon has a different name
- insinto "/usr/share/icons/hicolor/128x128/apps"
- newins "${icon_path}/mozicon128.png" "${icon}.png"
- # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
- newicon "${icon_path}/content/icon48.png" "${icon}.png"
- newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
- sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
- "${ED}/usr/share/applications/${PN}.desktop" || die
-
- # Add StartupNotify=true bug 237317
- if use startup-notification ; then
- echo "StartupNotify=true"\
- >> "${ED}/usr/share/applications/${PN}.desktop" \
- || die
- fi
-
- # Required in order to use plugins and even run firefox on hardened.
- if use jit; then
- pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
- else
- pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
- fi
-
- if use minimal; then
- rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
- || die "Failed to remove sdk and headers"
- fi
-
- # very ugly hack to make firefox not sigbus on sparc
- # FIXME: is this still needed??
- use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
- -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
- || die "sparc sed failed"; }
-
- # revdep-rebuild entry
- insinto /etc/revdep-rebuild
- echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
- doins "${T}"/10${PN} || die
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- # Update mimedb for the new .desktop file
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-41.0-r1.ebuild b/www-client/firefox/firefox-41.0-r1.ebuild
deleted file mode 100644
index 335eb95..0000000
--- a/www-client/firefox/firefox-41.0-r1.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-# No official support as of fetch time
-# csb
-MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
-gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
-nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
- # ESR releases have slightly version numbers
- MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-40.0-patches-0.01"
-MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_WIFI=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.41 multilib pax-utils fdo-mime autotools virtualx mozlinguas
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test"
-RESTRICT="!bindist? ( bindist )"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
- https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
- https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND="
- >=dev-libs/nss-3.19.2
- >=dev-libs/nspr-4.10.8
- selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
- pgo? (
- >=sys-devel/gcc-4.5 )
- amd64? ( ${ASM_DEPEND}
- virtual/opengl )
- x86? ( ${ASM_DEPEND}
- virtual/opengl )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
- CHANGESET="8a3042764de7"
- SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.xz"
- S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
-elif [[ ${PV} =~ beta ]]; then
- S="${WORKDIR}/mozilla-beta"
- SRC_URI="${SRC_URI}
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-else
- SRC_URI="${SRC_URI}
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
- if [[ ${MOZ_ESR} == 1 ]]; then
- S="${WORKDIR}/mozilla-esr${PV%%.*}"
- else
- S="${WORKDIR}/mozilla-release"
- fi
-fi
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-pkg_setup() {
- moz_pkgsetup
-
- # Avoid PGO profiling problems due to enviroment leakage
- # These should *always* be cleaned up anyway
- unset DBUS_SESSION_BUS_ADDRESS \
- DISPLAY \
- ORBIT_SOCKETDIR \
- SESSION_MANAGER \
- XDG_SESSION_COOKIE \
- XAUTHORITY
-
- if ! use bindist; then
- einfo
- elog "You are enabling official branding. You may not redistribute this build"
- elog "to any users on your network or the internet. Doing so puts yourself into"
- elog "a legal problem with Mozilla Foundation"
- elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
- fi
-
- if use pgo; then
- einfo
- ewarn "You will do a double build for profile guided optimization."
- ewarn "This will result in your build taking at least twice as long as before."
- fi
-}
-
-pkg_pretend() {
- # Ensure we have enough disk space to compile
- if use pgo || use debug || use test ; then
- CHECKREQS_DISK_BUILD="8G"
- else
- CHECKREQS_DISK_BUILD="4G"
- fi
- check-reqs_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
-
- # Unpack language packs
- mozlinguas_src_unpack
-}
-
-src_prepare() {
- # Apply our patches
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/firefox"
- epatch "${FILESDIR}"/${PN}-38-dont-hardcode-libc-soname.patch #557956
-
- # Allow user to apply any additional patches without modifing ebuild
- epatch_user
-
- # Enable gnomebreakpad
- if use debug ; then
- sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
- "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
- fi
-
- # Ensure that our plugins dir is enabled as default
- sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
- sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
- # Fix sandbox violations during make clean, bug 372817
- sed -e "s:\(/no-such-file\):${T}\1:g" \
- -i "${S}"/config/rules.mk \
- -i "${S}"/nsprpub/configure{.in,} \
- || die
-
- # Don't exit with error when some libs are missing which we have in
- # system.
- sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
- -i "${S}"/browser/installer/Makefile.in || die
-
- # Don't error out when there's no files to be removed:
- sed 's@\(xargs rm\)$@\1 -f@' \
- -i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
- # Keep codebase the same even if not using official branding
- sed '/^MOZ_DEV_EDITION=1/d' \
- -i "${S}"/browser/branding/aurora/configure.sh || die
-
- eautoreconf
-
- # Must run autoconf in js/src
- cd "${S}"/js/src || die
- eautoconf
-
- # Need to update jemalloc's configure
- cd "${S}"/memory/jemalloc/src || die
- WANT_AUTOCONF= eautoconf
-}
-
-src_configure() {
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- MEXTENSIONS="default"
- # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
- # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
- # get your own set of keys.
- _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- mozconfig_config
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Add full relro support for hardened
- use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
- if use neon ; then
- mozconfig_annotate '' --with-fpu=neon
- mozconfig_annotate '' --with-thumb=yes
- mozconfig_annotate '' --with-thumb-interwork=no
- fi
-
- if [[ ${CHOST} == armv* ]] ; then
- mozconfig_annotate '' --with-float-abi=hard
- mozconfig_annotate '' --enable-skia
-
- if ! use system-libvpx ; then
- sed -i -e "s|softfp|hard|" \
- "${S}"/media/libvpx/moz.build
- fi
- fi
-
- use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
-
- # Setup api key for location services
- echo -n "${_google_api_key}" > "${S}"/google-api-key
- mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --disable-mailnews
-
- # Other ff-specific settings
- mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
- # Allow for a proper pgo build
- if use pgo; then
- echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
- fi
-
- echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
- # Finalize and report settings
- mozconfig_final
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-cxxflags -fno-stack-protector
- fi
-
- # workaround for funky/broken upstream configure...
- emake -f client.mk configure
-}
-
-src_compile() {
- if use pgo; then
- addpredict /root
- addpredict /etc/gconf
- # Reset and cleanup environment variables used by GNOME/XDG
- gnome2_environment_reset
-
- # Firefox tries to use dri stuff when it's run, see bug 380283
- shopt -s nullglob
- cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -z "${cards}"; then
- cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
- if test -n "${cards}"; then
- # Binary drivers seem to cause access violations anyway, so
- # let's use indirect rendering so that the device files aren't
- # touched at all. See bug 394715.
- export LIBGL_ALWAYS_INDIRECT=1
- fi
- fi
- shopt -u nullglob
- addpredict "${cards}"
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
- Xemake -f client.mk profiledbuild || die "Xemake failed"
- else
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
- emake -f client.mk realbuild
- fi
-
-}
-
-src_install() {
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
- cd "${BUILD_OBJ_DIR}" || die
-
- # Pax mark xpcshell for hardened support, only used for startupcache creation.
- pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
- # Add our default prefs for firefox
- cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- # Set default path to search for dictionaries.
- echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
- >> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- local plugin
- use gmp-autoupdate || for plugin in \
- gmp-gmpopenh264 ; do
- echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
- done
-
- MOZ_MAKE_FLAGS="${MAKEOPTS}" \
- emake DESTDIR="${D}" install
-
- # Install language packs
- mozlinguas_src_install
-
- local size sizes icon_path icon name
- if use bindist; then
- sizes="16 32 48"
- icon_path="${S}/browser/branding/aurora"
- # Firefox's new rapid release cycle means no more codenames
- # Let's just stick with this one...
- icon="aurora"
- name="Aurora"
-
- # Override preferences to set the MOZ_DEV_EDITION defaults, since we
- # don't define MOZ_DEV_EDITION to avoid profile debaucles.
- # (source: browser/app/profile/firefox.js)
- cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
- else
- sizes="16 22 24 32 256"
- icon_path="${S}/browser/branding/official"
- icon="${PN}"
- name="Mozilla Firefox"
- fi
-
- # Install icons and .desktop for menu entry
- for size in ${sizes}; do
- insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
- newins "${icon_path}/default${size}.png" "${icon}.png"
- done
- # The 128x128 icon has a different name
- insinto "/usr/share/icons/hicolor/128x128/apps"
- newins "${icon_path}/mozicon128.png" "${icon}.png"
- # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
- newicon "${icon_path}/content/icon48.png" "${icon}.png"
- newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
- sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
- "${ED}/usr/share/applications/${PN}.desktop" || die
-
- # Add StartupNotify=true bug 237317
- if use startup-notification ; then
- echo "StartupNotify=true"\
- >> "${ED}/usr/share/applications/${PN}.desktop" \
- || die
- fi
-
- # Required in order to use plugins and even run firefox on hardened.
- if use jit; then
- pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
- else
- pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
- fi
-
- if use minimal; then
- rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
- || die "Failed to remove sdk and headers"
- fi
-
- # very ugly hack to make firefox not sigbus on sparc
- # FIXME: is this still needed??
- use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
- -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
- || die "sparc sed failed"; }
-
- # revdep-rebuild entry
- insinto /etc/revdep-rebuild
- echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
- doins "${T}"/10${PN} || die
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- # Update mimedb for the new .desktop file
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-41.0.1.ebuild b/www-client/firefox/firefox-41.0.1.ebuild
new file mode 100644
index 0000000..9064c79
--- /dev/null
+++ b/www-client/firefox/firefox-41.0.1.ebuild
@@ -0,0 +1,411 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# No official support as of fetch time
+# csb
+MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
+gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
+nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+ # ESR releases have slightly version numbers
+ MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-41.0-patches-01"
+MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.41 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test"
+RESTRICT="!bindist? ( bindist )"
+
+# More URIs appended below...
+SRC_URI="${SRC_URI}
+ https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+ https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
+ https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Mesa 7.10 needed for WebGL + bugfixes
+RDEPEND="
+ >=dev-libs/nss-3.19.2
+ >=dev-libs/nspr-4.10.8
+ selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+ pgo? (
+ >=sys-devel/gcc-4.5 )
+ amd64? ( ${ASM_DEPEND}
+ virtual/opengl )
+ x86? ( ${ASM_DEPEND}
+ virtual/opengl )"
+
+# No source releases for alpha|beta
+if [[ ${PV} =~ alpha ]]; then
+ CHANGESET="8a3042764de7"
+ SRC_URI="${SRC_URI}
+ https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.xz"
+ S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
+elif [[ ${PV} =~ beta ]]; then
+ S="${WORKDIR}/mozilla-beta"
+ SRC_URI="${SRC_URI}
+ ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
+else
+ SRC_URI="${SRC_URI}
+ ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
+ if [[ ${MOZ_ESR} == 1 ]]; then
+ S="${WORKDIR}/mozilla-esr${PV%%.*}"
+ else
+ S="${WORKDIR}/mozilla-release"
+ fi
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+pkg_setup() {
+ moz_pkgsetup
+
+ # Avoid PGO profiling problems due to enviroment leakage
+ # These should *always* be cleaned up anyway
+ unset DBUS_SESSION_BUS_ADDRESS \
+ DISPLAY \
+ ORBIT_SOCKETDIR \
+ SESSION_MANAGER \
+ XDG_SESSION_COOKIE \
+ XAUTHORITY
+
+ if ! use bindist; then
+ einfo
+ elog "You are enabling official branding. You may not redistribute this build"
+ elog "to any users on your network or the internet. Doing so puts yourself into"
+ elog "a legal problem with Mozilla Foundation"
+ elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+ fi
+
+ if use pgo; then
+ einfo
+ ewarn "You will do a double build for profile guided optimization."
+ ewarn "This will result in your build taking at least twice as long as before."
+ fi
+}
+
+pkg_pretend() {
+ # Ensure we have enough disk space to compile
+ if use pgo || use debug || use test ; then
+ CHECKREQS_DISK_BUILD="8G"
+ else
+ CHECKREQS_DISK_BUILD="4G"
+ fi
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ unpack ${A}
+
+ # Unpack language packs
+ mozlinguas_src_unpack
+}
+
+src_prepare() {
+ # Apply our patches
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}/firefox"
+
+ # Allow user to apply any additional patches without modifing ebuild
+ epatch_user
+
+ # Enable gnomebreakpad
+ if use debug ; then
+ sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+ "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+ fi
+
+ # Ensure that our plugins dir is enabled as default
+ sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+ "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+ sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+ "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+ # Fix sandbox violations during make clean, bug 372817
+ sed -e "s:\(/no-such-file\):${T}\1:g" \
+ -i "${S}"/config/rules.mk \
+ -i "${S}"/nsprpub/configure{.in,} \
+ || die
+
+ # Don't exit with error when some libs are missing which we have in
+ # system.
+ sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+ -i "${S}"/browser/installer/Makefile.in || die
+
+ # Don't error out when there's no files to be removed:
+ sed 's@\(xargs rm\)$@\1 -f@' \
+ -i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+ # Keep codebase the same even if not using official branding
+ sed '/^MOZ_DEV_EDITION=1/d' \
+ -i "${S}"/browser/branding/aurora/configure.sh || die
+
+ eautoreconf
+
+ # Must run autoconf in js/src
+ cd "${S}"/js/src || die
+ eautoconf
+
+ # Need to update jemalloc's configure
+ cd "${S}"/memory/jemalloc/src || die
+ WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+ MEXTENSIONS="default"
+ # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+ # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+ # get your own set of keys.
+ _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+ ####################################
+ #
+ # mozconfig, CFLAGS and CXXFLAGS setup
+ #
+ ####################################
+
+ mozconfig_init
+ mozconfig_config
+
+ # It doesn't compile on alpha without this LDFLAGS
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ # Add full relro support for hardened
+ use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+ if use neon ; then
+ mozconfig_annotate '' --with-fpu=neon
+ mozconfig_annotate '' --with-thumb=yes
+ mozconfig_annotate '' --with-thumb-interwork=no
+ fi
+
+ if [[ ${CHOST} == armv* ]] ; then
+ mozconfig_annotate '' --with-float-abi=hard
+ mozconfig_annotate '' --enable-skia
+
+ if ! use system-libvpx ; then
+ sed -i -e "s|softfp|hard|" \
+ "${S}"/media/libvpx/moz.build
+ fi
+ fi
+
+ use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
+
+ # Setup api key for location services
+ echo -n "${_google_api_key}" > "${S}"/google-api-key
+ mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+ mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+ mozconfig_annotate '' --disable-mailnews
+
+ # Other ff-specific settings
+ mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+ # Allow for a proper pgo build
+ if use pgo; then
+ echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
+ fi
+
+ echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+
+ # Finalize and report settings
+ mozconfig_final
+
+ if [[ $(gcc-major-version) -lt 4 ]]; then
+ append-cxxflags -fno-stack-protector
+ fi
+
+ # workaround for funky/broken upstream configure...
+ emake -f client.mk configure
+}
+
+src_compile() {
+ if use pgo; then
+ addpredict /root
+ addpredict /etc/gconf
+ # Reset and cleanup environment variables used by GNOME/XDG
+ gnome2_environment_reset
+
+ # Firefox tries to use dri stuff when it's run, see bug 380283
+ shopt -s nullglob
+ cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+ if test -z "${cards}"; then
+ cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+ if test -n "${cards}"; then
+ # Binary drivers seem to cause access violations anyway, so
+ # let's use indirect rendering so that the device files aren't
+ # touched at all. See bug 394715.
+ export LIBGL_ALWAYS_INDIRECT=1
+ fi
+ fi
+ shopt -u nullglob
+ addpredict "${cards}"
+
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+ Xemake -f client.mk profiledbuild || die "Xemake failed"
+ else
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+ emake -f client.mk realbuild
+ fi
+
+}
+
+src_install() {
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+ DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+ cd "${BUILD_OBJ_DIR}" || die
+
+ # Pax mark xpcshell for hardened support, only used for startupcache creation.
+ pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+ # Add our default prefs for firefox
+ cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
+ "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || die
+
+ # Set default path to search for dictionaries.
+ echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+ >> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || die
+
+ echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+ "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || die
+
+ local plugin
+ use gmp-autoupdate || for plugin in \
+ gmp-gmpopenh264 ; do
+ echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+ "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || die
+ done
+
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+ emake DESTDIR="${D}" install
+
+ # Install language packs
+ mozlinguas_src_install
+
+ local size sizes icon_path icon name
+ if use bindist; then
+ sizes="16 32 48"
+ icon_path="${S}/browser/branding/aurora"
+ # Firefox's new rapid release cycle means no more codenames
+ # Let's just stick with this one...
+ icon="aurora"
+ name="Aurora"
+
+ # Override preferences to set the MOZ_DEV_EDITION defaults, since we
+ # don't define MOZ_DEV_EDITION to avoid profile debaucles.
+ # (source: browser/app/profile/firefox.js)
+ cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+ else
+ sizes="16 22 24 32 256"
+ icon_path="${S}/browser/branding/official"
+ icon="${PN}"
+ name="Mozilla Firefox"
+ fi
+
+ # Install icons and .desktop for menu entry
+ for size in ${sizes}; do
+ insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+ newins "${icon_path}/default${size}.png" "${icon}.png"
+ done
+ # The 128x128 icon has a different name
+ insinto "/usr/share/icons/hicolor/128x128/apps"
+ newins "${icon_path}/mozicon128.png" "${icon}.png"
+ # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+ newicon "${icon_path}/content/icon48.png" "${icon}.png"
+ newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+ sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+ "${ED}/usr/share/applications/${PN}.desktop" || die
+
+ # Add StartupNotify=true bug 237317
+ if use startup-notification ; then
+ echo "StartupNotify=true"\
+ >> "${ED}/usr/share/applications/${PN}.desktop" \
+ || die
+ fi
+
+ # Required in order to use plugins and even run firefox on hardened.
+ if use jit; then
+ pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+ else
+ pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+ fi
+
+ if use minimal; then
+ rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
+ || die "Failed to remove sdk and headers"
+ fi
+
+ # very ugly hack to make firefox not sigbus on sparc
+ # FIXME: is this still needed??
+ use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+ -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
+ || die "sparc sed failed"; }
+
+ # revdep-rebuild entry
+ insinto /etc/revdep-rebuild
+ echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
+ doins "${T}"/10${PN} || die
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ # Update mimedb for the new .desktop file
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index dfaf0b0..a8f98d0 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-beta_46.0.2490.52-1_amd64.deb 47188898 SHA256 c96732a2a9f6c09166613f868e1282aead0d473a9e5b7c294d54324c724c0345 SHA512 fd6a77a52856220deb956203fa286bacfb75d2a85452747a154aa36c172a52df94199f26a748785a820309fc611fb2fe43437685c5e8eccc9806e1cae55e5644 WHIRLPOOL c00eb4a70956119cdca5bca07e908fc2fe82251c41fe845d9f5749efb102fb270955f0445a7db6acdcb372664d036e01a7e14fd68b02b308d8bf86401f268141
-DIST google-chrome-beta_46.0.2490.52-1_i386.deb 46989238 SHA256 a5164faa32d22cf60cf9c3861760f7d7507c55a2bf94d8297acef12f58674f82 SHA512 28021f863fc16758e64675d45399719984d34f956dfbfa7ef007c635fac3b0e6ffaf87a4ecdbd6575d6f745ecaa04bfff01904100b7106592928ce630efc6636 WHIRLPOOL 27452b59301dfc10f0e7998effe89b7313e1538c7f42e1b7fca838cf800a3067caeda54607055aa11bb797ff44c5704e0a155194338ebfc591ea41b8148fc66d
+DIST google-chrome-beta_46.0.2490.64-1_amd64.deb 47216802 SHA256 87def8cb17a58b50ea5f048bdf3d23ce2a2ca3b0e73b95c21956a503f1d81bd5 SHA512 a8efd58eae215ecaea0841d11b1b9cee99229b5486412c95e031d26b2d600e04e7e603470fb42c10cbf7deb69e95483510d6abab4f8af479d8afb6be1889cb30 WHIRLPOOL 9b633273d6ee84799eeb0c78a61a4b9fa3babfc1a9cb13ff6f0cfb6be7648aecaffd65f55cd466a38634beaf2986829f6bf3c89eeea2f259539159733befbade
+DIST google-chrome-beta_46.0.2490.64-1_i386.deb 46756938 SHA256 a465c8ce96dff605e532b92bade2628e6a5b7b7f206ab97716bf64a039b33d48 SHA512 7321ef2851bc91b093b34446d603ad8267c012149b6b95941d4418f143b1ecf7a2941b1591034b6f02947aaca381beab0ef1a7dedcd367b2dccb93d3e32e1c8f WHIRLPOOL 2661821a0b2af6f7aa002e2c7e4f7e07db6883b5db4f79cc78abb84914c490b8c79c83c0c8096dcf283cd87e3a06bb6bfdae060fed5c30e4bf77ca96d679b3cf
diff --git a/www-client/google-chrome-beta/google-chrome-beta-46.0.2490.52_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-46.0.2490.64_p1.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-46.0.2490.52_p1.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-46.0.2490.64_p1.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index e3fd019..f35cf72 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-unstable_47.0.2522.1-1_amd64.deb 47590434 SHA256 57e8c77e5846b6f3a05d54645ad15afc09dc57fa7931fe1c62bd493a3684c499 SHA512 a348f1b5110c9112cc775a5ad831104f62bef82adab83ff8db389b7bfe78cee6cb4a4d97104bfc2dbf095bc91e26f1cb046d3d9d52e74dc26805a18ed591e836 WHIRLPOOL dfbf27c6932d613798fafeb6d70f0dac8cb9ba8b154ec2098096e98c1f832ba0887468ac6665d89549d71440d9803eceb3ccbb5624f9d97fdf8a1a20d629f2ee
-DIST google-chrome-unstable_47.0.2522.1-1_i386.deb 46988260 SHA256 cf40b161e61d266bcc99134b4dcbde5d49af747a7f438937a0f12ed5c9111665 SHA512 6bfa3bc74e73696caa06dc3d9deafafc09a782b16bbb4bea8a85368c7ac839bafb7d53dd68ba9cf010877ebd9ae9920347a75c8f1b12e085f1fd4b67f0531ada WHIRLPOOL 32bda47dd82cc0b426683c3a76660ea3d6a4cfd0ca781ed18f178a9e2b16947468230c47809f5ccddee552b2ab7e7ac73fd5e7b31ed97782ed3819e9fe0c2d51
+DIST google-chrome-unstable_47.0.2526.8-1_amd64.deb 47158322 SHA256 b03f75b829c8cc3dcc3e9d19048c2b6bca5bbaa7b087d85cfb11cdb2143eff00 SHA512 c1b55b0ece5141560d4d1479eeee160c9696d00af4561d2d3aa291693dd2d5c5430bbbf2d6400e1e7cf05686d11aa78b989f0b18ba2c96663678104c2576729c WHIRLPOOL 909c9516c433db3b9813f942d58b27aa8e68a1c6c2c44b65905f0a71cc772adb52eb2f788c8a2697a14113a4d749cbfa38f6b2ea8c3425f7b028abfda0de91a0
+DIST google-chrome-unstable_47.0.2526.8-1_i386.deb 46796668 SHA256 454a3df7c0aca2d3d9a09c4f972831c59d57f80608ac45177db4296ccca64cda SHA512 dcbd903005525cd75482f22e0bc9d3ea9f058e86a12a7eceb1bd1aaeb21f98a80d591525035618b259e76b11b3929bb7f126f9e8285e2360b2d8a467e768de7b WHIRLPOOL 6b12ec0be4b2ee827b294948f308a15ef9475ab65c9bb66d5122fc0500bdfdea2655fe4fdc1eda5ae2988eb7059adb980a0c892009d93f8bde7c25012f41afc9
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-47.0.2522.1_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-47.0.2526.8_p1.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-47.0.2522.1_p1.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-47.0.2526.8_p1.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 05b2b87..9107c82 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,2 +1,2 @@
-DIST opera-beta_32.0.1948.19_amd64.deb 43093322 SHA256 1ddcf1f7aba8ba04ec990c1d1c7ca3a3c9d6c58e2c18fb36d24d87178c5088f0 SHA512 c3ff5db796fc8f6ecb4ab2f56a6a7821f5267af3b29081f65b94523804abadf40dc8c77f33e9db0078a578644e836c381a4d1e99765e5864ab7c09a556a0ec62 WHIRLPOOL 9259681db8d6bf6956fc8c2caf4b60d9bffef8c28a9634e2c420cef71a22af7305c30240e9ce04c6ca4999f7118abec5c9743e4c9294fcb2efa4b71c6c414128
DIST opera-beta_33.0.1990.11_amd64.deb 43800862 SHA256 17f69d837046eed24d6e2e63fee2dda01863134cbb85e98b4363d45a53164ea3 SHA512 4f46bd72ae004c241b809482c7fb69561c1084c072114a30df7bf8399bc7828c9b4230ca0ab45bcd63784dc2c4f0fa82375f554e63784b8dd41f8ecca10fe1cd WHIRLPOOL f51436a5e4374fd018e843dbb5fe34180795b022d82ccf51440332727fe9e90c1b0b690e6f32f88d5d0ea810acd00ecc65622d7adb15fffdb0d5fbafbd70057e
+DIST opera-beta_33.0.1990.20_amd64.deb 43872706 SHA256 b43c6ef0f920a8299cc962865a075fca578fddd13f011216734c35a6aaed3dfa SHA512 3c78200a90640e23f5fdc23708b9f74c5cba884c4df1cdccf507683f16f07f54174cddea5dd33344e26fd0efb7902b0fb55d6b8f9b692470d9e499b96158a15f WHIRLPOOL d21c415e7ecaf99a6a44cb80bc5abb013dc79b2326a510d5f8216bba5af5828d74dc2f74a0b35b9e7f8a2890e5002ce770bd999ffa6d2aca81749059225d1887
diff --git a/www-client/opera-beta/opera-beta-32.0.1948.19.ebuild b/www-client/opera-beta/opera-beta-33.0.1990.20.ebuild
similarity index 100%
rename from www-client/opera-beta/opera-beta-32.0.1948.19.ebuild
rename to www-client/opera-beta/opera-beta-33.0.1990.20.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 1b8bbf6..da4e65a 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,4 +1,4 @@
-DIST opera-developer_33.0.1982.0_amd64.deb 43074562 SHA256 3b23b3c07b861d728e00d58969cc6abd0619e55657f5cd5bec1eb562752e8e1b SHA512 82df5908a37e1bf916c8b9b4a7126e1fe426b77ba1f940e9705bb8c18aa56f282e6fc27235b933c2a681a25127c80e572b6275a1025f871240c9b550ae4e1773 WHIRLPOOL 5be7dce53d3e7064e7ec5129e934e53ccbe5ae85b1d86f235431c31678f5fdf91de8568b835e384340838d475fe4749e25e62e3b84751b4af73c2b55d8a472bd
-DIST opera-developer_33.0.1982.0_i386.deb 45087390 SHA256 380ae2394564bdb35b73bb8db5aac437cc837d11422562bdbd0dbf838744d4db SHA512 d5496dc8266601f946e6c649da21da6d2ef7178c2783a9ee7041cf1ce25ceeacd43b29a74ee626e18091d158abc29062e9e5de717958a05cae83c3758c686ec9 WHIRLPOOL 253a68170cd3854134f35ac45c4bec4a60832c22ecce983a119e44c989ebea22cd173474a7e8cce13e64ef0a83b01bcdfd943a813bf9d027ed2ddb54c566645a
DIST opera-developer_34.0.1996.0_amd64.deb 43927392 SHA256 cc19f06699a5af10c1728d74ac52530dd9bae50700afc09287a6a4b426c8da59 SHA512 f2ced215d7a06983e109a812e4e60d4bc763da846212e308ec3df6b97cb26011b734f7596b925582f80b4728a352d5df5bbe939b061810dff022e108daa3176f WHIRLPOOL aab2b80483a3f7509e5e0cd4d104d7e5a7353daa9ea587203c20f87d6dc59c18e06ce84f33257090985b5725fe8f14c390708f39df7280bb9c676721a7f2d8db
DIST opera-developer_34.0.1996.0_i386.deb 45548400 SHA256 84a7badbfa8031b3861091cbfbe2e90b2787ca4d8007656c0fb5675bb2db16e8 SHA512 0d103c45ee5dad1494887169352a90f1f3200b0e36421fdb535435d63a1ff1f207f82eb0fa75e90e66d1fe4aeb6ac934d5eac47a93c0baa99be2220e97c01901 WHIRLPOOL 367b953b71b0eef989cd215f37f4fdb2a7b60c606319d9627e91a35811f090b39aec9544ea33fc557b1003ec8f8ce4831979966fdd8757e16fc9c6d8741f0b83
+DIST opera-developer_34.0.2011.0_amd64.deb 44092286 SHA256 9736eaa5d24634797f415bc19698634bfab32e66c36e6915d22e6a058e7256a8 SHA512 d8119b518f2f6290444dc5853154e6edee6f59b47ef23017f5dd4815396e09a0ffbc3e7765821a00267632148fe2fa8215b540dfb246db4aa96fcf7d58b941d0 WHIRLPOOL df772a18c5a6037304000fff04ca556770f6b9dafb47f03cf32e4df86ce0e4c44709780a47980eee440a7cbce8fa574ca9d9e68b022a4eb1f0c69c35a1a74c63
+DIST opera-developer_34.0.2011.0_i386.deb 45892542 SHA256 cf011a77198085afb1ce0728eacd3a5c175503627db12f3e56bd10d3b78b8232 SHA512 30e753dc5e3876a5c646de2a7adc5166b3a16b6653b6c663603c7fdad12b1b060329540fae9051ff3055e9874f5a339cda629a9bccfbd26a51294c35cef3ee9f WHIRLPOOL f3c8a937c71e72b3f85875e10fceb47551739854865d57d3caa08b5ee94616981650fbb1d1f447864744181e696067328cf65ec403414a7f62faee789cf72f82
diff --git a/www-client/opera-developer/opera-developer-33.0.1982.0.ebuild b/www-client/opera-developer/opera-developer-34.0.2011.0.ebuild
similarity index 100%
rename from www-client/opera-developer/opera-developer-33.0.1982.0.ebuild
rename to www-client/opera-developer/opera-developer-34.0.2011.0.ebuild
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 4269a3f..0e275aa 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,6 +1,6 @@
DIST enigmail-1.8.2.tar.gz 1604159 SHA256 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512 51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11 WHIRLPOOL e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c
-DIST firefox-38.0-patches-0.3.tar.xz 4796 SHA256 bfbef81748f76f5f80c3ce6e6b810b65f6266f71da02722b1e8c9fad865b02bd SHA512 a974e33759246153db7d83488f1326275efd12c44a6c8c539cbc35709b4dbd27e848bda32f302ac2baa5d8729ba20579ebc7f643419757f542972ca1a264d520 WHIRLPOOL 3549239db380c02a1575ff407ea684a14827f2250d991b5eb6c8a341ceebaca57cd2cc422e160f00dfab933385d677574cd84947da07bd282c68bb84c40fa42b
-DIST firefox-40.0-patches-0.01.tar.xz 5144 SHA256 072c44c79ba82d04958b3fc3d1c6e90805cf71797a03b96961fd3a16bd14c3a7 SHA512 bb9ca395ee380e6ec21fefadc5c5052ce8490039577ac0245bcee309686e802a654a999b3aeeaf8d97573f102fba3620c9995ec145ddcdded2ee9487490f87f9 WHIRLPOOL e74ed6af06e61baaf0991d23849739fb8c1cb33c800467e76d1c15ae22360c18c757ac9f19d274ca9cc54a6f9a0d17f365bd815b4a35c94766b29980638e8c91
+DIST firefox-38.0-patches-04.tar.xz 5572 SHA256 501bd1cbd0ac7239674df4f7424e0dd57cab9ede47e18af0c99a8b8e04aa5ccc SHA512 311d494ba2a4219c88eea651e617aa776d6aa8ff68092302b76e9ff4e3e348c7197ec583923188e39973b7bd14f94df19756daf2495d9b0fe44aeaa3dcd19100 WHIRLPOOL 6605eaa0b80c97d2d5d23a23f7b8d92e7ed875787b932adf14622eb3fb5f5ccdebe8a094d78b3518d874b8819724af94100fd1728074ba4a5c426bbd91eeb722
+DIST firefox-41.0-patches-01.tar.xz 6328 SHA256 408f9a577d698b3713a112d04552e396ff2af7cb9756f87800efef7cc55dcdba SHA512 a9476a658731b5fdd51bb9855bf4292afc8cfb8e4475250b4fac75cb5166a1e9d384a8fd2ceb38d6f2044759bcb895f956c0cfcb361eb4a60d38481a93c546b0 WHIRLPOOL 9420e7757a0f45889dec228ce3d1fedd23ed6ff9cde1f3461ffef577ccd43bc6cdb5ce3a3200f067bfe9203111067467a91bd90c0861bf81d490b022baf087eb
DIST seamonkey-2.33-patches-01.tar.xz 944 SHA256 1612d94dddbd37fa4ce8307c1ba565c8439d082609b63c12b4971e361895566c SHA512 0132e7d06a1ea5d6c059f23e5b8a20016a1e911e8aa40ae15eaefcd141030b4d245297f1e13e508827d91bab5988db4775c8425e737654afba2ede9c2dee8392 WHIRLPOOL 4520c4eaa7e6a25f5c32e9cd1d46472e181fbd769a1c5a59c913834cec5556100eac01423b4abf4a47543d0fbae4bf83b0f4a4d6cec7a058587e2705043bf507
DIST seamonkey-2.35-be.xpi 844271 SHA256 c1043f743a353dfb46db8f524249c808183e89f4f0f7a6181f9d5304d545f694 SHA512 2683a9e5858680a37b152c77fc15964d9b342e2d2a0fc409968b6cf35758f2bf30b3339dcd5c860ef95c56ed85c224383f95efc3d14999cd0a3e4a396c7c4644 WHIRLPOOL f3f69369b0e225cdbb8fc1ac35e4e2295ed1778df7cabd3c9f4f566b758ee6f7dc2f922e422b5b5175bc2ff2ecc15769e535810a90435d15f57f7b22217eb1bf
DIST seamonkey-2.35-ca.xpi 835414 SHA256 6b6bc56a6f780f18a8736a554fcec9b042ff8c3a4ecbef9d192d3ad6a67ed150 SHA512 7dd90e4d3124749971c66c5aa49c4a7ba2fa3813df49526d8f42083b0b6b712362005d3e7332a4d74b053360d56beb22f922e6917471f42e81386b7cc5d9b6d0 WHIRLPOOL 8aa4bc9e1d662c3488fe27b490b4bc42536931a82340b5b133b9886efd10836b64da3c7f253cfd83e561f0d9b2ed03cae922a836c9bb0f927a4c28dabd1de64f
diff --git a/www-client/seamonkey/files/firefox-38-dont-hardcode-libc-soname.patch b/www-client/seamonkey/files/firefox-38-dont-hardcode-libc-soname.patch
deleted file mode 100644
index 83779bc..0000000
--- a/www-client/seamonkey/files/firefox-38-dont-hardcode-libc-soname.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/testing/mozbase/mozinfo/mozinfo/mozinfo.py 2015-08-06 13:41:02.000000000 -0400
-+++ b/testing/mozbase/mozinfo/mozinfo/mozinfo.py 2015-08-21 21:17:00.320766493 -0400
-@@ -96,7 +96,7 @@
- import errno
- PR_SET_SECCOMP = 22
- SECCOMP_MODE_FILTER = 2
-- ctypes.CDLL("libc.so.6", use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0)
-+ ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0)
- info['has_sandbox'] = ctypes.get_errno() == errno.EFAULT
- else:
- info['has_sandbox'] = True
---- a/testing/mochitest/runtests.py 2015-08-06 13:41:02.000000000 -0400
-+++ b/testing/mochitest/runtests.py 2015-08-21 21:17:36.060766000 -0400
-@@ -1097,7 +1097,7 @@
- if not mozinfo.isLinux:
- return False, ''
-
-- libc = ctypes.cdll.LoadLibrary('libc.so.6')
-+ libc = ctypes.cdll.LoadLibrary(ctypes.util.find_library('c'))
- O_RDWR = 2
- # These are from linux/videodev2.h
-
diff --git a/www-client/seamonkey/files/firefox-38-hppa-js-syntax-error.patch b/www-client/seamonkey/files/firefox-38-hppa-js-syntax-error.patch
deleted file mode 100644
index 719732e..0000000
--- a/www-client/seamonkey/files/firefox-38-hppa-js-syntax-error.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Ian Stakenvicius <axs@gentoo.org>
-# Parent 2ee9895e032c492705adaf213706d4260ca172c8
-Fix JS_CHECK_STACK_SIZE define for stack-growing-up case (hppa)
-
-Upstream bug 1189011
-Gentoo bug 556196
-
-diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
---- a/js/src/jsfriendapi.h
-+++ b/js/src/jsfriendapi.h
-@@ -15,17 +15,17 @@
- #include "jsbytecode.h"
- #include "jspubtd.h"
-
- #include "js/CallArgs.h"
- #include "js/CallNonGenericMethod.h"
- #include "js/Class.h"
-
- #if JS_STACK_GROWTH_DIRECTION > 0
--# define JS_CHECK_STACK_SIZE(limit, sp) (MOZ_LIKELY(((uintptr_t)(sp) < (limit)))
-+# define JS_CHECK_STACK_SIZE(limit, sp) (MOZ_LIKELY((uintptr_t)(sp) < (limit)))
- #else
- # define JS_CHECK_STACK_SIZE(limit, sp) (MOZ_LIKELY((uintptr_t)(sp) > (limit)))
- #endif
-
- class JSAtom;
- struct JSErrorFormatString;
- class JSLinearString;
- struct JSJitInfo;
diff --git a/www-client/seamonkey/seamonkey-2.35.ebuild b/www-client/seamonkey/seamonkey-2.35.ebuild
index 841dac1..d39821d 100644
--- a/www-client/seamonkey/seamonkey-2.35.ebuild
+++ b/www-client/seamonkey/seamonkey-2.35.ebuild
@@ -30,7 +30,7 @@
MOZCONFIG_OPTIONAL_JIT="enabled"
inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.39 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
-PATCHFF="firefox-38.0-patches-0.3"
+PATCHFF="firefox-38.0-patches-04"
PATCH="${PN}-2.33-patches-01"
EMVER="1.8.2"
diff --git a/www-client/seamonkey/seamonkey-2.38.ebuild b/www-client/seamonkey/seamonkey-2.38.ebuild
index 5c64288..77c945d 100644
--- a/www-client/seamonkey/seamonkey-2.38.ebuild
+++ b/www-client/seamonkey/seamonkey-2.38.ebuild
@@ -30,7 +30,7 @@
MOZCONFIG_OPTIONAL_JIT="enabled"
inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.41 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
-PATCHFF="firefox-40.0-patches-0.01"
+PATCHFF="firefox-41.0-patches-01"
PATCH="${PN}-2.33-patches-01"
EMVER="1.8.2"
@@ -119,8 +119,6 @@
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/firefox"
- epatch "${FILESDIR}"/firefox-38-hppa-js-syntax-error.patch #556196
- epatch "${FILESDIR}"/firefox-38-dont-hardcode-libc-soname.patch #557956
popd &>/dev/null || die
# Shell scripts sometimes contain DOS line endings; bug 391889
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 7bcc0f0..e02f718 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,4 +1,2 @@
-DIST vivaldi-1.0.283.8_p1-amd64.deb 39888582 SHA256 a96efd48782b70ba0888230cc05f4cae11d82f0ec6e1737a2d4a5ca15e38b5fe SHA512 fb6126d3860d920da361c52a15e35c81b0211ec24ea139848a4b1f8299630dd79251563fcd4f0358ad1b7d2f5b2cb43354981a92f6943960ad7988e6b35d5939 WHIRLPOOL b924ce90b2a73e2b85330226919d19c33282818a0f1728582a326590649b9218735f92e9213796cf36aadade9fdb8fc7248871d177baffcf32c1fd5ef132b859
-DIST vivaldi-1.0.283.8_p1-i386.deb 40037526 SHA256 23ed900371afea966b1c7fd9b6fc4f27d72fae1a2481627105b37fada0b93171 SHA512 c45d229c1b569a0f48704a5b7035a30cc381749680011463e623e3fc0c149bd11ac13262e91b1bc8dbe7b5b84d565721b0524f8dd5f85c59fa8e5f4dc061c881 WHIRLPOOL a2da0f5c7d2cd12fbe8a509757b7d852ffc9deb16aea5df2cfb03d6f471775d775d1329c1657020bf9f50daae48f940b3e3d83ab914fc0c8e9ad190da52840d0
-DIST vivaldi-1.0.288.3_p1-amd64.deb 39924644 SHA256 86bee895601dbee6f3808b8846e65d2f6a786d2d0ea213c6767fdbea561c3480 SHA512 55919c588391d548f1623fdea43997da297e58f708bad742e8e3334945044dc8734729fbb3f5985c4ee5ccd8e3d8a07d8e94efffbabb16adada03beabb769465 WHIRLPOOL 06ff1132aeade8d1b1c2036be8d7e0a303196020bb75651a978a741cc72aa2531bb57030495f0fab06a7c7a880e26afaddcfdbc9fcb1e384518aa94cca4c4855
-DIST vivaldi-1.0.288.3_p1-i386.deb 40121952 SHA256 27f323d6c138cba6095dfa4dc17672096f421b02161c09d16394a70440242347 SHA512 4813f36cbe999a6d7a801667cb6093d2bb6289ba8c1221e427bd3ec459f07e44949494b3f9c1d41b013fb459dc07d5f641ad6f16423714d98d4b24de94bac013 WHIRLPOOL 7d01912f6f2f64285cfe6ebc330da68467996e387ed7373b814e77248ddf6d167b2b126836cf41c25f47dc0d4eb2986d4edacf994894d17c0993bf10f0978b02
+DIST vivaldi-1.0.291.18_p1-amd64.deb 40035786 SHA256 057fd309ac396dcb1170a83dcc0ea9d1804839e6846dd607d92189d25530ed08 SHA512 1fc5508aed4f850ecf097e0551b0342dca9f29745a2f6161301ef993f289eaa82a10538ba47c64e53bd0b85cf4c5ea3358f680811c7dfa30649f36993e4960c1 WHIRLPOOL dda5ce0c847c80ccfdb4b94a6421297cecb95e6da59e24986d6162dd8c51fb52601e3f3316fb5008b1f921bc0fae8f2301ecc1ba55f7440d361978755a9b0fbe
+DIST vivaldi-1.0.291.18_p1-i386.deb 40162732 SHA256 f66debe9282d34e56f2b9309bce0e9d5f3f002165dc16c3e1931b27edf12f261 SHA512 e5caf75aae4dac7054e79ba36604a32363550dd94da5eeb0f9a217d512058e368d81c2fb1ef3a050ce725acaa239a323d0450ee724d6b4c5e73ad7a109fe8216 WHIRLPOOL 22e0d087aeb4a2c66eadbb73fb3b827c9480df46e8f132e7e2605335118a70cdb041842da5f2c8f34c60f2bfbec18be3915071a747bacbf2bfc1cf819464cb21
diff --git a/www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch b/www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch
index e1fc56f..ee8d0c7 100644
--- a/www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch
+++ b/www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch
@@ -4,8 +4,8 @@
FLASH_PATH="/usr/lib64/chromium/PepperFlash/libpepflashplayer.so" # openSuse 64-bit
elif [ -f "/usr/lib/pepflashplugin-installer/libpepflashplayer.so" ]; then
FLASH_PATH="/usr/lib/pepflashplugin-installer/libpepflashplayer.so" # ppa:skunk/pepper-flash
-+elif [ -f "/usr/lib64/chromium-browser/PepperFlash/libpepflashplayer.so" ]; then
-+ FLASH_PATH="/usr/lib64/chromium-browser/PepperFlash/libpepflashplayer.so" # www-plugins/chrome-binary-plugins
++elif [ -f "/usr/@LIBDIR@/chromium-browser/PepperFlash/libpepflashplayer.so" ]; then
++ FLASH_PATH="/usr/@LIBDIR@/chromium-browser/PepperFlash/libpepflashplayer.so" # www-plugins/chrome-binary-plugins
fi
if [ -f $FLASH_PATH ]; then
FLASH_VERSION=`grep -m 1 -a -o "LNX [[:digit:]]\+,[[:digit:]]\+,[[:digit:]]\+,[[:digit:]]\+" $FLASH_PATH | cut -c 5- | sed -e "s/,/./g"`
diff --git a/www-client/vivaldi/vivaldi-1.0.283.8_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.283.8_p1.ebuild
deleted file mode 100644
index 6378a5a..0000000
--- a/www-client/vivaldi/vivaldi-1.0.283.8_p1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CHROMIUM_LANGS="
- am ar bg bn ca cs da de el en_GB en_US es_419 es et fa fil fi fr gu he hi
- hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv
- sw ta te th tr uk vi zh_CN zh_TW
-"
-inherit chromium eutils multilib unpacker toolchain-funcs
-
-DESCRIPTION="A new browser for our friends"
-HOMEPAGE="http://vivaldi.com/"
-VIVALDI_BASE_URI="${HOMEPAGE}download/snapshot/${PN}-snapshot_${PV/_p/-}_"
-SRC_URI="
- amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
- x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="bindist mirror"
-
-S=${WORKDIR}
-
-RDEPEND="
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/openssl-1.0.1:0
- gnome-base/gconf:2
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/freetype
- net-misc/curl
- net-print/cups
- sys-apps/dbus
- sys-libs/libcap
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-VIVALDI_HOME="opt/${PN}-snapshot"
-
-src_unpack() {
- unpack_deb ${A}
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0.275.3_p1-flash.patch
-
- sed -i \
- -e 's|vivaldi-snapshot|vivaldi|g' \
- usr/share/applications/${PN}-snapshot.desktop \
- usr/share/xfce4/helpers/${PN}-snapshot.desktop || die
-
- mv usr/share/doc/${PN}-snapshot usr/share/doc/${PF} || die
-
- rm etc/cron.daily/${PN}-snapshot || die
- rmdir etc/cron.daily/ || die
- rmdir etc/ || die
-
- rm usr/bin/${PN}-snapshot || die
- rm _gpgbuilder || die
-
- local c d
- for d in 16 22 24 32 48 64 128 256; do
- mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
- cp \
- ${VIVALDI_HOME}/product_logo_${d}.png \
- usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die
- done
-
- pushd "${VIVALDI_HOME}/locales" > /dev/null || die
- chromium_remove_language_paks
- popd > /dev/null || die
-
-}
-
-src_install() {
- mv * "${D}" || die
- dosym /${VIVALDI_HOME}/${PN}-snapshot /usr/bin/${PN}
-
- fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
diff --git a/www-client/vivaldi/vivaldi-1.0.288.3_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.288.3_p1.ebuild
deleted file mode 100644
index 6378a5a..0000000
--- a/www-client/vivaldi/vivaldi-1.0.288.3_p1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CHROMIUM_LANGS="
- am ar bg bn ca cs da de el en_GB en_US es_419 es et fa fil fi fr gu he hi
- hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv
- sw ta te th tr uk vi zh_CN zh_TW
-"
-inherit chromium eutils multilib unpacker toolchain-funcs
-
-DESCRIPTION="A new browser for our friends"
-HOMEPAGE="http://vivaldi.com/"
-VIVALDI_BASE_URI="${HOMEPAGE}download/snapshot/${PN}-snapshot_${PV/_p/-}_"
-SRC_URI="
- amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
- x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="bindist mirror"
-
-S=${WORKDIR}
-
-RDEPEND="
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/openssl-1.0.1:0
- gnome-base/gconf:2
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/freetype
- net-misc/curl
- net-print/cups
- sys-apps/dbus
- sys-libs/libcap
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-VIVALDI_HOME="opt/${PN}-snapshot"
-
-src_unpack() {
- unpack_deb ${A}
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0.275.3_p1-flash.patch
-
- sed -i \
- -e 's|vivaldi-snapshot|vivaldi|g' \
- usr/share/applications/${PN}-snapshot.desktop \
- usr/share/xfce4/helpers/${PN}-snapshot.desktop || die
-
- mv usr/share/doc/${PN}-snapshot usr/share/doc/${PF} || die
-
- rm etc/cron.daily/${PN}-snapshot || die
- rmdir etc/cron.daily/ || die
- rmdir etc/ || die
-
- rm usr/bin/${PN}-snapshot || die
- rm _gpgbuilder || die
-
- local c d
- for d in 16 22 24 32 48 64 128 256; do
- mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
- cp \
- ${VIVALDI_HOME}/product_logo_${d}.png \
- usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die
- done
-
- pushd "${VIVALDI_HOME}/locales" > /dev/null || die
- chromium_remove_language_paks
- popd > /dev/null || die
-
-}
-
-src_install() {
- mv * "${D}" || die
- dosym /${VIVALDI_HOME}/${PN}-snapshot /usr/bin/${PN}
-
- fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
diff --git a/www-client/vivaldi/vivaldi-1.0.291.18_p1-r1.ebuild b/www-client/vivaldi/vivaldi-1.0.291.18_p1-r1.ebuild
new file mode 100644
index 0000000..c40dd91
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-1.0.291.18_p1-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+ am ar bg bn ca cs da de el en_GB en_US es_419 es et fa fil fi fr gu he hi
+ hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv
+ sw ta te th tr uk vi zh_CN zh_TW
+"
+inherit chromium eutils multilib unpacker toolchain-funcs
+
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="${HOMEPAGE}download/snapshot/${PN}-snapshot_${PV/_p/-}_"
+SRC_URI="
+ amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+ x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="bindist mirror"
+
+S=${WORKDIR}
+
+RDEPEND="
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/openssl-1.0.1:0
+ gnome-base/gconf:2
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype
+ net-misc/curl
+ net-print/cups
+ sys-apps/dbus
+ sys-libs/libcap
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+VIVALDI_HOME="opt/${PN}-snapshot"
+
+src_unpack() {
+ unpack_deb ${A}
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.0.275.3_p1-flash.patch
+ sed -i \
+ -e "s|@LIBDIR@|$(get_libdir)|g" \
+ opt/vivaldi-snapshot/vivaldi-snapshot || die
+
+ sed -i \
+ -e 's|vivaldi-snapshot|vivaldi|g' \
+ usr/share/applications/${PN}-snapshot.desktop \
+ usr/share/xfce4/helpers/${PN}-snapshot.desktop || die
+
+ mv usr/share/doc/${PN}-snapshot usr/share/doc/${PF} || die
+
+ rm etc/cron.daily/${PN}-snapshot || die
+ rmdir etc/cron.daily/ || die
+ rmdir etc/ || die
+
+ rm usr/bin/${PN}-snapshot || die
+ rm _gpgbuilder || die
+
+ local c d
+ for d in 16 22 24 32 48 64 128 256; do
+ mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+ cp \
+ ${VIVALDI_HOME}/product_logo_${d}.png \
+ usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die
+ done
+
+ pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+ chromium_remove_language_paks
+ popd > /dev/null || die
+
+}
+
+src_install() {
+ mv * "${D}" || die
+ dosym /${VIVALDI_HOME}/${PN}-snapshot /usr/bin/${PN}
+
+ fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+}
diff --git a/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild b/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild
index 0c76213..cc8d4f7 100644
--- a/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild
+++ b/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild
@@ -23,7 +23,10 @@
KEYWORDS="amd64 ~arm x86"
fi
-RDEPEND="dev-libs/fcgi"
+RDEPEND="
+ dev-libs/fcgi
+ systemd? ( sys-apps/systemd )
+"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/www-misc/monitorix/monitorix-3.5.1.ebuild b/www-misc/monitorix/monitorix-3.5.1.ebuild
index b638a22..a1aeb79 100644
--- a/www-misc/monitorix/monitorix-3.5.1.ebuild
+++ b/www-misc/monitorix/monitorix-3.5.1.ebuild
@@ -7,7 +7,7 @@
inherit eutils systemd user
DESCRIPTION="A lightweight system monitoring tool"
-HOMEPAGE="http://www.${PN}.org/"
+HOMEPAGE="http://www.monitorix.org/"
SRC_URI="http://www.${PN}.org/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index efa98a3..86ef61b 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,6 +1,6 @@
-DIST google-chrome-beta_46.0.2490.52-1_amd64.deb 47188898 SHA256 c96732a2a9f6c09166613f868e1282aead0d473a9e5b7c294d54324c724c0345 SHA512 fd6a77a52856220deb956203fa286bacfb75d2a85452747a154aa36c172a52df94199f26a748785a820309fc611fb2fe43437685c5e8eccc9806e1cae55e5644 WHIRLPOOL c00eb4a70956119cdca5bca07e908fc2fe82251c41fe845d9f5749efb102fb270955f0445a7db6acdcb372664d036e01a7e14fd68b02b308d8bf86401f268141
-DIST google-chrome-beta_46.0.2490.52-1_i386.deb 46989238 SHA256 a5164faa32d22cf60cf9c3861760f7d7507c55a2bf94d8297acef12f58674f82 SHA512 28021f863fc16758e64675d45399719984d34f956dfbfa7ef007c635fac3b0e6ffaf87a4ecdbd6575d6f745ecaa04bfff01904100b7106592928ce630efc6636 WHIRLPOOL 27452b59301dfc10f0e7998effe89b7313e1538c7f42e1b7fca838cf800a3067caeda54607055aa11bb797ff44c5704e0a155194338ebfc591ea41b8148fc66d
+DIST google-chrome-beta_46.0.2490.64-1_amd64.deb 47216802 SHA256 87def8cb17a58b50ea5f048bdf3d23ce2a2ca3b0e73b95c21956a503f1d81bd5 SHA512 a8efd58eae215ecaea0841d11b1b9cee99229b5486412c95e031d26b2d600e04e7e603470fb42c10cbf7deb69e95483510d6abab4f8af479d8afb6be1889cb30 WHIRLPOOL 9b633273d6ee84799eeb0c78a61a4b9fa3babfc1a9cb13ff6f0cfb6be7648aecaffd65f55cd466a38634beaf2986829f6bf3c89eeea2f259539159733befbade
+DIST google-chrome-beta_46.0.2490.64-1_i386.deb 46756938 SHA256 a465c8ce96dff605e532b92bade2628e6a5b7b7f206ab97716bf64a039b33d48 SHA512 7321ef2851bc91b093b34446d603ad8267c012149b6b95941d4418f143b1ecf7a2941b1591034b6f02947aaca381beab0ef1a7dedcd367b2dccb93d3e32e1c8f WHIRLPOOL 2661821a0b2af6f7aa002e2c7e4f7e07db6883b5db4f79cc78abb84914c490b8c79c83c0c8096dcf283cd87e3a06bb6bfdae060fed5c30e4bf77ca96d679b3cf
DIST google-chrome-stable_45.0.2454.101-1_amd64.deb 47425034 SHA256 f22f41e2ab4af3d0ef4b88f47abcf9fbcd9e9ec5e0a1ecb275cbb673ec688bb3 SHA512 506f846c1da31a2be5aac306d40e293ce0d36c7278e86a74700b223f7ef35bf386ce81bd989d37bec70c55f1339ec31eaf428ce36b7ea1185c3da15612791e64 WHIRLPOOL d9ca61d2a8ec2c1551c8a4358e62e060fa527e82301a23909a46b27d764ebf45afcea0bd399ca8e5a658eca77dcca96763ab676e4060a64789a643f5756e02ba
DIST google-chrome-stable_45.0.2454.101-1_i386.deb 46992150 SHA256 a5f2275d59b9bf49f094c62ce6a60610be5826cf96edf09525679f5e67a588d2 SHA512 ec05f2418ae25803eb0130c08f804d03d1dd5d6997d269298d6cf43fb74a75a60792ddef499ed97695951c2272155db087f2eb9ab7c7196847ccf421641e9118 WHIRLPOOL 86719d3d52bb32c716eb1fb7136223357d489e81e36096f8438bf565984bbcf44c5f3bcb2ff278615cb6eece988202470b30c0505e49726bdc6ab190c8fdb186
-DIST google-chrome-unstable_47.0.2522.1-1_amd64.deb 47590434 SHA256 57e8c77e5846b6f3a05d54645ad15afc09dc57fa7931fe1c62bd493a3684c499 SHA512 a348f1b5110c9112cc775a5ad831104f62bef82adab83ff8db389b7bfe78cee6cb4a4d97104bfc2dbf095bc91e26f1cb046d3d9d52e74dc26805a18ed591e836 WHIRLPOOL dfbf27c6932d613798fafeb6d70f0dac8cb9ba8b154ec2098096e98c1f832ba0887468ac6665d89549d71440d9803eceb3ccbb5624f9d97fdf8a1a20d629f2ee
-DIST google-chrome-unstable_47.0.2522.1-1_i386.deb 46988260 SHA256 cf40b161e61d266bcc99134b4dcbde5d49af747a7f438937a0f12ed5c9111665 SHA512 6bfa3bc74e73696caa06dc3d9deafafc09a782b16bbb4bea8a85368c7ac839bafb7d53dd68ba9cf010877ebd9ae9920347a75c8f1b12e085f1fd4b67f0531ada WHIRLPOOL 32bda47dd82cc0b426683c3a76660ea3d6a4cfd0ca781ed18f178a9e2b16947468230c47809f5ccddee552b2ab7e7ac73fd5e7b31ed97782ed3819e9fe0c2d51
+DIST google-chrome-unstable_47.0.2526.8-1_amd64.deb 47158322 SHA256 b03f75b829c8cc3dcc3e9d19048c2b6bca5bbaa7b087d85cfb11cdb2143eff00 SHA512 c1b55b0ece5141560d4d1479eeee160c9696d00af4561d2d3aa291693dd2d5c5430bbbf2d6400e1e7cf05686d11aa78b989f0b18ba2c96663678104c2576729c WHIRLPOOL 909c9516c433db3b9813f942d58b27aa8e68a1c6c2c44b65905f0a71cc772adb52eb2f788c8a2697a14113a4d749cbfa38f6b2ea8c3425f7b028abfda0de91a0
+DIST google-chrome-unstable_47.0.2526.8-1_i386.deb 46796668 SHA256 454a3df7c0aca2d3d9a09c4f972831c59d57f80608ac45177db4296ccca64cda SHA512 dcbd903005525cd75482f22e0bc9d3ea9f058e86a12a7eceb1bd1aaeb21f98a80d591525035618b259e76b11b3929bb7f126f9e8285e2360b2d8a467e768de7b WHIRLPOOL 6b12ec0be4b2ee827b294948f308a15ef9475ab65c9bb66d5122fc0500bdfdea2655fe4fdc1eda5ae2988eb7059adb980a0c892009d93f8bde7c25012f41afc9
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.52_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.64_beta1.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.52_beta1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.64_beta1.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2522.1_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.8_alpha1.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2522.1_alpha1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.8_alpha1.ebuild
diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest
index 0c22414..2b411b8 100644
--- a/www-plugins/freshplayerplugin/Manifest
+++ b/www-plugins/freshplayerplugin/Manifest
@@ -1,2 +1,3 @@
DIST freshplayerplugin-0.3.1.tar.gz 2711793 SHA256 4ed582896fff618d8025dd51bbf2fae0c5e36e2875065acc536b2c76befb593c SHA512 78e87548ecd758ad9ff0dab59b1b2f68b8b9a639ff19de08046a7090ab51d87f0e4c879b1b0075151ff17642d50ff937e199733c55c4a9cff94599fd98eae9de WHIRLPOOL d8be949cc9a2087d8f62fcfb4a1786d68574a5ec52dccc45da06df9838ee84e8dd4d7f3c3f86703e428df1b3f4d6d75c1e87d0809d3f78550a16ed278d51b211
DIST freshplayerplugin-0.3.2.tar.gz 2713241 SHA256 b3687b9d67ab88c64fea32b17f281f142bf861e33d9135b00da5d90d385d9ce5 SHA512 9c908ce1a168c0797dc3b0da8e98d722cc32d729acb1c4a8f38b7e95c23fe870baabe4b3f8790d021711578fdb9a61f44aba27cebb924fec9aabcf8cd91323e5 WHIRLPOOL 2e9b78bcc3605409ec6853caf31aab03658c044e0d05449a620b31261323856503db8db960db9992d6db4fd61df8f9feb05800124c2f4a450c4ff65b22fc7c34
+DIST freshplayerplugin-0.3.3.tar.gz 2722467 SHA256 0dc20d6ca083b24225d8bbab88be1ed483034bde71eb360962de47cdb2e51f00 SHA512 ae85adb7e894adf8c1cd4228d15975c9d5fefdb6c6d3aa90e65d93865996c787f6378eb145f35ed348db67cec0adad794b78a0f77519236c28082630ad3756bc WHIRLPOOL 3e9694738d5e926b44588560b2a6bf50eeeefc35855722bda2494a9d08bd11c8ed844791cdd8a312592be0ef002d3ee6b1c7fc090bbd94ca438ccc8a148eac99
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.3-r1.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.3-r1.ebuild
new file mode 100644
index 0000000..6f410bd
--- /dev/null
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.3-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="2.8.8"
+
+inherit cmake-utils multilib
+
+LICENSE="MIT"
+HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
+DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
+SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT=0
+IUSE="gtk3 jack libav libressl pulseaudio vaapi vdpau"
+
+KEYWORDS="~amd64 ~x86"
+
+HWDEC_DEPEND="
+ libav? ( media-video/libav:0=[vaapi?,vdpau?,x264] )
+ !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?,x264] )
+ x11-libs/libva
+ x11-libs/libvdpau
+"
+
+CDEPEND="
+ dev-libs/glib:2=
+ dev-libs/libevent:=[threads]
+ media-libs/alsa-lib:=
+ media-libs/freetype:2=
+ media-libs/libv4l:0=
+ media-libs/mesa:=[egl,gles2]
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
+ x11-libs/libdrm:=
+ x11-libs/pango:=[X]
+ jack? ( media-sound/jack-audio-connection-kit )
+ pulseaudio? ( media-sound/pulseaudio )
+ !gtk3? ( x11-libs/gtk+:2= )
+ gtk3? ( x11-libs/gtk+:3= )
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ vaapi? ( ${HWDEC_DEPEND} )
+ vdpau? ( ${HWDEC_DEPEND} )
+"
+
+DEPEND="${CDEPEND}
+ dev-util/ragel
+ virtual/pkgconfig
+ "
+RDEPEND="${CDEPEND}
+ || (
+ www-plugins/chrome-binary-plugins[flash]
+ www-client/google-chrome
+ www-client/google-chrome-beta
+ www-client/google-chrome-unstable
+ )
+ "
+
+PATCHES=( "${FILESDIR}/0.2.4-cmake.patch" )
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_with jack JACK)
+ $(cmake-utils_use_with pulseaudio PULSEAUDIO)
+ -DWITH_GTK=$(usex gtk3 3 2)
+ -DCMAKE_SKIP_RPATH=1
+ )
+ if use vaapi || use vdpau ; then
+ mycmakeargs+=( -DWITH_HWDEC=1 )
+ else
+ mycmakeargs+=( -DWITH_HWDEC=0 )
+ fi
+ cmake-utils_src_configure
+}
+
+src_install() {
+ dodoc ChangeLog data/freshwrapper.conf.example README.md
+ exeinto /usr/$(get_libdir)/nsbrowser/plugins
+ doexe "${BUILD_DIR}/libfreshwrapper-flashplayer.so"
+}
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.3.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.3.ebuild
new file mode 100644
index 0000000..5bfcf03
--- /dev/null
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="2.8.8"
+
+inherit cmake-utils multilib
+
+LICENSE="MIT"
+HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
+DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
+SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT=0
+IUSE="gtk3 jack libav pulseaudio vaapi vdpau"
+
+KEYWORDS="~amd64 ~x86"
+
+HWDEC_DEPEND="
+ libav? ( media-video/libav:0=[vaapi?,vdpau?,x264] )
+ !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?,x264] )
+ x11-libs/libva
+ x11-libs/libvdpau
+"
+
+CDEPEND="
+ dev-libs/glib:2=
+ dev-libs/libevent:=[threads]
+ dev-libs/openssl:0=
+ media-libs/alsa-lib:=
+ media-libs/freetype:2=
+ media-libs/libv4l:0=
+ media-libs/mesa:=[egl,gles2]
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
+ x11-libs/libdrm:=
+ x11-libs/pango:=[X]
+ jack? ( media-sound/jack-audio-connection-kit )
+ pulseaudio? ( media-sound/pulseaudio )
+ !gtk3? ( x11-libs/gtk+:2= )
+ gtk3? ( x11-libs/gtk+:3= )
+ vaapi? ( ${HWDEC_DEPEND} )
+ vdpau? ( ${HWDEC_DEPEND} )
+"
+
+DEPEND="${CDEPEND}
+ dev-util/ragel
+ virtual/pkgconfig
+ "
+RDEPEND="${CDEPEND}
+ || (
+ www-plugins/chrome-binary-plugins[flash]
+ www-client/google-chrome
+ www-client/google-chrome-beta
+ www-client/google-chrome-unstable
+ )
+ "
+
+PATCHES=( "${FILESDIR}/0.2.4-cmake.patch" )
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_with jack JACK)
+ $(cmake-utils_use_with pulseaudio PULSEAUDIO)
+ -DWITH_GTK=$(usex gtk3 3 2)
+ -DCMAKE_SKIP_RPATH=1
+ )
+ if use vaapi || use vdpau ; then
+ mycmakeargs+=( -DWITH_HWDEC=1 )
+ else
+ mycmakeargs+=( -DWITH_HWDEC=0 )
+ fi
+ cmake-utils_src_configure
+}
+
+src_install() {
+ dodoc ChangeLog data/freshwrapper.conf.example README.md
+ exeinto /usr/$(get_libdir)/nsbrowser/plugins
+ doexe "${BUILD_DIR}/libfreshwrapper-flashplayer.so"
+}
diff --git a/www-servers/bozohttpd/bozohttpd-20140708-r1.ebuild b/www-servers/bozohttpd/bozohttpd-20140708-r1.ebuild
new file mode 100644
index 0000000..1b68c21
--- /dev/null
+++ b/www-servers/bozohttpd/bozohttpd-20140708-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs
+
+DESCRIPTION="bozohttpd is a small and secure http server"
+HOMEPAGE="http://www.eterna.com.au/bozohttpd/"
+SRC_URI="http://www.eterna.com.au/bozohttpd/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="libressl"
+
+DEPEND="!libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}
+ virtual/logger"
+
+src_prepare() {
+ mv Makefile{.boot,} || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" OPT="${CFLAGS}"
+}
+
+src_install() {
+ dobin bozohttpd
+ doman bozohttpd.8
+
+ newconfd "${FILESDIR}"/${PN}.conffile bozohttpd
+ newinitd "${FILESDIR}"/${PN}.initscript bozohttpd
+}
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index d62c419..8574268 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,3 +1 @@
-DIST cherokee-1.2.103.zip 5783906 SHA256 0e125cba2ad2d0dc48ecca3af4894b92ec5fab422a9d7d27fd0c7a74751e5f35 SHA512 63ba5d41f61d2816df7dce3b572616eca5fc09dd2e9dca9efa2cbf28a38d6d5e1840e4cd302a0eb5780b1a0abe7632232511c77d9e383f0b945d3eca960af4ab WHIRLPOOL 00f592bc41eecd6422a95d6e36bf5c46b4845afe2adad756635d0d2c1e5c1bfde03e633bcbde8cab207c31050dc055e26fcdbf69512a8b61422242905b792754
DIST cherokee-1.2.104.zip 6200164 SHA256 1acc80de22ed0aa4a0d95aa643ac92a2cce435480258081213214bec05da4098 SHA512 9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d WHIRLPOOL b0c13205014daee461538d0b7968bf255fd6633dbf3defeb2505ce463772c6f56b06ef91ff6b055bd589a15d19974d794fcbe039c1552b04a6bd1228a690f417
-DIST cherokee-ctk-master.zip 415092 SHA256 dede313f1d396f1deaf78d9fd9a1270820d2e91761efe827a207b46061f27993 SHA512 c933f15aa7197f5001b3120fd27898b2e97b78998e0bd0d68e7ced16a57950b7e85e4d731ca0420cd8a0fb292b4cd34b9497928183ccca22c9aa3a16285f9ef7 WHIRLPOOL 92453d3478ae238e5d9422fc2e8f0f1406576f9753ba0ed644ae8e093862b72c8c634bdaaeec4c0f725bdef8f4bc5c7113a916c2cdd8fbb0a14db61e54173c57
diff --git a/www-servers/cherokee/cherokee-1.2.103-r2.ebuild b/www-servers/cherokee/cherokee-1.2.103-r2.ebuild
deleted file mode 100644
index 1d87b9e..0000000
--- a/www-servers/cherokee/cherokee-1.2.103-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-WANT_AUTOMAKE="1.11"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-r1 eutils multilib pam systemd user
-
-DESCRIPTION="An extremely fast and tiny web server"
-SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip
- https://github.com/cherokee/CTK/archive/master.zip -> ${PN}-ctk-master.zip"
-HOMEPAGE="http://www.cherokee-project.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php rrdtool ssl static static-libs"
-
-COMMON_DEPEND="dev-libs/libpcre
- >=sys-libs/zlib-1.1.4-r1
- ffmpeg? ( virtual/ffmpeg )
- geoip? ( dev-libs/geoip )
- ldap? ( net-nds/openldap )
- mysql? ( >=virtual/mysql-5 )
- nls? ( virtual/libintl )
- pam? ( virtual/pam )
- php? ( || (
- dev-lang/php[fpm]
- dev-lang/php[cgi]
- ) )
- ssl? ( dev-libs/openssl )"
-DEPEND="${COMMON_DEPEND}
- nls? ( sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
- rrdtool? ( net-analyzer/rrdtool )"
-
-RESTRICT="test"
-
-WEBROOT="/var/www/localhost"
-
-src_unpack() {
- unpack ${A}
- mv "webserver-${PV}" "${S}" || die
- rmdir "${S}/admin/CTK" || die
- mv "CTK-master" "${S}/admin/CTK" || die
-}
-
-pkg_setup() {
- enewgroup cherokee
- enewuser cherokee -1 -1 /var/www cherokee
-}
-
-src_prepare() {
- python_setup
- epatch \
- "${FILESDIR}/${PN}-1.2.99-gentoo.patch" \
- "${FILESDIR}/${PN}-1.2.103-linux3.patch"
-
- "${S}/po/admin/generate_POTFILESin.py" > po/admin/POTFILES.in
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use admin ; then
- myconf="${myconf} --enable-admin --with-python=/usr/bin/python"
- else
- myconf="${myconf} --disable-admin"
- fi
-
- # Uses autodetect because --with-php requires path to php-{fpm,cgi}.
- if ! use php ; then
- myconf="${myconf} --without-php"
- fi
-
- if use static ; then
- myconf="${myconf} --enable-static-module=all"
- fi
-
- local os="Unknown"
- case "${CHOST}" in
- *-freebsd*)
- os="FreeBSD" ;;
- *-netbsd*)
- os="NetBSD" ;;
- *-openbsd*)
- os="OpenBSD" ;;
- *)
- os="Linux" ;;
- esac
-
- econf \
- $(use_enable debug trace) \
- $(use_enable debug backtraces) \
- $(use_enable ipv6) \
- $(use_enable kernel_linux epoll) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_enable static-libs static) \
- $(use_with ffmpeg) \
- $(use_with geoip) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_with ssl libssl) \
- --disable-dependency-tracking \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --enable-os-string="Gentoo ${os}" \
- --enable-tmpdir="${EPREFIX}/var/tmp" \
- --localstatedir="${EPREFIX}/var" \
- --with-wwwroot="${EPREFIX}${WEBROOT}/htdocs" \
- --with-cgiroot="${EPREFIX}${WEBROOT}/cgi-bin" \
- --with-wwwuser=cherokee \
- --with-wwwgroup=cherokee \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- if ! use static-libs ; then
- find "${ED}" -name '*.la' -delete || die
- elif ! use static ; then
- find "${ED}/usr/$(get_libdir)/cherokee" '(' -name '*.la' -o -name '*.a' ')' -delete || die
- fi
-
- dodoc AUTHORS NEWS README.rst
-
- if use pam ; then
- pamd_mimic system-auth cherokee auth account session || die
- fi
-
- newinitd "${FILESDIR}/${PN}-initd-1.2.99" ${PN}
- newconfd "${FILESDIR}/${PN}-confd-1.2.98" ${PN}
-
- if ! use admin ; then
- rm -r \
- "${ED}"/usr/bin/cherokee-admin-launcher \
- "${ED}"/usr/bin/CTK-run \
- "${ED}"/usr/sbin/cherokee-admin \
- "${ED}"/usr/share/cherokee/admin || die
- fi
-
- exeinto /usr/share/doc/${PF}/contrib
- doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py}
-
- #move the htdocs to docdir, bug #429632
- docompress -x /usr/share/doc/"${PF}"/htdocs.dist
- mv "${ED}"${WEBROOT}/htdocs \
- "${ED}"/usr/share/doc/"${PF}"/htdocs.dist
- mkdir "${ED}"${WEBROOT}/htdocs
-
- keepdir \
- "${WEBROOT}"/htdocs \
- /var/log/cherokee \
- /var/lib/cherokee/graphs/images
- fowners cherokee:cherokee \
- /var/log/cherokee \
- /var/lib/cherokee/graphs \
- /var/lib/cherokee/graphs/images
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate-r1 ${PN}
-
- systemd_dounit "${FILESDIR}"/cherokee.service
-}
-
-pkg_postinst() {
- elog
- if use admin ; then
- elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090"
- elog
- elog "Cherokee currently supports configuration versioning, so from now on,"
- elog "whenever a change is made to the configuration file format,"
- elog "Cherokee-Admin will be able to automatically convert yours to the new"
- elog "release. You simply have to load Cherokee-Admin and it will be converted"
- elog "once you proceed to saving it."
- elog
- elog "There is also a command line utility that you can use to do the exact"
- elog "same thing. Config format can change in different versions. It is"
- elog "provided under:"
- elog " ${EPREFIX}/usr/share/cherokee/admin/upgrade_config.py"
- else
- elog "Try USE=admin if you want an easy way to configure cherokee."
- fi
- elog
- elog "emerge www-servers/spawn-fcgi if you use Ruby on Rails with ${PN}."
- elog
-}
diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild b/www-servers/cherokee/cherokee-1.2.104.ebuild
index a78bc08..6d4655b 100644
--- a/www-servers/cherokee/cherokee-1.2.104.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104.ebuild
@@ -17,7 +17,7 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php rrdtool ssl static static-libs"
+IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap libressl mysql nls pam php rrdtool ssl static static-libs"
COMMON_DEPEND="dev-libs/libpcre
>=sys-libs/zlib-1.1.4-r1
@@ -28,10 +28,14 @@
nls? ( virtual/libintl )
pam? ( virtual/pam )
php? ( || (
- dev-lang/php[fpm]
- dev-lang/php[cgi]
+ dev-lang/php:*[fpm]
+ dev-lang/php:*[cgi]
) )
- ssl? ( dev-libs/openssl )"
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ "
DEPEND="${COMMON_DEPEND}
nls? ( sys-devel/gettext )"
RDEPEND="${COMMON_DEPEND}
diff --git a/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch b/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch
deleted file mode 100644
index 7f96f68..0000000
--- a/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur webserver-1.2.103.orig/admin/SystemStats.py webserver-1.2.103/admin/SystemStats.py
---- webserver-1.2.103.orig/admin/SystemStats.py 2013-01-26 17:52:44.000000000 -0500
-+++ webserver-1.2.103/admin/SystemStats.py 2013-07-15 07:27:11.000000000 -0400
-@@ -39,7 +39,7 @@
- global _stats
-
- if not _stats:
-- if sys.platform == 'linux2':
-+ if sys.platform == 'linux2' or sys.platform == 'linux3':
- _stats = System_stats__Linux()
- elif sys.platform == 'darwin':
- _stats = System_stats__Darwin()
-diff -Naur webserver-1.2.103.orig/admin/util.py webserver-1.2.103/admin/util.py
---- webserver-1.2.103.orig/admin/util.py 2013-01-26 17:52:44.000000000 -0500
-+++ webserver-1.2.103/admin/util.py 2013-07-15 07:29:12.000000000 -0400
-@@ -341,7 +341,7 @@
- def os_get_document_root():
- if sys.platform == 'darwin':
- return "/Library/WebServer/Documents"
-- elif sys.platform == 'linux2':
-+ elif sys.platform == 'linux2' or sys.platform == 'linux3':
- if os.path.exists ("/etc/redhat-release"):
- return '/var/www'
- elif os.path.exists ("/etc/fedora-release"):
-diff -Naur webserver-1.2.103.orig/admin/wizards/php.py webserver-1.2.103/admin/wizards/php.py
---- webserver-1.2.103.orig/admin/wizards/php.py 2013-01-26 17:52:44.000000000 -0500
-+++ webserver-1.2.103/admin/wizards/php.py 2013-07-15 07:29:47.000000000 -0400
-@@ -607,7 +607,7 @@
- first_group = str(root_group)
-
- # Systems
-- if sys.platform == 'linux2':
-+ if sys.platform == 'linux2' or sys.platform == 'linux3':
- if os.getuid() == 0:
- return root_group
- return first_group
diff --git a/www-servers/gatling/gatling-0.13-r1.ebuild b/www-servers/gatling/gatling-0.13-r1.ebuild
new file mode 100644
index 0000000..2c6b7b1
--- /dev/null
+++ b/www-servers/gatling/gatling-0.13-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="High performance web server"
+HOMEPAGE="http://www.fefe.de/gatling/"
+SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="libressl ssl diet"
+REQUIRED_USE="ssl? ( !diet )"
+
+DEPEND=">=dev-libs/libowfat-0.25[diet=]
+ diet? ( dev-libs/dietlibc )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ rm Makefile # leaves us with GNUmakefile
+ epatch "${FILESDIR}/${P}-compile.patch"
+}
+
+src_compile() {
+ local DIET=
+ use diet && DIET='/usr/bin/diet'
+
+ local targets='gatling'
+ use ssl && targets+=' tlsgatling'
+
+ emake DIET="${DIET}" CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} -I${ROOT}usr/include/libowfat" \
+ LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} \
+ || die "emake ${targets} failed"
+}
+
+src_install() {
+ doman gatling.1 || die "installing manpage failed"
+
+ newconfd "${FILESDIR}/gatling.confd" gatling || die
+ newinitd "${FILESDIR}/gatling.initd-2" gatling || die
+ dodoc README.{ftp,http} || die "installing docs failed"
+
+ dobin gatling || die "installing gatling binary failed"
+ use ssl && {
+ dodoc README.tls || die "installing docs failed"
+ dobin tlsgatling || die "installing tlsgatling binary failed"
+ }
+}
+
+pkg_setup() {
+ ebegin "Creating gatling user and group"
+ enewgroup gatling
+ enewuser ${PN} -1 -1 /var/www/localhost ${PN}
+}
diff --git a/www-servers/lighttpd/lighttpd-1.4.37-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.37-r1.ebuild
new file mode 100644
index 0000000..8aa54dd
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.37-r1.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit base autotools eutils depend.php readme.gentoo user systemd
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="http://www.lighttpd.net/"
+SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcache mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
+
+REQUIRED_USE="kerberos? ( ssl !libressl )"
+
+CDEPEND="
+ bzip2? ( app-arch/bzip2 )
+ fam? ( virtual/fam )
+ gdbm? ( sys-libs/gdbm )
+ ldap? ( >=net-nds/openldap-2.1.26 )
+ libev? ( >=dev-libs/libev-4.01 )
+ lua? ( >=dev-lang/lua-5.1:= )
+ memcache? ( dev-libs/libmemcache )
+ mysql? ( >=virtual/mysql-4.0 )
+ pcre? ( >=dev-libs/libpcre-3.1 )
+ php? ( dev-lang/php:*[cgi] )
+ rrdtool? ( net-analyzer/rrdtool )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] )
+ libressl? ( dev-libs/libressl:= )
+ )
+ webdav? (
+ dev-libs/libxml2
+ >=dev-db/sqlite-3
+ sys-fs/e2fsprogs
+ )
+ xattr? ( kernel_linux? ( sys-apps/attr ) )
+ zlib? ( >=sys-libs/zlib-1.1 )"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ doc? ( dev-python/docutils )
+ test? (
+ virtual/perl-Test-Harness
+ dev-libs/fcgi
+ )"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-apache )
+"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+ local config="${D}/etc/lighttpd/lighttpd.conf"
+
+ # enable php/mod_fastcgi settings
+ use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
+
+ # enable stat() caching
+ use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
+
+ # automatically listen on IPv6 if built with USE=ipv6. Bug #234987
+ use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
+}
+
+# remove non-essential stuff (for USE=minimal)
+remove_non_essential() {
+ local libdir="${D}/usr/$(get_libdir)/${PN}"
+
+ # text docs
+ use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
+
+ # non-essential modules
+ rm -f \
+ ${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
+
+ # allow users to keep some based on USE flags
+ use pcre || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
+ use webdav || rm -f ${libdir}/mod_webdav.*
+ use mysql || rm -f ${libdir}/mod_mysql_vhost.*
+ use lua || rm -f ${libdir}/mod_{cml,magnet}.*
+ use rrdtool || rm -f ${libdir}/mod_rrdtool.*
+ use zlib || rm -f ${libdir}/mod_compress.*
+}
+
+pkg_setup() {
+ if ! use pcre ; then
+ ewarn "It is highly recommended that you build ${PN}"
+ ewarn "with perl regular expressions support via USE=pcre."
+ ewarn "Otherwise you lose support for some core options such"
+ ewarn "as conditionals and modules such as mod_re{write,direct}"
+ ewarn "and mod_ssi."
+ fi
+ if use mmap; then
+ ewarn "You have enabled the mmap option. This option may allow"
+ ewarn "local users to trigger SIGBUG crashes. Use this option"
+ ewarn "with EXTRA care."
+ fi
+ enewgroup lighttpd
+ enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
+
+ DOC_CONTENTS="IPv6 migration guide:\n
+ http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
+}
+
+src_prepare() {
+ base_src_prepare
+ #dev-python/docutils installs rst2html.py not rst2html
+ sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
+ die "sed doc/Makefile.am failed"
+ eautoreconf
+}
+
+src_configure() {
+ econf --libdir=/usr/$(get_libdir)/${PN} \
+ --enable-lfs \
+ $(use_enable ipv6) \
+ $(use_enable mmap) \
+ $(use_with bzip2) \
+ $(use_with fam) \
+ $(use_with gdbm) \
+ $(use_with kerberos kerberos5) \
+ $(use_with ldap) \
+ $(use_with libev) \
+ $(use_with lua) \
+ $(use_with memcache) \
+ $(use_with mysql) \
+ $(use_with pcre) \
+ $(use_with ssl openssl) \
+ $(use_with webdav webdav-props) \
+ $(use_with webdav webdav-locks) \
+ $(use_with xattr attr) \
+ $(use_with zlib)
+}
+
+src_compile() {
+ emake
+
+ if use doc ; then
+ einfo "Building HTML documentation"
+ cd doc || die
+ emake html
+ fi
+}
+
+src_test() {
+ if [[ ${EUID} -eq 0 ]]; then
+ default_src_test
+ else
+ ewarn "test skipped, please re-run as root if you wish to test ${PN}"
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # init script stuff
+ newinitd "${FILESDIR}"/lighttpd.initd lighttpd
+ newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+ use fam && has_version app-admin/fam && \
+ { sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
+
+ # configs
+ insinto /etc/lighttpd
+ doins "${FILESDIR}"/conf/lighttpd.conf
+ doins "${FILESDIR}"/conf/mime-types.conf
+ doins "${FILESDIR}"/conf/mod_cgi.conf
+ doins "${FILESDIR}"/conf/mod_fastcgi.conf
+
+ # update lighttpd.conf directives based on conditionals
+ update_config
+
+ # docs
+ dodoc AUTHORS README NEWS doc/scripts/*.sh
+ newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
+ use ipv6 && readme.gentoo_create_doc
+
+ use doc && dohtml -r doc/*
+
+ docinto txt
+ dodoc doc/outdated/*.txt
+
+ # logrotate
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
+
+ keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+ fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+ fperms 0750 /var/l{ib,og}/lighttpd
+
+ #spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
+ rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
+
+ use minimal && remove_non_essential
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+}
+
+pkg_postinst () {
+ use ipv6 && readme.gentoo_print_elog
+
+ if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
+ einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
+ einfo "spawn-fcgi's init script configuration is now located"
+ einfo "at /etc/conf.d/spawn-fcgi."
+ fi
+
+ if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
+ elog "Gentoo has a customized configuration,"
+ elog "which is now located in /etc/lighttpd. Please migrate your"
+ elog "existing configuration."
+ fi
+}
diff --git a/www-servers/pound/pound-2.7f-r1.ebuild b/www-servers/pound/pound-2.7f-r1.ebuild
new file mode 100644
index 0000000..4efc7af
--- /dev/null
+++ b/www-servers/pound/pound-2.7f-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+MY_P=${P/p/P}
+DESCRIPTION="A http/https reverse-proxy and load-balancer"
+HOMEPAGE="http://www.apsis.ch/pound/"
+SRC_URI="http://www.apsis.ch/pound/${MY_P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND="dev-libs/libpcre
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+ dodir /usr/sbin
+ cp "${S}"/pound "${D}"/usr/sbin/
+ cp "${S}"/poundctl "${D}"/usr/sbin/
+
+ doman pound.8
+ doman poundctl.8
+ dodoc README FAQ
+
+ dodir /etc/init.d
+ newinitd "${FILESDIR}"/pound.init-1.9 pound
+
+ insinto /etc
+ newins "${FILESDIR}"/pound-2.2.cfg pound.cfg
+}
+
+pkg_postinst() {
+ elog "No demo-/sample-configfile is included in the distribution -"
+ elog "read the man-page for more info."
+ elog "A sample (localhost:8888 -> localhost:80) for gentoo is given in \"/etc/pound.cfg\"."
+ echo
+ ewarn "You will have to upgrade you configuration file, if you are"
+ ewarn "upgrading from a version <= 2.0."
+ echo
+ ewarn "The 'WebDAV' config statement is no longer supported!"
+ ewarn "Please adjust your configuration, if necessary."
+ echo
+}
diff --git a/www-servers/pshs/pshs-0.3-r1.ebuild b/www-servers/pshs/pshs-0.3-r1.ebuild
new file mode 100644
index 0000000..d07609f
--- /dev/null
+++ b/www-servers/pshs/pshs-0.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
+HOMEPAGE="https://bitbucket.org/mgorny/pshs/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +magic +netlink qrcode ssl upnp"
+
+RDEPEND=">=dev-libs/libevent-2:0=
+ magic? ( sys-apps/file:0= )
+ qrcode? ( media-gfx/qrencode:0= )
+ ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ upnp? ( net-libs/miniupnpc:0= )"
+DEPEND="${RDEPEND}
+ netlink? ( sys-apps/iproute2
+ >=sys-kernel/linux-headers-2.6.27 )"
+# libnetlink is static only ATM
+
+src_configure() {
+ local myconf=(
+ $(use_enable magic libmagic)
+ $(use_enable netlink)
+ $(use_enable qrcode qrencode)
+ $(use_enable ssl)
+ $(use_enable upnp)
+ )
+
+ econf "${myconf[@]}"
+}
diff --git a/www-servers/pshs/pshs-9999.ebuild b/www-servers/pshs/pshs-9999.ebuild
index 6d71ea0..8e23ff2 100644
--- a/www-servers/pshs/pshs-9999.ebuild
+++ b/www-servers/pshs/pshs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,13 +17,15 @@
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+magic +netlink qrcode ssl upnp"
+IUSE="libressl +magic +netlink qrcode ssl upnp"
RDEPEND=">=dev-libs/libevent-2:0=
magic? ( sys-apps/file:0= )
qrcode? ( media-gfx/qrencode:0= )
ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
- dev-libs/openssl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
upnp? ( net-libs/miniupnpc:0= )"
DEPEND="${RDEPEND}
netlink? ( sys-apps/iproute2
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index d6eb89b..510de9f 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,2 +1,3 @@
DIST uwsgi-2.0.11.1.tar.gz 782091 SHA256 75a7d3138cfa9cd81a760c2f8a43f3d80961edc8e4f27043dc1412206c926287 SHA512 0978234bf1592b52f0e8718eb63de141e2aa9928e7efff3e4833f795ee66bcb14fa1a35a141d9b590d5fffc9fbc6bc8ed3c8095e04af27a34318f37dbac6117c WHIRLPOOL f830cf3cdbfda90dc65efbd01550644eb06e091fd91b6237f851efc71d2bcb1e811ad9e8db827abfeda76e041a5ef61711c84f0b3a93e041da598d349b788688
+DIST uwsgi-2.0.11.2.tar.gz 782133 SHA256 0b889b0b4d2dd3f6625df28cb0b86ec44a68d074ede2d0dfad0b91e88914885c SHA512 627759ec9cccc8de74016c245b19069dc7e6970c398be95e707c2c9e36fa06438249f130d0c2bdee16f585b123094a9dd4977de5be276a065ddce30a9698da9a WHIRLPOOL 314a397bc678aefe59df8b6a87584768d19b5d52cfd894d518ebe3e9019fb74232c9139c9cc5af00da8b1bc21c369c7a84e9d424b7c5986e6ece65172f3cca27
DIST uwsgi-2.0.9.tar.gz 779244 SHA256 fe0489bca0a8b95653908be2297e35699fb9e992f728e382224587ee6b918295 SHA512 8afb6ca51aa2113e2c9fc0b90e11ce8c1aeddb38f41c7b0d5da6811d7ef93aa8b9e015abfd29b1ced35b0f6a00fd7285b8140b855fc3ee79804e2513e94a9fb5 WHIRLPOOL 362abe240b9a3f170409b850d9ae5186701b137159cd91d2e689b5f3d43dfe779f13d9e4554b60b82efd534a00751394a7982130912f7f106ac6e7c6dbde88d6
diff --git a/www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild
new file mode 100644
index 0000000..7982b6f
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild
@@ -0,0 +1,402 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby19 ruby20 ruby21"
+
+PHP_EXT_INI="no"
+PHP_EXT_NAME="dummy"
+PHP_EXT_OPTIONAL_USE="php"
+USE_PHP="php5-4 php5-5 php5-6" # deps must be registered separately below
+
+MY_P="${P/_/-}"
+
+inherit apache-module distutils-r1 eutils flag-o-matic multilib pax-utils php-ext-source-r2 python-r1 ruby-ng versionator
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
+ http ugreen signal syslog rsyslog
+ router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
+ {core,fast,raw,ssl}router
+ redislog mongodblog log{file,socket}
+ spooler cheaper_busyness symcall
+ transformation_{chunked,gzip,offload,tofile}
+ zergpool )
+UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
+ dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
+ geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
+ rados router_{access,radius,spnego,xmldir}
+ sqlite ssi stats_pusher_statsd
+ systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
+
+LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
+LANG_SUPPORT_EXTENDED=( lua php pypy python python_asyncio python_gevent ruby )
+
+# plugins to be ignored (for now):
+# cheaper_backlog2: example plugin
+# coroae: TODO
+# cplusplus: partially example code, needs explicit class
+# dummy: no idea
+# example: example plugin
+# exception_log: example plugin
+# *go*: TODO
+# *java*: TODO
+# v8: TODO
+# matheval: TODO
+IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing +ssl +xml yajl yaml zeromq"
+
+for plugin in ${UWSGI_PLUGINS_STD[@]} ; do IUSE="${IUSE} +uwsgi_plugins_${plugin}" ; done
+for plugin in ${UWSGI_PLUGINS_OPT[@]} ; do IUSE="${IUSE} uwsgi_plugins_${plugin}" ; done
+IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
+
+REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
+ uwsgi_plugins_logcrypto? ( ssl )
+ uwsgi_plugins_sslrouter? ( ssl )
+ routing? ( pcre )
+ uwsgi_plugins_emperor_zeromq? ( zeromq )
+ uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
+ uwsgi_plugins_router_xmldir? ( xml )
+ pypy? ( python_targets_python2_7 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ python_asyncio? ( python_targets_python3_4 python_gevent )
+ python_gevent? ( python )
+ expat? ( xml )"
+
+# util-linux is required for libuuid when requesting zeromq support
+# Order:
+# 1. Unconditional
+# 2. General features
+# 3. Plugins
+# 4. Language/app support
+CDEPEND="sys-libs/zlib
+ caps? ( sys-libs/libcap )
+ json? ( !yajl? ( dev-libs/jansson )
+ yajl? ( dev-libs/yajl ) )
+ pcre? ( dev-libs/libpcre:3 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ xml? ( !expat? ( dev-libs/libxml2 )
+ expat? ( dev-libs/expat ) )
+ yaml? ( dev-libs/libyaml )
+ zeromq? ( net-libs/zeromq sys-apps/util-linux )
+ uwsgi_plugins_alarm_curl? ( net-misc/curl )
+ uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
+ uwsgi_plugins_curl_cron? ( net-misc/curl )
+ uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
+ uwsgi_plugins_geoip? ( dev-libs/geoip )
+ uwsgi_plugins_ldap? ( net-nds/openldap )
+ uwsgi_plugins_pam? ( virtual/pam )
+ uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
+ uwsgi_plugins_rados? ( sys-cluster/ceph )
+ uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
+ uwsgi_plugins_router_spnego? ( virtual/krb5 )
+ uwsgi_plugins_rsyslog? ( app-admin/rsyslog )
+ uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
+ uwsgi_plugins_webdav? ( dev-libs/libxml2 )
+ uwsgi_plugins_xslt? ( dev-libs/libxslt )
+ lua? ( dev-lang/lua:= )
+ mono? ( =dev-lang/mono-2* )
+ perl? ( dev-lang/perl:= )
+ php? (
+ php_targets_php5-4? ( dev-lang/php:5.4[embed] )
+ php_targets_php5-5? ( dev-lang/php:5.5[embed] )
+ )
+ pypy? ( virtual/pypy )
+ python? ( ${PYTHON_DEPS} )
+ python_gevent? ( >=dev-python/gevent-1.0.1[$(python_gen_usedep 'python2*')] )
+ ruby? ( $(ruby_implementations_depend) )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
+
+want_apache2
+
+S="${WORKDIR}/${MY_P}"
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="42_mod_uwsgi-r2 42_mod_uwsgi"
+
+src_unpack() {
+ default
+}
+
+pkg_setup() {
+ python_setup
+ use ruby && ruby-ng_pkg_setup
+ depend.apache_pkg_setup
+}
+
+src_prepare() {
+ sed -i \
+ -e "s|'-O2', ||" \
+ -e "s|'-Werror', ||" \
+ -e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
+ uwsgiconfig.py || die "sed failed"
+
+ sed -i \
+ -e "s|/lib|/$(get_libdir)|" \
+ plugins/php/uwsgiplugin.py || die "sed failed"
+}
+
+src_configure() {
+ local embedded_plugins=()
+ local plugins=()
+ local malloc_impl="libc"
+ local json="false"
+ local xml="false"
+
+ for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
+ use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
+ done
+ for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
+ use ${p} && plugins+=("${p}")
+ done
+
+ # do not embed any plugins
+ if ! use embedded ; then
+ plugins=( ${plugins[@]} ${embedded_plugins[@]} )
+ embedded_plugins=()
+ fi
+
+ # flatten the arrays
+ plugins=${plugins[@]}
+ embedded_plugins=${embedded_plugins[@]}
+
+ # rename some of the use flags, language plugins are always real plugins
+ plugins="${plugins/perl/psgi}"
+ plugins="${plugins/sqlite/sqlite3}"
+ embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
+
+ # override defaults as requested by the user
+ if use xml; then
+ use expat && xml="expat" || xml="libxml2"
+ fi
+ if use json; then
+ use yajl && json="yajl" || json="jansson"
+ fi
+ use jemalloc && malloc_impl="jemalloc"
+
+ # prepare the buildconf for gentoo
+ cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini
+ sed -i \
+ -e "s|VAR_XML|${xml}|" \
+ -e "s|VAR_YAML|$(usex yaml true false)|" \
+ -e "s|VAR_JSON|${json}|" \
+ -e "s|VAR_SSL|$(usex ssl true false)|" \
+ -e "s|VAR_PCRE|$(usex pcre true false)|" \
+ -e "s|VAR_ZMQ|$(usex zeromq true false)|" \
+ -e "s|VAR_ROUTING|$(usex routing true false)|" \
+ -e "s|VAR_DEBUG|$(usex debug true false)|" \
+ -e "s|VAR_MALLOC|${malloc_impl}|" \
+ -e "s|VAR_PLUGINS|${plugins// /, }|" \
+ -e "s|VAR_PLUGIN_DIR|/usr/$(get_libdir)/uwsgi|" \
+ -e "s|VAR_BUILD_DIR|${T}/plugins|" \
+ -e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
+ buildconf/gentoo.ini || die "sed failed"
+
+ use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+ use zeromq || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+
+ if use uwsgi_plugins_emperor_pg ; then
+ PGPV="$(best_version dev-db/postgresql)"
+ PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-})"
+ sed -i \
+ -e "s|pg_config|pg_config${PGSLOT/.}|" \
+ plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
+ fi
+}
+
+each_ruby_compile() {
+ cd "${WORKDIR}/${MY_P}" || die "sed failed"
+
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
+}
+
+python_compile_plugins() {
+ local EPYV
+ local PYV
+ EPYV=${EPYTHON/.}
+ PYV=${EPYV/python}
+
+ if [[ ${EPYTHON} == pypy* ]] ; then
+ echo "skipping because pypy is not meant to build plugins on its own"
+ return
+ fi
+
+ ${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
+
+ if use python_asyncio ; then
+ if [[ "${PYV}" == "34" || "${PYV}" == "35" ]] ; then
+ ${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
+ fi
+ fi
+
+ if use python_gevent ; then
+ if [[ "${PYV}" == "27" ]] ; then
+ ${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
+ fi
+ fi
+
+ if use pypy ; then
+ if [[ "${PYV}" == "27" ]] ; then
+ # TODO: do some proper patching ? The wiki didn't help... I gave up for now.
+ # QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so
+ append-ldflags -Wl,-z,noexecstack
+ ${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed"
+ fi
+ fi
+}
+
+python_install_symlinks() {
+ dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
+}
+
+src_compile() {
+ mkdir -p "${T}/plugins"
+
+ python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+
+ if use lua ; then
+ # setting the name for the pkg-config file to lua, since we don't have
+ # slotted lua
+ UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
+ fi
+
+ if use php ; then
+ for s in $(php_get_slots); do
+ UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
+ done
+ fi
+
+ if use python ; then
+ python_foreach_impl python_compile_plugins
+ fi
+
+ if use ruby ; then
+ ruby-ng_src_compile
+ fi
+
+ if use apache2 ; then
+ for m in proxy_uwsgi Ruwsgi uwsgi ; do
+ APXS2_ARGS="-c mod_${m}.c"
+ apache-module_src_compile
+ done
+ fi
+}
+
+src_install() {
+ dobin uwsgi
+ pax-mark m "${D}"/usr/bin/uwsgi
+
+ insinto /usr/$(get_libdir)/uwsgi
+ doins "${T}/plugins"/*.so
+
+ use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
+ use lua && dosym uwsgi /usr/bin/uwsgi_lua
+ use mono && dosym uwsgi /usr/bin/uwsgi_mono
+ use perl && dosym uwsgi /usr/bin/uwsgi_psgi
+
+ if use php ; then
+ for s in $(php_get_slots); do
+ dosym uwsgi /usr/bin/uwsgi_${s/.}
+ done
+ fi
+
+ if use python ; then
+ python_foreach_impl python_install_symlinks
+ python_foreach_impl python_domodule uwsgidecorators.py
+ fi
+
+ if use apache2; then
+ for m in proxy_uwsgi Ruwsgi uwsgi ; do
+ APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
+ apache-module_src_install
+ done
+ fi
+
+ newinitd "${FILESDIR}"/uwsgi.initd-r6 uwsgi
+ newconfd "${FILESDIR}"/uwsgi.confd-r3 uwsgi
+ keepdir /etc/"${PN}".d
+ use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
+}
+
+pkg_postinst() {
+ if use apache2 ; then
+ elog "Three Apache modules have been installed: mod_proxy_uwsgi, mod_uwsgi and mod_Ruwsgi."
+ elog "You can enable them with -D PROXY_UWSGI, -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
+ elog "mod_uwsgi and mod_Ruwsgi have the same configuration interface and define the same symbols."
+ elog "Therefore you can enable only one of them at a time."
+ elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky."
+ elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
+ elog "mod_proxy_uwsgi is a proxy module, considered stable and is now the recommended module."
+ fi
+
+ elog "Append the following options to the uwsgi call to load the respective language plugin:"
+ use cgi && elog " '--plugins cgi' for cgi"
+ use lua && elog " '--plugins lua' for lua"
+ use mono && elog " '--plugins mono' for mono"
+ use perl && elog " '--plugins psgi' for perl"
+
+ if use php ; then
+ for s in $(php_get_slots); do
+ elog " '--plugins ${s/.}' for ${s}"
+ done
+ fi
+
+ python_pkg_postinst() {
+ local EPYV
+ local PYV
+ EPYV=${EPYTHON/.}
+ PYV=${EPYV/python}
+
+ if [[ ${EPYTHON} == pypy* ]] ; then
+ elog " '--plugins pypy' for pypy"
+ return
+ fi
+
+ elog " "
+ elog " '--plugins ${EPYV}' for ${EPYTHON}"
+ if use python_asyncio ; then
+ if [[ ${EPYV} == python34 ]] ; then
+ elog " '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
+ else
+ elog " (asyncio is only supported in python3.4)"
+ fi
+ fi
+ if use python_gevent ; then
+ if [[ ${EPYTHON} == python2* ]] ; then
+ elog " '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
+ else
+ elog " (gevent is currently not supported in ${EPYTHON})"
+ fi
+ fi
+ }
+
+ use python && python_foreach_impl python_pkg_postinst
+
+ if use ruby ; then
+ for ruby in $USE_RUBY; do
+ if use ruby_targets_${ruby} ; then
+ elog " '--plugins rack_${ruby/.}' for ${ruby}"
+ elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers"
+ elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
+ fi
+ done
+ fi
+}
diff --git a/www-servers/uwsgi/uwsgi-2.0.11.2.ebuild b/www-servers/uwsgi/uwsgi-2.0.11.2.ebuild
new file mode 100644
index 0000000..cab9f47
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-2.0.11.2.ebuild
@@ -0,0 +1,399 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby19 ruby20 ruby21"
+
+PHP_EXT_INI="no"
+PHP_EXT_NAME="dummy"
+PHP_EXT_OPTIONAL_USE="php"
+USE_PHP="php5-4 php5-5 php5-6" # deps must be registered separately below
+
+MY_P="${P/_/-}"
+
+inherit apache-module distutils-r1 eutils flag-o-matic multilib pax-utils php-ext-source-r2 python-r1 ruby-ng versionator
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
+ http ugreen signal syslog rsyslog
+ router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
+ {core,fast,raw,ssl}router
+ redislog mongodblog log{file,socket}
+ spooler cheaper_busyness symcall
+ transformation_{chunked,gzip,offload,tofile}
+ zergpool )
+UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
+ dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
+ geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
+ rados router_{access,radius,spnego,xmldir}
+ sqlite ssi stats_pusher_statsd
+ systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
+
+LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
+LANG_SUPPORT_EXTENDED=( lua php pypy python python_asyncio python_gevent ruby )
+
+# plugins to be ignored (for now):
+# cheaper_backlog2: example plugin
+# coroae: TODO
+# cplusplus: partially example code, needs explicit class
+# dummy: no idea
+# example: example plugin
+# exception_log: example plugin
+# *go*: TODO
+# *java*: TODO
+# v8: TODO
+# matheval: TODO
+IUSE="apache2 +caps debug +embedded expat jemalloc json +pcre +routing +ssl +xml yajl yaml zeromq"
+
+for plugin in ${UWSGI_PLUGINS_STD[@]} ; do IUSE="${IUSE} +uwsgi_plugins_${plugin}" ; done
+for plugin in ${UWSGI_PLUGINS_OPT[@]} ; do IUSE="${IUSE} uwsgi_plugins_${plugin}" ; done
+IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
+
+REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
+ uwsgi_plugins_logcrypto? ( ssl )
+ uwsgi_plugins_sslrouter? ( ssl )
+ routing? ( pcre )
+ uwsgi_plugins_emperor_zeromq? ( zeromq )
+ uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
+ uwsgi_plugins_router_xmldir? ( xml )
+ pypy? ( python_targets_python2_7 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ python_asyncio? ( python_targets_python3_4 python_gevent )
+ python_gevent? ( python )
+ expat? ( xml )"
+
+# util-linux is required for libuuid when requesting zeromq support
+# Order:
+# 1. Unconditional
+# 2. General features
+# 3. Plugins
+# 4. Language/app support
+CDEPEND="sys-libs/zlib
+ caps? ( sys-libs/libcap )
+ json? ( !yajl? ( dev-libs/jansson )
+ yajl? ( dev-libs/yajl ) )
+ pcre? ( dev-libs/libpcre:3 )
+ ssl? ( dev-libs/openssl:= )
+ xml? ( !expat? ( dev-libs/libxml2 )
+ expat? ( dev-libs/expat ) )
+ yaml? ( dev-libs/libyaml )
+ zeromq? ( net-libs/zeromq sys-apps/util-linux )
+ uwsgi_plugins_alarm_curl? ( net-misc/curl )
+ uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
+ uwsgi_plugins_curl_cron? ( net-misc/curl )
+ uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
+ uwsgi_plugins_geoip? ( dev-libs/geoip )
+ uwsgi_plugins_ldap? ( net-nds/openldap )
+ uwsgi_plugins_pam? ( virtual/pam )
+ uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
+ uwsgi_plugins_rados? ( sys-cluster/ceph )
+ uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
+ uwsgi_plugins_router_spnego? ( virtual/krb5 )
+ uwsgi_plugins_rsyslog? ( app-admin/rsyslog )
+ uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
+ uwsgi_plugins_webdav? ( dev-libs/libxml2 )
+ uwsgi_plugins_xslt? ( dev-libs/libxslt )
+ lua? ( dev-lang/lua:= )
+ mono? ( =dev-lang/mono-2* )
+ perl? ( dev-lang/perl:= )
+ php? (
+ php_targets_php5-4? ( dev-lang/php:5.4[embed] )
+ php_targets_php5-5? ( dev-lang/php:5.5[embed] )
+ )
+ pypy? ( virtual/pypy )
+ python? ( ${PYTHON_DEPS} )
+ python_gevent? ( >=dev-python/gevent-1.0.1[$(python_gen_usedep 'python2*')] )
+ ruby? ( $(ruby_implementations_depend) )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
+
+want_apache2
+
+S="${WORKDIR}/${MY_P}"
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="42_mod_uwsgi-r2 42_mod_uwsgi"
+
+src_unpack() {
+ default
+}
+
+pkg_setup() {
+ python_setup
+ use ruby && ruby-ng_pkg_setup
+ depend.apache_pkg_setup
+}
+
+src_prepare() {
+ sed -i \
+ -e "s|'-O2', ||" \
+ -e "s|'-Werror', ||" \
+ -e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
+ uwsgiconfig.py || die "sed failed"
+
+ sed -i \
+ -e "s|/lib|/$(get_libdir)|" \
+ plugins/php/uwsgiplugin.py || die "sed failed"
+}
+
+src_configure() {
+ local embedded_plugins=()
+ local plugins=()
+ local malloc_impl="libc"
+ local json="false"
+ local xml="false"
+
+ for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
+ use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
+ done
+ for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
+ use ${p} && plugins+=("${p}")
+ done
+
+ # do not embed any plugins
+ if ! use embedded ; then
+ plugins=( ${plugins[@]} ${embedded_plugins[@]} )
+ embedded_plugins=()
+ fi
+
+ # flatten the arrays
+ plugins=${plugins[@]}
+ embedded_plugins=${embedded_plugins[@]}
+
+ # rename some of the use flags, language plugins are always real plugins
+ plugins="${plugins/perl/psgi}"
+ plugins="${plugins/sqlite/sqlite3}"
+ embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
+
+ # override defaults as requested by the user
+ if use xml; then
+ use expat && xml="expat" || xml="libxml2"
+ fi
+ if use json; then
+ use yajl && json="yajl" || json="jansson"
+ fi
+ use jemalloc && malloc_impl="jemalloc"
+
+ # prepare the buildconf for gentoo
+ cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini
+ sed -i \
+ -e "s|VAR_XML|${xml}|" \
+ -e "s|VAR_YAML|$(usex yaml true false)|" \
+ -e "s|VAR_JSON|${json}|" \
+ -e "s|VAR_SSL|$(usex ssl true false)|" \
+ -e "s|VAR_PCRE|$(usex pcre true false)|" \
+ -e "s|VAR_ZMQ|$(usex zeromq true false)|" \
+ -e "s|VAR_ROUTING|$(usex routing true false)|" \
+ -e "s|VAR_DEBUG|$(usex debug true false)|" \
+ -e "s|VAR_MALLOC|${malloc_impl}|" \
+ -e "s|VAR_PLUGINS|${plugins// /, }|" \
+ -e "s|VAR_PLUGIN_DIR|/usr/$(get_libdir)/uwsgi|" \
+ -e "s|VAR_BUILD_DIR|${T}/plugins|" \
+ -e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
+ buildconf/gentoo.ini || die "sed failed"
+
+ use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+ use zeromq || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+
+ if use uwsgi_plugins_emperor_pg ; then
+ PGPV="$(best_version dev-db/postgresql)"
+ PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-})"
+ sed -i \
+ -e "s|pg_config|pg_config${PGSLOT/.}|" \
+ plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
+ fi
+}
+
+each_ruby_compile() {
+ cd "${WORKDIR}/${MY_P}" || die "sed failed"
+
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
+}
+
+python_compile_plugins() {
+ local EPYV
+ local PYV
+ EPYV=${EPYTHON/.}
+ PYV=${EPYV/python}
+
+ if [[ ${EPYTHON} == pypy* ]] ; then
+ echo "skipping because pypy is not meant to build plugins on its own"
+ return
+ fi
+
+ ${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
+
+ if use python_asyncio ; then
+ if [[ "${PYV}" == "34" || "${PYV}" == "35" ]] ; then
+ ${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
+ fi
+ fi
+
+ if use python_gevent ; then
+ if [[ "${PYV}" == "27" ]] ; then
+ ${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
+ fi
+ fi
+
+ if use pypy ; then
+ if [[ "${PYV}" == "27" ]] ; then
+ # TODO: do some proper patching ? The wiki didn't help... I gave up for now.
+ # QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so
+ append-ldflags -Wl,-z,noexecstack
+ ${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed"
+ fi
+ fi
+}
+
+python_install_symlinks() {
+ dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
+}
+
+src_compile() {
+ mkdir -p "${T}/plugins"
+
+ python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+
+ if use lua ; then
+ # setting the name for the pkg-config file to lua, since we don't have
+ # slotted lua
+ UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
+ fi
+
+ if use php ; then
+ for s in $(php_get_slots); do
+ UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
+ done
+ fi
+
+ if use python ; then
+ python_foreach_impl python_compile_plugins
+ fi
+
+ if use ruby ; then
+ ruby-ng_src_compile
+ fi
+
+ if use apache2 ; then
+ for m in proxy_uwsgi Ruwsgi uwsgi ; do
+ APXS2_ARGS="-c mod_${m}.c"
+ apache-module_src_compile
+ done
+ fi
+}
+
+src_install() {
+ dobin uwsgi
+ pax-mark m "${D}"/usr/bin/uwsgi
+
+ insinto /usr/$(get_libdir)/uwsgi
+ doins "${T}/plugins"/*.so
+
+ use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
+ use lua && dosym uwsgi /usr/bin/uwsgi_lua
+ use mono && dosym uwsgi /usr/bin/uwsgi_mono
+ use perl && dosym uwsgi /usr/bin/uwsgi_psgi
+
+ if use php ; then
+ for s in $(php_get_slots); do
+ dosym uwsgi /usr/bin/uwsgi_${s/.}
+ done
+ fi
+
+ if use python ; then
+ python_foreach_impl python_install_symlinks
+ python_foreach_impl python_domodule uwsgidecorators.py
+ fi
+
+ if use apache2; then
+ for m in proxy_uwsgi Ruwsgi uwsgi ; do
+ APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
+ apache-module_src_install
+ done
+ fi
+
+ newinitd "${FILESDIR}"/uwsgi.initd-r6 uwsgi
+ newconfd "${FILESDIR}"/uwsgi.confd-r3 uwsgi
+ keepdir /etc/"${PN}".d
+ use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
+}
+
+pkg_postinst() {
+ if use apache2 ; then
+ elog "Three Apache modules have been installed: mod_proxy_uwsgi, mod_uwsgi and mod_Ruwsgi."
+ elog "You can enable them with -D PROXY_UWSGI, -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
+ elog "mod_uwsgi and mod_Ruwsgi have the same configuration interface and define the same symbols."
+ elog "Therefore you can enable only one of them at a time."
+ elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky."
+ elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
+ elog "mod_proxy_uwsgi is a proxy module, considered stable and is now the recommended module."
+ fi
+
+ elog "Append the following options to the uwsgi call to load the respective language plugin:"
+ use cgi && elog " '--plugins cgi' for cgi"
+ use lua && elog " '--plugins lua' for lua"
+ use mono && elog " '--plugins mono' for mono"
+ use perl && elog " '--plugins psgi' for perl"
+
+ if use php ; then
+ for s in $(php_get_slots); do
+ elog " '--plugins ${s/.}' for ${s}"
+ done
+ fi
+
+ python_pkg_postinst() {
+ local EPYV
+ local PYV
+ EPYV=${EPYTHON/.}
+ PYV=${EPYV/python}
+
+ if [[ ${EPYTHON} == pypy* ]] ; then
+ elog " '--plugins pypy' for pypy"
+ return
+ fi
+
+ elog " "
+ elog " '--plugins ${EPYV}' for ${EPYTHON}"
+ if use python_asyncio ; then
+ if [[ ${EPYV} == python34 ]] ; then
+ elog " '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
+ else
+ elog " (asyncio is only supported in python3.4)"
+ fi
+ fi
+ if use python_gevent ; then
+ if [[ ${EPYTHON} == python2* ]] ; then
+ elog " '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
+ else
+ elog " (gevent is currently not supported in ${EPYTHON})"
+ fi
+ fi
+ }
+
+ use python && python_foreach_impl python_pkg_postinst
+
+ if use ruby ; then
+ for ruby in $USE_RUBY; do
+ if use ruby_targets_${ruby} ; then
+ elog " '--plugins rack_${ruby/.}' for ${ruby}"
+ elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers"
+ elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
+ fi
+ done
+ fi
+}
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index e8df026..b6e8a47 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,7 +1,3 @@
-DIST varnish-3.0.5.tar.gz 2116664 SHA256 302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7 SHA512 0fe8a0f45ebe3b159fde811ac374ef8fb5be7712d8a61474778c57ddf4e7fb0404c7b28abeb614a16255a1c9ef0c780db44d03b1c8fbfee54adc49d92cbf733d WHIRLPOOL 5c33e510b5c511790a38451068e569ac62a5db4dc0c9aab99ef1509166674474c12dc5e0e9cdcde0245eb1b5c7b9947fed19a513114f363d468f2fbeff1c8d0d
-DIST varnish-3.0.6.tar.gz 2049810 SHA256 840ded8f25e7343117f6e3e2015759118f1d2db357ae8d7e02ea964e6fb680b7 SHA512 6dcbbf1407e72f9fe6c156a4074d9d42ce147d225cd3001b3240a22ed02e7adf2e900671f9f7e81cbd6b565b29ac65e0436c08c295763b5f7d48b6ab76a1c6b3 WHIRLPOOL 6254de1210f179c0e523cbdb7a1ecd36535cc50ee085d5093a7bc2285d666db45fa4fd130253ae6c94c09037b1225f0c89b5d73a2e0e51f0e5fda7d3e2e2d81d
DIST varnish-3.0.7.tar.gz 2102037 SHA256 a27e9f11391617fab27cc6edc31d3c8681b8d6975f8c2cd07f6e081bc54c24ce SHA512 5fa9749305eb1a546ef4aae8a1797247fcc9098e1661453b9b87916da9fbc60d76bc0de9542ab17136e3da4b256c8a547aded2b4372dbbb54c44e93eff34a061 WHIRLPOOL 00ff6d16603ba4bf42608d55d769048f35c275a8ffa2b6860df6de2571d0481c39019d58d5b843f8a64492a5bf26caf9d841a023826d2fd2771ed8d35447a659
-DIST varnish-4.0.0.tar.gz 2372630 SHA256 4bbf73656be11687cbb8c7d4a7315786081687664b40a8ccbe67b36f8c0b1c17 SHA512 5eb3806f6c7c46438b6ebbe30c42f5a6afc53a9fa9e8f4b809c7d18b465712640950601be9873810a0f408865fba6ae9d18e46e4f22c89cc3a2e0c351753ac71 WHIRLPOOL 431dad47430a7b2a2eba3dd635eb487cb4d112a9ebdf6a3cb946b0bd8476653bded2d29128bcac1f98c6b3dfc3d7bc9c32f25ea76bccc9f427519f8dc36e2eb6
-DIST varnish-4.0.1.tar.gz 1877657 SHA256 49c3cebc89cb08fbc89d6680c1c8b42efc9313888172f3cdbdae7324b5c8f35b SHA512 e1ae846ff5b5e6ac0b694e8b197f9f7ec8c47677cbaaab6c0c490b6d5fa52f58f84fa3001bee8fe57451328cb809be0b5be55ddb41bd9c2444f23e0af582116b WHIRLPOOL 3013ae885a1eb6d44600b7c5513109a526cbed8f6bf687a81fa31111088713d68a9a059a67912966d7bed3b6404988c5fc785f02c91a63ea1f2a5037caf21e7b
-DIST varnish-4.0.2.tar.gz 1853668 SHA256 d9fb6a6eaf05bbb0c8eb5855556a4b092183b2c1a61281bfd73adf83a304555b SHA512 262bef5823f56c70fa9c7f24225b02b0218889c216143f63bb11db978ca7eddb174f605a5e48a4e774d88b20af5f5845bb2a6aef6fa3aaaf7cacd8c7c17cb82f WHIRLPOOL 35977069c6908a2fd731984585b447055730a288300de8709d83bec2df3677337535970c503b3b3d26635b0c747e7c387a423d93e776a755b8d8f0078c845696
DIST varnish-4.0.3.tar.gz 1866760 SHA256 94b9a174097f47db2286acd2c35f235e49a2b7a9ddfdbd6eb7aa4da9ae8f8206 SHA512 db7bb141afd4617ac95573983dc30591b0eb9bc1af06df1094f2c1eeac539da936afb4a239d2f446d3c3a51b88a781b7f9f6d9a0b2028eaf0e7049ea2159d883 WHIRLPOOL 942456e19be427859283959dabe5522667519d36decbc598c8ee1e949767ea7435469393289d4373db6abac5275e50a95fc3799a837dc17740a490b4912bfe6f
+DIST varnish-4.1.0.tar.gz 1990932 SHA256 4a6ea08e30b62fbf25f884a65f0d8af42e9cc9d25bf70f45ae4417c4f1c99017 SHA512 b50aaa41247b912b40307423f99ae519ae5e19bea3546b049f148661727887f06b3d27712e685c219ae18cb6d53d89b415ddbd10bada7cfac00b2fd995995f5c WHIRLPOOL ae462819521b2ad5df29e82a1966190b849eba2c0d9d146cf97c8a0dba325653c24a6c67ed8a154c1cb1cba6a1a25c78bfda6d83deff72ad7756a57725521d92
diff --git a/www-servers/varnish/varnish-3.0.5-r3.ebuild b/www-servers/varnish/varnish-3.0.5-r3.ebuild
deleted file mode 100644
index f1acfed..0000000
--- a/www-servers/varnish/varnish-3.0.5-r3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit autotools-utils eutils systemd python-single-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="doc jemalloc jit static-libs +tools"
-
-CDEPEND="
- || ( dev-libs/libedit sys-libs/readline )
- dev-libs/libpcre[jit?]
- jemalloc? ( dev-libs/jemalloc )
- tools? ( sys-libs/ncurses )"
-
-#varnish compiles stuff at run time
-RDEPEND="
- ${PYTHON_DEPS}
- ${CDEPEND}
- sys-devel/gcc"
-
-DEPEND="
- ${CDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.4-fix-automake-1.13.patch
- "${FILESDIR}"/${PN}-3.0.4-automagic.patch
- "${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch
- "${FILESDIR}"/${PN}-3.0.5-fix-python-path.patch
- "${FILESDIR}"/${PN}-3.0.5-path-to-vmod_vcc.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Remove bundled libjemalloc. We also fix
- # automagic dep in our patches, bug #461638
- rm -rf lib/libjemalloc
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable jit pcre-jit )
- $(use_with jemalloc)
- $(use_with tools)
- --without-rst2man
- --without-rst2html
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- newinitd "${FILESDIR}"/varnishd.initd-r1 varnishd
- newconfd "${FILESDIR}"/varnishd.confd-r1 varnishd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/varnishd.logrotate" varnishd
-
- dodir /var/log/varnish
-
- use doc && dohtml -r "doc/sphinx/=build/html/"
-
- systemd_dounit "${FILESDIR}/${PN}d.service"
-
- python_doscript lib/libvmod_std/vmod.py
- insinto /etc/varnish
- doins lib/libvmod_std/vmod.vcc
-}
-
-pkg_postinst () {
- elog "No demo-/sample-configfile is included in the distribution. Please"
- elog "read the man-page for more info. A sample configuration proxying"
- elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-3.0.5-r4.ebuild b/www-servers/varnish/varnish-3.0.5-r4.ebuild
deleted file mode 100644
index 3dc57eb..0000000
--- a/www-servers/varnish/varnish-3.0.5-r4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit autotools-utils eutils systemd python-single-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="doc jemalloc jit static-libs +tools"
-
-CDEPEND="
- || ( dev-libs/libedit sys-libs/readline )
- dev-libs/libpcre[jit?]
- jemalloc? ( dev-libs/jemalloc )
- tools? ( sys-libs/ncurses )"
-
-#varnish compiles stuff at run time
-RDEPEND="
- ${PYTHON_DEPS}
- ${CDEPEND}
- sys-devel/gcc"
-
-DEPEND="
- ${CDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.4-fix-automake-1.13.patch
- "${FILESDIR}"/${PN}-3.0.4-automagic.patch
- "${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch
- "${FILESDIR}"/${PN}-3.0.5-fix-python-path.patch
- "${FILESDIR}"/${PN}-3.0.5-path-to-vmod_vcc.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Remove bundled libjemalloc. We also fix
- # automagic dep in our patches, bug #461638
- rm -rf lib/libjemalloc
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable jit pcre-jit )
- $(use_with jemalloc)
- $(use_with tools)
- --without-rst2man
- --without-rst2html
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- newinitd "${FILESDIR}"/varnishd.initd-r2 varnishd
- newconfd "${FILESDIR}"/varnishd.confd-r2 varnishd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/varnishd.logrotate" varnishd
-
- dodir /var/log/varnish
-
- use doc && dohtml -r "doc/sphinx/=build/html/"
-
- systemd_dounit "${FILESDIR}/${PN}d.service"
-
- python_doscript lib/libvmod_std/vmod.py
- insinto /etc/varnish
- doins lib/libvmod_std/vmod.vcc
-}
-
-pkg_postinst () {
- elog "No demo-/sample-configfile is included in the distribution. Please"
- elog "read the man-page for more info. A sample configuration proxying"
- elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-3.0.5.ebuild b/www-servers/varnish/varnish-3.0.5.ebuild
deleted file mode 100644
index 151d66c..0000000
--- a/www-servers/varnish/varnish-3.0.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="doc jemalloc jit static-libs +tools"
-
-CDEPEND="
- || ( dev-libs/libedit sys-libs/readline )
- dev-libs/libpcre[jit?]
- jemalloc? ( dev-libs/jemalloc )
- tools? ( sys-libs/ncurses )"
-
-#varnish compiles stuff at run time
-RDEPEND="
- ${CDEPEND}
- sys-devel/gcc"
-
-DEPEND="
- ${CDEPEND}
- virtual/pkgconfig"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.4-fix-automake-1.13.patch
- "${FILESDIR}"/${PN}-3.0.4-automagic.patch
- "${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-src_prepare() {
- # Remove bundled libjemalloc. We also fix
- # automagic dep in our patches, bug #461638
- rm -rf lib/libjemalloc
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable jit pcre-jit )
- $(use_with jemalloc)
- $(use_with tools)
- --without-rst2man
- --without-rst2html
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- newinitd "${FILESDIR}"/varnishd.initd-r1 varnishd
- newconfd "${FILESDIR}"/varnishd.confd-r1 varnishd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/varnishd.logrotate" varnishd
-
- dodir /var/log/varnish
-
- use doc && dohtml -r "doc/sphinx/=build/html/"
-}
-
-pkg_postinst () {
- elog "No demo-/sample-configfile is included in the distribution. Please"
- elog "read the man-page for more info. A sample configuration proxying"
- elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-3.0.6.ebuild b/www-servers/varnish/varnish-3.0.6.ebuild
deleted file mode 100644
index 3bb22aa..0000000
--- a/www-servers/varnish/varnish-3.0.6.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit autotools-utils eutils systemd python-single-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="doc jemalloc jit static-libs +tools"
-
-CDEPEND="
- || ( dev-libs/libedit sys-libs/readline )
- dev-libs/libpcre[jit?]
- jemalloc? ( dev-libs/jemalloc )
- tools? ( sys-libs/ncurses )"
-
-#varnish compiles stuff at run time
-RDEPEND="
- ${PYTHON_DEPS}
- ${CDEPEND}
- sys-devel/gcc"
-
-DEPEND="
- ${CDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.4-fix-automake-1.13.patch
- "${FILESDIR}"/${PN}-3.0.4-automagic.patch
- "${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch
- "${FILESDIR}"/${PN}-3.0.5-fix-python-path.patch
- "${FILESDIR}"/${PN}-3.0.5-path-to-vmod_vcc.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Remove bundled libjemalloc. We also fix
- # automagic dep in our patches, bug #461638
- rm -rf lib/libjemalloc
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable jit pcre-jit )
- $(use_with jemalloc)
- $(use_with tools)
- --without-rst2man
- --without-rst2html
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- newinitd "${FILESDIR}"/varnishd.initd-r2 varnishd
- newconfd "${FILESDIR}"/varnishd.confd-r2 varnishd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/varnishd.logrotate" varnishd
-
- dodir /var/log/varnish
-
- use doc && dohtml -r "doc/sphinx/=build/html/"
-
- systemd_dounit "${FILESDIR}/${PN}d.service"
-
- python_doscript lib/libvmod_std/vmod.py
- insinto /etc/varnish
- doins lib/libvmod_std/vmod.vcc
-}
-
-pkg_postinst () {
- elog "No demo-/sample-configfile is included in the distribution. Please"
- elog "read the man-page for more info. A sample configuration proxying"
- elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-3.0.7.ebuild b/www-servers/varnish/varnish-3.0.7.ebuild
index 3dc57eb..b43cc84 100644
--- a/www-servers/varnish/varnish-3.0.7.ebuild
+++ b/www-servers/varnish/varnish-3.0.7.ebuild
@@ -18,10 +18,10 @@
IUSE="doc jemalloc jit static-libs +tools"
CDEPEND="
- || ( dev-libs/libedit sys-libs/readline )
+ || ( dev-libs/libedit sys-libs/readline:= )
dev-libs/libpcre[jit?]
jemalloc? ( dev-libs/jemalloc )
- tools? ( sys-libs/ncurses )"
+ tools? ( sys-libs/ncurses:= )"
#varnish compiles stuff at run time
RDEPEND="
diff --git a/www-servers/varnish/varnish-4.0.0-r1.ebuild b/www-servers/varnish/varnish-4.0.0-r1.ebuild
deleted file mode 100644
index 8f7b4e2..0000000
--- a/www-servers/varnish/varnish-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit user autotools-utils eutils systemd python-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="jemalloc jit static-libs"
-
-CDEPEND="
- || ( dev-libs/libedit sys-libs/readline )
- dev-libs/libpcre[jit?]
- jemalloc? ( dev-libs/jemalloc )
- sys-libs/ncurses"
-
-#varnish compiles stuff at run time
-RDEPEND="
- ${PYTHON_DEPS}
- ${CDEPEND}
- sys-devel/gcc"
-
-DEPEND="
- ${CDEPEND}
- dev-python/docutils
- virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.0-fix-man-Makefile_am.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-pkg_setup() {
- ebegin "Creating varnish user and group"
- enewgroup varnish 40
- enewuser varnish 40 -1 /var/lib/varnish varnish
- eend $?
-}
-
-src_prepare() {
- # Remove bundled libjemalloc. We also fix
- # automagic dep in our patches, bug #461638
- rm -rf lib/libjemalloc
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable jit pcre-jit )
- $(use_with jemalloc)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
-
- newinitd "${FILESDIR}"/varnishlog.initd varnishlog
- newconfd "${FILESDIR}"/varnishlog.confd varnishlog
-
- newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
- newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
-
- newinitd "${FILESDIR}"/varnishd.initd-r3 varnishd
- newconfd "${FILESDIR}"/varnishd.confd-r3 varnishd
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
-
- diropts -m750
-
- dodir /var/log/varnish/
-
- systemd_dounit "${FILESDIR}/${PN}d.service"
-
- insinto /etc/varnish/
- doins lib/libvmod_std/vmod.vcc
-
- fowners root:varnish /etc/varnish/
- fowners varnish:varnish /var/lib/varnish/
- fperms 0750 /var/lib/varnish/ /etc/varnish/
-}
-
-pkg_postinst () {
- elog "No demo-/sample-configfile is included in the distribution. Please"
- elog "read the man-page for more info. A sample configuration proxying"
- elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-4.0.1-r1.ebuild b/www-servers/varnish/varnish-4.0.1-r1.ebuild
deleted file mode 100644
index 8d7018d..0000000
--- a/www-servers/varnish/varnish-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit user autotools-utils eutils systemd python-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="jemalloc jit static-libs"
-
-CDEPEND="
- || ( dev-libs/libedit sys-libs/readline )
- dev-libs/libpcre[jit?]
- jemalloc? ( dev-libs/jemalloc )
- sys-libs/ncurses"
-
-#varnish compiles stuff at run time
-RDEPEND="
- ${PYTHON_DEPS}
- ${CDEPEND}
- sys-devel/gcc"
-
-DEPEND="
- ${CDEPEND}
- dev-python/docutils
- virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.1-fix-man-Makefile_am.patch
- "${FILESDIR}"/${PN}-4.0.1-fix-doc-Makefile_am.patch
- "${FILESDIR}"/${PN}-4.0.1-fix-warning.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-pkg_setup() {
- ebegin "Creating varnish user and group"
- enewgroup varnish 40
- enewuser varnish 40 -1 /var/lib/varnish varnish
- eend $?
-}
-
-src_prepare() {
- # Remove bundled libjemalloc. We also fix
- # automagic dep in our patches, bug #461638
- rm -rf lib/libjemalloc
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable jit pcre-jit )
- $(use_with jemalloc)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
-
- newinitd "${FILESDIR}"/varnishlog.initd varnishlog
- newconfd "${FILESDIR}"/varnishlog.confd varnishlog
-
- newinitd "${FILESDIR}"/varnishncsa.initd-r1 varnishncsa
- newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
-
- newinitd "${FILESDIR}"/varnishd.initd-r3 varnishd
- newconfd "${FILESDIR}"/varnishd.confd-r3 varnishd
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
-
- diropts -m750
-
- dodir /var/log/varnish/
-
- systemd_dounit "${FILESDIR}/${PN}d.service"
-
- insinto /etc/varnish/
- doins lib/libvmod_std/vmod.vcc
- doins etc/example.vcl
-
- fowners root:varnish /etc/varnish/
- fowners varnish:varnish /var/lib/varnish/
- fperms 0750 /var/lib/varnish/ /etc/varnish/
-}
-
-pkg_postinst () {
- elog "No demo-/sample-configfile is included in the distribution. Please"
- elog "read the man-page for more info. A sample configuration proxying"
- elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-4.0.2.ebuild b/www-servers/varnish/varnish-4.0.2.ebuild
deleted file mode 100644
index 8d7018d..0000000
--- a/www-servers/varnish/varnish-4.0.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit user autotools-utils eutils systemd python-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="jemalloc jit static-libs"
-
-CDEPEND="
- || ( dev-libs/libedit sys-libs/readline )
- dev-libs/libpcre[jit?]
- jemalloc? ( dev-libs/jemalloc )
- sys-libs/ncurses"
-
-#varnish compiles stuff at run time
-RDEPEND="
- ${PYTHON_DEPS}
- ${CDEPEND}
- sys-devel/gcc"
-
-DEPEND="
- ${CDEPEND}
- dev-python/docutils
- virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.1-fix-man-Makefile_am.patch
- "${FILESDIR}"/${PN}-4.0.1-fix-doc-Makefile_am.patch
- "${FILESDIR}"/${PN}-4.0.1-fix-warning.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-pkg_setup() {
- ebegin "Creating varnish user and group"
- enewgroup varnish 40
- enewuser varnish 40 -1 /var/lib/varnish varnish
- eend $?
-}
-
-src_prepare() {
- # Remove bundled libjemalloc. We also fix
- # automagic dep in our patches, bug #461638
- rm -rf lib/libjemalloc
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable jit pcre-jit )
- $(use_with jemalloc)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
-
- newinitd "${FILESDIR}"/varnishlog.initd varnishlog
- newconfd "${FILESDIR}"/varnishlog.confd varnishlog
-
- newinitd "${FILESDIR}"/varnishncsa.initd-r1 varnishncsa
- newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
-
- newinitd "${FILESDIR}"/varnishd.initd-r3 varnishd
- newconfd "${FILESDIR}"/varnishd.confd-r3 varnishd
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
-
- diropts -m750
-
- dodir /var/log/varnish/
-
- systemd_dounit "${FILESDIR}/${PN}d.service"
-
- insinto /etc/varnish/
- doins lib/libvmod_std/vmod.vcc
- doins etc/example.vcl
-
- fowners root:varnish /etc/varnish/
- fowners varnish:varnish /var/lib/varnish/
- fperms 0750 /var/lib/varnish/ /etc/varnish/
-}
-
-pkg_postinst () {
- elog "No demo-/sample-configfile is included in the distribution. Please"
- elog "read the man-page for more info. A sample configuration proxying"
- elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-4.0.3.ebuild b/www-servers/varnish/varnish-4.0.3.ebuild
index 9bf65e5..24d34d0 100644
--- a/www-servers/varnish/varnish-4.0.3.ebuild
+++ b/www-servers/varnish/varnish-4.0.3.ebuild
@@ -18,10 +18,10 @@
IUSE="jemalloc jit static-libs"
CDEPEND="
- || ( dev-libs/libedit sys-libs/readline )
+ || ( dev-libs/libedit sys-libs/readline:= )
dev-libs/libpcre[jit?]
jemalloc? ( dev-libs/jemalloc )
- sys-libs/ncurses"
+ sys-libs/ncurses:="
#varnish compiles stuff at run time
RDEPEND="
diff --git a/www-servers/varnish/varnish-4.1.0.ebuild b/www-servers/varnish/varnish-4.1.0.ebuild
new file mode 100644
index 0000000..24d34d0
--- /dev/null
+++ b/www-servers/varnish/varnish-4.1.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit user autotools-utils eutils systemd python-r1
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
+HOMEPAGE="http://www.varnish-cache.org/"
+SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="jemalloc jit static-libs"
+
+CDEPEND="
+ || ( dev-libs/libedit sys-libs/readline:= )
+ dev-libs/libpcre[jit?]
+ jemalloc? ( dev-libs/jemalloc )
+ sys-libs/ncurses:="
+
+#varnish compiles stuff at run time
+RDEPEND="
+ ${PYTHON_DEPS}
+ ${CDEPEND}
+ sys-devel/gcc"
+
+DEPEND="
+ ${CDEPEND}
+ dev-python/docutils
+ virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+DOCS=( README doc/changes.rst )
+
+AUTOTOOLS_AUTORECONF="yes"
+
+pkg_setup() {
+ ebegin "Creating varnish user and group"
+ enewgroup varnish 40
+ enewuser varnish 40 -1 /var/lib/varnish varnish
+ eend $?
+}
+
+src_prepare() {
+ # Remove bundled libjemalloc. We also fix
+ # automagic dep in our patches, bug #461638
+ rm -rf lib/libjemalloc
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable jit pcre-jit )
+ $(use_with jemalloc)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
+
+ newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+ newconfd "${FILESDIR}"/varnishlog.confd varnishlog
+
+ newinitd "${FILESDIR}"/varnishncsa.initd-r1 varnishncsa
+ newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+ newinitd "${FILESDIR}"/varnishd.initd-r3 varnishd
+ newconfd "${FILESDIR}"/varnishd.confd-r3 varnishd
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+ diropts -m750
+
+ dodir /var/log/varnish/
+
+ systemd_dounit "${FILESDIR}/${PN}d.service"
+
+ insinto /etc/varnish/
+ doins lib/libvmod_std/vmod.vcc
+ doins etc/example.vcl
+
+ fowners root:varnish /etc/varnish/
+ fowners varnish:varnish /var/lib/varnish/
+ fperms 0750 /var/lib/varnish/ /etc/varnish/
+}
+
+pkg_postinst () {
+ elog "No demo-/sample-configfile is included in the distribution. Please"
+ elog "read the man-page for more info. A sample configuration proxying"
+ elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
+}
diff --git a/www-servers/webfs/webfs-1.21-r4.ebuild b/www-servers/webfs/webfs-1.21-r4.ebuild
new file mode 100644
index 0000000..219938b
--- /dev/null
+++ b/www-servers/webfs/webfs-1.21-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Lightweight HTTP server for static content"
+SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz"
+HOMEPAGE="http://linux.bytesex.org/misc/webfs.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~arm-linux ~x86-linux"
+IUSE="libressl ssl threads"
+
+DEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )"
+
+RDEPEND="${DEPEND}
+ app-misc/mime-types"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-Variables.mk-dont-strip-binaries-on-install.patch"
+ epatch "${FILESDIR}/${P}-CVE-2013-0347.patch"
+ sed -e "s:/etc/mime.types:${EPREFIX}\\0:" -i GNUmakefile || die "sed failed"
+}
+
+src_compile() {
+ local myconf
+ use ssl || myconf="${myconf} USE_SSL=no"
+ use threads && myconf="${myconf} USE_THREADS=yes"
+
+ emake prefix="${EPREFIX}/usr" ${myconf}
+}
+
+src_install() {
+ local myconf
+ use ssl || myconf="${myconf} USE_SSL=no"
+ use threads && myconf="${myconf} USE_THREADS=yes"
+ einstall ${myconf} mandir="${ED}/usr/share/man"
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ dodoc README
+}
+
+pkg_preinst() {
+ # Fix existing log permissions for bug #458892.
+ chmod 0600 "${EROOT}/var/log/webfsd.log" 2>/dev/null
+}
diff --git a/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild b/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild
new file mode 100644
index 0000000..3001951
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal nptl selinux +suid systemd tslib +udev unwind wayland"
+
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ media-libs/freetype
+ >=x11-apps/iceauth-1.0.2
+ >=x11-apps/rgb-1.0.3
+ >=x11-apps/xauth-1.0.3
+ x11-apps/xkbcomp
+ >=x11-libs/libdrm-2.4.46
+ >=x11-libs/libpciaccess-0.12.901
+ >=x11-libs/libXau-1.0.4
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXfont-1.4.2
+ >=x11-libs/libxkbfile-1.0.4
+ >=x11-libs/libxshmfence-1.1
+ >=x11-libs/pixman-0.27.2
+ >=x11-libs/xtrans-1.3.5
+ >=x11-misc/xbitmaps-1.0.1
+ >=x11-misc/xkeyboard-config-2.4.1-r3
+ dmx? (
+ x11-libs/libXt
+ >=x11-libs/libdmx-1.0.99.1
+ >=x11-libs/libX11-1.1.5
+ >=x11-libs/libXaw-1.0.4
+ >=x11-libs/libXext-1.0.99.4
+ >=x11-libs/libXfixes-5.0
+ >=x11-libs/libXi-1.2.99.1
+ >=x11-libs/libXmu-1.0.3
+ x11-libs/libXrender
+ >=x11-libs/libXres-1.0.3
+ >=x11-libs/libXtst-1.0.99.2
+ )
+ glamor? (
+ media-libs/libepoxy
+ >=media-libs/mesa-10.3.4-r1[egl,gbm]
+ !x11-libs/glamor
+ )
+ kdrive? (
+ >=x11-libs/libXext-1.0.5
+ x11-libs/libXv
+ )
+ xephyr? (
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-renderutil
+ x11-libs/xcb-util-wm
+ )
+ !minimal? (
+ >=x11-libs/libX11-1.1.5
+ >=x11-libs/libXext-1.0.5
+ >=media-libs/mesa-10.3.4-r1[nptl=]
+ )
+ tslib? ( >=x11-libs/tslib-1.0 )
+ udev? ( >=virtual/udev-150 )
+ unwind? ( sys-libs/libunwind )
+ wayland? (
+ >=dev-libs/wayland-1.3.0
+ media-libs/libepoxy
+ )
+ >=x11-apps/xinit-1.3.3-r1
+ systemd? (
+ sys-apps/dbus
+ sys-apps/systemd
+ )"
+
+DEPEND="${CDEPEND}
+ sys-devel/flex
+ >=x11-proto/bigreqsproto-1.1.0
+ >=x11-proto/compositeproto-0.4
+ >=x11-proto/damageproto-1.1
+ >=x11-proto/fixesproto-5.0
+ >=x11-proto/fontsproto-2.1.3
+ >=x11-proto/glproto-1.4.17-r1
+ >=x11-proto/inputproto-2.2.99.1
+ >=x11-proto/kbproto-1.0.3
+ >=x11-proto/randrproto-1.4.0
+ >=x11-proto/recordproto-1.13.99.1
+ >=x11-proto/renderproto-0.11
+ >=x11-proto/resourceproto-1.2.0
+ >=x11-proto/scrnsaverproto-1.1
+ >=x11-proto/trapproto-3.4.3
+ >=x11-proto/videoproto-2.2.2
+ >=x11-proto/xcmiscproto-1.2.0
+ >=x11-proto/xextproto-7.2.99.901
+ >=x11-proto/xf86dgaproto-2.0.99.1
+ >=x11-proto/xf86rushproto-1.1.2
+ >=x11-proto/xf86vidmodeproto-2.2.99.1
+ >=x11-proto/xineramaproto-1.1.3
+ >=x11-proto/xproto-7.0.26
+ >=x11-proto/presentproto-1.0
+ >=x11-proto/dri3proto-1.0
+ dmx? (
+ >=x11-proto/dmxproto-2.2.99.1
+ doc? (
+ || (
+ www-client/links
+ www-client/lynx
+ www-client/w3m
+ )
+ )
+ )
+ !minimal? (
+ >=x11-proto/xf86driproto-2.1.0
+ >=x11-proto/dri2proto-2.8
+ )"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-xserver )
+ !x11-drivers/xf86-video-modesetting
+"
+
+PDEPEND="
+ xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+ || ( ${IUSE_SERVERS} )
+ )
+ xephyr? ( kdrive )"
+
+#UPSTREAMED_PATCHES=(
+# "${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+ "${UPSTREAMED_PATCHES[@]}"
+ "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch
+ "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+ # needed for new eselect-opengl, bug #541232
+ "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch
+ "${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch
+)
+
+pkg_pretend() {
+ # older gcc is not supported
+ [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+ die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+src_configure() {
+ # localstatedir is used for the log location; we need to override the default
+ # from ebuild.sh
+ # sysconfdir is used for the xorg.conf location; same applies
+ # NOTE: fop is used for doc generating ; and i have no idea if gentoo
+ # package it somewhere
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable dmx)
+ $(use_enable glamor)
+ $(use_enable kdrive)
+ $(use_enable kdrive kdrive-kbd)
+ $(use_enable kdrive kdrive-mouse)
+ $(use_enable kdrive kdrive-evdev)
+ $(use_enable suid install-setuid)
+ $(use_enable tslib)
+ $(use_enable unwind libunwind)
+ $(use_enable wayland xwayland)
+ $(use_enable !minimal record)
+ $(use_enable !minimal xfree86-utils)
+ $(use_enable !minimal install-libxf86config)
+ $(use_enable !minimal dri)
+ $(use_enable !minimal dri2)
+ $(use_enable !minimal glx)
+ $(use_enable xephyr)
+ $(use_enable xnest)
+ $(use_enable xorg)
+ $(use_enable xvfb)
+ $(use_enable nptl glx-tls)
+ $(use_enable udev config-udev)
+ $(use_with doc doxygen)
+ $(use_with doc xmlto)
+ $(use_with systemd systemd-daemon)
+ $(use_enable systemd systemd-logind)
+ --enable-libdrm
+ --sysconfdir="${EPREFIX}"/etc/X11
+ --localstatedir="${EPREFIX}"/var
+ --with-fontrootdir="${EPREFIX}"/usr/share/fonts
+ --with-xkb-output="${EPREFIX}"/var/lib/xkb
+ --disable-config-hal
+ --disable-linux-acpi
+ --without-dtrace
+ --without-fop
+ --with-os-vendor=Gentoo
+ --with-sha1=libcrypto
+ )
+
+ xorg-2_src_configure
+}
+
+src_install() {
+ xorg-2_src_install
+
+ server_based_install
+
+ if ! use minimal && use xorg; then
+ # Install xorg.conf.example into docs
+ dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+ fi
+
+ newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+ newinitd "${FILESDIR}"/xdm.initd-11 xdm
+ newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+ # install the @x11-module-rebuild set for Portage
+ insinto /usr/share/portage/config/sets
+ newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+ # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+ eselect opengl set xorg-x11 --use-old
+}
+
+pkg_postrm() {
+ # Get rid of module dir to ensure opengl-update works properly
+ if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+ rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+ fi
+}
+
+server_based_install() {
+ if ! use xorg; then
+ rm "${ED}"/usr/share/man/man1/Xserver.1x \
+ "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+ "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+ "${ED}"/usr/share/man/man1/Xserver.1x
+ fi
+}
diff --git a/x11-drivers/xf86-video-freedreno/Manifest b/x11-drivers/xf86-video-freedreno/Manifest
index a2df8d6..d752812 100644
--- a/x11-drivers/xf86-video-freedreno/Manifest
+++ b/x11-drivers/xf86-video-freedreno/Manifest
@@ -1,3 +1,4 @@
DIST xf86-video-freedreno-1.0.0.tar.bz2 310884 SHA256 6f11ce10a86b154c2a827632c6be4d33d32c4f982a72c355680f8c3bb22db767 SHA512 80d1d8a5d69dd36df2c23f72460c40604d1873389bc3ab446b876587500dac4c88b10512552a884809bdc886207649ba3815d5a0e576d23ea723823055ac4877 WHIRLPOOL e23ef483791a9dccfd8284af71631a3c9289ea665d321215e3a36c8c79924ee5c6300a09fc667d4f9d1e2f8400bc5c6d96f74856accbdf37e5cfd387de30925f
DIST xf86-video-freedreno-1.1.0.tar.bz2 324575 SHA256 7ac0a972d4a5610a1ca32ae0aee2733db907fd017c1c8b9c4c0482540bb985cf SHA512 f4dfa1e246340b59ebf49826b71edc8d69ae9fea3ff41780d0a11fe5fab8e714b094cc8bd7e8d20537eac52d489518a8ae3848fd13d584ed764d14066d0cf117 WHIRLPOOL 2844805c73f61d5e7e67449c954eed806e31ddedf0cc5354318e847dc3a76678cbc28acd79a046f0e727e320ba1d99907497295b8e5300cffc7b34f87b2c43f3
DIST xf86-video-freedreno-1.3.0.tar.bz2 327153 SHA256 1c9d872d1e7389c7771c33e0070f6eb730c406511afcda63867b096aa3d9301d SHA512 f897cf0f7dda36212ef44379cd23d838f1a01832911b3ca52771ccbca6c3722da2c9218bac78679b610d8c3a7f56d05ba3823bea7cbbaef3366b4b14e9e311fd WHIRLPOOL 4d06a33160da61477e22f7c19788b9f66027a20db8958c61ffc0018260d29d966a60c2770d65fda5911fbd631eb9d21632bf007d5f5ac9b078e0c9eda7b1c71e
+DIST xf86-video-freedreno-1.4.0.tar.bz2 312898 SHA256 f5abdd0b09b7ba4bab13440667b00b9be72e734a343d35d8876f08e1b93dc6c1 SHA512 5bc7c35bd79e8ff90d8da5360413b03c497ba3dec9399c78fc85e8f1d2bf8955c27c6b225dfbbcdb73a16a4b539cfa131e309866e42289cb577d0e9bfc15b6ca WHIRLPOOL 9af8cc95f0a5b17e90bcd55e506dc3a7177890a03f23885ae593615a68bcbc90c93fa49c0e0afa36f164fd115abb3e14074e18e7e6e59bffde4b942e6c02776b
diff --git a/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.4.0.ebuild b/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.4.0.ebuild
new file mode 100644
index 0000000..f0c33a3
--- /dev/null
+++ b/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.4.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="Driver for Adreno mobile GPUs"
+KEYWORDS="~arm"
+IUSE=""
+
+RDEPEND=">=media-libs/mesa-10.2[xa]
+ virtual/libudev
+ >=x11-libs/libdrm-2.4.54[video_cards_freedreno]"
+DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-omap/Manifest b/x11-drivers/xf86-video-omap/Manifest
index 2b479a3..1b6990c 100644
--- a/x11-drivers/xf86-video-omap/Manifest
+++ b/x11-drivers/xf86-video-omap/Manifest
@@ -1,2 +1,3 @@
DIST xf86-video-omap-0.4.2.tar.bz2 310629 SHA256 1343fe5be6eeb375bbad0731685d05cb649faef773eba927645cef536bb206ff SHA512 9c3160af5dcd97463ef36ef6d24be1382466095b9df5c2946b74f1ba00671bd6c08dcfb52c6b6f7c72b97dbc5124b842c59448ecd7ada3c22da097ba55e4fb83 WHIRLPOOL 2621dfbe4f715875f0eb26d363947d6a4b574fa48b6d720e521196a8d72d9ec96d84c76e0eabd9810327d6210f349ee584a29f70312aff4c749708230d021424
DIST xf86-video-omap-0.4.3.tar.bz2 316093 SHA256 db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d SHA512 278cbe478acc67a966a1c3080ada2a13458011fc0b50d122811da803d4e051a5827bcccd48517e1ed2f416da1d5fee062aa1c8796f152048c449594aed55b310 WHIRLPOOL 0db24e2aaeff75f6c3602f5def850111dbb171cf4c9453219c366639b9f7771a4f1cf41bd700e54a0124d1ded0d6069b87866fba70f101849d75c12708e3c9a0
+DIST xf86-video-omap-0.4.4.tar.bz2 300380 SHA256 a7192690b8638f5c8d611a1bae07cc13081e22edd4070f37a2f5c3f8d79e7ebc SHA512 584056c660dd7c31568c8b7783727e095173071bb5a0d9d07cac906f40aac563740d225c0dc3a46ca0af5ed8018b49409429f9ec3d8d09227ed021472cd7e118 WHIRLPOOL 19b1cb1cf9b8eeb242e67e58197b73fc5aef1fe1dc676a953b4d32a92ec13dd627e0526d3037a2ecce1e7cdfec100e9c68b2b5e90e90941de8ca90631ee81815
diff --git a/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.4.ebuild b/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.4.ebuild
new file mode 100644
index 0000000..6b3ff14
--- /dev/null
+++ b/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="OMAP video driver"
+
+KEYWORDS="~arm"
+
+RDEPEND=">=x11-base/xorg-server-1.3
+ >=x11-libs/libdrm-2.4.36[video_cards_omap]"
+DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index a5b92fd..8d76d9a 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -1,4 +1,4 @@
DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
DIST VirtualBox-4.3.30.tar.bz2 97428942 SHA256 ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 SHA512 d0817335cf4bd196da93b91ede6bc9e48ca0d471166ab2790dbf508a4574e4ace54a86053932abf3b4e804c583e80a713d2ab2e556dc15bee6ef3a62f88b95fc WHIRLPOOL 47cbd702e83cc737e04b5862cc6c52e32be244dc1dc0145f582f57b2f19bb898f0f4b200576a28f10a3290691f1ffd43c256e8c8eb5545a9723be8eefca88a38
-DIST VirtualBox-5.0.2.tar.bz2 109872963 SHA256 f290c220d62af2a7fdabb1934c1a0b924b68968a236bb2509bcb507d2c19485e SHA512 fc89cfe475aa02182b04e19a62d52d02b4ff5d2afb082ed3cf11b36288b19f7be15b0e76ae2fd8b9b2c3d5456b316453f112c3b711d242915688adf24623e0c1 WHIRLPOOL 23de881fa6233ce97a1ceeca900657019466df08dc0890355b9d415cd8f4fe8d6877f06218b2455a75be69cfa13d3b2a35855fb641832b300788273af1d26b32
DIST VirtualBox-5.0.4.tar.bz2 109865904 SHA256 b19e23fc8e71f38aef7c059f44e59fcbff3bb2ce85baa8de81f1629b85f68fcf SHA512 4349792390f0a236faef0bdb06806dde604373dcccf83351f805508a2fdcae9f729a5e793ac53c4d134c50e48c0624b340328a7bb21ddcf15ed69a08365eb2b5 WHIRLPOOL cacf3193231a8500a3b475ede2d0f0458a656d87d3d97b78ccb743c1606f7f6ec58f6d56cb1bc0a40e9eb279d4cbeeab3318d1e71be3dead07fe4ccff6bdfbcf
+DIST VirtualBox-5.0.6.tar.bz2 109863328 SHA256 22d63f28c43165a31dcccdec1c65f376f46d7e09555c47611cfaafb5576a5843 SHA512 3e51c9476c29a3ba79adda2d3b0c0b516459f58c8aa5e7b795be1aa2468b8e61241bbe5615787d7302a5f95230a446377bd8698f801c2114b26a471ae8bbbc11 WHIRLPOOL 11603c9aa14acac87032b5d8fc1f8d0a567632ca591230e0cc5c1d9a1ae9b39ebccb1a3bb85e1845abc01b04da550a2ef889e1bf91da0bb82df1fafa384f88b4
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.2.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.6.ebuild
similarity index 100%
rename from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.2.ebuild
rename to x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.6.ebuild
diff --git a/x11-libs/cairo/cairo-1.14.2-r1.ebuild b/x11-libs/cairo/cairo-1.14.2-r1.ebuild
new file mode 100644
index 0000000..12d34b3
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.14.2-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+ SRC_URI=""
+else
+ SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb xlib-xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+ directfb? ( dev-libs/DirectFB )
+ gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ )
+ xcb? (
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/libtool-2
+ X? (
+ >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+ )"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+# doc? (
+# >=dev-util/gtk-doc-1.6
+# ~app-text/docbook-xml-dtd-4.2
+# )"
+
+REQUIRED_USE="
+ gles2? ( !opengl )
+ xlib-xcb? ( xcb )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/cairo/cairo-directfb.h
+)
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+ epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+
+ # tests and perf tools require X, bug #483574
+ if ! use X; then
+ sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+ fi
+
+ epatch_user
+
+ # Slightly messed build system YAY
+ if [[ ${PV} == *9999* ]]; then
+ touch boilerplate/Makefile.am.features
+ touch src/Makefile.am.features
+ touch ChangeLog
+ fi
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myopts
+
+ [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+ use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+ # TODO: remove this (and add USE-dep) when DirectFB is converted,
+ # bug #484248 -- but beware of the circular dep.
+ if ! multilib_is_native_abi; then
+ myopts+=" --disable-directfb"
+ fi
+
+ # TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
+ if ! multilib_is_native_abi; then
+ myopts+=" --disable-qt"
+ fi
+
+ # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ --disable-dependency-tracking \
+ $(use_with X x) \
+ $(use_enable X tee) \
+ $(use_enable X xlib) \
+ $(use_enable X xlib-xrender) \
+ $(use_enable aqua quartz) \
+ $(use_enable aqua quartz-image) \
+ $(use_enable debug test-surfaces) \
+ $(use_enable directfb) \
+ $(use_enable gles2 glesv2) \
+ $(use_enable glib gobject) \
+ $(use_enable opengl gl) \
+ $(use_enable static-libs static) \
+ $(use_enable svg) \
+ $(use_enable valgrind) \
+ $(use_enable xcb) \
+ $(use_enable xcb xcb-shm) \
+ $(use_enable xlib-xcb) \
+ --enable-ft \
+ --enable-pdf \
+ --enable-png \
+ --enable-ps \
+ --disable-drm \
+ --disable-gallium \
+ --disable-qt \
+ --disable-vg \
+ ${myopts}
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --all
+ einstalldocs
+}
+
+pkg_postinst() {
+ if use !xlib-xcb; then
+ if has_version net-misc/nxserver-freenx \
+ || has_version net-misc/x2goserver; then
+ ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers."
+ ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+"
+ ewarn "applications that are running inside NX sessions. For details, see"
+ ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173"
+ fi
+ fi
+}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 4301ec8..12d34b3 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -30,6 +30,7 @@
>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
directfb? ( dev-libs/DirectFB )
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index b55bc94..a376532 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -12,8 +12,8 @@
SLOT="1"
LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="cairo debug doc examples games +opengl pdf static-libs +threads +xft +xinerama"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
RDEPEND="
>=media-libs/libpng-1.2:0
@@ -29,14 +29,7 @@
xft? ( x11-libs/libXft )"
DEPEND="${RDEPEND}
x11-proto/xextproto
- doc? (
- app-doc/doxygen
- pdf? (
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- )
+ doc? ( app-doc/doxygen )
xinerama? ( x11-proto/xineramaproto )"
FLTK_INCDIR=${EPREFIX}/usr/include/fltk
@@ -99,12 +92,11 @@
src_compile() {
default
+
if use doc; then
emake -C documentation html
- if use pdf; then
- emake -C documentation pdf
- fi
fi
+
if use games; then
emake -C test blocks checkers sudoku
fi
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index ba25ae8..3c620a6 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -15,7 +15,7 @@
SLOT="1"
LICENSE="FLTK LGPL-2"
KEYWORDS=""
-IUSE="cairo debug doc examples games +opengl pdf static-libs +threads +xft +xinerama"
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
RDEPEND="
>=media-libs/libpng-1.2:0
@@ -31,14 +31,7 @@
xft? ( x11-libs/libXft )"
DEPEND="${RDEPEND}
x11-proto/xextproto
- doc? (
- app-doc/doxygen
- pdf? (
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- )
+ doc? ( app-doc/doxygen )
xinerama? ( x11-proto/xineramaproto )"
FLTK_INCDIR=${EPREFIX}/usr/include/fltk
@@ -102,12 +95,11 @@
src_compile() {
default
+
if use doc; then
emake -C documentation html
- if use pdf; then
- emake -C documentation pdf
- fi
fi
+
if use games; then
emake -C test blocks checkers sudoku
fi
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 3bbc8ef..a6dadd3 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1 +1,2 @@
DIST gdk-pixbuf-2.30.8.tar.xz 1336788 SHA256 4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be SHA512 2888cf035b70330e8d3ac87af54b69b2c990440fd59922464088d2a685e90022ad39c83d1ce1ccccfac3872b55ce9445ec4a3e9c7ab6371e20b19e20df7f261d WHIRLPOOL e7f69807ed629c5703750a91cc7a95ee2b3aa178a74c9197c20f863648436a023d140cf1274ba38369e8da3d77216bb1fcc66bae5b612ee8ee33ee4b42e11d65
+DIST gdk-pixbuf-2.32.1.tar.xz 2427908 SHA256 4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc SHA512 4c744f166e86c17cafebe0db9434794666b64850a60597e34675cf9b902e48e89c3ff45032a10899944ae59b6c0db63c1ff33c4d2c50846393e77bad3a3adec2 WHIRLPOOL 566b73752c1e478fdf7011c3d2222ea39eb13052741c70a0dffd6a0800e892e951207856b90e0d20c352981565682dec28c51fc4951f2236767e97c838d239a2
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch
new file mode 100644
index 0000000..273956e
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch
@@ -0,0 +1,81 @@
+From 2fb6bce8b3fdae67b8cdd93f253dad3743fc01b8 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Tue, 6 Oct 2015 11:46:24 -0500
+Subject: [PATCH] pixops: use gint64 in more places to avoid overflow when
+ shifting
+
+---
+ gdk-pixbuf/pixops/pixops.c | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
+index b0abecd..6a4a096 100644
+--- a/gdk-pixbuf/pixops/pixops.c
++++ b/gdk-pixbuf/pixops/pixops.c
+@@ -354,11 +354,11 @@ pixops_composite_nearest (guchar *dest_buf,
+ double scale_y,
+ int overall_alpha)
+ {
+- int i;
+- int x;
+- int x_step = (1 << SCALE_SHIFT) / scale_x;
+- int y_step = (1 << SCALE_SHIFT) / scale_y;
+- int xmax, xstart, xstop, x_pos, y_pos;
++ gint64 i;
++ gint64 x;
++ gint64 x_step = (1 << SCALE_SHIFT) / scale_x;
++ gint64 y_step = (1 << SCALE_SHIFT) / scale_y;
++ gint64 xmax, xstart, xstop, x_pos, y_pos;
+ const guchar *p;
+ unsigned int a0;
+
+@@ -524,13 +524,13 @@ pixops_composite_color_nearest (guchar *dest_buf,
+ guint32 color1,
+ guint32 color2)
+ {
+- int i, j;
+- int x;
+- int x_step = (1 << SCALE_SHIFT) / scale_x;
+- int y_step = (1 << SCALE_SHIFT) / scale_y;
++ gint64 i, j;
++ gint64 x;
++ gint64 x_step = (1 << SCALE_SHIFT) / scale_x;
++ gint64 y_step = (1 << SCALE_SHIFT) / scale_y;
+ int r1, g1, b1, r2, g2, b2;
+ int check_shift = get_check_shift (check_size);
+- int xmax, xstart, xstop, x_pos, y_pos;
++ gint64 xmax, xstart, xstop, x_pos, y_pos;
+ const guchar *p;
+ unsigned int a0;
+
+@@ -1338,20 +1338,20 @@ pixops_process (guchar *dest_buf,
+ PixopsLineFunc line_func,
+ PixopsPixelFunc pixel_func)
+ {
+- int i, j;
+- int x, y; /* X and Y position in source (fixed_point) */
++ gint64 i, j;
++ gint64 x, y; /* X and Y position in source (fixed_point) */
+
+ guchar **line_bufs;
+ int *filter_weights;
+
+- int x_step;
+- int y_step;
++ gint64 x_step;
++ gint64 y_step;
+
+ int check_shift;
+- int scaled_x_offset;
++ gint64 scaled_x_offset;
+
+- int run_end_x;
+- int run_end_index;
++ gint64 run_end_x;
++ gint64 run_end_index;
+
+ x_step = (1 << SCALE_SHIFT) / scale_x; /* X step in source (fixed point) */
+ y_step = (1 << SCALE_SHIFT) / scale_y; /* Y step in source (fixed point) */
+--
+2.6.1
+
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r1.ebuild
deleted file mode 100644
index d611493..0000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X debug +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
- X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-doc-am-1.20
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="${COMMON_DEPEND}
- !<gnome-base/gail-1000
- !<gnome-base/librsvg-2.31.0
- !<x11-libs/gtk+-2.21.3:2
- !<x11-libs/gtk+-2.90.4:3
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-gtklibs-20131008-r2
- !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
- )
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gdk-pixbuf-query-loaders
-)
-
-src_prepare() {
- # Upstream patches from 2.31.x
- epatch "${FILESDIR}"/${PN}-2.30.8-divide-by-zero.patch \
- "${FILESDIR}"/${PN}-2.30.8-pixops-overflow.patch #556314
-
- # This will avoid polluting the pkg-config file with versioned libpng,
- # which is causing problems with libpng14 -> libpng15 upgrade
- # See upstream bug #667068
- # First check that the pattern is present, to catch upstream changes on bumps,
- # because sed doesn't return failure code if it doesn't do any replacements
- grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
- sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
- [[ ${CHOST} == *-solaris* ]] && append-libs intl
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- # png always on to display icons
- ECONF_SOURCE="${S}" \
- gnome2_src_configure \
- $(usex debug --enable-debug=yes "") \
- $(use_with jpeg libjpeg) \
- $(use_with jpeg2k libjasper) \
- $(use_with tiff libtiff) \
- $(multilib_native_use_enable introspection) \
- $(use_with X x11) \
- --with-libpng
-
- # work-around gtk-doc out-of-source brokedness
- if multilib_is_native_abi; then
- ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
- fi
-}
-
-multilib_src_install() {
- # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
-
- multilib_pkg_preinst() {
- # Make sure loaders.cache belongs to gdk-pixbuf alone
- local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
- }
-
- multilib_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
-
- multilib_foreach_abi gnome2_pkg_postinst
-
- # Migration snippet for when this was handled by gtk+
- if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
- elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
- elog "to do that you can use qfile from portage-utils:"
- elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
- fi
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
- rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
- fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild
deleted file mode 100644
index 4ef0c9e..0000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X debug +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
- X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-doc-am-1.20
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="${COMMON_DEPEND}
- !<gnome-base/gail-1000
- !<gnome-base/librsvg-2.31.0
- !<x11-libs/gtk+-2.21.3:2
- !<x11-libs/gtk+-2.90.4:3
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-gtklibs-20131008-r2
- !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
- )
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gdk-pixbuf-query-loaders
-)
-
-src_prepare() {
- # This will avoid polluting the pkg-config file with versioned libpng,
- # which is causing problems with libpng14 -> libpng15 upgrade
- # See upstream bug #667068
- # First check that the pattern is present, to catch upstream changes on bumps,
- # because sed doesn't return failure code if it doesn't do any replacements
- grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
- sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
- [[ ${CHOST} == *-solaris* ]] && append-libs intl
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- # png always on to display icons
- ECONF_SOURCE="${S}" \
- gnome2_src_configure \
- $(usex debug --enable-debug=yes "") \
- $(use_with jpeg libjpeg) \
- $(use_with jpeg2k libjasper) \
- $(use_with tiff libtiff) \
- $(multilib_native_use_enable introspection) \
- $(use_with X x11) \
- --with-libpng
-}
-
-multilib_src_install() {
- # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
-
- multilib_pkg_preinst() {
- # Make sure loaders.cache belongs to gdk-pixbuf alone
- local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
- }
-
- multilib_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
-
- multilib_foreach_abi gnome2_pkg_postinst
-
- # Migration snippet for when this was handled by gtk+
- if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
- elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
- elog "to do that you can use qfile from portage-utils:"
- elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
- fi
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
- rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
- fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild
new file mode 100644
index 0000000..7abd159
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+ tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+ X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-doc-am-1.20
+ >=sys-devel/gettext-0.19
+ virtual/pkgconfig
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gail-1000
+ !<gnome-base/librsvg-2.31.0
+ !<x11-libs/gtk+-2.21.3:2
+ !<x11-libs/gtk+-2.90.4:3
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r2
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gdk-pixbuf-query-loaders
+)
+
+src_prepare() {
+ # Upstream patches from 2.32.x
+ epatch "${FILESDIR}"/${P}-gint64-shift-overflow.patch
+
+ # This will avoid polluting the pkg-config file with versioned libpng,
+ # which is causing problems with libpng14 -> libpng15 upgrade
+ # See upstream bug #667068
+ # First check that the pattern is present, to catch upstream changes on bumps,
+ # because sed doesn't return failure code if it doesn't do any replacements
+ grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
+ sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
+ [[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ # png always on to display icons
+ ECONF_SOURCE="${S}" \
+ gnome2_src_configure \
+ $(usex debug --enable-debug=yes "") \
+ $(use_with jpeg libjpeg) \
+ $(use_with jpeg2k libjasper) \
+ $(use_with tiff libtiff) \
+ $(multilib_native_use_enable introspection) \
+ $(use_with X x11) \
+ --with-libpng
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
+ fi
+}
+
+multilib_src_install() {
+ # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+ MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ multilib_pkg_preinst() {
+ # Make sure loaders.cache belongs to gdk-pixbuf alone
+ local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+
+ multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+
+ multilib_foreach_abi gnome2_pkg_postinst
+
+ # Migration snippet for when this was handled by gtk+
+ if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
+ elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
+ elog "to do that you can use qfile from portage-utils:"
+ elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+ fi
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+ fi
+}
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
index b2854c1..6ee11f7 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE="+hardened"
# gnome-pty-helper was spit out with 0.27.90
diff --git a/x11-libs/gtk+/gtk+-3.16.6.ebuild b/x11-libs/gtk+/gtk+-3.16.6.ebuild
index 33dc84f..47de420 100644
--- a/x11-libs/gtk+/gtk+-3.16.6.ebuild
+++ b/x11-libs/gtk+/gtk+-3.16.6.ebuild
@@ -19,7 +19,7 @@
xinerama? ( X )
"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# FIXME: introspection data is built against system installation of gtk+:3
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
diff --git a/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild b/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
index 6a229b2..e8442d8 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
@@ -16,7 +16,7 @@
SLOT="3.0/3"
IUSE="glade +introspection vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
# Note: has native OSX support, prefix teams, attack!
RDEPEND="
diff --git a/x11-libs/libXevie/Manifest b/x11-libs/libXevie/Manifest
deleted file mode 100644
index 43242ef..0000000
--- a/x11-libs/libXevie/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libXevie-1.0.3.tar.bz2 253286 SHA256 c00b382123e58f595b3cecaa50471ebec534660e5f92ae46d94266345844fd73 SHA512 fe26a446842559bc077e3ca257a57bb26730eec72c55fbe98de2a6b9ea83a47a2a8411ba16976bf834bb83b50398dde73d93112153b79b7b8ef88604f9b16dd6 WHIRLPOOL fc85854900e05c0692d6d432fe687be9236225445f77359f87504a400fd021f59cad63a52acc98ec4bf8cc7884269a1b002a80c4cb7b07cdbeec979dd2af83b9
diff --git a/x11-libs/libXevie/libXevie-1.0.3.ebuild b/x11-libs/libXevie/libXevie-1.0.3.ebuild
deleted file mode 100644
index e059fe5..0000000
--- a/x11-libs/libXevie/libXevie-1.0.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-inherit xorg-2
-
-DESCRIPTION="X.Org Xevie library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-proto/xextproto
- x11-proto/xproto
- x11-proto/evieext"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXevie/metadata.xml b/x11-libs/libXevie/metadata.xml
deleted file mode 100644
index 01c4c00..0000000
--- a/x11-libs/libXevie/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-libs/librfm/Manifest b/x11-libs/librfm/Manifest
new file mode 100644
index 0000000..3f34e25
--- /dev/null
+++ b/x11-libs/librfm/Manifest
@@ -0,0 +1 @@
+DIST librfm5-5.3.16.3.tar.bz2 3304424 SHA256 326d6be04a39a25246800987299bc224385511c95190490f5bdf813242ec3753 SHA512 e3d00b0337c9368bbe939bcb2d7f6b1c3f3b6b5a810074c5d6bc7afccd938c5284075231a0326b5be2b93436bee346871fb47ee30c130e6ce00756148d214000 WHIRLPOOL 3b24c6d50232f291cb84db379cddbd489a31099a019f4d2c7159e3477ec4459ab0cc7d390b90aebb2a06a7a405d497ce569cdfb02cc43d06b0e210051120ef3d
diff --git a/x11-libs/librfm/librfm-5.3.16.3.ebuild b/x11-libs/librfm/librfm-5.3.16.3.ebuild
new file mode 100644
index 0000000..ea0262c
--- /dev/null
+++ b/x11-libs/librfm/librfm-5.3.16.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=${PN}5-${PV}
+
+DESCRIPTION="the basic library used by some rfm applications, such as Rodent filemanager"
+HOMEPAGE="http://xffm.org/libxffm.html"
+SRC_URI="mirror://sourceforge/xffm/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.22.5:2
+ >=dev-libs/libdbh-5.0.13
+ >=dev-libs/libtubo-5.0.13
+ >=dev-libs/libxml2-2.4.0:2
+ >=dev-libs/libzip-0.9
+ >=gnome-base/librsvg-2.26:2
+ >=x11-libs/cairo-1.12.6
+ >=x11-libs/gtk+-3.12:3
+ >=x11-libs/pango-1.28.0
+ !<x11-misc/rodent-5"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+ DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+
+src_prepare() {
+ sed -i -e "s:-O2:${CFLAGS}:" m4/rfm-conditionals.m4 || die
+ eautoreconf
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/x11-libs/librfm/metadata.xml b/x11-libs/librfm/metadata.xml
new file mode 100644
index 0000000..fcc6fe9
--- /dev/null
+++ b/x11-libs/librfm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>angelos@gentoo.org</email>
+ <name>Christoph Mende</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 9a0c7c4..95de130 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,4 +1 @@
-DIST pango-1.36.3.tar.xz 1021656 SHA256 ad48e32917f94aa9d507486d44366e59355fcfd46ef86d119ddcba566ada5d22 SHA512 74f94c4e853f8d7538990589e5c9796e48cce32f935cf50d0155b57d00fbce155c9dd659b0803b861c568ddedffb14712fbcbefadfeefb43d2ed0fab949258a2 WHIRLPOOL c63a1b5d27eb55530bfc86da77f25fe6c022346cf30f1beeaaa1ef3b90cee6afde44d0735ad77811e7cc487cd35bb18efc667aaa470725c0b2cc3fdb6e495560
-DIST pango-1.36.5.tar.xz 1023952 SHA256 be0e94b2e5c7459f0b6db21efab6253556c8f443837200b8736d697071276ac8 SHA512 d2c2f5ffcc67ec9f4bf942905b09294be4896f11b1fd66b6e63e75c3f269c8b5c1f9e75127f7b550fa354e0fc66eb32de24d262caa784ee7ac66709da776386c WHIRLPOOL ac6ecb13dbba51527a629e1b216ed6affa9881ffffd5ed90d3f1d96772a17c7815ae0a3c2340444c473092a1c2ec8966110bb1f2c6df2b0af7358a1c9e8255de
-DIST pango-1.36.7.tar.xz 1033896 SHA256 1f7b527423a1b3044fd9ae7fbe054107b06723ff1c73e0b5f7bf9b84358d404a SHA512 a048888ffdcf7dd574da01598a86d936540d057d2226d122c73c024d401c281260fd93262e7a683d88b58b9a90e44e7e7597945a84a4d4f81094e1498a4247e3 WHIRLPOOL d88a3fe0f9f6b9c403de1f6662db41c2e3f83e401d4413f9ab22a9e0525edd16eee7248c4b5555fc7c178dd167f06bbd66df5b3c1ee8a0b9febf244abf8256a8
DIST pango-1.36.8.tar.xz 1033528 SHA256 18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07 SHA512 799fad4add3b1ff297bd151a302d6724c5fb0223c9e0f710f97192c024de0175db9a03458e0c18019bdd987b04b5f74737659e113d6b511cf1fc118b9be3c215 WHIRLPOOL cb352f115a85f02061c1d1d96ad99340372a013eb9249ff2ccf6531926c26dc17b9b88572bccd40e3dbcb6f8e7a673b01ff1821a8acaa5117d96d8d6ed71707e
diff --git a/x11-libs/pango/files/pango-1.32.1-lib64.patch b/x11-libs/pango/files/pango-1.32.1-lib64.patch
deleted file mode 100644
index 0820c78..0000000
--- a/x11-libs/pango/files/pango-1.32.1-lib64.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c41144ce0d72cb19d347a46ef9386f257f14fb58 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 28 Oct 2012 23:19:39 +0100
-Subject: [PATCH] Add multilib support
-
-pango.modules list modules specific to a host architecture.
-Add host triplet in path so that machine able to run multiple
-triplet have a proper file per pango library.
----
- pango/Makefile.am | 1 +
- pango/pango-utils.c | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/pango/Makefile.am b/pango/Makefile.am
-index ab092c9..558108b 100644
---- a/pango/Makefile.am
-+++ b/pango/Makefile.am
-@@ -17,6 +17,7 @@ INCLUDES = \
- -DPANGO_ENABLE_BACKEND \
- -DPANGO_ENABLE_ENGINE \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
-+ -DHOST=\"$(host_triplet)\" \
- -DLIBDIR=\"$(libdir)\" \
- -I$(top_srcdir) \
- -I$(top_builddir) \
-diff --git a/pango/pango-utils.c b/pango/pango-utils.c
-index 18ffa26..3b88f15 100644
---- a/pango/pango-utils.c
-+++ b/pango/pango-utils.c
-@@ -738,9 +738,9 @@ pango_get_sysconf_subdirectory (void)
- #else
- const char *sysconfdir = g_getenv ("PANGO_SYSCONFDIR");
- if (sysconfdir != NULL)
-- tmp_result = g_build_filename (sysconfdir, "pango", NULL);
-+ tmp_result = g_build_filename (sysconfdir, "pango", HOST, NULL);
- else
-- tmp_result = SYSCONFDIR "/pango";
-+ tmp_result = SYSCONFDIR "/pango/" HOST;
- #endif
- g_once_init_leave((gsize*)&result, (gsize)tmp_result);
- }
---
-1.7.12.4
-
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
index e6cd553..1ebecbb 100644
--- a/x11-libs/pango/metadata.xml
+++ b/x11-libs/pango/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <upstream>
- <remote-id type="cpe">cpe:/a:pango:pango</remote-id>
- </upstream>
+<herd>gnome</herd>
+<upstream>
+ <remote-id type="cpe">cpe:/a:pango:pango</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/x11-libs/pango/pango-1.36.3.ebuild b/x11-libs/pango/pango-1.36.3.ebuild
deleted file mode 100644
index 87a9efa..0000000
--- a/x11-libs/pango/pango-1.36.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +introspection"
-
-RDEPEND="
- >=media-libs/harfbuzz-0.9.9:=[glib(+),truetype(+)]
- >=dev-libs/glib-2.33.12:2
- >=media-libs/fontconfig-2.10.91:1.0=
- media-libs/freetype:2=
- >=x11-libs/cairo-1.12.10:=[X?]
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- X? (
- x11-libs/libXrender
- x11-libs/libX11
- >=x11-libs/libXft-2.0.0 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.15
- virtual/pkgconfig
- X? ( x11-proto/xproto )
- !<=sys-devel/autoconf-2.63:2.5
-"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
- eautoreconf
-
- gnome2_src_prepare
-}
-
-src_configure() {
- tc-export CXX
-
- gnome2_src_configure \
- --with-cairo \
- $(use_enable introspection) \
- $(use_with X xft) \
- "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
- "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
-}
-
-src_install() {
- gnome2_src_install
-
- local PANGO_CONFDIR="/etc/pango/${CHOST}"
- dodir "${PANGO_CONFDIR}"
- keepdir "${PANGO_CONFDIR}"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- einfo "Generating modules listing..."
- local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
- local pango_conf="${PANGO_CONFDIR}/pango.modules"
- local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX)
-
- # be atomic!
- if pango-querymodules --system \
- "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \
- > "${tmp_file}"; then
- cat "${tmp_file}" > "${pango_conf}" || {
- rm "${tmp_file}"; die; }
- else
- ewarn "Cannot update pango.modules, file generation failed"
- fi
- rm "${tmp_file}"
-
- if [[ ${REPLACING_VERSIONS} < 1.30.1 ]]; then
- elog "In >=${PN}-1.30.1, default configuration file locations moved from"
- elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and"
- elog "~/.config/pango/pangox.aliases"
- fi
-}
diff --git a/x11-libs/pango/pango-1.36.5.ebuild b/x11-libs/pango/pango-1.36.5.ebuild
deleted file mode 100644
index 23fbe59..0000000
--- a/x11-libs/pango/pango-1.36.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +introspection"
-
-RDEPEND="
- >=media-libs/harfbuzz-0.9.12:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- X? (
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
- )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-gtklibs-20131008-r3
- !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
- )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.20
- virtual/pkgconfig
- X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
- !<=sys-devel/autoconf-2.63:2.5
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/pango-querymodules
-)
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
- eautoreconf
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- tc-export CXX
-
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- --with-cairo \
- $(multilib_native_use_enable introspection) \
- $(use_with X xft) \
- "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
- "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
-}
-
-multilib_src_install() {
- gnome2_src_install
-
- local PANGO_CONFDIR="/etc/pango/${CHOST}"
- dodir "${PANGO_CONFDIR}"
- keepdir "${PANGO_CONFDIR}"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- multilib_pkg_postinst() {
- einfo "Generating modules listing..."
- local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
- local pango_conf="${PANGO_CONFDIR}/pango.modules"
- local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX)
-
- # be atomic!
- if "${CHOST}-pango-querymodules" --system \
- "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \
- > "${tmp_file}"; then
- sed "s:^${ROOT}:/:" "${tmp_file}" > "${pango_conf}" || {
- rm "${tmp_file}"; die; }
- else
- ewarn "Cannot update pango.modules, file generation failed"
- fi
- rm "${tmp_file}"
- }
- multilib_foreach_abi multilib_pkg_postinst
-
- if [[ ${REPLACING_VERSIONS} < 1.30.1 ]]; then
- elog "In >=${PN}-1.30.1, default configuration file locations moved from"
- elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and"
- elog "~/.config/pango/pangox.aliases"
- fi
-}
diff --git a/x11-libs/pango/pango-1.36.7.ebuild b/x11-libs/pango/pango-1.36.7.ebuild
deleted file mode 100644
index 8b5a85f..0000000
--- a/x11-libs/pango/pango-1.36.7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +introspection"
-
-RDEPEND="
- >=media-libs/harfbuzz-0.9.12:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- X? (
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
- )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-gtklibs-20131008-r3
- !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
- )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.20
- virtual/pkgconfig
- X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
- !<=sys-devel/autoconf-2.63:2.5
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/pango-querymodules
-)
-
-multilib_src_configure() {
- tc-export CXX
-
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- --with-cairo \
- $(multilib_native_use_enable introspection) \
- $(use_with X xft) \
- "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
- "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
-
- if multilib_is_native_abi; then
- ln -s "${S}"/docs/html docs/html || die
- fi
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- multilib_pkg_postinst() {
- einfo "Generating modules listing..."
- "${CHOST}-pango-querymodules" --update-cache
-
- # Remove old autogenerated file to prevent collisions with newer
- rm -f "${EROOT}/etc/pango/${CHOST}/pango.modules"
- }
-
- multilib_foreach_abi multilib_pkg_postinst
-}
diff --git a/x11-libs/pango/pango-1.36.8-r1.ebuild b/x11-libs/pango/pango-1.36.8-r1.ebuild
new file mode 100644
index 0000000..71b86e9
--- /dev/null
+++ b/x11-libs/pango/pango-1.36.8-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +introspection test"
+
+RDEPEND="
+ >=media-libs/harfbuzz-0.9.12:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r3
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.20
+ virtual/pkgconfig
+ test? ( media-fonts/cantarell )
+ X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+ !<=sys-devel/autoconf-2.63:2.5
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/pango-querymodules
+)
+
+multilib_src_configure() {
+ tc-export CXX
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --with-cairo \
+ $(multilib_native_use_enable introspection) \
+ $(use_with X xft) \
+ "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+ "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/html docs/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ multilib_pkg_postinst() {
+ einfo "Generating modules listing..."
+
+ # chroot needed for bug #534360
+ chroot "${ROOT}" "${CHOST}-pango-querymodules" --update-cache
+
+ # Remove old autogenerated file to prevent collisions with newer
+ rm -f "${EROOT}/etc/pango/${CHOST}/pango.modules"
+ }
+
+ multilib_foreach_abi multilib_pkg_postinst
+
+ # Remove old file, bug #536726
+ oldfile="${EROOT}etc/pango/pango.modules"
+ if [[ -f "${oldfile}" ]]; then
+ elog
+ elog "Removing old ${oldfile}..."
+ rm -f "${oldfile}" || eerror "Failed, please remove ${oldfile} manually"
+ fi
+}
diff --git a/x11-libs/vte/vte-0.40.2.ebuild b/x11-libs/vte/vte-0.40.2.ebuild
index 9476de9..f005bc7 100644
--- a/x11-libs/vte/vte-0.40.2.ebuild
+++ b/x11-libs/vte/vte-0.40.2.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2+"
SLOT="2.91"
IUSE="+crypt debug glade +introspection vala"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
RDEPEND="
diff --git a/x11-misc/alltray/alltray-0.7.5.1.ebuild b/x11-misc/alltray/alltray-0.7.5.1.ebuild
index 64e0767..e743ae6 100644
--- a/x11-misc/alltray/alltray-0.7.5.1.ebuild
+++ b/x11-misc/alltray/alltray-0.7.5.1.ebuild
@@ -40,7 +40,7 @@
-e '/Encoding/d' \
-e '/Categories/s:Application;::' \
-e '/Icon/s:.png::' \
- data/alltray.desktop{,.in} || die
+ data/alltray.desktop{,.in} || die
vala_src_prepare
sed -i -e '/AC_PATH_PROG/s:valac:${VALAC}:g' configure.ac || die
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index ff665bb..7077069 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -4,4 +4,4 @@
DIST lightdm-1.12.3.tar.xz 473512 SHA256 c7dc90fde4f22762f38f06506b64f3b95cc3a1d9ccb8c18efa408087fd054465 SHA512 dca75324e3326a3fdc575837226a9633c7ec967e2484b03e051d5ce2f788dba8e23d4875da3c8d97cb8c6a1da843bc7500876027ca2c40e2bc4844b034acbd08 WHIRLPOOL 22a0c30032dcec66263801285017305b385789ed09b32c3e73c5db27daad44a7c44311d30f2002fe776f10cbaeb5d47727502ff19f61c0465e37987baa231de8
DIST lightdm-1.14.2.tar.xz 477232 SHA256 28b078979870782aaa1a9167945e1dab19cc6d699747af3d0c0c9a3bdb8dbba1 SHA512 5dec6fb492930827c3e07a027411ad5b864f0ef923753c9b8d309c1ab9de9c405ba66b2adbb12784cdd02d9cadebcb5299761ec17bbf1cd4a4202478ce8b427b WHIRLPOOL e9122281e599663af42f06a8d68fc0eae6b9b1c7d820802c14bc9d5bfd32005d4fe28cae805f697ec62587e2e4c5c4e290d37fcb84cf262f538b967c584e9f45
DIST lightdm-1.15.3.tar.xz 479432 SHA256 0670c6de84e9edfea3210b42aef688a848fa5366d150a71a67cdf83bc64bda5f SHA512 2fde5b1d01c8bbfa1fa74af9947c4ced9211d0f56d9590c9b5253a51774e2f927a4c6c2e76cde7d34351ae8474bf20e27cf71806c0a4e3a4dffc81b070384344 WHIRLPOOL a4765ee04e9faedfe397b561d17e6ac37ee1738358f7dd00f4be6e4fbabca6a83bd76fe845e4605345053350768363c2027a474a0087d5d37b819a0638c35f54
-DIST lightdm-1.16.2.tar.xz 480092 SHA256 18024767158e29adca327778cb05440338972187f15263664d8266b982905218 SHA512 9f1e27b390bdd475eb9aa38e35d8fc8278eaa30a65cffbe2ea3979826efc71ececd54982a0be67f4c9d22369c2032453b606ce4cb4092794d7cfbb800bc95d0a WHIRLPOOL d7d62b3a564bcc2d53779f90a3342d0c72937f12c70084df7a554c9d712708bafaa2c7970fb46ce4dffe8828c1b9d0ce87e3d90c20a03fb252de9b12f8c8ff32
+DIST lightdm-1.16.3.tar.xz 480400 SHA256 c88b0ea63949724f807f5835f1a8a9468a4102e2dfad902d539f7f6bd0bb5b4b SHA512 65b780c9e03c8b0e912a49bc627345770e1f75500b65d8599935b9daf1e0eaa6a77e183e08f1eb38a6af3d7ff6d38f5d65419bd1c0ab9282c7ae84d17d34b55d WHIRLPOOL faa24407c4e00d5e440d6255695ff18754962a3a1e3445910c606d0f53c42e64e10a6337b52f54c45f65cb6f306bd236be239c0e41011ec0698a599f463e7a00
diff --git a/x11-misc/lightdm/lightdm-1.16.2.ebuild b/x11-misc/lightdm/lightdm-1.16.2.ebuild
deleted file mode 100644
index bf9a442..0000000
--- a/x11-misc/lightdm/lightdm-1.16.2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils pam readme.gentoo systemd versionator
-
-TRUNK_VERSION="$(get_version_component_range 1-2)"
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
- mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+gtk +introspection kde qt4 qt5 +gnome"
-REQUIRED_USE="|| ( gtk kde )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
- dev-libs/libxml2
- gnome? ( sys-apps/accountsservice )
- virtual/pam
- x11-libs/libX11
- >=x11-libs/libxklavier-5
- introspection? ( >=dev-libs/gobject-introspection-1 )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- )"
-RDEPEND="${COMMON_DEPEND}
- >=sys-auth/pambase-20101024-r2"
-DEPEND="${COMMON_DEPEND}
- dev-util/gtk-doc-am
- dev-util/intltool
- gnome? ( gnome-base/gnome-common )
- sys-devel/gettext
- virtual/pkgconfig"
-PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
- kde? ( x11-misc/lightdm-kde )"
-
-DOCS=( NEWS )
-RESTRICT="test"
-
-src_prepare() {
- sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
- sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
-
- einfo "Fixing the session-wrapper variable in lightdm.conf"
- sed -i -e \
- "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
- data/lightdm.conf || die "Failed to fix lightdm.conf"
-
- epatch_user
-
- # Remove bogus Makefile statement. This needs to go upstream
- sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
- if has_version dev-libs/gobject-introspection; then
- eautoreconf
- else
- AT_M4DIR=${WORKDIR} eautoreconf
- fi
-}
-
-src_configure() {
- # Set default values if global vars unset
- local _greeter _session _user
- _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
- _session=${LIGHTDM_SESSION:=gnome}
- _user=${LIGHTDM_USER:=root}
- # Let user know how lightdm is configured
- einfo "Gentoo configuration"
- einfo "Default greeter: ${_greeter}"
- einfo "Default session: ${_session}"
- einfo "Greeter user: ${_user}"
-
- # also disable tests because libsystem.c does not build. Tests are
- # restricted so it does not matter anyway.
- econf \
- --localstatedir=/var \
- --disable-static \
- --disable-tests \
- $(use_enable introspection) \
- $(use_enable qt4 liblightdm-qt) \
- $(use_enable qt5 liblightdm-qt5) \
- --with-user-session=${_session} \
- --with-greeter-session=${_greeter} \
- --with-greeter-user=${_user} \
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
- default
-
- # Delete apparmor profiles because they only work with Ubuntu's
- # apparmor package. Bug #494426
- if [[ -d ${D}/etc/apparmor.d ]]; then
- rm -r "${D}/etc/apparmor.d" || die \
- "Failed to remove apparmor profiles"
- fi
-
- insinto /etc/${PN}
- doins data/{${PN},keys}.conf
- doins "${FILESDIR}"/Xsession
- fperms +x /etc/${PN}/Xsession
- # /var/lib/lightdm-data could be useful. Bug #522228
- dodir /var/lib/lightdm-data
-
- prune_libtool_files --all
- rm -rf "${ED}"/etc/init
-
- # Remove existing pam file. We will build a new one. Bug #524792
- rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
- pamd_mimic system-local-login ${PN} auth account password session #372229
- pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
- dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
-
- readme.gentoo_create_doc
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/x11-misc/lightdm/lightdm-1.16.3.ebuild b/x11-misc/lightdm/lightdm-1.16.3.ebuild
new file mode 100644
index 0000000..5ba006f
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.16.3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils pam readme.gentoo systemd versionator
+
+TRUNK_VERSION="$(get_version_component_range 1-2)"
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
+ mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="audit +gtk +introspection kde qt4 qt5 +gnome"
+REQUIRED_USE="|| ( gtk kde )"
+
+COMMON_DEPEND="audit? ( sys-process/audit )
+ >=dev-libs/glib-2.32.3:2
+ dev-libs/libxml2
+ gnome? ( sys-apps/accountsservice )
+ virtual/pam
+ x11-libs/libX11
+ >=x11-libs/libxklavier-5
+ introspection? ( >=dev-libs/gobject-introspection-1 )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ dev-qt/qtgui:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ )"
+RDEPEND="${COMMON_DEPEND}
+ >=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+ dev-util/gtk-doc-am
+ dev-util/intltool
+ gnome? ( gnome-base/gnome-common )
+ sys-devel/gettext
+ virtual/pkgconfig"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
+ kde? ( x11-misc/lightdm-kde )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+ sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+ sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+ einfo "Fixing the session-wrapper variable in lightdm.conf"
+ sed -i -e \
+ "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+ data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+ epatch_user
+
+ # Remove bogus Makefile statement. This needs to go upstream
+ sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+ if has_version dev-libs/gobject-introspection; then
+ eautoreconf
+ else
+ AT_M4DIR=${WORKDIR} eautoreconf
+ fi
+}
+
+src_configure() {
+ # Set default values if global vars unset
+ local _greeter _session _user
+ _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+ _session=${LIGHTDM_SESSION:=gnome}
+ _user=${LIGHTDM_USER:=root}
+ # Let user know how lightdm is configured
+ einfo "Gentoo configuration"
+ einfo "Default greeter: ${_greeter}"
+ einfo "Default session: ${_session}"
+ einfo "Greeter user: ${_user}"
+
+ # also disable tests because libsystem.c does not build. Tests are
+ # restricted so it does not matter anyway.
+ econf \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-tests \
+ $(use_enable audit) \
+ $(use_enable introspection) \
+ $(use_enable qt4 liblightdm-qt) \
+ $(use_enable qt5 liblightdm-qt5) \
+ --with-user-session=${_session} \
+ --with-greeter-session=${_greeter} \
+ --with-greeter-user=${_user} \
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ default
+
+ # Delete apparmor profiles because they only work with Ubuntu's
+ # apparmor package. Bug #494426
+ if [[ -d ${D}/etc/apparmor.d ]]; then
+ rm -r "${D}/etc/apparmor.d" || die \
+ "Failed to remove apparmor profiles"
+ fi
+
+ insinto /etc/${PN}
+ doins data/{${PN},keys}.conf
+ doins "${FILESDIR}"/Xsession
+ fperms +x /etc/${PN}/Xsession
+ # /var/lib/lightdm-data could be useful. Bug #522228
+ dodir /var/lib/lightdm-data
+
+ prune_libtool_files --all
+ rm -rf "${ED}"/etc/init
+
+ # Remove existing pam file. We will build a new one. Bug #524792
+ rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
+ pamd_mimic system-local-login ${PN} auth account password session #372229
+ pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+ dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+ readme.gentoo_create_doc
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/x11-misc/rodent/Manifest b/x11-misc/rodent/Manifest
index 4d7cce9..1c1603c 100644
--- a/x11-misc/rodent/Manifest
+++ b/x11-misc/rodent/Manifest
@@ -1 +1,2 @@
DIST rodent-4.9.2.tar.gz 12061909 SHA256 d1e892ed22ad5eac65d915b0ac81d1c01b72699667429e7bc8847cc8c5ddc001 SHA512 776975bfff4e9e7b51e4f4b6f2d3e78c2fdeb949ed144dce66faa32b5a20f085201050500f26eb4af74ec63a354bb71ab39b8dd5eb9f95bffe289bb71bdd33a6 WHIRLPOOL 698facf1ff82b1c1a668437d7f0af253084e259f69459e00206ee4630809549187be89cc576534713376a2ab848a35b77c00881e2c5021cbeccc4e9e1fd3b40a
+DIST rodent-5.3.16.3.tar.bz2 10873231 SHA256 456ffaa4ef3b60af1a94dad0a35f1e3986235d81f00b257a3204074a2275f3d6 SHA512 83c85501d3fe49e84abe9bb61a23ca4ec86fb22abb2e9a01228b3180d114380ff085ee58f51b9ac47173214ab8323e0bde7cfca6fb9b7907d4b1551ad48326f5 WHIRLPOOL 2e8707d48b879209e225c8101f2919bb5cb327794da5d872ae5fa422bf2af39c2a828f0b81d359b9e7e06c18a5d8ff77d4249980293f62ea9833711c308360e5
diff --git a/x11-misc/rodent/rodent-5.3.16.3.ebuild b/x11-misc/rodent/rodent-5.3.16.3.ebuild
new file mode 100644
index 0000000..4204844
--- /dev/null
+++ b/x11-misc/rodent/rodent-5.3.16.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools
+
+DESCRIPTION="A fast, small and powerful file manager and graphical shell"
+HOMEPAGE="http://xffm.org/"
+SRC_URI="mirror://sourceforge/xffm/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/librfm-5.3.16.3"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig"
+
+pkg_setup() {
+ DOCS=( AUTHORS ChangeLog TODO )
+}
+
+src_prepare() {
+ pushd apps/rodent-pkg >/dev/null || die
+ sed -i -e "/^install-data-hook/d" \
+ -e "/rm -f/d" Build/Makefile.am || die
+ eautoreconf
+ popd >/dev/null || die
+}
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index 65e448d..0f10856 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -1 +1,2 @@
DIST screengrab-1.0.tar.gz 152250 SHA256 40babc5c1afc32e4f413ec56bfd2bf39bdb894ac32465b6cceec21520e60563f SHA512 e34e1fa907ccb105e1b37db40c2dfc22d19b8cdf517a73f4df11f3dffc2cdb0c6ed204d2d1c5bd8efeaa5326f52907fb4b364c84be510d392d7ff882f8d44a7e WHIRLPOOL cefb28f7d4ef29683389e4f4a2e12bb15af049e3c0834f6d53d04650b7b5128090defe5d0849bfdb417e534ccdac12ace73f72a70852f02681a58d35a4032f6b
+DIST screengrab-1.2.1.tar.gz 156692 SHA256 48cdaf66e6eff3ef0db89cb09b7c5757f07b99dd1cd05321e33b04a14c670d3b SHA512 12892eaf33fe48875c1d0dccdc631cc64c246ba2ba10432539099b35e75c36f19c8ff8b97dee959575f214ea852d1afaa9cf46476f98e0978b379a05df101805 WHIRLPOOL dc2a41981a7a0b569d0dac55d1bc16531c64e0e2dbe69330a1ff5a6511b28b0e2b6f8330e50805bf5c5b432afa3ac05aab93bfd398a26d8ff729276d6ccb1bfb
diff --git a/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild b/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild
new file mode 100644
index 0000000..39d1f19
--- /dev/null
+++ b/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Qt application for getting screenshots"
+HOMEPAGE="http://screengrab.doomer.org"
+SRC_URI="https://github.com/DOOMer/screengrab/archive/1.2.1.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ x11-libs/libqxt
+ x11-libs/libX11
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i -e "/LICENSE.txt/d" CMakeLists.txt || die
+ rm -r src/3rdparty || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSG_DOCDIR=${PF}
+ -DSG_USE_SYSTEM_QXT=ON
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/x11-misc/sddm/sddm-0.12.0.ebuild b/x11-misc/sddm/sddm-0.12.0.ebuild
index 5c93801..14af057 100644
--- a/x11-misc/sddm/sddm-0.12.0.ebuild
+++ b/x11-misc/sddm/sddm-0.12.0.ebuild
@@ -6,7 +6,7 @@
inherit cmake-utils user
DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/${PN}/${PN}"
+HOMEPAGE="https://github.com/sddm/sddm"
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 120b07d..3d29b4c 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1 +1,2 @@
DIST shared-mime-info-1.4.tar.xz 537916 SHA256 bbc0bd023f497dfd75e1ca73441cbbb5a63617d9e14f2790b868361cc055b5b1 SHA512 ac643a5360c1e4811b2df8e3c52434e5ee48f8e62a01ede3fb0895d30721b58b5b26c0edc43f779576ff899bd1a8b181699a08dbbb1e956394555f6ca983a582 WHIRLPOOL 32cb301cd54140b83af8c321b7ebc571b87b07ca86bfc68e6760e4dd3551188a092a96087042b13f1278c11cd88c261879fc816d0c2efcbee473211d929194bf
+DIST shared-mime-info-1.5.tar.xz 559040 SHA256 d6412840eb265bf36e61fd7b6fc6bea21b0f58cb22bed16f2ccccdd54bea4180 SHA512 8a97c8fa5a60eede056a42c36d9f8d015bf2788feca4630397ef71ba2cfe29ad469fb1669c368674edd4661af6b2f6823377cc27525f44c61788533c0c28e22a WHIRLPOOL 157dfc0f3a6aacde8ca734217f9a3b2e8baa9bc0254a2024716136215624e642b25537216f79c9a95ba55ee70dff872eb746cb3e0e07cb31a8a190d7d5bf6b7b
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.5.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.5.ebuild
new file mode 100644
index 0000000..e192913
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime
+
+DESCRIPTION="The Shared MIME-info Database specification"
+HOMEPAGE="http://freedesktop.org/wiki/Software/shared-mime-info"
+SRC_URI="http://people.freedesktop.org/~hadess/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-libs/glib-2
+ dev-libs/libxml2"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+DOCS=( ChangeLog HACKING NEWS README )
+
+src_prepare() {
+ epatch_user
+}
+
+src_configure() {
+ export ac_cv_func_fdatasync=no #487504
+
+ econf \
+ $(use_enable test default-make-check) \
+ --disable-update-mimedb
+}
+
+src_compile() {
+ # FIXME: 0.91 fails with -j9 every second time like:
+ # update_mime_database-update-mime-database.o: file not recognized: File truncated
+ # collect2: ld returned 1 exit status
+ emake -j1
+}
+
+src_install() {
+ default
+
+ # in prefix, install an env.d entry such that prefix patch is used/added
+ if use prefix; then
+ echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo
+ doenvd "${T}"/50mimeinfo
+ fi
+}
+
+pkg_postinst() {
+ use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+ fdo-mime_mime_database_update
+}
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 7a95728..7e79bb0 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -13,7 +13,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="branding pam consolekit"
REQUIRED_USE="consolekit? ( pam )"
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index d22f5cb..e8cc1ea 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -2,3 +2,4 @@
DIST xdg-utils-1.1.0_rc2-patchset-1.tar.xz 20164 SHA256 0c7f3c39c28d43e049ea32f4b29f768c91a1c190d4ea736940370b40ee4d2cb8 SHA512 3f90bd778fe1aaf50a05f6d0e4ae51ab251037bde57a7f21a66b66681f05b811a832dadfde909938240ee4bbf4060e471faf0105a5f0e832af7e0436b4206bef WHIRLPOOL 883cb5efead1df84425252860577610dad5ae7ce14673d5c96a432c44de215252349ac0d07b7bfb071da38b70235f8b7c9c2fea8ffba5c1443f28078842a3930
DIST xdg-utils-1.1.0_rc3_p20150119.tar.xz 262380 SHA256 6db91e0f6a4bb2698abde9dc578d61d1a9375c417adbe61e4c4364bbcbe6a4d9 SHA512 a83903f3d367e1deaf9355727e024606a4df90869629862c5ac55ca5f35b47ab2992863a9aec91413606e1ebc26905c1aef03c3f7f35a68db048059921658089 WHIRLPOOL d04f0bab8aefd9fb4d6c8805bf66aaeb5a79e1ecbe5866624f1f1d1da77115cc5c64d563aa75540ffef4eaeb610d879657422635b7548a0184138eb7319efedd
DIST xdg-utils-1.1.0_rc3_p20150825.tar.xz 263016 SHA256 c3aa384e7bf31cda8901269e46056344dc03b4d62488faf47c342afecac93f11 SHA512 ac83266f355394815581d7b13b1618c80d4c1d84c1717665ade98584d989e910575c748361f8b3a545a0c978c06fb7a1ed6ca26c5a5b70cc366f70dc41806049 WHIRLPOOL 5d84ce4218726c92fa7822ad33cd1b953095a78857ba156df7ce1cc0030e6f73e4736314a41bc8a581a1b3b0262be15a8ce117e5ecc994dea1e9fb44a85bc899
+DIST xdg-utils-1.1.1.tar.gz 295213 SHA256 b0dd63a2576e0bb16f1aa78d6ddf7d6784784a098d4df17161cd6a17c7bc4125 SHA512 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb WHIRLPOOL d40e89ae50d5cdf96cd7c03e9e4ab91fc46c0da2d8d79f8e27d64f4c5526c733ae5e75e89d880cd05b5c347ecb9837090ec110be5813456c690807abb1508718
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.1.ebuild
new file mode 100644
index 0000000..7a85756
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
+HOMEPAGE="http://portland.freedesktop.org/"
+#SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
+#SRC_URI="http://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz
+# https://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
+SRC_URI="http://portland.freedesktop.org/download/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +perl"
+
+RDEPEND="dev-util/desktop-file-utils
+ x11-misc/shared-mime-info
+ x11-apps/xprop
+ x11-apps/xset
+ perl? ( dev-perl/File-MimeInfo )"
+DEPEND="app-text/xmlto
+ || ( www-client/links www-client/lynx virtual/w3m )"
+
+DOCS="README RELEASE_NOTES TODO" # ChangeLog is bogus, see git instead
+
+RESTRICT="test" # Disabled because of sandbox violation(s)
+
+#S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # If you choose to do git snapshot instead of patchset, you need to remember
+ # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
+ # all the files
+ if [[ -d ${WORKDIR}/patch ]]; then
+ EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
+ fi
+ eautoreconf
+ pushd scripts && make scripts-clean && popd
+}
+
+src_configure() {
+ export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
+ default
+}
+
+src_install() {
+ default
+
+ newdoc scripts/xsl/README README.xsl
+ use doc && dohtml -r scripts/html
+
+ # Install default XDG_DATA_DIRS, bug #264647
+ echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
+ echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
+ doenvd 30xdg-data-local
+
+ echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
+ echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
+ doenvd 90xdg-data-base
+}
+
+pkg_postinst() {
+ [[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install x11-libs/gtk+:2 for the gtk-update-icon-cache command."
+}
diff --git a/x11-misc/xosview/xosview-1.16.ebuild b/x11-misc/xosview/xosview-1.16.ebuild
index dec30bd..bcbcdd4 100644
--- a/x11-misc/xosview/xosview-1.16.ebuild
+++ b/x11-misc/xosview/xosview-1.16.ebuild
@@ -12,7 +12,7 @@
LICENSE="GPL-2 BSD"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
IUSE="suid"
COMMON_DEPS="x11-libs/libX11
diff --git a/x11-plugins/wmclock/Manifest b/x11-plugins/wmclock/Manifest
index 5821b4d..1a0d028 100644
--- a/x11-plugins/wmclock/Manifest
+++ b/x11-plugins/wmclock/Manifest
@@ -1,3 +1,4 @@
DIST wmclock-1.0.13.tar.gz 45740 SHA256 53a0166d565661d917743bfa3f77cb084e0d6c0ea369f81e17f4a6709e9e9e42 SHA512 b7d202798767705157a2a5199344f645aa44201d3a3b6b4eb7a6213ebb10074cea68554d8d4ff9862eabfa2a94e88e453d36c22c451de74e9cac656c4d8af63c WHIRLPOOL ed8447ad66d62271aabdff08a81a5d5f5352ac3d6d79bfaa538df270cdec104d5bf26148c320ffcc83a38579abac411ed06fb880ad34b4b29d8ca0f70320162b
DIST wmclock-1.0.14.tar.gz 38311 SHA256 9a05bd547bb1f855ea75374cfada9f14ef90592246362a91dcb2c580550db64d SHA512 34bf6e2287477a207e09d35d9ef0b326d2683be31a66d3cc6aa22323b5615cb114e8597d54ea7b3cbc204b689bba05d26e152f196305b82f4ba7220d14af73f6 WHIRLPOOL 85e3b10abc634aafa164d150debf3f320ac4efbb513039f19e60eeafc5fab8dd0c8be80789af26380a571786a9c364c662a8d263f1c0156d968e95a63d28c903
DIST wmclock-1.0.15.tar.gz 35234 SHA256 4d51e2e584e55bad5aaa714c75d42ca47833b07489e9671f60e9b5ebae35c96f SHA512 908f34e9d41c0fa51df2352ce7a43319810f8ef35be9594126536907257516e7f8818635ff306e67fef81fc25ecba809a9d4152b6e3b7c6943586eabedbe09f9 WHIRLPOOL 565654a66359f9ddef57404a7bd7061092ab0b777c4821df4db862903e17588a8eda1c366637375e7643adb57458b80c20dddc7ac449af42e4474c4e25e0ee85
+DIST wmclock-1.0.16.tar.gz 37434 SHA256 85269486b48f6a3b6089aa495cb2dc255f71e989257ddcab47b7736604dbcbb5 SHA512 e27f7f89a7193852d4173b00f69cc319e781d083ec45935271878b729a280f5dfca3e4c3366342f3b40f29a5529b259095aab8e0af6043ae8c9dbd63a4f7f658 WHIRLPOOL e1f7cda9de19a0758928be8b7f068338e1d329d324d68c4b5edd57aea8f4c6009686d8b935a8fce8b48711f64b109d604eb0ac3e5d1597b0b0daa3b74c7b87e9
diff --git a/x11-plugins/wmclock/wmclock-1.0.16.ebuild b/x11-plugins/wmclock/wmclock-1.0.16.ebuild
new file mode 100644
index 0000000..a6dcfb1
--- /dev/null
+++ b/x11-plugins/wmclock/wmclock-1.0.16.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools
+
+DESCRIPTION="a dockapp that displays time and date (same style as NEXTSTEP(tm) operating systems)"
+HOMEPAGE="http://windowmaker.org/dockapps/?name=wmclock"
+# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm"
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
+
+src_prepare() {
+ eautoreconf
+}
diff --git a/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild b/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild
new file mode 100644
index 0000000..d615b51
--- /dev/null
+++ b/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+MY_P=${PN}.app-${PV}
+DESCRIPTION="PPP dial control and network load monitor with NeXTStep look"
+HOMEPAGE="http://windowmaker.org/dockapps/?name=wmppp.app"
+# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm"
+DEPEND="${RDEPEND}
+ x11-proto/xextproto"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install () {
+ emake DESTDIR="${D}" PREFIX=/usr install
+ dodoc BUGS CHANGES HINTS README TODO
+}
diff --git a/x11-plugins/wmppp/wmppp-1.3.2.ebuild b/x11-plugins/wmppp/wmppp-1.3.2.ebuild
deleted file mode 100644
index c8a4901..0000000
--- a/x11-plugins/wmppp/wmppp-1.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-MY_P=${PN}.app-${PV}
-DESCRIPTION="PPP dial control and network load monitor with NeXTStep look"
-HOMEPAGE="http://windowmaker.org/dockapps/?name=wmppp.app"
-# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXpm"
-DEPEND="${RDEPEND}
- x11-proto/xextproto"
-
-S=${WORKDIR}/${MY_P}
-
-#src_prepare() {
-# sed -ie 's/-o wmppp/\$(LDFLAGS) -o wmppp/' Makefile
-#}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install () {
- emake DESTDIR="${D}" PREFIX=/usr install
-# dobin wmppp
-# exeinto /etc/ppp
-# doexe getmodemspeed
-# dodoc user.wmppprc
- dodoc BUGS CHANGES HINTS README TODO
-}
diff --git a/x11-terms/lilyterm/files/lilyterm-0.9.9.4-gettext.patch b/x11-terms/lilyterm/files/lilyterm-0.9.9.4-gettext.patch
new file mode 100644
index 0000000..c6df78d
--- /dev/null
+++ b/x11-terms/lilyterm/files/lilyterm-0.9.9.4-gettext.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,7 +51,7 @@
+
+ AC_PROG_INTLTOOL
+ ALL_LINGUAS="$_LANG_LIST"
+-GETTEXT_PACKAGE="$_PACKAGE"
++GETTEXT_PACKAGE="$_BINARY"
+ AC_SUBST(GETTEXT_PACKAGE)
+ AM_GLIB_GNU_GETTEXT
+ AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
+
diff --git a/x11-terms/lilyterm/lilyterm-0.9.9.4-r1.ebuild b/x11-terms/lilyterm/lilyterm-0.9.9.4-r1.ebuild
new file mode 100644
index 0000000..f024b95
--- /dev/null
+++ b/x11-terms/lilyterm/lilyterm-0.9.9.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="a terminal emulator based off of libvte that aims to be fast and lightweight"
+HOMEPAGE="http://lilyterm.luna.com.tw"
+LICENSE="GPL-3"
+SRC_URI="http://${PN}.luna.com.tw/file/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ x11-libs/vte:0
+"
+DEPEND="
+ ${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.9.9.4-gettext.patch
+
+ ./autogen.sh
+}
diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
index 14d28d3..83742fe 100644
--- a/x11-terms/roxterm/Manifest
+++ b/x11-terms/roxterm/Manifest
@@ -1,3 +1,4 @@
DIST roxterm-2.6.3.tar.bz2 301226 SHA256 0c809acbf31f5200594c7c992239f5e1b87206d96ab8a61ef2ee8d81c2378e69 SHA512 9adbb64a1b5c2cfb861d657345dd7d84e804dc55de1ad58dc8a4d9bdf04617f88da4d7de6bfe679345a30d291b10b00a32df0220776fb430b30551e4e6d9a2f7 WHIRLPOOL 35dae640675b036ed3a0a616eba4e86dc65b16e2cca72876eab9fb43508364bb7df2f328486adeded852a6775853373b2f6a4e8dadf80f02245c27fc924ffda5
DIST roxterm-2.6.5.tar.bz2 300892 SHA256 e8b2dd5ce320b763b66590ebef77c422ab90181bb1a84d30fea8c47da0d46cab SHA512 a614680e3c3139342552ef01274635409d9618e573c575dbcbf2f80e50922dce677fd7b7039c3e2af034eb1950933a1fddb189c65cfc89fcbaf15fbe677da71e WHIRLPOOL 6e473149e2d3341d9500e666cc4ac27549c813b66b1eb0a727d24ef182b6ca26466928f72c533b99e89a4ebc768f12a2def20ba31f9793016be78a9c2e5493bd
DIST roxterm-2.9.3.tar.bz2 364120 SHA256 36131decfe79fa7d4c8fd325d4feaa843f348532a3871b173e6712fcde5cbda7 SHA512 3f197ebc532721a6132da96d3b4bf65032def43eba4d7b00ecb2c74223c43c0549a9605753e81992c2c4b4955adbbc041e8a31f22947752dc52a9edd46457d16 WHIRLPOOL 956b92892e43a88c3e6aa3894f67d23b8ceace0feb42cb808c3e81916e5f8e1f0c3354f8b6337fbfcd8e315503a17631a699c58d97c5b88fb1b3ae96c7b501c4
+DIST roxterm-3.1.5.tar.xz 309892 SHA256 78cfb639f97ef4bcf12178fe44d287571227b6d1539cbb8fa98810e597f4109f SHA512 f07989331b1cf915e94582bfceff8cb87f20613eb272ccc502fb49c7508a1330cfa3b137c59f300b8541595aed541867c1b0aad36809e7e9a326f7119fde2acd WHIRLPOOL c06a720411c51eae79c649aada2c7c2743b0855860fe6c3103faf37073eb95a7e0ebda110f6c5cf99f41a87d5fa6a7e0f4044e3827cd50a6a5c37b7160f7fb8c
diff --git a/x11-terms/roxterm/roxterm-2.6.3.ebuild b/x11-terms/roxterm/roxterm-2.6.3.ebuild
index 3ce0b3d..290c67a 100644
--- a/x11-terms/roxterm/roxterm-2.6.3.ebuild
+++ b/x11-terms/roxterm/roxterm-2.6.3.ebuild
@@ -37,14 +37,14 @@
python_convert_shebangs 2 mscript.py
# the "maitch" build system is complete junk. let's stab it...
- sed -i -e 's:TerminalEmulator:System;&:' roxterm.desktop || die
+ sed -i -e 's:TerminalEmulator:System;&:' roxterm.desktop || die
sed -i -e '/ctx.install_doc/s:COPYING COPYING-LGPL ::' mscript.py || die
sed -i -e "/CFLAGS/s:-O2 -g:${CFLAGS}:" {maitch,mscript}.py || die
sed -i \
-e 's:gcc:${CC}:' \
-e "/LDFLAGS/s:'':'${LDFLAGS}':" \
-e 's:--mode=link:--mode=link --tag=CC:' \
- maitch.py || die
+ maitch.py || die
}
src_configure() {
diff --git a/x11-terms/roxterm/roxterm-3.1.5.ebuild b/x11-terms/roxterm/roxterm-3.1.5.ebuild
new file mode 100644
index 0000000..b7ef8de
--- /dev/null
+++ b/x11-terms/roxterm/roxterm-3.1.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+inherit gnome2-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="A terminal emulator designed to integrate with the ROX environment"
+HOMEPAGE="http://roxterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/roxterm/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+ dev-libs/glib:2
+ x11-libs/gtk+:3
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/vte:2.91"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-libs/libxslt
+ dev-python/lockfile
+ virtual/pkgconfig
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+ nls? ( app-text/po4a sys-devel/gettext )"
+
+src_configure() {
+ local myconf=(
+ CC="$(tc-getCC)"
+ CFLAGS="${CFLAGS}"
+ LDFLAGS="${LDFLAGS}"
+ --prefix=/usr
+ --docdir="/usr/share/doc/${PF}"
+ --destdir="${D}"
+ )
+
+ use nls || myconf+=( --disable-gettext --disable-po4a --disable-translations )
+ ./mscript.py configure "${myconf[@]}"
+}
+
+src_compile() {
+ ./mscript.py build
+}
+
+src_install() {
+ ./mscript.py install
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 5aa0cbe..cd270b9 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,4 +1,4 @@
DIST adwaita-icon-theme-3.14.1.tar.xz 17581976 SHA256 b776a7ad58c97f4c1ede316e44d8d054105429cb4e3a8ec46616a14b11df48ee SHA512 c7831e78eb382faa78706caf53e6b3c5543d7fab266d73c8f1325d81331b75f1244f06da1c908e1d1a4336964e51ea65284f461ec0fdd523bc71569e84287931 WHIRLPOOL c15d849ac2e859bc632b5b47b360ce33a4bb402a39a7b1a369c8adfab47bfa099cb38c80bddbb5c1eae7bc0e6b656fcb422168841e6d1bb767506b6546c21838
DIST adwaita-icon-theme-3.16.2.1.tar.xz 18860704 SHA256 b4556dfbf555d4fac12d4d5c12f7519de0d43ec42a1b649611439a50bf7acb96 SHA512 a38d59d54e204f8c2ab8c8ef2d6120dad636c5534293578692d1fb9a288e5862596117fa938eddf752137ef27e1d1a86eb0a1a046b87961a84c5673df58a5eec WHIRLPOOL e126870d234438baf6037fd2e66a7a6df185bd2658ac5021b3dcca37cd7e009411a9e0df78bab239cba9db3becfd295d77d684ce9c6aca004ee247896902fc94
-DIST adwaita-icon-theme-3.16.2.tar.xz 18507060 SHA256 9c6662ad739cdb32d0ffe638f54e5033c5ea6f53e7f8c2b412ec64b8e7e1b4c2 SHA512 4f9f8c979e984765941cb659af7e9d1585b4146d71a82af2490c84db2a7f9fc632b85baf9c90b6096b394ae56964628a522b00de6e1cf4ada31bbdddda27cfca WHIRLPOOL 1ba3383bb202dc7ee10b7119a770096b1d89a58607949261d621df272a3455ed2b45607a9fb88763af3a987bedbe54686d3a631a49164d0371d57b35da75cf58
+DIST adwaita-icon-theme-3.16.2.2.tar.xz 18860536 SHA256 3149a815ad165abdd20165891fa72b533b909d7844e3fd41b8d0a0f9d9a99066 SHA512 9984f0aa64a146ca55be77fa3b417eafd2e31e3f213ff93fcc954df22a30bdf42efb3f6967a2d97b302cac2e26e49926eefdfb9b5f70aee79bddc39beef5cd54 WHIRLPOOL 137550131571c3e63442cb102d710efcfffbda60777ae8c55186795b4c0adb1da6db003a75acb0f3a73877e9a8ed6b84285ba77cb6f300b038215c0fc1dc2f0e
DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.1.ebuild
deleted file mode 100644
index c2b24bf..0000000
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME default icon theme"
-HOMEPAGE="https://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git"
-
-SRC_URI="${SRC_URI}
- branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )"
-
-LICENSE="|| ( LGPL-3 CC-BY-SA-3.0 )
- branding? ( CC-Sampling-Plus-1.0 )"
-SLOT="0"
-IUSE="branding"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-COMMON_DEPEND="
- >=x11-themes/hicolor-icon-theme-0.10
-"
-RDEPEND="${COMMON_DEPEND}
- gnome-base/librsvg:2
- !<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40
- sys-devel/gettext
- virtual/pkgconfig
-"
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_prepare() {
- if use branding; then
- for i in 16 22 24 32 48; do
- cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
- "${S}"/Adwaita/${i}x${i}/places/start-here.png \
- || die "Copying gentoo logos failed"
- done
- fi
-
- # Install cursors in the right place
- sed -e 's:^\(cursordir.*\)icons\(.*\):\1cursors/xorg-x11\2:' \
- -i "${S}"/Makefile.am \
- -i "${S}"/Makefile.in || die
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
-}
-
-src_install() {
- gnome2_src_install
-
- # Make it the default cursor theme
- dosym Adwaita /usr/share/cursors/xorg-x11/default
-}
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.1.ebuild
index 234be3d..d43065f 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.1.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.1.ebuild
@@ -17,7 +17,7 @@
branding? ( CC-Sampling-Plus-1.0 )"
SLOT="0"
IUSE="branding"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
COMMON_DEPEND="
>=x11-themes/hicolor-icon-theme-0.10
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.2.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.2.ebuild
new file mode 100644
index 0000000..8d09d06
--- /dev/null
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+DESCRIPTION="GNOME default icon theme"
+HOMEPAGE="https://git.gnome.org/browse/adwaita-icon-theme/"
+
+SRC_URI="${SRC_URI}
+ branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+LICENSE="
+ || ( LGPL-3 CC-BY-SA-3.0 )
+ branding? ( CC-Sampling-Plus-1.0 )
+"
+SLOT="0"
+IUSE="branding"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+ >=x11-themes/hicolor-icon-theme-0.10
+"
+RDEPEND="${COMMON_DEPEND}
+ gnome-base/librsvg:2
+ !<x11-themes/gnome-themes-standard-3.14
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.40
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+ if use branding; then
+ for i in 16 22 24 32 48; do
+ cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
+ "${S}"/Adwaita/${i}x${i}/places/start-here.png \
+ || die "Copying gentoo logos failed"
+ done
+ fi
+
+ # Install cursors in the right place used in Gentoo
+ sed -e 's:^\(cursordir.*\)icons\(.*\):\1cursors/xorg-x11\2:' \
+ -i "${S}"/Makefile.am \
+ -i "${S}"/Makefile.in || die
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
+}
+
+src_install() {
+ gnome2_src_install
+ # Buggy directory due to drop of intltool usage
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756036
+ rm -rf "${ED}"/usr/locale
+}
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.ebuild
deleted file mode 100644
index 340084a..0000000
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator
-
-DESCRIPTION="GNOME default icon theme"
-HOMEPAGE="https://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git"
-
-SRC_URI="${SRC_URI}
- branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )"
-
-LICENSE="|| ( LGPL-3 CC-BY-SA-3.0 )
- branding? ( CC-Sampling-Plus-1.0 )"
-SLOT="0"
-IUSE="branding"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-COMMON_DEPEND="
- >=x11-themes/hicolor-icon-theme-0.10
-"
-RDEPEND="${COMMON_DEPEND}
- gnome-base/librsvg:2
- !<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40
- sys-devel/gettext
- virtual/pkgconfig
-"
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_prepare() {
- if use branding; then
- for i in 16 22 24 32 48; do
- cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
- "${S}"/Adwaita/${i}x${i}/places/start-here.png \
- || die "Copying gentoo logos failed"
- done
- fi
-
- # Install cursors in the right place
- sed -e 's:^\(cursordir.*\)icons\(.*\):\1cursors/xorg-x11\2:' \
- -i "${S}"/Makefile.am \
- -i "${S}"/Makefile.in || die
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
-}
-
-src_install() {
- gnome2_src_install
- # Buggy directory due to drop of intltool usage
- rm -rf "${D}"/usr/locale
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- elog "$PF no longer installs the"
- elog "/usr/share/cursors/xorg-x11/default symlink. Instead, desktop"
- elog "environments are expected to set the cursor theme using the"
- elog "XCURSOR_THEME environment variable or other means."
- elog "If you are seeing old-style X11 cursors in GNOME or Cinnamon,"
- elog "make sure you have >=gnome-base/gnome-session-3.14.0-r2"
- elog "and then log out and log in again."
-}
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.16.2.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.16.2.ebuild
index 59f2c53..71f267e 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.16.2.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.16.2.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="+gtk"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
COMMON_DEPEND="
gnome-base/librsvg:2[${MULTILIB_USEDEP}]
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
index 703848b..c3235d1 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
@@ -14,7 +14,7 @@
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="accessibility lua"
RDEPEND="
diff --git a/x11-wm/aewm++/aewm++-1.1.5-r1.ebuild b/x11-wm/aewm++/aewm++-1.1.5-r1.ebuild
deleted file mode 100644
index 6619bab..0000000
--- a/x11-wm/aewm++/aewm++-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A window manager with more modern features than aewm but with the same look and feel"
-HOMEPAGE="https://github.com/frankhale/aewmpp"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-proto/xextproto
- x11-proto/xproto"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc43.patch \
- "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
- emake CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc ChangeLog README || die
-}
diff --git a/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild b/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
new file mode 100644
index 0000000..f80697f
--- /dev/null
+++ b/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A window manager with more modern features than aewm but with the same look and feel"
+HOMEPAGE="https://github.com/frankhale/aewmpp"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext"
+DEPEND="${RDEPEND}
+ x11-proto/xextproto
+ x11-proto/xproto"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc43.patch \
+ "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+ emake CXX="$(tc-getCXX)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc ChangeLog README
+}
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 068bf7a..a285414 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,6 +1,2 @@
DIST awesome-3.4.15.tar.bz2 762323 SHA256 4207f5cbed25d0e7ab35157165d923c2ccf04fded5b3d5fc130134ce9ed5ddfd SHA512 18bb2659e1e7c18a8917f606d635e968daa31a5be4c6d93a109603aace9b5d8b5fd0b8ac1d13ba3d6f2c5c42661204ce80c5ea322088cd358ec5e164b760c339 WHIRLPOOL 74da6197f2e4e5f3d99a11e99c26563f6a145181bab5c017b7ee330041864527551a230ce6dc6109bb5510621fe874921c7caa72c095fa2be6fbdb69e02da1dd
-DIST awesome-3.5.2.tar.xz 715164 SHA256 188d65b02a8ef905be43f126e2591b0d3caf84e094fb6af5501ae5ef07503e86 SHA512 e1c661dfa64e1747a15c149c445877f36380f30f20a4a39ccf1a02df95b1dc5b38337567dd7e401592b2906627716e72673772fe131189c763dc846978bafd48 WHIRLPOOL caec16cc014bd9ed93c4feec8cca40989cc4a66fd2a6816db65654b66e861c6cc2554a7c5e0e587124f4a96d34ddcd6c2e2845f5ddd2a725048d442361c81407
-DIST awesome-3.5.3.tar.xz 718872 SHA256 544eb343a4a059ebe405ae907bda205e7c63a550417c8ee49f9eeee6870c9253 SHA512 7d3e75ddf72a28a29b3031419485072719fe552508e450faee9e58a365827187c6de50dd11b5a8f0b41a3330456b46a7e6f67018b52891e22d4455e999137d2e WHIRLPOOL ac1a3e1555ff81b7e32f673755514f747d05eb245089094381f46e3abc4ce46e70b35c19512ef589a0e3338e5d71760a1f3b879ceb86fdc8f68d48fbdee2e2c9
-DIST awesome-3.5.4.tar.xz 718916 SHA256 b48bce31e14345f260075d528263385564eaeb204c4b673c893f77e884a24ea8 SHA512 afc221931759e56c24f89bdbf6aab9eb9059a44acaea6345567f3f77eb4663354ca7a266e9395f0b6a3068cd7f15e824a6c938987eac915ddba420050c265235 WHIRLPOOL 0a92be54433a0e91fd52aa31c95d72c3d4b8dd35f4e36094ac94726fbb6ba33f6a7b4ac42e3f81f9b94ab419671ded42d0c769e95ca90e53228147a6f3d3a1bd
-DIST awesome-3.5.5.tar.xz 719080 SHA256 bf30dbd7c4621742b2565919404f009588ea482574ddb85aaa5301bce5258d47 SHA512 2ca9af95afb8d07369da89c18f34889158dc387c570ac5f591ee05c1867d6a88197e02c29fae6666d3b684ed9a783d5bcfae995c98cbf0a5e29237f317d2870f WHIRLPOOL 94d5a5908d5b671389db5a44392ca051841e5b42e962e2420218595636897d1c7e5a5972b9e790799ba31a6c897fc02e3bd601302debd39bb4627acb4e83d779
DIST awesome-3.5.6.tar.xz 720112 SHA256 37f49de187825425cb3096fc870959d5fec9302b22ffd0f2874d8a18e85046d7 SHA512 8d89bf46956276a8bcf106bb255c051e8382b08617e17691134a8f3e5db3ec9f7773581c02ce62d23e72499f7b1e60fe4322c211e41219b5bffd1897a96f6cf6 WHIRLPOOL 8ec944f1113f7b7b7c6857c02a6c657aec05ddf23674c75a7cf571d4a65720ed4f5f1d28b0fdac032c12ea5e9a54f655d080c6af4e1d314b8c00bf2b9e806d01
diff --git a/x11-wm/awesome/awesome-3.5.2-r1.ebuild b/x11-wm/awesome/awesome-3.5.2-r1.ebuild
deleted file mode 100644
index fdd3e15..0000000
--- a/x11-wm/awesome/awesome-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MIN_VERSION="2.8"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD gnome"
-
-COMMON_DEPEND="
- >=dev-lang/lua-5.1
- dev-libs/glib:2
- >=dev-libs/libxdg-basedir-1
- >=dev-lua/lgi-0.6.1
- x11-libs/cairo[xcb]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libxcb-1.6
- >=x11-libs/pango-1.19.3[introspection]
- >=x11-libs/startup-notification-0.10_p20110426
- >=x11-libs/xcb-util-0.3.8
- x11-libs/xcb-util-cursor
- x11-libs/libXcursor
- || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
- dbus? ( >=sys-apps/dbus-1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${COMMON_DEPEND}
- >=app-text/asciidoc-8.4.5
- app-text/xmlto
- dev-util/gperf
- virtual/pkgconfig
- media-gfx/imagemagick[png]
- >=x11-proto/xcb-proto-1.5
- >=x11-proto/xproto-7.0.15
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
- # bug #408025
- epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
-}
-
-src_configure() {
- mycmakeargs=(
- -DPREFIX="${EPREFIX}"/usr
- -DSYSCONFDIR="${EPREFIX}"/etc
- $(cmake-utils_use_with dbus DBUS)
- $(cmake-utils_use doc GENERATE_DOC)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- local myargs="all"
-
- if use doc ; then
- myargs="${myargs} doc"
- fi
- cmake-utils_src_make ${myargs}
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use doc ; then
- (
- cd "${CMAKE_BUILD_DIR}"/doc
- mv html doxygen
- dohtml -r doxygen || die
- )
- fi
- rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN} || die
-
- # GNOME-based awesome
- if use gnome ; then
- # GNOME session
- insinto /usr/share/gnome-session/sessions
- newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
- # Application launcher
- domenu "${FILESDIR}/${PN}-gnome.desktop" || die
- # X Session
- insinto /usr/share/xsessions/
- doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
- fi
-}
-
-pkg_postinst() {
- # bug #447308
- if use gnome; then
- elog
- elog "You have enabled the gnome USE flag."
- elog "Please note that quitting awesome won't kill your gnome session."
- elog "To really quit the session, you should bind your quit key"
- elog "to the following command:"
- elog " gnome-session-quit --logout"
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=447308"
- fi
-
- # bug #440724
- elog
- elog "If you are having issues with Java application windows being"
- elog "completely blank, try installing"
- elog " x11-misc/wmname"
- elog "and setting the WM name to LG3D."
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=440724"
- elog
-}
diff --git a/x11-wm/awesome/awesome-3.5.2.ebuild b/x11-wm/awesome/awesome-3.5.2.ebuild
deleted file mode 100644
index 1315b68..0000000
--- a/x11-wm/awesome/awesome-3.5.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MIN_VERSION="2.8"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD gnome"
-
-COMMON_DEPEND="
- >=dev-lang/lua-5.1
- dev-libs/glib:2
- >=dev-libs/libxdg-basedir-1
- >=dev-lua/lgi-0.6.1
- x11-libs/cairo[xcb]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libxcb-1.6
- >=x11-libs/pango-1.19.3[introspection]
- >=x11-libs/startup-notification-0.10_p20110426
- >=x11-libs/xcb-util-0.3.8
- x11-libs/xcb-util-cursor
- x11-libs/libXcursor
- || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
- dbus? ( >=sys-apps/dbus-1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${COMMON_DEPEND}
- >=app-text/asciidoc-8.4.5
- app-text/xmlto
- dev-util/gperf
- virtual/pkgconfig
- media-gfx/imagemagick[png]
- >=x11-proto/xcb-proto-1.5
- >=x11-proto/xproto-7.0.15
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
- # bug #408025
- epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
-}
-
-src_configure() {
- mycmakeargs=(
- -DPREFIX="${EPREFIX}"/usr
- -DSYSCONFDIR="${EPREFIX}"/etc
- $(cmake-utils_use_with dbus DBUS)
- $(cmake-utils_use doc GENERATE_DOC)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- local myargs="all"
-
- if use doc ; then
- myargs="${myargs} doc"
- fi
- cmake-utils_src_make ${myargs}
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use doc ; then
- (
- cd "${CMAKE_BUILD_DIR}"/doc
- mv html doxygen
- dohtml -r doxygen || die
- )
- fi
- rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN} || die
-
- # GNOME-based awesome
- if use gnome ; then
- # GNOME session
- insinto /usr/share/gnome-session/sessions
- doins "${FILESDIR}/${PN}-gnome.session" || die
- # Application launcher
- domenu "${FILESDIR}/${PN}-gnome.desktop" || die
- # X Session
- insinto /usr/share/xsessions/
- doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
- fi
-}
-
-pkg_postinst() {
- # bug #447308
- if use gnome; then
- elog
- elog "You have enabled the gnome USE flag."
- elog "Please note that quitting awesome won't kill your gnome session."
- elog "To really quit the session, you should bind your quit key"
- elog "to the following command:"
- elog " gnome-session-quit --logout"
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=447308"
- fi
-
- # bug #440724
- elog
- elog "If you are having issues with Java application windows being"
- elog "completely blank, try installing"
- elog " x11-misc/wmname"
- elog "and setting the WM name to LG3D."
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=440724"
- elog
-}
diff --git a/x11-wm/awesome/awesome-3.5.3.ebuild b/x11-wm/awesome/awesome-3.5.3.ebuild
deleted file mode 100644
index aebb60e..0000000
--- a/x11-wm/awesome/awesome-3.5.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MIN_VERSION="2.8"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD gnome"
-
-COMMON_DEPEND="
- >=dev-lang/lua-5.1
- dev-libs/glib:2
- >=dev-libs/libxdg-basedir-1
- >=dev-lua/lgi-0.7
- x11-libs/cairo[xcb]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libxcb-1.6
- >=x11-libs/pango-1.19.3[introspection]
- >=x11-libs/startup-notification-0.10_p20110426
- >=x11-libs/xcb-util-0.3.8
- x11-libs/xcb-util-cursor
- x11-libs/libXcursor
- || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
- dbus? ( >=sys-apps/dbus-1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${COMMON_DEPEND}
- >=app-text/asciidoc-8.4.5
- app-text/xmlto
- dev-util/gperf
- virtual/pkgconfig
- media-gfx/imagemagick[png]
- >=x11-proto/xcb-proto-1.5
- >=x11-proto/xproto-7.0.15
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
- # bug #408025
- epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
- epatch "${FILESDIR}/${PN}-xsession.patch"
-}
-
-src_configure() {
- mycmakeargs=(
- -DPREFIX="${EPREFIX}"/usr
- -DSYSCONFDIR="${EPREFIX}"/etc
- $(cmake-utils_use_with dbus DBUS)
- $(cmake-utils_use doc GENERATE_DOC)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- local myargs="all"
-
- if use doc ; then
- myargs="${myargs} doc"
- fi
- cmake-utils_src_make ${myargs}
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use doc ; then
- (
- cd "${CMAKE_BUILD_DIR}"/doc
- mv html doxygen
- dohtml -r doxygen || die
- )
- fi
- rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN} || die
-
- # GNOME-based awesome
- if use gnome ; then
- # GNOME session
- insinto /usr/share/gnome-session/sessions
- newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
- # Application launcher
- domenu "${FILESDIR}/${PN}-gnome.desktop" || die
- # X Session
- insinto /usr/share/xsessions/
- doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
- fi
-}
-
-pkg_postinst() {
- # bug #447308
- if use gnome; then
- elog
- elog "You have enabled the gnome USE flag."
- elog "Please note that quitting awesome won't kill your gnome session."
- elog "To really quit the session, you should bind your quit key"
- elog "to the following command:"
- elog " gnome-session-quit --logout"
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=447308"
- fi
-
- # bug #440724
- elog
- elog "If you are having issues with Java application windows being"
- elog "completely blank, try installing"
- elog " x11-misc/wmname"
- elog "and setting the WM name to LG3D."
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=440724"
- elog
-}
diff --git a/x11-wm/awesome/awesome-3.5.4.ebuild b/x11-wm/awesome/awesome-3.5.4.ebuild
deleted file mode 100644
index f709548..0000000
--- a/x11-wm/awesome/awesome-3.5.4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MIN_VERSION="2.8"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD gnome"
-
-COMMON_DEPEND="
- >=dev-lang/lua-5.1
- dev-libs/glib:2
- >=dev-libs/libxdg-basedir-1
- >=dev-lua/lgi-0.7
- x11-libs/cairo[xcb]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libxcb-1.6
- >=x11-libs/pango-1.19.3[introspection]
- >=x11-libs/startup-notification-0.10_p20110426
- >=x11-libs/xcb-util-0.3.8
- x11-libs/xcb-util-cursor
- x11-libs/libXcursor
- || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
- dbus? ( >=sys-apps/dbus-1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${COMMON_DEPEND}
- >=app-text/asciidoc-8.4.5
- app-text/xmlto
- dev-util/gperf
- virtual/pkgconfig
- media-gfx/imagemagick[png]
- >=x11-proto/xcb-proto-1.5
- >=x11-proto/xproto-7.0.15
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
- # bug #408025
- epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
- epatch "${FILESDIR}/${PN}-xsession.patch"
-
- # bug #506586
- epatch "${FILESDIR}/${P}-imagebox.patch"
-}
-
-src_configure() {
- mycmakeargs=(
- -DPREFIX="${EPREFIX}"/usr
- -DSYSCONFDIR="${EPREFIX}"/etc
- $(cmake-utils_use_with dbus DBUS)
- $(cmake-utils_use doc GENERATE_DOC)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- local myargs="all"
-
- if use doc ; then
- myargs="${myargs} doc"
- fi
- cmake-utils_src_make ${myargs}
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use doc ; then
- (
- cd "${CMAKE_BUILD_DIR}"/doc
- mv html doxygen
- dohtml -r doxygen || die
- )
- fi
- rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN} || die
-
- # GNOME-based awesome
- if use gnome ; then
- # GNOME session
- insinto /usr/share/gnome-session/sessions
- newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
- # Application launcher
- domenu "${FILESDIR}/${PN}-gnome.desktop" || die
- # X Session
- insinto /usr/share/xsessions/
- doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
- fi
-}
-
-pkg_postinst() {
- # bug #447308
- if use gnome; then
- elog
- elog "You have enabled the gnome USE flag."
- elog "Please note that quitting awesome won't kill your gnome session."
- elog "To really quit the session, you should bind your quit key"
- elog "to the following command:"
- elog " gnome-session-quit --logout"
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=447308"
- fi
-
- # bug #440724
- elog
- elog "If you are having issues with Java application windows being"
- elog "completely blank, try installing"
- elog " x11-misc/wmname"
- elog "and setting the WM name to LG3D."
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=440724"
- elog
-}
diff --git a/x11-wm/awesome/awesome-3.5.5-r1.ebuild b/x11-wm/awesome/awesome-3.5.5-r1.ebuild
deleted file mode 100644
index 9a2fa5e..0000000
--- a/x11-wm/awesome/awesome-3.5.5-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MIN_VERSION="2.8"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD gnome"
-
-COMMON_DEPEND="
- >=dev-lang/lua-5.1
- dev-libs/glib:2
- >=dev-libs/libxdg-basedir-1
- >=dev-lua/lgi-0.7
- x11-libs/cairo[xcb]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libxcb-1.6
- >=x11-libs/pango-1.19.3[introspection]
- >=x11-libs/startup-notification-0.10_p20110426
- >=x11-libs/xcb-util-0.3.8
- x11-libs/xcb-util-cursor
- x11-libs/libXcursor
- || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
- dbus? ( >=sys-apps/dbus-1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${COMMON_DEPEND}
- >=app-text/asciidoc-8.4.5
- app-text/xmlto
- dev-util/gperf
- virtual/pkgconfig
- media-gfx/imagemagick[png]
- >=x11-proto/xcb-proto-1.5
- >=x11-proto/xproto-7.0.15
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
- # bug #408025
- epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
- epatch "${FILESDIR}/${PN}-xsession.patch"
-
- # bug #507604
- epatch "${FILESDIR}/${P}-util.lua-xdg-icons-fix.patch"
- # bug #509658
- epatch "${FILESDIR}/${P}-cflag-cleanup.patch"
-}
-
-src_configure() {
- mycmakeargs=(
- -DPREFIX="${EPREFIX}"/usr
- -DSYSCONFDIR="${EPREFIX}"/etc
- $(cmake-utils_use_with dbus DBUS)
- $(cmake-utils_use doc GENERATE_DOC)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- local myargs="all"
-
- if use doc ; then
- myargs="${myargs} doc"
- fi
- cmake-utils_src_make ${myargs}
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use doc ; then
- (
- cd "${CMAKE_BUILD_DIR}"/doc
- mv html doxygen
- dohtml -r doxygen || die
- )
- fi
- rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN} || die
-
- # GNOME-based awesome
- if use gnome ; then
- # GNOME session
- insinto /usr/share/gnome-session/sessions
- newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
- # Application launcher
- domenu "${FILESDIR}/${PN}-gnome.desktop" || die
- # X Session
- insinto /usr/share/xsessions/
- doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
- fi
-}
-
-pkg_postinst() {
- # bug #447308
- if use gnome; then
- elog
- elog "You have enabled the gnome USE flag."
- elog "Please note that quitting awesome won't kill your gnome session."
- elog "To really quit the session, you should bind your quit key"
- elog "to the following command:"
- elog " gnome-session-quit --logout"
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=447308"
- fi
-
- # bug #440724
- elog
- elog "If you are having issues with Java application windows being"
- elog "completely blank, try installing"
- elog " x11-misc/wmname"
- elog "and setting the WM name to LG3D."
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=440724"
- elog
-}
diff --git a/x11-wm/awesome/awesome-3.5.5.ebuild b/x11-wm/awesome/awesome-3.5.5.ebuild
deleted file mode 100644
index a8f8015..0000000
--- a/x11-wm/awesome/awesome-3.5.5.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MIN_VERSION="2.8"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD gnome"
-
-COMMON_DEPEND="
- >=dev-lang/lua-5.1
- dev-libs/glib:2
- >=dev-libs/libxdg-basedir-1
- >=dev-lua/lgi-0.7
- x11-libs/cairo[xcb]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libxcb-1.6
- >=x11-libs/pango-1.19.3[introspection]
- >=x11-libs/startup-notification-0.10_p20110426
- >=x11-libs/xcb-util-0.3.8
- x11-libs/xcb-util-cursor
- x11-libs/libXcursor
- || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
- dbus? ( >=sys-apps/dbus-1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${COMMON_DEPEND}
- >=app-text/asciidoc-8.4.5
- app-text/xmlto
- dev-util/gperf
- virtual/pkgconfig
- media-gfx/imagemagick[png]
- >=x11-proto/xcb-proto-1.5
- >=x11-proto/xproto-7.0.15
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
- # bug #408025
- epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
- epatch "${FILESDIR}/${PN}-xsession.patch"
-
- # bug #507604
- epatch "${FILESDIR}/${P}-util.lua-xdg-icons-fix.patch"
-}
-
-src_configure() {
- mycmakeargs=(
- -DPREFIX="${EPREFIX}"/usr
- -DSYSCONFDIR="${EPREFIX}"/etc
- $(cmake-utils_use_with dbus DBUS)
- $(cmake-utils_use doc GENERATE_DOC)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- local myargs="all"
-
- if use doc ; then
- myargs="${myargs} doc"
- fi
- cmake-utils_src_make ${myargs}
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use doc ; then
- (
- cd "${CMAKE_BUILD_DIR}"/doc
- mv html doxygen
- dohtml -r doxygen || die
- )
- fi
- rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN} || die
-
- # GNOME-based awesome
- if use gnome ; then
- # GNOME session
- insinto /usr/share/gnome-session/sessions
- newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
- # Application launcher
- domenu "${FILESDIR}/${PN}-gnome.desktop" || die
- # X Session
- insinto /usr/share/xsessions/
- doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
- fi
-}
-
-pkg_postinst() {
- # bug #447308
- if use gnome; then
- elog
- elog "You have enabled the gnome USE flag."
- elog "Please note that quitting awesome won't kill your gnome session."
- elog "To really quit the session, you should bind your quit key"
- elog "to the following command:"
- elog " gnome-session-quit --logout"
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=447308"
- fi
-
- # bug #440724
- elog
- elog "If you are having issues with Java application windows being"
- elog "completely blank, try installing"
- elog " x11-misc/wmname"
- elog "and setting the WM name to LG3D."
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=440724"
- elog
-}
diff --git a/x11-wm/awesome/awesome-3.5.6-r1.ebuild b/x11-wm/awesome/awesome-3.5.6-r1.ebuild
new file mode 100644
index 0000000..3b95151
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.5.6-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_MIN_VERSION="2.8"
+inherit cmake-utils eutils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="http://awesome.naquadah.org/"
+SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus doc elibc_FreeBSD gnome"
+
+COMMON_DEPEND="
+ >=dev-lang/lua-5.1:0
+ dev-libs/glib:2
+ >=dev-libs/libxdg-basedir-1
+ >=dev-lua/lgi-0.7
+ x11-libs/cairo[xcb]
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/libxcb-1.6
+ >=x11-libs/pango-1.19.3[introspection]
+ >=x11-libs/startup-notification-0.10_p20110426
+ >=x11-libs/xcb-util-0.3.8
+ x11-libs/xcb-util-cursor
+ x11-libs/libXcursor
+ >=x11-libs/libX11-1.3.99.901
+ dbus? ( >=sys-apps/dbus-1 )
+ elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${COMMON_DEPEND}
+ >=app-text/asciidoc-8.4.5
+ app-text/xmlto
+ dev-util/gperf
+ virtual/pkgconfig
+ media-gfx/imagemagick[png]
+ >=x11-proto/xcb-proto-1.5
+ >=x11-proto/xproto-7.0.15
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS="AUTHORS BUGS PATCHES README STYLE"
+
+src_prepare() {
+ # bug #408025
+ epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
+ epatch "${FILESDIR}/${PN}-xsession.patch"
+
+ # bug #507604
+ epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
+ # bug #509658
+ epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DPREFIX="${EPREFIX}"/usr
+ -DSYSCONFDIR="${EPREFIX}"/etc
+ $(cmake-utils_use_with dbus DBUS)
+ $(cmake-utils_use doc GENERATE_DOC)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ local myargs="all"
+
+ if use doc ; then
+ myargs="${myargs} doc"
+ fi
+ cmake-utils_src_make ${myargs}
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use doc ; then
+ (
+ cd "${CMAKE_BUILD_DIR}"/doc
+ mv html doxygen
+ dohtml -r doxygen || die
+ )
+ fi
+ rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
+
+ exeinto /etc/X11/Sessions
+ newexe "${FILESDIR}"/${PN}-session ${PN} || die
+
+ # GNOME-based awesome
+ if use gnome ; then
+ # GNOME session
+ insinto /usr/share/gnome-session/sessions
+ newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
+ # Application launcher
+ domenu "${FILESDIR}/${PN}-gnome.desktop" || die
+ # X Session
+ insinto /usr/share/xsessions/
+ doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
+ fi
+}
+
+pkg_postinst() {
+ # bug #447308
+ if use gnome; then
+ elog
+ elog "You have enabled the gnome USE flag."
+ elog "Please note that quitting awesome won't kill your gnome session."
+ elog "To really quit the session, you should bind your quit key"
+ elog "to the following command:"
+ elog " gnome-session-quit --logout"
+ elog "For more info visit"
+ elog " https://bugs.gentoo.org/show_bug.cgi?id=447308"
+ fi
+
+ # bug #440724
+ elog
+ elog "If you are having issues with Java application windows being"
+ elog "completely blank, try installing"
+ elog " x11-misc/wmname"
+ elog "and setting the WM name to LG3D."
+ elog "For more info visit"
+ elog " https://bugs.gentoo.org/show_bug.cgi?id=440724"
+ elog
+}
diff --git a/x11-wm/awesome/awesome-3.5.6.ebuild b/x11-wm/awesome/awesome-3.5.6.ebuild
deleted file mode 100644
index 2fbf298..0000000
--- a/x11-wm/awesome/awesome-3.5.6.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MIN_VERSION="2.8"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD gnome"
-
-COMMON_DEPEND="
- >=dev-lang/lua-5.1
- dev-libs/glib:2
- >=dev-libs/libxdg-basedir-1
- >=dev-lua/lgi-0.7
- x11-libs/cairo[xcb]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libxcb-1.6
- >=x11-libs/pango-1.19.3[introspection]
- >=x11-libs/startup-notification-0.10_p20110426
- >=x11-libs/xcb-util-0.3.8
- x11-libs/xcb-util-cursor
- x11-libs/libXcursor
- || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
- dbus? ( >=sys-apps/dbus-1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${COMMON_DEPEND}
- >=app-text/asciidoc-8.4.5
- app-text/xmlto
- dev-util/gperf
- virtual/pkgconfig
- media-gfx/imagemagick[png]
- >=x11-proto/xcb-proto-1.5
- >=x11-proto/xproto-7.0.15
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
- # bug #408025
- epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
- epatch "${FILESDIR}/${PN}-xsession.patch"
-
- # bug #507604
- epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
- # bug #509658
- epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
-}
-
-src_configure() {
- mycmakeargs=(
- -DPREFIX="${EPREFIX}"/usr
- -DSYSCONFDIR="${EPREFIX}"/etc
- $(cmake-utils_use_with dbus DBUS)
- $(cmake-utils_use doc GENERATE_DOC)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- local myargs="all"
-
- if use doc ; then
- myargs="${myargs} doc"
- fi
- cmake-utils_src_make ${myargs}
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use doc ; then
- (
- cd "${CMAKE_BUILD_DIR}"/doc
- mv html doxygen
- dohtml -r doxygen || die
- )
- fi
- rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN} || die
-
- # GNOME-based awesome
- if use gnome ; then
- # GNOME session
- insinto /usr/share/gnome-session/sessions
- newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
- # Application launcher
- domenu "${FILESDIR}/${PN}-gnome.desktop" || die
- # X Session
- insinto /usr/share/xsessions/
- doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
- fi
-}
-
-pkg_postinst() {
- # bug #447308
- if use gnome; then
- elog
- elog "You have enabled the gnome USE flag."
- elog "Please note that quitting awesome won't kill your gnome session."
- elog "To really quit the session, you should bind your quit key"
- elog "to the following command:"
- elog " gnome-session-quit --logout"
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=447308"
- fi
-
- # bug #440724
- elog
- elog "If you are having issues with Java application windows being"
- elog "completely blank, try installing"
- elog " x11-misc/wmname"
- elog "and setting the WM name to LG3D."
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=440724"
- elog
-}
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 9749600..2e56dc6 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -4,9 +4,6 @@
DIST e16-1.0.15.tar.gz 2392041 SHA256 ce8e87618c5d0b85882197a92ceee8d4240caacffb525bae7721eb0e0a83a7ea SHA512 bc2a891b172b7201a24629cd52df6817ce03b0d5978e2a75db6abba4c21d8670bd94243d7026bc8f50cefb7562c34266aa8332901dde593d0d44e8b3a5dfd5e8 WHIRLPOOL 59cff86ef7a694a8a23e04ff5609958ded65cccb786f1845866ecb6a8cf0c6e892666b429780f6dba12913411ffb97dd67ae7df2d48a431ddef66af4d2973ffd
DIST e16-1.0.16.tar.gz 2395638 SHA256 a50ecbcf1cf239a5b36cc592364b2b1ee8e4135098704e5b1b949f989811cff1 SHA512 1cd3e42221546b08a7fa1431ab603d79963d91da86b0ec53d4578b8e02697b6b54db1ee75ae7e948c780905ad059c4be77d72f8bb33d3808e03842d53922eb8e WHIRLPOOL 4e26917992d90e69af1e1574582048e09ee4ef4e461c4f0e05739d80f63647575b548c97f8afc0bf79a97647d632463b22bbf9c431a3977b8e9ef83ea952220a
DIST e16-1.0.17.tar.gz 2417299 SHA256 41ed67b648acc9b570cc681cf69d0accf38b69fd5d0af6b8ea8a6eacbf87659d SHA512 d6ad565cf638de5240fbcd0f1cd37977c69e6af31a4ff9127e9c570fdf57a56bde50978620fbc34508d02661effa17f0c8b91ca23faebc0b77f9d40e166ba021 WHIRLPOOL d4996798db0ce676c0cdce8bc6a354fcb6649ee4a9c579dc4c51beaeb96d7dcd2dfe0f063ead6724b21bb9f7f66608596412a251df0c2670b944f7376cb3e504
-DIST enlightenment-0.17.6.tar.bz2 29500129 SHA256 25ec72b40e7827468a2498fedfb03f86cb6f20101b63175d80c96db3157b0c0e SHA512 5f8fec0b2c9cb2bcc3e2738b68e4266179153288a161e4e2d0f7ff50b702d6d78d836b433105c548997b516324ca7ba44a74a7361052235b50e18c22a26c9dc9 WHIRLPOOL e89b52efa2007815ef4de9272102f5f170a3838666483a4653bdaa2f37291e14e92d6814dcbd7dfdfdcf14735dc37571b6fa1bf6f7b5a8c08070723d75e7d03a
-DIST enlightenment-0.18.7.tar.bz2 27613518 SHA256 90fc71cd7eda1bf4e7cf4fa6ed4d578ce01f5d8c66e21f1d1a2ffbc843f36b13 SHA512 f06479e3c6da31f9457525247f1654ed10e192073f1e9fa9d07f5d8158f6463871960776c320bb5cc3676cdfb3188e4b0c5435c438051a2bfd9f3b2c8f73befd WHIRLPOOL b1b6323b047d330789b079dad45826269d878890b56b763b7a2b4a10dff1adecbeb062ba7cb795ff0f415d06f8da3c5b11a64dfaeb98fb8ac48d77e79b2d1391
DIST enlightenment-0.18.8.tar.bz2 27616548 SHA256 e99b1d8a9c64dad80611310bd3dc3a7b6d9eaefbd21d0f4a3c350aed9137ca13 SHA512 8ba767b7004c78130eda315a4b7c06d5dcd4034e4d9ef588d0012eca70fb677cff8f9a81bb5a33e6e8891d52f9f93e0f1cf4d3fadec505afd6c1f476b964fe73 WHIRLPOOL edbd586f1c00574457fe2123d1a0c86e00b8c949abf04677535b0d4378bc66822cc72f48138be622a8c671f40f65fe5ce42b6d8af3f96259b15136981f556994
DIST enlightenment-0.19.10.tar.xz 24594372 SHA256 8bdc2b764765e807df263962cb3c4793256a34ce74cf854f623a47859f7a4f5d SHA512 c9ee8e9a6a6575103cb1785fc478cfdcd7c544e21eb8738d3877f8742fb0250bae751ae7d05b6b57b7ca37c7011e7ae183da1aa251233c85dd7e38a23f897243 WHIRLPOOL a0d320c52850de00db1a2778f2d71be58b0567854e0c07e03b00ef42f8b94a00abff0616ae389831a117a37a1f554f6e41474e9e8fec0186a8079f970d1db977
-DIST enlightenment-0.19.4.tar.xz 24597128 SHA256 e777febb2fa751ec3320fdc3e2ecb0a9b70ec75f2d188fb02edd31004e536b64 SHA512 c5f6a68cff1c4744da050e1ac865f8af6a70675d4a50644f91a30e572509c5f5314a43a16a43e9f45d3ddb0a827bd213a1478d6f7416f76e68928560a3e32b6f WHIRLPOOL 8e37c7fb3d1ebd234a39bdaf6d82aa3097dc40bf5150315b05d72ff3e71b85a04026a28a1a4240625d28f6bfa7900a6cf2a0f642bb5ae605812e1503af37c150
-DIST enlightenment-0.19.8.tar.xz 24594628 SHA256 b1a9b76bb8282b266f12a0de1e83126deffbb8bb4fbea6901831cd00b09503f9 SHA512 531e90ca68fbc75ead4cbf389e48e0ca5b3c39f181bec154271301f7893810a976145bc34eb0a95adf08aa24c11a6b85936856fe0bb5a0ca61cfddbb608fc48b WHIRLPOOL 1795762d27dfb7d8f67953b1154ef3471d392a246b36ac7687a70a2e5d66e619b786c6510bb8563806666caea7b966d6d3bbaace04d2a2f9063a5dfa5b611309
+DIST enlightenment-0.19.12.tar.xz 24569084 SHA256 55f23c337e3092e735ae37ada8f6701adab5ddd13f37ef38c63eec8a536f0b25 SHA512 30332fa0108a4361dd7cc961325b607fccef99caa1db6eaf068fc97de9978ad21dde5724a7e8f6612441fb0529a56461c8df63de25579f67d452fa9bf382d859 WHIRLPOOL e19f84c4a6311ef583d8f2bd53bc85a13e37bc65bdccc1823953685e0946f18cfaf0a75ee97f1a97e5d7fb9c9b0711b92f00f6949e5ca44718b6bf2347cb3a4c
diff --git a/x11-wm/enlightenment/enlightenment-0.17.6.ebuild b/x11-wm/enlightenment/enlightenment-0.17.6.ebuild
deleted file mode 100644
index 71c4a99..0000000
--- a/x11-wm/enlightenment/enlightenment-0.17.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools enlightenment
-
-DESCRIPTION="Enlightenment DR17 window manager"
-SRC_URI="https://download.enlightenment.org/releases/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-KEYWORDS="amd64 x86"
-SLOT="0.17/${PV%%_*}"
-
-# The @ is just an anchor to expand from
-__EVRY_MODS=""
-__CONF_MODS="
- +@applications +@dialogs +@display +@edgebindings
- +@interaction +@intl +@keybindings +@menus
- +@paths +@performance +@randr +@shelves +@theme
- +@window-manipulation +@window-remembers"
-__NORM_MODS="
- @access +@backlight +@battery +@clock +@comp +@connman +@cpufreq +@dropshadow
- +@everything +@fileman +@fileman-opinfo +@gadman +@ibar +@ibox +@illume2
- +@mixer +@msgbus +@notification +@pager +@quickaccess +@shot +@start
- +@syscon +@systray +@tasks +@temperature +@tiling +@winlist +@wizard +@xkbswitch"
-IUSE_E_MODULES="
- ${__CONF_MODS//@/enlightenment_modules_conf-}
- ${__NORM_MODS//@/enlightenment_modules_}"
-
-IUSE="pam spell static-libs +udev ukit ${IUSE_E_MODULES}"
-
-RDEPEND="
- pam? ( sys-libs/pam )
- || ( >=dev-libs/efl-1.8.4[X,eet,jpeg(+),png] >=dev-libs/efl-1.8.4[xcb,eet,jpeg(+),png] )
- >=dev-libs/e_dbus-1.7.10
- ukit? ( >=dev-libs/e_dbus-1.7.10[udev] )
- x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P%%_*}
-
-src_prepare() {
- sed -i "s:1.7.10:1.7.9:g" configure.ac
- eautoreconf
- epatch "${FILESDIR}"/quickstart.diff
- enlightenment_src_prepare
-}
-
-src_configure() {
- E_ECONF+=(
- --disable-install-sysactions
- --disable-elementary
- $(use_enable doc)
- --disable-device-hal
- --enable-emotion
- --disable-mount-hal
- $(use_enable nls)
- $(use_enable pam)
- --enable-device-udev
- $(use_enable udev mount-eeze)
- $(use_enable ukit mount-udisks)
- --disable-physics
- )
- local u c
- for u in ${IUSE_E_MODULES} ; do
- u=${u#+}
- c=${u#enlightenment_modules_}
- E_ECONF+=( $(use_enable ${u} ${c}) )
- done
- enlightenment_src_configure
-}
-
-src_install() {
- enlightenment_src_install
- insinto /etc/enlightenment
- newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-}
diff --git a/x11-wm/enlightenment/enlightenment-0.18.7.ebuild b/x11-wm/enlightenment/enlightenment-0.18.7.ebuild
deleted file mode 100644
index cd02a9c..0000000
--- a/x11-wm/enlightenment/enlightenment-0.18.7.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
- EGIT_SUB_PROJECT="core"
- EGIT_URI_APPEND="${PN}"
-else
- SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.bz2"
- EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment DR17 window manager"
-
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0.17/${PV%%_*}"
-
-# The @ is just an anchor to expand from
-__EVRY_MODS=""
-__CONF_MODS="
- +@applications +@comp +@dialogs +@display
- +@interaction +@intl +@menus
- +@paths +@performance +@randr +@shelves +@theme +@wallpaper2
- +@window-manipulation +@window-remembers"
-__NORM_MODS="
- @access +@appmenu +@backlight +@bluez4 +@battery +@clock
- +@connman +@contact +@cpufreq +@everything +@fileman
- +@fileman-opinfo +@gadman +@ibar +@ibox +@illume2 +@mixer +@msgbus
- +@music-control +@notification +@pager +@quickaccess +@shot
- +@start +@syscon +@systray +@tasks +@teamwork +@temperature +@tiling
- +@winlist +@wizard @wl-desktop-shell @wl-screenshot +@xkbswitch"
-IUSE_E_MODULES="
- ${__CONF_MODS//@/enlightenment_modules_conf-}
- ${__NORM_MODS//@/enlightenment_modules_}"
-
-IUSE="pam spell static-libs systemd +udev ukit wayland ${IUSE_E_MODULES}"
-
-RDEPEND="
- pam? ( sys-libs/pam )
- systemd? ( sys-apps/systemd )
- wayland? ( dev-libs/efl[wayland]
- >=dev-libs/wayland-1.2.0
- >=x11-libs/pixman-0.31.1
- >=x11-libs/libxkbcommon-0.3.1
- )
- >=dev-libs/efl-1.8.3
- || ( >=dev-libs/efl-1.8.3[X] >=dev-libs/efl-1.8.3[xcb] )
- >=media-libs/elementary-1.8.2
- x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/quickstart.diff
- enlightenment_src_prepare
-}
-
-src_configure() {
- E_ECONF+=(
- --disable-install-sysactions
- $(use_enable doc)
- --disable-device-hal
- $(use_enable nls)
- $(use_enable pam)
- $(use_enable systemd)
- --enable-device-udev
- $(use_enable udev mount-eeze)
- $(use_enable ukit mount-udisks)
- $(use_enable wayland wayland-clients)
- )
- local u c
- for u in ${IUSE_E_MODULES} ; do
- u=${u#+}
- c=${u#enlightenment_modules_}
- E_ECONF+=( $(use_enable ${u} ${c}) )
- done
- enlightenment_src_configure
-}
-
-src_install() {
- enlightenment_src_install
- insinto /etc/enlightenment
- newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-}
diff --git a/x11-wm/enlightenment/enlightenment-0.19.4.ebuild b/x11-wm/enlightenment/enlightenment-0.19.12.ebuild
similarity index 100%
rename from x11-wm/enlightenment/enlightenment-0.19.4.ebuild
rename to x11-wm/enlightenment/enlightenment-0.19.12.ebuild
diff --git a/x11-wm/enlightenment/enlightenment-0.19.8.ebuild b/x11-wm/enlightenment/enlightenment-0.19.8.ebuild
deleted file mode 100644
index bde4193..0000000
--- a/x11-wm/enlightenment/enlightenment-0.19.8.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_SUB_PROJECT="core"
- EGIT_URI_APPEND="${PN}"
-else
- SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
- EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment DR17 window manager"
-
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0.17/${PV%%_*}"
-
-# The @ is just an anchor to expand from
-__EVRY_MODS=""
-__CONF_MODS="
- +@applications +@comp +@dialogs +@display
- +@interaction +@intl +@menus
- +@paths +@performance +@randr +@shelves +@theme +@wallpaper2
- +@window-manipulation +@window-remembers"
-__NORM_MODS="
- @access +@appmenu +@backlight +@bluez4 +@battery +@clock
- +@connman +@contact +@cpufreq +@everything +@fileman
- +@fileman-opinfo +@gadman +@ibar +@ibox +@illume2 +@mixer +@msgbus
- +@music-control +@notification +@pager +@quickaccess +@shot
- +@start +@syscon +@systray +@tasks +@teamwork +@temperature +@tiling
- +@winlist +@wizard @wl-desktop-shell @wl-screenshot +@xkbswitch"
-IUSE_E_MODULES="
- ${__CONF_MODS//@/enlightenment_modules_conf-}
- ${__NORM_MODS//@/enlightenment_modules_}"
-
-IUSE="pam spell static-libs systemd +udev ukit wayland ${IUSE_E_MODULES}"
-
-RDEPEND="
- pam? ( sys-libs/pam )
- systemd? ( sys-apps/systemd )
- wayland? (
- dev-libs/efl[wayland]
- >=dev-libs/wayland-1.2.0
- >=x11-libs/pixman-0.31.1
- >=x11-libs/libxkbcommon-0.3.1
- )
- >=dev-libs/efl-${PV}[X]
- >=media-libs/elementary-${PV}
- x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/quickstart.diff
- enlightenment_src_prepare
-}
-
-src_configure() {
- E_ECONF=(
- --disable-install-sysactions
- $(use_enable doc)
- --disable-device-hal
- $(use_enable nls)
- $(use_enable pam)
- $(use_enable systemd)
- --enable-device-udev
- $(use_enable udev mount-eeze)
- $(use_enable ukit mount-udisks)
- $(use_enable wayland wayland-clients)
- )
- local u c
- for u in ${IUSE_E_MODULES} ; do
- u=${u#+}
- c=${u#enlightenment_modules_}
- E_ECONF+=( $(use_enable ${u} ${c}) )
- done
- enlightenment_src_configure
-}
-
-src_install() {
- enlightenment_src_install
- insinto /etc/enlightenment
- newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-}
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index cc4abd4..41964c0 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -61,11 +61,9 @@
<flag name="enlightenment_modules_battery">A gadget to visualize your battery status</flag>
<flag name="enlightenment_modules_bluez4">Configure Bluetooth devices</flag>
<flag name="enlightenment_modules_clock">Nice clock gadget to show current time</flag>
- <flag name="enlightenment_modules_comp">Enlightenment Composite Manager</flag>
<flag name="enlightenment_modules_connman">Control Wifi and wired networks as a user</flag>
<flag name="enlightenment_modules_contact">Enable the contact module</flag>
<flag name="enlightenment_modules_cpufreq">Gadget to monitor and change the CPU frequency</flag>
- <flag name="enlightenment_modules_dropshadow">Module to add a dropshadow to windows</flag>
<flag name="enlightenment_modules_everything">The run command module provides an application launcher dialog</flag>
<flag name="enlightenment_modules_fileman">Enlightenment's integrated file manager</flag>
<flag name="enlightenment_modules_fileman-opinfo">Can be placed on the desktop or in a shelf</flag>
@@ -96,10 +94,8 @@
<flag name="enlightenment_modules_conf-comp">Configure default dialog properties</flag>
<flag name="enlightenment_modules_conf-dialogs">Configure default dialog properties</flag>
<flag name="enlightenment_modules_conf-display">Used to configure your screen</flag>
- <flag name="enlightenment_modules_conf-edgebindings">Configure your edge bindings here</flag>
<flag name="enlightenment_modules_conf-interaction">Configure Mouse and Touch input</flag>
<flag name="enlightenment_modules_conf-intl">Used to select a default language</flag>
- <flag name="enlightenment_modules_conf-keybindings">Key, Mouse and Button control settings</flag>
<flag name="enlightenment_modules_conf-menus">Configures menu behavior</flag>
<flag name="enlightenment_modules_conf-paths">Specifies the Enlightenment search paths and default directories</flag>
<flag name="enlightenment_modules_conf-performance">Used to configure certain performance related items as frame rates and cache settings</flag>
diff --git a/x11-wm/i3/i3-4.10.4.ebuild b/x11-wm/i3/i3-4.10.4.ebuild
index b637b1e..646dae9 100644
--- a/x11-wm/i3/i3-4.10.4.ebuild
+++ b/x11-wm/i3/i3-4.10.4.ebuild
@@ -12,7 +12,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="+pango"
CDEPEND="dev-libs/libev
diff --git a/x11-wm/icewm/icewm-1.3.11.ebuild b/x11-wm/icewm/icewm-1.3.11.ebuild
index ba07240..663a0c4 100644
--- a/x11-wm/icewm/icewm-1.3.11.ebuild
+++ b/x11-wm/icewm/icewm-1.3.11.ebuild
@@ -48,7 +48,7 @@
x11-proto/xproto
x11-proto/xextproto
doc? ( app-text/linuxdoc-tools )
- nls? ( >=sys-devel/gettext-0.19.2 )
+ nls? ( >=sys-devel/gettext-0.19.5 )
truetype? ( >=media-libs/freetype-2.0.9 )
xinerama? ( x11-proto/xineramaproto )
"
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index e42995b..ba894dd 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -1 +1,2 @@
DIST jwm-2.1.0.tar.bz2 163590 SHA256 5c99f9023dc8c2597effdaacc240ff4c2e07e77c8244f3bf1de5cc483bcf08ab SHA512 68476ce1e57486110301582e7a42e709d8113634736063915b1e5ed8351187095f3dcafdc3194839a405959c0b7d5c10f31ae420ee54ce8d857e300194388c1e WHIRLPOOL 68a958e1384ce4a7c28a41ae239b44eaf509ece13d9f2630abf72c39a96670d0abd4aa45c9f47957655f6fd87ac8505c5694c253d2b3480537ca344324c319a6
+DIST jwm-2.3.2.tar.xz 325648 SHA256 92a3e66ceb847aac9fa09a24b16c93194f6c52e398f5a88f228b4986ea972c53 SHA512 34b9d482815e8b269203e1f5bf02d3e13f3186153755c9e74094e4a8af376f35b8bef4553056e83c20ba0c532e6d2606633d71272e186fe45dfed9e4ea836a27 WHIRLPOOL 93d140919edf16fb44bf93b88880d017174036de363a514862c5553ea84796311ba74fa2f6736fa2f78fe639e95ad6087b38fa962d77c83c4c4d863e35c06703
diff --git a/x11-wm/jwm/jwm-2.3.2.ebuild b/x11-wm/jwm/jwm-2.3.2.ebuild
new file mode 100644
index 0000000..64d42ed
--- /dev/null
+++ b/x11-wm/jwm/jwm-2.3.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Very fast and lightweight still powerful window manager for X"
+HOMEPAGE="http://joewing.net/programs/jwm/"
+SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
+IUSE="bidi debug jpeg png truetype xinerama xpm"
+
+RDEPEND="xpm? ( x11-libs/libXpm )
+ xinerama? ( x11-libs/libXinerama )
+ x11-libs/libXext
+ x11-libs/libXrender
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ truetype? ( x11-libs/libXft )
+ png? ( media-libs/libpng:0= )
+ jpeg? ( virtual/jpeg:0= )
+ bidi? ( dev-libs/fribidi )
+ dev-libs/expat"
+DEPEND="${RDEPEND}
+ x11-proto/xproto
+ x11-proto/xextproto
+ xinerama? ( x11-proto/xineramaproto )"
+
+src_configure() {
+ econf \
+ $(use_enable debug) \
+ $(use_enable jpeg) \
+ $(use_enable png) \
+ $(use_enable truetype xft) \
+ $(use_enable xinerama) \
+ $(use_enable xpm) \
+ $(use_enable bidi fribidi) \
+ --enable-shape \
+ --enable-xrender
+}
+
+src_install() {
+ dodir /etc
+ dodir /usr/bin
+ dodir /usr/share/man
+
+ default
+
+ make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
+
+ dodoc README.md example.jwmrc ChangeLog
+}
+
+pkg_postinst() {
+ einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
+ einfo "or per-user by creating a configuration file in ~/.jwmrc"
+ einfo
+ einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/x11-wm/jwm/metadata.xml b/x11-wm/jwm/metadata.xml
index 4538a68..986da1c 100644
--- a/x11-wm/jwm/metadata.xml
+++ b/x11-wm/jwm/metadata.xml
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>wraeth@wraeth.id.au</email>
+ <name>Sam Jorna</name>
+ <description>Proxy maintainer for assignee of bugs</description>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 3633659..43311d2 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,3 +1,2 @@
DIST mutter-3.14.4.tar.xz 1608836 SHA256 b4fbcc0664484d6215fc1f2101e9b636303de63544b786f2f87ebf2f6a616a8b SHA512 5b6e2d969e9a328e23bedb9fd0409da1af0d2ae8ded6a940992d4cff18a8cbfe2aa6582a56a2c8bd549a560a84d8cbffe953f151bcadf235315b8ec8bc7d1267 WHIRLPOOL 45c0329832999f14a5eaa77df3a6c7bbc72556b779fc55b3db9505594efec40252996bf8d96083da47fdb67b6bf5a9402f526d8bbb1e5436e5de16a8520e4acf
-DIST mutter-3.16.2.tar.xz 1549760 SHA256 4a2b752f0b3aa59f50563190222623324f5154acbb6bf174213f5849e77d0763 SHA512 f2cd350f8dbd03bc8e58f6c3f1b48cd51b38ae56e020d4e02100ef02f003d797a20095acf6a8874563fde42cfde49c4a28c418af151ee49f24ed391d5ae3caba WHIRLPOOL a88badf1f59c8c6ba8dcde4af207a2e66e66abbd6fd6c436289591bbb6eb3b017f50a7122282b69fd7d55127029e7623b7cbca3467d2d25d95c8ff6077dc371b
DIST mutter-3.16.3.tar.xz 1550004 SHA256 ee0098487d1bfb8f28e3927fbb9df227d846555142d352f8693f56a08441c755 SHA512 31b6319c605d2576bf179e01534fe886a997677c63f19fa5d4a2d71e616a02de89d3edb069a444fb84c6fdf5a471afa2bda1d835c07e5d6dce712b2485e5937d WHIRLPOOL 23cc5161edb108137c9c983551b57659fc02c179bc7e08abebd5b26b98dcc1a17e00579a6b1e9f6fc544a92a877282fa1202a6390a14ef92ca6374dae1750112
diff --git a/x11-wm/mutter/files/mutter-3.16.2-size-unredirected.patch b/x11-wm/mutter/files/mutter-3.16.2-size-unredirected.patch
deleted file mode 100644
index 0999ebd..0000000
--- a/x11-wm/mutter/files/mutter-3.16.2-size-unredirected.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 351f444f9d16a90636feb217b15f0f376bf96d85 Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <jstpierre@mecheye.net>
-Date: Tue, 23 Jun 2015 16:23:45 -0700
-Subject: surface-actor-x11: Make sure to set a size when unredirected
-
-When we're unredirected, we don't have a pixmap, and thus our allocation
-becomes 0x0. So when events come in, they pass right through our actor,
-going to the one underneath in the stack.
-
-Fix this by having a fallback size on the shaped texture actor when
-we're unredirected, causing it to always have a valid allocation.
-
-This fixes clicking on stuff in sloppy / mouse mode focus.
-
-diff --git a/src/compositor/meta-shaped-texture-private.h b/src/compositor/meta-shaped-texture-private.h
-index 4ee8027..21c6335 100644
---- a/src/compositor/meta-shaped-texture-private.h
-+++ b/src/compositor/meta-shaped-texture-private.h
-@@ -32,6 +32,9 @@
- ClutterActor *meta_shaped_texture_new (void);
- void meta_shaped_texture_set_texture (MetaShapedTexture *stex,
- CoglTexture *texture);
-+void meta_shaped_texture_set_fallback_size (MetaShapedTexture *stex,
-+ guint fallback_width,
-+ guint fallback_height);
- gboolean meta_shaped_texture_is_obscured (MetaShapedTexture *self);
-
- #endif
-diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
-index 163c5e6..8701d1b 100644
---- a/src/compositor/meta-shaped-texture.c
-+++ b/src/compositor/meta-shaped-texture.c
-@@ -86,6 +86,7 @@ struct _MetaShapedTexturePrivate
- cairo_region_t *unobscured_region;
-
- guint tex_width, tex_height;
-+ guint fallback_width, fallback_height;
-
- guint create_mipmaps : 1;
- };
-@@ -136,7 +137,20 @@ set_unobscured_region (MetaShapedTexture *self,
- g_clear_pointer (&priv->unobscured_region, (GDestroyNotify) cairo_region_destroy);
- if (unobscured_region)
- {
-- cairo_rectangle_int_t bounds = { 0, 0, priv->tex_width, priv->tex_height };
-+ guint width, height;
-+
-+ if (priv->texture)
-+ {
-+ width = priv->tex_width;
-+ height = priv->tex_height;
-+ }
-+ else
-+ {
-+ width = priv->fallback_width;
-+ height = priv->fallback_height;
-+ }
-+
-+ cairo_rectangle_int_t bounds = { 0, 0, width, height };
- priv->unobscured_region = cairo_region_copy (unobscured_region);
- cairo_region_intersect_rectangle (priv->unobscured_region, &bounds);
- }
-@@ -499,16 +513,21 @@ meta_shaped_texture_get_preferred_width (ClutterActor *self,
- gfloat *natural_width_p)
- {
- MetaShapedTexturePrivate *priv;
-+ guint width;
-
- g_return_if_fail (META_IS_SHAPED_TEXTURE (self));
-
- priv = META_SHAPED_TEXTURE (self)->priv;
-
-- if (min_width_p)
-- *min_width_p = priv->tex_width;
-+ if (priv->texture)
-+ width = priv->tex_width;
-+ else
-+ width = priv->fallback_width;
-
-+ if (min_width_p)
-+ *min_width_p = width;
- if (natural_width_p)
-- *natural_width_p = priv->tex_width;
-+ *natural_width_p = width;
- }
-
- static void
-@@ -518,16 +537,21 @@ meta_shaped_texture_get_preferred_height (ClutterActor *self,
- gfloat *natural_height_p)
- {
- MetaShapedTexturePrivate *priv;
-+ guint height;
-
- g_return_if_fail (META_IS_SHAPED_TEXTURE (self));
-
- priv = META_SHAPED_TEXTURE (self)->priv;
-
-- if (min_height_p)
-- *min_height_p = priv->tex_height;
-+ if (priv->texture)
-+ height = priv->tex_height;
-+ else
-+ height = priv->fallback_height;
-
-+ if (min_height_p)
-+ *min_height_p = height;
- if (natural_height_p)
-- *natural_height_p = priv->tex_height;
-+ *natural_height_p = height;
- }
-
- static cairo_region_t *
-@@ -860,6 +884,17 @@ meta_shaped_texture_get_image (MetaShapedTexture *stex,
- return surface;
- }
-
-+void
-+meta_shaped_texture_set_fallback_size (MetaShapedTexture *self,
-+ guint fallback_width,
-+ guint fallback_height)
-+{
-+ MetaShapedTexturePrivate *priv = self->priv;
-+
-+ priv->fallback_width = fallback_width;
-+ priv->fallback_height = fallback_height;
-+}
-+
- static void
- meta_shaped_texture_cull_out (MetaCullable *cullable,
- cairo_region_t *unobscured_region,
-diff --git a/src/compositor/meta-surface-actor-x11.c b/src/compositor/meta-surface-actor-x11.c
-index 4aa7ecd..b50b8f2 100644
---- a/src/compositor/meta-surface-actor-x11.c
-+++ b/src/compositor/meta-surface-actor-x11.c
-@@ -416,6 +416,7 @@ meta_surface_actor_x11_set_size (MetaSurfaceActorX11 *self,
- int width, int height)
- {
- MetaSurfaceActorX11Private *priv = meta_surface_actor_x11_get_instance_private (self);
-+ MetaShapedTexture *stex = meta_surface_actor_get_texture (META_SURFACE_ACTOR (self));
-
- if (priv->last_width == width &&
- priv->last_height == height)
-@@ -424,4 +425,5 @@ meta_surface_actor_x11_set_size (MetaSurfaceActorX11 *self,
- priv->size_changed = TRUE;
- priv->last_width = width;
- priv->last_height = height;
-+ meta_shaped_texture_set_fallback_size (stex, width, height);
- }
---
-cgit v0.10.2
-
diff --git a/x11-wm/mutter/files/mutter-3.16.3-GL_EXT_x11_sync_object.patch b/x11-wm/mutter/files/mutter-3.16.3-GL_EXT_x11_sync_object.patch
new file mode 100644
index 0000000..401c175
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-3.16.3-GL_EXT_x11_sync_object.patch
@@ -0,0 +1,840 @@
+From 9cc80497a262edafc58062fd860ef7a9dcab688c Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos@gmail.com>
+Date: Fri, 18 Apr 2014 20:21:20 +0200
+Subject: compositor: Add support for GL_EXT_x11_sync_object
+
+If GL advertises this extension we'll use it to synchronize X with GL
+rendering instead of relying on the XSync() behavior with open source
+drivers.
+
+Some driver bugs were uncovered while working on this so if we have
+had to reboot the ring a few times, something is probably wrong and
+we're likely to just make things worse by continuing to try. Let's
+err on the side of caution, disable ourselves and fallback to the
+XSync() path in the compositor.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=728464
+
+diff --git a/configure.ac b/configure.ac
+index 01d75cb..6eea6b2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -332,6 +332,11 @@ fi
+
+ GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
+
++AC_CHECK_DECL([GL_EXT_x11_sync_object],
++ [],
++ [AC_MSG_ERROR([GL_EXT_x11_sync_object definition not found, please update your GL headers])],
++ [#include <GL/glx.h>])
++
+ #### Warnings (last since -Werror can disturb other tests)
+
+ # Stay command-line compatible with the gnome-common configure option. Here
+diff --git a/src/Makefile.am b/src/Makefile.am
+index baadb41..a4e07a9 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -139,6 +139,8 @@ libmutter_la_SOURCES = \
+ compositor/meta-surface-actor.h \
+ compositor/meta-surface-actor-x11.c \
+ compositor/meta-surface-actor-x11.h \
++ compositor/meta-sync-ring.c \
++ compositor/meta-sync-ring.h \
+ compositor/meta-texture-rectangle.c \
+ compositor/meta-texture-rectangle.h \
+ compositor/meta-texture-tower.c \
+diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
+index 3ff8431..ac38ffc 100644
+--- a/src/backends/x11/meta-backend-x11.c
++++ b/src/backends/x11/meta-backend-x11.c
+@@ -45,6 +45,7 @@
+ #include <meta/util.h>
+ #include "display-private.h"
+ #include "compositor/compositor-private.h"
++#include "compositor/meta-sync-ring.h"
+
+ struct _MetaBackendX11Private
+ {
+@@ -255,6 +256,8 @@ handle_host_xevent (MetaBackend *backend,
+ MetaCompositor *compositor = display->compositor;
+ if (meta_plugin_manager_xevent_filter (compositor->plugin_mgr, event))
+ bypass_clutter = TRUE;
++ if (compositor->have_x11_sync_object)
++ meta_sync_ring_handle_event (event);
+ }
+ }
+
+diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h
+index 80fb4e2..9e3e73d 100644
+--- a/src/compositor/compositor-private.h
++++ b/src/compositor/compositor-private.h
+@@ -15,7 +15,8 @@ struct _MetaCompositor
+ {
+ MetaDisplay *display;
+
+- guint repaint_func_id;
++ guint pre_paint_func_id;
++ guint post_paint_func_id;
+
+ gint64 server_time_query_time;
+ gint64 server_time_offset;
+@@ -40,6 +41,7 @@ struct _MetaCompositor
+ MetaPluginManager *plugin_mgr;
+
+ gboolean frame_has_updated_xsurfaces;
++ gboolean have_x11_sync_object;
+ };
+
+ /* Wait 2ms after vblank before starting to draw next frame */
+diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
+index 250d489..554faa1 100644
+--- a/src/compositor/compositor.c
++++ b/src/compositor/compositor.c
+@@ -79,6 +79,7 @@
+ #include "frame.h"
+ #include <X11/extensions/shape.h>
+ #include <X11/extensions/Xcomposite.h>
++#include "meta-sync-ring.h"
+
+ #include "backends/x11/meta-backend-x11.h"
+
+@@ -125,7 +126,11 @@ meta_switch_workspace_completed (MetaCompositor *compositor)
+ void
+ meta_compositor_destroy (MetaCompositor *compositor)
+ {
+- clutter_threads_remove_repaint_func (compositor->repaint_func_id);
++ clutter_threads_remove_repaint_func (compositor->pre_paint_func_id);
++ clutter_threads_remove_repaint_func (compositor->post_paint_func_id);
++
++ if (compositor->have_x11_sync_object)
++ meta_sync_ring_destroy ();
+ }
+
+ static void
+@@ -468,13 +473,11 @@ meta_compositor_manage (MetaCompositor *compositor)
+ MetaDisplay *display = compositor->display;
+ Display *xdisplay = display->xdisplay;
+ MetaScreen *screen = display->screen;
++ MetaBackend *backend = meta_get_backend ();
+
+ meta_screen_set_cm_selection (display->screen);
+
+- {
+- MetaBackend *backend = meta_get_backend ();
+- compositor->stage = meta_backend_get_stage (backend);
+- }
++ compositor->stage = meta_backend_get_stage (backend);
+
+ /* We use connect_after() here to accomodate code in GNOME Shell that,
+ * when benchmarking drawing performance, connects to ::after-paint
+@@ -510,7 +513,7 @@ meta_compositor_manage (MetaCompositor *compositor)
+
+ compositor->output = screen->composite_overlay_window;
+
+- xwin = meta_backend_x11_get_xwindow (META_BACKEND_X11 (meta_get_backend ()));
++ xwin = meta_backend_x11_get_xwindow (META_BACKEND_X11 (backend));
+
+ XReparentWindow (xdisplay, xwin, compositor->output, 0, 0);
+
+@@ -530,6 +533,9 @@ meta_compositor_manage (MetaCompositor *compositor)
+ * contents until we show the stage.
+ */
+ XMapWindow (xdisplay, compositor->output);
++
++ compositor->have_x11_sync_object =
++ meta_sync_ring_init (meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend)));
+ }
+
+ redirect_windows (display->screen);
+@@ -1044,11 +1050,12 @@ frame_callback (CoglOnscreen *onscreen,
+ }
+ }
+
+-static void
+-pre_paint_windows (MetaCompositor *compositor)
++static gboolean
++meta_pre_paint_func (gpointer data)
+ {
+ GList *l;
+ MetaWindowActor *top_window;
++ MetaCompositor *compositor = data;
+
+ if (compositor->onscreen == NULL)
+ {
+@@ -1060,7 +1067,7 @@ pre_paint_windows (MetaCompositor *compositor)
+ }
+
+ if (compositor->windows == NULL)
+- return;
++ return TRUE;
+
+ top_window = g_list_last (compositor->windows)->data;
+
+@@ -1077,10 +1084,12 @@ pre_paint_windows (MetaCompositor *compositor)
+ {
+ /* We need to make sure that any X drawing that happens before
+ * the XDamageSubtract() for each window above is visible to
+- * subsequent GL rendering; the only standardized way to do this
+- * is EXT_x11_sync_object, which isn't yet widely available. For
+- * now, we count on details of Xorg and the open source drivers,
+- * and hope for the best otherwise.
++ * subsequent GL rendering; the standardized way to do this is
++ * GL_EXT_X11_sync_object. Since this isn't implemented yet in
++ * mesa, we also have a path that relies on the implementation
++ * of the open source drivers.
++ *
++ * Anything else, we just hope for the best.
+ *
+ * Xorg and open source driver specifics:
+ *
+@@ -1095,17 +1104,28 @@ pre_paint_windows (MetaCompositor *compositor)
+ * round trip request at this point is sufficient to flush the
+ * GLX buffers.
+ */
+- XSync (compositor->display->xdisplay, False);
+-
+- compositor->frame_has_updated_xsurfaces = FALSE;
++ if (compositor->have_x11_sync_object)
++ compositor->have_x11_sync_object = meta_sync_ring_insert_wait ();
++ else
++ XSync (compositor->display->xdisplay, False);
+ }
++
++ return TRUE;
+ }
+
+ static gboolean
+-meta_repaint_func (gpointer data)
++meta_post_paint_func (gpointer data)
+ {
+ MetaCompositor *compositor = data;
+- pre_paint_windows (compositor);
++
++ if (compositor->frame_has_updated_xsurfaces)
++ {
++ if (compositor->have_x11_sync_object)
++ compositor->have_x11_sync_object = meta_sync_ring_after_frame ();
++
++ compositor->frame_has_updated_xsurfaces = FALSE;
++ }
++
+ return TRUE;
+ }
+
+@@ -1140,10 +1160,16 @@ meta_compositor_new (MetaDisplay *display)
+ G_CALLBACK (on_shadow_factory_changed),
+ compositor);
+
+- compositor->repaint_func_id = clutter_threads_add_repaint_func (meta_repaint_func,
+- compositor,
+- NULL);
+-
++ compositor->pre_paint_func_id =
++ clutter_threads_add_repaint_func_full (CLUTTER_REPAINT_FLAGS_PRE_PAINT,
++ meta_pre_paint_func,
++ compositor,
++ NULL);
++ compositor->post_paint_func_id =
++ clutter_threads_add_repaint_func_full (CLUTTER_REPAINT_FLAGS_POST_PAINT,
++ meta_post_paint_func,
++ compositor,
++ NULL);
+ return compositor;
+ }
+
+diff --git a/src/compositor/meta-sync-ring.c b/src/compositor/meta-sync-ring.c
+new file mode 100644
+index 0000000..4ee61f8
+--- /dev/null
++++ b/src/compositor/meta-sync-ring.c
+@@ -0,0 +1,566 @@
++/*
++ * This is based on an original C++ implementation for compiz that
++ * carries the following copyright notice:
++ *
++ *
++ * Copyright © 2011 NVIDIA Corporation
++ *
++ * Permission to use, copy, modify, distribute, and sell this software
++ * and its documentation for any purpose is hereby granted without
++ * fee, provided that the above copyright notice appear in all copies
++ * and that both that copyright notice and this permission notice
++ * appear in supporting documentation, and that the name of NVIDIA
++ * Corporation not be used in advertising or publicity pertaining to
++ * distribution of the software without specific, written prior
++ * permission. NVIDIA Corporation makes no representations about the
++ * suitability of this software for any purpose. It is provided "as
++ * is" without express or implied warranty.
++ *
++ * NVIDIA CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++ * FITNESS, IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ *
++ * Authors: James Jones <jajones@nvidia.com>
++ */
++
++#include <string.h>
++
++#include <GL/gl.h>
++#include <GL/glx.h>
++#include <X11/extensions/sync.h>
++
++#include <cogl/cogl.h>
++#include <clutter/clutter.h>
++
++#include <meta/util.h>
++
++#include "meta-sync-ring.h"
++
++/* Theory of operation:
++ *
++ * We use a ring of NUM_SYNCS fence objects. On each frame we advance
++ * to the next fence in the ring. For each fence we do:
++ *
++ * 1. fence is XSyncTriggerFence()'d and glWaitSync()'d
++ * 2. NUM_SYNCS / 2 frames later, fence should be triggered
++ * 3. fence is XSyncResetFence()'d
++ * 4. NUM_SYNCS / 2 frames later, fence should be reset
++ * 5. go back to 1 and re-use fence
++ *
++ * glClientWaitSync() and XAlarms are used in steps 2 and 4,
++ * respectively, to double-check the expectections.
++ */
++
++#define NUM_SYNCS 10
++#define MAX_SYNC_WAIT_TIME (1 * 1000 * 1000 * 1000) /* one sec */
++#define MAX_REBOOT_ATTEMPTS 2
++
++typedef enum
++{
++ META_SYNC_STATE_READY,
++ META_SYNC_STATE_WAITING,
++ META_SYNC_STATE_DONE,
++ META_SYNC_STATE_RESET_PENDING,
++} MetaSyncState;
++
++typedef struct
++{
++ Display *xdisplay;
++
++ XSyncFence xfence;
++ GLsync glsync;
++
++ XSyncCounter xcounter;
++ XSyncAlarm xalarm;
++ XSyncValue next_counter_value;
++
++ MetaSyncState state;
++} MetaSync;
++
++typedef struct
++{
++ Display *xdisplay;
++ int xsync_event_base;
++ int xsync_error_base;
++
++ GHashTable *alarm_to_sync;
++
++ MetaSync *syncs_array[NUM_SYNCS];
++ guint current_sync_idx;
++ MetaSync *current_sync;
++ guint warmup_syncs;
++
++ guint reboots;
++} MetaSyncRing;
++
++static MetaSyncRing meta_sync_ring = { 0 };
++
++static XSyncValue SYNC_VALUE_ZERO;
++static XSyncValue SYNC_VALUE_ONE;
++
++static const char* (*meta_gl_get_string) (GLenum name);
++static void (*meta_gl_get_integerv) (GLenum pname,
++ GLint *params);
++static const char* (*meta_gl_get_stringi) (GLenum name,
++ GLuint index);
++static void (*meta_gl_delete_sync) (GLsync sync);
++static GLenum (*meta_gl_client_wait_sync) (GLsync sync,
++ GLbitfield flags,
++ GLuint64 timeout);
++static void (*meta_gl_wait_sync) (GLsync sync,
++ GLbitfield flags,
++ GLuint64 timeout);
++static GLsync (*meta_gl_import_sync) (GLenum external_sync_type,
++ GLintptr external_sync,
++ GLbitfield flags);
++
++static MetaSyncRing *
++meta_sync_ring_get (void)
++{
++ if (meta_sync_ring.reboots > MAX_REBOOT_ATTEMPTS)
++ return NULL;
++
++ return &meta_sync_ring;
++}
++
++static gboolean
++load_gl_symbol (const char *name,
++ void **func)
++{
++ *func = cogl_get_proc_address (name);
++ if (!*func)
++ {
++ meta_verbose ("MetaSyncRing: failed to resolve required GL symbol \"%s\"\n", name);
++ return FALSE;
++ }
++ return TRUE;
++}
++
++static gboolean
++check_gl_extensions (void)
++{
++ ClutterBackend *backend;
++ CoglContext *cogl_context;
++ CoglDisplay *cogl_display;
++ CoglRenderer *cogl_renderer;
++
++ backend = clutter_get_default_backend ();
++ cogl_context = clutter_backend_get_cogl_context (backend);
++ cogl_display = cogl_context_get_display (cogl_context);
++ cogl_renderer = cogl_display_get_renderer (cogl_display);
++
++ switch (cogl_renderer_get_driver (cogl_renderer))
++ {
++ case COGL_DRIVER_GL3:
++ {
++ int num_extensions, i;
++ gboolean arb_sync = FALSE;
++ gboolean x11_sync_object = FALSE;
++
++ meta_gl_get_integerv (GL_NUM_EXTENSIONS, &num_extensions);
++
++ for (i = 0; i < num_extensions; ++i)
++ {
++ const char *ext = meta_gl_get_stringi (GL_EXTENSIONS, i);
++
++ if (g_strcmp0 ("GL_ARB_sync", ext) == 0)
++ arb_sync = TRUE;
++ else if (g_strcmp0 ("GL_EXT_x11_sync_object", ext) == 0)
++ x11_sync_object = TRUE;
++ }
++
++ return arb_sync && x11_sync_object;
++ }
++ case COGL_DRIVER_GL:
++ {
++ const char *extensions = meta_gl_get_string (GL_EXTENSIONS);
++ return (extensions != NULL &&
++ strstr (extensions, "GL_ARB_sync") != NULL &&
++ strstr (extensions, "GL_EXT_x11_sync_object") != NULL);
++ }
++ default:
++ break;
++ }
++
++ return FALSE;
++}
++
++static gboolean
++load_required_symbols (void)
++{
++ static gboolean success = FALSE;
++
++ if (success)
++ return TRUE;
++
++ /* We don't link against libGL directly because cogl may want to
++ * use something else. This assumes that cogl has been initialized
++ * and dynamically loaded libGL at this point.
++ */
++
++ if (!load_gl_symbol ("glGetString", (void **) &meta_gl_get_string))
++ goto out;
++ if (!load_gl_symbol ("glGetIntegerv", (void **) &meta_gl_get_integerv))
++ goto out;
++ if (!load_gl_symbol ("glGetStringi", (void **) &meta_gl_get_stringi))
++ goto out;
++
++ if (!check_gl_extensions ())
++ {
++ meta_verbose ("MetaSyncRing: couldn't find required GL extensions\n");
++ goto out;
++ }
++
++ if (!load_gl_symbol ("glDeleteSync", (void **) &meta_gl_delete_sync))
++ goto out;
++ if (!load_gl_symbol ("glClientWaitSync", (void **) &meta_gl_client_wait_sync))
++ goto out;
++ if (!load_gl_symbol ("glWaitSync", (void **) &meta_gl_wait_sync))
++ goto out;
++ if (!load_gl_symbol ("glImportSyncEXT", (void **) &meta_gl_import_sync))
++ goto out;
++
++ success = TRUE;
++ out:
++ return success;
++}
++
++static void
++meta_sync_insert (MetaSync *self)
++{
++ g_return_if_fail (self->state == META_SYNC_STATE_READY);
++
++ XSyncTriggerFence (self->xdisplay, self->xfence);
++ XFlush (self->xdisplay);
++
++ meta_gl_wait_sync (self->glsync, 0, GL_TIMEOUT_IGNORED);
++
++ self->state = META_SYNC_STATE_WAITING;
++}
++
++static GLenum
++meta_sync_check_update_finished (MetaSync *self,
++ GLuint64 timeout)
++{
++ GLenum status = GL_WAIT_FAILED;
++
++ switch (self->state)
++ {
++ case META_SYNC_STATE_DONE:
++ status = GL_ALREADY_SIGNALED;
++ break;
++ case META_SYNC_STATE_WAITING:
++ status = meta_gl_client_wait_sync (self->glsync, 0, timeout);
++ if (status == GL_ALREADY_SIGNALED || status == GL_CONDITION_SATISFIED)
++ self->state = META_SYNC_STATE_DONE;
++ break;
++ default:
++ break;
++ }
++
++ g_warn_if_fail (status != GL_WAIT_FAILED);
++
++ return status;
++}
++
++static void
++meta_sync_reset (MetaSync *self)
++{
++ XSyncAlarmAttributes attrs;
++ int overflow;
++
++ g_return_if_fail (self->state == META_SYNC_STATE_DONE);
++
++ XSyncResetFence (self->xdisplay, self->xfence);
++
++ attrs.trigger.wait_value = self->next_counter_value;
++
++ XSyncChangeAlarm (self->xdisplay, self->xalarm, XSyncCAValue, &attrs);
++ XSyncSetCounter (self->xdisplay, self->xcounter, self->next_counter_value);
++
++ XSyncValueAdd (&self->next_counter_value,
++ self->next_counter_value,
++ SYNC_VALUE_ONE,
++ &overflow);
++
++ self->state = META_SYNC_STATE_RESET_PENDING;
++}
++
++static void
++meta_sync_handle_event (MetaSync *self,
++ XSyncAlarmNotifyEvent *event)
++{
++ g_return_if_fail (event->alarm == self->xalarm);
++ g_return_if_fail (self->state == META_SYNC_STATE_RESET_PENDING);
++
++ self->state = META_SYNC_STATE_READY;
++}
++
++static MetaSync *
++meta_sync_new (Display *xdisplay)
++{
++ MetaSync *self;
++ XSyncAlarmAttributes attrs;
++
++ self = g_malloc0 (sizeof (MetaSync));
++
++ self->xdisplay = xdisplay;
++
++ self->xfence = XSyncCreateFence (xdisplay, DefaultRootWindow (xdisplay), FALSE);
++ self->glsync = meta_gl_import_sync (GL_SYNC_X11_FENCE_EXT, self->xfence, 0);
++
++ self->xcounter = XSyncCreateCounter (xdisplay, SYNC_VALUE_ZERO);
++
++ attrs.trigger.counter = self->xcounter;
++ attrs.trigger.value_type = XSyncAbsolute;
++ attrs.trigger.wait_value = SYNC_VALUE_ONE;
++ attrs.trigger.test_type = XSyncPositiveTransition;
++ attrs.events = TRUE;
++ self->xalarm = XSyncCreateAlarm (xdisplay,
++ XSyncCACounter |
++ XSyncCAValueType |
++ XSyncCAValue |
++ XSyncCATestType |
++ XSyncCAEvents,
++ &attrs);
++
++ XSyncIntToValue (&self->next_counter_value, 1);
++
++ self->state = META_SYNC_STATE_READY;
++
++ return self;
++}
++
++static Bool
++alarm_event_predicate (Display *dpy,
++ XEvent *event,
++ XPointer data)
++{
++ MetaSyncRing *ring = meta_sync_ring_get ();
++
++ if (!ring)
++ return False;
++
++ if (event->type == ring->xsync_event_base + XSyncAlarmNotify)
++ {
++ if (((MetaSync *) data)->xalarm == ((XSyncAlarmNotifyEvent *) event)->alarm)
++ return True;
++ }
++ return False;
++}
++
++static void
++meta_sync_free (MetaSync *self)
++{
++ /* When our assumptions don't hold, something has gone wrong but we
++ * don't know what, so we reboot the ring. While doing that, we
++ * trigger fences before deleting them to try to get ourselves out
++ * of a potentially stuck GPU state.
++ */
++ switch (self->state)
++ {
++ case META_SYNC_STATE_WAITING:
++ case META_SYNC_STATE_DONE:
++ /* nothing to do */
++ break;
++ case META_SYNC_STATE_RESET_PENDING:
++ {
++ XEvent event;
++ XIfEvent (self->xdisplay, &event, alarm_event_predicate, (XPointer) self);
++ meta_sync_handle_event (self, (XSyncAlarmNotifyEvent *) &event);
++ }
++ /* fall through */
++ case META_SYNC_STATE_READY:
++ XSyncTriggerFence (self->xdisplay, self->xfence);
++ XFlush (self->xdisplay);
++ break;
++ default:
++ break;
++ }
++
++ meta_gl_delete_sync (self->glsync);
++ XSyncDestroyFence (self->xdisplay, self->xfence);
++ XSyncDestroyCounter (self->xdisplay, self->xcounter);
++ XSyncDestroyAlarm (self->xdisplay, self->xalarm);
++
++ g_free (self);
++}
++
++gboolean
++meta_sync_ring_init (Display *xdisplay)
++{
++ gint major, minor;
++ guint i;
++ MetaSyncRing *ring = meta_sync_ring_get ();
++
++ if (!ring)
++ return FALSE;
++
++ g_return_val_if_fail (xdisplay != NULL, FALSE);
++ g_return_val_if_fail (ring->xdisplay == NULL, FALSE);
++
++ if (!load_required_symbols ())
++ return FALSE;
++
++ if (!XSyncQueryExtension (xdisplay, &ring->xsync_event_base, &ring->xsync_error_base) ||
++ !XSyncInitialize (xdisplay, &major, &minor))
++ return FALSE;
++
++ XSyncIntToValue (&SYNC_VALUE_ZERO, 0);
++ XSyncIntToValue (&SYNC_VALUE_ONE, 1);
++
++ ring->xdisplay = xdisplay;
++
++ ring->alarm_to_sync = g_hash_table_new (NULL, NULL);
++
++ for (i = 0; i < NUM_SYNCS; ++i)
++ {
++ MetaSync *sync = meta_sync_new (ring->xdisplay);
++ ring->syncs_array[i] = sync;
++ g_hash_table_replace (ring->alarm_to_sync, (gpointer) sync->xalarm, sync);
++ }
++
++ ring->current_sync_idx = 0;
++ ring->current_sync = ring->syncs_array[0];
++ ring->warmup_syncs = 0;
++
++ return TRUE;
++}
++
++void
++meta_sync_ring_destroy (void)
++{
++ guint i;
++ MetaSyncRing *ring = meta_sync_ring_get ();
++
++ if (!ring)
++ return;
++
++ g_return_if_fail (ring->xdisplay != NULL);
++
++ ring->current_sync_idx = 0;
++ ring->current_sync = NULL;
++ ring->warmup_syncs = 0;
++
++ for (i = 0; i < NUM_SYNCS; ++i)
++ meta_sync_free (ring->syncs_array[i]);
++
++ g_hash_table_destroy (ring->alarm_to_sync);
++
++ ring->xsync_event_base = 0;
++ ring->xsync_error_base = 0;
++ ring->xdisplay = NULL;
++}
++
++static gboolean
++meta_sync_ring_reboot (Display *xdisplay)
++{
++ MetaSyncRing *ring = meta_sync_ring_get ();
++
++ if (!ring)
++ return FALSE;
++
++ meta_sync_ring_destroy ();
++
++ ring->reboots += 1;
++
++ if (!meta_sync_ring_get ())
++ {
++ meta_warning ("MetaSyncRing: Too many reboots -- disabling\n");
++ return FALSE;
++ }
++
++ return meta_sync_ring_init (xdisplay);
++}
++
++gboolean
++meta_sync_ring_after_frame (void)
++{
++ MetaSyncRing *ring = meta_sync_ring_get ();
++
++ if (!ring)
++ return FALSE;
++
++ g_return_if_fail (ring->xdisplay != NULL);
++
++ if (ring->warmup_syncs >= NUM_SYNCS / 2)
++ {
++ guint reset_sync_idx = (ring->current_sync_idx + NUM_SYNCS - (NUM_SYNCS / 2)) % NUM_SYNCS;
++ MetaSync *sync_to_reset = ring->syncs_array[reset_sync_idx];
++
++ GLenum status = meta_sync_check_update_finished (sync_to_reset, 0);
++ if (status == GL_TIMEOUT_EXPIRED)
++ {
++ meta_warning ("MetaSyncRing: We should never wait for a sync -- add more syncs?\n");
++ status = meta_sync_check_update_finished (sync_to_reset, MAX_SYNC_WAIT_TIME);
++ }
++
++ if (status != GL_ALREADY_SIGNALED && status != GL_CONDITION_SATISFIED)
++ {
++ meta_warning ("MetaSyncRing: Timed out waiting for sync object.\n");
++ return meta_sync_ring_reboot (ring->xdisplay);
++ }
++
++ meta_sync_reset (sync_to_reset);
++ }
++ else
++ {
++ ring->warmup_syncs += 1;
++ }
++
++ ring->current_sync_idx += 1;
++ ring->current_sync_idx %= NUM_SYNCS;
++
++ ring->current_sync = ring->syncs_array[ring->current_sync_idx];
++
++ return TRUE;
++}
++
++gboolean
++meta_sync_ring_insert_wait (void)
++{
++ MetaSyncRing *ring = meta_sync_ring_get ();
++
++ if (!ring)
++ return FALSE;
++
++ g_return_if_fail (ring->xdisplay != NULL);
++
++ if (ring->current_sync->state != META_SYNC_STATE_READY)
++ {
++ meta_warning ("MetaSyncRing: Sync object is not ready -- were events handled properly?\n");
++ if (!meta_sync_ring_reboot (ring->xdisplay))
++ return FALSE;
++ }
++
++ meta_sync_insert (ring->current_sync);
++
++ return TRUE;
++}
++
++void
++meta_sync_ring_handle_event (XEvent *xevent)
++{
++ XSyncAlarmNotifyEvent *event;
++ MetaSync *sync;
++ MetaSyncRing *ring = meta_sync_ring_get ();
++
++ if (!ring)
++ return;
++
++ g_return_if_fail (ring->xdisplay != NULL);
++
++ if (xevent->type != (ring->xsync_event_base + XSyncAlarmNotify))
++ return;
++
++ event = (XSyncAlarmNotifyEvent *) xevent;
++
++ sync = g_hash_table_lookup (ring->alarm_to_sync, (gpointer) event->alarm);
++ if (sync)
++ meta_sync_handle_event (sync, event);
++}
+diff --git a/src/compositor/meta-sync-ring.h b/src/compositor/meta-sync-ring.h
+new file mode 100644
+index 0000000..6dca8ef
+--- /dev/null
++++ b/src/compositor/meta-sync-ring.h
+@@ -0,0 +1,14 @@
++#ifndef _META_SYNC_RING_H_
++#define _META_SYNC_RING_H_
++
++#include <glib.h>
++
++#include <X11/Xlib.h>
++
++gboolean meta_sync_ring_init (Display *dpy);
++void meta_sync_ring_destroy (void);
++gboolean meta_sync_ring_after_frame (void);
++gboolean meta_sync_ring_insert_wait (void);
++void meta_sync_ring_handle_event (XEvent *event);
++
++#endif /* _META_SYNC_RING_H_ */
+--
+cgit v0.10.2
+
diff --git a/x11-wm/mutter/files/mutter-3.16.3-crash-border.patch b/x11-wm/mutter/files/mutter-3.16.3-crash-border.patch
new file mode 100644
index 0000000..9cbd0d0
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-3.16.3-crash-border.patch
@@ -0,0 +1,32 @@
+From f60c33b5afc4b1dff0b31f17d7ae222db8aa789f Mon Sep 17 00:00:00 2001
+From: Marek Chalupa <mchqwerty@gmail.com>
+Date: Fri, 3 Jul 2015 11:28:00 +0200
+Subject: frames: handle META_FRAME_CONTROL_NONE on left click
+
+We can get this operation in some cases, for example when
+we're trying to resize window that cannot be resized.
+This can occur with maximized windows that have a border
+(without border we couldn't resize them by mouse in maximized state).
+In this case we reached abort() beacuse we did not handle this op.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=751884
+
+diff --git a/src/ui/frames.c b/src/ui/frames.c
+index 362d7b6..a2f7f45 100644
+--- a/src/ui/frames.c
++++ b/src/ui/frames.c
+@@ -1053,6 +1053,11 @@ meta_frame_left_click_event (MetaUIFrame *frame,
+ }
+
+ return TRUE;
++ case META_FRAME_CONTROL_NONE:
++ /* We can get this for example when trying to resize window
++ * that cannot be resized (e. g. it is maximized and the theme
++ * currently used has borders for maximized windows), see #751884 */
++ return FALSE;
+ default:
+ g_assert_not_reached ();
+ }
+--
+cgit v0.10.2
+
diff --git a/x11-wm/mutter/files/mutter-3.16.3-fallback-keymap.patch b/x11-wm/mutter/files/mutter-3.16.3-fallback-keymap.patch
new file mode 100644
index 0000000..f77234b
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-3.16.3-fallback-keymap.patch
@@ -0,0 +1,28 @@
+From 9abc0712836c9e56ed08796645874cc0d10b1826 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos@gmail.com>
+Date: Mon, 21 Sep 2015 17:25:40 +0200
+Subject: backend-x11: Fallback to a default keymap if getting it from X fails
+
+This shouldn't fail but apparently sometimes it does and in that case
+having a possibly wrong idea of the keymap is still better than
+crashing.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=754979
+
+diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
+index 7ad28fd..dbcd13f 100644
+--- a/src/backends/x11/meta-backend-x11.c
++++ b/src/backends/x11/meta-backend-x11.c
+@@ -760,6 +760,9 @@ meta_backend_x11_get_keymap (MetaBackend *backend)
+ priv->xcb,
+ xkb_x11_get_core_keyboard_device_id (priv->xcb),
+ XKB_KEYMAP_COMPILE_NO_FLAGS);
++ if (priv->keymap == NULL)
++ priv->keymap = xkb_keymap_new_from_names (context, NULL, XKB_KEYMAP_COMPILE_NO_FLAGS);
++
+ xkb_context_unref (context);
+ }
+
+--
+cgit v0.10.2
+
diff --git a/x11-wm/mutter/files/mutter-3.16.3-fix-race.patch b/x11-wm/mutter/files/mutter-3.16.3-fix-race.patch
new file mode 100644
index 0000000..a0b493b
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-3.16.3-fix-race.patch
@@ -0,0 +1,114 @@
+From c77e482b60bea40a422691b16af02a429d9c2edc Mon Sep 17 00:00:00 2001
+From: Aaron Plattner <aplattner@nvidia.com>
+Date: Mon, 3 Aug 2015 21:15:15 -0700
+Subject: compositor: Fix GL_EXT_x11_sync_object race condition
+
+The compositor maintains a ring of shared fences with the X server in order to
+properly synchronize rendering between the X server and the compositor's GPU
+channel. When all of the fences have been used, the compositor needs to reset
+one so that it can be reused. It does this by first waiting on the CPU for the
+fence to become triggered, and then sending a request to the X server to reset
+the fence.
+
+If the compositor's GPU channel is busy processing other work (e.g. the desktop
+switcher animation), then the X server may process the reset request before the
+GPU has consumed the fence. This causes the GPU channel to hang.
+
+Fix the problem by having the compositor's GPU channel trigger its own fence
+after waiting for the X server's fence. Wait for that fence on the CPU before
+sending the reset request to the X server. This ensures that the GPU has
+consumed the X11 fence before the server resets it.
+
+Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=728464
+
+diff --git a/src/compositor/meta-sync-ring.c b/src/compositor/meta-sync-ring.c
+index 4ee61f8..44b1c41 100644
+--- a/src/compositor/meta-sync-ring.c
++++ b/src/compositor/meta-sync-ring.c
+@@ -73,7 +73,8 @@ typedef struct
+ Display *xdisplay;
+
+ XSyncFence xfence;
+- GLsync glsync;
++ GLsync gl_x11_sync;
++ GLsync gpu_fence;
+
+ XSyncCounter xcounter;
+ XSyncAlarm xalarm;
+@@ -118,6 +119,8 @@ static void (*meta_gl_wait_sync) (GLsync sync,
+ static GLsync (*meta_gl_import_sync) (GLenum external_sync_type,
+ GLintptr external_sync,
+ GLbitfield flags);
++static GLsync (*meta_gl_fence_sync) (GLenum condition,
++ GLbitfield flags);
+
+ static MetaSyncRing *
+ meta_sync_ring_get (void)
+@@ -224,6 +227,8 @@ load_required_symbols (void)
+ goto out;
+ if (!load_gl_symbol ("glImportSyncEXT", (void **) &meta_gl_import_sync))
+ goto out;
++ if (!load_gl_symbol ("glFenceSync", (void **) &meta_gl_fence_sync))
++ goto out;
+
+ success = TRUE;
+ out:
+@@ -238,7 +243,8 @@ meta_sync_insert (MetaSync *self)
+ XSyncTriggerFence (self->xdisplay, self->xfence);
+ XFlush (self->xdisplay);
+
+- meta_gl_wait_sync (self->glsync, 0, GL_TIMEOUT_IGNORED);
++ meta_gl_wait_sync (self->gl_x11_sync, 0, GL_TIMEOUT_IGNORED);
++ self->gpu_fence = meta_gl_fence_sync (GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+
+ self->state = META_SYNC_STATE_WAITING;
+ }
+@@ -255,9 +261,13 @@ meta_sync_check_update_finished (MetaSync *self,
+ status = GL_ALREADY_SIGNALED;
+ break;
+ case META_SYNC_STATE_WAITING:
+- status = meta_gl_client_wait_sync (self->glsync, 0, timeout);
++ status = meta_gl_client_wait_sync (self->gpu_fence, 0, timeout);
+ if (status == GL_ALREADY_SIGNALED || status == GL_CONDITION_SATISFIED)
+- self->state = META_SYNC_STATE_DONE;
++ {
++ self->state = META_SYNC_STATE_DONE;
++ meta_gl_delete_sync (self->gpu_fence);
++ self->gpu_fence = 0;
++ }
+ break;
+ default:
+ break;
+@@ -312,7 +322,8 @@ meta_sync_new (Display *xdisplay)
+ self->xdisplay = xdisplay;
+
+ self->xfence = XSyncCreateFence (xdisplay, DefaultRootWindow (xdisplay), FALSE);
+- self->glsync = meta_gl_import_sync (GL_SYNC_X11_FENCE_EXT, self->xfence, 0);
++ self->gl_x11_sync = meta_gl_import_sync (GL_SYNC_X11_FENCE_EXT, self->xfence, 0);
++ self->gpu_fence = 0;
+
+ self->xcounter = XSyncCreateCounter (xdisplay, SYNC_VALUE_ZERO);
+
+@@ -365,6 +376,8 @@ meta_sync_free (MetaSync *self)
+ switch (self->state)
+ {
+ case META_SYNC_STATE_WAITING:
++ meta_gl_delete_sync (self->gpu_fence);
++ break;
+ case META_SYNC_STATE_DONE:
+ /* nothing to do */
+ break;
+@@ -383,7 +396,7 @@ meta_sync_free (MetaSync *self)
+ break;
+ }
+
+- meta_gl_delete_sync (self->glsync);
++ meta_gl_delete_sync (self->gl_x11_sync);
+ XSyncDestroyFence (self->xdisplay, self->xfence);
+ XSyncDestroyCounter (self->xdisplay, self->xcounter);
+ XSyncDestroyAlarm (self->xdisplay, self->xalarm);
+--
+cgit v0.10.2
+
diff --git a/x11-wm/mutter/files/mutter-3.16.3-fix-return.patch b/x11-wm/mutter/files/mutter-3.16.3-fix-return.patch
new file mode 100644
index 0000000..2898d52
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-3.16.3-fix-return.patch
@@ -0,0 +1,32 @@
+From a54b1261d3ec5ccf7a8262c88557b6b952bc8a2e Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan <lantw@src.gnome.org>
+Date: Sat, 8 Aug 2015 20:12:09 +0800
+Subject: build: Fix return value in meta-sync-ring.c
+
+https://bugzilla.gnome.org/show_bug.cgi?id=753380
+
+diff --git a/src/compositor/meta-sync-ring.c b/src/compositor/meta-sync-ring.c
+index 44b1c41..217ebe5 100644
+--- a/src/compositor/meta-sync-ring.c
++++ b/src/compositor/meta-sync-ring.c
+@@ -499,7 +499,7 @@ meta_sync_ring_after_frame (void)
+ if (!ring)
+ return FALSE;
+
+- g_return_if_fail (ring->xdisplay != NULL);
++ g_return_val_if_fail (ring->xdisplay != NULL, FALSE);
+
+ if (ring->warmup_syncs >= NUM_SYNCS / 2)
+ {
+@@ -542,7 +542,7 @@ meta_sync_ring_insert_wait (void)
+ if (!ring)
+ return FALSE;
+
+- g_return_if_fail (ring->xdisplay != NULL);
++ g_return_val_if_fail (ring->xdisplay != NULL, FALSE);
+
+ if (ring->current_sync->state != META_SYNC_STATE_READY)
+ {
+--
+cgit v0.10.2
+
diff --git a/x11-wm/mutter/files/mutter-3.16.3-flickering.patch b/x11-wm/mutter/files/mutter-3.16.3-flickering.patch
new file mode 100644
index 0000000..6267a4e
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-3.16.3-flickering.patch
@@ -0,0 +1,114 @@
+From 916070cc7218cc80f4565ea265b0dd6e5e93cb98 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos@gmail.com>
+Date: Wed, 12 Aug 2015 15:26:34 +0200
+Subject: compositor: Handle fences in the frontend X connection
+
+Since mutter has two X connections and does damage handling on the
+frontend while fence triggering is done on the backend, we have a race
+between XDamageSubtract() and XSyncFenceTrigger() causing missed
+redraws in the GL_EXT_X11_sync_object path.
+
+If the fence trigger gets processed first by the server, any client
+drawing that happens between that and the damage subtract being
+processed and is completely contained in the last damage event box
+that mutter got, won't be included in the current frame nor will it
+cause a new damage event.
+
+A simple fix for this would be XSync()ing on the frontend connection
+after doing all the damage subtracts but that would add a round trip
+on every frame again which defeats the asynchronous design of X
+fences.
+
+Instead, if we move fence handling to the frontend we automatically
+get the right ordering between damage subtracts and fence triggers.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=728464
+
+diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
+index ac38ffc..3ff8431 100644
+--- a/src/backends/x11/meta-backend-x11.c
++++ b/src/backends/x11/meta-backend-x11.c
+@@ -45,7 +45,6 @@
+ #include <meta/util.h>
+ #include "display-private.h"
+ #include "compositor/compositor-private.h"
+-#include "compositor/meta-sync-ring.h"
+
+ struct _MetaBackendX11Private
+ {
+@@ -256,8 +255,6 @@ handle_host_xevent (MetaBackend *backend,
+ MetaCompositor *compositor = display->compositor;
+ if (meta_plugin_manager_xevent_filter (compositor->plugin_mgr, event))
+ bypass_clutter = TRUE;
+- if (compositor->have_x11_sync_object)
+- meta_sync_ring_handle_event (event);
+ }
+ }
+
+diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
+index 554faa1..2e182c2 100644
+--- a/src/compositor/compositor.c
++++ b/src/compositor/compositor.c
+@@ -534,8 +534,7 @@ meta_compositor_manage (MetaCompositor *compositor)
+ */
+ XMapWindow (xdisplay, compositor->output);
+
+- compositor->have_x11_sync_object =
+- meta_sync_ring_init (meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend)));
++ compositor->have_x11_sync_object = meta_sync_ring_init (xdisplay);
+ }
+
+ redirect_windows (display->screen);
+@@ -737,6 +736,9 @@ meta_compositor_process_event (MetaCompositor *compositor,
+ process_damage (compositor, (XDamageNotifyEvent *) event, window);
+ }
+
++ if (compositor->have_x11_sync_object)
++ meta_sync_ring_handle_event (event);
++
+ /* Clutter needs to know about MapNotify events otherwise it will
+ think the stage is invisible */
+ if (!meta_is_wayland_compositor () && event->type == MapNotify)
+diff --git a/src/compositor/meta-sync-ring.c b/src/compositor/meta-sync-ring.c
+index 217ebe5..336ccd4 100644
+--- a/src/compositor/meta-sync-ring.c
++++ b/src/compositor/meta-sync-ring.c
+@@ -322,7 +322,7 @@ meta_sync_new (Display *xdisplay)
+ self->xdisplay = xdisplay;
+
+ self->xfence = XSyncCreateFence (xdisplay, DefaultRootWindow (xdisplay), FALSE);
+- self->gl_x11_sync = meta_gl_import_sync (GL_SYNC_X11_FENCE_EXT, self->xfence, 0);
++ self->gl_x11_sync = 0;
+ self->gpu_fence = 0;
+
+ self->xcounter = XSyncCreateCounter (xdisplay, SYNC_VALUE_ZERO);
+@@ -347,6 +347,13 @@ meta_sync_new (Display *xdisplay)
+ return self;
+ }
+
++static void
++meta_sync_import (MetaSync *self)
++{
++ g_return_if_fail (self->gl_x11_sync == 0);
++ self->gl_x11_sync = meta_gl_import_sync (GL_SYNC_X11_FENCE_EXT, self->xfence, 0);
++}
++
+ static Bool
+ alarm_event_predicate (Display *dpy,
+ XEvent *event,
+@@ -437,6 +444,12 @@ meta_sync_ring_init (Display *xdisplay)
+ ring->syncs_array[i] = sync;
+ g_hash_table_replace (ring->alarm_to_sync, (gpointer) sync->xalarm, sync);
+ }
++ /* Since the connection we create the X fences on isn't the same as
++ * the one used for the GLX context, we need to XSync() here to
++ * ensure glImportSync() succeeds. */
++ XSync (xdisplay, False);
++ for (i = 0; i < NUM_SYNCS; ++i)
++ meta_sync_import (ring->syncs_array[i]);
+
+ ring->current_sync_idx = 0;
+ ring->current_sync = ring->syncs_array[0];
+--
+cgit v0.10.2
+
diff --git a/x11-wm/mutter/mutter-3.16.2-r1.ebuild b/x11-wm/mutter/mutter-3.16.2-r1.ebuild
deleted file mode 100644
index 19d40dc..0000000
--- a/x11-wm/mutter/mutter-3.16.2-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://git.gnome.org/browse/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +kms test wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# libXi-1.7.4 or newer needed per:
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944
-COMMON_DEPEND="
- >=x11-libs/pango-1.2[X,introspection?]
- >=x11-libs/cairo-1.10[X]
- >=x11-libs/gtk+-3.9.11:3[X,introspection?]
- >=dev-libs/glib-2.36.0:2[dbus]
- >=media-libs/clutter-1.21.3:1.0[introspection?]
- >=media-libs/cogl-1.17.1:1.0=[introspection?]
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/startup-notification-0.7
- >=x11-libs/libXcomposite-0.2
- >=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?]
- gnome-base/gnome-desktop:3=
- >sys-power/upower-0.99:=
-
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libXcomposite-0.2
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/libXi-1.7.4
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libxcb
- x11-libs/libxkbfile
- >=x11-libs/libxkbcommon-0.4.3[X]
- x11-misc/xkeyboard-config
-
- gnome-extra/zenity
-
- introspection? ( >=dev-libs/gobject-introspection-1.42:= )
- kms? (
- dev-libs/libinput
- >=media-libs/clutter-1.20[egl]
- media-libs/cogl:1.0=[kms]
- >=media-libs/mesa-10.3[gbm]
- sys-apps/systemd
- virtual/libgudev
- x11-libs/libdrm:= )
- wayland? (
- >=dev-libs/wayland-1.6.90
- >=media-libs/clutter-1.20[wayland]
- x11-base/xorg-server[wayland] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-doc-am-1.15
- >=dev-util/intltool-0.41
- sys-devel/gettext
- virtual/pkgconfig
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
- !x11-misc/expocity
-"
-
-src_prepare() {
- # surface-actor-x11: Make sure to set a size when unredirected (from 3.16 branch)
- epatch "${FILESDIR}"/${P}-size-unredirected.patch
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-sm \
- --enable-startup-notification \
- --enable-verbose-mode \
- --with-libcanberra \
- $(use_enable introspection) \
- $(use_enable kms native-backend) \
- $(use_enable wayland)
-}
diff --git a/x11-wm/mutter/mutter-3.16.2.ebuild b/x11-wm/mutter/mutter-3.16.2.ebuild
deleted file mode 100644
index c464ffd..0000000
--- a/x11-wm/mutter/mutter-3.16.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://git.gnome.org/browse/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +kms test wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# libXi-1.7.4 or newer needed per:
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944
-COMMON_DEPEND="
- >=x11-libs/pango-1.2[X,introspection?]
- >=x11-libs/cairo-1.10[X]
- >=x11-libs/gtk+-3.9.11:3[X,introspection?]
- >=dev-libs/glib-2.36.0:2[dbus]
- >=media-libs/clutter-1.21.3:1.0[introspection?]
- >=media-libs/cogl-1.17.1:1.0=[introspection?]
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/startup-notification-0.7
- >=x11-libs/libXcomposite-0.2
- >=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?]
- gnome-base/gnome-desktop:3=
- >sys-power/upower-0.99:=
-
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libXcomposite-0.2
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/libXi-1.7.4
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libxcb
- x11-libs/libxkbfile
- >=x11-libs/libxkbcommon-0.4.3[X]
- x11-misc/xkeyboard-config
-
- gnome-extra/zenity
-
- introspection? ( >=dev-libs/gobject-introspection-1.42:= )
- kms? (
- dev-libs/libinput
- >=media-libs/clutter-1.20[egl]
- media-libs/cogl:1.0=[kms]
- >=media-libs/mesa-10.3[gbm]
- sys-apps/systemd
- virtual/libgudev
- x11-libs/libdrm:= )
- wayland? (
- >=dev-libs/wayland-1.6.90
- >=media-libs/clutter-1.20[wayland]
- x11-base/xorg-server[wayland] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-doc-am-1.15
- >=dev-util/intltool-0.41
- sys-devel/gettext
- virtual/pkgconfig
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
- !x11-misc/expocity
-"
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-sm \
- --enable-startup-notification \
- --enable-verbose-mode \
- --with-libcanberra \
- $(use_enable introspection) \
- $(use_enable kms native-backend) \
- $(use_enable wayland)
-}
diff --git a/x11-wm/mutter/mutter-3.16.3-r1.ebuild b/x11-wm/mutter/mutter-3.16.3-r1.ebuild
new file mode 100644
index 0000000..76f8ab6
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.16.3-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://git.gnome.org/browse/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection +kms test wayland"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# libXi-1.7.4 or newer needed per:
+# https://bugzilla.gnome.org/show_bug.cgi?id=738944
+COMMON_DEPEND="
+ >=x11-libs/pango-1.2[X,introspection?]
+ >=x11-libs/cairo-1.10[X]
+ >=x11-libs/gtk+-3.9.11:3[X,introspection?]
+ >=dev-libs/glib-2.36.0:2[dbus]
+ >=media-libs/clutter-1.21.3:1.0[introspection?]
+ >=media-libs/cogl-1.17.1:1.0=[introspection?]
+ >=media-libs/libcanberra-0.26[gtk3]
+ >=x11-libs/startup-notification-0.7
+ >=x11-libs/libXcomposite-0.2
+ >=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?]
+ gnome-base/gnome-desktop:3=
+ >sys-power/upower-0.99:=
+
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=x11-libs/libXcomposite-0.2
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ >=x11-libs/libXi-1.7.4
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libxcb
+ x11-libs/libxkbfile
+ >=x11-libs/libxkbcommon-0.4.3[X]
+ x11-misc/xkeyboard-config
+
+ gnome-extra/zenity
+
+ introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+ kms? (
+ dev-libs/libinput
+ >=media-libs/clutter-1.20[egl]
+ media-libs/cogl:1.0=[kms]
+ >=media-libs/mesa-10.3[gbm]
+ sys-apps/systemd
+ virtual/libgudev
+ x11-libs/libdrm:= )
+ wayland? (
+ >=dev-libs/wayland-1.6.90
+ >=media-libs/clutter-1.20[wayland]
+ x11-base/xorg-server[wayland] )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-doc-am-1.15
+ >=dev-util/intltool-0.41
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ test? ( app-text/docbook-xml-dtd:4.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !x11-misc/expocity
+"
+
+src_prepare() {
+ # Fallback to a default keymap if getting it from X fails (from 'master')
+ epatch "${FILESDIR}"/${PN}-3.16.3-fallback-keymap.patch
+
+ # frames: handle META_FRAME_CONTROL_NONE on left click (from '3.16')
+ epatch "${FILESDIR}"/${P}-crash-border.patch
+
+ # compositor: Add support for GL_EXT_x11_sync_object (from '3.16')
+ epatch "${FILESDIR}"/${P}-GL_EXT_x11_sync_object.patch
+
+ # compositor: Fix GL_EXT_x11_sync_object race condition (from '3.16')
+ epatch "${FILESDIR}"/${P}-fix-race.patch
+
+ # build: Fix return value in meta-sync-ring.c (from '3.16')
+ epatch "${FILESDIR}"/${P}-fix-return.patch
+
+ # compositor: Handle fences in the frontend X connection (from '3.16')
+ epatch "${FILESDIR}"/${P}-flickering.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ --enable-sm \
+ --enable-startup-notification \
+ --enable-verbose-mode \
+ --with-libcanberra \
+ $(use_enable introspection) \
+ $(use_enable kms native-backend) \
+ $(use_enable wayland)
+}
diff --git a/x11-wm/page/page-1.9.6-r1.ebuild b/x11-wm/page/page-1.9.6-r1.ebuild
new file mode 100644
index 0000000..a2341d8
--- /dev/null
+++ b/x11-wm/page/page-1.9.6-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="A mouse friendly tiling window manager"
+HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
+SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-proto/xcb-proto
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ x11-libs/libXfixes
+ x11-libs/libXdamage
+ x11-proto/damageproto
+ x11-proto/randrproto
+ x11-libs/libXrandr
+ x11-proto/xproto
+ x11-proto/fixesproto
+ x11-proto/compositeproto
+ x11-libs/libXcomposite
+ x11-proto/renderproto
+ x11-libs/libXrender
+ x11-libs/libXext
+ x11-proto/xextproto
+ x11-libs/cairo[xcb]
+ x11-libs/pango
+ dev-libs/glib"
+
+RDEPEND="!dev-tcltk/tcllib"
diff --git a/x11-wm/page/page-1.9.6-r2.ebuild b/x11-wm/page/page-1.9.6-r2.ebuild
new file mode 100644
index 0000000..ca5672c
--- /dev/null
+++ b/x11-wm/page/page-1.9.6-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="A mouse friendly tiling window manager"
+HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
+SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-proto/xcb-proto
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ x11-libs/libXfixes
+ x11-libs/libXdamage
+ x11-proto/damageproto
+ x11-proto/randrproto
+ x11-libs/libXrandr
+ x11-proto/xproto
+ x11-proto/fixesproto
+ x11-proto/compositeproto
+ x11-libs/libXcomposite
+ x11-proto/renderproto
+ x11-libs/libXrender
+ x11-libs/libXext
+ x11-proto/xextproto
+ x11-libs/cairo[xcb]
+ x11-libs/pango
+ dev-libs/glib"
+
+RDEPEND="${DEPEND}
+ !dev-tcltk/tcllib"
diff --git a/x11-wm/page/page-1.9.6.ebuild b/x11-wm/page/page-1.9.6.ebuild
deleted file mode 100644
index a327826..0000000
--- a/x11-wm/page/page-1.9.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
-SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="x11-proto/xcb-proto
- x11-libs/libxcb
- x11-libs/xcb-util
- x11-libs/libXfixes
- x11-libs/libXdamage
- x11-proto/damageproto
- x11-proto/randrproto
- x11-libs/libXrandr
- x11-proto/xproto
- x11-proto/fixesproto
- x11-proto/compositeproto
- x11-libs/libXcomposite
- x11-proto/renderproto
- x11-libs/libXrender
- x11-libs/libXext
- x11-proto/xextproto
- x11-libs/cairo
- x11-libs/pango
- dev-libs/glib"
diff --git a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
index c35177b..365a078 100644
--- a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
+++ b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
@@ -48,7 +48,7 @@
# http://git.xfce.org/thunar-plugins/thunar-vcs-plugin/commit/?id=e87584f7b87627a322f6e41025e5e52d65ebb4d8
local lang
for lang in el eu ru ug uk; do
- mv "${WORKDIR}"/${P}-${lang}.po po/${lang}.po || die
+ mv "${WORKDIR}"/${P}-${lang}.po po/${lang}.po || die
done
xfconf_src_prepare
}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 44f5563..b122762 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1 +1,2 @@
DIST xfce4-whiskermenu-plugin-1.5.0-src.tar.bz2 145549 SHA256 da82bdbc899a9935b560323aac9037d44f37fb110509b80ec293196722671851 SHA512 2cfbade2926fc7ff936ae2d5be2ef1d6a49e9ffc79fc9d9b78ba75070b70e7978ce4ae20df08b7d1089f016741231be029f92cd4b53cbaf7dfec08c97ad60028 WHIRLPOOL fc6e9a32e6fc6e0a8127b214899c743712503fff0a117e993b3c8049004b75519690948e4bf664a6200ae54e29c1cd70ab919dfd5953acee02e11aa77537768d
+DIST xfce4-whiskermenu-plugin-1.5.1-src.tar.bz2 148050 SHA256 1c7650562322867513370ab575536b67aa3712329bb60a0c91a0a70e23a8945a SHA512 ae1ea2395d574fc942dc83303e768be776968b5f6cd69310450c2c4f291c9639e430c8a65282da8587be930baa503905eaf69bbab5b86c552d4de7689dd2ae79 WHIRLPOOL eafefc8da4fa38f2e82a6ec44d5448152633a19850a26e92a5ebd601564485988fd696358bb55709bc78c828a06269af9aa3cd66a74d40d8efeeb825fc3d95fb
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.5.1.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.5.1.ebuild
new file mode 100644
index 0000000..376f10a
--- /dev/null
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.5.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit gnome2-utils cmake-utils
+
+DESCRIPTION="Alternate application launcher for Xfce"
+HOMEPAGE="http://gottcode.org/xfce4-whiskermenu-plugin/"
+SRC_URI="http://gottcode.org/xfce4-whiskermenu-plugin/${P}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+ x11-libs/gtk+:2=
+ xfce-base/exo:=
+ xfce-base/garcon:=
+ xfce-base/libxfce4ui:=
+ xfce-base/libxfce4util:=
+ xfce-base/xfce4-panel:=
+ virtual/libintl:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+src_prepare() {
+ local i
+ cd po || die
+ if [[ -n "${LINGUAS+x}" ]] ; then
+ for i in *.po ; do
+ einfo "removing ${i%.po} linguas"
+ has ${i%.po} ${LINGUAS} || { rm ${i} || die ; }
+ done
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_AS_NEEDED=OFF
+ -DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
+ -DENABLE_DEVELOPER_MODE=OFF
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ dodoc ChangeLog NEWS README
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
