diff options
Diffstat (limited to 'x11-misc/slim')
-rw-r--r-- | x11-misc/slim/Manifest | 10 | ||||
-rw-r--r-- | x11-misc/slim/files/slim-1.3.9-config.diff | 49 | ||||
-rw-r--r-- | x11-misc/slim/files/slim-1.3.9-greeter-session.diff | 12 | ||||
-rw-r--r-- | x11-misc/slim/files/slim-1.4.0-config.diff | 48 | ||||
-rw-r--r-- | x11-misc/slim/metadata.xml | 11 | ||||
-rw-r--r-- | x11-misc/slim/slim-1.3.9.ebuild | 98 | ||||
-rw-r--r-- | x11-misc/slim/slim-1.4.0.ebuild | 104 | ||||
-rw-r--r-- | x11-misc/slim/slim-9999.ebuild | 104 |
8 files changed, 433 insertions, 3 deletions
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest index 4c512627a587..6b73796d3028 100644 --- a/x11-misc/slim/Manifest +++ b/x11-misc/slim/Manifest @@ -13,7 +13,15 @@ AUX slim-1.3.6-libslim-cmake-fixes.patch 852 BLAKE2B d4879e855e0cb0e1b2409890ed4 AUX slim-1.3.6-session-chooser.patch 3994 BLAKE2B 48990db75196e9da4022af1ecf8ae509453d2e001d44327eb89fbb4513d661ac3b3bbbdbe8e85ca34dabbf179d84076b584401cb777c28beef1860f28425f0c8 SHA512 7227fa0210d7870971870409da2d86d9f239ae285dde116e2b2d817318339fb51324bd11d04dc4c26a2ca3c1e5a0f0686987eab7042265389fb2f60cc7d37a45 AUX slim-1.3.6-strip-systemd-unit-install.patch 474 BLAKE2B 77f06c1f31801a56289b699f4e801ee169543c0407a79c6d7d73aa83053fdb70f74dbd962654b93081c6af680d800c9ede45cbf7116bc66ef540f216154a3f06 SHA512 990723e37a3adcec5a43a6b9bf5196d580121f8af9a6db533a3eb1c4d38269150fb01f0efd8d8e57c85b4662a573195347bdd95259059052b70f22c4b3164f9f AUX slim-1.3.6-systemd-session.patch 820 BLAKE2B 39345e96a1dc2cfc7a94b874d5be4bc099377aada324056bb8be073bb1c5245bbdd8b265b37b286a0fd1863fbc1de1ffd37b1001f468a1df3d49ac33c0f544de SHA512 df653a31bd2b0d3bb5b09d700d89d6b4c444b3ef49dc6d5a0646cab5480841a76ecb1c3bcd45b602eb0d2000971a5ef576eac63de67907769ea23b6925329635 +AUX slim-1.3.9-config.diff 1728 BLAKE2B 6fcf8821bc57e3600596cd2a7d0db18c06f691db8a708ffed7e59bedaa974550dcf337cb19193e991e3d4473a3c65028a9f71aad95b02b41f83f5dd95a0265e0 SHA512 815ef6979c19d08d593903d8accd3a7d97c78e0651eb5b7f183a9b88cd43f68f0a4e1c17a3fe0c28550de60e94024e5d1144df01a340d6be1cea6b7de7fe6375 +AUX slim-1.3.9-greeter-session.diff 430 BLAKE2B 43f2875f45f97a2c71203ce7ad1e3b571e4a73ac5c67a2aa910398133f520d2b74ed2ec2f41b7829549ad56436d1a93199ddf2a7a9fe1e6cfb8d88818351305a SHA512 dba4f83e7771877cd5f116ea348f6ab9f3933a772da96ac7861ac55727d1e5a3017c0e039830dacc52eee191047e6403776ef450555cb614c3c1d902efd82d21 +AUX slim-1.4.0-config.diff 1843 BLAKE2B 6b942f49ccdac70a60b5f7111ca41fda4df48f29916fa54aa55cb0b5cdd20fcd98156986786338a12462c7f3c91fa042ba0659af646aba3f4b33011e0c34cc39 SHA512 e8ce676df78341ba8b14236ceeb4982449377bbaec14dd8125431f891ba7bf662389f1606e1debb26d001b6d17d6a4099058d4ed0bcf8ec90a635d4f00e14ba4 AUX slim.logrotate 102 BLAKE2B 8b41d56746b9889ee7f13f3cef08f80532c0c58505061ce09262aa629af5ec77dc35278ce979c717cd53f6ba586c529201e0dca47a28044231bf2d0b9cd8f317 SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2 DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c +DIST slim-1.3.9.tar.gz 239609 BLAKE2B 41eec388b0d63bc720cb51f93707f69c4765800f4e69654fe5ebdcb280eb25775c7ed951163943b6f58884b0a9fb628e049d68a2faa7516b1f884adb080953c6 SHA512 607366a402479381858f8193db9b4da0a40eda15f4868cad9e7313b4a084390cf3cee80958f58a56d3e4383cf2fa9069960d1b20861068f921bd9ba89da7aec1 +DIST slim-1.4.0.tar.gz 530318 BLAKE2B 507f22d09a3449b870bb5fd5a5f0ab1002ceee5372c82f702582809a5fc442088c17d79fedff6712e198cee672696388479604a194e5729c7bc12139770c833d SHA512 2ef38d39e2d5186f9342161d99740b0c8cd87f234deaf550ca1528c9a61c052d26123c7da26f4a0a5e658d01cb200b115cf7879d349ed51a6e8c729ee3fdf77f EBUILD slim-1.3.6-r5.ebuild 3739 BLAKE2B 4a1023452cf9aa2a3153c2200410ff92f13406901b31ef79a16ff3dd82175b4d7923dc1cfb9f846e51b9491b809d8b1dcf5fcf29f6f950e90506483c24120dbb SHA512 a9efc164ce7eae9650d7e9e68295735a261e2939f630d2bfbd12da809047aff13fd0efb8524832bba0ee53c8680f30e8abde4fe9170aa17adba15ca186daa186 -MISC metadata.xml 250 BLAKE2B 2935a19b57a99bf0913dd1aab24f97ae93e0af3115c02452965a06089e95c707dd9561f3d0e20b49e636591ba33fdad5a31116e31e6b019413af5a097868cc00 SHA512 8eb455286381c902517d2c15522e01da58c3b254accc607ad91c92a27bc47f7f58b250ad6b969f9f7d0da0e35b64d84673498b889d815c39fefe3c429e9078c2 +EBUILD slim-1.3.9.ebuild 2151 BLAKE2B 688bf4bf867538b546d3b1184b9470b374c65c9c99767b54e52108bc53f9874636160b685ecce9ee9d796f9d3fda8793cefec151de4b5941dba6685646327b48 SHA512 7973d0662790cb436a60092886d5a6c6ee35a839296541617c359c9b5aed6bf729cdd686df20209aed117988b44db349ded9f691fab819f5f3b0fbc24626cb14 +EBUILD slim-1.4.0.ebuild 2275 BLAKE2B 1f5d8c3376d3a880c5e40dad90bc09e03b9696b7a94f91f9df99417abe0ee1233a731a7ad6a731fcf0cc051fe731337429f635f664749a39ba7e1755d262e995 SHA512 0f454ae2c86badeb4226112b35fd7886cd7428531368ae2cd4690a1296a9597394608ce6e570229112f513ec5fdd6090b1224a56fec571c4354497d76e6b4184 +EBUILD slim-9999.ebuild 2275 BLAKE2B 1f5d8c3376d3a880c5e40dad90bc09e03b9696b7a94f91f9df99417abe0ee1233a731a7ad6a731fcf0cc051fe731337429f635f664749a39ba7e1755d262e995 SHA512 0f454ae2c86badeb4226112b35fd7886cd7428531368ae2cd4690a1296a9597394608ce6e570229112f513ec5fdd6090b1224a56fec571c4354497d76e6b4184 +MISC metadata.xml 484 BLAKE2B 6a3b8faccbbc036860cb1edde84558decd7fa4ec73410ce02f0376b039211b275ff073788801ae08e34a8235477b5c70ec409e3d2ded25154154ac3d35c4722d SHA512 1185115679245eab9f80d76c4700580e52b5a1d2c68f56d6704bfd908664991fb9f82c0098020dcc2a7ac75bd0d52f2afe3b393a731832d37947d4416899b119 diff --git a/x11-misc/slim/files/slim-1.3.9-config.diff b/x11-misc/slim/files/slim-1.3.9-config.diff new file mode 100644 index 000000000000..da7e69f2eccd --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.9-config.diff @@ -0,0 +1,49 @@ +Customize the configuration file to suit Gentoo practice +=================================================================== +--- a/slim.conf ++++ b/slim.conf +@@ -21,7 +21,7 @@ + + # Activate numlock when slim starts. Valid values: on|off + # Default is to not change it +-# numlock on ++numlock on + + # Hide the mouse cursor (note: does not work with some WMs). + # Valid values: true|false +@@ -36,7 +36,8 @@ + # to adjust the command according to your preferred shell, + # i.e. for freebsd use: + # login_cmd exec /bin/sh - ~/.xinitrc %session +-login_cmd exec /bin/bash -login ~/.xinitrc %session ++# login_cmd exec /bin/bash -login ~/.xinitrc %session ++login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session + + # Commands executed when starting and exiting a session. + # They can be used for registering a X11 session with +@@ -66,12 +67,12 @@ + # %session is the Exec= value -- note that this may provide a full + # path to the session executable! +-#sessiondir /usr/share/xsessions ++sessiondir /usr/share/xsessions + + +-# Executed when pressing F11 (requires imagemagick) ++# Executed when pressing F11 (requires media-gfx/imagemagick for import) + screenshot_cmd import -window root /slim.png +-# Alternative using scrot. ++# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info. + #screenshot_cmd scrot /root/slim.png + + # welcome message. Available variables: %host, %domain + welcome_msg Welcome to %host +@@ -111,8 +111,8 @@ + # randomly choose from + current_theme default + +-# Lock file ++# Lock file, /etc/init.d/xdm expects slim.pid + lockfile /run/slim.pid + + # Log file + logfile /var/log/slim.log diff --git a/x11-misc/slim/files/slim-1.3.9-greeter-session.diff b/x11-misc/slim/files/slim-1.3.9-greeter-session.diff new file mode 100644 index 000000000000..c9e5e256850a --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.9-greeter-session.diff @@ -0,0 +1,12 @@ +Fix bug #727544 by telling elogind that we're a greeter +=================================================================== +--- a/app.cpp ++++ b/app.cpp +@@ -290,6 +290,7 @@ + pam.start("slim"); + pam.set_item(PAM::Authenticator::TTY, DisplayName); + pam.set_item(PAM::Authenticator::Requestor, "root"); ++ pam.setenv("XDG_SESSION_CLASS", "greeter"); + } + catch(PAM::Exception& e){ + logStream << APPNAME << ": " << e << endl; diff --git a/x11-misc/slim/files/slim-1.4.0-config.diff b/x11-misc/slim/files/slim-1.4.0-config.diff new file mode 100644 index 000000000000..1a92a66a6f43 --- /dev/null +++ b/x11-misc/slim/files/slim-1.4.0-config.diff @@ -0,0 +1,48 @@ +Index: slim-fork-code/slim.conf +Customize the configuration file to suit Gentoo practice +=================================================================== +--- a/slim.conf (revision 54) ++++ b/slim.conf (working copy) +@@ -21,7 +21,7 @@ + + # Activate numlock when slim starts. Valid values: on|off + # Default is to not change it +-#numlock on ++numlock on + + # Hide the mouse cursor (note: does not work with some WMs). + # Valid values: true|false +@@ -35,7 +35,8 @@ + # NOTE: if your system does not have bash you need to adjust the command + # according to your preferred shell, e.g. for freebsd use: + # login_cmd exec /bin/sh - ~/.xinitrc %session +-login_cmd exec /bin/bash -login ~/.xinitrc %session ++#login_cmd exec /bin/bash -login ~/.xinitrc %session ++login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session + + # Commands executed when starting and exiting a session. + # They can be used for registering a X11 session with +@@ -65,11 +66,12 @@ + # %session is the Exec= value -- note that this may provide a full + # path to the session executable! + #sessiondir /usr/share/xsessions ++sessiondir /etc/X11/Sessions + + +-# Executed when pressing F11 (requires imagemagick) ++# Executed when pressing F11 (requires media-gfx/imagemagick for import) + screenshot_cmd import -window root /slim.png +-# Alternative using scrot. ++# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info. + #screenshot_cmd scrot /root/slim.png + + # Delay after failed authentication before allowing another attempt +@@ -102,7 +104,7 @@ + # randomly choose from + current_theme default + +-# Lock file ++# Lock file, /etc/init.d/xdm expects slim.pid + lockfile /run/slim.pid + + # Log file - full path for a file, or just stderr (or /dev/stderr) to send diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml index d371e5ad92eb..1505068a165e 100644 --- a/x11-misc/slim/metadata.xml +++ b/x11-misc/slim/metadata.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>bugs.gentoo@flitspace.org.uk</email> + <name>Robert Pearce</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> - <remote-id type="sourceforge">slim.berlios</remote-id> + <remote-id type="sourceforge">slim-fork</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/slim/slim-1.3.9.ebuild b/x11-misc/slim/slim-1.3.9.ebuild new file mode 100644 index 000000000000..e4a798f76287 --- /dev/null +++ b/x11-misc/slim/slim-1.3.9.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake pam readme.gentoo-r1 systemd + +DESCRIPTION="Simple Login Manager resurrected" +HOMEPAGE="https://slim-fork.sourceforge.io/" +SRC_URI="mirror://sourceforge/project/${PN}-fork/${P}.tar.gz" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + +LICENSE="GPL-2" +SLOT="0" +IUSE="branding pam" + +RDEPEND="media-libs/libjpeg-turbo:= + media-libs/libpng:0= + x11-apps/sessreg + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXrandr + pam? ( + sys-libs/pam + x11-libs/libXext + )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" +PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" + +PATCHES=( + # Our Gentoo-specific config changes + "${FILESDIR}"/${P}-config.diff + "${FILESDIR}"/${P}-greeter-session.diff +) + +DISABLE_AUTOFORMATTING=1 +DOC_CONTENTS=" +The configuration file is located at /etc/slim.conf. + +If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" +in /etc/conf.d/display-manager and run + + # rc-update add display-manager default. + +See also https://wiki.gentoo.org/wiki/SLiM +" + +src_prepare() { + cmake_src_prepare + + if use branding; then + sed -i -e '/current_theme/s/default/slim-gentoo-simple/' slim.conf || die + fi +} + +src_configure() { + local mycmakeargs=( + -DUSE_PAM=$(usex pam) + -DUSE_CONSOLEKIT=OFF + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use pam ; then + pamd_mimic system-local-login slim auth account session + pamd_mimic system-local-login slimlock auth + fi + + systemd_dounit slim.service + + insinto /usr/share/slim + newins "${FILESDIR}/Xsession-r3" Xsession + + insinto /etc/logrotate.d + newins "${FILESDIR}/slim.logrotate" slim + + dodoc xinitrc.sample ChangeLog README TODO THEMES + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + if ! use pam; then + elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to" + elog "the console when restarting your window manager. If this is not desired, then" + elog "please remerge ${PN} with USE=\"pam\"" + elog + fi +} diff --git a/x11-misc/slim/slim-1.4.0.ebuild b/x11-misc/slim/slim-1.4.0.ebuild new file mode 100644 index 000000000000..a48f2bde4254 --- /dev/null +++ b/x11-misc/slim/slim-1.4.0.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake pam readme.gentoo-r1 systemd + +if [[ ${PV} == "9999" ]] ; then + ESVN_REPO_URI="https://svn.code.sf.net/p/slim-fork/code/trunk" + inherit subversion +else + SRC_URI="mirror://sourceforge/project/${PN}-fork/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +DESCRIPTION="Simple Login Manager resurrected" +HOMEPAGE="https://slim-fork.sourceforge.io/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="branding pam" + +RDEPEND="media-libs/libjpeg-turbo:= + media-libs/libpng:0= + x11-apps/sessreg + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXrandr + pam? ( + sys-libs/pam + x11-libs/libXext + )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" +PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" + +PATCHES=( + # Our Gentoo-specific config changes + "${FILESDIR}"/${PN}-1.4.0-config.diff +) + +DISABLE_AUTOFORMATTING=1 +DOC_CONTENTS=" +The configuration file is located at /etc/slim.conf. + +If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" +in /etc/conf.d/display-manager and run + + # rc-update add display-manager default. + +See also https://wiki.gentoo.org/wiki/SLiM +" + +src_prepare() { + cmake_src_prepare + + if use branding; then + sed -i -e '/current_theme/s/default/slim-gentoo-simple/' slim.conf || die + fi +} + +src_configure() { + local mycmakeargs=( + -DUSE_PAM=$(usex pam) + -DUSE_CONSOLEKIT=OFF + -DBUILD_SLIMLOCK=$(usex pam) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use pam ; then + pamd_mimic system-local-login slim auth account session + pamd_mimic system-local-login slimlock auth + fi + + systemd_dounit slim.service + + insinto /usr/share/slim + newins "${FILESDIR}/Xsession-r3" Xsession + + insinto /etc/logrotate.d + newins "${FILESDIR}/slim.logrotate" slim + + dodoc xinitrc.sample ChangeLog README TODO THEMES + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + if ! use pam; then + elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to" + elog "the console when restarting your window manager. If this is not desired, then" + elog "please remerge ${PN} with USE=\"pam\"" + elog + fi +} diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild new file mode 100644 index 000000000000..a48f2bde4254 --- /dev/null +++ b/x11-misc/slim/slim-9999.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake pam readme.gentoo-r1 systemd + +if [[ ${PV} == "9999" ]] ; then + ESVN_REPO_URI="https://svn.code.sf.net/p/slim-fork/code/trunk" + inherit subversion +else + SRC_URI="mirror://sourceforge/project/${PN}-fork/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +DESCRIPTION="Simple Login Manager resurrected" +HOMEPAGE="https://slim-fork.sourceforge.io/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="branding pam" + +RDEPEND="media-libs/libjpeg-turbo:= + media-libs/libpng:0= + x11-apps/sessreg + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXrandr + pam? ( + sys-libs/pam + x11-libs/libXext + )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" +PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" + +PATCHES=( + # Our Gentoo-specific config changes + "${FILESDIR}"/${PN}-1.4.0-config.diff +) + +DISABLE_AUTOFORMATTING=1 +DOC_CONTENTS=" +The configuration file is located at /etc/slim.conf. + +If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" +in /etc/conf.d/display-manager and run + + # rc-update add display-manager default. + +See also https://wiki.gentoo.org/wiki/SLiM +" + +src_prepare() { + cmake_src_prepare + + if use branding; then + sed -i -e '/current_theme/s/default/slim-gentoo-simple/' slim.conf || die + fi +} + +src_configure() { + local mycmakeargs=( + -DUSE_PAM=$(usex pam) + -DUSE_CONSOLEKIT=OFF + -DBUILD_SLIMLOCK=$(usex pam) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use pam ; then + pamd_mimic system-local-login slim auth account session + pamd_mimic system-local-login slimlock auth + fi + + systemd_dounit slim.service + + insinto /usr/share/slim + newins "${FILESDIR}/Xsession-r3" Xsession + + insinto /etc/logrotate.d + newins "${FILESDIR}/slim.logrotate" slim + + dodoc xinitrc.sample ChangeLog README TODO THEMES + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + if ! use pam; then + elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to" + elog "the console when restarting your window manager. If this is not desired, then" + elog "please remerge ${PN} with USE=\"pam\"" + elog + fi +} |