diff options
Diffstat (limited to 'x11-misc')
20 files changed, 118 insertions, 210 deletions
diff --git a/x11-misc/basqet/metadata.xml b/x11-misc/basqet/metadata.xml index 7aa61dde7f6e..c1ca52bbfce4 100644 --- a/x11-misc/basqet/metadata.xml +++ b/x11-misc/basqet/metadata.xml @@ -4,5 +4,6 @@ <herd>qt</herd> <upstream> <remote-id type="google-code">basqet</remote-id> + <remote-id type="bitbucket">ridderby/basqet</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest index 029df26c031f..579483a1a90e 100644 --- a/x11-misc/colord/Manifest +++ b/x11-misc/colord/Manifest @@ -1,3 +1,3 @@ DIST colord-1.2.10.tar.xz 1203248 SHA256 1dea0453cc778326e700f6cb0a206836a57dedfb0fbdc3acaf2be02ea77a963a SHA512 fdf6f41e84fb37905e3c2e37a7d095d5271759f17e292cf5cf23f846ea6805949185c1a0548c4c4e24e2a385e655cd30609423921b0389076f5373ca1b8578e7 WHIRLPOOL d70fd0d3fde030f6c592f49ae146ccbb38c00ad0c28e2253ea8e2e00436c19fc4cf53aead6360e04eb7509a8d94bd07ffab6dde5592fd050dd37de3355b76f87 DIST colord-1.2.11.tar.xz 1205468 SHA256 dac29c83659703a8548db561bc670832f26b30f7a88ed90a6530eb052a10df8f SHA512 fec46d295b1b4caba7c0a666eccbf3ce325fab4bd56e6a841cfdd9b7a381384dff3c71a744dda0e88ed2e99519c278c1ee495e6b8870c74cb4939dbc08d4bb96 WHIRLPOOL 7372d1a52c897e133fa75c8e06c47b3f7035cb01a3ec858f74ddc741613b11554a2d6dac6c886347f4e82baa16091cc41232a5deb3db4ae5a4930be0d1de6f41 -DIST colord-1.2.9.tar.xz 1200936 SHA256 48ce0db4f327c94c2bec11fed98a9a73f580d34c6edcd636d90831fe3bea5ae4 SHA512 d25497fa6460e5ffd7ce872bf16b60916e879cdd3aaec4c81dd4ab8446949767f3d3d49a3e654813445b049a9653334ba22d8e9a91cf6699c6063c01be382a75 WHIRLPOOL ca8edc19b162e4e97c263c1bc64d2a655d5adafeb2cb64c8bdbd7eb4e20052ce76f8ad332168088a97e654d20f0c5215d62829fed7471ac69faed3a79fc9f283 +DIST colord-1.2.12.tar.xz 1214992 SHA256 d5241864c16a37f9e40d38d5009255456495a67f170ce0dc9250774442d68c3a SHA512 5ce8f4fd10b92ec0cb54a05017ab050753381663a43e40d959606bb5f71ddce5456a3d67f8ce0538a2c945136834c66615f3615fdfb3e1eaaf5f5ca7a9e9c4eb WHIRLPOOL 5b04acfc8de34758252f0215371f75b9ccab8f80194a9624d6b4c3651929266032f3e9e1e05b48fb82572891e93d6082739c022b2624978b0f8ece7e323e1b48 diff --git a/x11-misc/colord/colord-1.2.9.ebuild b/x11-misc/colord/colord-1.2.12.ebuild index 7b4e1b9181f9..e6e9171e254b 100644 --- a/x11-misc/colord/colord-1.2.9.ebuild +++ b/x11-misc/colord/colord-1.2.12.ebuild @@ -6,9 +6,8 @@ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" VALA_USE_DEPEND="vapigen" -VALA_MIN_API_VERSION="0.18" -inherit autotools bash-completion-r1 check-reqs eutils gnome2 multilib-minimal user systemd udev vala +inherit autotools bash-completion-r1 check-reqs eutils gnome2 user systemd udev vala multilib-minimal DESCRIPTION="System service to accurately color manage input and output devices" HOMEPAGE="http://www.freedesktop.org/software/colord/" @@ -16,7 +15,7 @@ SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0/2" # subslot = libcolord soname version -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" # We prefer policykit enabled by default, bug #448058 IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala" @@ -32,7 +31,7 @@ COMMON_DEPEND=" >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}] argyllcms? ( media-gfx/argyllcms ) gusb? ( >=dev-libs/libgusb-0.2.2[introspection?,${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) + introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) policykit? ( >=sys-auth/polkit-0.103 ) scanner? ( media-gfx/sane-backends diff --git a/x11-misc/gpaste/gpaste-3.16.2.1.ebuild b/x11-misc/gpaste/gpaste-3.16.2.1.ebuild index 47b2d4f6ae86..24fec00606c9 100644 --- a/x11-misc/gpaste/gpaste-3.16.2.1.ebuild +++ b/x11-misc/gpaste/gpaste-3.16.2.1.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" IUSE="+applet gnome vala" CDEPEND=" - dev-util/appdata-tools + dev-libs/appstream-glib >=dev-libs/glib-2.44:2 >=dev-libs/gobject-introspection-1.44.0 sys-apps/dbus diff --git a/x11-misc/grun/metadata.xml b/x11-misc/grun/metadata.xml index 11cb726ccd43..62788e9b0972 100644 --- a/x11-misc/grun/metadata.xml +++ b/x11-misc/grun/metadata.xml @@ -4,5 +4,6 @@ <herd>desktop-misc</herd> <upstream> <remote-id type="google-code">grun</remote-id> + <remote-id type="github">lrgc/grun</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/ktsuss/metadata.xml b/x11-misc/ktsuss/metadata.xml index 1d6819a1c170..a6a88629dac8 100644 --- a/x11-misc/ktsuss/metadata.xml +++ b/x11-misc/ktsuss/metadata.xml @@ -9,5 +9,6 @@ </maintainer> <upstream> <remote-id type="google-code">ktsuss</remote-id> + <remote-id type="github">nomius/ktsuss</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/qlipper/metadata.xml b/x11-misc/qlipper/metadata.xml index dc439f7e84f5..417967a8329b 100644 --- a/x11-misc/qlipper/metadata.xml +++ b/x11-misc/qlipper/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>qt</herd> + <herd>qt</herd> + <upstream> + <remote-id type="github">pvanek/qlipper</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/qxkb/metadata.xml b/x11-misc/qxkb/metadata.xml index dc439f7e84f5..32bdd4ceba31 100644 --- a/x11-misc/qxkb/metadata.xml +++ b/x11-misc/qxkb/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>qt</herd> + <herd>qt</herd> + <upstream> + <remote-id type="github">disels/qxkb</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest index ccb3713a7a9c..cfdf1ada139d 100644 --- a/x11-misc/rofi/Manifest +++ b/x11-misc/rofi/Manifest @@ -1,2 +1,2 @@ -DIST rofi-0.15.5.tar.xz 124952 SHA256 3d7fefc986003527237ffc59a27158e4680e8c6daa6d45374e50734a19996dcf SHA512 4925912cc575a83d3b3fbe08b767798f3e3834dc1d818894ac1537f2eb8a102219029a9c35f8085e81d9c30cfecad86e44ae4707e5149a14ba144f79e08880bc WHIRLPOOL 2bceb26240ceeb0870bb2d7cc630079cc5fd53ae88ec5ce425d9371b6363f1a874e52f8d1e9373a8956f16c6779cdf9d1fb9c6ec50fc96a62d00c6d1241cd98c DIST rofi-0.15.7.tar.xz 125824 SHA256 8c35d3d2a36cc61ae6b5dcc6a07a590e3d6d446944ec6e37dd5a3c3fcff64188 SHA512 51caaaf6f2280c24b65386a3e38591b601e06f9d7ffa132023c93d86cb9ccf8ac1d1e2dec6886128ebdac6558fae3c718c21e489c4bd13575aeee2143ecdac13 WHIRLPOOL a9de957c8cee9682608c35363d1142ec624fb4ce8f22c96da9dc35259afab599fd48dc1e9d528c287fecaa5e1a3c20efe51f1c9159913d7aa7878bbd98814578 +DIST rofi-0.15.8.tar.xz 129980 SHA256 13aa2194c87f183c217069292092b38b9ab12115abb0bf312c6d48b22c3b369f SHA512 9c43bdef60a229af371e992a0363e81d5bc09704e5579ffce38c6f0218df9e7607efe13744b700d8b3fa01f3654193afa2f95cd86383ab668573b51902030bb6 WHIRLPOOL 3c9863cafecd606d4f7514328bc3434e60b2bf24faa3f77478c836efa4ea3e4c7037eb4588a76ae23c29294504c9a5b983a86f59ca2c784520a66fadd3f2ce18 diff --git a/x11-misc/rofi/rofi-0.15.5.ebuild b/x11-misc/rofi/rofi-0.15.8.ebuild index 6de1ac970986..6de1ac970986 100644 --- a/x11-misc/rofi/rofi-0.15.5.ebuild +++ b/x11-misc/rofi/rofi-0.15.8.ebuild diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index ffdf15a403d6..7fa0ac18140b 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -1 +1,2 @@ DIST sddm-0.11.0.tar.gz 4735807 SHA256 80d53f075c275f744bd547523d6d640baccfacb4e463a71ec0facb8231b832ce SHA512 9dd2b80788e3cfdb353e64f709db451e04828991976b8b0f74c0e97dbf467fa2744702c73e5e50137eec10dac92df7dacd83fb458f75dd595556fc95fb1759f7 WHIRLPOOL 079c5093374710c2a3247a3e27dd26f3d10962c7cb8f260b80a4ba17a72e63676012d4b8e50f8f4bffc43124efdf05c7e14aefe86253b391345c7fa98a2d4c2f +DIST sddm-0.12.0.tar.xz 3866620 SHA256 7d7504bf8a717a9131a2f32be852d7631365d21a468ca2649c8245f24ff29ae0 SHA512 d1d9f60634cb2a71096d92321a7a8b33efb8879a766979ca7c1d31ac5f1dbde8253384070338eef80f777db1cd78eef540e9111151f7f9e7d8e648d557e58047 WHIRLPOOL 58d21ead822b85bf3f0f6375cfadee6225dd9bf696e786fe68f283def43b4107d11e14b357d60b0278266270f9ddcb6a9b86285bc3b1a19644583f6ebebc4990 diff --git a/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch deleted file mode 100644 index acdfdc1a43e2..000000000000 --- a/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/data/scripts/Xsession b/data/scripts/Xsession -index a5d270d..4b48524 100755 ---- a/data/scripts/Xsession -+++ b/data/scripts/Xsession -@@ -74,7 +74,7 @@ case $session in - exec xterm -geometry 80x24-0-0 - ;; - *) -- eval exec "$session" -+ eval exec ck-launch-session "$session" - ;; - esac - exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." diff --git a/x11-misc/sddm/files/sddm-0.11.0-consolekit2.patch b/x11-misc/sddm/files/sddm-0.11.0-consolekit2.patch deleted file mode 100644 index 7f6f3f7f8113..000000000000 --- a/x11-misc/sddm/files/sddm-0.11.0-consolekit2.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 7a8024639ee3ae7e128a9dc3efce90a07b4d316c Mon Sep 17 00:00:00 2001 -From: Eric Koegel <eric.koegel@gmail.com> -Date: Mon, 6 Jul 2015 11:16:38 +0300 -Subject: [PATCH] ConsoleKit2 support for system actions - -This adds support for calling ConsoleKit2's DBUS API for shutdown, -reboot, suspend, and hibernate. It does so by using the exact same -interface as login1, making it a shared seat manager backend. ---- - INSTALL | 4 ++-- - src/daemon/PowerManager.cpp | 26 +++++++++++++++++--------- - 2 files changed, 19 insertions(+), 11 deletions(-) - -diff --git a/INSTALL b/INSTALL -index 77b6a8b..5d16710 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -30,8 +30,8 @@ its home set to `/var/lib/sddm` by default. - SDDM depends on PAM for authorization and XCB to communicate with the X server. - Apart from other things, it also depends on Qt for the user interface and event - loop management. --SDDM can optionally make use of logind (the systemd login manager API) or --upower to enable support for suspend, hibernate etc. -+SDDM can optionally make use of logind (the systemd login manager API), or -+ConsoleKit2, or upower to enable support for suspend, hibernate etc. - In order to build the man pages, you will need `rst2man` installed. It is - provided by the python `docutils` package - -diff --git a/src/daemon/PowerManager.cpp b/src/daemon/PowerManager.cpp -index 3a4d25d..6329032 100644 ---- a/src/daemon/PowerManager.cpp -+++ b/src/daemon/PowerManager.cpp -@@ -59,8 +59,8 @@ namespace SDDM { - - class UPowerBackend : public PowerManagerBackend { - public: -- UPowerBackend() { -- m_interface = new QDBusInterface(UPOWER_SERVICE, UPOWER_PATH, UPOWER_OBJECT, QDBusConnection::systemBus()); -+ UPowerBackend(const QString & service, const QString & path, const QString & interface) { -+ m_interface = new QDBusInterface(service, path, interface, QDBusConnection::systemBus()); - } - - ~UPowerBackend() { -@@ -110,20 +110,24 @@ namespace SDDM { - }; - - /**********************************************/ -- /* LOGIN1 BACKEND */ -+ /* LOGIN1 && ConsoleKit2 BACKEND */ - /**********************************************/ - - #define LOGIN1_SERVICE QStringLiteral("org.freedesktop.login1") - #define LOGIN1_PATH QStringLiteral("/org/freedesktop/login1") - #define LOGIN1_OBJECT QStringLiteral("org.freedesktop.login1.Manager") - -- class Login1Backend : public PowerManagerBackend { -+#define CK2_SERVICE QStringLiteral("org.freedesktop.ConsoleKit") -+#define CK2_PATH QStringLiteral("/org/freedesktop/ConsoleKit/Manager") -+#define CK2_OBJECT QStringLiteral("org.freedesktop.ConsoleKit.Manager") -+ -+ class SeatManagerBackend : public PowerManagerBackend { - public: -- Login1Backend() { -- m_interface = new QDBusInterface(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_OBJECT, QDBusConnection::systemBus()); -+ SeatManagerBackend(const QString & service, const QString & path, const QString & interface) { -+ m_interface = new QDBusInterface(service, path, interface, QDBusConnection::systemBus()); - } - -- ~Login1Backend() { -+ ~SeatManagerBackend() { - delete m_interface; - } - -@@ -194,11 +198,15 @@ namespace SDDM { - - // check if login1 interface exists - if (interface->isServiceRegistered(LOGIN1_SERVICE)) -- m_backends << new Login1Backend(); -+ m_backends << new SeatManagerBackend(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_OBJECT); -+ -+ // check if ConsoleKit2 interface exists -+ if (interface->isServiceRegistered(CK2_SERVICE)) -+ m_backends << new SeatManagerBackend(CK2_SERVICE, CK2_PATH, CK2_OBJECT); - - // check if upower interface exists - if (interface->isServiceRegistered(UPOWER_SERVICE)) -- m_backends << new UPowerBackend(); -+ m_backends << new UPowerBackend(UPOWER_SERVICE, UPOWER_PATH, UPOWER_OBJECT); - } - - PowerManager::~PowerManager() { diff --git a/x11-misc/sddm/files/sddm-0.11.0-upower.patch b/x11-misc/sddm/files/sddm-0.11.0-upower.patch deleted file mode 100644 index 387f106c29bb..000000000000 --- a/x11-misc/sddm/files/sddm-0.11.0-upower.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/daemon/PowerManager.cpp 2015-08-17 00:52:12.786176023 +0200 -+++ b/src/daemon/PowerManager.cpp 2015-08-17 00:53:30.259207476 +0200 -@@ -209,7 +209,7 @@ - #endif // HAVE_CONSOLEKIT2 - - // check if upower interface exists -- if (interface->isServiceRegistered(UPOWER_SERVICE)) -+// if (interface->isServiceRegistered(UPOWER_SERVICE)) - m_backends << new UPowerBackend(UPOWER_SERVICE, UPOWER_PATH, UPOWER_OBJECT); - } - diff --git a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch b/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch new file mode 100644 index 000000000000..67a662186615 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch @@ -0,0 +1,26 @@ +diff -u CMakeLists.txt CMakeLists.txt +--- CMakeLists.txt 2015-09-05 22:40:50.000000000 +0200 ++++ CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200 +@@ -35,22 +35,6 @@ + # Definitions + add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII) + +-# Default build type +-if(NOT CMAKE_BUILD_TYPE) +- set(CMAKE_BUILD_TYPE Release) +-endif() +- +-# Handle build type +-if(CMAKE_BUILD_TYPE MATCHES [Dd]ebug) +- message(STATUS "Debug build") +- add_definitions(-DDEBUG) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0") +-else() +- message(STATUS "Release build") +- add_definitions(-DNDEBUG) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") +-endif() +- + # Default absolute paths + if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR) + set(CMAKE_INSTALL_SYSCONFDIR "/etc") diff --git a/x11-misc/sddm/sddm-0.11.0-r2.ebuild b/x11-misc/sddm/sddm-0.11.0-r2.ebuild deleted file mode 100644 index 5057c94fd70b..000000000000 --- a/x11-misc/sddm/sddm-0.11.0-r2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit cmake-utils toolchain-funcs user - -DESCRIPTION="Simple Desktop Display Manager" -HOMEPAGE="https://github.com/sddm/sddm" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~x86" - -LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain" -SLOT="0" -IUSE="consolekit systemd +upower" -REQUIRED_USE="?? ( upower systemd )" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/linguist-tools:5 - dev-qt/qttest:5 - sys-libs/pam - >=x11-base/xorg-server-1.15.1 - x11-libs/libxcb[xkb(-)] - consolekit? ( >=sys-auth/consolekit-0.9.4 ) - systemd? ( sys-apps/systemd:= ) - upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" -DEPEND="${RDEPEND} - >=sys-devel/gcc-4.7.0 - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-consolekit2.patch" - "${FILESDIR}/${P}-dbus-config.patch" -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then - if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then - die 'The active compiler needs to be gcc 4.7 (or newer)' - fi - fi -} - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/sddm ${PN} -} - -src_prepare() { - cmake-utils_src_prepare - - use consolekit && epatch "${FILESDIR}/${PN}-0.10.0-consolekit.patch" - use upower && epatch "${FILESDIR}/${P}-upower.patch" - - # respect user's cflags - sed -e 's|-Wall -march=native||' \ - -e 's|-O2||' \ - -i CMakeLists.txt || die 'sed failed' -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_no systemd SYSTEMD) - -DDBUS_CONFIG_FILENAME:STRING="org.freedesktop.sddm.conf" - ) - cmake-utils_src_configure -} - -pkg_postinst() { - ewarn "Add the sddm user manually to the video group" - ewarn "if you experience flickering or other rendering issues of sddm-greeter" - ewarn "see https://github.com/gentoo/qt/pull/52" -} diff --git a/x11-misc/sddm/sddm-0.11.0-r1.ebuild b/x11-misc/sddm/sddm-0.11.0-r3.ebuild index 2cab5ed1980c..5c7c96445b93 100644 --- a/x11-misc/sddm/sddm-0.11.0-r1.ebuild +++ b/x11-misc/sddm/sddm-0.11.0-r3.ebuild @@ -12,8 +12,7 @@ KEYWORDS="~amd64 ~arm ~x86" LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain" SLOT="0" -IUSE="consolekit systemd +upower" -REQUIRED_USE="?? ( upower systemd )" +IUSE="consolekit systemd" RDEPEND="sys-libs/pam >=x11-base/xorg-server-1.15.1 @@ -24,21 +23,21 @@ RDEPEND="sys-libs/pam dev-qt/linguist-tools:5 dev-qt/qttest:5 systemd? ( sys-apps/systemd:= ) - upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" + !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" DEPEND="${RDEPEND} - >=sys-devel/gcc-4.7.0 virtual/pkgconfig" pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-version) < 4.7 ]] && \ + if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then + if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then die 'The active compiler needs to be gcc 4.7 (or newer)' + fi fi } src_prepare() { use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch" - use upower && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch" + use !systemd && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch" # fix bug 552318 epatch "${FILESDIR}/${P}-dbus-config.patch" @@ -68,7 +67,7 @@ pkg_postinst() { ewarn "see https://github.com/gentoo/qt/pull/52" } -pkg_setup() { +pkg_postinst() { enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/sddm ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video } diff --git a/x11-misc/sddm/sddm-0.12.0.ebuild b/x11-misc/sddm/sddm-0.12.0.ebuild new file mode 100644 index 000000000000..9eca3ca7ea26 --- /dev/null +++ b/x11-misc/sddm/sddm-0.12.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit cmake-utils user + +DESCRIPTION="Simple Desktop Display Manager" +HOMEPAGE="https://github.com/${PN}/${PN}" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" +KEYWORDS="~amd64 ~x86" + +LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" +SLOT="0" +IUSE="consolekit +pam systemd" + +RDEPEND="dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtdeclarative:5 + dev-qt/qtnetwork:5 + dev-qt/linguist-tools:5 + dev-qt/qttest:5 + >=x11-base/xorg-server-1.15.1 + x11-libs/libxcb[xkb(-)] + consolekit? ( >=sys-auth/consolekit-0.9.4 ) + pam? ( sys-libs/pam ) + systemd? ( sys-apps/systemd:= ) + !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" + +DEPEND="${RDEPEND} + dev-python/docutils + virtual/pkgconfig" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then + if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then + die 'The active compiler needs to be gcc 4.7 (or newer)' + fi + fi +} + +src_prepare() { + cmake-utils_src_prepare + + epatch "${FILESDIR}/${P}-respect-user-flags.patch" + use consolekit && epatch "${FILESDIR}/${PN}-0.11.0-consolekit.patch" +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_no pam PAM) + $(cmake-utils_use_no systemd SYSTEMD) + -DBUILD_MAN_PAGES=ON + -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" + ) + + cmake-utils_src_configure +} + +pkg_postinst() { + enewgroup ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video +} diff --git a/x11-misc/wbar/metadata.xml b/x11-misc/wbar/metadata.xml index a5d082ae569c..2b43af1b2da0 100644 --- a/x11-misc/wbar/metadata.xml +++ b/x11-misc/wbar/metadata.xml @@ -7,5 +7,6 @@ </use> <upstream> <remote-id type="google-code">wbar</remote-id> + <remote-id type="github">rodolf0/wbar</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/xvkbd/xvkbd-3.6.ebuild b/x11-misc/xvkbd/xvkbd-3.6.ebuild index 39089235a439..850129160cc9 100644 --- a/x11-misc/xvkbd/xvkbd-3.6.ebuild +++ b/x11-misc/xvkbd/xvkbd-3.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://homepage3.nifty.com/tsato/xvkbd/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc ~x86" RDEPEND=" x11-libs/libX11 |