From fa0b4a97a4e0aeb115935abe2e5fc3d65e0da131 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Oct 2017 12:51:27 +0000 Subject: app-admin/keepasxc : version bump, x11-base/xorg-server : adjust to gentoo changes --- app-admin/keepassxc/Manifest | 2 +- app-admin/keepassxc/keepassxc-2.2.1-r1710.ebuild | 66 ------------------ app-admin/keepassxc/keepassxc-2.2.2-r1710.ebuild | 78 ++++++++++++++++++++++ .../xorg-server/xorg-server-1.19.5-r1710.ebuild | 6 +- 4 files changed, 82 insertions(+), 70 deletions(-) delete mode 100644 app-admin/keepassxc/keepassxc-2.2.1-r1710.ebuild create mode 100644 app-admin/keepassxc/keepassxc-2.2.2-r1710.ebuild diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index 22352d46..954ba7a5 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1 +1 @@ -DIST keepassxc-2.2.1.tar.gz 3880551 SHA256 184663e8b08e081dedf4c9dbdd68bf86ed0f5e32388b4781b7afcf89ef5c8e4d SHA512 bce2a0d6d3ad32bb507afac22670b34c37f5e36de6a30bb7c9b5a523c12bad59d95a414b90608451660fb9ce224279c7658e1892f2b99c673908449cc86e5595 WHIRLPOOL 32a0ede5c150bc4fc54c1b0a8f3c46110a19349d732913bdc9f3bc6492c1998569b2cd7a178ec9bb11e5b8dc9698138d8a7f26000211377a0c90f505605fe54c +DIST keepassxc-2.2.2.tar.gz 3885990 SHA256 d36b21415f666d68eb130d739302759a0746b8df9315f828b44b7c1333c2d6a3 SHA512 73a167a79af56d4b6dbef7ce4050ca599f2c107a5c8af3b9e28241504572988b2d8b258135b7a34dfceae5a18cbda26b97ed513bbde14fe3d38e3f41b882d34b WHIRLPOOL 8dd6bf0e02d251f7a2b0dc2850d219257d9de6c856b03f7d867d1606cfed67d07c7126b1c9ccb1b843e26db8d15f9a8e76ce0514f42df12199418b71e2969913 diff --git a/app-admin/keepassxc/keepassxc-2.2.1-r1710.ebuild b/app-admin/keepassxc/keepassxc-2.2.1-r1710.ebuild deleted file mode 100644 index a74352a4..00000000 --- a/app-admin/keepassxc/keepassxc-2.2.1-r1710.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -SCM="" -[[ "${PV}" == 9999 ]] && SCM="git-r3" -inherit cmake-utils ${SCM} -unset SCM - -DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" -HOMEPAGE="https://github.com/keepassxreboot/keepassxc" - -if [[ "${PV}" != 9999 ]] ; then - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -else - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" -fi - -LICENSE="LGPL-2.1 GPL-2 GPL-3" -SLOT="0" -IUSE="autotype debug http test yubikey" - -RDEPEND=" - dev-libs/libgcrypt:= - dev-libs/json-c - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - sys-libs/zlib - autotype? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXtst - ) - yubikey? ( sys-auth/ykpers ) -" - -DEPEND=" - ${RDEPEND} - dev-qt/linguist-tools:5 - dev-qt/qtconcurrent:5 - test? ( dev-qt/qttest:5 ) -" - -src_prepare() { - use test || \ - sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_GUI_TESTS=OFF - -DWITH_TESTS="$(usex test)" - -DWITH_XC_AUTOTYPE="$(usex autotype)" - -DWITH_XC_HTTP="$(usex http)" - -DWITH_XC_YUBIKEY="$(usex yubikey)" - ) - cmake-utils_src_configure -} diff --git a/app-admin/keepassxc/keepassxc-2.2.2-r1710.ebuild b/app-admin/keepassxc/keepassxc-2.2.2-r1710.ebuild new file mode 100644 index 00000000..22e6fe7f --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.2.2-r1710.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +SCM="" +[[ "${PV}" == 9999 ]] && SCM="git-r3" +inherit cmake-utils gnome2-utils xdg-utils ${SCM} +unset SCM + +DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" +HOMEPAGE="https://keepassxc.org" + +if [[ "${PV}" != 9999 ]] ; then + SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +else + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" +fi + +LICENSE="LGPL-2.1 GPL-2 GPL-3" +SLOT="0" +IUSE="autotype debug http test yubikey" + +RDEPEND=" + dev-libs/libgcrypt:= + dev-libs/json-c + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + sys-libs/zlib + autotype? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXtst + ) + yubikey? ( sys-auth/ykpers ) +" + +DEPEND=" + ${RDEPEND} + dev-qt/linguist-tools:5 + dev-qt/qtconcurrent:5 + test? ( dev-qt/qttest:5 ) +" + +src_prepare() { + use test || \ + sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWITH_GUI_TESTS=OFF + -DWITH_TESTS="$(usex test)" + -DWITH_XC_AUTOTYPE="$(usex autotype)" + -DWITH_XC_HTTP="$(usex http)" + -DWITH_XC_YUBIKEY="$(usex yubikey)" + ) + cmake-utils_src_configure +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r1710.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r1710.ebuild index 7e258484..2ea07cb0 100644 --- a/x11-base/xorg-server/xorg-server-1.19.5-r1710.ebuild +++ b/x11-base/xorg-server/xorg-server-1.19.5-r1710.ebuild @@ -9,10 +9,10 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" DESCRIPTION="X.Org X servers" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux systemd tslib +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity" CDEPEND=">=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) @@ -175,6 +175,7 @@ src_configure() { $(use_enable kdrive kdrive-kbd) $(use_enable kdrive kdrive-mouse) $(use_enable kdrive kdrive-evdev) + $(use_enable suid install-setuid) $(use_enable tslib) $(use_enable unwind libunwind) $(use_enable wayland xwayland) @@ -194,7 +195,6 @@ src_configure() { $(use_with systemd systemd-daemon) $(use_enable systemd systemd-logind) --enable-libdrm - --enable-suid-wrapper --sysconfdir="${EPREFIX}"/etc/X11 --localstatedir="${EPREFIX}"/var --with-fontrootdir="${EPREFIX}"/usr/share/fonts -- cgit v1.2.3