Merge remote-tracking branch 'github/pr/478'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 15 Dec 2015 22:11:57 +0000 (22:11 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 15 Dec 2015 22:13:42 +0000 (22:13 +0000)
205 files changed:
app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
app-admin/glance/glance-2015.2.9999.ebuild
app-arch/dump/dump-0.4.44-r2.ebuild [new file with mode: 0644]
app-arch/libpar2/libpar2-0.4.ebuild
app-arch/xar/xar-1.5.2-r2.ebuild [new file with mode: 0644]
app-crypt/pinentry/Manifest
app-crypt/pinentry/pinentry-0.9.6-r4.ebuild [deleted file]
app-crypt/pinentry/pinentry-0.9.7.ebuild [moved from app-crypt/pinentry/pinentry-0.9.6-r5.ebuild with 95% similarity]
app-editors/focuswriter/Manifest
app-editors/focuswriter/focuswriter-1.5.5.ebuild [new file with mode: 0644]
app-editors/qxmledit/Manifest
app-editors/qxmledit/qxmledit-0.8.5.ebuild [deleted file]
app-editors/tea/Manifest
app-editors/tea/tea-41.1.0.ebuild [moved from app-editors/tea/tea-36.0.2.ebuild with 68% similarity]
dev-cpp/gstreamermm/Manifest
dev-cpp/gstreamermm/gstreamermm-0.10.11.ebuild
dev-cpp/gstreamermm/gstreamermm-1.0.10.ebuild [deleted file]
dev-cpp/gstreamermm/gstreamermm-1.4.3.ebuild
dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild
dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
dev-db/mariadb/mariadb-10.1.9-r1.ebuild
dev-db/mysql/mysql-5.6.28.ebuild
dev-db/percona-server/percona-server-5.6.27.75.0-r1.ebuild
dev-db/postgis/Manifest
dev-db/postgis/files/postgis-2.2.0-arflags.patch [new file with mode: 0644]
dev-db/postgis/postgis-2.1.0.ebuild [deleted file]
dev-db/postgis/postgis-2.1.4.ebuild [deleted file]
dev-db/postgis/postgis-2.1.5.ebuild [deleted file]
dev-db/postgis/postgis-2.1.6.ebuild [deleted file]
dev-db/postgis/postgis-2.1.7.ebuild [deleted file]
dev-db/postgis/postgis-2.2.0.ebuild [new file with mode: 0644]
dev-db/postgresql/postgresql-9.3.10-r2.ebuild [new file with mode: 0644]
dev-db/postgresql/postgresql-9.4.5-r2.ebuild [new file with mode: 0644]
dev-db/postgresql/postgresql-9.5_beta2-r1.ebuild [new file with mode: 0644]
dev-db/postgresql/postgresql-9999.ebuild
dev-lang/python/python-2.7.10-r1.ebuild
dev-lang/python/python-3.3.5-r1.ebuild
dev-lang/python/python-3.4.3.ebuild
dev-libs/qcustomplot/Manifest
dev-libs/qcustomplot/qcustomplot-1.2.1.ebuild [deleted file]
dev-libs/qcustomplot/qcustomplot-1.3.0.ebuild [deleted file]
dev-lisp/trivial-gray-streams/Manifest [new file with mode: 0644]
dev-lisp/trivial-gray-streams/metadata.xml [new file with mode: 0644]
dev-lisp/trivial-gray-streams/trivial-gray-streams-20081102.ebuild [new file with mode: 0644]
dev-lisp/trivial-gray-streams/trivial-gray-streams-9999.ebuild [new file with mode: 0644]
dev-python/numpy/Manifest
dev-python/numpy/numpy-1.10.2.ebuild [new file with mode: 0644]
dev-python/numpy/numpy-9999.ebuild [new file with mode: 0644]
dev-ros/libmavconn/Manifest
dev-ros/libmavconn/libmavconn-0.16.4.ebuild [new file with mode: 0644]
dev-ros/libmavconn/libmavconn-9999.ebuild
dev-ros/mavlink-gbp-release/Manifest
dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.12.12.ebuild [new file with mode: 0644]
dev-ros/mavros/Manifest
dev-ros/mavros/mavros-0.16.4.ebuild [new file with mode: 0644]
dev-ros/mavros/mavros-9999.ebuild
dev-ros/mavros_extras/Manifest
dev-ros/mavros_extras/mavros_extras-0.16.4.ebuild [new file with mode: 0644]
dev-ros/mavros_msgs/Manifest
dev-ros/mavros_msgs/mavros_msgs-0.16.4.ebuild [new file with mode: 0644]
dev-ruby/redis/Manifest
dev-ruby/redis/redis-3.2.2.ebuild [new file with mode: 0644]
dev-tex/chktex/Manifest
dev-tex/chktex/chktex-1.7.5.ebuild [new file with mode: 0644]
dev-util/jenkins-bin/Manifest
dev-util/jenkins-bin/jenkins-bin-1.642.ebuild [new file with mode: 0644]
dev-vcs/subversion/Manifest
dev-vcs/subversion/subversion-1.8.15.ebuild [moved from dev-vcs/subversion/subversion-1.8.14-r1.ebuild with 99% similarity]
dev-vcs/subversion/subversion-1.9.3.ebuild [moved from dev-vcs/subversion/subversion-1.9.1.ebuild with 95% similarity]
dev-vcs/tortoisehg/Manifest
dev-vcs/tortoisehg/tortoisehg-3.6.2.ebuild [moved from dev-vcs/tortoisehg/tortoisehg-3.6.ebuild with 100% similarity]
eclass/cmake-utils.eclass
games-server/crossfire-server/crossfire-server-1.71.0.ebuild
games-server/crossfire-server/files/crossfire-server-1.71.0-format.patch [new file with mode: 0644]
kde-plasma/bluedevil/Manifest
kde-plasma/bluedevil/bluedevil-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/breeze-gtk/Manifest
kde-plasma/breeze-gtk/breeze-gtk-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/breeze/Manifest
kde-plasma/breeze/breeze-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kde-cli-tools/Manifest
kde-plasma/kde-cli-tools/kde-cli-tools-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kde-gtk-config/Manifest
kde-plasma/kde-gtk-config/kde-gtk-config-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kdecoration/Manifest
kde-plasma/kdecoration/kdecoration-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kdeplasma-addons/Manifest
kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kgamma/Manifest
kde-plasma/kgamma/kgamma-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/khelpcenter/Manifest
kde-plasma/khelpcenter/khelpcenter-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/khotkeys/Manifest
kde-plasma/khotkeys/khotkeys-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kinfocenter/Manifest
kde-plasma/kinfocenter/kinfocenter-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kmenuedit/Manifest
kde-plasma/kmenuedit/kmenuedit-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kscreen/Manifest
kde-plasma/kscreen/kscreen-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kscreenlocker/Manifest
kde-plasma/kscreenlocker/kscreenlocker-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/ksshaskpass/Manifest
kde-plasma/ksshaskpass/ksshaskpass-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/ksysguard/Manifest
kde-plasma/ksysguard/ksysguard-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kwallet-pam/Manifest
kde-plasma/kwallet-pam/kwallet-pam-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kwayland-integration/Manifest
kde-plasma/kwayland-integration/kwayland-integration-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kwayland/Manifest
kde-plasma/kwayland/kwayland-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kwin/Manifest
kde-plasma/kwin/kwin-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/kwrited/Manifest
kde-plasma/kwrited/kwrited-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/libkscreen/Manifest
kde-plasma/libkscreen/libkscreen-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/libksysguard/Manifest
kde-plasma/libksysguard/libksysguard-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/milou/Manifest
kde-plasma/milou/milou-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/oxygen/Manifest
kde-plasma/oxygen/oxygen-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/plasma-desktop/Manifest
kde-plasma/plasma-desktop/plasma-desktop-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/plasma-mediacenter/Manifest
kde-plasma/plasma-mediacenter/plasma-mediacenter-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/plasma-meta/plasma-meta-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/plasma-nm/Manifest
kde-plasma/plasma-nm/plasma-nm-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/plasma-pa/Manifest
kde-plasma/plasma-pa/plasma-pa-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/plasma-sdk/Manifest
kde-plasma/plasma-sdk/plasma-sdk-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/plasma-workspace-wallpapers/Manifest
kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/plasma-workspace/Manifest
kde-plasma/plasma-workspace/plasma-workspace-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/polkit-kde-agent/Manifest
kde-plasma/polkit-kde-agent/polkit-kde-agent-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/powerdevil/Manifest
kde-plasma/powerdevil/powerdevil-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/sddm-kcm/Manifest
kde-plasma/sddm-kcm/sddm-kcm-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/systemsettings/Manifest
kde-plasma/systemsettings/systemsettings-5.5.1.ebuild [new file with mode: 0644]
kde-plasma/user-manager/Manifest
kde-plasma/user-manager/user-manager-5.5.1.ebuild [new file with mode: 0644]
media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch [new file with mode: 0644]
media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch [new file with mode: 0644]
media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch [new file with mode: 0644]
media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch [new file with mode: 0644]
media-gfx/rawtherapee/files/rawtherapee-4.2-sigc26.patch [new file with mode: 0644]
media-gfx/rawtherapee/rawtherapee-4.2-r1.ebuild [new file with mode: 0644]
media-libs/jbigkit/files/jbigkit-2.1-build.patch
media-libs/mesa/Manifest
media-libs/mesa/mesa-11.1.0.ebuild [new file with mode: 0644]
media-libs/phonon/files/phonon-4.8.3-gcc5.patch [new file with mode: 0644]
media-libs/phonon/phonon-4.8.3-r1.ebuild
media-libs/varconf/varconf-0.6.7-r1.ebuild [new file with mode: 0644]
media-sound/qtagger/qtagger-1.0.1-r2.ebuild [new file with mode: 0644]
media-sound/qtractor/Manifest
media-sound/qtractor/qtractor-0.7.2.ebuild [new file with mode: 0644]
media-video/baka-mplayer/Manifest
media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild [moved from media-video/baka-mplayer/baka-mplayer-2.0.2.ebuild with 69% similarity]
net-fs/davfs2/metadata.xml
net-libs/mbedtls/metadata.xml
net-misc/curl/curl-7.46.0-r1.ebuild [new file with mode: 0644]
net-misc/curl/curl-7.46.0.ebuild
net-print/cups-filters/Manifest
net-print/cups-filters/cups-filters-1.3.0.ebuild [deleted file]
net-print/cups-filters/cups-filters-1.4.0.ebuild [moved from net-print/cups-filters/cups-filters-1.2.0.ebuild with 100% similarity]
profiles/desc/curl_ssl.desc
profiles/package.mask
ros-meta/mavros/mavros-0.16.4.ebuild [new file with mode: 0644]
sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
sys-auth/keystone/Manifest
sys-auth/keystone/keystone-2015.2.9999.ebuild
sys-auth/keystone/keystone-8.0.1.ebuild [new file with mode: 0644]
sys-boot/grub/files/CVE-2015-8370.patch [new file with mode: 0644]
sys-boot/grub/files/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch [new file with mode: 0644]
sys-boot/grub/grub-0.97-r17.ebuild [new file with mode: 0644]
sys-boot/grub/grub-2.02_beta2-r8.ebuild [new file with mode: 0644]
sys-cluster/cinder/cinder-2015.2.9999.ebuild
sys-cluster/neutron/neutron-2015.2.9999.ebuild
sys-cluster/neutron/neutron-7.0.1.ebuild
sys-cluster/nova/nova-2015.2.9999.ebuild
sys-kernel/gentoo-sources/Manifest
sys-kernel/gentoo-sources/gentoo-sources-4.1.15.ebuild [new file with mode: 0644]
sys-kernel/gentoo-sources/gentoo-sources-4.2.8.ebuild [new file with mode: 0644]
sys-kernel/gentoo-sources/gentoo-sources-4.3.3.ebuild [new file with mode: 0644]
sys-kernel/vanilla-sources/Manifest
sys-kernel/vanilla-sources/vanilla-sources-4.1.15.ebuild [moved from sys-kernel/vanilla-sources/vanilla-sources-4.1.14.ebuild with 100% similarity]
sys-kernel/vanilla-sources/vanilla-sources-4.2.8.ebuild [moved from sys-kernel/vanilla-sources/vanilla-sources-4.2.7.ebuild with 100% similarity]
sys-kernel/vanilla-sources/vanilla-sources-4.3.3.ebuild [moved from sys-kernel/vanilla-sources/vanilla-sources-4.3.2.ebuild with 100% similarity]
sys-libs/binutils-libs/binutils-libs-2.25.1-r2.ebuild
www-apps/icingaweb2/Manifest
www-apps/icingaweb2/icingaweb2-2.1.0.ebuild [new file with mode: 0644]
www-client/qupzilla/Manifest
www-client/qupzilla/qupzilla-1.8.9.ebuild [new file with mode: 0644]
www-client/seamonkey-bin/Manifest
www-client/seamonkey-bin/files/all-gentoo-1-cve-2015-4000.js
www-client/seamonkey-bin/metadata.xml
www-client/seamonkey-bin/seamonkey-bin-2.39.ebuild [moved from www-client/seamonkey-bin/seamonkey-bin-2.35.ebuild with 100% similarity]

index 1c2a80b38620beaf4b07fe9d001a6f3d11aa7b76..853813e88f0163b6606842279cad0f58848f5b69 100644 (file)
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 inherit eutils
 
 DESCRIPTION="editor, browser, and mail client using the /bin/ed interface"
@@ -11,12 +11,13 @@ SRC_URI="http://the-brannons.com/${PN}/${P}.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="linguas_fr odbc"
+IUSE="libressl linguas_fr odbc"
 COMMON_DEPEND=">=dev-lang/spidermonkey-24.0:24
        >=sys-libs/readline-6.0
        >=net-misc/curl-7.36.0
        >=dev-libs/libpcre-7.8
-       >=dev-libs/openssl-0.9.8j
+       !libressl? ( dev-libs/openssl:0 )
+       libressl? ( dev-libs/libressl )
        odbc? ( dev-db/unixODBC )"
 DEPEND="${COMMON_DEPEND}
        virtual/pkgconfig
index d44d287f516eb7135bc36d9f80b9cde6c92c4d21..a523853d80d2e2ab2c5298e3254bed9cb284969f 100644 (file)
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 git-r3 user
 
@@ -27,7 +27,7 @@ DEPEND="
                >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
                <=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
                >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-               <=dev-python/coverage-4.0.2[${PYTHON_USEDEP}]
+               <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
                >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
                <=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
                >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
@@ -38,11 +38,12 @@ DEPEND="
                !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
                <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
                >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+               !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
                <=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
                >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
                <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
                >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-               <=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+               <=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
                >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
                <=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
                >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
@@ -50,7 +51,7 @@ DEPEND="
                >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
                <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
                >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-               <=dev-python/oslotest-1.12.0[${PYTHON_USEDEP}]
+               <=dev-python/oslotest-2.0.0[${PYTHON_USEDEP}]
                >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
                <=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
                >=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
@@ -59,8 +60,11 @@ DEPEND="
                <=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
                <=dev-python/qpid-python-0.32[$(python_gen_usedep 'python2_7')]
                >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+               >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+               <=dev-python/python-swiftclient-2.7.0[${PYTHON_USEDEP}]
                >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-               <=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
+               <=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
+               >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
        )"
 
 #note to self, wsgiref is a python builtin, no need to package it
@@ -70,17 +74,17 @@ RDEPEND="
        ${CDEPEND}
        sqlite? (
                >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
        )
        mysql? (
                dev-python/mysql-python
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        postgres? (
                dev-python/psycopg:2[${PYTHON_USEDEP}]
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        ~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
        ~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
@@ -101,23 +105,25 @@ RDEPEND="
        >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
        <=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
        >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-concurrency-2.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-context-0.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-service-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-utils-2.7.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
        >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+       <=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
        >=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
        <=dev-python/futurist-0.8.0[${PYTHON_USEDEP}]
        >=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
-       <=dev-python/taskflow-1.23.0[${PYTHON_USEDEP}]
+       <=dev-python/taskflow-1.25.0[${PYTHON_USEDEP}]
        >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/keystonemiddleware-3.0.0[${PYTHON_USEDEP}]
+       !~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
+       <=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
        >=dev-python/WSME-0.7[${PYTHON_USEDEP}]
        <=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
        <=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
@@ -125,27 +131,35 @@ RDEPEND="
        !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
        <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
        >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-       <=dev-python/python-keystoneclient-1.8.1-r9999[${PYTHON_USEDEP}]
+       !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+       <=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
        >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
        <=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
        >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
        <=dev-python/six-1.10.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-       <=dev-python/oslo-db-3.1.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-i18n-2.7.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-log-1.13.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-log-2.1.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/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-middleware-2.10.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-policy-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-serialization-1.11.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
        >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
        !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
        <=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
@@ -157,9 +171,9 @@ RDEPEND="
        >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
        <=dev-python/semantic_version-2.4.2[${PYTHON_USEDEP}]
        >=dev-python/castellan-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/castellan-0.2.1[${PYTHON_USEDEP}]
+       <=dev-python/castellan-0.3.1[${PYTHON_USEDEP}]
        >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-       <=dev-python/cryptography-1.1-r9999[${PYTHON_USEDEP}]
+       <=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
 "
 
 PATCHES=(
diff --git a/app-arch/dump/dump-0.4.44-r2.ebuild b/app-arch/dump/dump-0.4.44-r2.ebuild
new file mode 100644 (file)
index 0000000..94b0c0b
--- /dev/null
@@ -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 autotools
+
+MY_P=${P/4./4b}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Dump/restore ext2fs backup utilities"
+HOMEPAGE="http://dump.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug ermt libressl readline selinux static"
+
+RDEPEND=">=sys-fs/e2fsprogs-1.27
+       >=app-arch/bzip2-1.0.2
+       >=sys-libs/zlib-1.1.4
+       ermt? (
+               !libressl? ( dev-libs/openssl:0 )
+               libressl? ( dev-libs/libressl )
+       )
+       readline? (
+               sys-libs/readline:0=
+               sys-libs/ncurses:=
+               static? ( sys-libs/ncurses:=[static-libs] )
+       )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       virtual/os-headers"
+
+src_prepare() {
+       epatch "${FILESDIR}/${P}-underlinking.patch"
+       epatch "${FILESDIR}/${P}-rl_completion_matches-detection.patch"
+       epatch "${FILESDIR}/${P}-fix-pointers-aliasing.patch"
+       eautoreconf
+}
+
+src_configure() {
+       econf \
+               --with-dumpdatespath=/etc/dumpdates \
+               --with-{bin,man}owner=root \
+               --with-{bin,man}grp=root \
+               --enable-largefile \
+               $(use_enable selinux transselinux) \
+               $(use_enable ermt) \
+               $(use_enable static) \
+               $(use_enable readline) \
+               $(use_enable debug)
+}
+
+src_install() {
+       # built on old autotools, no DESTDIR support
+       einstall MANDIR="${D}"/usr/share/man/man8
+       mv "${ED}"/usr/sbin/{,dump-}rmt || die
+       mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die
+       use ermt && newsbin rmt/ermt dump-ermt
+
+       dodoc CHANGES KNOWNBUGS MAINTAINERS README REPORTING-BUGS THANKS TODO
+       dodoc -r examples/*
+}
+
+pkg_postinst() {
+       ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'."
+       ewarn "This is to avoid conflicts with app-arch/tar 'rmt'."
+}
index 18c5bed4c8d58561b5e10f1799c1770f84bb37dd..4c7a699fb800615c20a8a723921364d4294a706d 100644 (file)
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit autotools-utils
+inherit autotools-utils flag-o-matic
 
 DESCRIPTION="A library for par2, extracted from par2cmdline"
 HOMEPAGE="https://launchpad.net/libpar2/"
@@ -23,3 +23,8 @@ DOCS=( AUTHORS ChangeLog README )
 
 # Needed to install all headers properly (bug #391815)
 AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+       autotools-utils_src_prepare
+       append-cxxflags -std=c++11 #567498
+}
diff --git a/app-arch/xar/xar-1.5.2-r2.ebuild b/app-arch/xar/xar-1.5.2-r2.ebuild
new file mode 100644 (file)
index 0000000..b753675
--- /dev/null
@@ -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
+
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://code.google.com/p/xar"
+SRC_URI="https://xar.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="acl +bzip2 libressl"
+
+DEPEND="
+       !libressl? ( dev-libs/openssl:0 )
+       libressl? ( dev-libs/libressl )
+       dev-libs/libxml2
+       sys-libs/zlib
+       acl? ( sys-apps/acl )
+       bzip2? ( app-arch/bzip2 )"
+RDEPEND="${DEPEND}"
+
+DOCS=( TODO )
+
+src_prepare() {
+       epatch "${FILESDIR}/${P}-automagic_acl_and_bzip2.patch"
+       epatch "${FILESDIR}/${P}-respect_ldflags.patch"
+       epatch_user
+       eautoconf
+}
+
+src_configure() {
+       econf $(use_enable acl) $(use_enable bzip2)
+}
index 4461fc86e9872d9ce977c80cc4197adbd930293b..e1aa88b0875707918c0d31c60a93702f945a2998 100644 (file)
@@ -1,3 +1,4 @@
 DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac
 DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727
 DIST pinentry-0.9.6.tar.bz2 432889 SHA256 2a1124e9097f24f866cab7982610677e222cea71be0a71a5566f223177e01e66 SHA512 c9f94e5ce5baf6779f6effc13f82c8c7f99d426dc232114fc4e11a8684eaefbaf4f60363db78cdb9f4c8e91ba7af40779ec1c5d7e01ee15b84c7de77ccf46e72 WHIRLPOOL 954d185ce60eeb28717dd5986c4bdfda0472944b99d52caa213919b4dd1368b2d2b4cff27bfc4158a0fd7f70f7f6549b3415de7ba33239ec9305a2e0e0bdcbc0
+DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a
diff --git a/app-crypt/pinentry/pinentry-0.9.6-r4.ebuild b/app-crypt/pinentry/pinentry-0.9.6-r4.ebuild
deleted file mode 100644 (file)
index 20fc85f..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="http://gnupg.org/aegypten2/index.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-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"
-IUSE="emacs gtk ncurses qt4 caps gnome-keyring static"
-
-CDEPEND="
-       >=dev-libs/libgpg-error-1.17
-       >=dev-libs/libassuan-2
-       >=dev-libs/libgcrypt-1.6.3
-       ncurses? ( sys-libs/ncurses:0= )
-       gtk? ( x11-libs/gtk+:2 )
-       qt4? ( >=dev-qt/qtgui-4.4.1:4 )
-       caps? ( sys-libs/libcap )
-       static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
-       app-eselect/eselect-pinentry
-       gnome-keyring? ( app-crypt/libsecret )
-"
-
-DEPEND="${CDEPEND}
-       sys-devel/gettext
-       virtual/pkgconfig
-"
-
-RDEPEND="
-       ${CDEPEND}
-       gnome-keyring? ( app-crypt/gcr )
-"
-
-REQUIRED_USE="
-       || ( ncurses gtk qt4 )
-       gtk? ( !static )
-       qt4? ( !static )
-       static? ( ncurses )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
-       epatch "${FILESDIR}/${P}-Remove-detection-of-Qt5.patch"
-       eautoreconf
-}
-
-src_configure() {
-       use static && append-ldflags -static
-       [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
-
-       # Issues finding qt on multilib systems
-       export QTLIB="${QTDIR}/$(get_libdir)"
-
-       econf \
-               --enable-pinentry-tty \
-               $(use_enable emacs pinentry-emacs) \
-               $(use_enable gtk pinentry-gtk2) \
-               $(use_enable ncurses pinentry-curses) \
-               $(use_enable ncurses fallback-curses) \
-               $(use_enable qt4 pinentry-qt) \
-               $(use_with caps libcap) \
-               $(use_enable gnome-keyring libsecret) \
-               $(use_enable gnome-keyring pinentry-gnome3) \
-               MOC="$(qt4_get_bindir)"/moc
-}
-
-src_install() {
-       default
-       rm -f "${ED}"/usr/bin/pinentry || die
-
-       if use_enable qt4; then
-               dosym pinentry-qt /usr/bin/pinentry-qt4
-       fi
-}
-
-pkg_postinst() {
-       if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
-               elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
-               elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
-               elog "The soft resource limit for memory locking specifies the limit an"
-               elog "unprivileged process may lock into memory. You can also use POSIX"
-               elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
-               elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
-               elog "your users."
-       fi
-
-       eselect pinentry update ifunset
-}
-
-pkg_postrm() {
-       eselect pinentry update ifunset
-}
similarity index 95%
rename from app-crypt/pinentry/pinentry-0.9.6-r5.ebuild
rename to app-crypt/pinentry/pinentry-0.9.7.ebuild
index 6e10cf89fa45cf7c2b767b29f8eddd488c68afb1..931d7f2072a1ede3ed88739b81310ed49be5156f 100644 (file)
@@ -17,7 +17,7 @@ IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static"
 
 CDEPEND="
        >=dev-libs/libgpg-error-1.17
-       >=dev-libs/libassuan-2
+       >=dev-libs/libassuan-2.1
        >=dev-libs/libgcrypt-1.6.3
        ncurses? ( sys-libs/ncurses:0= )
        gtk? ( x11-libs/gtk+:2 )
@@ -45,7 +45,7 @@ RDEPEND="
 "
 
 REQUIRED_USE="
-       || ( ncurses gtk qt4 )
+       || ( ncurses gtk qt4 qt5 )
        gtk? ( !static )
        qt4? ( !static )
        qt5? ( !static )
@@ -57,7 +57,6 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
 src_prepare() {
        epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
-       epatch "${FILESDIR}/${P}-add-disable-pinentry-qt5-option.patch"
        eautoreconf
 }
 
@@ -99,7 +98,7 @@ src_install() {
        default
        rm -f "${ED}"/usr/bin/pinentry || die
 
-       if use_enable qt4 || use_enable qt5; then
+       if use qt4 || use qt5; then
                dosym pinentry-qt /usr/bin/pinentry-qt4
        fi
 }
index c2bf16344ccc77992b32e4e77fb8e89fe62888dc..72ab73caa6d96c850be5a56990d0a756383dacf6 100644 (file)
@@ -1,2 +1,3 @@
 DIST focuswriter-1.5.3-src.tar.bz2 5201148 SHA256 1c48c72879a7b40cf7d97c28abf5cf713c063b7f83a1179093b1241f5797a8c4 SHA512 6796fc8dbe5d5ba545fc8ee5797f620e56dea67a038f4c4eb9e404940a863b32ea2ceb30ed7ea8e22187be2763cc128def3f08f61187ba11de94ec9ae16f807f WHIRLPOOL c5dbf0e739928833bbccdc2e5de6305ca553a3e8f0f1d54d1d2a6bd4636b8ede85c3adedcaee85d66779e25cd53678428cc3817bdedcf30be42c89fc1aebdf07
 DIST focuswriter-1.5.4-src.tar.bz2 5247111 SHA256 5ffd74a2d5a790e432d819dfd269ddb8d6c1a0168c91e441b2121fa6eaf8f565 SHA512 f532dac5a0691d7b82a16b5dae115c7d79b161484ba1ad2243fd1ccaeba8ae9c9ed0019eba6cd87cc4155a51f5a97cad16c92b9453671426e214e139d78bc526 WHIRLPOOL aca3722b60aee8bec0979f71a04d28217c82c9a2fb60b49a19a58596c9d67bd160626d14cc950eeaa9c0543001f93ec9576a1561c24bbe29a98eeec708287331
+DIST focuswriter-1.5.5-src.tar.bz2 5249014 SHA256 b6a2085587864b2685516d20870d9375803ccdf3472e66bf457382d028c1da0e SHA512 aed6a2e203dcf349ff7fef6caa8e7ab1dbba80da988933c06d6f4ea1ad49ad4c4546b30aaacf9373d1234cb8934daac36f00d0d7b3512d9c3fc4f1e1b273a766 WHIRLPOOL 29795304e6d6687d16d2774cd4d28d0c45382474391d7ad62fa557a134e7c5d11ba6bf81bb81df2b0fb3727b4bb32f705d8fe73a7129f44c8485cc9d8b19b2e1
diff --git a/app-editors/focuswriter/focuswriter-1.5.5.ebuild b/app-editors/focuswriter/focuswriter-1.5.5.ebuild
new file mode 100644 (file)
index 0000000..f2e2306
--- /dev/null
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="ar ca cs da de el en en_GB es_MX es fi fr he hu hy id it ja ko nl pl
+pt_BR pt ro ru sk sr sv tr uk vi zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+inherit fdo-mime gnome2-utils l10n readme.gentoo qt4-r2
+
+DESCRIPTION="A fullscreen and distraction-free word processor"
+HOMEPAGE="http://gottcode.org/focuswriter/"
+SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="app-text/hunspell
+       dev-qt/qtcore:4
+       dev-qt/qtgui:4
+       dev-qt/qtsingleapplication[qt4(+),X]
+       sys-libs/zlib"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig"
+
+DOCS=( ChangeLog CREDITS NEWS README )
+DOC_CONTENTS="Focuswriter has optional sound support if media-libs/sdl-mixer is
+installed with wav useflag enabled."
+
+PATCHES=( "${FILESDIR}/${PN}-1.5.2-unbundle-qtsingleapplication.patch" )
+
+rm_loc() {
+       sed -e "s|translations/${PN}_${1}.ts||" -i ${PN}.pro || die 'sed failed'
+       rm translations/${PN}_${1}.{ts,qm} || die "removing ${1} locale failed"
+}
+
+src_prepare() {
+       l10n_for_each_disabled_locale_do rm_loc
+       qt4-r2_src_prepare
+}
+
+src_configure() {
+       eqmake4 PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+       readme.gentoo_create_doc
+       qt4-r2_src_install
+}
+
+pkg_preinst() {
+       gnome2_icon_savelist
+}
+
+pkg_postinst() {
+       readme.gentoo_pkg_postinst
+       gnome2_icon_cache_update
+       fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+       gnome2_icon_cache_update
+       fdo-mime_desktop_database_update
+}
index f671aec5440cbd6671124e67c4cfd84066cc5f2b..6ea697aa3a047aabe40a74b95534b59ad9e50988 100644 (file)
@@ -1,2 +1 @@
-DIST qxmledit-0.8.5-src.tgz 6727188 SHA256 aedb70f27493ba50f0c8bde4acdd8913fcf4221611b24f9042769df47aa701c4 SHA512 c974dc0787fdc1831a39e9e36f842ed92ca5b57e9e66e64822eea4646d88a0755f9aa791e4d7724872856561eac213413696fa7b0f61d89b54e29cbc95049a8a WHIRLPOOL 362d898005677dea5bb7372bc78d8b5d9376f2c7555be3086448778202a55fff5766856c39a55561c92b08498ecafaeace033121ba4706b4c1aa923ea45f28d8
 DIST qxmledit-0.8.8-1-src.tgz 8885329 SHA256 d43ccd0029b1094a970d58170a095cbe5fddfe3d93da7c52388783d321386e17 SHA512 5440d33c052507d3b5c840cdd2966c151a77e2027703f7c1d33f80ec786affab915053d2ae17ef72fd856223ca85dbb70d39d8800170449a26ea88632c0069b5 WHIRLPOOL 68f8d73c39ce490f13d88283053ad045125f007132a25d965ffb603ab1de1d42b62944659a76aa9bbb5adc884b37ad90f7eaf4487f314678d8a1923cd16f1078
diff --git a/app-editors/qxmledit/qxmledit-0.8.5.ebuild b/app-editors/qxmledit/qxmledit-0.8.5.ebuild
deleted file mode 100644 (file)
index a8296f9..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib eutils qt4-r2
-
-MY_P="qxmledit-${PV}-src"
-
-DESCRIPTION="Qt4 XML Editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND=">=dev-qt/qtcore-4.7:4
-       >=dev-qt/qtgui-4.7:4
-       >=dev-qt/qtsql-4.7:4
-       >=dev-qt/qtsvg-4.7:4
-       >=dev-qt/qtxmlpatterns-4.7:4"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS NEWS README ROADMAP TODO"
-
-src_prepare() {
-       # fix doc dir
-       sed -i "/INST_DOC_DIR = / s|/opt/${PN}|/usr/share/doc/${PF}|" \
-               src/QXmlEdit{,Widget}.pro src/sessions/QXmlEditSessions.pro || \
-               die "failed to fix doc installation path"
-       # fix binary installation path
-       sed -i "/INST_DIR = / s|/opt/${PN}|/usr/bin|" \
-               src/QXmlEdit{,Widget}.pro src/sessions/QXmlEditSessions.pro || \
-               die "failed to fix binary installation path"
-       # fix helper libraries installation path
-       sed -i "/INST_LIB_DIR = / s|/opt/${PN}|/usr/$(get_libdir)|" \
-               src/QXmlEdit{,Widget}.pro \
-               src/sessions/QXmlEditSessions.pro || \
-               die "failed to fix library installation path"
-       # fix translations
-       sed -i "/INST_DATA_DIR = / s|/opt|/usr/share|" src/QXmlEdit{,Widget}.pro \
-               src/sessions/QXmlEditSessions.pro || \
-               die "failed to fix translations"
-       # fix include
-       sed -i "/INST_INCLUDE_DIR = / s|/opt|/usr/share|" src/QXmlEditWidget.pro \
-               || die "failed to fix include directory"
-
-       qt4-r2_src_prepare
-}
-
-src_install() {
-       qt4-r2_src_install
-
-       newicon src/images/icon.png ${PN}.png
-       make_desktop_entry QXmlEdit QXmlEdit ${PN} "Qt;Utility;TextEditor"
-}
index 631584cfc4ab05c2b1d3a66d30e914772d6c8440..e88b9d0ade6dbde6edfbd799c95cf5c7fa34b4d9 100644 (file)
@@ -1,2 +1,2 @@
-DIST tea-36.0.2.tar.bz2 315046 SHA256 6541b645451de3f6eefce58b55a302224b925bdbdb9efcfa1491bcf867baad6f SHA512 e04df49e8381c69f0e2fb6900d6f095b0eb15bdc2d8fb935230129b2fef7560fd91936d66a2440d1922a6fc6c2e7d07e40fe1106b5cf22dd495bba667cf5def8 WHIRLPOOL 1da79f26126c98876ff6bfef04c799f476a204294466cbd47834748a12e8c59d10f7c2e36d4ebc089fcef21caca1beeab1293acee13da9af341466c117873e1f
 DIST tea-41.0.0.tar.bz2 381891 SHA256 b20bfe3235a4f405bcd984adfabde2302a15cf8512e19f8b97bc43ce9911632b SHA512 aff52922be7650a23fcafe5a8106d5955bc7c68a901ad6a3982b71196ac8856939d3bc61236babbed21a749c2fc205510ef081ac35d7d33fcf2d2700ebb5cbaf WHIRLPOOL ed913f3fb424e47fbbecab445ccd9c34c9ad66befdda950fee05958459b87efad67cfea37548c5ab8456b849c860f0cd3ef59e386aaa99c01b5041dae02c1afc
+DIST tea-41.1.0.tar.bz2 381370 SHA256 65ea128739802b7626a5a59de12b0e885dcef7a83f7bcd06b6d3aea830ed8717 SHA512 a46e0cdfce5c7d453c7783c59ad98b2b029847ddcc8ce0655c6e1ae45825426ac1b271ca7ad90f0219d8f796f507f6bdba0f2c764c563c8c23503b94be817eb7 WHIRLPOOL a3d00f5e42a145be2a7f3bf846832bf2a7e95e957abf4c928118be7607adb57fddfb906fbedaf7fa51665b25629beae0fe5b4db40886f42dfcf5c166e43717b5
similarity index 68%
rename from app-editors/tea/tea-36.0.2.ebuild
rename to app-editors/tea/tea-41.1.0.ebuild
index 306d38a2e23471cbbdcd98bf6d19d4d8700bf358..c1f2497a05e6a038bbc10a679d474020cdadf934 100644 (file)
@@ -1,15 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 PLOCALES="de fr ru"
 
-inherit eutils l10n qt4-r2
+inherit eutils l10n qmake-utils
 
 DESCRIPTION="Small, lightweight Qt text editor"
-HOMEPAGE="http://semiletov.org/tea/"
-SRC_URI="http://semiletov.org/${PN}/dloads/${P}.tar.bz2"
+HOMEPAGE="http://tea.ourproject.org/ http://semiletov.org/tea/"
+SRC_URI="http://tea.ourproject.org/dloads/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -17,9 +17,9 @@ KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd"
 IUSE="aspell hunspell"
 
 RDEPEND="
-       sys-libs/zlib
        dev-qt/qtcore:4
        dev-qt/qtgui:4
+       sys-libs/zlib
        aspell? ( app-text/aspell )
        hunspell? ( app-text/hunspell )
 "
@@ -31,15 +31,14 @@ DOCS=( AUTHORS ChangeLog NEWS TODO )
 
 src_configure() {
        eqmake4 src.pro \
-               PREFIX="${EPREFIX}/usr/bin" \
-               USE_ASPELL=$(use aspell && echo true || echo false) \
-               USE_HUNSPELL=$(use hunspell && echo true || echo false)
+               $(use aspell || echo CONFIG+=noaspell) \
+               $(use hunspell || echo CONFIG+=nohunspell)
 }
 
 src_install() {
-       qt4-r2_src_install
+       dobin bin/tea
 
-       newicon icons/tea_icon_v2.png ${PN}.png
+       newicon icons/tea-icon-v3-01.png ${PN}.png
        make_desktop_entry ${PN} 'Tea Editor'
 
        # translations
index bc133a96671d8dcb4aa05688489b74680941702c..a31a9ce3839d19b8410a2f3cf562a427d5915686 100644 (file)
@@ -1,3 +1,2 @@
 DIST gstreamermm-0.10.11.tar.xz 5840552 SHA256 12b5f377363594a69cb79f2f5cd0a8b1813ca6553680c3216e6354cfd682ebc6 SHA512 2ad370f6902dcb4663ea801bdbbf744a98de9e24fc04f27b5044a4a95337168e2bb195761a07ac9c1011f9ed4936287fcc5f4c2b984f0a362b429d05be7d3909 WHIRLPOOL d9be72d4691b9b0769b75819ca9403a2df7f1dbdad4974e4b26e4fd87d4b7ea0503fb2ba6a500a008ec9d1c29f6677e61649798801e6babf7e4d7b8562cc72f2
-DIST gstreamermm-1.0.10.tar.xz 4649144 SHA256 dd9e9b2d2bc7f52ab9196f4613b99700e1c9f2ab7c076bd87c657f3f435f1dc6 SHA512 6f67e823b9f4d1384b139cef47c3de5f28df437452cbba54369973c00f675d40ce9937f38e063b31f5a824f0facdc53d54a2ec4c04e03ed8eee89ad39f9e1229 WHIRLPOOL cf045345fed45d94aa61b5a4c75f1149f9ae280476d284c00bdd3cb33be9369215be3fe540443f6c015ae1e9c25558173d86775b5fbd9d821cb7f8616197c8b0
 DIST gstreamermm-1.4.3.tar.xz 5886048 SHA256 f1c11ee1cf7537d77de7f8d486e09c5140cc4bb78882849718cd88959a55462e SHA512 ea4d281a4f3b79113fc3a0474e23d82442facac6eaf66215de412310b9c306aa5d586ee5570087d94d90acbfc09c5766edba1414b50f0fd9a3111cda610f5671 WHIRLPOOL b8bee1e9672c5ca527718e1826a4b486ea47fd772b079dddb532716c2082bb4cca55823a8b3dcd5eabe8819ee944b0cb68740c6b986ff329b71dad47240fe904
index aca693a5faa52c386244b3d310aaa2033560ce52..08447b904e01f480a9e08024c2fbe192de1369bd 100644 (file)
@@ -5,7 +5,7 @@
 EAPI="5"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit flag-o-matic gnome2
 
 DESCRIPTION="C++ interface for GStreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}
                media-plugins/gst-plugins-x:0.10 )
 "
 
-DOCS="AUTHORS ChangeLog NEWS README"
 # Installs reference docs into /usr/share/doc/gstreamermm-0.10/
 # but that's okay, because the rest of dev-cpp/*mm stuff does the same
+
+src_prepare() {
+       gnome2_src_prepare
+       append-cxxflags -std=c++11 #568254
+}
diff --git a/dev-cpp/gstreamermm/gstreamermm-1.0.10.ebuild b/dev-cpp/gstreamermm/gstreamermm-1.0.10.ebuild
deleted file mode 100644 (file)
index f890052..0000000
+++ /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"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for GStreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc examples test"
-
-RDEPEND="
-       >=media-libs/gstreamer-1.0.10:1.0
-       >=media-libs/gst-plugins-base-1.0.10:1.0
-       >=dev-cpp/glibmm-2.36:2
-       >=dev-cpp/libxmlpp-2.14:2.6
-       >=dev-libs/libsigc++-2:2
-"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       doc? (
-               app-doc/doxygen
-               dev-libs/libxslt
-               media-gfx/graphviz )
-       test? (
-               dev-cpp/gtest
-               media-libs/gst-plugins-base:1.0[X,ogg,theora,vorbis]
-               media-libs/gst-plugins-good:1.0
-               media-plugins/gst-plugins-jpeg:1.0 )
-"
-#   dev-cpp/mm-common"
-# eautoreconf needs mm-common
-
-# Installs reference docs into /usr/share/doc/gstreamermm-1.0/
-# but that's okay, because the rest of dev-cpp/*mm stuff does the same
-
-src_prepare() {
-       if ! use examples; then
-               # don't waste time building examples
-               sed -e 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-                       -i Makefile.am Makefile.in || die
-       fi
-
-       # FIXME: disable endless unittests, report upstream
-       sed -e '/test-regression-rewritefile$(EXEEXT) \\/d' \
-               -e '/test-regression-seekonstartup$(EXEEXT) \\/d' \
-               -i tests/Makefile.in || die
-
-       gnome2_src_prepare
-}
-
-src_configure() {
-       gnome2_src_configure $(use_enable doc documentation)
-}
-
-src_test() {
-       # running tests in parallel fails
-       emake -j1 check || die
-}
index 945242a7ae6dbee3a72166c59619837b7760148e..fbedd8d177d0671c3dcba8dc4976f6f44019e8ce 100644 (file)
@@ -3,8 +3,7 @@
 # $Id$
 
 EAPI="5"
-
-inherit gnome2
+inherit flag-o-matic gnome2
 
 DESCRIPTION="C++ interface for GStreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
@@ -47,6 +46,7 @@ src_prepare() {
        fi
 
        gnome2_src_prepare
+       append-cxxflags -std=c++11 #568254 , fixed in master
 }
 
 src_configure() {
@@ -55,5 +55,5 @@ src_configure() {
 
 src_test() {
        # running tests in parallel fails
-       emake -j1 check || die
+       emake -j1 check
 }
index 504827e25070e1bf5f4b4d3c3e5bb85ce44c2447..6353a78181217280adb355c8cd50cbc4be502fea 100644 (file)
@@ -5,7 +5,7 @@
 EAPI=5
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2
+inherit eutils flag-o-matic gnome2
 
 DESCRIPTION="C++ bindings for gtkglext"
 HOMEPAGE="https://projects.gnome.org/gtkglext/"
@@ -36,6 +36,7 @@ src_prepare() {
                die "sed Makefile.in failed"
 
        gnome2_src_prepare
+       append-cxxflags -std=c++11 #568024
 }
 
 src_install() {
index fc60c9a6590277c5537f8593dac31227a59ba7e2..369745deb40d075026a15084156f8735125afb57 100644 (file)
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit gnome2
+inherit flag-o-matic gnome2
 
 DESCRIPTION="C++ bindings for libgnomecanvas"
 HOMEPAGE="http://www.gtkmm.org"
@@ -32,6 +32,7 @@ src_prepare() {
                        die "sed Makefile.in failed"
        fi
        gnome2_src_prepare
+       append-cxxflags -std=c++11 #568300
 }
 
 src_compile() {
index 30ae24676165515bbc7aa831837401751fa390eb..5a483225457020fb256dbf19fde10d2068c25aef 100644 (file)
@@ -167,7 +167,7 @@ multilib_src_test() {
                        binlog.binlog_statement_insert_delayed main.information_schema \
                        main.mysqld--help plugins.cracklib_password_check \
                        funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-                               mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+                               mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
                done
 
                # Run mysql tests
index 716cd4f2fe139a85c061b77afc49df45a6594be2..ee4c1e885c8d8adf30aaacecb1d2e83ca3503f25 100644 (file)
@@ -123,13 +123,13 @@ multilib_src_test() {
                        rpl.rpl_plugin_load \
                        main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
                ; do
-                               mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+                               mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
                done
 
                if ! use extraengine ; then
                        # bug 401673, 530766
                        for t in federated.federated_plugin ; do
-                               mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
+                               mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
                        done
                fi
 
index 5d3293548ad6249a1f7c0c47118256c25a162b91..05963acc135f9b07e91632bf35ddefa509dab184 100644 (file)
@@ -131,7 +131,7 @@ multilib_src_test() {
                        engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
                        engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
                        main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-                               mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+                               mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
                done
 
                # Run mysql tests
index 2862459254e43108f2f1b79561fe0b548cb474c4..99052b1d6da5c5d6dbc0d3b2a94dd556e3a697b7 100644 (file)
@@ -1,9 +1,5 @@
 DIST postgis-2.0.3.tar.gz 5581619 SHA256 7f865a6fdf19afed7d2f3e7178cd504f7254a9e96f2ce6a07d0ea19edc1668a0 SHA512 e49232a0aebd202a053e2f6cb741551e932e49a8c535fadd22fe15c654e3823c2f43a4c78dc0340cddbbc7f9298651dc16e1737be3bfe0779cc4feede032facc WHIRLPOOL 9c7985ab6d50a4a8ffa4e8fa5ea69c7e365aae8d90a3ea70c978149e5a9efe4a29a29d11db5d2a6b5c830dcd5ba458a3263288f32a5af54665f5d1cab3357415
 DIST postgis-2.0.6.tar.gz 5651448 SHA256 438fc9cf8d008c537ed2d6776bc30e726eb1f9a85247df945c2beccc42f33489 SHA512 c838b68b03d08bfd427d8a78c67754697a9409d6333e23e4bf8b63efc4320369258f14a03ba9e21ca4bd967fbfdf99d02720fa370170d4d34c20e31ad47bbf0c WHIRLPOOL 5795385bd146d280c0a8108ccb704417bf206ed80bfa9383c793d1313a3029186d26799438e21b3d6920e92d8859de947e61c1cd55cd0cc275ad800ef128f542
-DIST postgis-2.1.0.tar.gz 6518378 SHA256 fc00481aec904661f3eb11da4305b1666f2040c28b0651de7eac6c22f217b26c SHA512 ed5140aef0e68cb075fc06eaa91733c46d38ce4e01cbf1d97d14ff1a4d447f7cfcaf32924150946c7bb388d334bd5bc9f97753c47c84c16068b9dff6438e8493 WHIRLPOOL a52000a334dd2bb246b665ec7bcd743833c4699cb0cabdd1d9bab3538ee18df6e7b766c06728a97274647f63da1cc130f79902a32cf0621d9a3b8190c8fe596e
 DIST postgis-2.1.1.tar.gz 6717940 SHA256 f55acf056362e7e78766bec7a403e02a3b6b087a6d18b4222647b6a932d5c945 SHA512 f85c4d1db32802b3acbda3f4c391ca961bf1301c699a00682265c7a984fbc74ee7b9fbfc5580fc04dff0491921eb6dbe4d8bd73dded216794a4b7f90c3ed650f WHIRLPOOL 807d0ce975b72315a72d4c2ecd192c612b00530a7e542b18429fed0c69cf6cb95285554c34be58e3d2a2c513f436289449dfbe82c7430fba87e901a4bea49c2d
-DIST postgis-2.1.4.tar.gz 6854492 SHA256 cd73c2a38428c8736f6cae73b955aee0bd42f9ca4fd8d93c1af464524cb100fc SHA512 1d7dd2547fe9819addea0c9dfb4f4c78f30593af21f7cf05c4e40c2684ea3e04ad50c1937ba72172c69df713384c866e6a336b6cab733c9dd0f273f41df568d2 WHIRLPOOL f685cb2e991319b1a2f7a54ce050217d8ea636c02491fca2dafb1a2f66fe3548d4daff6d3de67925a700d9de42af29dfc4af0d26727e77f969a100a1fe964567
-DIST postgis-2.1.5.tar.gz 6827999 SHA256 0d0e27f72f12b8dba456fbde25ed0f6913f42baf57332a7f1b9bbc6f29fddbf4 SHA512 c1d186b237114c951feb78e97dc7d69896dcb0884c02e49d93e8602590e82d34a808eb12c127c7dc78db3237ac619709f8bd7febb4670909b03615f8278aede2 WHIRLPOOL c203aa2034e899647139445ce0b1e6e7637a0e2ad3c1f6d4ee1f303d9734b219b68d18fb6d6e7da6c9df53f90e8dfd30ce8d4ab8a6c942b96db7e8b55d632417
-DIST postgis-2.1.6.tar.gz 6803831 SHA256 6ffdf655bc4fca2b5495dd96f44b266e84111912d5c3f91b832023c4fec5c222 SHA512 a6c1263d64f2c1828656d5613840d721fb70ecbdfab3e28099c8f6b80d5404d46a9376913c0ab46c7f1109517c04430800b8c3be0c94d964421c6681afb2f997 WHIRLPOOL 98bfcae992f444b63840a28ef90077c01473ea528aa72ae5fd283b4fdcf7b7e37732afeac1a29fc87e330f687ca491d5afbed44b0792fb00763dc682501d37a3
-DIST postgis-2.1.7.tar.gz 6804372 SHA256 00ab79a3f609d7ea458f6fc358032ad059cb720baf88285243d6436a597a7ec2 SHA512 021fcb73c2109dafb67cb9d459eb08e0da7e55cf1a5fab81115aad3b0a61809b8f83d7a278aa04e41ecd633164e4257a90d5dfc0e81339b0c322e7d41d3c5eae WHIRLPOOL 938cacf1af4ba8a2f0f3bbefe11c0014a31cd331186cd7fc7fc0a242528094efb617326a484bdad76704bfb98fd065a7f280ab663088440af0555fc69862e36b
 DIST postgis-2.1.8.tar.gz 6811272 SHA256 7c2380b895fe7bda34c2e70deab3fcf4c12b13ab40d7501cdaa6fa36f1a6c662 SHA512 e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4 WHIRLPOOL b6675fecbb922379bd50c351abe1553fdbda53543fce56451c688e25a3fa2e9d0813d8f3a349b623b85fcb4016fc4710f6746a224ba7673ec0d2106c7635d3d1
+DIST postgis-2.2.0.tar.gz 10164837 SHA256 66f0f8480d535959b8bb9abb5ee5d602d1001413ca770df120baf3de627f9e91 SHA512 e9954d5c4aa381536ae87c32bb37b166a7ede0f9b9fc96cfb300dc2350b9351f40870429f64e755c3371be692a1956f5f8ea21733b64aab490f42d2232ae5d8f WHIRLPOOL 639c6b278dd6e5c3a11ed1d8de179ee72a4e6e9c54ba1e74e585e9233167a3c2cdca0704c47966cf757db22221ebbc8970a68375894a6179970ab6c0e6c637a2
diff --git a/dev-db/postgis/files/postgis-2.2.0-arflags.patch b/dev-db/postgis/files/postgis-2.2.0-arflags.patch
new file mode 100644 (file)
index 0000000..9777004
--- /dev/null
@@ -0,0 +1,18 @@
+diff -Naruw a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
+--- a/raster/rt_core/Makefile.in       2015-05-13 14:13:18.000000000 -0400
++++ b/raster/rt_core/Makefile.in       2015-12-14 16:49:49.166156232 -0500
+@@ -18,7 +18,7 @@
+ #
+ #############################################################################
+-AR = ar rs
++ARFLAGS = rs
+ CC = @CC@
+ LIBLWGEOM_LDFLAGS = ../../liblwgeom/.libs/liblwgeom.a
+@@ -64,4 +64,4 @@
+       rm -f Makefile
+ librtcore.a: $(RT_OBJS)
+-      $(AR) $(RT_LIB) $(RT_OBJS)
++      $(AR) $(ARFLAGS) $(RT_LIB) $(RT_OBJS)
diff --git a/dev-db/postgis/postgis-2.1.0.ebuild b/dev-db/postgis/postgis-2.1.0.ebuild
deleted file mode 100644 (file)
index 10c8d48..0000000
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-POSTGRES_COMPAT=( 9.{0,1,2,3} )
-
-inherit autotools eutils versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk"
-
-RDEPEND="
-               || (
-                       dev-db/postgresql:9.3[server]
-                       dev-db/postgresql:9.2[server]
-                       dev-db/postgresql:9.1[server]
-                       dev-db/postgresql:9.0[server]
-               )
-               dev-libs/json-c
-               dev-libs/libxml2:2
-               >=sci-libs/geos-3.3.8
-               >=sci-libs/proj-4.6.0
-               >=sci-libs/gdal-1.10.0
-               gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-               doc? (
-                               app-text/docbook-xsl-stylesheets
-                               app-text/docbook-xml-dtd:4.3
-                               dev-libs/libxslt
-                               || (
-                                       media-gfx/imagemagick[png]
-                                       media-gfx/graphicsmagick[imagemagick,png]
-                               )
-               )
-               virtual/pkgconfig
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-RESTRICT="test"
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-# Because developers have been fooled into thinking recursive make is a
-# good thing.
-MAKEOPTS="-j1"
-
-postgres_check_slot() {
-       if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-               die 'POSTGRES_COMPAT not declared.'
-       fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" \
-       && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
-
-       local res=$(echo ${POSTGRES_COMPAT[@]} \
-               | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-       if [[ "$res" -eq "0" ]] ; then
-                       eerror "PostgreSQL slot must be set to one of: "
-                       eerror "    ${POSTGRES_COMPAT[@]}"
-                       return 1
-       fi
-
-       return 0
-}
-
-pkg_pretend() {
-       postgres_check_slot || die
-}
-
-pkg_setup() {
-       postgres_check_slot || die
-       export PGSLOT="$(postgresql-config show)"
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
-               "${FILESDIR}/${PN}-2.0-arflags.patch" \
-               "${FILESDIR}/${PN}-2.1-pkgconfig-json.patch"
-
-       local AT_M4DIR="macros"
-       eautoreconf
-}
-
-src_configure() {
-       local myargs=""
-       use gtk && myargs+=" --with-gui"
-       econf \
-               --with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
-               ${myargs}
-}
-
-src_compile() {
-       # Occasionally, builds fail because of out of order compilation.
-       # Otherwise, it'd be fine.
-       emake
-       emake -C topology
-
-       if use doc ; then
-               emake comments
-               emake cheatsheets
-               emake -C doc html
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       use doc && emake DESTDIR="${D}" comments-install
-       emake -C topology DESTDIR="${D}" install
-       dobin ./utils/postgis_restore.pl
-
-       dodoc CREDITS TODO loader/README.* doc/*txt
-
-       use doc && dohtml -r doc/html/*
-
-       docinto topology
-       dodoc topology/{TODO,README}
-
-       insinto /etc
-       doins "${FILESDIR}/postgis_dbs"
-}
-
-pkg_postinst() {
-       postgresql-config update
-
-       elog "To finish installing or updating PostGIS edit:"
-       elog "    ${EROOT%/}/etc/postgis_dbs"
-       elog
-       elog "Then, run:"
-       elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-       source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-       source "${EROOT%/}/etc/postgis_dbs"
-       local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-       if [[ -n ${configured} ]] ; then
-               einfon "Password for PostgreSQL user '${pguser}': "
-               read -s PGPASSWORD
-               export PGPASSWORD
-               echo
-       else
-               eerror "You must edit:"
-               eerror "    ${EROOT%/}/etc/postgis_dbs"
-               eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-               eerror
-               die "Edit postgis_dbs"
-       fi
-
-       # The server we work with must be the same slot we built against.
-       local server_version
-       server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-               -Aqwtc 'SELECT version()' 2> /dev/null)
-       if [[ $? = 0 ]] ; then
-               server_version=$(echo ${server_version} | cut -d " " -f 2 | \
-                       cut -d "." -f -2 | tr -d .)
-               if [[ $server_version != ${PGSLOT//.} ]] ; then
-                       unset PGPASSWORD
-                       eerror "Server version must be ${PGSLOT}.x"
-                       die "Server version isn't ${PGSLOT}.x"
-               fi
-       else
-               unset PGPASSWORD
-               eerror "Is the server running?"
-               die "Couldn't connect to server."
-       fi
-
-       local retval
-       safe_exit() {
-               unset PGPASSWORD
-               sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-               eend $retval
-               eerror "All actions could not be performed."
-               eerror "Read above to see what failed."
-               eerror "Once you fix the issue, you'll need to edit:"
-               eerror "    ${EROOT%/}/etc/postgis_dbs"
-               eerror "As some things may have succeeded."
-               eerror
-               die "All actions could not be performed"
-       }
-
-       local db
-       for db in ${databases[@]} ; do
-               ebegin "Performing CREATE LANGUAGE on ${db}"
-               createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-               retval=$?
-               # In this case, only error code 1 is fatal
-               [[ $retval == 1 ]] && safe_exit || eend 0
-
-               ebegin "Enabling PostGIS on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${templates[@]} ; do
-               ebegin "Creating template database '${db}'"
-               createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-                       ${db} "PostGIS Template"
-               retval=$?
-               [[ $retval != 0 ]] && safe_exit
-
-               psql -q -U ${pguser} -p ${PGPORT} -c \
-                       "UPDATE pg_database \
-                        SET datistemplate = TRUE, datallowconn = TRUE \
-                        WHERE datname = '${db}'"
-               retval=$?
-               [[ $retval != 0 ]] && safe_exit
-
-               createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-               retval=$?
-               # In this case, only error code 1 is fatal
-               [[ $retval == 1 ]] && safe_exit
-
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${epsg_databases[@]} ; do
-               ebegin "Adding EPSG to ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/spatial_ref_sys.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${comment_databases[@]} ; do
-               ebegin "Adding comments on ${db}"
-               local comment_file
-               for comment_file in "${postgis_path}"/*_comments.sql ; do
-                       psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-                       retval=$?
-                       [[ $retval == 0 ]] && continue || safe_exit
-               done
-               eend 0
-       done
-
-       for db in ${upgrade_from_1_3[@]} ; do
-               ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${upgrade_from_1_4[@]} ; do
-               ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${upgrade_from_1_5[@]} ; do
-               ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       # Clean up and make it so the user has to edit postgis_dbs again that
-       # way this script won't step on any toes due to user error.
-       unset PGPASSWORD
-       sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-       einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-       einfo
-       einfo "To enable other databases, change the default slot:"
-       einfo "    postgresql-config set <slot>"
-       einfo "Then, emerge this package again:"
-       einfo "    emerge -av =${CATEGORY}/${PF}"
-}
diff --git a/dev-db/postgis/postgis-2.1.4.ebuild b/dev-db/postgis/postgis-2.1.4.ebuild
deleted file mode 100644 (file)
index 6d7fa20..0000000
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-POSTGRES_COMPAT=( 9.{0,1,2,3,4} )
-
-inherit autotools eutils versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk static-libs test"
-
-RDEPEND="
-               || (
-                       dev-db/postgresql:9.4[server]
-                       dev-db/postgresql:9.3[server]
-                       dev-db/postgresql:9.2[server]
-                       dev-db/postgresql:9.1[server]
-                       dev-db/postgresql:9.0[server]
-               )
-               dev-libs/json-c
-               dev-libs/libxml2:2
-               >=sci-libs/geos-3.4.2
-               >=sci-libs/proj-4.6.0
-               >=sci-libs/gdal-1.10.0
-               gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-               doc? (
-                               app-text/docbook-xsl-stylesheets
-                               app-text/docbook-xml-dtd:4.5
-                               dev-libs/libxslt
-                               || (
-                                       media-gfx/imagemagick[png]
-                                       media-gfx/graphicsmagick[imagemagick,png]
-                               )
-               )
-               virtual/pkgconfig
-               test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc )"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-postgres_check_slot() {
-       if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-               die 'POSTGRES_COMPAT not declared.'
-       fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" \
-       && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
-
-       local res=$(echo ${POSTGRES_COMPAT[@]} \
-               | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-       if [[ "$res" -eq "0" ]] ; then
-                       eerror "PostgreSQL slot must be set to one of: "
-                       eerror "    ${POSTGRES_COMPAT[@]}"
-                       return 1
-       fi
-
-       return 0
-}
-
-pkg_pretend() {
-       postgres_check_slot || die
-}
-
-pkg_setup() {
-       postgres_check_slot || die
-       export PGSLOT="$(postgresql-config show)"
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
-               "${FILESDIR}/${PN}-2.0-arflags.patch" \
-               "${FILESDIR}/${PN}-2.1.4-pkgconfig-json.patch"
-
-       local AT_M4DIR="macros"
-       eautoreconf
-}
-
-src_configure() {
-       local myargs=""
-       use gtk && myargs+=" --with-gui"
-       econf \
-               --with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
-               ${myargs}
-}
-
-src_compile() {
-       emake
-       emake -C topology
-
-       if use doc ; then
-               emake comments
-               emake cheatsheets
-               emake -C doc html
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       use doc && emake DESTDIR="${D}" comments-install
-       emake -C topology DESTDIR="${D}" install
-       dobin ./utils/postgis_restore.pl
-
-       dodoc CREDITS TODO loader/README.* doc/*txt
-
-       use doc && dohtml -r doc/html/*
-
-       docinto topology
-       dodoc topology/{TODO,README}
-
-       insinto /etc
-       doins "${FILESDIR}/postgis_dbs"
-
-       use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-       postgresql-config update
-
-       elog "To finish installing or updating PostGIS edit:"
-       elog "    ${EROOT%/}/etc/postgis_dbs"
-       elog
-       elog "Then, run:"
-       elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-       source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-       source "${EROOT%/}/etc/postgis_dbs"
-       local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-       if [[ -n ${configured} ]] ; then
-               einfon "Password for PostgreSQL user '${pguser}': "
-               read -s PGPASSWORD
-               export PGPASSWORD
-               echo
-       else
-               eerror "You must edit:"
-               eerror "    ${EROOT%/}/etc/postgis_dbs"
-               eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-               eerror
-               die "Edit postgis_dbs"
-       fi
-
-       # The server we work with must be the same slot we built against.
-       local server_match
-       server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-               -Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}")
-       if [[ $? = 0 ]] ; then
-               if [[ $server_match -ne 1 ]] ; then
-                       unset PGPASSWORD
-                       eerror "Server version must be ${PGSLOT}.x"
-                       die "Server version isn't ${PGSLOT}.x"
-               fi
-       else
-               unset PGPASSWORD
-               eerror "Is the server running?"
-               die "Couldn't connect to server."
-       fi
-
-       local retval
-       safe_exit() {
-               unset PGPASSWORD
-               sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-               eend $retval
-               eerror "All actions could not be performed."
-               eerror "Read above to see what failed."
-               eerror "Once you fix the issue, you'll need to edit:"
-               eerror "    ${EROOT%/}/etc/postgis_dbs"
-               eerror "As some things may have succeeded."
-               eerror
-               die "All actions could not be performed"
-       }
-
-       local db
-       for db in ${databases[@]} ; do
-               ebegin "Performing CREATE LANGUAGE on ${db}"
-               createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-               retval=$?
-               # In this case, only error code 1 is fatal
-               [[ $retval == 1 ]] && safe_exit || eend 0
-
-               ebegin "Enabling PostGIS on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${templates[@]} ; do
-               ebegin "Creating template database '${db}'"
-               createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-                       ${db} "PostGIS Template"
-               retval=$?
-               [[ $retval != 0 ]] && safe_exit
-
-               psql -q -U ${pguser} -p ${PGPORT} -c \
-                       "UPDATE pg_database \
-                        SET datistemplate = TRUE, datallowconn = TRUE \
-                        WHERE datname = '${db}'"
-               retval=$?
-               [[ $retval != 0 ]] && safe_exit
-
-               createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-               retval=$?
-               # In this case, only error code 1 is fatal
-               [[ $retval == 1 ]] && safe_exit
-
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${epsg_databases[@]} ; do
-               ebegin "Adding EPSG to ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/spatial_ref_sys.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${comment_databases[@]} ; do
-               ebegin "Adding comments on ${db}"
-               local comment_file
-               for comment_file in "${postgis_path}"/*_comments.sql ; do
-                       psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-                       retval=$?
-                       [[ $retval == 0 ]] && continue || safe_exit
-               done
-               eend 0
-       done
-
-       for db in ${upgrade_from_1_3[@]} ; do
-               ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${upgrade_from_1_4[@]} ; do
-               ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${upgrade_from_1_5[@]} ; do
-               ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       # Clean up and make it so the user has to edit postgis_dbs again that
-       # way this script won't step on any toes due to user error.
-       unset PGPASSWORD
-       sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-       einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-       einfo
-       einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
-}
diff --git a/dev-db/postgis/postgis-2.1.5.ebuild b/dev-db/postgis/postgis-2.1.5.ebuild
deleted file mode 100644 (file)
index 6d7fa20..0000000
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-POSTGRES_COMPAT=( 9.{0,1,2,3,4} )
-
-inherit autotools eutils versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk static-libs test"
-
-RDEPEND="
-               || (
-                       dev-db/postgresql:9.4[server]
-                       dev-db/postgresql:9.3[server]
-                       dev-db/postgresql:9.2[server]
-                       dev-db/postgresql:9.1[server]
-                       dev-db/postgresql:9.0[server]
-               )
-               dev-libs/json-c
-               dev-libs/libxml2:2
-               >=sci-libs/geos-3.4.2
-               >=sci-libs/proj-4.6.0
-               >=sci-libs/gdal-1.10.0
-               gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-               doc? (
-                               app-text/docbook-xsl-stylesheets
-                               app-text/docbook-xml-dtd:4.5
-                               dev-libs/libxslt
-                               || (
-                                       media-gfx/imagemagick[png]
-                                       media-gfx/graphicsmagick[imagemagick,png]
-                               )
-               )
-               virtual/pkgconfig
-               test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc )"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-postgres_check_slot() {
-       if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-               die 'POSTGRES_COMPAT not declared.'
-       fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" \
-       && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
-
-       local res=$(echo ${POSTGRES_COMPAT[@]} \
-               | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-       if [[ "$res" -eq "0" ]] ; then
-                       eerror "PostgreSQL slot must be set to one of: "
-                       eerror "    ${POSTGRES_COMPAT[@]}"
-                       return 1
-       fi
-
-       return 0
-}
-
-pkg_pretend() {
-       postgres_check_slot || die
-}
-
-pkg_setup() {
-       postgres_check_slot || die
-       export PGSLOT="$(postgresql-config show)"
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
-               "${FILESDIR}/${PN}-2.0-arflags.patch" \
-               "${FILESDIR}/${PN}-2.1.4-pkgconfig-json.patch"
-
-       local AT_M4DIR="macros"
-       eautoreconf
-}
-
-src_configure() {
-       local myargs=""
-       use gtk && myargs+=" --with-gui"
-       econf \
-               --with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
-               ${myargs}
-}
-
-src_compile() {
-       emake
-       emake -C topology
-
-       if use doc ; then
-               emake comments
-               emake cheatsheets
-               emake -C doc html
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       use doc && emake DESTDIR="${D}" comments-install
-       emake -C topology DESTDIR="${D}" install
-       dobin ./utils/postgis_restore.pl
-
-       dodoc CREDITS TODO loader/README.* doc/*txt
-
-       use doc && dohtml -r doc/html/*
-
-       docinto topology
-       dodoc topology/{TODO,README}
-
-       insinto /etc
-       doins "${FILESDIR}/postgis_dbs"
-
-       use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-       postgresql-config update
-
-       elog "To finish installing or updating PostGIS edit:"
-       elog "    ${EROOT%/}/etc/postgis_dbs"
-       elog
-       elog "Then, run:"
-       elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-       source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-       source "${EROOT%/}/etc/postgis_dbs"
-       local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-       if [[ -n ${configured} ]] ; then
-               einfon "Password for PostgreSQL user '${pguser}': "
-               read -s PGPASSWORD
-               export PGPASSWORD
-               echo
-       else
-               eerror "You must edit:"
-               eerror "    ${EROOT%/}/etc/postgis_dbs"
-               eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-               eerror
-               die "Edit postgis_dbs"
-       fi
-
-       # The server we work with must be the same slot we built against.
-       local server_match
-       server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-               -Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}")
-       if [[ $? = 0 ]] ; then
-               if [[ $server_match -ne 1 ]] ; then
-                       unset PGPASSWORD
-                       eerror "Server version must be ${PGSLOT}.x"
-                       die "Server version isn't ${PGSLOT}.x"
-               fi
-       else
-               unset PGPASSWORD
-               eerror "Is the server running?"
-               die "Couldn't connect to server."
-       fi
-
-       local retval
-       safe_exit() {
-               unset PGPASSWORD
-               sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-               eend $retval
-               eerror "All actions could not be performed."
-               eerror "Read above to see what failed."
-               eerror "Once you fix the issue, you'll need to edit:"
-               eerror "    ${EROOT%/}/etc/postgis_dbs"
-               eerror "As some things may have succeeded."
-               eerror
-               die "All actions could not be performed"
-       }
-
-       local db
-       for db in ${databases[@]} ; do
-               ebegin "Performing CREATE LANGUAGE on ${db}"
-               createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-               retval=$?
-               # In this case, only error code 1 is fatal
-               [[ $retval == 1 ]] && safe_exit || eend 0
-
-               ebegin "Enabling PostGIS on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${templates[@]} ; do
-               ebegin "Creating template database '${db}'"
-               createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-                       ${db} "PostGIS Template"
-               retval=$?
-               [[ $retval != 0 ]] && safe_exit
-
-               psql -q -U ${pguser} -p ${PGPORT} -c \
-                       "UPDATE pg_database \
-                        SET datistemplate = TRUE, datallowconn = TRUE \
-                        WHERE datname = '${db}'"
-               retval=$?
-               [[ $retval != 0 ]] && safe_exit
-
-               createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-               retval=$?
-               # In this case, only error code 1 is fatal
-               [[ $retval == 1 ]] && safe_exit
-
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${epsg_databases[@]} ; do
-               ebegin "Adding EPSG to ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/spatial_ref_sys.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${comment_databases[@]} ; do
-               ebegin "Adding comments on ${db}"
-               local comment_file
-               for comment_file in "${postgis_path}"/*_comments.sql ; do
-                       psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-                       retval=$?
-                       [[ $retval == 0 ]] && continue || safe_exit
-               done
-               eend 0
-       done
-
-       for db in ${upgrade_from_1_3[@]} ; do
-               ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${upgrade_from_1_4[@]} ; do
-               ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${upgrade_from_1_5[@]} ; do
-               ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       # Clean up and make it so the user has to edit postgis_dbs again that
-       # way this script won't step on any toes due to user error.
-       unset PGPASSWORD
-       sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-       einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-       einfo
-       einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
-}
diff --git a/dev-db/postgis/postgis-2.1.6.ebuild b/dev-db/postgis/postgis-2.1.6.ebuild
deleted file mode 100644 (file)
index d332459..0000000
+++ /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"
-POSTGRES_COMPAT=( 9.{0,1,2,3,4} )
-
-inherit autotools eutils versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk static-libs test"
-
-RDEPEND="
-               || (
-                       dev-db/postgresql:9.4[server]
-                       dev-db/postgresql:9.3[server]
-                       dev-db/postgresql:9.2[server]
-                       dev-db/postgresql:9.1[server]
-                       dev-db/postgresql:9.0[server]
-               )
-               dev-libs/json-c
-               dev-libs/libxml2:2
-               >=sci-libs/geos-3.4.2
-               >=sci-libs/proj-4.6.0
-               >=sci-libs/gdal-1.10.0
-               gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-               doc? (
-                               app-text/docbook-xsl-stylesheets
-                               app-text/docbook-xml-dtd:4.5
-                               dev-libs/libxslt
-                               || (
-                                       media-gfx/imagemagick[png]
-                                       media-gfx/graphicsmagick[imagemagick,png]
-                               )
-               )
-               virtual/pkgconfig
-               test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc )"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-postgres_check_slot() {
-       if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-               die 'POSTGRES_COMPAT not declared.'
-       fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" \
-       && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
-
-       local res=$(echo ${POSTGRES_COMPAT[@]} \
-               | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-       if [[ "$res" -eq "0" ]] ; then
-                       eerror "PostgreSQL slot must be set to one of: "
-                       eerror "    ${POSTGRES_COMPAT[@]}"
-                       return 1
-       fi
-
-       return 0
-}
-
-pkg_setup() {
-       postgres_check_slot || die
-       export PGSLOT="$(postgresql-config show)"
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
-               "${FILESDIR}/${PN}-2.0-arflags.patch" \
-               "${FILESDIR}/${PN}-2.1.4-pkgconfig-json.patch"
-
-       local AT_M4DIR="macros"
-       eautoreconf
-}
-
-src_configure() {
-       local myargs=""
-       use gtk && myargs+=" --with-gui"
-       econf \
-               --with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
-               ${myargs}
-}
-
-src_compile() {
-       emake
-       emake -C topology
-
-       if use doc ; then
-               emake comments
-               emake cheatsheets
-               emake -C doc html
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       use doc && emake DESTDIR="${D}" comments-install
-       emake -C topology DESTDIR="${D}" install
-       dobin ./utils/postgis_restore.pl
-
-       dodoc CREDITS TODO loader/README.* doc/*txt
-
-       use doc && dohtml -r doc/html/*
-
-       docinto topology
-       dodoc topology/{TODO,README}
-
-       insinto /etc
-       doins "${FILESDIR}/postgis_dbs"
-
-       use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-       postgresql-config update
-
-       elog "To finish installing or updating PostGIS edit:"
-       elog "    ${EROOT%/}/etc/postgis_dbs"
-       elog
-       elog "Then, run:"
-       elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-       source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-       source "${EROOT%/}/etc/postgis_dbs"
-       local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-       if [[ -n ${configured} ]] ; then
-               einfon "Password for PostgreSQL user '${pguser}': "
-               read -s PGPASSWORD
-               export PGPASSWORD
-               echo
-       else
-               eerror "You must edit:"
-               eerror "    ${EROOT%/}/etc/postgis_dbs"
-               eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-               eerror
-               die "Edit postgis_dbs"
-       fi
-
-       # The server we work with must be the same slot we built against.
-       local server_match
-       server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-               -Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}")
-       if [[ $? = 0 ]] ; then
-               if [[ $server_match -ne 1 ]] ; then
-                       unset PGPASSWORD
-                       eerror "Server version must be ${PGSLOT}.x"
-                       die "Server version isn't ${PGSLOT}.x"
-               fi
-       else
-               unset PGPASSWORD
-               eerror "Is the server running?"
-               die "Couldn't connect to server."
-       fi
-
-       local retval
-       safe_exit() {
-               unset PGPASSWORD
-               sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-               eend $retval
-               eerror "All actions could not be performed."
-               eerror "Read above to see what failed."
-               eerror "Once you fix the issue, you'll need to edit:"
-               eerror "    ${EROOT%/}/etc/postgis_dbs"
-               eerror "As some things may have succeeded."
-               eerror
-               die "All actions could not be performed"
-       }
-
-       local db
-       for db in ${databases[@]} ; do
-               ebegin "Performing CREATE LANGUAGE on ${db}"
-               createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-               retval=$?
-               # In this case, only error code 1 is fatal
-               [[ $retval == 1 ]] && safe_exit || eend 0
-
-               ebegin "Enabling PostGIS on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${templates[@]} ; do
-               ebegin "Creating template database '${db}'"
-               createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-                       ${db} "PostGIS Template"
-               retval=$?
-               [[ $retval != 0 ]] && safe_exit
-
-               psql -q -U ${pguser} -p ${PGPORT} -c \
-                       "UPDATE pg_database \
-                        SET datistemplate = TRUE, datallowconn = TRUE \
-                        WHERE datname = '${db}'"
-               retval=$?
-               [[ $retval != 0 ]] && safe_exit
-
-               createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-               retval=$?
-               # In this case, only error code 1 is fatal
-               [[ $retval == 1 ]] && safe_exit
-
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${epsg_databases[@]} ; do
-               ebegin "Adding EPSG to ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/spatial_ref_sys.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${comment_databases[@]} ; do
-               ebegin "Adding comments on ${db}"
-               local comment_file
-               for comment_file in "${postgis_path}"/*_comments.sql ; do
-                       psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-                       retval=$?
-                       [[ $retval == 0 ]] && continue || safe_exit
-               done
-               eend 0
-       done
-
-       for db in ${upgrade_from_1_3[@]} ; do
-               ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${upgrade_from_1_4[@]} ; do
-               ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${upgrade_from_1_5[@]} ; do
-               ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       # Clean up and make it so the user has to edit postgis_dbs again that
-       # way this script won't step on any toes due to user error.
-       unset PGPASSWORD
-       sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-       einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-       einfo
-       einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
-}
diff --git a/dev-db/postgis/postgis-2.1.7.ebuild b/dev-db/postgis/postgis-2.1.7.ebuild
deleted file mode 100644 (file)
index 1397b5b..0000000
+++ /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"
-POSTGRES_COMPAT=( 9.{0,1,2,3,4,5} )
-
-inherit autotools eutils versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk static-libs test"
-
-RDEPEND="
-               || (
-                       dev-db/postgresql:9.4[server]
-                       dev-db/postgresql:9.3[server]
-                       dev-db/postgresql:9.2[server]
-                       dev-db/postgresql:9.1[server]
-                       dev-db/postgresql:9.0[server]
-               )
-               dev-libs/json-c
-               dev-libs/libxml2:2
-               >=sci-libs/geos-3.4.2
-               >=sci-libs/proj-4.6.0
-               >=sci-libs/gdal-1.10.0
-               gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-               doc? (
-                               app-text/docbook-xsl-stylesheets
-                               app-text/docbook-xml-dtd:4.5
-                               dev-libs/libxslt
-                               || (
-                                       media-gfx/imagemagick[png]
-                                       media-gfx/graphicsmagick[imagemagick,png]
-                               )
-               )
-               virtual/pkgconfig
-               test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc )"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-postgres_check_slot() {
-       if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-               die 'POSTGRES_COMPAT not declared.'
-       fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" \
-       && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
-
-       local res=$(echo ${POSTGRES_COMPAT[@]} \
-               | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-       if [[ "$res" -eq "0" ]] ; then
-                       eerror "PostgreSQL slot must be set to one of: "
-                       eerror "    ${POSTGRES_COMPAT[@]}"
-                       return 1
-       fi
-
-       return 0
-}
-
-pkg_setup() {
-       postgres_check_slot || die
-       export PGSLOT="$(postgresql-config show)"
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
-               "${FILESDIR}/${PN}-2.0-arflags.patch" \
-               "${FILESDIR}/${PN}-2.1.4-pkgconfig-json.patch"
-
-       local AT_M4DIR="macros"
-       eautoreconf
-}
-
-src_configure() {
-       local myargs=""
-       use gtk && myargs+=" --with-gui"
-       econf \
-               --with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
-               ${myargs}
-}
-
-src_compile() {
-       emake
-       emake -C topology
-
-       if use doc ; then
-               emake comments
-               emake cheatsheets
-               emake -C doc html
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       use doc && emake DESTDIR="${D}" comments-install
-       emake -C topology DESTDIR="${D}" install
-       dobin ./utils/postgis_restore.pl
-
-       dodoc CREDITS TODO loader/README.* doc/*txt
-
-       use doc && dohtml -r doc/html/*
-
-       docinto topology
-       dodoc topology/{TODO,README}
-
-       insinto /etc
-       doins "${FILESDIR}/postgis_dbs"
-
-       use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-       postgresql-config update
-
-       elog "To finish installing or updating PostGIS edit:"
-       elog "    ${EROOT%/}/etc/postgis_dbs"
-       elog
-       elog "Then, run:"
-       elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-       source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-       source "${EROOT%/}/etc/postgis_dbs"
-       local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-       if [[ -n ${configured} ]] ; then
-               einfon "Password for PostgreSQL user '${pguser}': "
-               read -s PGPASSWORD
-               export PGPASSWORD
-               echo
-       else
-               eerror "You must edit:"
-               eerror "    ${EROOT%/}/etc/postgis_dbs"
-               eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-               eerror
-               die "Edit postgis_dbs"
-       fi
-
-       # The server we work with must be the same slot we built against.
-       local server_match
-       server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-               -Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}")
-       if [[ $? = 0 ]] ; then
-               if [[ $server_match -ne 1 ]] ; then
-                       unset PGPASSWORD
-                       eerror "Server version must be ${PGSLOT}.x"
-                       die "Server version isn't ${PGSLOT}.x"
-               fi
-       else
-               unset PGPASSWORD
-               eerror "Is the server running?"
-               die "Couldn't connect to server."
-       fi
-
-       local retval
-       safe_exit() {
-               unset PGPASSWORD
-               sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-               eend $retval
-               eerror "All actions could not be performed."
-               eerror "Read above to see what failed."
-               eerror "Once you fix the issue, you'll need to edit:"
-               eerror "    ${EROOT%/}/etc/postgis_dbs"
-               eerror "As some things may have succeeded."
-               eerror
-               die "All actions could not be performed"
-       }
-
-       local db
-       for db in ${databases[@]} ; do
-               ebegin "Performing CREATE LANGUAGE on ${db}"
-               createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-               retval=$?
-               # In this case, only error code 1 is fatal
-               [[ $retval == 1 ]] && safe_exit || eend 0
-
-               ebegin "Enabling PostGIS on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${templates[@]} ; do
-               ebegin "Creating template database '${db}'"
-               createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-                       ${db} "PostGIS Template"
-               retval=$?
-               [[ $retval != 0 ]] && safe_exit
-
-               psql -q -U ${pguser} -p ${PGPORT} -c \
-                       "UPDATE pg_database \
-                        SET datistemplate = TRUE, datallowconn = TRUE \
-                        WHERE datname = '${db}'"
-               retval=$?
-               [[ $retval != 0 ]] && safe_exit
-
-               createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-               retval=$?
-               # In this case, only error code 1 is fatal
-               [[ $retval == 1 ]] && safe_exit
-
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${epsg_databases[@]} ; do
-               ebegin "Adding EPSG to ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/spatial_ref_sys.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${comment_databases[@]} ; do
-               ebegin "Adding comments on ${db}"
-               local comment_file
-               for comment_file in "${postgis_path}"/*_comments.sql ; do
-                       psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-                       retval=$?
-                       [[ $retval == 0 ]] && continue || safe_exit
-               done
-               eend 0
-       done
-
-       for db in ${upgrade_from_1_3[@]} ; do
-               ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${upgrade_from_1_4[@]} ; do
-               ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       for db in ${upgrade_from_1_5[@]} ; do
-               ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-               psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-                       -f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-               retval=$?
-               [[ $retval == 0 ]] && eend 0 || safe_exit
-       done
-
-       # Clean up and make it so the user has to edit postgis_dbs again that
-       # way this script won't step on any toes due to user error.
-       unset PGPASSWORD
-       sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-       einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-       einfo
-       einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
-}
diff --git a/dev-db/postgis/postgis-2.2.0.ebuild b/dev-db/postgis/postgis-2.2.0.ebuild
new file mode 100644 (file)
index 0000000..c6e8ec1
--- /dev/null
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+POSTGRES_COMPAT=( 9.{1,2,3,4,5} )
+
+inherit autotools eutils versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net"
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gtk static-libs test"
+
+RDEPEND="
+               || (
+                       dev-db/postgresql:9.5[server]
+                       dev-db/postgresql:9.4[server]
+                       dev-db/postgresql:9.3[server]
+                       dev-db/postgresql:9.2[server]
+                       dev-db/postgresql:9.1[server]
+               )
+               dev-libs/json-c
+               dev-libs/libxml2:2
+               >=sci-libs/geos-3.5.0
+               >=sci-libs/proj-4.6.0
+               >=sci-libs/gdal-1.10.0
+               gtk? ( x11-libs/gtk+:2 )
+"
+
+DEPEND="${RDEPEND}
+               doc? (
+                               app-text/docbook-xsl-stylesheets
+                               app-text/docbook-xml-dtd:4.5
+                               dev-libs/libxslt
+                               || (
+                                       media-gfx/imagemagick[png]
+                                       media-gfx/graphicsmagick[imagemagick,png]
+                               )
+               )
+               virtual/pkgconfig
+               test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc )"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+MAKEOPTS+=' -j1'
+
+# These modules are built using the same *FLAGS that were used to build
+# dev-db/postgresql. The right thing to do is to ignore the current
+# *FLAGS settings.
+QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+postgres_check_slot() {
+       if ! declare -p POSTGRES_COMPAT &>/dev/null; then
+               die 'POSTGRES_COMPAT not declared.'
+       fi
+
+# Don't die because we can't run postgresql-config during pretend.
+[[ "$EBUILD_PHASE" = "pretend" \
+       && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
+
+       local res=$(echo ${POSTGRES_COMPAT[@]} \
+               | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
+
+       if [[ "$res" -eq "0" ]] ; then
+                       eerror "PostgreSQL slot must be set to one of: "
+                       eerror "    ${POSTGRES_COMPAT[@]}"
+                       return 1
+       fi
+
+       return 0
+}
+
+pkg_pretend() {
+       postgres_check_slot || die
+}
+
+pkg_setup() {
+       postgres_check_slot || die
+       export PGSLOT="$(postgresql-config show)"
+}
+
+src_prepare() {
+       epatch "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+
+       local AT_M4DIR="macros"
+       eautoreconf
+}
+
+src_configure() {
+       local myargs=""
+       use gtk && myargs+=" --with-gui"
+       econf \
+               --with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
+               ${myargs}
+}
+
+src_compile() {
+       emake
+       emake -C topology
+
+       if use doc ; then
+               emake comments
+               emake cheatsheets
+               emake -C doc html
+       fi
+}
+
+src_install() {
+       emake DESTDIR="${D}" install
+       use doc && emake DESTDIR="${D}" comments-install
+       emake -C topology DESTDIR="${D}" install
+       dobin ./utils/postgis_restore.pl
+
+       dodoc CREDITS TODO loader/README.* doc/*txt
+
+       use doc && dohtml -r doc/html/*
+
+       docinto topology
+       dodoc topology/{TODO,README}
+
+       use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+pkg_postinst() {
+       postgresql-config update
+
+       elog "To finish installing PostGIS, follow the directions detailed at:"
+       elog "http://postgis.net/docs/manual-${MY_PV}/postgis_installation.html#create_new_db_extensions"
+}
diff --git a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild
new file mode 100644 (file)
index 0000000..d08a3dd
--- /dev/null
@@ -0,0 +1,401 @@
+# 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
+
+       # Rely on $PATH being in the proper order so that the correct
+       # install program is used for modules utilizing PGXS in both
+       # hardened and non-hardened environments. (Bug #528786)
+       sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || 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
+
+               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.4.5-r2.ebuild b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild
new file mode 100644 (file)
index 0000000..3a8c797
--- /dev/null
@@ -0,0 +1,433 @@
+# 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
+
+       # Rely on $PATH being in the proper order so that the correct
+       # install program is used for modules utilizing PGXS in both
+       # hardened and non-hardened environments. (Bug #528786)
+       sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || 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
+
+               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_beta2-r1.ebuild b/dev-db/postgresql/postgresql-9.5_beta2-r1.ebuild
new file mode 100644 (file)
index 0000000..181c72e
--- /dev/null
@@ -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=( 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
+
+       # Rely on $PATH being in the proper order so that the correct
+       # install program is used for modules utilizing PGXS in both
+       # hardened and non-hardened environments. (Bug #528786)
+       sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || 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
+
+               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
+}
index c2fe866097b02936f8d201cd9ab560d97456cdf2..addb7aa53fc931dc2a39193b024797310d377577 100644 (file)
@@ -112,6 +112,11 @@ src_prepare() {
        sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
                -i src/include/pg_config_manual.h || die
 
+       # Rely on $PATH being in the proper order so that the correct
+       # install program is used for modules utilizing PGXS in both
+       # hardened and non-hardened environments. (Bug #528786)
+       sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
        if use pam ; then
                sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
                        -i src/backend/libpq/auth.c || \
index bbc68548f3048b29434e436f5bfc0a8b931eb028..5715577a33622e64f513904a5c733cd8446e8d63 100644 (file)
@@ -46,7 +46,7 @@ RDEPEND="app-arch/bzip2
                ) )
                gdbm? ( sys-libs/gdbm[berkdb] )
                ncurses? (
-                       >=sys-libs/ncurses-5.2
+                       >=sys-libs/ncurses-5.2:0
                        readline? ( >=sys-libs/readline-4.1 )
                )
                sqlite? ( >=dev-db/sqlite-3.3.8:3 )
index c790c996d67548a31bc5f1b338cc3c5b8dfb59ee..37e68f3b95fdff1678501c85a1f34caf41b8b218 100644 (file)
@@ -35,7 +35,7 @@ RDEPEND="app-arch/bzip2
        !build? (
                gdbm? ( sys-libs/gdbm[berkdb] )
                ncurses? (
-                       >=sys-libs/ncurses-5.2
+                       >=sys-libs/ncurses-5.2:0
                        readline? ( >=sys-libs/readline-4.1 )
                )
                sqlite? ( >=dev-db/sqlite-3.3.8:3 )
index 11498ce3698742d9ae8aba8a334a2caaf3201f8a..67231a25b429040b3236a106dee218d28a7c2020 100644 (file)
@@ -34,7 +34,7 @@ RDEPEND="app-arch/bzip2
        !build? (
                gdbm? ( sys-libs/gdbm[berkdb] )
                ncurses? (
-                       >=sys-libs/ncurses-5.2
+                       >=sys-libs/ncurses-5.2:0
                        readline? ( >=sys-libs/readline-4.1 )
                )
                sqlite? ( >=dev-db/sqlite-3.3.8:3 )
index c1011ddbab0811eb4c453005057232f6e8e326ed..129678571f9f8d124f77d2251ebd37cf4ed8a367 100644 (file)
@@ -1,6 +1,2 @@
-DIST qcustomplot-sharedlib-1.2.1.tar.gz 1920 SHA256 16b3f59182d3703152589d71da580fbded0a67f88ab7df81b86095422d27685b SHA512 51df754a6657621a5e5b2e3dcc295890ac76ab4839089f25c65eb84758e7ac5c9821dd47acbaaa8da7a69b609abb1b6a829939eee616111994278856d371be78 WHIRLPOOL 02a3476811f89dbd21003d1da063615a9776d67436c5f525f5a773b21274a6aa091ba44130e7989f842bd85aad7633efa8a361cadadea2f3343b57a120f62cc4
-DIST qcustomplot-sharedlib-1.3.0.tar.gz 1927 SHA256 68f4574b53f0cbdaafdee06ad0048b60e4905d5031033f1721886cf763e1f774 SHA512 6ab098a676dc3ed4caba2b0784b79ebca70de52296dc1ca0caca7c00b2abc46d92ff1903785a9185eedd78044f9b9d730d798dc91cff5cc76b463796a74e3e9e WHIRLPOOL 0e919fb38e799217d3eb2f62915a6a9077ad621eb248cbd722cfd659e929471bff09c015df1be46c1d6a8f23b77c7bc437ec7ae430980dbfe0b07292909c99b0
 DIST qcustomplot-sharedlib-1.3.1.tar.gz 1926 SHA256 214b4dc82c612822b46976159864cc34732ebf0ce717bbe6d930760374344495 SHA512 1debdffed022dd3cd419d0a928176b6b0b1365739feaf8ca69458a9c6e16aa64c95d9b68eed2cde0699d7ab82e5dd66bcff8bbdb2f26e4a14e3186b3350342e6 WHIRLPOOL a51fd6ec8e46619a61b778656475ee2b3ff194d2b15c160246b1689f1b945160beece5a8762bf3fb1c8e9bc7f0cd570472379b0a679138d80609d6c3b38b481b
-DIST qcustomplot-source-1.2.1.tar.gz 208367 SHA256 9ac31c797ce9116c0b062249028c25a8b04a0cb4ae5cd5dcca52c2000a64bcd2 SHA512 f4613b4e85b98616974588edfe35c262eaa7975486a252b18f73c28aa3ed5e867955ddd6243f082b4fa080a93890d7d20b64e8f12e03bf6fdcb8417554438523 WHIRLPOOL 0c1dd80e0220ee9f80deff0b8baf373da587622084b834b6b3a9194d7286aae5a29bc352bf8d7bddcc8f27df6ebf7044709973d2179c1b4bed402cea9b94cdb2
-DIST qcustomplot-source-1.3.0.tar.gz 222695 SHA256 1b4c9d5ad4581fc33465e4e5a3ec63938fdaad78944e6118d1aa25dd0235afd6 SHA512 6991c05d38677f24697516fd41c6a6e85d6becd1de8e1e413577170246945fc318519d74407c6a995d72e2c6c05114469e6fbbdea2b17b1060f6d2fc35fb3d7f WHIRLPOOL 32e98f2b2d6e5d80017711d92a9587dce29880c9e707cfe291ee71a8b04a06680ca96aa52be0092875bc98cefe02f052eb98a6c1990b976b9ae3e68b26e61ec7
 DIST qcustomplot-source-1.3.1.tar.gz 224892 SHA256 b557728956945931ff75d21c0894c52a6341850ad246811affdda8b10bbc8486 SHA512 ce5d74d7ae1fb8f4547368c712e3e6f5192cf64df9ece4b055910f0ab4c4244446b3869f078214e38bb5337e755647e07f9a111f96553172b7960ae434d7800b WHIRLPOOL c1d3a817bf389d2e64df489961f072d5b0317c321a3a5d77f5176e8200ea01dc721953a396cd63e87a8ae1ece79406b3b6e6453af0c9550272850eb4f6ac33c4
diff --git a/dev-libs/qcustomplot/qcustomplot-1.2.1.ebuild b/dev-libs/qcustomplot/qcustomplot-1.2.1.ebuild
deleted file mode 100644 (file)
index 7c88dcf..0000000
+++ /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
-
-inherit qt4-r2
-
-DESCRIPTION="Qt C++ widget for plotting and data visualization"
-HOMEPAGE="http://www.qcustomplot.com/"
-SRC_URI="
-       http://www.qcustomplot.com/release/${PV}/QCustomPlot-sharedlib.tar.gz -> ${PN}-sharedlib-${PV}.tar.gz
-       http://www.qcustomplot.com/release/${PV}/QCustomPlot-source.tar.gz -> ${PN}-source-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-       dev-qt/qtcore:4
-       dev-qt/qtgui:4"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}-source
-
-src_prepare() {
-       sed \
-               -e 's:../../::g' \
-               -e '/CONFIG/s:shared.*:shared:g' \
-               "${WORKDIR}"/${PN}-sharedlib/sharedlib-compilation/sharedlib-compilation.pro > ${PN}.pro || die
-       qt4-r2_src_prepare
-}
-
-src_install() {
-       dolib.so lib${PN}*
-       doheader ${PN}.h
-       dodoc changelog.txt
-}
diff --git a/dev-libs/qcustomplot/qcustomplot-1.3.0.ebuild b/dev-libs/qcustomplot/qcustomplot-1.3.0.ebuild
deleted file mode 100644 (file)
index 028c9bf..0000000
+++ /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
-
-inherit qmake-utils
-
-DESCRIPTION="Qt C++ widget for plotting and data visualization"
-HOMEPAGE="http://www.qcustomplot.com/"
-SRC_URI="
-       http://www.qcustomplot.com/release/${PV}/QCustomPlot-sharedlib.tar.gz -> ${PN}-sharedlib-${PV}.tar.gz
-       http://www.qcustomplot.com/release/${PV}/QCustomPlot-source.tar.gz -> ${PN}-source-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="qt4 qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
-       qt4? (
-               dev-qt/qtcore:4
-               dev-qt/qtgui:4
-       )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtprintsupport:5
-               dev-qt/qtwidgets:5
-       )
-               "
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}-source
-
-src_prepare() {
-       sed \
-               -e 's:../../::g' \
-               -e '/CONFIG/s:shared.*:shared:g' \
-               "${WORKDIR}"/${PN}-sharedlib/sharedlib-compilation/sharedlib-compilation.pro > ${PN}.pro || die
-}
-
-src_configure() {
-       use qt4 && eqmake4
-       use qt5 && eqmake5
-}
-
-src_install() {
-       dolib.so lib${PN}*
-       doheader ${PN}.h
-       dodoc changelog.txt
-}
diff --git a/dev-lisp/trivial-gray-streams/Manifest b/dev-lisp/trivial-gray-streams/Manifest
new file mode 100644 (file)
index 0000000..80183fe
--- /dev/null
@@ -0,0 +1 @@
+DIST trivial-gray-streams-2008-11-02.tar.gz 3522 SHA256 827eff9528b469f18c332d0dec68a2498ca9261950635b1cd8e589a492b589a4 SHA512 81ca798988511237a5a4c9ae4e0b15253404c47e245cc644211ffc58015fd46fa1623fecf7f07ea5df7acf80fff24782410ef832f08fd55f71c57daad6ced787 WHIRLPOOL 07b4ba232c7a6156667a084adf56684c3d04ace96d56a282298fd7e284760b60c1fefa09f90053e1400fed5c2d6cb25dbb2756697c08ad15b2647fd72933e26e
diff --git a/dev-lisp/trivial-gray-streams/metadata.xml b/dev-lisp/trivial-gray-streams/metadata.xml
new file mode 100644 (file)
index 0000000..6dbd467
--- /dev/null
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+       <herd>common-lisp</herd>
+       <longdescription lang="en">
+               This system provides an extremely thin compatibility layer for
+               Gray streams
+       </longdescription>
+</pkgmetadata>
diff --git a/dev-lisp/trivial-gray-streams/trivial-gray-streams-20081102.ebuild b/dev-lisp/trivial-gray-streams/trivial-gray-streams-20081102.ebuild
new file mode 100644 (file)
index 0000000..71cf386
--- /dev/null
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit common-lisp-3
+
+MY_PV=${PV:0:4}-${PV:4:2}-${PV:6:2}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="A thin compatibility layer between Gray Stream Common Lisp implementations"
+HOMEPAGE="https://common-lisp.net/project/trivial-gray-streams/"
+SRC_URI="http://common-lisp.net/project/cl-plus-ssl/download/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!dev-lisp/cl-${PN}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+       unpack ${A}
+       rm "${S}"/Makefile
+}
diff --git a/dev-lisp/trivial-gray-streams/trivial-gray-streams-9999.ebuild b/dev-lisp/trivial-gray-streams/trivial-gray-streams-9999.ebuild
new file mode 100644 (file)
index 0000000..f73f20d
--- /dev/null
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit common-lisp-3 git-2
+
+DESCRIPTION="A thin compatibility layer between Gray Stream Common Lisp implementations"
+HOMEPAGE="https://common-lisp.net/project/trivial-gray-streams/"
+EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="!dev-lisp/cl-${PN}"
index 6baec64d2f08f82ccfb5fec8b5496cc7cb9c2435..2ec2993f8d9a77463f5a3ad73baf2c00b4129111 100644 (file)
@@ -1,4 +1,5 @@
 DIST numpy-1.10.1.tar.gz 4048478 SHA256 8b9f453f29ce96a14e625100d3dcf8926301d36c5f622623bf8820e748510858 SHA512 ea717bac913a8e63bf93822bddbfe7701a3de00051bf3c7020f5e22756987becb5a2f96a6a52a36fc7c2b856815a782e450099688ce86b21fa94b0076b9ef376 WHIRLPOOL 7671368bec55c7f53ffa78a509946acc998e6f4223da4f3429b82a5a38b5e0277a0f89773ec2335f8e46b5c695620a4119af5ab59734184054c31b11841de44b
+DIST numpy-1.10.2.tar.gz 4055005 SHA256 23a3befdf955db4d616f8bb77b324680a80a323e0c42a7e8d7388ef578d8ffa9 SHA512 040db49593f3c53c9b43301eacffc3b5817310f1dbb91fd650efcf5ba65ce7e217549dc5268bc56846f19f1a03dd19470989005aa176531af44d602b3546b007 WHIRLPOOL 30c4b365aac6623241afd72fc30d3a543183205eb23db1366937e39fc50dee862923dd249775fee67cce0199940a57ec1423f1cb0e65ff7c65764c7969d7a76f
 DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311
 DIST numpy-1.9.2.tar.gz 3986067 SHA256 325e5f2b0b434ecb6e6882c7e1034cc6cdde3eeeea87dbc482575199a6aeef2a SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9 WHIRLPOOL 59f5dc52cb95c7ce80fec3a7feac6cfda1d149596bf6d95c18bd8314e31a8df494b2b470c4cc3d8c296c9fc11c718d70d5b9b5344337175ca75496504c0fd201
 DIST numpy-1.9.3.tar.gz 3984430 SHA256 c3b74d3b9da4ceb11f66abd21e117da8cf584b63a0efbd01a9b7e91b693fbbd6 SHA512 32531cd8d1480a50812454ef8e3b68c0f84b2a4bc5de0df1457070db7f6fd94cdb50e6479a85fa4d1dc569a10d28f6864d5069fcf2a32fa20fa8803476a3df8c WHIRLPOOL a0235594e793625d5e3cef57956f4710587158885f39d7d1267c9845b12fb1d39fb9987ec095720c2d285c7c726383a15471f3629b739b77186470e2c40ba093
diff --git a/dev-python/numpy/numpy-1.10.2.ebuild b/dev-python/numpy/numpy-1.10.2.ebuild
new file mode 100644 (file)
index 0000000..79f9a89
--- /dev/null
@@ -0,0 +1,155 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+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}.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
+       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)
+               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
+
+       sed \
+               -e "s:\"cblas\":\"$(pc_libs cblas)\":g" \
+               -i numpy/distutils/system_info.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-9999.ebuild b/dev-python/numpy/numpy-9999.ebuild
new file mode 100644 (file)
index 0000000..e170cb9
--- /dev/null
@@ -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 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 git-r3 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=""
+EGIT_REPO_URI="https://github.com/numpy/numpy.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="lapack test"
+
+RDEPEND="
+       dev-python/setuptools[${PYTHON_USEDEP}]
+       lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+       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
+)
+
+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)
+               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
+
+       sed \
+               -e "s:\"cblas\":\"$(pc_libs cblas)\":g" \
+               -i numpy/distutils/system_info.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
+
+       # absent in 1.9
+       #docinto f2py
+       #dodoc numpy/f2py/docs/*.txt
+       #doman numpy/f2py/f2py.1
+}
index eaa73c1daf827b9120f90885a470c7298c4489e7..8c34a42466b488ebeb3330adaac18c4371521278 100644 (file)
@@ -3,3 +3,4 @@ DIST mavros-0.16.0.tar.gz 193327 SHA256 3712bd20209ff725bb1b8055e6c10f57a91535b3
 DIST mavros-0.16.1.tar.gz 193407 SHA256 1ae2e8988d15f65d3e724373045b034a2fd1af9438b7f044b0fc9887f3579fb8 SHA512 2b1a6792cf244ca647e6150cad92542dab32f73b13122af72cbe10ff1deaeda81183ec02d80a318bc8292dac55f981ec0d6e1812db81d2d20f1cc96bf7474492 WHIRLPOOL 852d852da73e8a956b5be7d31c2ef2da7d524b9b2ab4818cc1267d1fdcdf3760f8f2cc295f51cfb51982c73d8c50158170508e8f9d2b5af9d368916341ab30be
 DIST mavros-0.16.2.tar.gz 193530 SHA256 5f2b7cc609e68b14c67153590d01edc28bceb5af64febc97728cc09dad1b29ad SHA512 dc8767d3416e7290743ebe7073d721cbffe8400be20f54c8c6c9c5ed6129f614a670c81d910c25f054065ffa1022d862709364fe06ec1522dbd25344516e4343 WHIRLPOOL 3215a413732dab0e722aad5d06c1d048ae814ee85a248608d6aa41f67aabd081a01b7c883ffef483e596437c651827a03c92af248a70ef9973e95227e7477a48
 DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cbaf938fd7cbe96241ba0ad03c SHA512 0ebec5b04a2b28abc24936ba6082edd08aa45cd6e59eef0ff94cce189c57bd0fdb5f5464110c07d563cf5bf9748c309a1659cf37fb61bdff423747f85f9fd1b7 WHIRLPOOL bf55006fa98c6bf9625b8517c2c775ae515147847f8a611e2d3f46eca21c6f3be270015903c4134e5dcd39039e9870abd4f2f3adaabfeb1e62c4957b642ba014
+DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626837b643878ea1e1955d954cf SHA512 d2606671fab43cc9a4daf678d02286a2f31a0688c8ea327163f2dc06928bf640f425bca2bcfe2cb51a0d7aa108cca2dfbaa819deeaf56bbc9cfb784b4f0a4951 WHIRLPOOL 5a5f9e0243d4d04f16911214d40061464471df418e30e7a7cc099c7b82c429f16c2dc10432d3184f856fc23612161a574173e78c47d9462d9feefdc403414cb8
diff --git a/dev-ros/libmavconn/libmavconn-0.16.4.ebuild b/dev-ros/libmavconn/libmavconn-0.16.4.ebuild
new file mode 100644 (file)
index 0000000..52d2985
--- /dev/null
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+       >=dev-ros/mavlink-gbp-release-2015.12.12
+       dev-libs/boost:=
+       dev-libs/console_bridge
+"
+DEPEND="${RDEPEND}"
index b355f3bf65a3cc6f885daea4b96707a04894e9dc..52d298555cc37e752071409c2c44478209c42007 100644 (file)
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-       >=dev-ros/mavlink-gbp-release-2015
+       >=dev-ros/mavlink-gbp-release-2015.12.12
        dev-libs/boost:=
        dev-libs/console_bridge
 "
index 4a312e40b924e649e6a773a7a8222a2fd2ca2ca5..28d166858793c26864c4f359ec1a27ac80c1cad9 100644 (file)
@@ -1 +1,2 @@
 DIST mavlink-gbp-release-2015.10.10.tar.gz 472939 SHA256 a9b6c80a0e8b1df4623e22d83b1e7cebf5242e843f0c83faa699687e2d03d0fd SHA512 9686513a28ec4942da292c0ecf8c8ad84f0e79538272ce4ef353da76bc8ce2f34c20d1d74085b086f7fee315abd64948fe462e40036addfd167b579f86ea5393 WHIRLPOOL 59316cfa5ba2c003dec9299c6e6f2f2920a12cf9379c58ee64ddb2aeca3112915934b67cd1be04370e3571e674c9f6c1010cf8f1d0480121682c8ac3570a15ab
+DIST mavlink-gbp-release-2015.12.12.tar.gz 479433 SHA256 f5bab2ca92ef9c82aebffa69448eabfe26a9beedd4daa03301bc284ed65b63d8 SHA512 afadec6ed2b1a479c8c264f6805d0237843a4d501a1a7ed376749e7312dc2f5562d1af3bcac07670823abda9ba4f3104a16b5bfc18e0083b00ed4cbf44a780fc WHIRLPOOL 41a92dfd53fad94b56a5c0153b7e920ce7778ad606c5bda7f78bfff4b998bd89365119070a15143f8929dfd5e56c36181abd350fd7e824dc1e688cc17bb56420
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.12.12.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.12.12.ebuild
new file mode 100644 (file)
index 0000000..97f60dd
--- /dev/null
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
+VER_PREFIX=release/jade/mavlink/
+VER_SUFFIX=-${PV#*_p}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+EGIT_BRANCH="release/jade/mavlink"
+DESCRIPTION="MAVLink message marshaling library"
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
index cce6612981cd9b74341246cbc2b1e3cf3e0691a1..d74abc873622389344bcff243093cb6fb711dc4e 100644 (file)
@@ -1 +1,2 @@
 DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cbaf938fd7cbe96241ba0ad03c SHA512 0ebec5b04a2b28abc24936ba6082edd08aa45cd6e59eef0ff94cce189c57bd0fdb5f5464110c07d563cf5bf9748c309a1659cf37fb61bdff423747f85f9fd1b7 WHIRLPOOL bf55006fa98c6bf9625b8517c2c775ae515147847f8a611e2d3f46eca21c6f3be270015903c4134e5dcd39039e9870abd4f2f3adaabfeb1e62c4957b642ba014
+DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626837b643878ea1e1955d954cf SHA512 d2606671fab43cc9a4daf678d02286a2f31a0688c8ea327163f2dc06928bf640f425bca2bcfe2cb51a0d7aa108cca2dfbaa819deeaf56bbc9cfb784b4f0a4951 WHIRLPOOL 5a5f9e0243d4d04f16911214d40061464471df418e30e7a7cc099c7b82c429f16c2dc10432d3184f856fc23612161a574173e78c47d9462d9feefdc403414cb8
diff --git a/dev-ros/mavros/mavros-0.16.4.ebuild b/dev-ros/mavros/mavros-0.16.4.ebuild
new file mode 100644 (file)
index 0000000..ad4e45d
--- /dev/null
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink extendable communication node for ROS"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+       dev-ros/diagnostic_updater
+       dev-ros/pluginlib
+       dev-ros/roscpp
+       dev-ros/tf
+       dev-ros/angles
+       dev-ros/libmavconn
+       dev-ros/rosconsole_bridge
+       dev-libs/boost:=
+       dev-ros/eigen_conversions
+       dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+       >=dev-ros/mavros_msgs-0.16.4[${CATKIN_MESSAGES_CXX_USEDEP}]
+       dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+       dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+       dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+       dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+       >=dev-ros/mavlink-gbp-release-2015.12.12
+"
+DEPEND="${RDEPEND}"
index 8dee36918a67568fcb82510810b9f4f9b9179584..ad4e45d80ffd2834e1bc8febb24ab7e962c8bf3f 100644 (file)
@@ -26,10 +26,11 @@ RDEPEND="
        dev-libs/boost:=
        dev-ros/eigen_conversions
        dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-       dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+       >=dev-ros/mavros_msgs-0.16.4[${CATKIN_MESSAGES_CXX_USEDEP}]
        dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
        dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
        dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
        dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+       >=dev-ros/mavlink-gbp-release-2015.12.12
 "
 DEPEND="${RDEPEND}"
index eaa73c1daf827b9120f90885a470c7298c4489e7..8c34a42466b488ebeb3330adaac18c4371521278 100644 (file)
@@ -3,3 +3,4 @@ DIST mavros-0.16.0.tar.gz 193327 SHA256 3712bd20209ff725bb1b8055e6c10f57a91535b3
 DIST mavros-0.16.1.tar.gz 193407 SHA256 1ae2e8988d15f65d3e724373045b034a2fd1af9438b7f044b0fc9887f3579fb8 SHA512 2b1a6792cf244ca647e6150cad92542dab32f73b13122af72cbe10ff1deaeda81183ec02d80a318bc8292dac55f981ec0d6e1812db81d2d20f1cc96bf7474492 WHIRLPOOL 852d852da73e8a956b5be7d31c2ef2da7d524b9b2ab4818cc1267d1fdcdf3760f8f2cc295f51cfb51982c73d8c50158170508e8f9d2b5af9d368916341ab30be
 DIST mavros-0.16.2.tar.gz 193530 SHA256 5f2b7cc609e68b14c67153590d01edc28bceb5af64febc97728cc09dad1b29ad SHA512 dc8767d3416e7290743ebe7073d721cbffe8400be20f54c8c6c9c5ed6129f614a670c81d910c25f054065ffa1022d862709364fe06ec1522dbd25344516e4343 WHIRLPOOL 3215a413732dab0e722aad5d06c1d048ae814ee85a248608d6aa41f67aabd081a01b7c883ffef483e596437c651827a03c92af248a70ef9973e95227e7477a48
 DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cbaf938fd7cbe96241ba0ad03c SHA512 0ebec5b04a2b28abc24936ba6082edd08aa45cd6e59eef0ff94cce189c57bd0fdb5f5464110c07d563cf5bf9748c309a1659cf37fb61bdff423747f85f9fd1b7 WHIRLPOOL bf55006fa98c6bf9625b8517c2c775ae515147847f8a611e2d3f46eca21c6f3be270015903c4134e5dcd39039e9870abd4f2f3adaabfeb1e62c4957b642ba014
+DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626837b643878ea1e1955d954cf SHA512 d2606671fab43cc9a4daf678d02286a2f31a0688c8ea327163f2dc06928bf640f425bca2bcfe2cb51a0d7aa108cca2dfbaa819deeaf56bbc9cfb784b4f0a4951 WHIRLPOOL 5a5f9e0243d4d04f16911214d40061464471df418e30e7a7cc099c7b82c429f16c2dc10432d3184f856fc23612161a574173e78c47d9462d9feefdc403414cb8
diff --git a/dev-ros/mavros_extras/mavros_extras-0.16.4.ebuild b/dev-ros/mavros_extras/mavros_extras-0.16.4.ebuild
new file mode 100644 (file)
index 0000000..5622813
--- /dev/null
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+       dev-ros/image_transport
+       dev-ros/cv_bridge
+       dev-ros/mavros
+       dev-ros/roscpp
+       dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+       dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+       dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+       dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+       dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+       dev-ros/urdf
+       dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}"
index eaa73c1daf827b9120f90885a470c7298c4489e7..8c34a42466b488ebeb3330adaac18c4371521278 100644 (file)
@@ -3,3 +3,4 @@ DIST mavros-0.16.0.tar.gz 193327 SHA256 3712bd20209ff725bb1b8055e6c10f57a91535b3
 DIST mavros-0.16.1.tar.gz 193407 SHA256 1ae2e8988d15f65d3e724373045b034a2fd1af9438b7f044b0fc9887f3579fb8 SHA512 2b1a6792cf244ca647e6150cad92542dab32f73b13122af72cbe10ff1deaeda81183ec02d80a318bc8292dac55f981ec0d6e1812db81d2d20f1cc96bf7474492 WHIRLPOOL 852d852da73e8a956b5be7d31c2ef2da7d524b9b2ab4818cc1267d1fdcdf3760f8f2cc295f51cfb51982c73d8c50158170508e8f9d2b5af9d368916341ab30be
 DIST mavros-0.16.2.tar.gz 193530 SHA256 5f2b7cc609e68b14c67153590d01edc28bceb5af64febc97728cc09dad1b29ad SHA512 dc8767d3416e7290743ebe7073d721cbffe8400be20f54c8c6c9c5ed6129f614a670c81d910c25f054065ffa1022d862709364fe06ec1522dbd25344516e4343 WHIRLPOOL 3215a413732dab0e722aad5d06c1d048ae814ee85a248608d6aa41f67aabd081a01b7c883ffef483e596437c651827a03c92af248a70ef9973e95227e7477a48
 DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cbaf938fd7cbe96241ba0ad03c SHA512 0ebec5b04a2b28abc24936ba6082edd08aa45cd6e59eef0ff94cce189c57bd0fdb5f5464110c07d563cf5bf9748c309a1659cf37fb61bdff423747f85f9fd1b7 WHIRLPOOL bf55006fa98c6bf9625b8517c2c775ae515147847f8a611e2d3f46eca21c6f3be270015903c4134e5dcd39039e9870abd4f2f3adaabfeb1e62c4957b642ba014
+DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626837b643878ea1e1955d954cf SHA512 d2606671fab43cc9a4daf678d02286a2f31a0688c8ea327163f2dc06928bf640f425bca2bcfe2cb51a0d7aa108cca2dfbaa819deeaf56bbc9cfb784b4f0a4951 WHIRLPOOL 5a5f9e0243d4d04f16911214d40061464471df418e30e7a7cc099c7b82c429f16c2dc10432d3184f856fc23612161a574173e78c47d9462d9feefdc403414cb8
diff --git a/dev-ros/mavros_msgs/mavros_msgs-0.16.4.ebuild b/dev-ros/mavros_msgs/mavros_msgs-0.16.4.ebuild
new file mode 100644 (file)
index 0000000..7c9f450
--- /dev/null
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 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/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
index 8bf6feca44974afcda2fea303f9612d37c8817d1..91c9cdb9dfb09c3032a3333a8a8b2be5883db321 100644 (file)
@@ -1,3 +1,4 @@
 DIST redis-rb-3.0.6.tar.gz 62335 SHA256 06cad67fdfd6955112a65d05e0fff62b003439404f20d8b926ce92f6c5eabe4b SHA512 966a2b9bf5d3af51020015e8b066b728b0632093eedcf1ca41f82b3340d54b0bffb305a0aa7ec5c8534db0a71cd6de006a943a0ebef234a4f93204ea41a431b1 WHIRLPOOL cdeec7ccbe3dd6a4c4ea6e9e786c072cab436abacc48538501234cd58f8bb21bc8a43ad8a4db68b607c5ee9313daffe9e1eb0255057e6306db2c55d920673609
 DIST redis-rb-3.0.7.tar.gz 64059 SHA256 70bc9da8d41af542f41dd8be0f69d005f981d7198e867345ded562baaaab667a SHA512 93f5e68d491010d74d3b93fe6ff4e50f28bcdf4456435ee7ea066a4e21219a438944d66ca7cbdfd7182fb4a574f26fad3b85e14c226854e4b94f0a2681b8dfd7 WHIRLPOOL eac933f32c8a5851e896cf4360af1cad54112defdd58c2999bfc6509cbbabea6be2f252730d523391bf741ce6997f334714a33498eb54df01bd1d68fecb85eee
 DIST redis-rb-3.2.1.tar.gz 69986 SHA256 ea86257db6be49bfeca8cf4a9ffc645844b2d3ffd81542b2305f3e84fdd983d1 SHA512 3c3f6bca71a9a6ef0d6cc713483445a890034b6a96c773ae6ea0bd38153752327cb4cd50cdf791b14ed211eb7323c12498665b89946d0dfd5237a97dca506b10 WHIRLPOOL 94158ef753bed9271dec78fd9fae332168cb10417016df5dd3d3b38d4808bfbbf55bd9b2bc192087aadbf8f5df86e723c001eeebee386d00c0f85ab7ad37bbb9
+DIST redis-rb-3.2.2.tar.gz 72217 SHA256 37a5ae3a8163a2e6aaf5d40ede106ed13ce6fcfc2b99a22664392ffd3d132b90 SHA512 e5cb281c95ecadf86907a7f8b87cc3f895feac529b868f479d94c3ca00f8eebddbcebf9ffeacbe40738af6cb2bd8b4bb9b8f12462a99355337ee123cc3e4356e WHIRLPOOL 8d1b325d539856e4e91cb9d8643bfb55981b2c7b2ae1cd7b52778b5cb0266ab3f852541a0bca53418b4161ad6c6760be91b82fb09983a3bd8b7b8adf0800c4c4
diff --git a/dev-ruby/redis/redis-3.2.2.ebuild b/dev-ruby/redis/redis-3.2.2.ebuild
new file mode 100644 (file)
index 0000000..a213dd1
--- /dev/null
@@ -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"
+
+MY_P="redis-rb-${PV}"
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_TASK_TEST="run"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby client library for Redis"
+HOMEPAGE="https://github.com/redis/redis-rb"
+SRC_URI="https://github.com/redis/redis-rb/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="test? ( dev-db/redis )"
+
+RUBY_S="${MY_P}"
+
+all_ruby_prepare() {
+       # call me impatient, but this way we don't need netcat
+       sed -i \
+               -e '/test_subscribe_past_a_timeout/,+18d' \
+               test/publish_subscribe_test.rb || die "sed failed"
+
+       # Version 3.0.6 downloads and compiles redis-server to test against.
+       # This patch reverts it to the way 3.0.5 does it, using the local server.
+       # https://github.com/redis/redis-rb/commit/351a1294fe33f79c23495b7568045e9f484918f2
+       epatch "${FILESDIR}/${PN}-3.2.1-local-redis-server.patch"
+}
index 7b2c2be317d684aab189a4776cf0d2814261d815..131afb890ddb38e9d99951cd0d0e73582bda80e0 100644 (file)
@@ -2,3 +2,4 @@ DIST chktex-1.7.1.tar.gz 349551 SHA256 be01222e819c00bdf0fb411c232e585fd6a116adc
 DIST chktex-1.7.2.tar.gz 356981 SHA256 d7f37985e3a122990f2a29fe7cac5d1f31acb1e50035457ef7ceb07c30550158 SHA512 f0ac3ed74471d33da55591e6ca2a4b6847340540ef1911eef37bfad38ffc7c64ca4709966d52a22f871268edf893bf360c8429e1be7f62157d2fac9e58ea40af WHIRLPOOL b32e1927734ee1ba6af77bbe2a0e64ec640718ea26ebcd89a54c06555ec3b0c275fee3e81809b846b25f440f32397536d12eb85b3dde49bf55a7def09a19658a
 DIST chktex-1.7.3.tar.gz 150801 SHA256 22a2a1af8d6c8b901a66b3729c114080f722b3ba59a73ca000035686590c98dd SHA512 29018229176d3bfd7bff92e68739d32262b01414d7df3d379ef1604abcd28c28abdeb83a2513f6d439e5c888a05e5a636e4a7ab34275d40d20fc63a275985c4a WHIRLPOOL 6fcb533ce1bf0f5dede29825a6477f8961e08fe0e03a596fab76492fd97b5a5179bffc70bf7fdf3e8caffa15b2722ec1be46d58f304000760f4c9f3a6871d82b
 DIST chktex-1.7.4.tar.gz 150839 SHA256 77ed995eabe7088dacf53761933da23e6bf8be14d461f364bd06e090978bf6d2 SHA512 d5bf056f67ca520d9df95237b777380d9b98c792d5e20c16bcec2d78a4c68ec3c35308e4525eab33efa2abaf8f2d67ad62e65988b8885f30d1a3f29d27975a1f WHIRLPOOL e0cba6f01526d97304bd27804508c38a2ea1ca843f459d6e88dd7db84ba1745e8f37372f1b8aa393dbbe5fa1a62a71956849b2222859b36e125f24cdbc5333f3
+DIST chktex-1.7.5.tar.gz 151833 SHA256 4b5cfcf8430642e0fce925b2fd62e141d179cb71010565056f7cf40ba2770331 SHA512 035bd6af4d946464fc1d14bc5556a45f5a9aee8af18a50b300d3d797b91a36b9089e95c60f519aa95d8c21a75e102e950c88b97a52d4fe9e53243ab8484239dc WHIRLPOOL 9921dcb72c58b80f91b230d436cabf58dc25aa4711783b240844bdc5724a2f2ee5089a99e3827afe70425686f201cfd59dd4198f945d6811857b5daf1588e00c
diff --git a/dev-tex/chktex/chktex-1.7.5.ebuild b/dev-tex/chktex/chktex-1.7.5.ebuild
new file mode 100644 (file)
index 0000000..cca1bf4
--- /dev/null
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Checks latex source for common mistakes"
+HOMEPAGE="http://www.nongnu.org/chktex/"
+SRC_URI="http://download.savannah.gnu.org/releases/chktex/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc +pcre test"
+# Tests fail without pcre. Enable pcre by default and make tests depend on it.
+REQUIRED_USE="test? ( pcre )"
+
+RDEPEND="virtual/latex-base
+       dev-lang/perl
+       pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+       sys-apps/groff
+       doc? ( dev-tex/latex2html )"
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.1-asneeded.patch" )
+DOCS=( NEWS )
+
+src_configure() {
+       export VARTEXFONTS="${T}/fonts" #538672
+
+       local myeconfargs=(
+               $(use_enable debug debug-info)
+               $(use_enable pcre)
+       )
+       autotools-utils_src_configure
+}
+
+src_compile() {
+       autotools-utils_src_compile
+       use doc && autotools-utils_src_compile html
+}
+
+src_install() {
+       if use doc ; then
+               HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX/")
+               DOCS+=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX.tex")
+       fi
+       autotools-utils_src_install
+       doman *.1
+}
index 71c6e5d187ceac0158a80103e176fff956b0fd39..0a6708209ff5cb813030b0c5598f2daac28845e4 100644 (file)
@@ -1,2 +1,3 @@
 DIST jenkins-bin-1.625.3.war 63322455 SHA256 9964b10581414b5504921dd8a717b172c07bcdf5f9d1bae50595aca07ddacf20 SHA512 daa739c902d417949dd348780fe4c3d088d64917231273083638bbfe87a47c69007669298175d5bc60623aa7bb6c3ce19c250764b6108ae026e0622d968a3b26 WHIRLPOOL da0e99183bb22ef4b1475acd840c67c3d0e2cc2f3d998340ea0d6cbb0ce4cc4e26d60871d65aaf08d9af0026b51152274640c485592e6cb36cd95813848eddc6
 DIST jenkins-bin-1.641.war 63662610 SHA256 f7656c38fe4e3c11b58ab506512655dd6dd3c69275de61442cfc9f9c3ebf5b93 SHA512 f8929496d9d4081ff87f26a60965b1a3d5eb93e8c04d76a219541ddeb2d3da7fef7f39fa94199b4436c6759ed2ba5d516c32cc3825605aced2c7c1db90b1fe67 WHIRLPOOL 30caf6eba8dc8dcd5a534e1e27fbf54c0a3973c6d61997352015524d7d688569ebff6fdfafa06e12a210727b8c3278af9375c10fca2ab3cd2ab05428e8a200cf
+DIST jenkins-bin-1.642.war 63664946 SHA256 724cdb1815834c8b00ca84db548550e2c2b8a4bedf3e068bfc65bdfa953c20a9 SHA512 1a24cb111c0967f240cad3ff0b11bde93d37718d4dc0a86f667c6cc360cbdb69c33dc7fb85ed73e6852f6bf697984036bf6e8d71bd39dcd292058975fdb0e131 WHIRLPOOL d5f9603f00f7db7978489491986b910f300b64209dcc84611c387c1a8b0e8494941336c9b889aa02f97e385c6279c94d37d3189d9e4401646420922030d4d8b3
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.642.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.642.ebuild
new file mode 100644 (file)
index 0000000..37fc084
--- /dev/null
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+       media-libs/freetype
+       !dev-util/jenkins-bin:lts
+       >=virtual/jre-1.7.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+       enewgroup jenkins
+       enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+       keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+       insinto /opt/jenkins
+       newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+       insinto /etc/logrotate.d
+       newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+       newinitd "${FILESDIR}"/${PN}.init2 jenkins
+       newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+       systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+       fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
index 51bdf6b7ffc55b3ef710def4d4828d9c21a08ed7..43b1c8a826d8ebd8134b1b4d53c3314c24fdc1a3 100644 (file)
@@ -1,4 +1,5 @@
 DIST subversion-1.7.21.tar.bz2 5996788 SHA256 efeb349c5ba6d529ff8e9730a2abd9cb70f276b249238a6b7f27ba7da1190620 SHA512 d0ba3f0771c523b44efd2f12c1d101d720b7d834bc6bef12b8e47789a2fb76a2d399c041c1cdcd0e04411c29abfb9b2974ca9df6f2389f8a01d82e7738881975 WHIRLPOOL 0d12286ab0e5043f28622529ff5d2af5a1c8a61ef65227cc069cf93de35479bf79433fa201417456499fa16f11b03474127b66547b9c2e2a8c0d209fa2108e59
 DIST subversion-1.8.14.tar.bz2 6850562 SHA256 7f3883cdfcad4174e06dd94d6e3e8ec91856823268eebe60c924be76f5229a1f SHA512 95e1501494f5355f0c331fbe81422ca8f0b4d69e6d303125f4a5aac5f6fe946e958ca76fc96fe6b096cc0a530634ca103bf35622c12af90489ae17d0b9a9d987 WHIRLPOOL 0323746d40830109e081e002f499f1c73c15fe77acd4f1c9b790ae12440b3361d189f1d5212d49ba6f6c449297aec3513761375f748800686892607705310a56
-DIST subversion-1.9.1.tar.bz2 7747098 SHA256 91548f9fce38bdb2958848f54fd8007e357c22db09b7ef4763fc85cbcbc2c913 SHA512 57b8f913aefb06bbeac065ae6bb8113853018bdaefdb80c74a337479b9f3cf89834e8656591dbe8ab66b2cadf5f99f1036ff826a886ed6a9f643d6e5adb6a972 WHIRLPOOL 58bd1e41a7643befe6e9800ce0a270379b980746b14eda2c2230f96ea9e07b17ab115959e5b61f324f51055697c898526ac3b4be9b883147b1156f7c20b1f010
+DIST subversion-1.8.15.tar.bz2 6917489 SHA256 cf98a1f7686cfd6a15cbcde8379f15730fd5e00a3573cdb035a6491dbcccc82c SHA512 f5a33b0b2c87eae48a3c21c41164786e92aa061e774e9cc951bc93c1936db58a5d901904ad9dc28e85926f38c7d75645f39bb7e8543333943d3883ee9718aeb0 WHIRLPOOL 101c00a059e350d4999c37977059a439c5253d7ef185664ff8133b152bccdf386a8556f6d47390246ac742a4b4b77c89abd06e5cce76b6e276db6cc55f205374
 DIST subversion-1.9.2.tar.bz2 7910994 SHA256 023da881139b4514647b6f8a830a244071034efcaad8c8e98c6b92393122b4eb SHA512 debe1be153a7abd89d1c0c8d665725a9003e280a7fcde666c21818627bef0c47c30b27560aaa5a9a75251ba0d9c1490613cc79237704f4777a3cad0def52f08a WHIRLPOOL 3a5ff8067079d7e81f9414e3858afb98839cbdcb989b086d1696b4f0eac46ae2ed7c9933d3fa232431ad32578bf2fab986052a05dac7c528415bb5057fa5d213
+DIST subversion-1.9.3.tar.bz2 7909193 SHA256 8bbf6bb125003d88ee1c22935a36b7b1ab7d957e0c8b5fbfe5cb6310b6e86ae0 SHA512 2197c5076e688ac09e63c345e45f2a5ee2999426edb76a91c6b92d229fa8c87772d76e99003a4438035771b4c11c502de399d44f4f42c0d759dcbd01b628a4cb WHIRLPOOL d0b515c53384da558d0838a78f3be75e3bac643f5d95e536e65e0034e1814c91e0d2c218dd41bb5ee76447d47a0484105a25da1abef7851e7461a2a84c320a79
similarity index 99%
rename from dev-vcs/subversion/subversion-1.8.14-r1.ebuild
rename to dev-vcs/subversion/subversion-1.8.15.ebuild
index ddf430cff4ffc3ab695a11e451436c9adf2e246c..ffe23962a6b0c4ce07ebc8835d78a7141046c703 100644 (file)
@@ -117,7 +117,7 @@ pkg_setup() {
        if use ruby ; then
                local rbslot
                RB_VER=""
-               for rbslot in 2.2 2.1 2.0 1.9 ; do
+               for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@' <<< ${USE_RUBY/ruby}) ; do
                        if has_version dev-lang/ruby:${rbslot} ;  then
                                RB_VER="${rbslot/.}"
                                break
similarity index 95%
rename from dev-vcs/subversion/subversion-1.9.1.ebuild
rename to dev-vcs/subversion/subversion-1.9.3.ebuild
index b1fbfebc6dfdfbe6fa080aae1b2b98dfc9e1dee4..b25ce1e23bbf60c5f315545cb3ceeb2422444040 100644 (file)
@@ -4,11 +4,12 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby21 ruby20 ruby19"
 DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 GENTOO_DEPEND_ON_PERL="no"
 
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module eutils
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single
 
 MY_P="${P/_/-}"
 DESCRIPTION="Advanced version control system"
@@ -34,8 +35,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12
        kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
        perl? ( dev-lang/perl:= )
        python? ( ${PYTHON_DEPS} )
-       ruby? ( >=dev-lang/ruby-2.1:2.1
-               dev-ruby/rubygems[ruby_targets_ruby21] )
+       ruby? ( ${RUBY_DEPS} )
        sasl? ( dev-libs/cyrus-sasl )
        http? ( >=net-libs/serf-1.2.1 )"
 RDEPEND="${COMMON_DEPEND}
@@ -113,6 +113,18 @@ pkg_setup() {
 
        # Allow for custom repository locations.
        SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+
+       if use ruby ; then
+               local rbslot
+               RB_VER=""
+               for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@' <<< ${USE_RUBY/ruby}) ; do
+                       if has_version dev-lang/ruby:${rbslot} ;  then
+                               RB_VER="${rbslot/.}"
+                               break
+                       fi
+               done
+               [[ -z "${RB_VER}" ]] && die "No useable ruby version found"
+       fi
 }
 
 src_prepare() {
@@ -190,7 +202,7 @@ src_configure() {
 
        # for build-time scripts
        if use ctypes-python || use python || use test; then
-               python_export_best
+               python_setup
        fi
 
        if use python && [[ ${CHOST} == *-darwin* ]] ; then
@@ -199,10 +211,9 @@ src_configure() {
                export ac_cv_python_compile="$(tc-getCC)"
        fi
 
-       # force ruby-2.1
        # allow overriding Python include directory
-       ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby21" "none") \
-       ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc21" "none") \
+       ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
+       ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
        ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
        econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
                $(use_with apache2 apache-libexecdir) \
index 02557a8630027714b904e331c2ac403f9dbab40e..fbc8e00f83fc835fa3e16a276d6af00c7730ddca 100644 (file)
@@ -3,4 +3,4 @@ DIST tortoisehg-3.3.3.tar.gz 8230380 SHA256 a22ec794b0152b25b085447a253594dde27f
 DIST tortoisehg-3.4.2.tar.gz 8205349 SHA256 d22692166dc6ff61c9d12bfe5ceb77fbf87e7dd52222c956976e7987d84145a1 SHA512 f771536508f1c72c15b1fe7fbf5b3ef6dafbb14314db45776632231dd2d74b46b862476fe78505a08b2271c2ce6419926e6090a2e0a6451da60314ba154fe9f4 WHIRLPOOL cfe0db33da10b2fcafff3e831937488a276924420cfff8a50396e0109c3edef7fb182036d38b72ff8fbf6aafae714eb1b6c4caf109938361babf04eed3addce4
 DIST tortoisehg-3.5.2.tar.gz 7399407 SHA256 f5d36d8f19b508dd00a7ac720af3889defd40e99fcb60d907a0fefb9c867dd63 SHA512 43ab341b4b01b2b28a9ac4290c9902720a10094390d323ab0c4e0962276cd333def7bec818e59a8bbacac9390cb22fd310875eb58f7092573c1254c517ada310 WHIRLPOOL c49707205e06fe269be3c69330d78ca8194a54d709b9056bea502403b4e047a1da46f1cd73ca5d7b052aab6f0d4b3ae4aa93f0544b78f12a6a9ffd8459edfb37
 DIST tortoisehg-3.6.1.tar.gz 7440140 SHA256 28e2ce770731616570b7c8be726cc7b2045887d66c166b8e514a144ca8650b37 SHA512 53717171ae627c59043f1dd6796e3f81459b2a88a28a557caad659ecba6353df0f21e4a6a1b21658c2a16ef9e508feb3c500ece28c78d151fa661f7447684b06 WHIRLPOOL de22061bf1f1a110691fd4991085d29d989f22b1df468d107d3239c4c25978f819a671a7b677e49e66d2e9a6df71ce4fdfb01da8c459076962c657dd52c658cf
-DIST tortoisehg-3.6.tar.gz 7439819 SHA256 ec43d13f029bb23a12129d2a2c3b3b4daf3d8121cbb5c9c23e4872f7b0b75ad8 SHA512 2a0b90f3a7c0fdcb63f21c7885ebfa26de5da369b6a64b12282b72e144ef1c12a29a78f793c487f37dd5bf7b7ab93d3c6ea393c4607deabe5b0c4be7eb16342d WHIRLPOOL 73684fa3912c3fb1e7b8878ef20a1b1b49bc28cfde707ab626549e076bc176edd94b96f8ae67ae05e7a6a98389262b5872595c1d057369b4f928c391f03c72e8
+DIST tortoisehg-3.6.2.tar.gz 7748075 SHA256 3ed668010e7f850ed3932aab83f87f0d0cc8726969283b190e002e9a1d2a3cac SHA512 901962b7f09a4823401ef50407b0767c280089fd00ebbd9c06dd4e88c66fa3814364a82fb7726a53d53837948c623f09d3fdb3c6f432cc9107be3c1a8a826d5f WHIRLPOOL e378aa9a162538196ec127d30788b34aa76e2e786f06d3bb69b0b2e66c96a1c3c3f4a98e8e2f6b3d6a30887a76646473708710596aa77e7c2e6f7d292f55a787
index fa0ddca92cf52d5e11a1d2ec750158445e36931a..fd53b3a2bd1dd9a58118b18a049edde172a0ee1b 100644 (file)
@@ -556,8 +556,11 @@ enable_cmake-utils_src_configure() {
        # Convert mycmakeargs to an array, for backwards compatibility
        # Make the array a local variable since <=portage-2.1.6.x does not
        # support global arrays (see bug #297255).
-       if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then
-               eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
+       local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
+       if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
+               if [[ -n "${mycmakeargstype}" ]] ; then
+                       eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
+               fi
                local mycmakeargs_local=(${mycmakeargs})
        else
                local mycmakeargs_local=("${mycmakeargs[@]}")
index e0c191859bfd482aa4a4f0f98b86e57220551dea..06055ecb7ab276ff5d53e08accafe41cc26f83e0 100644 (file)
@@ -28,6 +28,7 @@ RDEPEND=${DEPEND}
 src_prepare() {
        rm -f "${WORKDIR}"/maps/Info/combine.pl # bug #236205
        ln -s "${WORKDIR}/arch" "${S}/lib" || die
+       epatch "${FILESDIR}"/${P}-format.patch
 }
 
 src_configure() {
diff --git a/games-server/crossfire-server/files/crossfire-server-1.71.0-format.patch b/games-server/crossfire-server/files/crossfire-server-1.71.0-format.patch
new file mode 100644 (file)
index 0000000..174b785
--- /dev/null
@@ -0,0 +1,20 @@
+--- server/c_chat.c.old        2015-12-15 21:35:30.024866220 +0100
++++ server/c_chat.c    2015-12-15 21:36:58.479266312 +0100
+@@ -483,7 +483,7 @@
+     { "You spit over your left shoulder.", "%s spits over his left shoulder." },
+     { "Strut your stuff.", "%s struts proudly." },
+     { NULL, NULL },
+-    { "%s patiently twiddles his thumbs.", "You patiently twiddle your thumbs." },
++    { "You patiently twiddle your thumbs.", "%s patiently twiddles his thumbs." },
+     { "You wave.", "%s waves happily." },
+     { "You whistle appreciatively.", "%s whistles appreciatively." },
+     { "Have you got something in your eye?", "%s winks suggestively." },
+@@ -645,7 +645,7 @@
+     if (*params == '\0') {
+         if (emotion > EMOTE_FIRST && emotion < EMOTE_LAST && single_emotes[emotion - 1][0] != NULL) {
+-            snprintf(buf, sizeof(buf), single_emotes[emotion - 1][0]);
++            snprintf(buf, sizeof(buf), "%s", single_emotes[emotion - 1][0]);
+             snprintf(buf2, sizeof(buf2), single_emotes[emotion - 1][1], op->name);
+         } else {
+             snprintf(buf, sizeof(buf), "You are a nut.");
index 39b2d29940743caaf1db0260bdb43c1e0edb3b41..d8109bad94b5e12738bfdf928f2ddfa089fdd12b 100644 (file)
@@ -1,2 +1,3 @@
 DIST bluedevil-5.4.3.tar.xz 129024 SHA256 7364cf95850fb30cbf487ab8e01686b82d5c7817fe45046f75bdc654a846f413 SHA512 d28b2d85322dab9d0680e7ef371f10e197a1a4dd9acc2e96df424f0928a19634363469671908f0dfb188b3ccfbd936bd7469b797bd010dad42717fa7322db930 WHIRLPOOL bf09237e2c830b9aa75a46991f6bc51b2e38588f1df5d6eeef94c87a89e25524d98c26bb0e72e172fe0f18017df08827b69db9eac8e5cccfea6dfadf8f211f64
 DIST bluedevil-5.5.0.tar.xz 132872 SHA256 f3e154a95845fd7cc78903808a4fdc7c4ab7a29267824654cd948a58af351140 SHA512 bae2ff37459bcebe53881ba8ec3154cc95c60b8041793cdb2f3c17548fc4094710a052196995246e33d82ad6c88539813b5d20850e618ad1e5c398c5785bdfa0 WHIRLPOOL d497454c5a767c7357b0008342cc6d7e33bebdc7a3123274e764773fbb3f50cf649bca4d138b267402084e2075a081367ecedae07e63969bf60088efbece4d31
+DIST bluedevil-5.5.1.tar.xz 132812 SHA256 27f18ad0c776e8b0d3809f3defb2172b7b9dc587dc7d50271094d726fd162d26 SHA512 1dbd48c04bcc56fc8ca2abec164dc06152494387d2cd13d740cede3b6b2b72bfd9b6881ff345ce2edf7640144990d3d92cd7dbdc429e72b0d58cd89a8e1ae6f3 WHIRLPOOL 9a2f0246bd9db1e73373dade209601f85028997677bebfaaa62fed6b41d4045aa43b0b275163fbb2b53074e00003f90045c9285c52f5f94428c4be883d49341a
diff --git a/kde-plasma/bluedevil/bluedevil-5.5.1.ebuild b/kde-plasma/bluedevil/bluedevil-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..00c987a
--- /dev/null
@@ -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
+}
index 183072796a8d4866d7585164342d5a218720e0c5..1a5c47992fea0ef77cdb22028087ced8be825c14 100644 (file)
@@ -1 +1,2 @@
 DIST breeze-gtk-5.5.0.1.tar.xz 257736 SHA256 96d80eea894d95b7360f4ccf9385a7d5c65340b4aad50fbfeb670a01025a5212 SHA512 9deaed7cc4fdc9eddc344083d0ca67ecdf51097ab954302fbd56151fb79ee437442c70034e87331121b5949600eec1a46f23572984ea8a04a7d7af19f42b15f5 WHIRLPOOL 71759b37c0b4177583b5a5577540abb6e7c7bab4e77cbe020b3d2d00ce43c445e3b4bd3f4cf1571804673159007b394393c3946ff02593ba1950ed5cf6842164
+DIST breeze-gtk-5.5.1.tar.xz 257636 SHA256 f856dd5d8555623f6752674f9ec42ab2d06b38943d7f4eb281f950af1b54d682 SHA512 1a41326160e816d57f0de3d7ba3fe877af2b8f5ea0f949c6dc23d76da5531fb29b9bceab646d36790a3cf51e44406b1245ded2e82238a173bc0b59d955d9d35a WHIRLPOOL 98cf37f8132afdfa7361aae5ceebc9eee2314314018db2c8a93c445c328ef9bebe2aa2bc072cd062c797f74c346b0b5845db03e766850d714f1035230a51fa54
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.5.1.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..06e094e
--- /dev/null
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Official GTK+ port of KDE's Breeze widget style"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
+LICENSE="LGPL-2.1+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
index f36a727e601b1815b3ea7285f9554d1a196a04a6..68aee34d8a29f71d7ceb6a022310dc3a9ff678af 100644 (file)
@@ -1,2 +1,3 @@
 DIST breeze-5.4.3.tar.xz 36568668 SHA256 fc89d5edcc8c3c13263d1b1759f0f8400ea79c76df0eeafcce91d462d4cf93fa SHA512 3c76d5ccf465c2392dd47a213c70111c3714edcb10f21ce3f44593c9c88feef4bc28b35ca40dc1ac96c62746f219b10c1af114c32163b58dc34c6181b1d57626 WHIRLPOOL ec2d05516929cedb416a905711d28f7bfa9f9aa9a394eb994177a9fdac72604708f041fc82ca499a893689c0768468cb88a91a1cea37f9d97748f2c61495fc39
 DIST breeze-5.5.0.tar.xz 29670848 SHA256 77a8d5732437ccb1cec08aa1c89ab409e75aa8cd55940e49cc6ab45d72445c49 SHA512 3c2886935f06888371e361f1efc1b0fcdd8a9f89a82e5048bf5739e7126ee266903f06c7c05474c3d6c19b021779b711173282bf6a98abee00010e9fbbdd4a88 WHIRLPOOL 2d3a49415f9ac42892890ccee6d40c18cade2cc4af4ed13bebe706cd44749d69afdfd588f435e8608c34b0ac2ae19223ccd2ab1afb8460fcb2d7c821b9d70560
+DIST breeze-5.5.1.tar.xz 29670368 SHA256 7cc284bcad00fc7505c76e6d6baff5f953a4aa03fd1ebfcd6729a383a293900d SHA512 f65bb0ccc1c604593a5f31d7e4d3d3c12adca435c27e4026354dcf7b62e6c95025ad66a0a079718637377112eddf64e915bb20eb5194e66eb581fe25a4de0e98 WHIRLPOOL 1d429a5d147e687154c46f2ef9ad52395955837a046b23f2ca4ee08affa95d2d8abaa12710228c2e441c187c21ce7835a36f7a7bdb4a0b0b009c0e605d830e79
diff --git a/kde-plasma/breeze/breeze-5.5.1.ebuild b/kde-plasma/breeze/breeze-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..292de95
--- /dev/null
@@ -0,0 +1,66 @@
+# 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_frameworks_dep plasma)
+       $(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_frameworks_dep breeze-icons)
+       $(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
+}
index 6d62d96cd33e197b7e59dd13527d893534608b32..77a6ba6fc1c36c821986fc56cb455978fbfdf110 100644 (file)
@@ -1,2 +1,3 @@
 DIST kde-cli-tools-5.4.3.tar.xz 484060 SHA256 19e1c443e74f4472dd85fe3065fd204bebff0e3358b9f34c82c0e4b5fb74a799 SHA512 6e9970fd492097319be2c3d84e08fa6cf885befdac8c8f4c8a328080c0f1091f976f885650156ee0e073a6c9af294c47482a1aeef8276b880538e2ef5d018b28 WHIRLPOOL aa8f48e0464de0f35597d7889203a743f575eb4cc29405f945b345cd92e3d158a3dcb1b2b829e10a0020ea3076cc980c3d39355dd863f2fd5e566763ffd3796b
 DIST kde-cli-tools-5.5.0.tar.xz 485988 SHA256 9b4fadc2d7d2526f30ce22fcbcf375aefd7793aa8d53609e5ecedfc043878550 SHA512 e0201b134c86f7b02b8016e2cb6c7910847f2c3a8dc71b93c2a9e94c0f83c70324d7532f3ffd4bc17472185988cf9034f90c5fbe8a8b6adbba6bea1f0c6bc7cd WHIRLPOOL e36443897b2870a036be38037da5dee44d38e8949baf55eaf379cf791bccc2418a8662f586e3f20972f32f582db6573d5d0473d9f48ce99b79894fbf5e96fbfa
+DIST kde-cli-tools-5.5.1.tar.xz 485636 SHA256 72a5923d34b8f80a53d284950c20e24afcafa41085642739bfaccbbcb04bf647 SHA512 49f7d87f792e9ffbb46960f96a76d411603f7cea0619222201d1cd2b515192968d8f013c698ed7eb5692ceca935f88247390daa1790cd158ccde119952271f8f WHIRLPOOL 9c418b725101072295734c2e43b2de91f10b2deeb7ea44dd05e3ebbd993ca4d9ce5d3c129d56bf6ebf3978ab924faf4f4a833c6cd7f64e469091985eb41eb56e
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..17bb7d2
--- /dev/null
@@ -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
+}
index b8045f98730ecc9e8471f4f4dc9dd0981a6f2913..da63d9238163552cc1b1d7e06323cbd11e49323f 100644 (file)
@@ -1,2 +1,3 @@
 DIST kde-gtk-config-5.4.3.tar.xz 144832 SHA256 2839198cfb470095a550cf574beb7a699fe532f77337d0a700afdccf2bdbee2a SHA512 4cbfcab8b2bb905627b7ec17fa78c5a6ae538aba20a5f83b762aad0837f33fd8cfb89bece94cca7f36bbd93328c5d77c6de02c95111b6fd27792de9891d54117 WHIRLPOOL 8f9f69edaf5a1025e4c5acb783169018030ee2ad8ec7563dfcfdf9368c0e5808faff8cd4c80591ca74016840bb339798774d2547663f458d359bbebca5b6654c
 DIST kde-gtk-config-5.5.0.tar.xz 145896 SHA256 6a8454c6275668c871d6e52fa5367d1dcdb84ace5804e164b15990bd4e6e26ae SHA512 a920d060fc0d94d9ddc7705a26cafa3a3142211f811acde471ca91f47870e27cccc1a1974908f2dbbb9ee8d4d28a1d7ebacb45c3970e37f4fbec1b021cb382ca WHIRLPOOL 302e5f21693b3ff6d09ddfec8f19a63473e80bcd4b54afe1c0a7057ec83ca8990d1d1491ff1d011ee63ac9be334445cc4e4217ab8dae15445f18a3d9d9103fc7
+DIST kde-gtk-config-5.5.1.tar.xz 145880 SHA256 20e6d69243f1843ee9dc94a2aa5ac0c61c7b1859bb62839a66e3f39e622a5ade SHA512 b17ddee3ddd22b5da298a73cfeb9bdcf274482a247548796a2f927c691021bcf6d07fc8520744d421a7fcd7f818a99ec1094db1fb4d78c8abbc749f324c2ea81 WHIRLPOOL 212a545612a7b4e8e10174f3dbb823c4bf938040325538f7cd82c05e7209e05439ac45cd0e78af03338509eb0f852efc471336ac12aaef2af0124214e01929de
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..dd38b01
--- /dev/null
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+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
+}
index ce822ab36e49138c8b7ae51de752854cbea71198..221932b77f3d73bb01aef36aed6361b28ec7d08a 100644 (file)
@@ -1,2 +1,3 @@
 DIST kdecoration-5.4.3.tar.xz 33580 SHA256 38056c388568e65976e8579825f863eccf01e730c159c81f674d3d80ebd522d5 SHA512 b346a370ddcc7ad3bda74c57f30e0eb586333e0a50d432382af1495ab292b2eeb0541e0d0638517c8133a75fd26e4f1e8c8ae731bc995ce6ad3b80a835b6b303 WHIRLPOOL 6926d3afba79a93c3d4473ba66f9b8409d2d347ccd19fd54229c0b3a1376be0419599614dd75068c313162af303b81c88925ce8ee304178872368d3db0ae3f5a
 DIST kdecoration-5.5.0.tar.xz 34700 SHA256 2a276c1423b20afb5e0d785b4208b0c0b7d3bced29d6570b39b3c5dc86b4bcf1 SHA512 7dbf3974830c96756f52dd57e2e82292ad677a89a38d17f0b08bcfacb62de239451befa59b741c3f2beab3d4049f0b5632a2655d0a738961a0ba9519f0a42981 WHIRLPOOL 36b41e640c02103ee5687c251eb746ab4a627b30d4db32ac5445ac51675c1849beb5e14d7c85bd15d3b20d26b37572d4534f85e16cb95dbdc4cfb684f6fdb10a
+DIST kdecoration-5.5.1.tar.xz 34696 SHA256 561222ff4a0328b10589f4135c3a2c9361ea0ce3605890eef03b2eb76ea4aeb9 SHA512 b9efbb714e6f1a6a3126542f494b2b7f19a24394678edac2c300e4d0e4ac66a1e6228dee8b1aec679462471b4d146c47081ee24e589e7645c634ea05bcb5cf0b WHIRLPOOL 24449db15e7280a535f734af6dc0a011a2012ca4dfd482da4cee4f72efd7a85df3a99df024b0785000c469ccaf54bd96aa02653bd8fcdca16faf98bccac0b87d
diff --git a/kde-plasma/kdecoration/kdecoration-5.5.1.ebuild b/kde-plasma/kdecoration/kdecoration-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..a489126
--- /dev/null
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugin based library to create window decorations"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:5"
+RDEPEND="${DEPEND}"
index 0e4851247d27c768540fdfd332e531ce70ddb648..4bc3742750ec5c663f2c1c858ae84901db707b62 100644 (file)
@@ -1,2 +1,3 @@
 DIST kdeplasma-addons-5.4.3.tar.xz 2076536 SHA256 b7672cfea66f08d1fb8732157caf920788b3c5ace20cbe98e662a60a69e6d873 SHA512 6f499a19ad89c433f18977485730d27a4d553e2fbf8002772797e7ad08648f6b576848083ae53066b6b6c27ff4ab2d4569952b9427f72610e5d94d9cbe1a2c44 WHIRLPOOL b621a6db0c7cdf2c9f78ba050cd59b7ce1e856087eea93c187884d4f470afb71adc2ff514f59bfe593aef25ac9486a95852b91df020424ff034cd0bcfca7c8ea
 DIST kdeplasma-addons-5.5.0.tar.xz 2111268 SHA256 3fd3fdbfb8b11a4552f1d9607234e6c54a3a88120875717f158d88b7ee497cf8 SHA512 67ba7306f0b1e6e04e5a69906e1aff650d2fc502926d599f846c0f45bf8c1d24ca21d8146e03d79f6e7e2e691e7ab7949eebfe80dd32a4a5cd1824e04e68923c WHIRLPOOL 6c030f073c59a8fe2b9c8138f633971341aff4b7178ba666fc3e3eed1f8c8ec9b7035d08add25c2276461105031525854ce9f8c0aa00b839ca3137a6a04e4b72
+DIST kdeplasma-addons-5.5.1.tar.xz 2111936 SHA256 3486d8bf1e686d33196b342dc5c8d47ce9c3c6e3178ace72faf37ce51bb9a944 SHA512 2943fcf9fc0c41f3ce1522801c2ea760544254c91c5089731b1ba098b546edd3da573f37cf84e81db99ea97ccb188d6c7d114f0578f58a8c079f2a5bb6297f26 WHIRLPOOL 47261c1415329cfacaf7e73373d076b95e2a6c854b2065307f07811f3df48288aeafeaa94abd7b1757aa89095a09d83def97920b292680d788f3710c78936469
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..f34b6f1
--- /dev/null
@@ -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
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="ibus scim"
+
+DEPEND="
+       $(add_frameworks_dep kactivities)
+       $(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 kiconthemes)
+       $(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
+       dev-qt/qtx11extras: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)
+       !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
+}
index 33eb3b5ff00bee794a4f0fa7f07c04c469d0fb4f..dae1cf937e72546a632a6597d9aa7b4785930596 100644 (file)
@@ -1,2 +1,3 @@
 DIST kgamma5-5.4.3.tar.xz 60308 SHA256 f9a143b29d862097d11ab497b8e672c9d27874e2ed92b971e4a3228e0098cb50 SHA512 9417d434a315c0debdec58ca1691babb002485184b5e02f21510dbdcdc4ef37614b96f69b625839efe6266aeb99ae21008a23734ce0201d1992130a29047881c WHIRLPOOL ce0f68e688a794d2959c1e0d0022f3508ab366198c81b2e5009f7745cf3cdb3bc9157a3cb8b3f565d141670a3e9e42c8c9d6d2f88e8a7be85cb948f01d6c0af4
 DIST kgamma5-5.5.0.tar.xz 60352 SHA256 0e2947636a4a8e1e4bb9b5f38eb557b62e6482b2ccb51c72027f88dc4005ccc4 SHA512 a10d8312559e84428a082ee1fb7492c9310bcdfa703951b7a39646da6c59972c46274c7d206762f0080f6cad3d23c20d91ed99e2d0756f369dd706341fa65623 WHIRLPOOL 55678f95a4885869efc762c9a9d6002a0cfd8860c2dcdea324db07b3e268ee67dd3af4619c121dd8a1a654044b72a3a1fcd952288e29539cab6375d1151ea93e
+DIST kgamma5-5.5.1.tar.xz 60276 SHA256 7e20648aeb2c81e563485a743aac7a50ab0b791020c32daac9f9de23a8138b63 SHA512 17d609432cc3773732ed474a392f73d22f085dd54687e073c48b9b7bc92f20d6221e923ce4ecda840b9a2855038da3ae51e58f8e2825259b78c2979c6e351815 WHIRLPOOL 2bee2c3a90faac2a706a237c278d1313a926a02a17d0de0b9e8b7d24e40f198cdffee8d27739705efd2b862709d598660e803360d248b2e4b14b00a98e6047c6
diff --git a/kde-plasma/kgamma/kgamma-5.5.1.ebuild b/kde-plasma/kgamma/kgamma-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..cf40395
--- /dev/null
@@ -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
+"
index 35329720ae6d5e91b2bbd3616116348d17561269..6ac389cfc614db5be8df4e05945a5d95461aff5f 100644 (file)
@@ -1,2 +1,3 @@
 DIST khelpcenter-5.4.3.tar.xz 1797076 SHA256 02630934f3fa5c03d384808ef2daef38a49db836fb64d384a95e54865545c64d SHA512 63becef909a2c1631f606418b6d2c435797e8ab02b272372c89d214d9ea943eb286bd9ddf644ad956159844bb0996820aa9501cfaf02e943f8bf1093dd54a223 WHIRLPOOL ed6c484a70ff5be1fe8e57944460d8695316b2911a1bb3514485d5685c66d5c7989a3601820d7c5b06120ace611db853b5efb7608ec6b79dd40866407dab7fce
 DIST khelpcenter-5.5.0.tar.xz 1800740 SHA256 0930f4a75e7f49bd0cd39db0dbfc62f0e05571ff5023d6677546494388d23c5e SHA512 0c31b3fa86952453f5320041e9018242b2427a09c227e344ddccb4942f5bca8a29f418143a1d468b7f0a3a990ac0c51035a8379d90a602d6617aeb3d8ce8e2dd WHIRLPOOL 40a3935e8e4a327af0d5cb6cf4f79deab8e04a1a1fbef1b2bb8a6196ed29abaa8f8c5e97f2a4a400ef6c0c46fcde4f38ea303c2fdf9c93b5eb0b3c5c2601cff4
+DIST khelpcenter-5.5.1.tar.xz 1800548 SHA256 1a2cb19a725728b30bb88390f77018e4ed3f3e57dba5a9db171430a53bb29a2a SHA512 ce7aa87862d02f890e146c42d8394cfc656e8df218e5e5809044f86ccf2c116fd630a2d1bff64fa3bb644441ee58b5c9d903aea0455c04418c4b7fa010548d27 WHIRLPOOL 9e5d8008a9ce3d0cba0bf54c5b174b69bcc03c320042e678e88a16da5b7779d4521db9304edcc9c4f8e6b347cdfe2831efc43f8efead478cb719e0e4c9c586dd
diff --git a/kde-plasma/khelpcenter/khelpcenter-5.5.1.ebuild b/kde-plasma/khelpcenter/khelpcenter-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..1ef6121
--- /dev/null
@@ -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
+"
index 7867ee1e2852ae68180f5dacbb6b14ea21977389..7116e1bc53a0a9fa5f19cfef6b52046896a7e567 100644 (file)
@@ -1,2 +1,3 @@
 DIST khotkeys-5.4.3.tar.xz 607124 SHA256 495c9ef896a550f076266099ad396f8bf4ee32b94575166acc0329696bd69624 SHA512 9e9bbec5b3e6c9e912b7679a5f8bdc3cd59a913c6af5da9dcfd866aafb3706b0edcc5ab13ccaa5a9bd356db2fc749c38b73128510e618de11f9edbdce47fee22 WHIRLPOOL b8cb7bc155d9bd6cd7f5e8fc2058f2acc580d756e14577d6b279252da24054911be08349f35eb4c1b942aeb0e609d2ed5da5d1ef0271f64d1d54364b569ba6cf
 DIST khotkeys-5.5.0.tar.xz 603560 SHA256 146a1c5ed5052a3ebff4da84f27eabf17667f5a71cb816d12ca6b21cea87eea4 SHA512 f93bdad84f0b34936cfa1db8de64ffd00bd02ef79f7b59a309ac68d9b6a6d1270bf86bceef6b0336cbbf534098245a863954287fd9b11c82f934d4194cdc972c WHIRLPOOL 8fe5f44d7aa6b445ef6d1a0c61255902668f39acb50804879389f823c4a8bee47e8d49496cc7c13882cff5719c180e9f906980d7854bb747d873f9705c394a08
+DIST khotkeys-5.5.1.tar.xz 603544 SHA256 1132aa80ef8c3548d82d85c50e65b131530efc6318e461670abaa2ed116c7565 SHA512 f82bf4bdff746feb49916f5b6ae949695da7e66ebb7551feb48645be33b5451f78bd32f6b4c3b5d96be667cd9b8736d26669f0e563bb0f8df766fca91b96dce4 WHIRLPOOL b316c5d323fee62acf56e963b49fe7937f499f64ff5d2237f5c642a863071ba179fe25143a2742475dec03d9870844c4bf495025a010c9d0136118c2f53ec859
diff --git a/kde-plasma/khotkeys/khotkeys-5.5.1.ebuild b/kde-plasma/khotkeys/khotkeys-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..eb9f299
--- /dev/null
@@ -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
+"
index ce426b1f34a9b9c6d1f906ab47e8e65003f52b00..52401b25908f88f32265c44cf223beea91ca52dc 100644 (file)
@@ -1,3 +1,4 @@
 DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb47dc3229505abbac0c6 SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 WHIRLPOOL e161bf40c5e16180fa65217cb49314fb230c45329f4c518d6014083bd71da82d4aa048811ee814fde7fa300105cef16c182688445164ae84d0d700e23641b342
 DIST kinfocenter-5.4.3.tar.xz 1131908 SHA256 475bf963a3b0bc5c6c267889ad96f2bf8666f051e3dbeb47b21e3ab4630bdeec SHA512 9ca50172136607e835be9dc7e9767988b11aa746d9c2236167d36c82858e0c0127f396c0d7a7884a33de025ce3a7f122eadbee0414bc5b4f7f138bea3c2312f9 WHIRLPOOL 419c49cddd263335858e70252809f5771f75ac69f76b0795ca1343195780a49951a6fdf0c42dd2d48e8bfd73b0a1613a6a56d7c335baabfd01f66d0056ba20ec
 DIST kinfocenter-5.5.0.tar.xz 1143256 SHA256 7e2b4446afc53985a21f5b387692a395bf1a17f42fa75e9e77c002f138a229f7 SHA512 8c9ab3a5878cf05fe8b40bb0b5fa3954c6cb9d841764dbe3d0da961d47332b9e28cbf20fbbb8079efea0ad7c05788952c86fd7dfcf475155f5c861ca567eef2c WHIRLPOOL fdf6c0d436eaa20cf414f06c8d338e50ea06348332d0155d1680f4b817d52e2bd35491aff2d35b1f049f25a6d29b46c723a82c20f8fef7f37d0c6261f9c6d1da
+DIST kinfocenter-5.5.1.tar.xz 1143244 SHA256 80b86a8316c24b3e725935bc6c53c884f81c1729013d35024ff4e2a034463f2c SHA512 9f42177168198d6b49af8ea510eab0e2b1e2d569e7d6f6dad0155567c023d7650149774a63af30f539eaba5edec6b1b2b7c0f5dfea9c69f6af6e57ee20795951 WHIRLPOOL 7461c893cff933f65a4b8951db66a3518d05c7fc17cdd00d055df31573bad49f3e6a599b3c30932d145ce09aa2ca9dfa3e8993e235fe87b3ffc86a0704ba715d
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.5.1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..bf714cb
--- /dev/null
@@ -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
+}
index 39c527570c7cb840e0fe66edb83b0bce5d45d113..4fb4a205be7666e72927131efa7cf6c4ce54b135 100644 (file)
@@ -1,2 +1,3 @@
 DIST kmenuedit-5.4.3.tar.xz 441376 SHA256 36ad27922d8a21a80646d4a9bfa2b93ebc6b1cad6da6dd67799200dec1dbfc7e SHA512 56f0e75b6a2de816bfd822053f4e61c5fb48cd63dc880c44d0d74780cbc694bf548153313fcb4d5c0e89d0e309670cb1bfe4cc051bfb5781c8089710b7a30ece WHIRLPOOL 67462c5cf5d3d00854873381e3c775a7c20fd312ea4464606eeb1331ac530e059239479be5cd46f5d8a02be22b61c24eb29706822e4520eb840b8bd73bee3d85
 DIST kmenuedit-5.5.0.tar.xz 441460 SHA256 96fc1411e0db3abacc585d8a9713969f042f35a996ede575fdc4f07ba17671c1 SHA512 609249e6ae04550b3dfec7f920b593185eb3513196816870aef966b237d36da26ff14136fd83d1bd2380c52267eeac8ea408d8e1a20088368c1498fb92c63b1b WHIRLPOOL bbb637254571cc95885a3a888802a5a49ef7ce47615c5affba6d56216be138ab8ca5f54fd0b8737ab13a00c06a028c3cf8818974188e4b55a26b0db589abdae8
+DIST kmenuedit-5.5.1.tar.xz 441356 SHA256 98bda543c62dd910ecbca5b91d1c3771a795687cee52c7186237a96da3a26572 SHA512 f417627b814e469f3b161f5a80df8c3e718eb56be5dd25cccf01f75e710cf211ead6ce9120c0b9e1117cb2703bfcf4f3e230784eb4110f9849d7219eb3a4352f WHIRLPOOL 42c8fd977a708f5dd765160448d4592acba682ccbb277e7ebc88662e23624200cc899662335f2368e965ae661e9b10f96913eec69751c09b556d4cf99d2c10a6
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.5.1.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..76fec64
--- /dev/null
@@ -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
+}
index 21f76761eb2b856ddfafbe37c53d3c4a5e34f3bb..e41149e8217a5ae2e42cc9173ac0e7cc3b18664c 100644 (file)
@@ -1,2 +1,3 @@
 DIST kscreen-5.4.3.tar.xz 100368 SHA256 b95ba33840e950f2c71a601f6623a9acedce5f3b58e5e1eed395eee230266a05 SHA512 da7a7f49c0688a7c1a4b7cb1651efcad00467393521262f7f8c030d9ad3f91c67a46aacaae9a107a29f2bb2b1d2ca4eab2978be3f80f4c9a8654278fdd9285dd WHIRLPOOL a339c4f2693c054f41350d90b6e3678a567f41ef56132ea995d26b1d439fb4f367c0376a7ef5ec438f318b61d0b327530b667c37977c6031d990b323ecc6249d
 DIST kscreen-5.5.0.tar.xz 103320 SHA256 a6b3074461435b1303b669d6355c1c1a82cff4e15194b3b0dbc5fcb468baf657 SHA512 3c34d2e24dc94ceab5d861607cc8a96365003ad0b66035ff7ed9ffccac53e94224bd0115bac3f462a98a0671e4dbd57472ee78de0023063cf5cf696b90d55c3b WHIRLPOOL 6ab7581ae76132cb6aca729523ff0112b74642a50db45b6924ccdaaab098a91e3c48bd33e7ed11f3db65bc43458f479c9ba8b9dd662f4188e387066504417bc2
+DIST kscreen-5.5.1.tar.xz 103352 SHA256 acd44e8f445516da50d7f1bfb63036884c8d92b23e529037be3d75319d0fc3fe SHA512 f271e2ef452450221502d11d6d6eab781c67fdf6392cd1107bd5f5232dfa2c31627c436a4fdd8726a37258e6acccda0d16610a39b975b0ee72fcf17d2767554f WHIRLPOOL 894d27e388bb1e4d619d6ef965f653fdd45bf12ad328a4345b78cb883383c17ed1db970143418af4e180c8920bb72c2e02b4fed57979e275c64d3a21c8592064
diff --git a/kde-plasma/kscreen/kscreen-5.5.1.ebuild b/kde-plasma/kscreen/kscreen-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..b25ff22
--- /dev/null
@@ -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
+"
index a85b0242db76c2e6046b68e8c7847becb6a4b7d0..79da4b844ef3bbe3bc1b37881888f013c5e738cc 100644 (file)
@@ -1 +1,2 @@
 DIST kscreenlocker-5.5.0.tar.xz 97484 SHA256 c90ec7a1ec3b27c557df134a25b358c6a56cb155878bbb0870e912cca61fddd7 SHA512 452c87358638196bfdd8372b7df7b56fa9b036a750a7316528e5963222d93187f124f6ffb2cc4325a3a562eb6e8c190edf4f373c2fe803edab853c4c4027323f WHIRLPOOL ddc8afe7cc172766896e60a6ac5aa3dc7cf99929894d691440fe75e2772c499a2ea07da642b3dbb54cf28004f401a8fea47fe3226835ab456dc803d31f76b447
+DIST kscreenlocker-5.5.1.tar.xz 97432 SHA256 3a1850a8cfc210a6c0fdff56b34481577eb697aa40982208df102f1dd1e02418 SHA512 c8819740bed336ec7e254faac3f0e3d7e915a067a23dd6b45e5ca1b3861414cd65cc44fc1627d21b1c0c03fad0515f55c5b4ef4942481cea5c75f776efa5bbb8 WHIRLPOOL caeb03ffa0be42cafe63cb9ef4e213a1f3b4e2377c7352e86d3e532b7ada154b06e7828e113d0dc2d0d10acef11e42c88592c76a586f26e265778018f7192eeb
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.5.1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..e7165e1
--- /dev/null
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.5.0"
+VIRTUALX_REQUIRED="test"
+inherit kde5 pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="pam"
+
+COMMON_DEPEND="
+       $(add_frameworks_dep kcmutils)
+       $(add_frameworks_dep kconfig)
+       $(add_frameworks_dep kconfigwidgets)
+       $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep kcrash)
+       $(add_frameworks_dep kdeclarative)
+       $(add_frameworks_dep kdelibs4support)
+       $(add_frameworks_dep kglobalaccel)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep kidletime)
+       $(add_frameworks_dep knotifications)
+       $(add_frameworks_dep kpackage)
+       $(add_frameworks_dep kwindowsystem)
+       $(add_frameworks_dep kxmlgui)
+       $(add_frameworks_dep plasma)
+       $(add_plasma_dep kwayland)
+       dev-libs/wayland
+       dev-qt/qtdbus:5
+       dev-qt/qtdeclarative:5[widgets]
+       dev-qt/qtgui:5
+       dev-qt/qtnetwork:5
+       dev-qt/qtwidgets:5
+       dev-qt/qtx11extras:5
+       x11-libs/libX11
+       x11-libs/libXi
+       x11-libs/libxcb
+       x11-libs/xcb-util-keysyms
+       pam? ( virtual/pam )
+"
+DEPEND="${COMMON_DEPEND}
+       x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+       $(add_plasma_dep kde-cli-tools)
+       !<kde-base/kcheckpass-4.11.22-r1:4
+       !kde-base/kdebase-pam:4
+       !<kde-plasma/plasma-workspace-5.4.50
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.4.90-no-SUID-no-GUID.patch" )
+
+src_prepare() {
+       kde5_src_prepare
+
+       use test || sed -i \
+               -e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
+}
+
+src_test() {
+       # requires running environment
+       local myctestargs=(
+               -E x11LockerTest
+       )
+       kde5_src_test
+}
+
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use_find_package pam)
+       )
+       kde5_src_configure
+}
+
+src_install() {
+       kde5_src_install
+
+       newpamd "${FILESDIR}/kde.pam" kde
+       newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+       if ! use pam; then
+               chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+               chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+       fi
+}
index f52f32b3d50ea169ba7a377425d31afdc532d2f8..56c03bd6bdf836a88ba0a822e237c89bb5820458 100644 (file)
@@ -1,2 +1,3 @@
 DIST ksshaskpass-5.4.3.tar.xz 19476 SHA256 7eb6025e58e8cd57cab640ab42ff9670ae113317534001be94916610135127a3 SHA512 b8378263806014c225a3c7337c1fcf0a513cf508db718e6154304f49841e0d3744b61a58058093e021f4ace8b282842bb7d90ae5a9ad912af222cbaedaac0aad WHIRLPOOL ed0c6a399bc4338b1b17ea2c790f1f9490eb1f2de01aa3b1aa5dcb8a7c919f5b4895e0eea65c76b624d2071436f1a0c60cc1256d0a320a60b8dccd4ea1af1031
 DIST ksshaskpass-5.5.0.tar.xz 20360 SHA256 10c2c4bbfdab8eb340e1a59f9378178b2c76493f512a7ff7dfceeafd3643a88a SHA512 0449d4719d3ce6d686bfd91b96987bda7f5b83ba4653a408002be2f6d7875743693150d8b4ed77c2e26781091795f248d26d9969a8b5b86d6c8e453386239473 WHIRLPOOL 438bcbec379aee04d52caf41fd6f9f8c39470c2c40a68bb9d32efad7628d336336239d61d8b106f3b68e77f2e16da3a3a28c73837a36541441f3731af686938c
+DIST ksshaskpass-5.5.1.tar.xz 20332 SHA256 1bd5b7b9e4ef58c4f1586af1818fea25cd772eba6f5d2285bcfea8cb4d814e75 SHA512 409493edf4b4f121993dbb30160b0a18dd2b8774a11334024ba5f6c930e046b95017accb3538654fc250d38513f63cedbed21cca7c61bdf80b6ee2e22a9632c8 WHIRLPOOL 0472fba59672db4785ea6a6af8bb403d5c62c3da383764bbf03cbad1972428aeb4ea892afbaffe936aa97d0d5551566b1325c46c658946499894c287a5a1d359
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.5.1.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..1dd1935
--- /dev/null
@@ -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 ""
+}
index 1caf0bb6d769bcc06d24d1afaf6e8eb5eb1a9bd5..8b3c07ea8e0bb230ca73fbb0a200ae77e399ebe8 100644 (file)
@@ -1,2 +1,3 @@
 DIST ksysguard-5.4.3.tar.xz 481208 SHA256 935633f75ad167cbdccfee453be9b65d12015db426576d434fd47fd797daebd1 SHA512 77f4d77c4df5ace23479d3cbe23d1da2d70e26c5530549bc24bc821ef3cadcaab38300b0fe211eb597448e9a453a58fa073b03ef798f6696d1a206800352755c WHIRLPOOL 1e40432a5b17bd9a99c933e5e6bc05055ba249bfc2dcdb3807aa02fe55ec732506b98c60e7d7e07174ea2bc397e1860ac851e4d28e262cf65cf0b4040032dd4d
 DIST ksysguard-5.5.0.tar.xz 481520 SHA256 7b8d1e0d76ac90ff08c31cdff2ffed0235588d65baa052e840d55bc6fc0052dd SHA512 cb72d188c2ead7941cf529ce938e34ef91f818f6a5f9f9ee560777d12b8b7ee91b145560776ef0c16f01fce4e8365410c2d464878f0a873e8f9407cdd47df56d WHIRLPOOL 2dbe052c96fadaa25ff2fe4ee70453cb150625b7b2768db734e613521eabdd85d6e819e823a7eb78a9d0159bc166f8e5f2bf28d244ac8b1b708931fd60e07ccc
+DIST ksysguard-5.5.1.tar.xz 481412 SHA256 816f0120dad6deb32de80e5da3d3d5335a5257865ed5d5700f5652284483e37e SHA512 32b5f207225a05768a1c5abe576924de9f668c82c6f27d7aa78a28e60fa9a20fe976583456f408cbfa59e093ef3d7aaf34b7753f26dc16b44c49d64c1008c94f WHIRLPOOL d778ebb1b2450bfa992363a3b33d64b7cac3a2b80a422c0ee3409d9ff03734fde2fc12a553e9dbbc3897d93852f632513d1e8067936f18b6c98427d6fc7af73a
diff --git a/kde-plasma/ksysguard/ksysguard-5.5.1.ebuild b/kde-plasma/ksysguard/ksysguard-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..18aaf1f
--- /dev/null
@@ -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)
+       $(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
+}
index 9c312e69b5ac15732cf4836ca1e7f8590d396edf..8d80095fc1ce2eb9fce3da151f721cea0e377773 100644 (file)
@@ -1,2 +1,3 @@
 DIST kwallet-pam-5.4.3.tar.xz 15540 SHA256 a15c1fe1f8b9dc3be2600b93876bbb15cb28cf65a935c066065c516518fabe54 SHA512 2bc79bce836d565aca07e7689d98cd44a20096991e1e57b6d6bf766fa518340421de7d7b47e6c8e8ae749a93af682a4722b6d5b1ce6167cf73248bc4d0795ef3 WHIRLPOOL d0a74950f94f7109ef4cef76726dc3f248795062da712832e69ed620c2df395e938112b9818ad0ff3d337bd68b005c25c08a9e2a53f86ec008a6a85b834fee25
 DIST kwallet-pam-5.5.0.tar.xz 16284 SHA256 0f98472e727cced732c51d3b76505adf941ac5fd5827ba66545e44006af69e20 SHA512 95a2cf4c4217f69deb7955465221153e8d69c6989fa418c97a0ce09dc83f433a6deb727d1dbe55a9d1a67be6b639ac29fa2bd6a10c99466b854837200a31b8d0 WHIRLPOOL 0ba41880168974e046bf3b5f29456606f4242026ab177fbb6ddf8caa8aa5a8272368364b49510620896d78a813d1a2838e11076a5b83b0ca02775d7fd23ee1e2
+DIST kwallet-pam-5.5.1.tar.xz 16276 SHA256 a6601a5d87e07ea0a546c94c153f187d17b304e8ee4e0f5781c9edda045268c2 SHA512 ef4dc21f87d8d6af3df070f2c1112b53d6812810d013e157eb711d870fff35447a3c0f788a8faf5b7977a50e2e61788668221f1faaa0abfc6b3d70a5fae95fa2 WHIRLPOOL 5c078ac38f870cbc9b151ac569adf121509bc8880042c01e9e7eb43d6b6bccbec9351e0c57e995964ffdf1bda63ee159692129159ea816baf1407cf9d6875911
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.5.1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..4aeb4a7
--- /dev/null
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+inherit kde5 multilib
+
+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}
+       net-misc/socat
+"
+
+src_configure() {
+       local mycmakeargs=(
+               -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+       )
+
+       kde5_src_configure
+}
index f09412d217642b1a1f8642a2f730ec9b43d94ccd..fc7c35c70cc173ef5bca6f255e2bbcabf070ace4 100644 (file)
@@ -1,2 +1,3 @@
 DIST kwayland-integration-5.4.3.tar.xz 14004 SHA256 17d76337e10c268823be94bb9c7b1254ea435492e9325641e34f847a76b64c81 SHA512 e8ffa0bbe0338ea5e158b150ac6a04e2ce7ede7e9f14ddebab8694f062e6dc928f6e44772ebc26b03cccc9693a6a8f697bd3653877413ad3b87d1dcdb5aba37d WHIRLPOOL bf147fd651132b8d45d7df8617ee9f6b994c51de078857380653ebd93a493ac9b2642666316ab6c9af3975fbe036a0a7b73830276e67b1960f6f749b5a88cd05
 DIST kwayland-integration-5.5.0.tar.xz 17080 SHA256 c4c209670b7994724a67ab79cf41d44c2e12b49c3a36600de85c7f9b90c75374 SHA512 3149f3e3ff8939d771e1cc9d78533067c8c81e75311cade7fdd7caca16c1eb9c4fdbcd30cd812eb000edb9e126d5f5e7f1745cdf74f6676117f0d691ae5e853e WHIRLPOOL 72155fe9a3d4335a84a2382e6eca817deaca87a138215751781b449b1d051a232d1458d80191dc145444bb4d846e72719432135cb2dfca86b0bcda6ad70dee34
+DIST kwayland-integration-5.5.1.tar.xz 17076 SHA256 ae649db9c158efcc3c170a2f7deb7e249bcb6eb3557e032d913d7d1d3b4b41eb SHA512 62faff5674c9d2a991cf1cb04159b9b91ff678fc3e6665ac7a5b6c4d4844f3bbec4e15f8c738ff0321a981fb43ec4454b830a25bbac85e7f899e1dfeec88473a WHIRLPOOL 8d1936289110da8c42221bd4ac51571540ef0a41d729e1d0dc7b15d6f91278510bb2b1bfc3427c65059a02a3b2eacc00251d51a3eb7dce8986dcf449bce7d547
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.5.1.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..1f1422d
--- /dev/null
@@ -0,0 +1,23 @@
+# 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
+       dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
index 6b183b7aa6ee255ee77b6482bcae4a3a52339d1d..9b50a65c3eaa858d562d5caa40cd506e8e768bc2 100644 (file)
@@ -1,2 +1,3 @@
 DIST kwayland-5.4.3.tar.xz 111608 SHA256 8085ef636c91c83c03eddaac0de7d8e7f56f08884ea8aa72fb63b9b93d7fd208 SHA512 3c247c75ff6d8cc469db0389caaad4b407e0aeac20bb4959689b3b40dc8eeccb03819d2fd2315c3074f9aa447e338ab2850743c2685913386dee7319a6558f72 WHIRLPOOL b55e4d103f671cc6f1d95d048b034d406d6435b8b53b337f976d4f7fdd61ce4dcc5b3787e122ec5ea5959423faf5cbe8ce546bac97c6d66b76c7766355daa8ee
 DIST kwayland-5.5.0.tar.xz 159732 SHA256 494364792100213be6d58d41497fbb20a4eaf9505e0a56dfe0d2a487671faab7 SHA512 0bf6f43c7daf9eb58896df2dd79955e7d3d3662e97360aab9cd5df991bf4dc511b7de1fc3fe014ed860deb6925b4155f4506db5a6b5c8277841fc4c7613fde17 WHIRLPOOL 7b2694a5b659934660399ba492f14c6440a3b58c5a8334118acc70b591c9274d8681df7684c0ff8cdd237297b01c86a3e802c6bc520349df4e12385923618f69
+DIST kwayland-5.5.1.tar.xz 159724 SHA256 85b4bb15c084391ec41b404b596213db5c28fb2156c73414d7909506af87bda1 SHA512 6f15a79fdd5af9114a1ef9998f76166a8bd23c018f428e08161c60a1b2dd559973ba93111b37d6a3790307ed71f6289fbb7691d2191ec5d17ab3581c6afbea7b WHIRLPOOL 43f2ef79bb59d60a7ccf57a7c8ed4cadaf35d3ef757d6b7ab65ea0513efa3b136cc95bbb07d069abbf5d2e7b5b1cd7e16a63bf1fd51712587bcee0bb04677579
diff --git a/kde-plasma/kwayland/kwayland-5.5.1.ebuild b/kde-plasma/kwayland/kwayland-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..2a9b634
--- /dev/null
@@ -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.7.0
+       dev-qt/qtgui:5
+       media-libs/mesa[egl]
+"
+RDEPEND="${DEPEND}"
+
+# All failing, i guess we need a virtual wayland server
+RESTRICT="test"
index b88a009942a5aa0374651b28ba9d8f8472c6be17..bbe2b445661624c99e39f8bb95d0b3585d220a34 100644 (file)
@@ -1,2 +1,3 @@
 DIST kwin-5.4.3.tar.xz 3790076 SHA256 ab4842735dbee91e93f0d0dadb39df4aed234346010caeb3c2fcc230562ac366 SHA512 dcb4c006b06653950f52a9583dcf3a23cceec90fef7e629dde9fff4e683ac406b64425c136a3c9c774e4d2946a4619c263af93b87e803237ec618911c9d32759 WHIRLPOOL 8fdff9ed2204b810549a273a01c2bb39caaec2ec073262516f8cdf9e57c745d0d2d2f45a2a71fa820b26d5672d6558422adfd73575b0b6d2cd1572b68d2485d9
 DIST kwin-5.5.0.tar.xz 3810348 SHA256 34b02f5a1ef50390ed90f550e4d15ed806279072a34e7ded2475f32027a8f338 SHA512 092f513cf35b053a3ed995b6497727671f6099b03e828420a5202679728b025afc5eac60269b780484fc0e03b61fd8acc49a7bf218ae75bde5d5337dcbc9945d WHIRLPOOL e1f1503957f972469064329295074d9e76fd1065f5afca8170ac26e50fad57e2a08d41729979906adb573da505097c9f591f6ac77740c3570618381db40691b3
+DIST kwin-5.5.1.tar.xz 3811772 SHA256 74a308ce3951139e3009c6dcb005fdc0a143962aaae2d60f02ac1a48364a103f SHA512 b5bc7e2b030ee26a7bdab06fb1c2cd2c38169ef2eac507379dc9d07716eab6b3f0b6c07f171ba1a12b7ab0d853e9e5663fc7d778e36505d79b2133c2b96b27d5 WHIRLPOOL f14482c9d46439007bba1a47158a5e45a21eff7b3b10aeed190de372d23edf156e4fdbf061da35d39980abe716b0300129cb7060c614ef573c18360c7a8f3a74
diff --git a/kde-plasma/kwin/kwin-5.5.1.ebuild b/kde-plasma/kwin/kwin-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..a172baa
--- /dev/null
@@ -0,0 +1,88 @@
+# 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 multimedia"
+
+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 kidletime)
+       $(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)
+       $(add_plasma_dep kscreenlocker)
+       $(add_plasma_dep kwayland)
+       >=dev-libs/libinput-0.10
+       >=dev-libs/wayland-1.2
+       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/fontconfig
+       media-libs/freetype
+       media-libs/libepoxy
+       media-libs/mesa[egl,gbm,gles2?,wayland]
+       virtual/libudev:=
+       x11-libs/libICE
+       x11-libs/libSM
+       x11-libs/libX11
+       x11-libs/libdrm
+       >=x11-libs/libxcb-1.10
+       >=x11-libs/libxkbcommon-0.4.1
+       x11-libs/xcb-util-cursor
+       x11-libs/xcb-util-image
+       x11-libs/xcb-util-keysyms
+"
+RDEPEND="${COMMON_DEPEND}
+       $(add_plasma_dep kde-cli-tools)
+       multimedia? (
+               || (
+                       dev-qt/qtmultimedia:5[gstreamer,qml]
+                       dev-qt/qtmultimedia:5[gstreamer010,qml]
+               )
+       )
+       !kde-base/kwin:4
+       !kde-base/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+       dev-qt/designer:5
+       dev-qt/qtconcurrent:5
+       x11-proto/xproto
+       test? ( x11-libs/xcb-util-wm )
+"
+
+src_prepare() {
+       kde5_src_prepare
+       use multimedia || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}
index c5a665abb7ff5ecf6c97061562a2a6de255b4595..0456b9434a023ca6c1a72a4ff49bea6bcfa0a03b 100644 (file)
@@ -1,2 +1,3 @@
 DIST kwrited-5.4.3.tar.xz 19484 SHA256 d3835c5f17c3209feb9d0abee0d179cdd78881c7c0d1b3fcc05a7ff3f5863647 SHA512 090895091bb9567f578d46880a86c62f9ac7f2b43167ac88ffb1422f0d89fa964a2a96ab237f3ea56f10411121a24f63e163691d5f140a6bf2817bfed335332c WHIRLPOOL 74a868f3d56bde4b9d3635ba3bcb7c314f4414ba922a1aff1dd3f2b564bc583201c74fcfdbd3d6b6dde03ade82e351c04baa91b90d1084d7396845631b547741
 DIST kwrited-5.5.0.tar.xz 19500 SHA256 484b534875ea88637f3b2b6cfad894667a5688eb2c5f7b48728e8dd6419d1fb8 SHA512 34b5a76238778b4b3d019af740d521ed0c45dacfe3cde00c5f603f3a55613fcb5c4cd2cba9547bc72e34cb3076045f804ce32170010c9f2e856f662283634f6f WHIRLPOOL fca396fb92011c2fcc8e01e6646f752759fcac2f836d8942fceea2faeb4a5bd229f76f6e4d3454e1e537f9888d3700a99579a8fc19662f2522a0c907fc4e0703
+DIST kwrited-5.5.1.tar.xz 19496 SHA256 60e00ecc2d43026b70c3a896c540c9f93bab8886a637507aaf4b682ac90e3636 SHA512 e7738135a3b53f9be97ebb0fa5cbf769e115d209734b5c2d9635e53f34c82c41864d1ded75e0fc63c84d9ca0cb5d38ff583769fa65266d6aa20b0b945a43e140 WHIRLPOOL e54642f0e1d29e4a328f31adf7553066bc6dc5cf65fc32a0d94940ef72fc4d27f552607b31e88abfc8765b9aa7a33ae0d93333e05571c9bdf3c5c97b740b1d16
diff --git a/kde-plasma/kwrited/kwrited-5.5.1.ebuild b/kde-plasma/kwrited/kwrited-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..4df389e
--- /dev/null
@@ -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
+"
index db92b7b66f20fa0f9c1afb52174d781d3f882c38..4974a0563afa5febf76ab3b7423a4e615f1dec3d 100644 (file)
@@ -1,2 +1,3 @@
 DIST libkscreen-5.4.3.tar.xz 72244 SHA256 1d2b17c4e10edc4bd7ce0f220f2b68eb3522c76c2708b0ddc0c2f6bda7794975 SHA512 483b65a55bf84f3ac7915e5e4d2224d71b86dc2a58697219bdc53af21df9cb65c5c950cf550a4b172e464bd7f9d3da93fb7283601d1e6fac8a5c18a4cb7bab90 WHIRLPOOL faca84131edd21d922c18040c2c294531ca16e82e1f516aecd7247be0039b4dfbb758b2f3b3533e769c59dd5bbcb658583418a98921f42515cf483731c78edb6
 DIST libkscreen-5.5.0.tar.xz 71904 SHA256 83f75c47336bf12815960010fb3e44238ef2af3ba76b72ff07a67f8599740370 SHA512 e884211ba5d59a8b3d8cbfe685540eee10aa32e09bec01d43f266d45b932c1596a258d82bbfb24e4de4b653540f06d447770aa470bd84a67117a4aaaf1ba14f9 WHIRLPOOL 7324c3f00a68704fc9d7f81d443d72fcc6346dbf7dd087b02d505670737657c25eb4c2945de9e476dee7013939233c8c602964327df1a32cfa34c7a3f61e3256
+DIST libkscreen-5.5.1.tar.xz 71964 SHA256 5e2c38a436293ec4ba2f19237614e254a799808ee232818a053d439e5b8761ec SHA512 21b32967bd01a8a12f96b89eda1bdb1d83a9864c8808518d5a0278517f71ddff9fb204b1c0613fd96a68df79470bbc3974805e525b73bdb0450fbc89ad18a78c WHIRLPOOL d5f484f1d7b51b2315266359fb1049dcaa424b747b3c92a767618d2340f0078fe2db4ba5c6a5006a3fc0c85b43be642f20fb26c02baf309ef331808c74651af7
diff --git a/kde-plasma/libkscreen/libkscreen-5.5.1.ebuild b/kde-plasma/libkscreen/libkscreen-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..36fedf0
--- /dev/null
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="forceoptional"
+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
+"
index 0156873a5d9e51a4d9da776974382fd9aa2c68e4..ffa8a65550fc7fb9d5602dfe6dea24e3fe017f3c 100644 (file)
@@ -1,2 +1,3 @@
 DIST libksysguard-5.4.3.tar.xz 561892 SHA256 d1d858b60d83ab6acce176647a35dde98cac483f02ebdce3ca7cfd25e46cd6a1 SHA512 a7ed47c1ae6985ee213103f51a96d09bb93c6ab3693cf6aefb2f88db14c817943d7d1c3e6b3c38495557dc533b5fa7cc9f881a09002d16b7ab3d4d71a88534ef WHIRLPOOL 0390c0ca26795d07f2d6bf2c534c811650075ee3185c8a2327b24b6fe8ae4c763a4d4c84b08beec80a11e5d0f44a08e5981884036acb5ce410ecd366c469adfa
 DIST libksysguard-5.5.0.tar.xz 568012 SHA256 2826e8c2f68a8c28a9100d566ac2aa5eb5b00ece664e1b35711271cb938356dc SHA512 6a18df1d7c59e5634aa03fa6482f20855bb7f5ffacd2991dcc5b2a798135928cdcf3679ce15cc93ad2127b2592d25cd81efb4d0998f1b0e41457f45479025d28 WHIRLPOOL b2462461869a2b817a7620181065bcc55c66f52f9e98578b4e18e829b70c2a61b77ab656ecd719b955e93fbc91d1aed4d4100b77885dbddc8e808ecf456a7f23
+DIST libksysguard-5.5.1.tar.xz 568288 SHA256 bd95020baf65e779ee649af9d9743d699dd51679a055466ced558158f3eefbfd SHA512 179cea1aaae62df30285b4ea3b1a15ea67218a4be27b222231f92688699bcbcc6971aa5636d7bfd264d8eb422792db0d969d9c4f806c2bcfa111bb49e55e7522 WHIRLPOOL 479fc3541999079fa877b99f7c92a304455cdfdabce4d7266abf7e1113917bdcd512e14adaa3104c799fb74e1b40178e0e999192e44602bf94c9ff324dc51cf1
diff --git a/kde-plasma/libksysguard/libksysguard-5.5.1.ebuild b/kde-plasma/libksysguard/libksysguard-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..acc41a8
--- /dev/null
@@ -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="+detailedmemory 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
+       detailedmemory? ( 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 detailedmemory Qt5WebKitWidgets)
+               $(cmake-utils_use_find_package X X11)
+       )
+
+       kde5_src_configure
+}
index f2b7e0985ec70fce1996a5772a1f90406ee597d2..f285527e6cb406cbe9fa5a4f9e8178bcc7b0fe89 100644 (file)
@@ -1,2 +1,3 @@
 DIST milou-5.4.3.tar.xz 51492 SHA256 e1487fc818435c25830962e0cab9b78938de4d48c332583ace87681e6080c677 SHA512 cb1f983c9b8f83496ee8348f9dbd3c7fe4ec3c235b1acb21a32dd515cfbf00fcffa45e8ab4516e5a43779e41f23d0dd3a044be16127c65d3cb3a67eb8d662a54 WHIRLPOOL b8e0f23b591e4573836074fcc160972cb11a93ee10c033bd4fc8f33c9d4ce06e5cd9c108c4d00ca273a3a4b76b0a381304dde79cf3f2fe947fe62442a0587e18
 DIST milou-5.5.0.tar.xz 51564 SHA256 d53d33b8baf343a4f4d8ac36f01ed720ac62af620eb53c8f6c262169dc720576 SHA512 cbeaf0043face7678c340fb4eb55f8e82fb5f0b1ed9f6dac3e02774d7507ab948b95f4d6927c6799c1702d6492b40727cdc17983d9d14277d3f5534c7485148d WHIRLPOOL 8abd2dda3b088f1770c2d34034e00a1a0d02aba692dbed93af671683ac36cf3ebf98038f1cc1256dd22b30bf5f8e769abad4e1ee561019fa2fe33dc8e2547c18
+DIST milou-5.5.1.tar.xz 51548 SHA256 7a42ee7d80164648f6cbc883b177a5d7319f60f733eaf0fcf1ffe38c3a761a83 SHA512 95141846b362bd26c0208f47c2e21f15cb9f27f1e6cdba7361b6e7b4fcf45b3af95a0abda3a7d5d502aec1ece30471fa81d4bcc8f45106d2a963c8410dac7a38 WHIRLPOOL 1a94699bdb9ef3d82e08c726d973748e95fc0c0eae8f47ff9241f977f31a2450333bdd04af1e4587cf8157361f4618303e620ec16d288b1add6d4cc516497bb7
diff --git a/kde-plasma/milou/milou-5.5.1.ebuild b/kde-plasma/milou/milou-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..71ce2b7
--- /dev/null
@@ -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
+"
index 3a724120a5eff5155f38587e33c9649aaaf30f62..c45011085288609226484dea5c1324e3e893b04f 100644 (file)
@@ -1,2 +1,3 @@
 DIST oxygen-5.4.3.tar.xz 4508180 SHA256 0510483df7c55afde204c1927bea3ea1f2135761d0615c44f204e127743166ab SHA512 822cd897869afad160439d41f847590314a0d6c3135533384d90880366d8fe098590c9d0edad28f600607ac1c1e6d666127d6ac2b0be05b8683277adbb66c2ea WHIRLPOOL 94d55efdd725f01d8afd47452e60ff63ee980a15cb4a561651e1bfbff9a896d5e77876a213ab2ade081156cf87edc430749376522711453e2d7b91e0ffe81388
 DIST oxygen-5.5.0.tar.xz 4453584 SHA256 fdc44fb86111ca9315d9f286ec2a283ea3376836add7126f7ee0a45696a8808a SHA512 056a06563814c91a03c053b57c89eb498e35d531b30c37a2413c6de3f2b4c0abb2551cd5985373f772334cedb601ca314146d9e863b93602fdfaad78d536610c WHIRLPOOL d8a4399e18a7b68f9c0f8d987466675988bdd64feca6f20f4a73f57b04a42fbc2ded4d749d2d8fd94ec3b7517ce0d2f5c29df20c53a102274e81aeff19f5463f
+DIST oxygen-5.5.1.tar.xz 4454144 SHA256 d0b4d99ee3df0d89412b23d6b255612bfd5dfd4571ac29507dbe6ed587835f3b SHA512 dc47f8667d251e15796f240cb0ffbe278f07dbb9ed83721c361d9799b7f066cadea180fbe15cf29f2d69a800adbe5052acb9c13ffe9f9628583bed8031954720 WHIRLPOOL 88ac2468853a9709493716ba1fbdab9818fca09736855940e4fdce27181a9f1ea1d087a92e91ccf814ee176843032dd1ba899d5379f6da90beca3efdc9a17fbe
diff --git a/kde-plasma/oxygen/oxygen-5.5.1.ebuild b/kde-plasma/oxygen/oxygen-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..871ffc4
--- /dev/null
@@ -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)
+"
index c3cdf027ee69a6a0ffdb38e928709855cd5654aa..8e5d398223cfb336c20f6c0e52b764ea11f19188 100644 (file)
@@ -1,2 +1,3 @@
 DIST plasma-desktop-5.4.3.tar.xz 6263460 SHA256 2499741ae87166cdd5c2056dcc6a91aed6e65b9778f2c087169f6d666e44c043 SHA512 b3e7c7ae988dbddb16911443e75182f39c830a1128d39fe4dc69a0222b5f6db85df48af8f37efb955c5ed289bbb3a93b2bc2a8fc5270e9b0db889dc83e26e587 WHIRLPOOL 35f621a69c409a79c37605de6c335397cbfcf08d3fb2fa7c37b18f7ef98bb82b051b76a4c723bbfd17e841823c622dc212f2f7520931a42671eb092f113055b5
 DIST plasma-desktop-5.5.0.tar.xz 6294892 SHA256 846fc39cf73cc94344f1ba68a3640e586c513879820787aa06f5c528892453c5 SHA512 2b1b53b7b36b35ff6e63da31f8e10cbb770e8e89a08c34afee76633c767ff743df91bf96437c5077cc06c3ef25a4f2cc62ba58e169f9b0653b095350232348f4 WHIRLPOOL 7cd768a78c5d92276e916ad08780218603f1fbadb3e2f150d0bc7dae98ca621765d46fc4d826ae9fe6dab21022fafe68328c7e410eb82e629aca82fb26aaa1d1
+DIST plasma-desktop-5.5.1.tar.xz 6295496 SHA256 d146a98ff75726ae04c2025477f78b8ec1f124475f5f94cd3727045048865fbd SHA512 e6ed61afbe25ac35af78262b2f6bc0b00f2ee8b4b1c1dceae6d75c0aa109ebdc2d3bb4607a14899e7838121c1226a22d6c7afec65a7e0f15073ee0a543b03ff5 WHIRLPOOL ac711c5014b5998609a0c47b0a34823556103e4277660a07890eb31d78fba888a9300dfc452ee21df248b74d6738c4203d3b1ae0b4233bc87f6eb4333bf9df27
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.5.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..cdf749a
--- /dev/null
@@ -0,0 +1,138 @@
+# 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 kitemmodels)
+       $(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
+}
index 64dcc27d4b928401e67f161f4709b98c9dbf3b87..64c5d852a619a6a21ed21bb575aa4e5655d0c15d 100644 (file)
@@ -1,2 +1,3 @@
 DIST plasma-mediacenter-5.4.3.tar.xz 158840 SHA256 6a13e0cab0f6699d45e75b77556fb5a8fd87c6e42803613863c9e1ee4782054d SHA512 e05291a61548b9c5b30523efc52238e40375f50159d99169520c433589943ba1514489887e20e2ce06f2139aa63ef02e1c89e5170477aeebd32a530ebce7efde WHIRLPOOL 5d16865356e928b9e8aff2b83ac45d3cbe92918371ca53102ac312dcc21003c62f7b0c769f4e46d3df3e77715d37c004efb387c340df281ee6dd722cecb14472
 DIST plasma-mediacenter-5.5.0.tar.xz 160088 SHA256 a2e01a6f1117848959d609e97225689764e7f38d3a0365b8e57bb85c875e5982 SHA512 95118f81a8f16150e9f8d166b816fc630afe055f00892ade6d6b820a764bbf7fafdb9e55468717cc49e7a43ae0587ba00930695b3d0f976da0cc160f862a27b1 WHIRLPOOL 2d21d72044efebc6661aba4d8be57a08fd50f877d5027490ece525fb5a368e6261c5d681d757ef5ccd798e4723d63e5cb707e6ccfd7aa75bcf1911208e965821
+DIST plasma-mediacenter-5.5.1.tar.xz 160040 SHA256 be81e0cd40d16c6c103e06d9222d3e5171d8ccadc99dbb54abd4e825738fb48b SHA512 1f5963caecc36bf8f6a6e83f12be405d7c0e2865784b552d80164d674845ab790a114f128ab2d30ded81c1f7f60c9fba1202cd1a6ae014cb8dd3998350668c99 WHIRLPOOL 3ff788909fc59ec1bae491806f301e84459eec44a0d7394a9462e5203e1dc794cb464e7ad76ca293e22828a11c5aac13f02d4ad99efddf1ad210d40189962f5c
diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.5.1.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..86255d8
--- /dev/null
@@ -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.5.1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..e2375b4
--- /dev/null
@@ -0,0 +1,63 @@
+# 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 kscreenlocker)
+       $(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 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 breeze-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) )
+"
index e220e6ccd567efeabe8939440ece51db9478e39b..21d39c89b379c00eb6eb432f2abab8bf87f1b31a 100644 (file)
@@ -1,2 +1,3 @@
 DIST plasma-nm-5.4.3.tar.xz 550868 SHA256 b9500cbd386868da566af58c6ae4b55b2a7ec95d3df3bd2258467c7d2cfc90f2 SHA512 013bf2e217deca5e1f00277f42622b46a7042416e2479b1cfcb1f64b598e29058c14314b65f9427cf9a54963b820d07077fafb21120ea17598b3579e95a6ac12 WHIRLPOOL 866167f470b4e741cb1e64016ddc1f977a08dfba43432e37f217dbe807c7d2e7b07c6e4afbc77b6a141a82235a052fead462f337c649b9388d211db8c2f15c3e
 DIST plasma-nm-5.5.0.tar.xz 605796 SHA256 a4391942d81dcb1a752ef5e7ec6e84b97c6af598dc2e6c9ad02f3c7464ae9fb2 SHA512 0f600c24cbdbe3d6d82656c4efa074ec4363b247c994744917e343ae7f0c28d4929adbc5b4ffbc58cf2baeb5577782e3bf26d146ec340be1fd939c5d4987ec1e WHIRLPOOL dcf576914fa37de2fac1f742d9ef2ff0bb98c4937047d4e7655a1271b5993122ddd9b78bc6c05188169a22fa9900df530fa680c586456a3feca298ecfca2dc93
+DIST plasma-nm-5.5.1.tar.xz 608012 SHA256 0ffac9d50564928136d68c74a2d27f6eab450f51474e5dcceee09cf377420160 SHA512 05f2ab830c74ac7cc0306184c180ad8a20f088af8c6df3d8b60b6ebc4e3cb0a4ec41657d77e2f2d98b84e27faf7e3a4fdac1db55b9b68c68284281492563f739 WHIRLPOOL 69adb80f5b3ad721ba039dafe2addd12d490e5a691e264a35d3fc7ed730a7fbfd3aada4843ac5056f6063685e9271ca9f64fbf3dc1835bae692723294ce2ec69
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.5.1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..f9cd638
--- /dev/null
@@ -0,0 +1,66 @@
+# 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)
+       >=app-crypt/qca-2.1.0.3-r1:2[qt5]
+       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)
+       !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
+}
index 1e295f10f183bc9aac9001aa47ff0cf1e0ec5dfd..a1b8543769c8cd84590db2dd16bae8eb388089a5 100644 (file)
@@ -1,2 +1,3 @@
 DIST plasma-pa-5.4.3.tar.xz 44312 SHA256 2677af6636e84bfe8256fb23bbc00c0a0dbbeabeed15006604d0667ef75ecd9b SHA512 9a5073d2f661d4454a7bcc10e8f15b3bbceaecf46fb4f51eb94fb4be31b1d387e6c324ee8ff24f4e49000a90345e7315bd4c5c52c24f3c3d19cd3182be16699b WHIRLPOOL aa557495fd5aec275baaee58f921ccc5f0b3cf95931464a8098c3eefd531ec520b1d9bff2dc002d8bd13dd8273fb7b37b1c428947193ec77bd9a0890ab90dba2
 DIST plasma-pa-5.5.0.tar.xz 52080 SHA256 7522ff37433891ba1f999a8e9aedd4362d90f6fdfe514f3fe7bbd96e9cd5207a SHA512 78746a1c47b966c2a8603f62d7c6f67c1a1b415f04620886132429c8b1fa1a4959bbb6789568958d4a749a9f208a7e90500720d37da0c8977418620806142ca0 WHIRLPOOL bfd5d3762530969c37895967d15de6c60ce5b43be21bf8013012b0c367dcf687d5a78e7c3e91b37c0d93de4f14c8d0e7c98628d31aacc50d8482cee84aa059bc
+DIST plasma-pa-5.5.1.tar.xz 53804 SHA256 13de2fa6d8c739b65ad1019ce937652ca6bdc3d9da1687a7954800dcc9a5ca8d SHA512 92bb286025dc37311094c94e9923aef38df1181f68c27f36c4769870e4518616a010241cec953362091b3bdbdf764379f9ec27fd708e0e8aa01d5807e2a97d6d WHIRLPOOL 06a373c3bd471a95311079f4730f4053a6eb17297377e604f963dab516b203c030e5c877f7cdabffc9d3ed9d36f80664f7a92bafb54e6c2661e8d78e4d08063e
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.5.1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..b5034ac
--- /dev/null
@@ -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}"
index 984167ee439c351bf60d75b5de2e1c052ca297ed..8b7325f41829fb0e41682210388642ed13b54e6e 100644 (file)
@@ -1,2 +1,3 @@
 DIST plasma-sdk-5.4.3.tar.xz 645240 SHA256 68b5f4acf8614a097a45a39b9a589e3a6c2fe13fc1801e7d612e1233c00ba321 SHA512 fa8020ecf67ff2d49957691cecb1de4502914f7783d8e60ffaeba6543f9a7cad3b62804e7d90b20bf3b918c4523bcf017565f74cfd946a09f418b9273f12e0cf WHIRLPOOL 940eec0d9bcc468a96cd26ad556681d7a281e72c11d63f4b2f89182db8190a7e8060692b6e5adac8a3f948f752af151dfc6468bbbb2fa3c7fb024f53d06cf7f1
 DIST plasma-sdk-5.5.0.tar.xz 663212 SHA256 9b14ac59f8a387d4bc33605996c94d54b0d10aed26318180bf48e1f58bb2d4a4 SHA512 78495973caa0a7b85f2e25a8fcc9aa5fa85fea11c609668e7cd851017d1dfe18eeb73202e17215dbee6f9007f07c166d6ee98fee34464a106c3161b47e529a9c WHIRLPOOL 6e67a93f8cd93f37f13164268add3a9db28aeb742cd959afd611628407ce23cda88bc310d080c1cb2466ca75c7b55b1703e0cfab417cf022bb67ae22084146a2
+DIST plasma-sdk-5.5.1.tar.xz 663300 SHA256 1e1e6fbb77808130516fdcdbe3ac3d395bc975252a077e6c0be5de3fdb4733e8 SHA512 2db6fbb2acaadcfc4e55f4787ca802922efb7675b78a674f2c54e8399e954fe78d1eb9426b79c1f36af425631297bf105cbe1d6b944325e4dd977500087939f3 WHIRLPOOL e173db1f7307fc7696ce44fe629ed13c7e5b1cde200af3a300f68d0570d44d05f21c76991d82c0ada0f7458a90b4e906b24d6658dfa58388b50b07e825f00382
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.5.1.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..213c37b
--- /dev/null
@@ -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" )
index 2ba02083de48c04ba2155206b005350d15f89d28..54be76d47ed6801e7e0c4faad80496dfce66b8a1 100644 (file)
@@ -1,2 +1,3 @@
 DIST plasma-workspace-wallpapers-5.4.3.tar.xz 50572248 SHA256 1de6e524506b00a2948c19175292dd02916e19fa9111c66a9dcefab3444bcb8b SHA512 976167fb283ac5176f189c63cbbdccad2908ef5e9bedbf5364ec7abf83cd2be7e80b6c19429cae65cb1d11946c8d308c55c1d540d19190328de32c5ad8b700df WHIRLPOOL df24a56cb1d8d8765fa2320f80b9f9e23f216116baab95bb2842e5be54f708e9e384a1fb758b012aee5dc4966804a8dc3bebf34e510d77db530cafe9c5070cc7
 DIST plasma-workspace-wallpapers-5.5.0.tar.xz 45917108 SHA256 bf11efae144e3e00623b565aedd5f48e24aba29ec03466d4f5b561e4ff214563 SHA512 21a34425874333c62226122effd75e2d5c15f88334c09f50d090509ded64f25a641c94cc1589ec516e40a346b243c540a426ca01d7ce7d9705701e823948fc29 WHIRLPOOL 9a707845f0088677e3b160b80a4696268d8db338e2c7b328ed2fbc08c4c6a4364c8c71a66accfbcadca02c59dca2282e493a4eec0f57d913d6dc5ae17f2968bb
+DIST plasma-workspace-wallpapers-5.5.1.tar.xz 45917036 SHA256 317f3204ce070d42efb3ae208f9f151e817890da7c64d21eedb26db9d85b4bf0 SHA512 555ce8ce79306bbb86a6ca45e08d8e78e62b0089ecd0a1ff3eff2937369ce059dc2739b8d9c497152976c69546af276855fce507c730fbe2cbda56842f37cc19 WHIRLPOOL ae0b52d417941aa2473f985950520017f5044d1a5796fcf5715c1731b9da9c71f18973fdbe139525e208c3b8cfada91b59f00f6eb7d338836e44a58aa49dc5f4
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.1.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..6e0b997
--- /dev/null
@@ -0,0 +1,16 @@
+# 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="!<kde-apps/kde-wallpapers-15.08.3-r1[-minimal(-)]"
index 0f89774ed2dcd45521699882779adbfdeedeb88a..cee65163414506a70427c43251ea6799c72b8860 100644 (file)
@@ -1,2 +1,3 @@
 DIST plasma-workspace-5.4.3.tar.xz 8648136 SHA256 bfe459234e1bcd8ed5c3a64524061330e92e38ec693099d5007048a483c71d0c SHA512 ac407724bd8aebc9207fbd55a97ceb0eac6c9fcb3129fd2ad19264a120c6e33495c8be5cadcf428d109f163c5159e009f034694b90252a338ec888ca77868941 WHIRLPOOL 86d516b5193ccc83fb552742809b073cd165993fee48c4516d9b4a978ddee0e5be1a930e6dd8ff0b6f64ea9b90eca9c53ce74029d3204e143570913b01cd0394
 DIST plasma-workspace-5.5.0.tar.xz 7382184 SHA256 2338e8b35651c5caf4fe28c99e37e89d56538f8b7c80a367e26af808f4007f04 SHA512 7ed3bd8e0b3d9c2c5c7043afea7fc103f4a8fe80cfb97c0508fc666373379c9060ee2d41523f42ef43ae675f180779f1d6d576822a989c57f0f01892fa7ac435 WHIRLPOOL f7aa77395063bf575c3318cb12fcd5bfc858761db16ebb4f8529e3617cc991cc1f9e14aacf6dbe95bac2794d0303f4e7d8b26aaed17306afdc143c6642dc39d6
+DIST plasma-workspace-5.5.1.tar.xz 7383196 SHA256 b8423fe5b8f6ef08f5c187320a58538dde37cb47263371bc8e1de2f9619eaecd SHA512 4d4be563146e0b587607e2eed499444303d82658a76a8436c696124952d11a8bb88a7de288f932c56e680627228ec8301d71798023576a3f475162421a1ba371 WHIRLPOOL 4ef868107e9d8c9bd7a2d4c898aab3cfb1ad1f112b6c284228920776626bfded2beb088e4b7c6ec782236664e73b9ac24a02f6845e3bd588443059706ca0487c
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.5.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..004cd1d
--- /dev/null
@@ -0,0 +1,171 @@
+# 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"
+QT_MINIMAL="5.5.0"
+VIRTUALX_REQUIRED="test"
+inherit kde5 multilib qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="dbus +geolocation gps prison qalculate"
+
+COMMON_DEPEND="
+       $(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)
+       $(add_plasma_dep kscreenlocker)
+       $(add_plasma_dep kwayland)
+       $(add_plasma_dep kwin)
+       $(add_plasma_dep libkscreen)
+       $(add_plasma_dep libksysguard)
+       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/zlib
+       x11-libs/libICE
+       x11-libs/libSM
+       x11-libs/libX11
+       x11-libs/libXau
+       x11-libs/libxcb
+       x11-libs/libXfixes
+       x11-libs/libXrender
+       x11-libs/xcb-util
+       x11-libs/xcb-util-image
+       dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+       geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+       gps? ( sci-geosciences/gpsd )
+       prison? ( media-libs/prison:5 )
+       qalculate? ( sci-libs/libqalculate )
+"
+RDEPEND="${COMMON_DEPEND}
+       $(add_frameworks_dep kded)
+       $(add_kdeapps_dep kio-extras)
+       $(add_plasma_dep kde-cli-tools)
+       $(add_plasma_dep ksysguard)
+       $(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
+       !dev-libs/xembed-sni-proxy
+       !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
+"
+DEPEND="${COMMON_DEPEND}
+       x11-proto/xproto
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.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|\`$(qt5_get_bindir)/qtpaths|" \
+               -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+
+       if ! use geolocation; then
+               punt_bogus_dep KF5 NetworkManagerQt
+               pushd dataengines > /dev/null || die
+                       comment_add_subdirectory geolocation
+               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
+
+       # 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
+}
index 370c4d54e437d7d01744dd39a9cd0585dce7c686..52bdeda5fd5d79aa00d1f89f7ef802993828a255 100644 (file)
@@ -1,2 +1,3 @@
 DIST polkit-kde-agent-1-5.4.3.tar.xz 39560 SHA256 d6a782f95916d2e82bd6de94e5f54f36102d2cf3fca91984d914bb9e5be5098c SHA512 aac51aeb7f87943eb98fd0183779a6dd38ac490e8c2d57591868608ba5e72dcc56e820a546adce794e83a8ac37c62672be103508666fefe4fe8438befc723a42 WHIRLPOOL c9d7859c27cc0b84fdac427be4e3d3c3b2ba7e514fec3a6e1614e97f8ce6b3b6b49c12413d575e52d199230eee5d522733ced26d401a77ebf5b1f69700e2f74d
 DIST polkit-kde-agent-1-5.5.0.tar.xz 39708 SHA256 2c386293d23bd7b6e5f11bfbd2654ebc11c223d2e7f24aae0e5910e9bf401b2a SHA512 6f5b971c16345249c6861d76034123f3d952f3af218ee481a1561f5b6f592c7f7344bb753ba10736eac79897e5ac5bdfc11ad1478163cad38a572c0de79b2695 WHIRLPOOL 984537df8a00ff90dc7496944e1f9cc950a63a37b87c269ac5cb93d9ed7d86e3d584c62a996ddd0e7d31ee697f7a57ef7bf2acb272dc4fb9336836cb3c749752
+DIST polkit-kde-agent-1-5.5.1.tar.xz 39672 SHA256 819d44b53fc1bcc386bf671c714b6d94c99e6345cfd0e9c56f7d1ed800052da0 SHA512 dc7a530d1200ded8f3f42bbe4b2ecbd4f7634f1c5fa4205ebfd3dbebe05ecb544561d3c79ff744ef5b2e06e561f3db7e6128c412f6e9dcf6ef69a0e1d92f18ba WHIRLPOOL cecd41c3ac1466d851747d4cee23c0d924b7620a3477649d8037afc0a02a0359623681ac48dfd72615702891d56f8536dc84b27cd136231c17d692ce57681f10
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.5.1.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..4a77936
--- /dev/null
@@ -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
+"
index 6ece0c245444401f2528c0a84b5fb8df1d05851d..1fb54c5cf99bb1e85b174de36e8a9bae3f8176ad 100644 (file)
@@ -1,2 +1,3 @@
 DIST powerdevil-5.4.3.tar.xz 346732 SHA256 4085e4c3c7429c72502a0b4e204753e5087df88bbac5ac1f531806a2d8eb40c8 SHA512 458731d78fc7fcfe80ef77badc63ebcb76dfc5870addcbd0a588e93f799f416a7c2f9888a0785759122455e40b8e76bfdc75fa6e4655166b01b19611a9f1871c WHIRLPOOL 725864cfe2e954747668a54b4d79c538b5e0c8cf1c462cd660b049ac89aa3d418264809b2faf743ecef8ddc1804859b49b1048ac65340a2572776d44a10298a6
 DIST powerdevil-5.5.0.tar.xz 345484 SHA256 8ef0f17ca326b839c60cbb59d71b9c8cb94d9c040e94a620291477053ff3ea0d SHA512 f8947d592c9017bb9c5da28de8d203df6a5fcfece437905641862270cd207277aedb7663464be9c87d7e2d075f20daeb522531ce96dae708d772e5e252320bc3 WHIRLPOOL 0ed8ee1274333e0c2f62fcf8eafa9416ce08d0140fd54b5df7ae430177feec4e5e94f3344b7784334188865143ceb09a99984d5f4e39bd0c0bd0161a33180099
+DIST powerdevil-5.5.1.tar.xz 345512 SHA256 f76205cc39329c683eb03efb5dbc4b3c9e891d55a236f4ccaab437542a6550be SHA512 bb1958ca9817862f425b790c1e21cba2bc41f35a686c8ea42aac6c1487128321962eb47c63de8e227e3a8f9e8d1921f3934d14839f0c964253e462199142f981 WHIRLPOOL d75ce9eff31aed811c3e5c186f8029ede1cec00514dab6b770895b7b5b80512f966ef95f561a2bbab676e2e201510ae801259ac24ea5425d22f3dbccb4baf11f
diff --git a/kde-plasma/powerdevil/powerdevil-5.5.1.ebuild b/kde-plasma/powerdevil/powerdevil-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..f7a911a
--- /dev/null
@@ -0,0 +1,71 @@
+# 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 kwayland)
+       $(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
+}
index e63e70cfdbbc34d27ad69dc55d3e977885f37041..3bbc688b8d44405be6e16a3c2447e01017bf27cd 100644 (file)
@@ -1,2 +1,3 @@
 DIST sddm-kcm-5.4.3.tar.xz 47700 SHA256 d32cf16e254f216f3477460229d5500fd63944630d073c4eec5cde400af5f9de SHA512 10ce1ce02897a50cc4e465e13a11e9ea12cd267bff92330660e99b7771026bb7ed3c5386cabc83b98549d7346e6060b76d08c3d5f0715300f83908d7c0321ea4 WHIRLPOOL fcf958ad26d9aca77deba14d091c9b2522aa37f8daa9890a16aaf66bf251fb1c0fce8ca795fae6502b885f61dd1d59a219f9111d399231b8bb5133a87c70d39b
 DIST sddm-kcm-5.5.0.tar.xz 47820 SHA256 605ae336798642dc267cf09d4ea96bfe9e7630fde6d8821f0ff2f7353e897df3 SHA512 11d51f7d6406fede787f9c646ce8862c6aa2f514287a5d37bbef73807054f407db73dabb05ee35339e06b334851c045c951a958f0350db22772e947370d0a9fa WHIRLPOOL a683376ddb3ca78653330bc78277312a7d3e0142e99afb98a7aed4354c5fdf3dc892894dac96b9bc3e7f14e1ef34060160ebd8f228d6bc308a8bb6484cea8488
+DIST sddm-kcm-5.5.1.tar.xz 47832 SHA256 3bbb2c5c691c0480f332fb36ba5493874e8875b0dbaf86854d80643afdf67639 SHA512 eee2653225460b9ce357b514e91374d25605c687fce910fc9705fe34a757bca52beb7821e4f9ba9ea33ed20dd205f4012554e6f22b8f52e48d93a4cdcbb9b979 WHIRLPOOL 910d1af29321130f48ceae929f9dc01ebefb4c809abadd1a7b20af84d525c529412f1de66e9e74560b9b30839e21c4dc8b0a1d9d18dc144fea2b820e226aa86f
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.5.1.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..bea72c3
--- /dev/null
@@ -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 )
index 314b4888c9b957a3463881e8c8c3c4aa9117121e..24a1bbaf530bb0e5dbabea9f06e5e9c5aaa552ec 100644 (file)
@@ -1,2 +1,3 @@
 DIST systemsettings-5.4.3.tar.xz 157308 SHA256 6b8716d12eda9f27a4c26a96ea8d034d3bfff501e93ddc4e4057d3ee7229e412 SHA512 1d9e8595331c8ca366bebd7f68391b4d0c8e94f903986ca12ea32ce8620548ea7b030c52abc4d0b530eea1de82caa5da00aa80e00f637acf3c22c24b4db1087b WHIRLPOOL 5655758dab4f0b4e41e49323bfd24746d4680e6790f15b185761d5f17a71de8714a7e732ff1364bcf828556d1604a8e5dfb8e5b461abacafc73aef31a588c53c
 DIST systemsettings-5.5.0.tar.xz 157632 SHA256 21776796c35c7fea2ee899f4b7c81ff1d903eae04a23813da4e29220f047f8ab SHA512 b8bfe50181705aaadba3614671790aca4bf56b913defe374733fa1fed36a928a0d2f399770200347310b44114b8b9fac8f1ced652288fc7c6baa3e76a33c540d WHIRLPOOL 71ab27ee206fc251df41dbbf216bd6608fb83c9ebb879a6389110640bdbd9d078bdc8a9f5ef60262bcda6b03a645937b2e31678bde19d3d53a3a66b72ce0a5d8
+DIST systemsettings-5.5.1.tar.xz 157604 SHA256 568f4ea2122324a16202674403929296cfe2aefb26462bfba8c160bfe9f609a7 SHA512 47fc9adfdf5c78c440d77b0bfe817dda1ab50586b43391683e6d9a7b7e66e1efcad759ef86cc83a310e3f702ace3366bed6f7b71416e4e9d2358e4c81a2295fe WHIRLPOOL e0f1ae6bc306a7ec1588cfe973e94a6f937857a9c16aa928d5c1e8bf229b19cef5b653ec93cb057c66eab62b894cd305b8e97f2704540be6a4994ae6f24ed439
diff --git a/kde-plasma/systemsettings/systemsettings-5.5.1.ebuild b/kde-plasma/systemsettings/systemsettings-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..a216c26
--- /dev/null
@@ -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
+"
index b23a52d6cde1afde69fabb7f25439ba6a4b0669e..40ecc553de8225edad45bb6e15cabda50e73a5eb 100644 (file)
@@ -1,2 +1,3 @@
 DIST user-manager-5.4.3.tar.xz 55356 SHA256 4831b9c82b826ba5fd1f392a40f2ebc15fd04e4ee02c9d1d205a3e877081ce6e SHA512 3d364a6c5502e4f038336a3f4c37109c2ca66177293c84afe899a5c76fdef6b83bc039db77746568dccc0eb5c0de8bd38c56dae7628fa6b28dcbe68450159603 WHIRLPOOL 912f02b9b04ebab67974c757bd9fa88caa8d693ea17b2be101cfac5c0115e9ab54ccd5e08031c4afb938189e0a79f1d33c9ccf014da7bada42882fc91367fcf9
 DIST user-manager-5.5.0.tar.xz 57208 SHA256 491cbd4d9d611a101b808226269a503c11093101eb939f04d211e1eb784e6423 SHA512 e83fc215ed3541306224f62430cf054ef619268e2a981126469bd6a2aaf45b04fd4d5f586ffd6a199e1f6db81c85e6d79d2f87060088e22a9d7ea72a45a60034 WHIRLPOOL e69116f9a76f748765b941396ea224f717b524c45e30fa48a1f9db113b16150fd37fcb276bb38249aa57c2b6d93e09ea560f3b1db3ec71e5b20023e330450558
+DIST user-manager-5.5.1.tar.xz 57176 SHA256 2ed10090b0424cfc53fc6f61fc456121bd12b0d1260599bf0db5281a9db0b98a SHA512 9a62edaa896b490f7ab4d75475bbf530c71c7a774c3d150c8fba27887fac927d13202a65db8bbc0d99e5c581dbf73ae2f59a96588190dab0ad6f278e6766f111 WHIRLPOOL 7d9d876a3fa3b0913b76c218a5d4249dc7977916f0956d996acefb1917f7e10b1df3ed82232d2307aed7285820667cb540da71a7e8e530a3b5291267152b5410
diff --git a/kde-plasma/user-manager/user-manager-5.5.1.ebuild b/kde-plasma/user-manager/user-manager-5.5.1.ebuild
new file mode 100644 (file)
index 0000000..0f43764
--- /dev/null
@@ -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/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch
new file mode 100644 (file)
index 0000000..3de7d7e
--- /dev/null
@@ -0,0 +1,28 @@
+Author: Philip Rinn <rinni@inventati.org>
+Description: Fix CVE-2015-3885
+Source: https://github.com/rawstudio/rawstudio/commit/983bda1f0fa5fa86884381208274198a620f006e
+Last-update: 2015-05-14
+--- a/rtengine/dcraw.c
++++ b/rtengine/dcraw.c
+@@ -824,7 +824,8 @@
+ int CLASS ljpeg_start (struct jhead *jh, int info_only)
+ {
+-  int c, tag, len;
++  int c, tag;
++  ushort len;
+   uchar data[0x10000];
+   const uchar *dp;
+--- a/rtengine/dcraw.cc
++++ b/rtengine/dcraw.cc
+@@ -787,7 +787,8 @@
+ int CLASS ljpeg_start (struct jhead *jh, int info_only)
+ {
+-  int c, tag, len;
++  int c, tag;
++  ushort len;
+   uchar data[0x10000];
+   const uchar *dp;
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch
new file mode 100644 (file)
index 0000000..0d79e25
--- /dev/null
@@ -0,0 +1,14 @@
+Author: Philip Rinn <rinni@inventati.org>
+Description: Fix build with C++11 as char is unsigned on some architectures
+Last-update: 2015-11-04
+--- a/rtengine/dcraw.cc
++++ b/rtengine/dcraw.cc
+@@ -2054,7 +2054,7 @@
+ void CLASS kodak_radc_load_raw()
+ {
+-  static const char src[] = {
++  static const signed char src[] = {
+     1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
+     1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
+     2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch
new file mode 100644 (file)
index 0000000..4832dc3
--- /dev/null
@@ -0,0 +1,20 @@
+Author: Philip Rinn <rinni@inventati.org>
+Description: Fix build with C++11
+Last-update: 2015-11-03
+--- a/rtengine/dcraw.cc
++++ b/rtengine/dcraw.cc
+@@ -136,10 +136,10 @@
+ #define SQR(x) rtengine::SQR(x)
+ #define ABS(x) (((int)(x) ^ ((int)(x) >> 31)) - ((int)(x) >> 31))
+-#define MIN(a,b) rtengine::min(a,static_cast<typeof(a)>(b))
+-#define MAX(a,b) rtengine::max(a,static_cast<typeof(a)>(b))
+-#define LIM(x,min,max) rtengine::LIM(x,static_cast<typeof(x)>(min),static_cast<typeof(x)>(max))
+-#define ULIM(x,y,z) rtengine::ULIM(x,static_cast<typeof(x)>(y),static_cast<typeof(x)>(z))
++#define MIN(a,b) rtengine::min(a,static_cast<__typeof__(a)>(b))
++#define MAX(a,b) rtengine::max(a,static_cast<__typeof__(a)>(b))
++#define LIM(x,min,max) rtengine::LIM(x,static_cast<__typeof__(x)>(min),static_cast<__typeof__(x)>(max))
++#define ULIM(x,y,z) rtengine::ULIM(x,static_cast<__typeof__(x)>(y),static_cast<typeof__(x)>(z))
+ #define CLIP(x) rtengine::CLIP(x)
+ #define SWAP(a,b) { a=a+b; b=a-b; a=a-b; }
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch
new file mode 100644 (file)
index 0000000..48acb5f
--- /dev/null
@@ -0,0 +1,27 @@
+From 39ef59ddeb7679c71274b1da3faadd395b650c73 Mon Sep 17 00:00:00 2001
+From: Adam Reichold <adam.reichold@t-online.de>
+Date: Sun, 29 Nov 2015 11:48:30 +0100
+Subject: [PATCH] Build with '-std=c++11' if libsigc++ version 2.5.1 is used as
+ it does require it.
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dd5fcbc..6153484 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -278,10 +278,10 @@ if (OPTION_OMP)
+     endif (OPENMP_FOUND)
+ endif (OPTION_OMP)
+-if(USE_EXPERIMENTAL_LANG_VERSIONS)
++if(USE_EXPERIMENTAL_LANG_VERSIONS OR NOT (SIGC_VERSION VERSION_LESS 2.5.1))
+       SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu1x")
+       SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+-endif (USE_EXPERIMENTAL_LANG_VERSIONS)
++endif ()
+ # find out whether we are building out of source
+ get_filename_component(ABS_SOURCE_DIR "${PROJECT_SOURCE_DIR}" ABSOLUTE)
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-sigc26.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-sigc26.patch
new file mode 100644 (file)
index 0000000..356cee9
--- /dev/null
@@ -0,0 +1,47 @@
+Author: Philip Rinn <rinni@inventati.org>
+Description: Fix build with sigc++ >= 2.5.2
+Last-update: 2015-11-03
+--- a/rtgui/adjuster.cc
++++ b/rtgui/adjuster.cc
+@@ -17,7 +17,7 @@
+  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ #include "adjuster.h"
+-#include <sigc++/class_slot.h>
++#include <sigc++/slot.h>
+ #include <cmath>
+ #include "multilangmgr.h"
+ #include "../rtengine/rtengine.h"
+--- a/rtgui/thresholdadjuster.cc
++++ b/rtgui/thresholdadjuster.cc
+@@ -17,7 +17,7 @@
+  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ #include "thresholdadjuster.h"
+-#include <sigc++/class_slot.h>
++#include <sigc++/slot.h>
+ #include <cmath>
+ #include "multilangmgr.h"
+ #include "../rtengine/rtengine.h"
+--- a/rtgui/preferences.cc
++++ b/rtgui/preferences.cc
+@@ -16,7 +16,7 @@
+  *  You should have received a copy of the GNU General Public License\r
+  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.\r
+  */\r
+-#include <sigc++/class_slot.h>\r
++#include <sigc++/slot.h>\r
+ #include "preferences.h"\r
+ #include "multilangmgr.h"\r
+ #include "splash.h"\r
+--- a/rtgui/tonecurve.cc
++++ b/rtgui/tonecurve.cc
+@@ -18,7 +18,7 @@
+  */\r
+ #include "tonecurve.h"\r
+ #include "adjuster.h"\r
+-#include <sigc++/class_slot.h>\r
++#include <sigc++/slot.h>\r
+ #include <iomanip>\r
+ #include "ppversion.h"\r
+ #include "edit.h"\r
diff --git a/media-gfx/rawtherapee/rawtherapee-4.2-r1.ebuild b/media-gfx/rawtherapee/rawtherapee-4.2-r1.ebuild
new file mode 100644 (file)
index 0000000..6aa7c2e
--- /dev/null
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="A powerful cross-platform raw image processing program"
+HOMEPAGE="http://www.rawtherapee.com/"
+SRC_URI="http://rawtherapee.com/shared/source/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 openmp"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+       >=x11-libs/gtk+-2.24.18:2
+       >=dev-cpp/gtkmm-2.12:2.4
+       >=dev-cpp/glibmm-2.16:2
+       dev-libs/expat
+       dev-libs/libsigc++:2
+       media-libs/libcanberra[gtk]
+       media-libs/tiff
+       media-libs/libpng
+       media-libs/libiptcdata
+       media-libs/lcms:2
+       sci-libs/fftw:3.0
+       sys-libs/zlib
+       virtual/jpeg"
+DEPEND="${RDEPEND}
+       app-arch/xz-utils
+       virtual/pkgconfig"
+
+PATCHES=(
+       # Upstream patches for fixing build with current libstdc++
+       # A newer snapshot/version will make this unneeded
+       "${FILESDIR}"/${P}-cxx11.patch
+       "${FILESDIR}"/${P}-CVE-2015-3885.patch
+       "${FILESDIR}"/${P}-build-cxx11.patch
+       "${FILESDIR}"/${P}-build-cxx11-2.patch
+       "${FILESDIR}"/${P}-sigc26.patch
+)
+
+pkg_pretend() {
+       if use openmp ; then
+               tc-has-openmp || die "Please switch to an openmp compatible compiler"
+       fi
+}
+
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use openmp OPTION_OMP)
+               $(cmake-utils_use_with bzip2 BZIP)
+               -DDOCDIR=/usr/share/doc/${PF}
+               -DCREDITSDIR=/usr/share/${PN}
+               -DLICENCEDIR=/usr/share/${PN}
+               -DCACHE_NAME_SUFFIX=""
+       )
+       cmake-utils_src_configure
+}
index 4d0ebd3813420a26cde816f687ffdcb271d9171f..a7bc7ae761deb78a853ea69d17b61c5dc844ef44 100644 (file)
@@ -13,7 +13,7 @@ This patch has been mailed to upstream. No reply at this time. Status unknown.
  
  # Options for the compiler: A high optimization level is suggested
 -CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage
-+CFLAGS += -W -Wall -ansi -pedantic # --coverage
++override CFLAGS += -W -Wall -ansi -pedantic # --coverage
  
 -all: libjbig.a libjbig85.a tstcodec tstcodec85
 +ifeq ($(shell uname),Darwin)
@@ -81,7 +81,7 @@ This patch has been mailed to upstream. No reply at this time. Status unknown.
  
  # Options for the compiler: A high optimization level is suggested
 -CFLAGS = -O2 -W -Wno-unused-result
-+CFLAGS += -W
++override CFLAGS += -W
  # CFLAGS = -O -g -W -Wall -Wno-unused-result -ansi -pedantic # -DDEBUG
  
  export CC CFLAGS
@@ -106,8 +106,8 @@ This patch has been mailed to upstream. No reply at this time. Status unknown.
  # Options for the compiler
 -CFLAGS = -g -O -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
 -CPPFLAGS = -I../libjbig 
-+CFLAGS += -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
-+CPPFLAGS += -I../libjbig 
++override CFLAGS += -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
++override CPPFLAGS += -I../libjbig
  
  .SUFFIXES: .1 .5 .txt $(SUFFIXES)
  .PHONY: txt test test82 test85 clean
index b7dce638a4e0f42dd04728738a0f313de8eaa5c6..181ffe0376da0eec4e2a367c3c631cb222d9e2a0 100644 (file)
@@ -4,4 +4,5 @@ DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1
 DIST mesa-10.6.9.tar.xz 7041588 SHA256 b04c4de6280b863babc2929573da17218d92e9e4ba6272d548d135415723e8c3 SHA512 32abcf167312dea06482e46da6f15b1c6902696a7dff759561f099eb12a6748673a5d6bb084c12ef57e6f13d3ec1b456541611a710519da87b11fd622f453344 WHIRLPOOL d3bf4627bdf7a576343bd2701948d5872e5d05a43b2980ce4e4915e8d95bd85eadb563cb3588918c55307769132a0cc8592361b4c9fbdf4831c181604d79028b
 DIST mesa-11.0.6.tar.xz 7272972 SHA256 8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760 SHA512 946a66803395ef0f4d3b328e981e03a87bb5173a523be5da1dd3363002fceacd8dcbfdbf9716e31bb4247b23cc5ef112b24bb4ef0709b514bc8160c6cbf1dbf3 WHIRLPOOL 19729acb5fbbcff3a99b4d7644750dff4a7a2d41c3f25f2e004938faf0c72abd33e97f5d23d2804f84b957824757b5f64f3a7f54a2dd8999b2a71eb9b1976e0b
 DIST mesa-11.0.7.tar.xz 7279276 SHA256 e7e90a332ede6c8fd08eff90786a3fd1605a4e62ebf3a9b514047838194538cb SHA512 cf3bae4db0a3af41d075498ad44f1bff994c30e97d58f9f4bdb52d1c6e1244365d68edfa55bf9076f1b4e9f8f4f3de9661f210291a5d8683e280327e1480c7cf WHIRLPOOL b599f605c1022f06953f11462c46525f2906106707e6e9e0e03c166ee6076eacc7ded68f4367f715556275053473532311aa61b11f99d6d81c647f23ffadd554
+DIST mesa-11.1.0.tar.xz 7557948 SHA256 9befe03b04223eb1ede177fa8cac001e2850292c8c12a3ec9929106afad9cf1f SHA512 49817dbe599fdeb3e9d69f149283a5414d3101177040e04ec2c07c9bc57c2e86dcd74c0eb9e5784eb74ec5adff01f4fc8fd07fce650ce0afc18c81265e369192 WHIRLPOOL c7553dcb8e4fc57f1551e9ab8b01781f5b27a8ecd2e2bbf34bee9009018dcad3c9363de92ab8ffa1394a9b80cbd40c7ee0d0324812a9ebab5bafa96f92534a0c
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
diff --git a/media-libs/mesa/mesa-11.1.0.ebuild b/media-libs/mesa/mesa-11.1.0.ebuild
new file mode 100644 (file)
index 0000000..38d52d0
--- /dev/null
@@ -0,0 +1,462 @@
+# 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=""
+       KEYWORDS=""
+else
+       SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
+       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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+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? ( !kernel_FreeBSD? (
+               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
+                               !kernel_FreeBSD? ( || (
+                                       >=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() {
+       [[ ${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/phonon/files/phonon-4.8.3-gcc5.patch b/media-libs/phonon/files/phonon-4.8.3-gcc5.patch
new file mode 100644 (file)
index 0000000..5038d73
--- /dev/null
@@ -0,0 +1,34 @@
+commit e966180fbba1812f8050a743351036d573c19b1f
+Author: Ryan Hill <rhill@gentoo.org>
+Date:   Sun Sep 13 06:17:43 2015 -0600
+
+    Fix build failure with GCC 5 and Qt 5.4.2.
+    
+    Recent versions of GCC (>=5.1) will sometimes emit copy relocations when
+       compiling with -fPIE, which causes some Qt applications to crash.  As of
+       5.4.2 all code built against Qt must instead be compiled with -fPIC.
+    
+    Enabling CMAKE_POSITION_INDEPENDENT_CODE will cause cmake to add -fPIC or
+    -fPIE depending on the type of object being built.  The try_compile() test
+    for -fvisibility=hidden support is creating an executable so -fPIE is used
+    which makes Qt throw a fit.
+    
+    Gentoo-Bug: https://bugs.gentoo.org/555866
+    See-Also:   https://bugreports.qt.io/browse/QTBUG-45755
+---
+ cmake/FindPhononInternal.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/cmake/FindPhononInternal.cmake
++++ b/cmake/FindPhononInternal.cmake
+@@ -109,8 +109,8 @@ else (NOT PHONON_BUILD_PHONON4QT5) # Qt5
+     find_package(Qt5Widgets)
+     macro_log_feature(Qt5Widgets_FOUND "Qt5 Widgets (qtbase)" "" "" TRUE)
+-    if (Qt5_POSITION_INDEPENDENT_CODE)
+-      set(CMAKE_POSITION_INDEPENDENT_CODE ON)
++    if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC)
++      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_PIC}")
+     endif()
+     #---- compat
index d308940bee1de7bfb809843caefa6a8ffde8325f..c1b5b0eb8eedd5415192c42737b58fbcee38279c 100644 (file)
@@ -58,7 +58,10 @@ PDEPEND="
        vlc? ( >=media-libs/phonon-vlc-0.8.0[qt4?,qt5?] )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
+PATCHES=(
+       "${FILESDIR}/${PN}-4.7.0-plugin-install.patch"
+       "${FILESDIR}/${P}-gcc5.patch"
+)
 
 pkg_setup() {
        MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
diff --git a/media-libs/varconf/varconf-0.6.7-r1.ebuild b/media-libs/varconf/varconf-0.6.7-r1.ebuild
new file mode 100644 (file)
index 0000000..ae5f5e3
--- /dev/null
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic
+
+DESCRIPTION="A configuration system designed for the STAGE server"
+SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
+HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/varconf"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libsigc++-2.0"
+DEPEND="$RDEPEND
+       virtual/pkgconfig"
+
+src_prepare() {
+       append-cxxflags -std=c++11 #566328
+}
diff --git a/media-sound/qtagger/qtagger-1.0.1-r2.ebuild b/media-sound/qtagger/qtagger-1.0.1-r2.ebuild
new file mode 100644 (file)
index 0000000..fac495e
--- /dev/null
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Simple Qt4 ID3v2 tag editor"
+HOMEPAGE="https://code.google.com/p/qtagger"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4
+       dev-qt/qtgui:4
+       media-libs/taglib
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+       # fix doc installation path
+       sed -i -e "s/doc\/${PN}/doc\/${PF}/" CMakeLists.txt || die
+       sed -i -e "s/share%1doc%1qtagger/share%1doc%1${PF}/" src/mainwindow.cpp || die
+
+       cmake-utils_src_prepare
+}
+
+src_configure() {
+       local mycmakeargs=(
+               -DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON
+       )
+
+       cmake-utils_src_configure
+}
+
+src_install() {
+       cmake-utils_src_install
+
+       rm "${D}"/usr/share/doc/${PF}/{ChangeLog~,LICENSE}
+}
index 317b46f89f7982618027f733868cb851e8d03f1a..855db6579a708b4e2f637f7a5461bb0baa7072c4 100644 (file)
@@ -1,2 +1,3 @@
 DIST qtractor-0.7.0.tar.gz 1447905 SHA256 5cda28d210e0301dfd1c426b015c0568dab29b8d27f8b5f0a7d0a4ae7eed22e4 SHA512 daa04b477d261ebd6d2af62db7cc708ab03960202332294ac7f62b475cbde5cb94db931674bd693ea4374aff489234ed0cefc5fc191d8ab079685b8039e03399 WHIRLPOOL 11d741a5799c352125f56a7ebcafec49442ffa4103c1be96d9e034ec0025ccbc681d26ea234e835b05d9d252e26d584810fa9dd1f05bd6adf1a866d734f65ec6
 DIST qtractor-0.7.1.tar.gz 1438633 SHA256 d0425f7d48f0032fd6ae4fc4b3d8f97d3dd21d08653fb4e26be5c8471da1cd89 SHA512 fa2210426388d0efdf920f591ad776c582867e9a556efaad3a03b575cd1f5702b686d347ad6a3991db07fcd7142b227d4b812095d91e280a01dc3f8dddfc8ede WHIRLPOOL af69a1e4c77a58961b63d431fa09eff8a7a5082dd35b8887f173c462e967b4be0843e203d4ca1cc9df9b869fbe3695e3f2187bc052dcbdc3ba7b39669a1f7bd5
+DIST qtractor-0.7.2.tar.gz 1452910 SHA256 829494f4def9b8579b52ba1d791ef47e3bb2cfcbadda87e0779861db806217c7 SHA512 3af60cb88f4ce6105dde4a201d0cbb43e694a7e64ecf0558bfa7cd1fa2315e9d12d148524b13f5883e70e10c8eb6b16a3893305546927d9e28fffe43a0e99a08 WHIRLPOOL 1a1ef9224f23892d9e309d29fee71143b2a26bec219c5c2fabd1a6e8afe5597ee1330b257be7164fa4c4e9c322daab08efcc1a9e78add7d25d607d4bf7550dce
diff --git a/media-sound/qtractor/qtractor-0.7.2.ebuild b/media-sound/qtractor/qtractor-0.7.2.ebuild
new file mode 100644 (file)
index 0000000..d2f69ae
--- /dev/null
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils flag-o-matic eutils
+
+DESCRIPTION="Qtractor is an Audio/MIDI multi-track sequencer"
+HOMEPAGE="http://qtractor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug dssi libsamplerate mad osc +qt5 rubberband vorbis cpu_flags_x86_sse zlib"
+
+RDEPEND="
+       !qt5? (
+               >=dev-qt/qtcore-4.2:4
+               >=dev-qt/qtgui-4.7:4
+       )
+       qt5? (
+               dev-qt/qtcore:5
+               dev-qt/qtgui:5
+               dev-qt/qtwidgets:5
+               dev-qt/qtxml:5
+               dev-qt/qtx11extras:5
+       )
+       media-libs/alsa-lib
+       media-libs/libsndfile
+       media-sound/jack-audio-connection-kit
+       media-libs/ladspa-sdk
+       >=media-libs/lilv-0.16.0
+       media-libs/lv2
+       media-libs/suil
+       dssi? ( media-libs/dssi )
+       mad? ( media-libs/libmad )
+       libsamplerate? ( media-libs/libsamplerate )
+       osc? ( media-libs/liblo )
+       rubberband? ( media-libs/rubberband )
+       vorbis? ( media-libs/libvorbis )
+       zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       qt5? ( dev-qt/linguist-tools:5 )"
+
+DOCS="README ChangeLog TODO AUTHORS"
+
+src_configure() {
+       econf \
+               $(use_enable mad libmad) \
+               $(use_enable libsamplerate) \
+               $(use_enable vorbis libvorbis) \
+               $(use_enable osc liblo) \
+               --enable-ladspa \
+               $(use_enable dssi) \
+               --enable-lilv \
+               $(use_enable qt5) \
+               $(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
+               $(use_enable rubberband librubberband) \
+               $(use_enable cpu_flags_x86_sse sse) \
+               $(use_enable zlib libz) \
+               $(use_enable debug)
+
+       if use qt5 ; then
+               eqmake5 ${PN}.pro -o ${PN}.mak
+       else
+               eqmake4 ${PN}.pro -o ${PN}.mak
+       fi
+}
+
+src_install() {
+       emake DESTDIR="${D}" install
+       einstalldocs
+}
index 0cd28638cf688264230b0c2927b3284509a64106..1ff0d1e0393f937aea8d8c6cb69922a9fec40308 100644 (file)
@@ -1,2 +1,2 @@
-DIST baka-mplayer-2.0.2.tar.gz 462702 SHA256 01f1cf3b369940deec5ee1ecfa1b39cac2ff7aaa17d2456976808ceea6d60a31 SHA512 3a134b60eca00ebe53223d6d2a12b7fa09902615d0a71522f2bb2bc6d818539ab93a46744de9fc554a4ee8b0918378cf28cd1f096136dffef37547d2fae67259 WHIRLPOOL dd65cd801f030895bcdc6c25301fa7813b6fb920c47af49e34d789140e16eb9dfc276d12ff6d7f27edcd2fb417fe7c638bff696317458eda084d1e01929903b1
 DIST baka-mplayer-2.0.3.tar.gz 568077 SHA256 d325d5b50d96952c1d216ffe3050bd6a009fc076fd37a4fe2d3f370658cdb5b9 SHA512 af2e79a318c8a119ef20c8721e42fa3a6c4900b5baf50613ba9de7c64cdaabbb08f0a31fc589460b544a8b67d662088cac2cdf3cc808ae128948a84882df13ab WHIRLPOOL d3f438768238787c2cf03b640641168b17e66dd570158b29076faffee25f0b0bfbe3667b6c270420bb8aef7c6325a8ba388ead67142e68f9163c9272919a439b
+DIST baka-mplayer-2.0.4.tar.gz 988060 SHA256 43647217695bdfc85771ce2fc8fcecebd49bdf6282c3a439816cfb4e08754002 SHA512 7898d65e87540bcb528d429dc70daefc7d4c0711b2983326cf6fa3a14e566c2742334378befdb710b8cc59452f960bc17b290058ba9e6878e830de6dbafce55a WHIRLPOOL 276f6fb6dfaf8b80858a75506fa5f1c282071076744a21c20ec75dc9458073e58618fa1ca828533c401da50585e178014f3a6423888dd8bd1f107853a4634b97
similarity index 69%
rename from media-video/baka-mplayer/baka-mplayer-2.0.2.ebuild
rename to media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild
index 45af3d4020c0825603a041e0920115fd8644aa7c..e68537a609fea828fecf24862a0cc4c247f7be11 100644 (file)
@@ -7,7 +7,7 @@ inherit qmake-utils
 
 DESCRIPTION="Cross-platform libmpv-based multimedia player with uncluttered design"
 HOMEPAGE="http://bakamplayer.u8sand.net/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.gz"
+SRC_URI="https://github.com/u8sand/Baka-MPlayer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -31,9 +31,14 @@ src_prepare() {
        # no need to install license
        sed -e '/^INSTALLS/s:license::' -i src/Baka-MPlayer.pro || die
        # put manual in our docdir
-       sed -e '/^manual.path/s:yer:yer-'${PV}':' -i src/Baka-MPlayer.pro || die
+       sed -e '/^manual.path/s:'${PN}':'${PF}':' -i src/Baka-MPlayer.pro || die
 }
 
 src_configure() {
-       eqmake5 INSTROOT="${D}" CONFIG+=install_translations src/Baka-MPlayer.pro
+       eqmake5 \
+               INSTROOT="${D}" \
+               CONFIG+=install_translations \
+               lrelease="$(qt5_get_bindir)"/lrelease \
+               lupdate="$(qt5_get_bindir)"/lupdate \
+               src/Baka-MPlayer.pro
 }
index ae4618a83b4247452bb402effb2472062b137dca..962495542556e03ae0f9c49f9e9cd64be75632ad 100644 (file)
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-fs</herd>
+       <herd>net-fs</herd>
+       <herd>proxy-maintainers</herd>
+       <maintainer>
+               <email>gokturk@binghamton.edu</email>
+               <name>Gokturk 'gokturk' Yuksek</name>
+               <description>Maintainer. Assign bugs on him</description>
+       </maintainer>   
 </pkgmetadata>
index 0fab649adea27d11b7e195e3b6738532228d1e6f..7eb66d818058c2bfe20151f2e7b03c62e400ae6b 100644 (file)
@@ -5,6 +5,10 @@
                <email>hasufell@gentoo.org</email>
                <name>Julian Ospald</name>
        </maintainer>
+       <maintainer>
+               <email>blueness@gentoo.org</email>
+               <name>Anthony G. Basile</name>
+       </maintainer>
        <longdescription lang="en">
                The aim of the mbed TLS project is to provide a quality, open-source
                cryptographic library written in C and targeted at embedded systems.
diff --git a/net-misc/curl/curl-7.46.0-r1.ebuild b/net-misc/curl/curl-7.46.0-r1.ebuild
new file mode 100644 (file)
index 0000000..af08d5d
--- /dev/null
@@ -0,0 +1,236 @@
+# 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-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_mbedtls 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[${MULTILIB_USEDEP}] )
+       ssl? (
+               curl_ssl_axtls? (
+                       net-libs/axtls[${MULTILIB_USEDEP}]
+                       app-misc/ca-certificates
+               )
+               curl_ssl_gnutls? (
+                       net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+                       dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+                       app-misc/ca-certificates
+               )
+               curl_ssl_libressl? (
+                       dev-libs/libressl[static-libs?,${MULTILIB_USEDEP}]
+               )
+               curl_ssl_mbedtls? (
+                       net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+                       app-misc/ca-certificates
+               )
+               curl_ssl_openssl? (
+                       dev-libs/openssl:0[static-libs?,${MULTILIB_USEDEP}]
+               )
+               curl_ssl_nss? (
+                       dev-libs/nss:0[${MULTILIB_USEDEP}]
+                       app-misc/ca-certificates
+               )
+               curl_ssl_polarssl? (
+                       net-libs/polarssl:0=[${MULTILIB_USEDEP}]
+                       app-misc/ca-certificates
+               )
+       )
+       http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+       idn? ( net-dns/libidn:0[static-libs?,${MULTILIB_USEDEP}] )
+       adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+       kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+       metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+       rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+       ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
+       sys-libs/zlib[${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)
+
+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_mbedtls
+                       curl_ssl_nss
+                       curl_ssl_openssl
+                       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-mbedtls --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"
+                       myconf+=( --with-axtls )
+               elif use curl_ssl_gnutls; then
+                       einfo "SSL provided by gnutls"
+                       myconf+=( --with-gnutls --with-nettle )
+               elif use curl_ssl_libressl; then
+                       einfo "SSL provided by LibreSSL"
+                       myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+               elif use curl_ssl_mbedtls; then
+                       einfo "SSL provided by mbedtls"
+                       myconf+=( --with-mbedtls )
+               elif use curl_ssl_nss; then
+                       einfo "SSL provided by nss"
+                       myconf+=( --with-nss )
+               elif use curl_ssl_polarssl; then
+                       einfo "SSL provided by polarssl"
+                       myconf+=( --with-polarssl )
+               elif use curl_ssl_openssl; then
+                       einfo "SSL provided by openssl"
+                       myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+               elif use curl_ssl_winssl; then
+                       einfo "SSL provided by Windows"
+                       myconf+=( --with-winssl )
+               else
+                       eerror "We can't be here because of REQUIRED_USE."
+               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-crypto-auth \
+               --enable-dict \
+               --enable-file \
+               --enable-ftp \
+               --enable-gopher \
+               --enable-http \
+               --enable-imap \
+               $(use_enable ldap) \
+               $(use_enable ldap ldaps) \
+               --disable-ntlm-wb \
+               --enable-pop3 \
+               --enable-rt  \
+               --enable-rtsp \
+               $(use_enable samba smb) \
+               $(use_with ssh libssh2) \
+               --enable-smtp \
+               --enable-telnet \
+               --enable-tftp \
+               --enable-tls-srp \
+               $(use_enable adns ares) \
+               --enable-cookies \
+               --enable-hidden-symbols \
+               $(use_enable ipv6) \
+               --enable-largefile \
+               --without-libpsl \
+               --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) \
+               $(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
+}
index e02f4fe9d08321b6dcf4895148fd410286f48a2e..c6d37c90d8c2c3d4acd100b8895bc57a44dfb284 100644 (file)
@@ -200,7 +200,7 @@ multilib_src_configure() {
                --disable-versioned-symbols \
                --without-cyassl \
                --without-darwinssl \
-               --with-mbedtls \
+               --without-mbedtls \
                $(use_with idn libidn) \
                $(use_with kerberos gssapi "${EPREFIX}"/usr) \
                $(use_with metalink libmetalink) \
index a8d4281eeca1607e127316ee044dfe75af4daea4..7549705bd1c3dbaff4a7a09901322f5eea033658 100644 (file)
@@ -1,3 +1,2 @@
 DIST cups-filters-1.0.71.tar.xz 1339116 SHA256 3180aa209c383402822e568ccef8e1ca43f51e30b3af2039c34ebae919a69c1f SHA512 dc243e88d535c8d7e7fd53074b1093a46fc22742504efa09096d2b216846df875e4d914f25d2f726034692538cfdf1b713bc1ef44d199003a21e242b99f44a01 WHIRLPOOL 4afc7079594563f57af81501192cc0cba19db6cd5c10a9544339858a343e245b485e528fbf80eecd711341b23b8321bde817c49db7ddd2f0b801da2b4b9c580d
-DIST cups-filters-1.2.0.tar.xz 1357268 SHA256 31dcb71dc79129056a5b0f6d30880bdb6511ee7acd06a3f5bd4e9d2684801d62 SHA512 1389d45607bee8376f23efc9b723df276002bf47292670e6cc872a8896ffe06d9eb0aa6f2be0c8c0ad86c8831bcc8f3779baa78d52224fb17dc2bf4ce9a97ca2 WHIRLPOOL 40b75a8ea04774f264691b85065a05296653c2c8e1de4b459a1ae995b4ea23ddbdd0b2e5ae7ab651f7486962507eb64f211034c6f8f24a958af15c794e12afc5
-DIST cups-filters-1.3.0.tar.xz 1362904 SHA256 61b669809dda352a427546e09de5a68a3d960c7646ef5c590772d4aa1b445995 SHA512 3bff2a836be4f2722e2c06ea1ef8faf994c38eba244482cd1b84c33cef4d156e41470a4c7feda31c96ab01fc3872fcbba411ed4ce71fa4b57e817336d7e11888 WHIRLPOOL 156bbf35c129f64ab3900add54ff89c80ddce1b9bb18d5a66ef8b20b2d2c0243d4ba623fa398c812def575cf27f131e5f228e697f964543e9190f36b3e31dd9d
+DIST cups-filters-1.4.0.tar.xz 1373724 SHA256 0aa63f82a3feb5c46136b917722ee1565b4c1e2e533db4716f62d31e29c6579a SHA512 c1f8b45ef79747405cbe114fc35f14cf30d3a7f13753bbfb524cb2ce7c7e4f10a4af8cd1df978a231c119d0e893efed946b25183f8898253b5be72ed9c926963 WHIRLPOOL ebce525e81f2ce6b040b154111e71df49f341337073795a156ac20b502352f2711034a651e1910cde7266de2177f02dabcf9efd86ab1d2afc57140dd4a697d9e
diff --git a/net-print/cups-filters/cups-filters-1.3.0.ebuild b/net-print/cups-filters/cups-filters-1.3.0.ebuild
deleted file mode 100644 (file)
index 52f9132..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit base eutils perl-module autotools systemd
-
-if [[ "${PV}" == "9999" ]] ; then
-       inherit bzr
-       EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-       KEYWORDS="~arm64"
-else
-       SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
-
-RDEPEND="
-       >=app-text/ghostscript-gpl-9.09
-       app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
-       >=app-text/qpdf-3.0.2:=
-       media-libs/fontconfig
-       media-libs/freetype:2
-       media-libs/lcms:2
-       >=net-print/cups-1.7.3
-       !<=net-print/cups-1.5.9999
-       sys-devel/bc
-       sys-libs/zlib
-       dbus? ( sys-apps/dbus )
-       foomatic? ( !net-print/foomatic-filters )
-       jpeg? ( virtual/jpeg:0 )
-       perl? ( dev-lang/perl:= )
-       png? ( media-libs/libpng:0= )
-       tiff? ( media-libs/tiff:0 )
-       zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-       dev-util/gdbus-codegen
-"
-
-src_prepare() {
-       base_src_prepare
-       sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-       eautoreconf
-}
-
-src_configure() {
-       econf \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-               $(use_enable dbus) \
-               $(use_enable zeroconf avahi) \
-               $(use_enable static-libs static) \
-               --with-fontdir="fonts/conf.avail" \
-               --with-pdftops=pdftops \
-               --enable-imagefilters \
-               $(use_with jpeg) \
-               $(use_with png) \
-               $(use_with tiff) \
-               --with-rcdir=no \
-               --with-browseremoteprotocols=DNSSD,CUPS \
-               --without-php
-}
-
-src_compile() {
-       MAKEOPTS=-j1 default
-
-       if use perl; then
-               pushd "${S}/scripting/perl" > /dev/null
-               perl-module_src_configure
-               perl-module_src_compile
-               popd > /dev/null
-       fi
-}
-
-src_install() {
-       default
-
-       if use perl; then
-               pushd "${S}/scripting/perl" > /dev/null
-               perl-module_src_install
-               perl_delete_localpod
-               popd > /dev/null
-       fi
-
-       # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-       dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
-       dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
-
-       prune_libtool_files --all
-
-       cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
-
-       if ! use zeroconf ; then
-               sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-               sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-       fi
-
-       if ! use foomatic ; then
-               # this needs an upstream solution / configure switch
-               rm -v "${ED}/usr/bin/foomatic-rip" || die
-               rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
-               rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
-       fi
-
-       doinitd "${T}"/cups-browsed
-       systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
-       if ! use foomatic ; then
-               ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-               ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-       fi
-}
index 4108ff1e095e794ce328776766ef0c638129d2a0..8afe56119726f9419254cabce9203b638303fad4 100644 (file)
@@ -3,12 +3,13 @@
 # $Id$
 
 # This file contains descriptions of CURL_SSL USE_EXPAND flags for net-misc/curl
-#spnego - Use SPNEGO fbopenssl - to be added
+# spnego - Use SPNEGO fbopenssl - to be added
 
 axtls - Use axTLS
 gnutls - Use GnuTLS
-nss - Use Mozilla's Network Security Services 
 libressl - Use LibreSSL
+mbedtls - Use mbed TLS
+nss - Use Mozilla's Network Security Services 
 openssl - Use OpenSSL
-polarssl - Use Polar SSL
+polarssl - Use PolarSSL
 winssl - Use WinSSL (only with elibc_Winnt) 
index 3f1e3dadf24729ec4c7572621fbe17506e3e827b..2d03e1e46f93b277e0991a7bc9b79cd37c816794 100644 (file)
 
 #--- END OF EXAMPLES ---
 
+# José María Alonso Josa <nimiux@gentoo.org> (15 Dec 2015)
+# Refers to same package as dev-lisp/clx
+# Masked for removal in 30 days, bug 568188
+dev-lisp/cl-clx
+
 # Andreas K. Huettel <dilfridge@gentoo.org> (11 Dec 2015)
 # Ancient, smells funny, disowned by upstream, needs syck
 # Masked for removal in 30 days, bug 565012
diff --git a/ros-meta/mavros/mavros-0.16.4.ebuild b/ros-meta/mavros/mavros-0.16.4.ebuild
new file mode 100644 (file)
index 0000000..84de950
--- /dev/null
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Metapackage for mavros packages"
+LICENSE="metapackage"
+SLOT="0"
+IUSE=""
+HOMEPAGE="http://wiki.ros.org/mavros"
+
+RDEPEND="
+       dev-ros/libmavconn
+       dev-ros/mavros
+       dev-ros/mavros_extras
+       dev-ros/mavros_msgs
+"
+DEPEND="${RDEPEND}"
+[ "${PV}" = "9999" ] || KEYWORDS="~amd64 ~arm"
index 805a0f649cf1b57a57c078bbc57c30a8e068780b..7bcd9d046a9bb79f9616a78d1cd97a118bc41268 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="http://www.xinetd.org/${P}.tar.gz"
 
 LICENSE="BSD"
 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="perl rpc tcpd"
 
 DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
index b80c651226e1946d02b3b6e3c7806e7490caadbb..8df4adedb288526d8320295a41d8506973af6595 100644 (file)
@@ -1,3 +1,4 @@
 DIST keystone-2015.1.1.tar.gz 884979 SHA256 6c703f2d26c6a5f4fd4963dc11474b55cf87c5890d97361a4738df35eea258c5 SHA512 0c540f2a33729a539e68cb5d3e0b0b4ef0014829c274b0b92d982cd7d75110b14a3edc9db9c15794dd4c73f45a4982f47f99f75be6cbd8c91b0550ef24040848 WHIRLPOOL c20cc32d6043e9a2e9e5441a17e55431efabc3619156256c8fe8217bd876b07abb5860a48fc4bd761f505f022579d815a29b56d5c7a0536bafe89a2ad4b3b93a
 DIST keystone-2015.1.2.tar.gz 889207 SHA256 af63a89ca1cebfff593e35c24105c1442ab50f760871d756a48cfc120a7a8ddb SHA512 1592fb4e4d0b3ada08f2f12a25e9da08979e6c624239660b38b858115e1dc04a810857f07753ad855f51abf3b4cc43bae4a6f53cca33d10ab9e16ec4229bff42 WHIRLPOOL 285d9e91dcd8b3961596c0d1a7d093d32538e4fefb0e082fc496c79882c5f5d80a296ad415c443d0549a8412488d38820799db7ba03be98013d1340e0641a19e
 DIST keystone-8.0.0.tar.gz 1061052 SHA256 b2172b3c5eec6d4438138856562833dfb5cabd69e0aab35be015f2505cb2431d SHA512 2675cd056bac6a1e0eb59e3f93583942a9a5db20e40d317ea300ca687c1112b001210f2c0d454f967f4d61c1c5117bf96731dbd17a5f6ec81b07e5c1d0666b6c WHIRLPOOL 9c4e76438ca2eb35685754e3580aa6ba3d1a86a30f0f8a484bac6b741adc6e5f328db988146c752a2d1a0b25b02a5089d9f859f5373cbf5c43b9c859a198eb51
+DIST keystone-8.0.1.tar.gz 1067603 SHA256 4d1a76e879eb5fc977692892d1dce46a0190bf17d57056d634d377ea4511b475 SHA512 2b61b8dc38df3e3fa7c684b55f19b48391f087f00a6156732e1d6d207f36f6d23fff3adaaacbb4b7629686b4fce8a963189051bb0c2f0dad02c219832dc64af5 WHIRLPOOL 812c553d493a26adc0b6c76db3b9b8e7da35593425ac7bf986aa3b6e1b51f3816f95b4a84339902e16f8a3d61a6bd053ab4e310e77f8ce874ed4165395cd9799
index cb547892b65573800f904261fc90d63f4b39fe0d..595da58fd3edb6d353902bfd318aaa7d95ca419d 100644 (file)
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 git-2 user
 
@@ -33,7 +33,7 @@ DEPEND="
                )
                mongo? (
                        >=dev-python/pymongo-2.6.3[${PYTHON_USEDEP}]
-                       <dev-python/pymongo-3.1[${PYTHON_USEDEP}]
+                       <dev-python/pymongo-3.2[${PYTHON_USEDEP}]
                )
                ldap? (
                        >=dev-python/python-ldap-2.4[$(python_gen_usedep 'python2_7')]
@@ -41,7 +41,7 @@ DEPEND="
                        ~dev-python/ldappool-1.0[$(python_gen_usedep 'python2_7')]
                )
                >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-               <=dev-python/coverage-4.0.2[${PYTHON_USEDEP}]
+               <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
                >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
                <=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
                >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
@@ -49,7 +49,7 @@ DEPEND="
                >=dev-python/mock-1.2[${PYTHON_USEDEP}]
                <=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
                >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-               <=dev-python/oslotest-1.11.0[${PYTHON_USEDEP}]
+               <=dev-python/oslotest-2.0.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}]
@@ -62,11 +62,13 @@ DEPEND="
                >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
                <=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
                >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-               <=dev-python/oslo-sphinx-3.3.1[${PYTHON_USEDEP}]
+               <=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
                >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
                <=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
                >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+               !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
                <=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+               >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
        )"
 RDEPEND="
        ${CDEPEND}
@@ -83,69 +85,80 @@ RDEPEND="
        !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
        <=dev-python/routes-2.2[${PYTHON_USEDEP}]
        >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-       <=dev-python/cryptography-1.1-r9999[${PYTHON_USEDEP}]
+       <=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
        >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
        <=dev-python/six-1.10.0-r9999[${PYTHON_USEDEP}]
        sqlite? (
                >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
        )
        mysql? (
                dev-python/mysql-python
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        postgres? (
                dev-python/psycopg:2
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
        <=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
        >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+       <=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
        >=dev-python/passlib-1.6[${PYTHON_USEDEP}]
        <=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
        >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-       <=dev-python/python-keystoneclient-1.8.1-r9999[${PYTHON_USEDEP}]
+       !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+       <=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
        >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/keystonemiddleware-3.0.0-r9999[${PYTHON_USEDEP}]
+       !~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
+       <=dev-python/keystonemiddleware-4.0.0-r9999[${PYTHON_USEDEP}]
        >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-concurrency-2.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-config-2.6.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-context-0.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-context-1.0.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/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-       <=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-log-1.11.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-middleware-2.10.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-policy-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-serialization-1.11.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-service-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-utils-2.7.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
        >=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
        <=dev-python/oauthlib-1.0.3[${PYTHON_USEDEP}]
        >=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
-       <=dev-python/pysaml2-3.0.2[${PYTHON_USEDEP}]
+       <=dev-python/pysaml2-4.0.0[${PYTHON_USEDEP}]
        >=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
        <=dev-python/dogpile-cache-0.5.7[${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/pycadf-1.1.0[${PYTHON_USEDEP}]
+       <=dev-python/pycadf-2.0.1[${PYTHON_USEDEP}]
        ~dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]"
 
 PATCHES=(
diff --git a/sys-auth/keystone/keystone-8.0.1.ebuild b/sys-auth/keystone/keystone-8.0.1.ebuild
new file mode 100644 (file)
index 0000000..1c62ec7
--- /dev/null
@@ -0,0 +1,225 @@
+# 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="The Openstack authentication, authorization, and service catalog"
+HOMEPAGE="https://launchpad.net/keystone"
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sqlite memcached mongo mysql postgres ldap test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+       dev-python/setuptools[${PYTHON_USEDEP}]
+       ${CDEPEND}
+       test? (
+               ${RDEPEND}
+               >=dev-python/bashate-0.2[${PYTHON_USEDEP}]
+               <=dev-python/bashate-0.3.2[${PYTHON_USEDEP}]
+               memcached? (
+                       >=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
+                       <=dev-python/python-memcached-1.57[${PYTHON_USEDEP}]
+               )
+               mongo? (
+                       >=dev-python/pymongo-2.6.3[${PYTHON_USEDEP}]
+                       <dev-python/pymongo-3.2[${PYTHON_USEDEP}]
+               )
+               ldap? (
+                       >=dev-python/python-ldap-2.4[$(python_gen_usedep 'python2_7')]
+                       <=dev-python/python-ldap-2.4.20[$(python_gen_usedep 'python2_7')]
+                       ~dev-python/ldappool-1.0[$(python_gen_usedep 'python2_7')]
+               )
+               >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+               <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
+               >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+               <=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
+               >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+               <=dev-python/lxml-3.5.0-r9999[${PYTHON_USEDEP}]
+               >=dev-python/mock-1.2[${PYTHON_USEDEP}]
+               <=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+               >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+               <=dev-python/oslotest-2.0.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/webtest-2.0[${PYTHON_USEDEP}]
+               <=dev-python/webtest-2.0.20[${PYTHON_USEDEP}]
+               >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+               <=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
+               >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+               <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+               >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+               <=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
+               >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+               <=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
+               >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+               <=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
+               >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+               !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
+               <=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+               >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
+       )"
+RDEPEND="
+       ${CDEPEND}
+       >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+       <=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
+       ~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+       >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+       <=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
+       >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+       <=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+       <=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+       >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+       !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+       !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+       <=dev-python/routes-2.2[${PYTHON_USEDEP}]
+       >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+       <=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
+       >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+       <=dev-python/six-1.10.0-r9999[${PYTHON_USEDEP}]
+       sqlite? (
+               >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+       )
+       mysql? (
+               dev-python/mysql-python
+               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+       )
+       postgres? (
+               dev-python/psycopg:2
+               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+       )
+       >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+       <=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+       >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+       <=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
+       >=dev-python/passlib-1.6[${PYTHON_USEDEP}]
+       <=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
+       >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+       !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+       <=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
+       >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+       !~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
+       <=dev-python/keystonemiddleware-4.0.0-r9999[${PYTHON_USEDEP}]
+       >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-context-1.0.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/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+       <=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
+       >=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
+       <=dev-python/oauthlib-1.0.3[${PYTHON_USEDEP}]
+       >=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
+       <=dev-python/pysaml2-4.0.0[${PYTHON_USEDEP}]
+       >=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
+       <=dev-python/dogpile-cache-0.5.7[${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/pycadf-1.1.0[${PYTHON_USEDEP}]
+       <=dev-python/pycadf-2.0.1[${PYTHON_USEDEP}]
+       ~dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+pkg_setup() {
+       enewgroup keystone
+       enewuser keystone -1 -1 /var/lib/keystone keystone
+}
+
+python_prepare_all() {
+       # it's in git, but not in the tarball.....
+       sed -i '/^hacking/d' test-requirements.txt || die
+       mkdir -p ${PN}/tests/tmp/ || die
+       cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
+       distutils-r1_python_prepare_all
+}
+
+# Ignore (naughty) test_.py files & 1 test that connect to the network
+#-I 'test_keystoneclient*' \
+python_test() {
+       nosetests -I 'test_keystoneclient*' \
+               -e test_static_translated_string_is_Message \
+               -e test_get_token_id_error_handling \
+               -e test_provider_token_expiration_validation \
+               -e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
+}
+
+python_install() {
+       distutils-r1_python_install
+       newconfd "${FILESDIR}/keystone.confd" keystone
+       newinitd "${FILESDIR}/keystone.initd" keystone
+
+       diropts -m 0750
+       keepdir /etc/keystone /var/log/keystone
+       insinto /etc/keystone
+       insopts -m0640 -okeystone -gkeystone
+       doins etc/keystone.conf.sample etc/logging.conf.sample
+       doins etc/default_catalog.templates etc/policy.json
+       doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
+       insinto /etc/keystone/httpd
+       doins httpd/keystone.py httpd/wsgi-keystone.conf
+
+       fowners keystone:keystone /etc/keystone /var/log/keystone
+}
+
+pkg_postinst() {
+       elog "You might want to run:"
+       elog "emerge --config =${CATEGORY}/${PF}"
+       elog "if this is a new install."
+       elog "If you have not already configured your openssl installation"
+       elog "please do it by modifying /etc/ssl/openssl.cnf"
+       elog "BEFORE issuing the configuration command."
+       elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+       if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+               einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+               read
+               "${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+       else
+               einfo "keystone PKI certificates directory already present, skipping configuration"
+       fi
+}
diff --git a/sys-boot/grub/files/CVE-2015-8370.patch b/sys-boot/grub/files/CVE-2015-8370.patch
new file mode 100644 (file)
index 0000000..5701b54
--- /dev/null
@@ -0,0 +1,45 @@
+From 88c9657960a6c5d3673a25c266781e876c181add Mon Sep 17 00:00:00 2001
+From: Hector Marco-Gisbert <hecmargi@upv.es>
+Date: Fri, 13 Nov 2015 16:21:09 +0100
+Subject: [PATCH] Fix security issue when reading username and password
+
+  This patch fixes two integer underflows at:
+    * grub-core/lib/crypto.c
+    * grub-core/normal/auth.c
+
+Signed-off-by: Hector Marco-Gisbert <hecmargi@upv.es>
+Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
+---
+ grub-core/lib/crypto.c  | 2 +-
+ grub-core/normal/auth.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
+index 010e550..524a3d8 100644
+--- a/grub-core/lib/crypto.c
++++ b/grub-core/lib/crypto.c
+@@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned buf_size)
+         break;
+       }
+-      if (key == '\b')
++      if (key == '\b' && cur_len)
+       {
+         cur_len--;
+         continue;
+diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
+index c6bd96e..5782ec5 100644
+--- a/grub-core/normal/auth.c
++++ b/grub-core/normal/auth.c
+@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size)
+         break;
+       }
+-      if (key == '\b')
++      if (key == '\b' && cur_len)
+       {
+         cur_len--;
+         grub_printf ("\b");
+-- 
+1.9.1
+
diff --git a/sys-boot/grub/files/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch b/sys-boot/grub/files/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch
new file mode 100644 (file)
index 0000000..c550aab
--- /dev/null
@@ -0,0 +1,53 @@
+From 5a52ee4b5cd152fa4ccd1c1f938ce2eba652af52 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Mon, 14 Dec 2015 23:59:17 +0000
+Subject: [PATCH] Add %esp to list of clobbered registers
+
+GCC assumes that it can combine stacks from
+outer
+    grub_stage2()
+and inner
+    trampoline doit()
+functions (optimisation -fcombine-stack-adjustments).
+
+But doit() function clobbers %esp in inline
+assebly statement as:
+
+  asm volatile ("movl %%esp, %0\n\tmovl %1, %%esp\n"
+               : "=&r" (realstack) : "r" (simstack));
+
+which tricks gcc into computing invalid local variable
+offsets from current %esp value.
+
+Fix by hinting gcc about %esp change in clobber list.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ grub/asmstub.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub/asmstub.c b/grub/asmstub.c
+index 6354806..44b056f 100644
+--- a/grub/asmstub.c
++++ b/grub/asmstub.c
+@@ -174,7 +174,7 @@ grub_stage2 (void)
+     {
+       /* Make sure our stack lives in the simulated memory area. */
+       asm volatile ("movl %%esp, %0\n\tmovl %1, %%esp\n"
+-                  : "=&r" (realstack) : "r" (simstack));
++                  : "=&r" (realstack) : "r" (simstack) : "%esp");
+       
+       /* Do a setjmp here for the stop command.  */
+       if (! setjmp (env_for_exit))
+@@ -191,7 +191,7 @@ grub_stage2 (void)
+       }
+       
+       /* Replace our stack before we use any local variables. */
+-      asm volatile ("movl %0, %%esp\n" : : "r" (realstack));
++      asm volatile ("movl %0, %%esp\n" : : "r" (realstack) : "%esp");
+     }
+   assert (grub_scratch_mem == 0);
+-- 
+2.6.3
+
diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild
new file mode 100644 (file)
index 0000000..3b19b8e
--- /dev/null
@@ -0,0 +1,289 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
+#      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
+#      we never updated any of the source code (it still all wants menu.lst),
+#      and there is no indication that upstream is making the transition.
+
+# If you need to roll a new grub-static distfile, here is how.
+# - Robin H. Johnson <robbat2@gentoo.org> - 29 Nov 2010
+# FEATURES='-noauto -noinfo -nodoc -noman -splitdebug nostrip' \
+# USE='static -ncurses -netboot -custom-cflags' \
+# PORTAGE_COMPRESS=true GRUB_STATIC_PACKAGE_BUILDING=1 ebuild \
+# grub-${PVR}.ebuild clean package && \
+# qtbz2 -s -j ${PKGDIR}/${CAT}/${PF}.tbz2 && \
+# mv ${PF}.tar.bz2 ${DISTDIR}/grub-static-${PVR}.tar.bz2
+
+EAPI="5"
+
+inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing
+
+PATCHVER="1.14" # Should match the revision ideally
+DESCRIPTION="GNU GRUB Legacy boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+       mirror://gnu-alpha/${PN}/${P}.tar.gz
+       mirror://gentoo/splash.xpm.gz
+       mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="custom-cflags ncurses netboot static"
+
+LIB_DEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0[static-libs(+),abi_x86_32(-)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//[static-libs(+),/=[} )"
+DEPEND="${RDEPEND}
+       static? ( ${LIB_DEPEND} )"
+
+pkg_setup() {
+       case $(tc-arch) in
+       amd64) CONFIG_CHECK='~IA32_EMULATION' check_extra_config ;;
+       esac
+}
+
+src_prepare() {
+       # Grub will not handle a kernel larger than EXTENDED_MEMSIZE Mb as
+       # discovered in bug 160801. We can change this, however, using larger values
+       # for this variable means that Grub needs more memory to run and boot. For a
+       # kernel of size N, Grub needs (N+1)*2.  Advanced users should set a custom
+       # value in make.conf, it is possible to make kernels ~16Mb in size, but it
+       # needs the kitchen sink built-in.
+       local t="custom"
+       if [[ -z ${GRUB_MAX_KERNEL_SIZE} ]] ; then
+               case $(tc-arch) in
+               amd64) GRUB_MAX_KERNEL_SIZE=9 ;;
+               x86)   GRUB_MAX_KERNEL_SIZE=5 ;;
+               esac
+               t="default"
+       fi
+       einfo "Grub will support the ${t} maximum kernel size of ${GRUB_MAX_KERNEL_SIZE} Mb (GRUB_MAX_KERNEL_SIZE)"
+
+       sed -i \
+               -e "/^#define.*EXTENDED_MEMSIZE/s,3,${GRUB_MAX_KERNEL_SIZE},g" \
+               "${S}"/grub/asmstub.c \
+               || die
+
+       EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+       # bug 564890, 566638
+       epatch "${FILESDIR}"/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch
+
+       rm -f "${S}"/aclocal.m4 # seems to keep bug 418287 away
+       eautoreconf
+}
+
+src_configure() {
+       filter-flags -fPIE #168834
+
+       use amd64 && multilib_toolchain_setup x86
+
+       unset BLOCK_SIZE #73499
+
+       ### i686-specific code in the boot loader is a bad idea; disabling to ensure
+       ### at least some compatibility if the hard drive is moved to an older or
+       ### incompatible system.
+
+       # grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
+       # but the objcopy's (faulty) test fails if -fstack-protector is default.
+       # create a cache telling configure that objcopy is ok, and add -C to econf
+       # to make use of the cache.
+       #
+       # CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
+       # STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
+       # -fno-stack-protector detected by configure, removed from netboot's emake.
+       use custom-cflags || unset CFLAGS
+
+       tc-ld-disable-gold #439082 #466536 #526348
+
+       export grub_cv_prog_objcopy_absolute=yes #79734
+       use static && append-ldflags -static
+
+       if use amd64 && use static ; then
+               if [[ -n ${GRUB_STATIC_PACKAGE_BUILDING} ]] ; then
+                       eerror "You have set GRUB_STATIC_PACKAGE_BUILDING. This"
+                       eerror "is specifically intended for building the tarballs for the"
+                       eerror "grub-static package via USE='static -ncurses'."
+                       eerror "All bets are now off."
+               fi
+       fi
+
+       multijob_init
+
+       # build the net-bootable grub first, but only if "netboot" is set
+       if use netboot ; then
+               (
+               multijob_child_init
+               mkdir -p "${WORKDIR}"/netboot
+               pushd "${WORKDIR}"/netboot >/dev/null
+               ECONF_SOURCE=${S} \
+               econf \
+                       --libdir=/lib \
+                       --datadir=/usr/lib/grub \
+                       --exec-prefix=/ \
+                       --disable-auto-linux-mem-opt \
+                       --enable-diskless \
+                       --enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
+                       --enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
+                       --enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
+                       --enable-{tulip,via-rhine,w89c840}
+               popd >/dev/null
+               ) &
+               multijob_post_fork
+       fi
+
+       # Now build the regular grub
+       # Note that FFS and UFS2 support are broken for now - stage1_5 files too big
+       econf \
+               --libdir=/lib \
+               --datadir=/usr/lib/grub \
+               --exec-prefix=/ \
+               --disable-auto-linux-mem-opt \
+               $(use_with ncurses curses)
+
+       # sanity check due to common failure
+       use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found"
+
+       multijob_finish
+}
+
+src_compile() {
+       use netboot && emake -C "${WORKDIR}"/netboot w89c840_o_CFLAGS="-O"
+       emake
+}
+
+src_test() {
+       # non-default block size also give false pass/fails.
+       unset BLOCK_SIZE
+       emake -j1 check
+}
+
+src_install() {
+       default
+       if use netboot ; then
+               exeinto /usr/lib/grub/${CHOST}
+               doexe "${WORKDIR}"/netboot/stage2/{nbgrub,pxegrub}
+               newexe "${WORKDIR}"/netboot/stage2/stage2 stage2.netboot
+       fi
+
+       pax-mark -m "${D}"/sbin/grub #330745
+
+       newdoc docs/menu.lst grub.conf.sample
+       dodoc "${FILESDIR}"/grub.conf.gentoo
+
+       [[ -n ${GRUB_STATIC_PACKAGE_BUILDING} ]] && \
+               mv "${D}"/usr/share/doc/{${PF},grub-static-${PF/grub-}}
+
+       insinto /usr/share/grub
+       doins "${DISTDIR}"/splash.xpm.gz
+}
+
+setup_boot_dir() {
+       local boot_dir=$1
+       local dir=${boot_dir}
+
+       mkdir -p "${dir}"
+       [[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
+       dir="${dir}/grub"
+       if [[ ! -e ${dir} ]] ; then
+               mkdir "${dir}" || die
+       fi
+
+       # change menu.lst to grub.conf
+       if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then
+               mv -f "${dir}"/menu.lst "${dir}"/grub.conf
+               ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+               echo
+       fi
+
+       if [[ ! -e ${dir}/menu.lst ]]; then
+               einfo "Linking from new grub.conf name to menu.lst"
+               ln -snf grub.conf "${dir}"/menu.lst
+       fi
+
+       if [[ -e ${dir}/stage2 ]] ; then
+               mv "${dir}"/stage2{,.old}
+               ewarn "*** IMPORTANT NOTE: you must run grub and install"
+               ewarn "the new version's stage1 to your MBR.  Until you do,"
+               ewarn "stage1 and stage2 will still be the old version, but"
+               ewarn "later stages will be the new version, which could"
+               ewarn "cause problems such as an unbootable system."
+               ewarn
+               ewarn "This means you must use either grub-install or perform"
+               ewarn "root/setup manually."
+               ewarn
+               ewarn "For more help, see the handbook:"
+               ewarn "https://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto"
+               echo
+       fi
+
+       einfo "Copying files from /lib/grub and /usr/share/grub to ${dir}"
+       for x in \
+               "${ROOT}"/lib*/grub/*/* \
+               "${ROOT}"/usr/share/grub/* ; do
+               [[ -f ${x} ]] && cp -p "${x}" "${dir}"/
+       done
+
+       if [[ ! -e ${dir}/grub.conf ]] ; then
+               s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo"
+               [[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf
+               [[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf
+               [[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf
+       fi
+
+       # Per bug 218599, we support grub.conf.install for users that want to run a
+       # specific set of Grub setup commands rather than the default ones.
+       grub_config=${dir}/grub.conf.install
+       [[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf
+       if [[ -e ${grub_config} ]] ; then
+               egrep \
+                       -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
+                       "${grub_config}" | \
+               /sbin/grub --batch \
+                       --device-map="${dir}"/device.map \
+                       > /dev/null
+       fi
+
+       # the grub default commands silently piss themselves if
+       # the default file does not exist ahead of time
+       if [[ ! -e ${dir}/default ]] ; then
+               grub-set-default --root-directory="${boot_dir}" default
+       fi
+       einfo "Grub has been installed to ${boot_dir} successfully."
+}
+
+pkg_postinst() {
+       mount-boot_mount_boot_partition
+
+       if [[ -n ${DONT_MOUNT_BOOT} ]]; then
+               elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
+               elog "the following instructions for your /boot!"
+               elog "Neglecting to do so may cause your system to fail to boot!"
+               elog
+       else
+               setup_boot_dir "${ROOT}"/boot
+               # Trailing output because if this is run from pkg_postinst, it gets mixed into
+               # the other output.
+               einfo ""
+       fi
+       elog "To interactively install grub files to another device such as a USB"
+       elog "stick, just run the following and specify the directory as prompted:"
+       elog "   emerge --config =${PF}"
+       elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
+       elog "grub where to install in a non-interactive way."
+
+       # needs to be after we call setup_boot_dir
+       mount-boot_pkg_postinst
+}
+
+pkg_config() {
+       local dir
+       if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then
+               einfo "Enter the directory where you want to setup grub:"
+               read dir
+       else
+               dir="${GRUB_ALT_INSTALLDIR}"
+       fi
+       setup_boot_dir "${dir}"
+}
diff --git a/sys-boot/grub/grub-2.02_beta2-r8.ebuild b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
new file mode 100644 (file)
index 0000000..c617cab
--- /dev/null
@@ -0,0 +1,313 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+GRUB_AUTOGEN=1
+
+if [[ -n ${GRUB_AUTOGEN} ]]; then
+       PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+       inherit python-any-r1
+fi
+
+inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
+
+if [[ ${PV} != 9999 ]]; then
+       if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+               # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+               MY_P=${P/_/'~'}
+               SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz
+                       https://dev.gentoo.org/~floppym/dist/${P}-gentoo-r3.tar.xz"
+               S=${WORKDIR}/${MY_P}
+       else
+               SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+                       https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+               S=${WORKDIR}/${P%_*}
+       fi
+       KEYWORDS="~amd64 ~x86"
+else
+       inherit git-r3
+       EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
+               http://git.savannah.gnu.org/r/grub.git"
+fi
+
+DEJAVU=dejavu-sans-ttf-2.34
+UNIFONT=unifont-7.0.06
+SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
+       themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/"
+
+# Includes licenses for dejavu and unifont
+LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+SLOT="2"
+IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
+
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
+IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
+
+REQUIRED_USE="
+       grub_platforms_coreboot? ( fonts )
+       grub_platforms_qemu? ( fonts )
+       grub_platforms_ieee1275? ( fonts )
+       grub_platforms_loongson? ( fonts )
+"
+
+# os-prober: Used on runtime to detect other OSes
+# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
+RDEPEND="
+       app-arch/xz-utils
+       >=sys-libs/ncurses-5.2-r5:0=
+       debug? (
+               sdl? ( media-libs/libsdl )
+       )
+       device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+       libzfs? ( sys-fs/zfs )
+       mount? ( sys-fs/fuse )
+       truetype? ( media-libs/freetype:2= )
+       ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+       ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+"
+DEPEND="${RDEPEND}
+       ${PYTHON_DEPS}
+       app-misc/pax-utils
+       sys-devel/flex
+       sys-devel/bison
+       sys-apps/help2man
+       sys-apps/texinfo
+       fonts? ( media-libs/freetype:2 )
+       grub_platforms_xen? ( app-emulation/xen-tools:= )
+       static? (
+               app-arch/xz-utils[static-libs(+)]
+               truetype? (
+                       app-arch/bzip2[static-libs(+)]
+                       media-libs/freetype[static-libs(+)]
+                       sys-libs/zlib[static-libs(+)]
+               )
+       )
+       test? (
+               dev-libs/libisoburn
+               app-emulation/qemu
+       )
+       themes? (
+               app-arch/unzip
+               media-libs/freetype:2
+       )
+"
+RDEPEND+="
+       kernel_linux? (
+               grub_platforms_efi-32? ( sys-boot/efibootmgr )
+               grub_platforms_efi-64? ( sys-boot/efibootmgr )
+       )
+       !multislot? ( !sys-boot/grub:0 )
+       nls? ( sys-devel/gettext )
+"
+
+DEPEND+=" !!=media-libs/freetype-2.5.4"
+
+STRIP_MASK="*/grub/*/*.{mod,img}"
+RESTRICT="test"
+
+QA_EXECSTACK="
+       usr/bin/grub*-emu*
+       usr/lib*/grub/*/*.mod
+       usr/lib*/grub/*/*.module
+       usr/lib*/grub/*/kernel.exec
+       usr/lib*/grub/*/kernel.img
+"
+
+QA_WX_LOAD="
+       usr/lib*/grub/*/kernel.exec
+       usr/lib*/grub/*/kernel.img
+       usr/lib*/grub/*/*.image
+"
+
+QA_PRESTRIPPED="
+       usr/lib.*/grub/.*/kernel.img
+"
+
+src_unpack() {
+       if [[ ${PV} == 9999 ]]; then
+               git-r3_src_unpack
+       fi
+       default_src_unpack
+}
+
+src_prepare() {
+       EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
+
+       epatch "${FILESDIR}"/CVE-2015-8370.patch
+
+       sed -i -e /autoreconf/d autogen.sh || die
+
+       if use multislot; then
+               # fix texinfo file name, bug 416035
+               sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
+       fi
+
+       epatch_user
+
+       if [[ -n ${GRUB_AUTOGEN} ]]; then
+               python_setup
+               bash autogen.sh || die
+       fi
+
+       if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
+               autopoint() { return 0; }
+               eautoreconf
+       fi
+}
+
+setup_fonts() {
+       ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+       if use themes; then
+               ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+       fi
+}
+
+grub_configure() {
+       local platform
+
+       case ${MULTIBUILD_VARIANT} in
+               efi-32)
+                       platform=efi
+                       if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+                               local CTARGET=${CTARGET:-i386}
+                       fi ;;
+               efi-64)
+                       platform=efi
+                       if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+                               local CTARGET=${CTARGET:-x86_64}
+                               local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+                               local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+                               export TARGET_CFLAGS TARGET_CPPFLAGS
+                       fi ;;
+               guessed) ;;
+               *)      platform=${MULTIBUILD_VARIANT} ;;
+       esac
+
+       local myeconfargs=(
+               --disable-werror
+               --program-prefix=
+               --libdir="${EPREFIX}"/usr/lib
+               --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+               $(use_enable debug mm-debug)
+               $(use_enable debug grub-emu-usb)
+               $(use_enable device-mapper)
+               $(use_enable mount grub-mount)
+               $(use_enable nls)
+               $(use_enable themes grub-themes)
+               $(use_enable truetype grub-mkfont)
+               $(use_enable libzfs)
+               $(use sdl && use_enable debug grub-emu-sdl)
+               ${platform:+--with-platform=}${platform}
+
+               # Let configure detect this where supported
+               $(usex efiemu '' '--disable-efiemu')
+       )
+
+       if use multislot; then
+               myeconfargs+=( --program-transform-name="s,grub,grub2," )
+       fi
+
+       mkdir -p "${BUILD_DIR}" || die
+       run_in_build_dir setup_fonts
+
+       autotools-utils_src_configure
+}
+
+src_configure() {
+       # Bug 508758.
+       replace-flags -O3 -O2
+
+       # We don't want to leak flags onto boot code.
+       export HOST_CCASFLAGS=${CCASFLAGS}
+       export HOST_CFLAGS=${CFLAGS}
+       export HOST_CPPFLAGS=${CPPFLAGS}
+       export HOST_LDFLAGS=${LDFLAGS}
+       unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+       use static && HOST_LDFLAGS+=" -static"
+
+       tc-ld-disable-gold #439082 #466536 #526348
+       export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+       unset LDFLAGS
+
+       tc-export CC NM OBJCOPY RANLIB STRIP
+       tc-export BUILD_CC # Bug 485592
+
+       # Portage will take care of cleaning up GRUB_PLATFORMS
+       MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
+       multibuild_parallel_foreach_variant grub_configure
+}
+
+src_compile() {
+       # Sandbox bug 404013.
+       use libzfs && addpredict /etc/dfs:/dev/zfs
+
+       multibuild_foreach_variant autotools-utils_src_compile
+
+       use doc && multibuild_for_best_variant \
+               autotools-utils_src_compile -C docs html
+}
+
+src_test() {
+       # The qemu dependency is a bit complex.
+       # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+       multibuild_foreach_variant autotools-utils_src_test
+}
+
+src_install() {
+       multibuild_foreach_variant autotools-utils_src_install \
+               bashcompletiondir="$(get_bashcompdir)"
+
+       local grub=grub
+       if use multislot; then
+               grub=grub2
+               mv "${ED%/}"/usr/share/info/grub{,2}.info || die
+               mv "${ED%/}"/$(get_bashcompdir)/grub{,2} || die
+       fi
+
+       bashcomp_alias ${grub} ${grub}-{install,set-default,mkrescue,reboot,script-check,editenv,sparc64-setup,mkfont,mkpasswd-pbkdf2,mkimage,bios-setup,mkconfig,probe}
+
+       use doc && multibuild_for_best_variant run_in_build_dir \
+               emake -C docs DESTDIR="${D}" install-html
+
+       insinto /etc/default
+       newins "${FILESDIR}"/grub.default-3 grub
+}
+
+pkg_postinst() {
+       mount-boot_mount_boot_partition
+
+       if [[ -e "${ROOT%/}/boot/grub2/grub.cfg"  ]]; then
+               ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
+               ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
+
+               if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
+                       mkdir -p "${ROOT%/}/boot/grub"
+                       ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
+               fi
+       fi
+
+       mount-boot_pkg_postinst
+
+       elog "For information on how to configure GRUB2 please refer to the guide:"
+       elog "    https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
+
+       if has_version 'sys-boot/grub:0'; then
+               elog "A migration guide for GRUB Legacy users is available:"
+               elog "    https://wiki.gentoo.org/wiki/GRUB2_Migration"
+       fi
+
+       if [[ -z ${REPLACING_VERSIONS} ]]; then
+               elog
+               elog "You may consider installing the following optional packages:"
+               optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober
+               optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
+               optfeature "Enable RAID device detection" sys-fs/mdadm
+       fi
+}
index f80614929cd03ea126e4be55b3bf3d8da12ed46b..c01d9497eb1e678ece100ef463f39a0d84351fa9 100644 (file)
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 eutils git-2 linux-info user
 
@@ -26,9 +26,9 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
        test? (
                ${RDEPEND}
                >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-               <=dev-python/coverage-4.0.2[${PYTHON_USEDEP}]
+               <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
                >=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
-               <=dev-python/ddt-1.0.0[${PYTHON_USEDEP}]
+               <=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
                >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
                <=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
                >=dev-python/mock-1.2[${PYTHON_USEDEP}]
@@ -40,7 +40,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
                >=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
                <=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
                >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-               <=dev-python/oslotest-1.12.0[${PYTHON_USEDEP}]
+               <=dev-python/oslotest-2.0.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}]
@@ -51,17 +51,18 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
                >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
                <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
                >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-               <=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+               <=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
                >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
                <=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
                >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-               <=dev-python/oslo-sphinx-3.3.1[${PYTHON_USEDEP}]
+               <=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
                >=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
                <=dev-python/os-testr-0.4.2[${PYTHON_USEDEP}]
                >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
                <=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
                >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-               <=dev-python/bandit-0.16.1[${PYTHON_USEDEP}]
+               <=dev-python/bandit-0.16.2[${PYTHON_USEDEP}]
+               >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
        )"
 
 RDEPEND="
@@ -69,7 +70,7 @@ RDEPEND="
        ~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
        >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
        <=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-       <=dev-python/enum34-1.0.4[$(python_gen_usedep 'python2_7')]
+       <=dev-python/enum34-1.1.1[$(python_gen_usedep 'python2_7')]
        >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
        <=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
        >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
@@ -77,44 +78,53 @@ RDEPEND="
        >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
        <=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
        >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/keystonemiddleware-3.0.0[${PYTHON_USEDEP}]
+       !~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
+       <=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
        >=dev-python/kombu-3.0.7[${PYTHON_USEDEP}]
-       <=dev-python/kombu-3.0.29[${PYTHON_USEDEP}]
+       <=dev-python/kombu-3.0.30[${PYTHON_USEDEP}]
        >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
        <=dev-python/lxml-3.5.0[${PYTHON_USEDEP}]
        >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
        !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
        <=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
        >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-config-2.6.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-concurrency-2.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-context-0.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-       <=dev-python/oslo-db-3.1.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-log-1.13.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-log-2.1.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/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-middleware-2.10.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-policy-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-reports-0.1.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-reports-0.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-reports-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-rootwrap-2.5.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-rootwrap-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-serialization-1.11.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-service-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-utils-2.7.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-versionedobjects-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-versionedobjects-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
        <=dev-python/osprofiler-0.3.1[${PYTHON_USEDEP}]
        >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
@@ -128,12 +138,17 @@ RDEPEND="
        <=dev-python/pyparsing-2.0.6[${PYTHON_USEDEP}]
        ~dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
        >=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-       <=dev-python/python-glanceclient-1.1.0[${PYTHON_USEDEP}]
+       <=dev-python/python-glanceclient-1.2.0[${PYTHON_USEDEP}]
        >=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
+       !~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
        <=dev-python/python-novaclient-2.35.0[${PYTHON_USEDEP}]
+       >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+       !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+       <=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
        >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-       <=dev-python/python-swiftclient-2.6.0[${PYTHON_USEDEP}]
+       <=dev-python/python-swiftclient-2.7.0[${PYTHON_USEDEP}]
        >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+       !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
        <=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
        >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
        !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
@@ -143,38 +158,38 @@ RDEPEND="
        !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
        <=dev-python/routes-2.2[${PYTHON_USEDEP}]
        >=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
-       <=dev-python/taskflow-1.23.0[${PYTHON_USEDEP}]
+       <=dev-python/taskflow-1.25.0[${PYTHON_USEDEP}]
        >=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
-       <=dev-python/rtslib-fb-2.1.57[${PYTHON_USEDEP}]
+       <=dev-python/rtslib-fb-2.1.58[${PYTHON_USEDEP}]
        >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
        <=dev-python/six-1.10.0[${PYTHON_USEDEP}]
        sqlite? (
                >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
        )
        mysql? (
                dev-python/mysql-python
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        postgres? (
                dev-python/psycopg:2
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
        <=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
        >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+       <=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
        ~dev-python/suds-0.6[${PYTHON_USEDEP}]
        >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
        <=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
        >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-i18n-2.7.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-vmware-0.16.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-vmware-1.23.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-vmware-2.1.0[${PYTHON_USEDEP}]
        >=dev-python/os-brick-0.4.0[${PYTHON_USEDEP}]
-       <=dev-python/os-brick-0.5.0[${PYTHON_USEDEP}]
+       <=dev-python/os-brick-0.6.0[${PYTHON_USEDEP}]
        iscsi? (
                sys-block/tgt
                sys-block/open-iscsi
index 181db3f537465546bde300cee5b4ec95d6507b79..c51ab18e5c35184810a78298a8f30e7189a534fc 100644 (file)
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 git-2 linux-info user
 
@@ -31,37 +31,38 @@ DEPEND="
                <=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
                >=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
                >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-               <=dev-python/coverage-4.0.2[${PYTHON_USEDEP}]
+               <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
                >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
                <=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
                >=dev-python/mock-1.2[${PYTHON_USEDEP}]
                <=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
                >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
                <=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
-               ~dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+               >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+               <=dev-python/requests-mock-0.7.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/oslo-sphinx-3.3.1[${PYTHON_USEDEP}]
+               <=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
                >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
                <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
                >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
                <=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
                >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-               <=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+               <=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
                >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
                <=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
                >=dev-python/webtest-2.0[${PYTHON_USEDEP}]
                <=dev-python/webtest-2.0.20[${PYTHON_USEDEP}]
                >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-               <=dev-python/oslotest-1.12.0[${PYTHON_USEDEP}]
+               <=dev-python/oslotest-2.0.0[${PYTHON_USEDEP}]
                >=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
                <=dev-python/os-testr-0.4.2[${PYTHON_USEDEP}]
                >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
                <=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
                >=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
-               <=dev-python/ddt-1.0.0[${PYTHON_USEDEP}]
+               <=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
                ~dev-python/pylint-1.4.4[${PYTHON_USEDEP}]
                >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
        )"
@@ -75,7 +76,7 @@ RDEPEND="
        !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
        <=dev-python/routes-2.2[${PYTHON_USEDEP}]
        >=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
-       <=dev-python/debtcollector-0.10.0[${PYTHON_USEDEP}]
+       <=dev-python/debtcollector-1.1.0[${PYTHON_USEDEP}]
        ~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
        >=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
        <=dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
@@ -90,7 +91,7 @@ RDEPEND="
        <=dev-python/jinja-2.8[${PYTHON_USEDEP}]
        >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
        !=dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
-       <=dev-python/keystonemiddleware-3.0.0[${PYTHON_USEDEP}]
+       <=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
        >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
        !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
        <=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
@@ -103,45 +104,45 @@ RDEPEND="
        <=dev-python/ryu-3.26[${PYTHON_USEDEP}]
        compute-only? (
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        sqlite? (
                >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
        )
        mysql? (
                dev-python/mysql-python
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        postgres? (
                dev-python/psycopg:2
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
        <=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
        >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
        !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/python-keystoneclient-1.8.1-r9999[${PYTHON_USEDEP}]
+       <=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
        >=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
        <=dev-python/alembic-0.8.3[${PYTHON_USEDEP}]
        >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
        <=dev-python/six-1.10.0[${PYTHON_USEDEP}]
        >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+       <=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-concurrency-2.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-config-2.6.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-context-0.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-       <=dev-python/oslo-db-3.1.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-i18n-2.7.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-log-1.13.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-log-2.1.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}]
@@ -151,26 +152,27 @@ RDEPEND="
        !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
        !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
        !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-messaging-2.5.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-middleware-2.10.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-policy-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-rootwrap-2.5.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-rootwrap-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-serialization-1.11.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-service-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
        !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-utils-2.7.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-versionedobjects-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-versionedobjects-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
        !~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
        <=dev-python/python-novaclient-2.35.0[${PYTHON_USEDEP}]
-       dev-python/pyudev[${PYTHON_USEDEP}]
+       <=dev-python/pyudev-0.18[${PYTHON_USEDEP}]
        sys-apps/iproute2
        net-misc/bridge-utils
        net-firewall/ipset
index 0bac3f0e9d32711464a5a4dc0931bb5b88455833..60a223df5400e1042c2b8c4ac24ddb3e319efaa0 100644 (file)
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 linux-info user
 
@@ -30,37 +30,38 @@ DEPEND="
                <=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
                >=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
                >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-               <=dev-python/coverage-4.0.2[${PYTHON_USEDEP}]
+               <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
                >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
                <=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
                >=dev-python/mock-1.2[${PYTHON_USEDEP}]
                <=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
                >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
                <=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
-               ~dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+               >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+               <=dev-python/requests-mock-0.7.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/oslo-sphinx-3.3.1[${PYTHON_USEDEP}]
+               <=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
                >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
                <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
                >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
                <=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
                >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-               <=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+               <=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
                >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
                <=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
                >=dev-python/webtest-2.0[${PYTHON_USEDEP}]
                <=dev-python/webtest-2.0.20[${PYTHON_USEDEP}]
                >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-               <=dev-python/oslotest-1.12.0[${PYTHON_USEDEP}]
+               <=dev-python/oslotest-2.0.0[${PYTHON_USEDEP}]
                >=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
                <=dev-python/os-testr-0.4.2[${PYTHON_USEDEP}]
                >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
                <=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
                >=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
-               <=dev-python/ddt-1.0.0[${PYTHON_USEDEP}]
+               <=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
                ~dev-python/pylint-1.4.4[${PYTHON_USEDEP}]
                >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
        )"
@@ -74,7 +75,7 @@ RDEPEND="
        !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
        <=dev-python/routes-2.2[${PYTHON_USEDEP}]
        >=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
-       <=dev-python/debtcollector-0.10.0[${PYTHON_USEDEP}]
+       <=dev-python/debtcollector-1.1.0[${PYTHON_USEDEP}]
        ~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
        >=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
        <=dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
@@ -89,7 +90,7 @@ RDEPEND="
        <=dev-python/jinja-2.8[${PYTHON_USEDEP}]
        >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
        !=dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
-       <=dev-python/keystonemiddleware-3.0.0[${PYTHON_USEDEP}]
+       <=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
        >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
        !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
        <=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
@@ -102,45 +103,45 @@ RDEPEND="
        <=dev-python/ryu-3.26[${PYTHON_USEDEP}]
        compute-only? (
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        sqlite? (
                >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
        )
        mysql? (
                dev-python/mysql-python
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        postgres? (
                dev-python/psycopg:2
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
        <=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
        >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
        !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/python-keystoneclient-1.8.1-r9999[${PYTHON_USEDEP}]
+       <=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
        >=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
        <=dev-python/alembic-0.8.3[${PYTHON_USEDEP}]
        >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
        <=dev-python/six-1.10.0[${PYTHON_USEDEP}]
        >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+       <=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-concurrency-2.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-config-2.6.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-context-0.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-       <=dev-python/oslo-db-3.1.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-i18n-2.7.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-log-1.13.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-log-2.1.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}]
@@ -150,26 +151,27 @@ RDEPEND="
        !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
        !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
        !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-messaging-2.5.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-middleware-2.10.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-policy-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-rootwrap-2.5.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-rootwrap-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-serialization-1.11.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-service-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
        !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-utils-2.7.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-versionedobjects-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-versionedobjects-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
        !~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
        <=dev-python/python-novaclient-2.35.0[${PYTHON_USEDEP}]
-       dev-python/pyudev[${PYTHON_USEDEP}]
+       <=dev-python/pyudev-0.18[${PYTHON_USEDEP}]
        sys-apps/iproute2
        net-misc/bridge-utils
        net-firewall/ipset
index f791d63652f287305346f8570ba4b29fedb0e9cd..f1c4cb2872aded04dfae12d220aa083f88571559 100644 (file)
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 eutils git-r3 linux-info multilib user
 
@@ -31,7 +31,7 @@ DEPEND="
        test? (
                ${RDEPEND}
                >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-               <=dev-python/coverage-4.0.2[${PYTHON_USEDEP}]
+               <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
                >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
                <=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
                >=dev-python/mock-1.2[${PYTHON_USEDEP}]
@@ -44,31 +44,33 @@ DEPEND="
                <=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
                ~dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
                >=dev-python/python-ironicclient-0.8.0[${PYTHON_USEDEP}]
-               <=dev-python/python-ironicclient-0.10.0[${PYTHON_USEDEP}]
+               <=dev-python/python-ironicclient-1.0.0[${PYTHON_USEDEP}]
                >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
                <=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
-               ~dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+               >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+               <=dev-python/requests-mock-0.7.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/pillow-2.4.0[${PYTHON_USEDEP}]
                <dev-python/pillow-3.0.0[${PYTHON_USEDEP}]
                >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-               <=dev-python/oslo-sphinx-3.3.1[${PYTHON_USEDEP}]
+               <=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
                >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-               <=dev-python/oslotest-1.12.0[${PYTHON_USEDEP}]
+               <=dev-python/oslotest-2.0.0[${PYTHON_USEDEP}]
                >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
                <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
                >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-               <=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+               <=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
                >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
                <=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
                >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
                <=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
                >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-               <=dev-python/bandit-0.16.1[${PYTHON_USEDEP}]
+               <=dev-python/bandit-0.16.2[${PYTHON_USEDEP}]
                >=dev-python/oslo-vmware-0.16.0[${PYTHON_USEDEP}]
-               <=dev-python/oslo-vmware-1.23.0[${PYTHON_USEDEP}]
+               <=dev-python/oslo-vmware-2.1.0[${PYTHON_USEDEP}]
+               >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
        )"
 
 # barbicanclient is in here for doc generation
@@ -76,31 +78,32 @@ RDEPEND="
        ${CDEPEND}
        compute-only? (
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        sqlite? (
                >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
        )
        mysql? (
                dev-python/mysql-python
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        postgres? (
                dev-python/psycopg:2
                >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
        )
        >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
        <=dev-python/boto-2.38.0[${PYTHON_USEDEP}]
        >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-       <=dev-python/decorator-4.0.4[${PYTHON_USEDEP}]
+       <=dev-python/decorator-4.0.6[${PYTHON_USEDEP}]
        ~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
        >=dev-python/jinja-2.6[${PYTHON_USEDEP}]
        <=dev-python/jinja-2.8[${PYTHON_USEDEP}]
        >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/keystonemiddleware-3.0.0[${PYTHON_USEDEP}]
+       !~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
+       <=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
        >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
        <=dev-python/lxml-3.5.0[${PYTHON_USEDEP}]
        >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
@@ -108,7 +111,7 @@ RDEPEND="
        !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
        <=dev-python/routes-2.2[${PYTHON_USEDEP}]
        >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-       <=dev-python/cryptography-1.1-r9999[${PYTHON_USEDEP}]
+       <=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
        >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
        <=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
        >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
@@ -134,62 +137,74 @@ RDEPEND="
        !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
        <dev-python/jsonschema-2.5.1-r9999[${PYTHON_USEDEP}]
        >=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
-       <=dev-python/python-cinderclient-1.4.0[${PYTHON_USEDEP}]
+       <=dev-python/python-cinderclient-1.5.0[${PYTHON_USEDEP}]
        >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-       <=dev-python/python-keystoneclient-1.8.1-r9999[${PYTHON_USEDEP}]
+       !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+       <=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
        >=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
        <=dev-python/python-neutronclient-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-       <=dev-python/python-glanceclient-1.1.0[${PYTHON_USEDEP}]
+       <=dev-python/python-glanceclient-1.2.0[${PYTHON_USEDEP}]
        >=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
        <=dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
+       >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+       !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
+       <=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
        >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
        <=dev-python/six-1.10.0[${PYTHON_USEDEP}]
        >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+       <=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
        >=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
        >=dev-python/websockify-0.6.1[${PYTHON_USEDEP}]
        >=dev-python/websockify-0.6.1[${PYTHON_USEDEP}]
        <=dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-concurrency-2.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-config-2.6.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-context-0.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-log-1.13.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-reports-0.1.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-reports-0.8.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-reports-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-serialization-1.11.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-utils-2.7.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-       <=dev-python/oslo-db-3.1.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-rootwrap-2.5.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-rootwrap-3.1.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/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-i18n-2.7.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-service-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/rfc3986-0.3.0[${PYTHON_USEDEP}]
+       <=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
        >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-middleware-2.10.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
        >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
        <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-versionedobjects-0.12.0[${PYTHON_USEDEP}]
+       <=dev-python/oslo-versionedobjects-1.1.0[${PYTHON_USEDEP}]
        >=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
        <=dev-python/alembic-0.8.3[${PYTHON_USEDEP}]
        >=dev-python/os-brick-0.4.0[${PYTHON_USEDEP}]
-       <=dev-python/os-brick-0.5.0[${PYTHON_USEDEP}]
-       <=dev-python/libvirt-python-1.2.20[${PYTHON_USEDEP}]
+       <=dev-python/os-brick-0.6.0[${PYTHON_USEDEP}]
+       <=dev-python/libvirt-python-1.3.0[${PYTHON_USEDEP}]
        app-emulation/libvirt[iscsi?]
        novncproxy? ( www-apps/novnc )
        sys-apps/iproute2
index db453b0f471113b98b84da5d4eb3d9d2cc353569..0d097dfbe64f6bd469682c93ecb62cbd5a2308c5 100644 (file)
@@ -55,9 +55,15 @@ DIST genpatches-4.1-17.extras.tar.xz 16176 SHA256 755f880b1683ac915aa36739ee355f
 DIST genpatches-4.1-18.base.tar.xz 434312 SHA256 e039e095053deb5b21709c3277ffed00c44a8589bed2e2481f2a74de548ef00c SHA512 599f8e0fd53a59429a5dd8ddf29ff2673827068132c3aca43894a629f007ec58c9ce872b0a39e65c7222b420ef25fa1324d3c60b0c526fea4345c004c55e8b12 WHIRLPOOL dc7322d05e7fd4a10bd149b00510ebb636832571108c7b751b90a3d8bd9dec0af01b29f59ac5e984621d1f6dc085600c919b28e06eb3f1d287c6f3045e585610
 DIST genpatches-4.1-18.experimental.tar.xz 61640 SHA256 183ac4b1c8b8fa2b8986ee37920246955f05d8be48c8d59017c3821572d1da7a SHA512 65335da4b6571111248fb6ee035d3be189b4045a9b05d695f21082fae25f4bc071b065bca416c2e99f69ebccbd8d2dded542532edf41299f8e3b662465a78c23 WHIRLPOOL 0ddf13a2c3ea96b73380c95e8f5eac4a77c9936dca1e52828f7aa4c056c4a01b35df12e509239874e0af61ccb6c38ec21f25444eec4a35a609b72bd397218ac6
 DIST genpatches-4.1-18.extras.tar.xz 16180 SHA256 6c386d8e019d5ff811aaf2c75c14c819237e94df4f3cd7037e4e04a9660ce5ca SHA512 7e1239796426182271aaefbf3cf0afb14a0864f39cbc2a14105afbe137b347967035fe716d43bb31b75518b598f20c8523262564adef32b14564f60a1f9b3306 WHIRLPOOL 3906fc8c6565ce77c283dd125be18601043d74df0e0c498e9e542dd933d085201b20a4751c52eafa30fbb908baeed820b074e691fc4359f43c53ddc0eac6c401
+DIST genpatches-4.1-19.base.tar.xz 451948 SHA256 65c565a3659b0b1ce639aab4c37a45f1e1a2890d4bc7ca05507fe97a1def3c8f SHA512 595abfe560bf83a1809785f4e3c5885db73fab079cb9117669c1006baffb2657d8d0fb5ef2b2740396bcbd7e7296952fafbf9b665944e0ec6bb6fa300bc2e4e5 WHIRLPOOL 5295d5d7e5202cfd3c94c4e3b43a068aacd640d411a34c4a12098a16c854893f9c2d18969efc7d61e1b5951f376e57f402c70dbf3b85ef679940dce2f1dfc674
+DIST genpatches-4.1-19.experimental.tar.xz 61636 SHA256 bbb7d352123b1e35b9550921ce331d8972b91646ab74c0575e7c14d052eccef6 SHA512 0e71ea82d396da39d9806383972877f0ba1552b62b2972a3ea64e17e1f94ff42bda42cd6fdb91173408dbfb24d6294c52bf0e00b26ef8286c61f1f8d3829b2e9 WHIRLPOOL 0de3d30618c081a1a4fe5745f27ebdce6cf87d1040f7813b02a849942a371ecbd5864a06366c733e2b869ce83acef9c076545435919d63b66fb5b507c10f7d80
+DIST genpatches-4.1-19.extras.tar.xz 16188 SHA256 d88c39902511c8bd0e4b80761bef8d85471f08cdea3b7eec3c7e57e63fb4d33a SHA512 83ed872b30caf21f5cbeac892cf00b7633b2957708aa40d1e92b9c7b47c0e1eb72c8a3fd7c8711de3b1c1f9e39699c8d85df93c6db0165a8e8df6d2380fd5792 WHIRLPOOL 7a2deb7718ec4ecdf44fe4e810c973b6d3bf153a9a244bb5b7b5882212a3134f893460f0665a5c655f7ce73a3e90cfc63c8d2cc5c2a502706b5d35f1884899d3
 DIST genpatches-4.2-10.base.tar.xz 248292 SHA256 8eb6bba57faabfba57c4415b145300c9fb7b96e9aebcb0dcde7b18aa447dc725 SHA512 0f449d0bc29102ea25fd695508fe17ce8258c216d454777d642727f2eb2f1042acde47bd52bcfabed296d4fc3d0fe3bcb080e5bde5077b1e0879b1651e7f9ffe WHIRLPOOL 3d07c16cc43de6237d6fee0af2bed8d3dae0c8e688d255a48f54b7b6a293ec9eb9658168120c18226079e1e2ca4ecff30b681ea326dcf9b434b2642c3910e16f
 DIST genpatches-4.2-10.experimental.tar.xz 61620 SHA256 e3f6a3d33552281f012456a580cc1e624cb8acdf33f28bc07231319fe3db4dd2 SHA512 d72a6d135b36dbb2e665a537a8d9e31b6fae2cda68aca32532a1e6ea249da88bcbc4b9f853e62ca4f8b58c78a4f242d7fe96ff673f3a881091112a35868f1dff WHIRLPOOL 634df2eefc154eca49e8d15aa286ce79941a4193bba4534dcd6340419993e428351562c7e17e8b19a1c47bd53a9a31485952e035061c8b1b5a5922224cf477dc
 DIST genpatches-4.2-10.extras.tar.xz 16180 SHA256 6c386d8e019d5ff811aaf2c75c14c819237e94df4f3cd7037e4e04a9660ce5ca SHA512 7e1239796426182271aaefbf3cf0afb14a0864f39cbc2a14105afbe137b347967035fe716d43bb31b75518b598f20c8523262564adef32b14564f60a1f9b3306 WHIRLPOOL 3906fc8c6565ce77c283dd125be18601043d74df0e0c498e9e542dd933d085201b20a4751c52eafa30fbb908baeed820b074e691fc4359f43c53ddc0eac6c401
+DIST genpatches-4.2-11.base.tar.xz 274904 SHA256 0407b8f542450e6c1a0af439b04b6fdb9668efbfb6a70da08fc08917b543b9a3 SHA512 ec4f0bc1a53ad19329ccd3000968eadfc9411ef890e8a342c5bbbb810ad1a1abdda430354f85d3fa4a158d330023dff3ec9a02f8228720d5a339806eb9374ec4 WHIRLPOOL 375134e742a18d874212a084cb949daddbf2cb833f8480857a1c65897845e6c8cc88761a4f3bf8858081dc5131710ce1bbe2316134888ba970eb0b98f51d3e24
+DIST genpatches-4.2-11.experimental.tar.xz 61620 SHA256 10111c0a06a30d661b90af17c5d50ce1ae533f55e419d253109a4a313c31121b SHA512 ecdb6aa5a53599d427f38915fb6f8955ee0dd9e9b3744de01e5eaa073e890124e6096cde67596dc853877cf39b227c8115605a71c40665d689febb02f6d193c0 WHIRLPOOL 4fcfc1aa68a6d95a3d3a91ed3d6b47308e17c433b95b0cc2bddfdf5e3dd394f5dd089b66145a4f853300cd18a6bce42e166fcec4ca1fd5a15b77724d99379dba
+DIST genpatches-4.2-11.extras.tar.xz 16188 SHA256 d88c39902511c8bd0e4b80761bef8d85471f08cdea3b7eec3c7e57e63fb4d33a SHA512 83ed872b30caf21f5cbeac892cf00b7633b2957708aa40d1e92b9c7b47c0e1eb72c8a3fd7c8711de3b1c1f9e39699c8d85df93c6db0165a8e8df6d2380fd5792 WHIRLPOOL 7a2deb7718ec4ecdf44fe4e810c973b6d3bf153a9a244bb5b7b5882212a3134f893460f0665a5c655f7ce73a3e90cfc63c8d2cc5c2a502706b5d35f1884899d3
 DIST genpatches-4.2-7.base.tar.xz 177852 SHA256 7f7528ef582219a6d5aee348b09c8523f7b6d5b80eed2d7c6d0a804dffb11440 SHA512 657a7316aaf139820898f0136f5eb0011d38a439f55257567c70074f65f78ab67b316132fa0cf3a19990c8decc49ebf13ed8b4be4788df66e51dd45ac307da31 WHIRLPOOL a6cb9ab193d124f524e84ec427bcd397cc8ac0327743f8ad69d5b61b2d91c4187eefdcc3c48aacae28f10553fb19eec82a48f988eba22845c658159d9f529d0a
 DIST genpatches-4.2-7.experimental.tar.xz 215956 SHA256 be585b9619c5828dca83243f5a3f74c7b5cd7bf775164c89a3eed808665795b5 SHA512 f555c5f870683de39c268ec7b5444340e1eeaadd2b48dc727c4bcc1a06a77643c9d058feb4d41276e0119132ea3c4fd09bb8b3171508fa48cd1a64643cfc6d5d WHIRLPOOL 02860073cf626b8c98e3aaa7df9c7138c8fec8387d58f6781d450c6f671dadf1ca8b329ca8768f9187a155b1fd7dd6a570de75d96973ee42e13e9a6fc0f2762b
 DIST genpatches-4.2-7.extras.tar.xz 16180 SHA256 2a280c94254b721cacb423e683593fc800fd645fe54dc568b845cf02887932b9 SHA512 9af37fd4762c658001b2726534c0bbedf033d29a76017ee53d2ded37282bcb709bb4b33864fd0fb69e107955c98cc37cd82cfe0dab1cdff1ea88f68f87aa2ed9 WHIRLPOOL 2c516cdf55f6dcb613e873a69c968c0b2e18f779baf7f12d0bdc77de09c17205819b014772d10dd25bd1cf1feb1fb3397561b520c6b8261649407663095f2e42
@@ -73,6 +79,9 @@ DIST genpatches-4.3-1.extras.tar.xz 16288 SHA256 41cf40be254f6204a0dcfbb0051309b
 DIST genpatches-4.3-3.base.tar.xz 42780 SHA256 61d6121205303e840e3eb29a2fc23be269f9aae7e8116012f476bff3d5d1a878 SHA512 be125ba6edd8731a8188478f5e463c2bb282654647b97c6e2190ae6183ebc380c53dd8f7324a5d2d6de207194bd1d9066ae611a40c93d6d74a5067aee37c98ca WHIRLPOOL 7f94a5bea46e661e12d1b0238233e94df6c6889397c7f5823283376f7a0587c41225c6c5d41caf1c04243f12d260cdf2b0aa8a3e8f0d95aae62328f524f3d1d2
 DIST genpatches-4.3-3.experimental.tar.xz 61640 SHA256 75f14ed604b7bf6acfe5cda34de34e76a27fe6f858ff45c33211b2086f174b9a SHA512 4f3b82c0fa96c4f27910692faff913d9480923c84658c0a7cad2553bb424da4d4fea7771455fb97942449c1e08a47d1e71faeb808941cc1859a72f6c92161e38 WHIRLPOOL f91c325499e18c516d1e6a950fafbb5782ec0c288009511f82975582c594aba7bb1eadbc63bb2ffc915e1591dc31243b2a3b4a4088ea1e01e0b5dc6381407e8d
 DIST genpatches-4.3-3.extras.tar.xz 16284 SHA256 575fdbd65e2c4a607cecd55e5ddb9be421fb9d7e199196b26eb31ea0f8933dfc SHA512 15c2a8bccb48219f925fadf3111066e8ce862fefb755451a1beaef954abedf5629fdc27dc7c66eb20598110b30f5774ed8029826464dadbdd7b3c60cdce573b3 WHIRLPOOL 803bbecf109f122b06807a93efc7efb914853a5675e49d052c7dc1275a1266937593d8ec835fa49699b4cf46078a1e5cdb6efd18b9b7e36c1b240701a986d42f
+DIST genpatches-4.3-4.base.tar.xz 75572 SHA256 c0c073f12a4f1c0adf9d3865fe5d16dc43ea0e5c95c0867868e16e57f2fd6235 SHA512 a16b75f8fcd868d6f9bc2b91318eb8b8ec4db2b622d244e750d4176c4e8225808751c543c54d768fbd88785da656e9f60d8ef8bc22672b5cb1038573c0c366e1 WHIRLPOOL 04c723b71f440035f57684088a47e83430f1c5b057951e037f128f3681f16669eca16f2f1b8d4b7be4a617420131277d1fe415503a679b83a081e06635df46e3
+DIST genpatches-4.3-4.experimental.tar.xz 61592 SHA256 93b8882ba8e67d58f997a9114d5f6d80097aa2773706299899dc38e14d23dda1 SHA512 ecd35bf49aff3afba08eadff0bef4adeac1d2de4e99f27f7fb2d21a55cbc933ea14eb540e77324680b551b9d96f613de7f5882f12efb25aac7109aa92a47713e WHIRLPOOL 259028c079acb258dbef7f36541ad1cce204b4db3058190b00a627e88d48247f4352e0dcd8d46f2106ba292ac740aea3e9d1220e4cb7865cfc6a03d402028370
+DIST genpatches-4.3-4.extras.tar.xz 16292 SHA256 51f02ec53d62389b330e5247a30cc1b84e689f450be6ee6a14f70aa563cac258 SHA512 f1861903f167a85bec8779cdd38d84e1503be4fa417582eb254627a421de32582e81e5983a7e38d371f74175b44685e34f6264cc7f3557b6e021140612afc644 WHIRLPOOL 610c81d7eb45f2152e90c6fdc88fe40a92701e9208bd04127bb54a2ab64ae51ff39f31ae0802efd9fa83b723e467008de2e0d1d93c440d4d3d44834efcd3034b
 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-4.1.15.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.15.ebuild
new file mode 100644 (file)
index 0000000..f237e10
--- /dev/null
@@ -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="19"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+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/gentoo-sources/gentoo-sources-4.2.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.2.8.ebuild
new file mode 100644 (file)
index 0000000..54331da
--- /dev/null
@@ -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="11"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+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/gentoo-sources/gentoo-sources-4.3.3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.3.3.ebuild
new file mode 100644 (file)
index 0000000..1c3e505
--- /dev/null
@@ -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="4"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+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
+}
index e74ce49e2fac692038f06ab9c659be2b608105b7..520414baa625bfc169f298e0febcfd11965104bf 100644 (file)
@@ -13,6 +13,6 @@ DIST patch-3.14.58.xz 1039716 SHA256 e65bbccf03522a609b88c8186eef4cdb41c35bd6f94
 DIST patch-3.18.23.xz 690832 SHA256 52406a0efaefdffd6464ce5866213fa6c800d08d3e8c3af19f01a38c237e5212 SHA512 b52747facd9049ed3dc32f75aec605766e29c538204eb585ee029e6dea5a763921ac00e7778c42b2033dec8f5543e8eaccfefca3f9aba1a0345894cdc58b77fc WHIRLPOOL 3c61f2b884a8d4b4305b16954d4f0e83cba57fd862d11d0aa596c80e057fba84440d9aca10ae5c3a62caefcfe1cbf188d0811d279a507e5fe203356a4d108e1e
 DIST patch-3.2.73.xz 1494652 SHA256 ea40b581e5c8841152eaeaef967e96b208eb8fc7b5c009cd1f9eaa8a428c72a8 SHA512 64b6b71d8d42a283cde6ed8ffe5ee4a47eb075ddbef8e8d5cc7fdae8a47001c4571586ede1099d6216ef387c781940a7ccc3e9f4e31c23a400b2a76418026145 WHIRLPOOL e5ddcdceffe478b2a423ca1ecb89fcfc0d458d4993f3cba175dcff0590e9e2f23f251e2f1f22586f9844298453c9c0d8f930e0867b0897a7c2fc39ff21ac5cbb
 DIST patch-3.4.110.xz 1293116 SHA256 132362637b7ba272d58acbedb172a7233c238ec1d794af111af55ee8a406e12d SHA512 fc3f95dbf831b8edf9626632983b2d38dc017ff9db8718a79c9c3f714d1114c4fc8c6673854218c5230b3f71667b735945f6f80ae11e424894570941e7431b4a WHIRLPOOL 9f1ec18591c043ba103856d2667c776bebc3369aafcb27d75174aac9d7e00653c571b245dcc8aca735838117cab62178e7a2f63a616a594fc9a508e85a997cca
-DIST patch-4.1.14.xz 416352 SHA256 c7903f02c7f1e00657d0b8f454f195ae1fe0ba3d9d4633d8e55c92a70d4a0619 SHA512 dcce40f93c1ea3c9bc95feedb0b576c842faa9e2f08a3969cdf613b18283c11bf3c27898c6d2a929b1d04bbfd66dabc03b01c165fa6d704b3c5701abc195d7a1 WHIRLPOOL 0068e4e59985630319a6a581dfe4a47789c23c632b96af91ca5a3fda49e2153db8734d9c4f352e242fd4d596ffda490d2f75d3d9d51f1fa5c41f3807b1ac440b
-DIST patch-4.2.7.xz 241240 SHA256 3b0a41fb370f2e8c4aa8e284b6f758bb79f6021f8a1d50a0c11caaf0b5ab8793 SHA512 81fb9e1cc914920c55addbca182c0f6cef6fcc1105613606e13815f186ff2d6c19c3edeff17e597524fb7b003ac23f2ec62edf28048d3204913d798e34802c60 WHIRLPOOL 25e965dab7341481c5ebccdd1d2f41b700689bc241c521bd4723d7df55fca12d38c5c1779420ac361013da5df93d631fb5233a92d9a8756eb5ec158be7c8472c
-DIST patch-4.3.2.xz 39640 SHA256 a96b8a4e90887dea82066b4d804ac193700c200b6c0075fecba0b691b0240a5e SHA512 ee0619d885e3f36239014bd1cb325ab736dff2ccc0b5634f14cc8fa65fddff0f045d2aafce5d55b5812ee6cf005c2119ee736721683fe88a31d471414f577bb2 WHIRLPOOL 81ab6c74d33f6bc4b3fddc9b9a57aee72055e3cfc92b36a9d2c5b8eb8621f5af05c1c81e1eab61e4d7dc83ae9049fee5b321f72414ec319f13a1d7b3aa5b927c
+DIST patch-4.1.15.xz 433040 SHA256 0ffca8557f1aa191da2f2260ad279c9cc858e6308a8af8a76f7ca3d3c0540344 SHA512 646daf16c01fb8c3013c7c9919c18c3635eb6bd37560623cb56cc7a6d0b22fb13290cee8865dfbcc435cd8544cc3ecb6f3aae538d10c9e0b1098806f233155a3 WHIRLPOOL de84d094927463fd425f7bac7d665aee593e41c44354a240db80653a60bc486dbb9dada6a3a84cc29995d03d1f480905878ea21a1299ca71b2a8e6ca58303351
+DIST patch-4.2.8.xz 267084 SHA256 712f93e2f5e8985248852753189001b036b8366008b8c10e3421bb1d45fc20bf SHA512 6353f1fb4e4d4229a9d45f61f666800beb04240d228499f4c4e84a9c7b32fb5a008698d906a722c996251bcf7d82426811a0a679243ff17fded88320c93ec325 WHIRLPOOL 5b6aa338c1b5f68acebb0783a579ef8aa57710cd992edf00f3df4feac63b7ac47426d74c2b4bf44c569df600cb10cbe01e055db6f952be435016d5c1cd9ce7da
+DIST patch-4.3.3.xz 72360 SHA256 95cd81fcbb87953f672150d60950548edc04a88474c42de713b91811557fefa5 SHA512 1b9cc343a589a7cdaa66284b3d7129be9869195f5b839dac0222050af42dc7a7451d4e2bf176c1a9939d6572a44a9b6f4534b0c7a79032881a9bc8f8f56c9c69 WHIRLPOOL 0a949df196f2b9d744af703910fc5a9a3da555648b190bd58febc14da1fdfc229f3528d38157dca3671301713857feaa747d0cf18a9477f62bd22d2ad1729472
index 5db501d1385ace6747f7ea535868d679c20d11ff..70862056102559537f0941ebfd07e64391cab432 100644 (file)
@@ -19,7 +19,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
 LICENSE="|| ( GPL-3 LGPL-3 )"
 # The shared lib SONAMEs use the ${PV} in them.
 SLOT="0/${PV}"
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="64-bit-bfd multitarget nls static-libs zlib"
 
 COMMON_DEPEND="zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
index ef3ac07f8c9fdeeba3b2fadbff00499ac5200956..64660fcfb83c9becce76c182c1de0e7867bcab34 100644 (file)
@@ -1 +1,2 @@
 DIST icingaweb2-2.0.0.tar.gz 9854668 SHA256 a6a5383049e632108ce19b4b85f16a7fdd2f5acb3a6d2af3935254e2bc7fb2e6 SHA512 fb0094b19429d7da533f05ffcb601b47a231e0d5af076775ea8a7c487b0584884172041f443851132bc27634de341190a97e76c750b529dc91b23d166e70ed58 WHIRLPOOL 2d88174296a29b576ba1d4bcf0bcf5a75d166e41c0972327c4c418d3e7bb54ebd74d5d59318c40dc9767d2271954750f9f7248072c8cced6c892a96e5ff5900a
+DIST icingaweb2-2.1.0.tar.gz 9957758 SHA256 1fa15efe4056eca4012358d009da1b90c4b4dd3e18d446de33eeaa48728389fd SHA512 fa694bdaba51b82c33b8fd726807df4c626cd944f1d2949cc8768df3e9bbebdb78888f6aaeba2e88f1f843dab8608d69e1b69f6630e438ab9854d3c8b99f4502 WHIRLPOOL 6b3cba5a701757000909c664d115755efaf3564a77a34a71bc4baa96b058efe1d682867fbaedae22e6a1126aa3dfb47389f8474c42f5a45fbffebc77529a7261
diff --git a/www-apps/icingaweb2/icingaweb2-2.1.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.1.0.ebuild
new file mode 100644 (file)
index 0000000..f3aaa1a
--- /dev/null
@@ -0,0 +1,65 @@
+# 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}"
+
+pkg_setup() {
+       if use apache2 ; then
+               want_apache2
+               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."
+}
index b51ed9ad19423e1e7f1aac1193a11ead34120b74..7c995dcf583fb281c91166107cc83dcd67d9453b 100644 (file)
@@ -1,2 +1,4 @@
 DIST QupZilla-1.8.6.tar.xz 3205912 SHA256 aecda29f8994c9dc4d6b5f76ce5b1ba947272a0d5a40b5d83a54023dd5d7a6a5 SHA512 36f1c79b7932b76f3ecbc4d1ea1bb207fe7e0477a98d583e13ab7df1703a5529e2d599c42b8f0a6792692c09e257abfdec398a1537a9002c1fd98d2128f4b627 WHIRLPOOL e60f66749654bd135fa2552ed2d75095c00108be6992b5d0e1609d7b458690218e601af317b3219f6e106e19870e46207109659e8aa9182117532bda7481f8e3
+DIST QupZilla-1.8.9.tar.xz 3004644 SHA256 620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac SHA512 64ee064aa55f4aa1c56ca3a925dbec66612d522eec570a96448d940d52239cb74dfb08b89610008b3ee669cfb4b287393020b8070162697e991aa8c04c57c448 WHIRLPOOL 4f5864c35d008b64292afbfb615cbb33a9e327446d637cbcd1bf41d0e4ffa7a3cf6a529d1eda14cba6bf28664aa40ee743f812b165698ba997a90cb2285cbc0d
 DIST qupzilla-plugins-2015.01.27.tar.gz 335585 SHA256 466d2cc4a0b904705e2d23b6c05be6d36c74065f81b24aa9b82be0e377960e55 SHA512 0354b96530eca72d27838acfcd6605c0a14095f741587b89d1d4292e57bebe54d17e49464dc0a41af99873031c69ef09120c07053452568caf16dca222f1371b WHIRLPOOL a849f120f7f7a9e4dae6fa9abb2d3a66295a4778101887e99248f1ebd46e9231481f99f1d8fd9478e12f5cedbc5be055948ebe026d504d6b5d2d362ee222ba49
+DIST qupzilla-plugins-2015.06.05.tar.gz 335627 SHA256 afc9589e54c3ed49f58c727c3ff7bd59d4467dfaf2ff78f57cd98afc4dfc1f7b SHA512 5f2a4b1796431c62580e569b57445b2a309b2314f59ceb0c99da2a1703a2ee23bd2d1cac8a1532be5f2161976b4dd5f439c08abe5c1826115e9adf636fc12522 WHIRLPOOL 10b53426888dc8868de783403463d0bbf83ee59fdf74f2409b78a725b4f90d08aa9698e622d3acfdedbca469397b2e3d4ed8f06d3112bd9cff6e76527b1611eb
diff --git a/www-client/qupzilla/qupzilla-1.8.9.ebuild b/www-client/qupzilla/qupzilla-1.8.9.ebuild
new file mode 100644 (file)
index 0000000..3a45094
--- /dev/null
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MY_PN="QupZilla"
+MY_P=${MY_PN}-${PV}
+PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lt lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW"
+PLUGINS_HASH="7c66cb2efbd18eacbd04ba211162b1a042e5b759"
+PLUGINS_VERSION="2015.06.05" # if there are no updates, we can use the older archive
+
+inherit eutils l10n multilib qmake-utils vcs-snapshot
+
+DESCRIPTION="Qt WebKit web browser"
+HOMEPAGE="http://www.qupzilla.com/"
+SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz
+       https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs +qt4 qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )
+       kde? ( qt4 )"
+
+RDEPEND="
+       x11-libs/libX11
+       gnome-keyring? ( gnome-base/gnome-keyring )
+       kde? (
+               kde-base/kdelibs:4
+               kde-apps/kwalletd:4
+       )
+       libressl? ( dev-libs/libressl )
+       !libressl? ( dev-libs/openssl:0 )
+       qt4? (
+               >=dev-qt/qtcore-4.8:4
+               >=dev-qt/qtgui-4.8:4
+               >=dev-qt/qtscript-4.8:4
+               >=dev-qt/qtsql-4.8:4[sqlite]
+               >=dev-qt/qtwebkit-4.8:4
+               dbus? ( >=dev-qt/qtdbus-4.8:4 )
+       )
+       qt5? (
+               dev-qt/qtcore:5
+               dev-qt/qtgui:5
+               dev-qt/qtconcurrent:5
+               dev-qt/qtnetwork:5[ssl]
+               dev-qt/qtprintsupport:5
+               dev-qt/qtscript:5
+               dev-qt/qtsql:5[sqlite]
+               dev-qt/qtwebkit:5
+               dev-qt/qtwidgets:5
+               dev-qt/qtx11extras:5
+               dbus? ( dev-qt/qtdbus:5 )
+       )
+"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       qt5? ( dev-qt/linguist-tools:5 )"
+
+DOCS=( AUTHORS CHANGELOG FAQ README.md )
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+       rm_loc() {
+               # remove localizations the user has not specified
+               sed -i -e "/${1}.ts/d" translations/translations.pri || die
+               rm translations/${1}.ts || die
+       }
+
+       epatch_user
+
+       # remove outdated prebuilt localizations
+       rm -rf bin/locale || die
+
+       # remove empty locale
+       rm translations/empty.ts || die
+
+       # get extra plugins into qupzilla build tree
+       mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_VERSION}/plugins/* "${S}"/src/plugins/ || die
+
+       l10n_find_plocales_changes "translations" "" ".ts"
+       l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_configure() {
+       # see BUILDING document for explanation of options
+       export \
+               QUPZILLA_PREFIX="${EPREFIX}/usr/" \
+               USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
+               USE_QTWEBKIT_2_2=true \
+               DISABLE_DBUS=$(usex dbus '' 'true') \
+               KDE_INTEGRATION=$(usex kde 'true' '') \
+               NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '')
+
+       if use qt4 ; then
+               eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
+       else
+               eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
+       fi
+}
+
+src_install() {
+       emake INSTALL_ROOT="${D}" install
+       einstalldocs
+}
+
+pkg_postinst() {
+       if has_version www-plugins/adobe-flash; then
+               ewarn "For using adobe flash plugin you may need to run"
+               ewarn "    \"paxctl-ng -m /usr/bin/qupzilla\""
+       fi
+}
index 4abd54b895b87a08e672a2022e33f80601d1a6a5..f3b688363eb940a2918f54eff618005133d16001 100644 (file)
@@ -1,28 +1,3 @@
-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
-DIST seamonkey-2.35-cs.xpi 830496 SHA256 f1ac05c2f4e123a12697f094c8c336c887f573640e766b63744dc98cea7c224a SHA512 e7b32870956654f59905e31bfed47e54c1c81eef42b33150b9d697319c9aea54955b425a1d0f8899241a3b1747b7561414b17e8ae3bc1825d9a9eb88454ccdd4 WHIRLPOOL ba14199497b61ede105e5f7eebd28da0c6804ac1e67c770aebbfc694e0f046a064b43c9a2ce234f1b26bee6fb35daa820f111c417be14169ae61a63eaf769222
-DIST seamonkey-2.35-de.xpi 838035 SHA256 5a9f9a542f8e815c4263f04e107e489dc6d8bae6b6464cd5f7af2966e9513acf SHA512 ffcd97d184df2d7b0b25bf8bf04055585826675100048d9ccdc453c67030cd20ed5a9adefed79388fc4e507e359233e27d31e6a6bd000b8e62496538da479e60 WHIRLPOOL 8b271aabdae9d8be8f3ab103d489fe5902c0f38caff003c5fc6d9e3840c106e3176ae47f2b207212d2ccd7b68dc52c64f63ac1f3e8f37d4bb3b0b2434591aeed
-DIST seamonkey-2.35-en-GB.xpi 804302 SHA256 e3db5141e431ea31f7d1f1d5a01aa9e0499d49bda0828b4ebfc77802ee365771 SHA512 eb67fa8ff2a1fa2f3649214e29daf56c866ee1ad26809229044ca3a1a9ea5493dbd7c00d3de09ea3c3e46e468ea3e5ffa8878b4d59e8b3aa3be0a67458694b94 WHIRLPOOL e52c054da0f9cacc5565bfeeb84a3cb6a16f09410b56f601920cc3f7e9e8d85c36d8fe94597a383f4cca13a2a71d4347a25b828ece1b19f14b99b649a5d7ec2b
-DIST seamonkey-2.35-es-AR.xpi 852042 SHA256 74c6c241aa7a1395435539b8969e0e9c4f3fcf957f7c6e8e73f5f61fae211575 SHA512 f055a4b759e8a5ab7f46fc5f263b7a351aba8f7249a36e6a3b0922aceb5ce1c40913c2a8dbd10cfb2b19231a8b9f85d6c4fdaa9d7d5a61827e9d8f2a9405b9a2 WHIRLPOOL 5599ffaed17c1630887cd1f5ff3ee4d8e46b886e6a360acdf546f9382810eae41017522175eb67a27708898d55eb048e9c9506fca2ff23dedc160e85b7b3186b
-DIST seamonkey-2.35-es-ES.xpi 830454 SHA256 c242cfb3406ad6048d7f855e22afdb58bd4d6f8d918eb2e96ddfcf64a0b445ad SHA512 bf03b245974264e8c9fa64c679b68b4f2a67b3bab76c07b7cb1478bf8fa071110fe129bd6f42bb878105c1c017672f5c6c2076f0a39bdf5500f5ba3adfe62fa2 WHIRLPOOL fe32e889f67a0e531a28451928cbea897d5b272a62943c9d6b8d39d239857553aaae31d428399d9e309dd8643fe243944cc0cc11c554bbc8a9346d2e5b417910
-DIST seamonkey-2.35-fi.xpi 802373 SHA256 92b7764676bc98f88ec4d9014f4f60577e78ae804ad610a5d6fe1493b554e555 SHA512 4938a8285170f5ebfaa46859aaa8a43e9efc49180a8ae3b79b189d94b660868212a34a83090043ee59b89ef89e10b608390db3692739fc64c95c0af518035b10 WHIRLPOOL 739252f6ac6964e2a7cea6753e7917be2d3f242e8cbe75f4499e12d5f6b72f6b4f01f361004baa2da5b9ccab5a3c79198f6798d238197279dd0fcc6aefb6b250
-DIST seamonkey-2.35-fr.xpi 810945 SHA256 5402fdfbc0d2f169de29a8ad475725ff8765f45c863d290f5ddea03e2f3f85e0 SHA512 48b9cc32e7bf9f8fb39268587d11b265e8471fa3032a11412ec3d0221a5c157027fdd874749a67aa4ac5d2ec56326f3b248f3f715d7772de3f12fae0e1640e38 WHIRLPOOL eb5524efaf01b55ddd587e7a1b7d5d327c596286fd385cc69c969d498deaa13ac39ae3bff0fca78e7aedade1d82dba4f307f8e06f17815aec5c515f6a62df0a7
-DIST seamonkey-2.35-gl.xpi 812465 SHA256 d9f56b51d65db6315937c47613f8f10d8f292195a317c9670c0bdb1c5259f955 SHA512 b0200e6b1a76e6e8189af56e90ddb2f5c4836b716bc004fde07ebc798ba636ac5b9f0578794016a365ddf7d6d4e5bdcd3b27d48edd2f51fc0cf951eae345f048 WHIRLPOOL 5efb32744cda7274aab771f974abd8ffbdc4bf80cfff4dcb346270be40e99c604abf23c59f8209874affe2d0139977b318da225a4d91d12819f20d03166a6cb6
-DIST seamonkey-2.35-hu.xpi 843768 SHA256 fdf492223b9430c6b0b7479193baeb9be473e996057bb52b30fa03024c116ab9 SHA512 f2cd850a83e58fe7c51f79dbd554e9630ce8bc9fdc103851bd3e3ef4a0aeae90495d68da28f0a159ef34d890aad6c0b8ceab8d7c792168832e0ae8f330f4ac81 WHIRLPOOL e096d2c2d44fa6c714aa52a2816c27eb07095bdd0558f160b317264a04f32d6d99fe16c0de8fe0ff9cd4a711d3115b3c3eceb3196cc1dda2590b3f389c51ac5a
-DIST seamonkey-2.35-it.xpi 742125 SHA256 0e6f3c94ba8ab8a6a87655ef4b465fed1dc82c7e6309a8c3e48545e22de3b6cb SHA512 782bf7bdccc821cc6f32118d5047327d86bd596b93d458c883cec2e07eddb3cad12477f296e78a90131ef0d62bcbedb10f3e954ef51fde423c64c32d5ffbbbec WHIRLPOOL 86d125cb3a1ee7380f0ee7bfa1df4387acda024685351448cabb026b302fbe79b2f188cb26f640448651d8a83ada86527dd46178d0d926a12a70103d1b0defef
-DIST seamonkey-2.35-ja.xpi 885520 SHA256 7bc044f438b5fa27af711590999dce35ca747a6aadd093bbd5ed41664519929c SHA512 a011f085284f340030b70c72e32e282565e417e38ac7c9137d5feefc4ba99dc04c4d65e3c9f992950160d4dd12744dda5608eb015f628943e40d335ca339dfb9 WHIRLPOOL 8aac6371bf745069fae02351442478b16c4770a957a8580aca739cd8235e9bae381b60714736604ccf3c866f72b5c4840e0583fc0220cfdff0f390271637bc14
-DIST seamonkey-2.35-lt.xpi 844697 SHA256 6fcc9f475ba069f58fc8685ee4b45c9937c3cff93227bde15fca92ccd3729300 SHA512 4eeada1d8e0cd79a0baf8411013304f383225a63ca6b968ae7406b707ad24f2d5817699957538e3318439987013ff6e77575f63cd2a800db10cba1b25855f427 WHIRLPOOL 1d2cc26867724e47c7d302b9e718596262cdfab1f042d777ad513f0471863eeff8bc64fd6f647dff3d75616b5042d446b8a595b2aac987a241553a1541403890
-DIST seamonkey-2.35-nb-NO.xpi 825491 SHA256 fad48d775baa3f5ee4e145b23ee09e65bb27137da6e127c4f8681bfc93ec539a SHA512 717706fadadecb57a63e4c0b1619d5d54c976803ece47f8449cb728a877bacaba6c91a7db67a9704c0a2c27dc2879c4d77e109502148beea9685c83cec78ca88 WHIRLPOOL 386d5affeb50caa5f7978360c4d25a975a8d876ce8631c7fc8452fee8bf8fe31cad3327098ee21d582f4181ee3b75d6cc98ba9eb0fa567879c3ae22f3131990a
-DIST seamonkey-2.35-nl.xpi 796553 SHA256 7e2948990879f389150adca707af4806b65a5b19c889ae89e87b74084c8a8cf4 SHA512 dc4289cb6f51bd195775f07f5c262b2b6ee3618ca08dcf73ca02a50a0e3af006307cfe17526422b3437074501c1b8913aa57cf48e76e046158d39a887584b3ef WHIRLPOOL 945159ee69875e93f7f57901f6ffcbd4c033ca5bac6f5fcee895ff01a799d78358d4d30a8d2768cc08fdbffc6bed0b6e0026572c8801212c95865ff1ecd026e9
-DIST seamonkey-2.35-pl.xpi 867329 SHA256 5febf28a4936a42d0b6d4e827571f4bd03674c8fafbd7475bd862211d797a513 SHA512 4d745b1f972459fea713b42f4781ea6e558c1f3bd9c77028e5dbf221243922d589eaf398c11e7ff01be5f0bff43a039ae01bff77bb2d1c9ca35c086e01510ad9 WHIRLPOOL ef0d31aaf00f4204a1a5dd7ccee2f144c835430340e2574ee1b72f72cba87f2642c1d1ef6a36cc3bde3c12ffe9d5a46a43df53f95f75150421ff904291c16478
-DIST seamonkey-2.35-pt-PT.xpi 859044 SHA256 90e1818b02c602346b21667e6d52c394762e97925eaf316b040a23e220b8c9ad SHA512 094fc8d11e05c1b95a3f11a0b868a0b9f1e7ce497658a206adba09feec183b8316fae4db6af4291284a44c116be625f84b4e4786b459ab040a2bf6a354bf0751 WHIRLPOOL 781903753a0e5aec8f149d61c28ece87b8ab7a6c9755567895e1fc0243f281e27579575ba5b78b186282c4a3bc69071b8bf749af60f7a29d766b743b54aef266
-DIST seamonkey-2.35-ru.xpi 899811 SHA256 e7036d99ac03e8a717c6dd520d4fa20710eb34723c52b41bab31e7a889fbd126 SHA512 c1beb81fdd1143ceecd1054fbcf79dfe2bbca3a78678c0ad213b61c3973a70c46ee70216fe041a18d57cd6b677d4fac804322e4c09c65b58a9bfa2556d63cf95 WHIRLPOOL 708fac77e6f0d3fc05b986b7bfe6573517672ee6a1bf181c6342774a39d86f5bbc6055457d2f4c043bab80914ac1932106f6c96fc1c6746ee712d8b931f6feb4
-DIST seamonkey-2.35-sk.xpi 857092 SHA256 0fc80d929764e091ab12849878a15fdf6b350191382ecfda6c97e5d3b6029b2c SHA512 2b842c704cfaa9ad88ef59539166cd6bb59ff264e75c803d1bfbbeb67b73e97e76fca1874cb4398b2a3e9890c0a6f4d012b911849886eae8cd42f736b8959497 WHIRLPOOL e202722d4b96728d2f30e096a5cab84504e7953ac10efbc21dd7962605baafca485c9220b305cb8d4ef086b4aaa4850178f962ef2a497f87a0a803fd7df03f5c
-DIST seamonkey-2.35-sv-SE.xpi 825057 SHA256 72a3152ddce1748ee0afbb37c72aeed6da725d91e775ce6e51bbb2459aff14a7 SHA512 63b464e4949d7db4026c46d28ef25c42036b60dc899a399308628bd76e054aace62439133fc51ba9433f480565a795f9db54d575befb906a8bd686becb2f0666 WHIRLPOOL ec4e8d9187fbfee6ff4ed10feb9bf6379a06a87790dce995d6ea8867908d69c355b9ce4f97f08b4447d659fa6139d5476081b68df0ed4be278179b9a298601a1
-DIST seamonkey-2.35-tr.xpi 808778 SHA256 598b5399fb18ef6fcee8e48682f5a70ae9de95b6735601086e1c661bdc72e993 SHA512 8919b576d0e70ddae76248a9519b2bea8c5bf46adfe4f70b7446e7ae0b136a4b09dc1dff05af7c60cd1961024e6f2e97f805f4b24b37f55a24fc7a2a230aab88 WHIRLPOOL 85b8bc2b93d44eadc86f5a140601a04068582855fff02020d1054b27d7c7a9f8d28a086cee5d931711afa558ced5bc3c203081bc4b4c29d693ed5d51e24605d0
-DIST seamonkey-2.35-uk.xpi 874302 SHA256 fce8928dd186da0685c4e9516f35e9edb40a57a632131db3cbaaed6394a628ce SHA512 2a03b5915d61000aebecdb1f90fc09b45bbc03ff2eb171778dc30084c3ee8ac7bbf1abef72074e6c294b0a778b8ab2d17f6a8c189f3295a9e73a73b9fac4d4d1 WHIRLPOOL 5040b9e47d7ea8c1d57a898b1a8d9234c5b36278b69d1d6566c7f03b9cee1e671eee543656b0a5e9aba8133815ac0c77b642898c29ddd27090ca6c6b56c53839
-DIST seamonkey-2.35-zh-CN.xpi 836554 SHA256 40f469d1b0df9a3c7dd2c6d765f9ccdcae3dca211b81ed2985d97c20cdc61a3b SHA512 97714a166a3af31aabf3ccf39c77e4cf8aa09a8c9803acdfe75660cddf2d8d4504bad9ed71293174c7ef484e6a13c9e94f86897f73eff306aa1a61d532fdf979 WHIRLPOOL 7d269108e45baeb3192890ef4c9dc0dbfbe228a85cf962c87c2c191c039718180e7461274ca4da9d13f3a0e9019e4adbdb5dd7164d705324331210836f76d3bd
-DIST seamonkey-2.35-zh-TW.xpi 860776 SHA256 5e6e23d891f08b9b55ccd55ae4d2ce8c5ea9e32232bcadb31749e199dc55b59d SHA512 4f9d791ea3f00b1f7827ba87c33d9ce09f3351fea970ae29393c38f9185ebb928275973aa55bc945154d4850c804367798c40f9d413862e26bd250259ba7e8f9 WHIRLPOOL 8d6dd5feeaa1eacbe51014e90b49651c262ccd44c5aec7b0907ae044630f3c3137f9c9304d3b88b94c158b8f9fb2ad22d40a4f15befaec6fcaf896195c04b90b
 DIST seamonkey-2.38-be.xpi 843477 SHA256 468cf5442f0847bbd5f8b0863fe63a6cfcdf3e6dc973f5815bcf74db54dd9dad SHA512 13c525fc424c65ebe3deb58069b0e427fe7386a736ccd40ef3f1c90616a1656fab569202b4ab7f86ef1fce3ca0d1b2583bf1c11e5c92344ea1b8e45eec5b0892 WHIRLPOOL a663b04ba4ecc9591c1151e02bd6a6b2e1bbb8f55cacf707e40190a48ded86dacc461c3c80a6a3b268ef2e2e3cf2e78cbf45a594ef3d062c801c427401c20725
 DIST seamonkey-2.38-ca.xpi 835381 SHA256 79e2b20e71f59b23a86663f411008e38df1fb43216ed26e9172e04ea5550d772 SHA512 a636adf34cce6af488156b7400f6f32fba61bd7bf098d1acd25ab5b2ed6ffa235290dae37d090e80af1a819dbef40eafc47802f5a127253a5bed432243755a99 WHIRLPOOL 6c53e991fbb862fe7c9205a2dafdb94b1649ed86ade5dcf247c1872347f3c325345614f83fc24612f2881d02d9d3483559dae4340c787803e34904e50aaf7d5d
 DIST seamonkey-2.38-cs.xpi 827932 SHA256 54727a8b78eab47adaef7a0f1424c2342bc688183820eb42975d56bf3b5cfee4 SHA512 357917f1928b44d57ff7681506b41e04458c8ed6115080e65e63ca07e7dc8b0936adda1b0d6796e983a31f1bccb156f659e2993cc0e8dbcb91b4525f3c4df4c7 WHIRLPOOL 7ed16fe693b3bd1d6ec6ead7f79c6831da4fcb704c8cb60477a376b8ac77188c6381892701736bbed4e6a8a703ddd8d877559900b98f20abb988b5e9fbed3eac
@@ -48,7 +23,32 @@ DIST seamonkey-2.38-tr.xpi 811292 SHA256 aeae6eb15335ab5f366df2b3929fe002a130ae8
 DIST seamonkey-2.38-uk.xpi 873154 SHA256 129e2e999d6d102a186d232c98c59b4c7220a3de09e55be9f561ea3a48fd29a8 SHA512 b905380d34e59b6ae8e1d4b80c2a73301dfa2ce4c922b291d493eede85350c84060cba7244f84bbbb963d3d55f66ed7c38f6891b0e49db263754a5f3e1ddaa73 WHIRLPOOL a760229b72321c378f69704a4784b63e354b89668d8ded474a77e3670bd6dc5a75da19c1175858605ed11a198479dac9a5fd53212fae22660e57995094a92a57
 DIST seamonkey-2.38-zh-CN.xpi 836248 SHA256 de94197af8954dff2330469d20e08789b739bd40e919f85be767967f69842ad3 SHA512 c3bcde38fffdc67cdea77918d3567084aa2893d5a4af06909a6d95ef81cec6ed63c0309f3351065d71cfe802a23d7e7b531d2814f6763f193a2d3764ab423e40 WHIRLPOOL 42a161aafe6b8a2204fa41ae894aad1cc644420d79d20e7899ddbba8d6b39de71be9b4fa5f317aca0a7a214fbf79287d714fd3056227043e43332b72faf8758f
 DIST seamonkey-2.38-zh-TW.xpi 858220 SHA256 051ff2e2eafe8a52c7f0005c43b288df8fec90a59b179902240cd8a6ef71f6a1 SHA512 caf512cae00df7cd3b06c2360bc6d50f8d220ba6bec5f6474180391e52586b9debfbe911786e39fe995d7a4446ef6c94176feeaed43f5459d9fcbfb2cdedd9b5 WHIRLPOOL d0991af14ae3b4839bb86be3239e1f048ae010fa570397218b3fd8b77a29b4eb7b404bb8966a3bbe538ce0ca1cf2ad39564d9fdd9e5e4a8ac4927167554c85a7
-DIST seamonkey-bin_i686-2.35.tar.bz2 46884190 SHA256 16eb932d9568c34baddac7a246bbba88ec8cd965874079ee9a3aa6098105b9b4 SHA512 22202d7aa092c7ac6d82cdecd473958b4f81b9d68bb3c89da4c442174c3fb45ef293e1036ce4278972f12d36999e9ea20ac7c8feee02955df57089542d6ad051 WHIRLPOOL 3bdf0b303b2ba094d1499f766f28ae8afde8c53f58c70011836372fdf94d3d911972b6e4af5497c0d0910b48e2f8bbb12b800ef5ca9c4e8a8dbacde2f5a1948f
+DIST seamonkey-2.39-be.xpi 845960 SHA256 289803bc8d1669aa8dc116e55ffbef60a611002c39dbe9e461ad3546d82043d5 SHA512 2332683e78d8f546fe85a9d7431c295f5f31341d46072eb0eafca6014d527367edc575f5384b332744d3ea9b1c37f5fb86d547f4c78919e4a9310c99c8705cae WHIRLPOOL 4b2fe60315e7146548311c6c8d2c335d21fed1fb0f9057e9c903968bae8dc251b7e60151965f1ca3a4f58dc210e08e6a7677a7f57c41f6d2577e156ef98ed5c0
+DIST seamonkey-2.39-ca.xpi 837800 SHA256 7cd996abf7027189f6c3fd09501331b1bcf06a61f596cd7042d2a2a66b58e0e2 SHA512 43eba49530dd7fdef0c197badff904cda164a700a54ece6fd0706867ae72637aa98eea71175e21de9b322c6b0deda5e709970e16f0bb543d56848e08457f129a WHIRLPOOL 47f6966ab587b4d9e33ff7f318e2009155d4f5d64d30020010414e2cb2d4ec05baff58dac2301339685ffadabeaa690bd519766fb6d99627e9e1258cce99b4ca
+DIST seamonkey-2.39-cs.xpi 830007 SHA256 6204072196d5ef65cfd5a380d7a985f225f17b8bf5c945e7828ca33cdb09b2da SHA512 b266532512053564d1dbe276e97f7cf3a314077129ecca389248a83b132aa0180627b8733de886fe292583148e6f704d55bd9bc3728ed7e046c2109b1df367f7 WHIRLPOOL bf94c95fb55858930bed961d828603d197099f63061795b04808e1149a7636c23e917e2ef39685e63601a310e31b37143a23637019f0118c75875d17ff338467
+DIST seamonkey-2.39-de.xpi 838258 SHA256 a12a02029fef8caa33a99c7bd254bcacf3825b1edbbbc7a2775a8f5a1756425f SHA512 9bd95c27b1b81b19de8fdf961c8d51f4bdd5dc3cc2595978814c2357ce78e83840b2a777e59c39485c60ff8a1aea671201d209bbf81191e89fd62ed824b6ae7e WHIRLPOOL d498a2d298fe5f43f988d583217748e8f4707804799cf40eb184a4fb816382fc9f6e0bb8c4620432eae3c94b56772b92f09405b74c83301e7343a9e97c3868fd
+DIST seamonkey-2.39-en-GB.xpi 800622 SHA256 6b7d78e35df5609cdbc944cc4a36fade59d9d29ba761d31969b20be13eebff0e SHA512 28873d21df8802b98dcae7c1bd7bf3d9641986ab95e38bc9b8f141205a60de225a021f014ceda8e905d5f5817b6d98b0168478baa221da1d5692c86ae30160b1 WHIRLPOOL 8de778ef8d2c782926c535a2deff67f86467db2773a85cab12986c2456897e0f44995242709314413ae19190524545aeec6ea365617109a8402cc90a7e3d4f2f
+DIST seamonkey-2.39-es-AR.xpi 849345 SHA256 f9c92da4f70391413c4be4255332add2fa60a54d8e42c3205badffc4579717da SHA512 e7c2ce3c9fd5eeae2dd1df6f8cea3551bfdedb04d9544e82358ac9508325508bb2d026ad7e85990b1a0e925106e62266e3bfe1fd395a51308e9368765696691d WHIRLPOOL 23ccfc5a9ae430807edee9fef4785ab9e5ca4ddf201e9984bc33303bdfad2b5251acb08b5117e5bf0dc02ed04dc8a808675657575b313634c7a1333e675c0425
+DIST seamonkey-2.39-es-ES.xpi 817622 SHA256 fe0d89ba946aff3ff90e6751491a64acf381d2fb176ed10270d113bc572e22f2 SHA512 6b7a2a3b93a86583b4bea013f7be87622977e392393a0a1fe62f832ca02877fb1744d958f96d67ac088c37016d44ef97ddbb03153ff2cc3001e70ee862da341f WHIRLPOOL 4dc58024895d4b45202a0dd6c6019783f9f99ba6239f60e228334bb308d02747ca5b287ee619abba9ff0a4fe5485b0b65223829b234492f96f43b0cf016e82da
+DIST seamonkey-2.39-fi.xpi 804879 SHA256 c1732389c3d532ca50152fda28495387e66c6ab9cfcda0b607936e9601549310 SHA512 271ddbfb82ccd5d51ad3dba7545fc241bf6a4ab10a5dc17e81af32394f97f7b74b80f03ad537fbf1b7ab731ce496b2e9b2b4155447580ab6605e77d6e91b3e99 WHIRLPOOL 3bd169380992dedc571b8bd18b5b289064dfca8ecb7aab2fc1416e83f59dc2b1534e63fdefc05d4399ee672775d53af63ad034b03ee699e92b64ba0e2a417310
+DIST seamonkey-2.39-fr.xpi 810559 SHA256 fa90086e2d3cc968010c222e58d5e4b465c2c374e07223191483b574db772999 SHA512 36f6d81a2d68fef54811c2c45a8d01c7713c7aed4987a9542219a1120d744e478991b07be40cad2364799d44bbfd46a902ecf55cbc71e11b0f4f24b5f1474c9e WHIRLPOOL 66895de4c7ac6159362de87119c9cd86a40628bfff6d1663ff294e150af2f7012f4be939b0b389c759ccda0dfd87950af298f28ee84bb11ab7fcaa6f8ff21a06
+DIST seamonkey-2.39-gl.xpi 816387 SHA256 20b888b8f9c2c2115e8a3a2157d6f8da353c484d573da0d347ffffd41f99bc76 SHA512 ccf7d4f2de45d91fc7ff983057b005d99e433c5f48a734787f2eaec6c807dce7243d91ceacc63105e5a9bfe898b5379186a29f082afe9ccad4d8bf163fc73f83 WHIRLPOOL b5bebae4cbd46ad028223bdfe82124d51e40750b1cbcf3dc129acc4c5cac22dbc06c2509919142eb3ccad8db54d378c53e30934c244183076ad4b988582161fc
+DIST seamonkey-2.39-hu.xpi 848211 SHA256 a13b872cf8ecc3cfaf1d8fc5e9a136ba4abd8ae07f4fff15e6dbe9fdd9e5ad7c SHA512 3304c4db69181d09e3c576068d952fa4452ccc130a18b263780c58ab144c152e1b0d78e63af6f41c1f580c5f232e03e01d3965b7dc403593328beac6213fb6c5 WHIRLPOOL 686d9519f6c50b1ce0a658e235dc42c0b34c9d66e2787633270fff708775b04144787c6a10605f21d88d0168fcd75722c1bd3b7027c00619c8457bb8c3794652
+DIST seamonkey-2.39-it.xpi 728624 SHA256 65fd240cdad3bc4808f0eb35ccf7cfeb9c5c69ba28d446fce91f225b0161ce97 SHA512 ad0ad56a1b1667c4617c8dae84b5f7ed8804b1680dbc8f6eeefb4f2a22424bd46dda30746f60e39daf605ba0887455822da96c07c2336ebce3dcfc9076da0ffc WHIRLPOOL e9a60ebca9a1145fa9549387e0ea2d9aabe2fe625d8feed17565a65c02ef4f50c3b5d8e05d905f9c56f8f8cf92aaa3ea67a6f6e61493671f594938982f326c2e
+DIST seamonkey-2.39-ja.xpi 886715 SHA256 859ee3e4733f944af91d06051cd99fb78f1bb7d60f012e8cf433cf65fb0d17a3 SHA512 8b06c7ec5fb94cc95ae734fe58ceff4ef7c1a1544591af3fed4f731c4d81e253486cf18260ad4998cc32d025b714280c06db03f7cbe0898214d39e59fc402550 WHIRLPOOL b5885745612c7b36f3d66b96e2226e22ef540ab3ae8c854a4777b18c97b2d59589a3e988fa2c6445966fd0e9c0af98d36e50725da354b644275ec2dcf4d5ff91
+DIST seamonkey-2.39-lt.xpi 857561 SHA256 bcd3b61379bbd1c28974f4609aefa25ece6b5f64715c4cb52b6eafffb60f23e6 SHA512 c89b197f4f24087aeb697d0d60ba58a67a3e142ca49d937b8750aec150c8e02ab91265998c044c7d8f778d6497fa5fab191d7e87ba5f4b634e22f8cfea4b1e8e WHIRLPOOL f183f2a78d12501153b0b6dda38d78215e8d1be1713d83ad61e51ed2f7afbdaf2b17e8cb7c9d034903a873482077fe3ea98a995d7480a295519ecbab89e44f22
+DIST seamonkey-2.39-nb-NO.xpi 827941 SHA256 9a7280be0ae9bdf0f21ad89749cbd050dcac588989c33b016bf79496ad3660df SHA512 aa7988628a69eb3179cd4c886214bf7da835fb7724dd32832dcbb15a40af4cec2bbcc3a8a71e9378e2b27d84f4672325a0becdf49ed01aef1585488cdb550206 WHIRLPOOL 850db2ac4ff722af009c383ba7bacb56c75ff04364d5eb0a389b758983c264b934bf8d13133b8450fbdeb52a20a24f5865ecedb6eea50b945e76963ef28b735d
+DIST seamonkey-2.39-nl.xpi 795152 SHA256 6e880ed775dbf46eb62e3ac9b8a55091790a451f86776aa5ba0de1945d8a23aa SHA512 044b041b813e058679515a796dbdb13e50417041714ad2fc6b2545aee25aa589e6ec680aa86fc4a52ba8156e3c80b804a853e72c1320ab759a044d43e9d29c16 WHIRLPOOL 18452e1851d57dccd4e29a05fb1df29361d540cfb35cc122e23b942283316f606f68aae980a580e3f9a9ff4982541b77f7812fad2d37ab237dae1b5ba944b038
+DIST seamonkey-2.39-pl.xpi 860260 SHA256 00cc6c894fc6dab4a22e9d38fb6037850f8e57a13f8150d64e8faf3878f204c8 SHA512 27c2ce154fd8ca27b7cf900409844b6484f59f059c6b5507ec88479c5537102c26ac5428ea7b93ca238e21e75ba099c12e15dec03777e3b5c0902777c6da8f77 WHIRLPOOL 0d9755979ed3904afa8dfa25adc5263606bce13e1cbbec2078ddb8436564a44626e0ae4ebab681af8466be02517a916d2cfc3ffe53cf3e85cadd9c5292508457
+DIST seamonkey-2.39-pt-PT.xpi 830427 SHA256 7be70081c211aed53e98228ed9f9d20741f227bbafb696acf44a5eae20a286f1 SHA512 932c0123bbb2bb7864520e1993f5f0d6d99f6be09af31f5b17c3d1d8dfa3428047b4f7577bfbac37164d87227a33832fa7db9dafef5b93b6af6bb7e4e570064a WHIRLPOOL d9b9ee79571b7031b29dd53cd0da10042aaee8a3a1a8f4f242cec845b8d1edb98a62f5717e2f290912c1cc59b29765e2d5e84c7e482f90f8f8c653d2491bc359
+DIST seamonkey-2.39-ru.xpi 889891 SHA256 9ad1066cb6cc07a49bbd0b2e8295db65e490a07af7c36485ae607d788817ec5e SHA512 17f7a292e38c86d6c921f65b76fd40e9b350d80577b2b840a11a16fb1242c07bcd30fd72bcc4c794836aae82c19f19a1910b0657ea0db5785843407bb1459db9 WHIRLPOOL 067e9a598e8060167b5f8e5654b8959ad70bf354192a2bf719c9682805be4a2b4971440455e5e92741d61371bafc9dfe5ec0e465c0f2377536c0e234f2e70cce
+DIST seamonkey-2.39-sk.xpi 856745 SHA256 f70af092108244bc70d3daa53fd41bd3a47c1af518afeca2b6f431952643c6e7 SHA512 f2884e0df86e0d620eb5b93f5103f0e3e08f1cb15e742034316020befe5de846d58d2e41be8547ad4e72b37304b15879556805f4a6a173eb731031baf420e61e WHIRLPOOL f2019f87ea7d8846d5bf7e20acec55fbf86b457a95386c121f33ac7b3bf68e7a77de2bfb720b91161144d86c5f87095e1b03dba4de4aeacbefb7f429e06cc3c8
+DIST seamonkey-2.39-sv-SE.xpi 823333 SHA256 4ee82e2d89fd9846b4fc9465797c2f04facea76b10bf00d82ade5a581b6c5c59 SHA512 f62d571c0887fa029369541d02a47d3b3aacc0a221efcf0f5c91fc6eab0f2c30af0aeb0694d9e13d5ef0eaac1563ed4c18adcc31945a72e245373c7ab9646a3b WHIRLPOOL ed69b558c1f1f2aa3523fddba4b233121c3c81937050e70c5785eb771f65c8522d6e27dcce07777fabce6e7ec0c9acaad1492b43a394b33c86bb9d3c88691fb5
+DIST seamonkey-2.39-tr.xpi 813628 SHA256 9d5e12b135b8157ab0febe7d2253466cc90ee410322234ebe23a3b4de83461b3 SHA512 bc2949594560050339dc32808e1c18b6895d7bd0f854f644f7f7603796262406b7d87a9d9392fe1e71eb0588737670f2609fd8cd137b098e704835afd5fe88d3 WHIRLPOOL 9c4eba08f151e292fa57b049e9295e2141c617a985d157ec932e757e88f0e39c15b1d5e47d0adaa1b843f05776918022424b51edd19cfc3b09e1567f83cb88c5
+DIST seamonkey-2.39-uk.xpi 875396 SHA256 6b4bed5fd385b1666579cf69cf094f7f81e4533be62915b02a9154ed9bbed6fe SHA512 0bd90ff705d398a4e54174ac331afa9f91ec79bb6b78be81afd4ad49100610381d52069e1b43ec63145f26b0a2c7eb2108937f1737c56e8c167f85e6a3ff8087 WHIRLPOOL bfc5381969f93569d710a074c69482d124714432ee9472b39254432aa78df0b1e3e4b1be8e6976b3dafb691aaeb0d037b3cd9a04382993ef2bea50a0317260db
+DIST seamonkey-2.39-zh-CN.xpi 838756 SHA256 7cdb2dc31da908a506fca78c93008cf1b6ce9ef3dddb0fcb38b383bf9e5be556 SHA512 6e1e98f2872b7b188a5db62d96ef0e21afd8b2502ef1fa35a6a59096d8d6c861253c6192a55e8bee93a6c4e746e418900257f01efeaf4f1c5a43c22c89168533 WHIRLPOOL d8d547e796b21ff5876e0dd25f5e1aea1a380a37a5c825cab4dae899dc17b191cc1783a0ca14c833df989c2338b7c55478727efaa9361fa9b26098396f9eea49
+DIST seamonkey-2.39-zh-TW.xpi 860307 SHA256 a3ae379666ff757e0424918491ae1aa710d08aa586d0fd4526bf4dd838c1461c SHA512 f26db467a96ae59e2b9b6d9f072108dc8a6686ce7f6da9c8451a02026cb46f37e86d578d44ec0557efe3f36603874dd970b76c95ed01b7e8fe1024b06b829abe WHIRLPOOL e80a726158c8ffb96ee69e4166877d133683ede68891ae570819fc1a26538828efc3c14bd30f540620286424aa49e1b6e4fc8ecf91273048b1f595325de86e03
 DIST seamonkey-bin_i686-2.38.tar.bz2 48747705 SHA256 7748d1d9e476aded1f124e8b4447815ae5affa5213f8790e09823ef66d745978 SHA512 1395f31804eecc74378eb3916d0b35272febe957b6ca55318d66e1e0e12e5145885af288e8e9742a3f4e59d69f71e9f848c70726ef0d5499cd11432e77d05de4 WHIRLPOOL 810d41a351e46bcbe14f6a5a31bd6281dffbbaa8b0a2c0826353c62319fa1aea2a18441faa11829b673d194754a4f817d41ebaaa2d3e69c2a689cfb9512655ba
-DIST seamonkey-bin_x86_64-2.35.tar.bz2 45688810 SHA256 4486aba8d10d3bfe40047ca708356334b057f71d04d31726e92a55e45b17c0e1 SHA512 ed9291702d98e493b4af4db4ba5f8fdc30ad4b5ab30f2c379f85b06016b7397c871c80cf9d113db579947e9fbf26a1f460134e67b669c1560116d216584e0d78 WHIRLPOOL c26bb3f7b03dd556af18d9a6e7056caae909546acf5bb0d056e952e9da3f9a67acd92cee03f168c76553ef9c6403a8a416b567b5b783d1d536bcc08fced1e7e3
+DIST seamonkey-bin_i686-2.39.tar.bz2 50222506 SHA256 035cef6a3839fc5e86b554070fbf111b2e33bf2ea74b565fb10c527761fc52b1 SHA512 23e3e9a75775ed93da1559efbf0fb34866038e38833f724536127e8ec58afe9a2e9d53734885e490bc7fc193cf642f843c2881b42ed2d31e99221fde218350a9 WHIRLPOOL fe67e6ac6a1b80d5d09d038b30cae4eaca54859ae56a7700b24c44ddcd9a8dd19c7d90355214e5ce4fbfa1fdd42afb1d578cafbaa85f9de457c08d84eaba9606
 DIST seamonkey-bin_x86_64-2.38.tar.bz2 47601657 SHA256 ab41bf9cdb910bcb3cb6dc0e11a29977d3e9b328347c13d2ce0d7e32eb383bb2 SHA512 5448bfe153da08b4305323775e9cc8b53bb6733d13af4c62dc80d7a19626451ba2b3344c65bf5a0ef3b8fb25547a412a49547c8750002dab7d9ac90427a1251c WHIRLPOOL dc0339729cce37d3e876ceff0fc2882d0d9fcf84f205b4b3e0a44efae543804b97649ad45dd3802c4c06c5596dffcdecffcd40fdbed94efdbfa891ec6af2a555
+DIST seamonkey-bin_x86_64-2.39.tar.bz2 48772457 SHA256 95b0baf509615d8d1d766ab66d7031151e47590b9d5d78ee04e8c96c92b3fe7b SHA512 2347eb7551ec3ee4ee34d1915c9a72f6a1b4615fefd63cfcd2e5e73b82b6d0eb6a39ac556d9fbc64752056fcf7cb82c386d2d2b95f26a86b5ecce3f90f08bb7b WHIRLPOOL 25dab04fc1cbf607edad8503a2811ea23bbd82f774f29c1202178535e7908fe3703d7d123631ccf5c2bf8b7dc8ecb0ede7980b5236dcec8ff7c1a6d6aa13f81e
index 0cda361882e5cc7cc578f2db05c7bb74e132312e..b218475fb61c6a5497a4d84ea9dd30a55bdf8eb8 100644 (file)
@@ -1,4 +1,4 @@
-// Ensure preference cann't be changed by users
+// Ensure preference can't be changed by users
 lockPref("app.update.auto", false);
 lockPref("app.update.enabled", false);
 lockPref("intl.locale.matchOS",                true);
index 399c1e9117748daf53536c54a2fd751f36eb7034..49b17a8957fb3593beaef53fbf05c28995f46e1c 100644 (file)
@@ -6,4 +6,9 @@
                <email>jdhore@gentoo.org</email>
                <name>Jeff Horelick</name>
        </maintainer>
+       <maintainer>
+               <email>elizabeth@interlinked.me</email>
+               <name>Elizabeth Myers</name>
+               <description>Proxied maintainer; set to assignee in all bugs</description>
+       </maintainer>
 </pkgmetadata>