diff options
| -rw-r--r-- | x11-misc/xscreensaver/Manifest | 1 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild (renamed from x11-misc/xscreensaver/xscreensaver-6.07.ebuild) | 16 |
2 files changed, 13 insertions, 4 deletions
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index a615956c98d6..86c43483d88b 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1,4 +1,5 @@ DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3 DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B 48c2766ff5879b77f521d17f08452c84a9c926fabba932a02d02615808f6f2503ed2be4bbfd71f21152ba833c7f4cc0d672cdc219b82729963d6d357c6198682 SHA512 fd9848843c43a5eb07007e5cca21ad1517cce1e3ebecd9d678bb6287b9b7f80eee0751b5789f2ed9fb5e0cefa2430ac9d9657aade724d70c6457cce3df1f6ea3 DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1 SHA512 988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5 +DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834 BLAKE2B 57c509e370ba79c4197a2a51188e09c2a48cc172f889c8876c0fb1af995b87465ddc390b3e704cb572c29c1537f3d05b065365d6357c51047c910124b7c8f6c4 SHA512 6e7dcfbe0e687719f3f5579790a48544bb8728231cd7ac1c8b82f5814da0be1e67f2308de7f0354a2ba20ac098c2d5ae8c212b9a3a7b84177bc4bb10739378c3 DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221 SHA512 abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5 diff --git a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild index 3865df2da794..29fc6c4aacc4 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild @@ -13,6 +13,10 @@ SRC_URI=" https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch -> ${PN}-6.06-logind-idle-hint.patch ) + systemd? ( + https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch -> + ${PN}-6.07-xscreensaver.service-start-with-no-splash.patch + ) " # Font license mapping for folder ./hacks/fonts/ as following: @@ -111,10 +115,14 @@ src_prepare() { sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die - # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver." - # after "systemctl --user enable xscreensaver". - sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \ - driver/xscreensaver.service.in || die + if use systemd; then + # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver." + # after "systemctl --user enable xscreensaver". + sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \ + driver/xscreensaver.service.in || die + + eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch" + fi strip-linguas -i po/ export ALL_LINGUAS="${LINGUAS}" |