From ff5dd7b3704b9e8f9f606d4929f95694ec84ddf3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 11 Aug 2016 00:33:31 +0100 Subject: cleanup --- x11-misc/mdm/Manifest | 2 - x11-misc/mdm/mdm-2.0.5.ebuild | 124 --------------------- x11-misc/notify-osd-customizable/Manifest | 1 - .../notify-osd-customizable-0.9.35.ebuild | 69 ------------ x11-misc/sddm/Manifest | 1 - x11-misc/sddm/files/sddm-0.10.0-consolekit.patch | 13 --- x11-misc/sddm/files/sddm-0.10.0-upower.patch | 12 -- x11-misc/sddm/files/sddm-0.11.0-consolekit.patch | 11 -- x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch | 46 -------- x11-misc/sddm/files/systemd_service.patch | 20 ---- x11-misc/sddm/sddm-0.11.0-r1.ebuild | 78 ------------- 11 files changed, 377 deletions(-) delete mode 100644 x11-misc/mdm/Manifest delete mode 100644 x11-misc/mdm/mdm-2.0.5.ebuild delete mode 100644 x11-misc/notify-osd-customizable/Manifest delete mode 100644 x11-misc/notify-osd-customizable/notify-osd-customizable-0.9.35.ebuild delete mode 100644 x11-misc/sddm/Manifest delete mode 100644 x11-misc/sddm/files/sddm-0.10.0-consolekit.patch delete mode 100644 x11-misc/sddm/files/sddm-0.10.0-upower.patch delete mode 100644 x11-misc/sddm/files/sddm-0.11.0-consolekit.patch delete mode 100644 x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch delete mode 100644 x11-misc/sddm/files/systemd_service.patch delete mode 100644 x11-misc/sddm/sddm-0.11.0-r1.ebuild (limited to 'x11-misc') diff --git a/x11-misc/mdm/Manifest b/x11-misc/mdm/Manifest deleted file mode 100644 index d93c295e..00000000 --- a/x11-misc/mdm/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gdm-2.8-gentoo-files-r2.tar.bz2 3101 SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e SHA512 785873f5ae702d3a49d51467f94cad77763f9379e9e2039b5229e9835410b11e517e2c490d73a1fd7237ceed4375964f6c21c20645d7f285fb1bf8543b9be85c WHIRLPOOL 869bede81425e6d23351d3b8c06a4ae2c9e9c27e01cf81213120c23b5b3ff21c76abbc83e2c74d46cf0b3468642c7bdedffb836e242d7126d5c2079edf0e88fc -DIST mdm-2.0.5.tar.gz 4307688 SHA256 e8936b772504895a5b9406ca7e23023be35c79040247d2181b8f0034808d551f SHA512 0e11e056553d1f6207834fd750324846614a00ad425b940399baf98f438611d145aa801325724010c0a3d0f1032b8ed8516d4aee76d4f37946b792fdb5f41827 WHIRLPOOL 1bbf3c30ab4ac552b993baeaa33f04742c5ede0d2a9dae6d5073562a26b56c2559ab98c52c62615e8dfb46761de11ec2a0fad84a57e2043bdecde2a6a475d378 diff --git a/x11-misc/mdm/mdm-2.0.5.ebuild b/x11-misc/mdm/mdm-2.0.5.ebuild deleted file mode 100644 index 8b5c1c74..00000000 --- a/x11-misc/mdm/mdm-2.0.5.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -EAPI=5 - -inherit autotools eutils libtool gnome2 pam user -DESCRIPTION="Mate Display Manager" -HOMEPAGE="http://mate-desktop.org" -LICENSE="GPL-2 LGPL-2" -SLOT=0 -KEYWORDS="~amd64 ~x86" -GDM_EXTRA="gdm-2.8-gentoo-files-r2" -SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - http://mirror.yandex.ru/gentoo-distfiles/distfiles/${GDM_EXTRA}.tar.bz2" -IUSE="accessibility afs elibc_glibc remote gnome-keyring ipv6 xinerama pam tcpd dmx selinux +consolekit" - - -RDEPEND=" - dev-libs/glib:2 - x11-libs/gtk+:2 - >=x11-libs/pango-1.36.8 - x11-libs/gdk-pixbuf - gnome-base/libglade:2.0 - gnome-base/libgnomecanvas - gnome-base/librsvg:2 - dev-libs/libxml2:2 - media-libs/libart_lgpl - net-libs/webkit-gtk:2 - x11-libs/gksu - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXext - x11-apps/sessreg - x11-libs/libXdmcp - xinerama? ( x11-libs/libXinerama x11-proto/xineramaproto ) - consolekit? ( - sys-auth/consolekit - dev-libs/dbus-glib ) - accessibility? ( x11-libs/libXevie ) - afs? ( net-fs/openafs sys-libs/lwp ) - dmx? ( x11-libs/libdmx ) - gnome-keyring? ( gnome-base/gnome-keyring[pam] ) - pam? ( virtual/pam ) - !pam? ( elibc_glibc? ( sys-apps/shadow ) ) - remote? ( gnome-extra/zenity ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - >=x11-misc/xdg-utils-1.0.2-r3 -" - -DEPEND="${RDEPEND} - dmx? ( x11-proto/dmxproto ) - app-text/docbook-xml-dtd:4.1.2 - sys-devel/gettext - x11-proto/inputproto - >=dev-util/intltool-0.35 - virtual/pkgconfig - >=app-text/scrollkeeper-0.1.4 - >=app-text/gnome-doc-utils-0.3.2" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README TODO" - G2CONF="${G2CONF} - --with-prefetch - --sysconfdir=/etc/X11 - --localstatedir=/var - --with-pam-prefix=/etc - --disable-static - $(use_enable ipv6) - $(use_enable remote secureremote) - $(use_with accessibility xevie) - $(use_with consolekit console-kit) - $(use_with dmx) - $(use_with selinux) - $(use_with tcpd tcp-wrappers) - $(use_with xinerama)" - - if use pam; then - G2CONF="${G2CONF} --enable-authentication-scheme=pam" - else - G2CONF="${G2CONF} --enable-console-helper=no" - if use elibc_glibc ; then - G2CONF="${G2CONF} --enable-authentication-scheme=shadow" - else - G2CONF="${G2CONF} --enable-authentication-scheme=crypt" - fi - fi - - enewgroup mdm - enewuser mdm -1 -1 /var/lib/mdm mdm -} - -src_prepare() { - eautoreconf - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - - local gentoodir="${WORKDIR}/${GDM_EXTRA}" - - # install XDG_DATA_DIRS mdm changes - echo 'XDG_DATA_DIRS="/usr/share/mdm"' > 99xdg-mdm - doenvd 99xdg-mdm - - - # avoid file collision, bug #213118 - rm -f "${D}/usr/share/xsessions/gnome.desktop" - - # We replace the pam stuff by our own - rm -rf "${D}/etc/pam.d" - - if use pam ; then - use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* - - mv "${gentoodir}"/pam.d/{g,m}dm - mv "${gentoodir}"/pam.d/{g,m}dmsetup - mv "${gentoodir}"/pam.d/{g,m}dm-autologin - dopamd "${gentoodir}"/pam.d/* - sed s/gdmsetup/mdmsetup/ "${gentoodir}/security/console.apps/gdmsetup" > "${gentoodir}/security/console.apps/mdmsetup" - dopamsecurity console.apps "${gentoodir}/security/console.apps/mdmsetup" - fi - -} diff --git a/x11-misc/notify-osd-customizable/Manifest b/x11-misc/notify-osd-customizable/Manifest deleted file mode 100644 index a69bfc4f..00000000 --- a/x11-misc/notify-osd-customizable/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST notify-osd_0.9.35+13.10.20130917.1-0ubuntu1-leolik~ppa0.tar.gz 281904 SHA256 66c7b1eeb54c923a3f574486aab6e5ac8fd0a7a6d027f2a8d84e80589ef44f56 SHA512 26f582a5df3dde0d5cfa2ffb60be2afbe69a5e484045efb9c839cca73b9d7cd77bee65bf1b897097ef386a6eaa7462f5e9d0692e3aef60ddae3321bf018452ff WHIRLPOOL e201db6de65e76ce58774a33f1ea5e0e9cb9d7ccea324036965b332b0726d815226be141cf87460fcc1a3957319ee63d8a827c3c9e018a18b9a62d90af9335c0 diff --git a/x11-misc/notify-osd-customizable/notify-osd-customizable-0.9.35.ebuild b/x11-misc/notify-osd-customizable/notify-osd-customizable-0.9.35.ebuild deleted file mode 100644 index 68e6888a..00000000 --- a/x11-misc/notify-osd-customizable/notify-osd-customizable-0.9.35.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -inherit autotools gnome2-utils multilib savedconfig - -P_N="notify-osd" -P_V="13.10.20130917.1" - - -DESCRIPTION="Canonical's on-screen-display notification agent, with leolik patch added (customizable)." -HOMEPAGE="https://launchpad.net/~leolik/+archive/leolik" -SRC_URI="https://launchpad.net/~leolik/+archive/leolik/+files/${P_N}_${PV}+${P_V}-0ubuntu1-leolik~ppa0.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+minimal" - -COMMON_DEPEND=">=dev-libs/dbus-glib-0.98 - >=dev-libs/glib-2.16 - >=x11-libs/gtk+-3.2:3 - >=x11-libs/libnotify-0.7 - >=x11-libs/libwnck-3 - x11-libs/libX11 - x11-libs/pixman - !x11-misc/notify-osd - !x11-misc/notification-daemon - !x11-misc/qtnotifydaemon" -RDEPEND="${COMMON_DEPEND} - !minimal? ( x11-themes/notify-osd-icons )" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - gnome-base/gnome-common - x11-proto/xproto" - -RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules - -DOCS=( AUTHORS ChangeLog NEWS README TODO ) - -S=${WORKDIR}/${P_N}-${PV}+${P_V} - -src_prepare() { - sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die - restore_config src/{bubble,defaults,dnd}.c #428134 - eautoreconf -} - -src_configure() { - econf --libexecdir=/usr/$(get_libdir)/${P_N} -} - -src_install() { - default - rm -f "${ED}"/usr/share/${P_N}/icons/*/*/*/README -} - -pkg_preinst() { - gnome2_icon_savelist - gnome2_schemas_savelist -} -pkg_postinst() { - gnome2_icon_cache_update - gnome2_schemas_update -} -pkg_postrm() { - gnome2_icon_cache_update - gnome2_schemas_update -} diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest deleted file mode 100644 index ffdf15a4..00000000 --- a/x11-misc/sddm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sddm-0.11.0.tar.gz 4735807 SHA256 80d53f075c275f744bd547523d6d640baccfacb4e463a71ec0facb8231b832ce SHA512 9dd2b80788e3cfdb353e64f709db451e04828991976b8b0f74c0e97dbf467fa2744702c73e5e50137eec10dac92df7dacd83fb458f75dd595556fc95fb1759f7 WHIRLPOOL 079c5093374710c2a3247a3e27dd26f3d10962c7cb8f260b80a4ba17a72e63676012d4b8e50f8f4bffc43124efdf05c7e14aefe86253b391345c7fa98a2d4c2f 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 acdfdc1a..00000000 --- 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.10.0-upower.patch b/x11-misc/sddm/files/sddm-0.10.0-upower.patch deleted file mode 100644 index 8c0f34c2..00000000 --- a/x11-misc/sddm/files/sddm-0.10.0-upower.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r sddm-0.9.0.orig/src/daemon/PowerManager.cpp sddm-0.9.0/src/daemon/PowerManager.cpp ---- sddm-0.9.0.orig/src/daemon/PowerManager.cpp 2014-10-01 18:40:37.402683578 +0200 -+++ sddm-0.9.0/src/daemon/PowerManager.cpp 2014-10-01 18:40:43.502618164 +0200 -@@ -197,7 +197,7 @@ - m_backends << new Login1Backend(); - - // check if upower interface exists -- if (interface->isServiceRegistered(UPOWER_SERVICE)) -+// if (interface->isServiceRegistered(UPOWER_SERVICE)) - m_backends << new UPowerBackend(); - } - diff --git a/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch deleted file mode 100644 index 4871bee0..00000000 --- a/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- data/scripts/Xsession.old 2015-01-08 12:58:24.448241484 +0100 -+++ data/scripts/Xsession 2015-01-08 13:00:07.794244087 +0100 -@@ -93,7 +93,7 @@ - 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-dbus-config.patch b/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch deleted file mode 100644 index c13c2bd7..00000000 --- a/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4ab6ab1b78617c51a6d9db4d03be2b3d75e7acc5 Mon Sep 17 00:00:00 2001 -From: Harald Sitter -Date: Tue, 14 Apr 2015 10:50:00 +0200 -Subject: [PATCH] allow changing the dbus config file name - -on some distributions the generic name of the dbus config might be provided -by more than one display manager, so always installing with the generic -name would require distributions to hard-patch the cmake code. -allowing to change it through a cmake cache variable enables distributions -to simply parameterize in their cmake call. - -this for example affects Ubuntu where the config would be provided by both -SDDM and LightDM. ---- - CMakeLists.txt | 1 + - data/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7ceed6e..cf21dc9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -141,6 +141,7 @@ set(SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsession" - - set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file") - set(LOG_FILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log" CACHE PATH "Path of the sddm log file") -+set(DBUS_CONFIG_FILENAME "org.freedesktop.DisplayManager.conf" CACHE STRING "Name of the sddm config file") - set(COMPONENTS_TRANSLATION_DIR "${DATA_INSTALL_DIR}/translations" CACHE PATH "Components translations directory") - - # Add subdirectories -diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index 918892f..335f4e7 100644 ---- a/data/CMakeLists.txt -+++ b/data/CMakeLists.txt -@@ -1,7 +1,7 @@ - install(DIRECTORY "faces" DESTINATION "${DATA_INSTALL_DIR}") - install(DIRECTORY "flags" DESTINATION "${DATA_INSTALL_DIR}") - --install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}") -+install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}" RENAME ${DBUS_CONFIG_FILENAME}) - - install(FILES "scripts/Xsession" "scripts/Xsetup" "scripts/Xstop" DESTINATION "${DATA_INSTALL_DIR}/scripts" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE --- -2.3.6 - diff --git a/x11-misc/sddm/files/systemd_service.patch b/x11-misc/sddm/files/systemd_service.patch deleted file mode 100644 index 7fc9e3f5..00000000 --- a/x11-misc/sddm/files/systemd_service.patch +++ /dev/null @@ -1,20 +0,0 @@ -mudler ---- services/~sddm.service.in 2015-08-31 16:11:52.267460238 +0200 -+++ services/sddm.service.in 2015-08-31 16:12:22.497417043 +0200 -@@ -1,13 +1,14 @@ - [Unit] - Description=Simple Desktop Display Manager - Documentation=man:sddm(1) man:sddm.conf(5) --Conflicts=getty@tty1.service --After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service -+After=systemd-user-sessions.service - - [Service] - ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm - Restart=always - #PrivateTmp=yes -+StandardOutput=syslog -+BusName=org.freedesktop.DisplayManager - - [Install] - Alias=display-manager.service diff --git a/x11-misc/sddm/sddm-0.11.0-r1.ebuild b/x11-misc/sddm/sddm-0.11.0-r1.ebuild deleted file mode 100644 index 77bba60b..00000000 --- a/x11-misc/sddm/sddm-0.11.0-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.11.0-r1.ebuild,v 1.1 2015/06/28 13:52:08 jauhien Exp $ - -EAPI=5 -inherit cmake-utils toolchain-funcs user - -DESCRIPTION="Simple Desktop Display Manager" -HOMEPAGE="https://github.com/sddm/sddm" -SRC_URI="http://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="sys-libs/pam - >=x11-base/xorg-server-1.15.1 - x11-libs/libxcb[xkb(-)] - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/linguist-tools:5 - dev-qt/qttest:5 - systemd? ( sys-apps/systemd:= ) - upower? ( || ( 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 ]] && \ - die 'The active compiler needs to be gcc 4.7 (or newer)' - fi -} - -src_prepare() { - use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch" - use upower && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch" - - # Sabayon, fixes autologin due to kogaion-live - use systemd && epatch "${FILESDIR}/systemd_service.patch" - - # fix bug 552318 - epatch "${FILESDIR}/${P}-dbus-config.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() { - if use consolekit; then - ewarn "This display manager doesn't have native built-in ConsoleKit support." - ewarn "In order to use ConsoleKit pam module with this display manager," - ewarn "you should remove the \"nox11\" parameter from pm_ck_connector.so" - ewarn "line in /etc/pam.d/system-login" - fi - 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" -} - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/sddm ${PN} -} -- cgit v1.2.3