From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
Date: Sun, 22 Mar 2020 08:05:46 +0000 (UTC) [thread overview]
Message-ID: <1584864342.92a5fff7f88c315b7bdbeed017a090ba1d9ad79f.jer@gentoo> (raw)
commit: 92a5fff7f88c315b7bdbeed017a090ba1d9ad79f
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 08:05:22 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 08:05:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92a5fff7
x11-misc/xscreensaver: Replace patch with sed scripts
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Bug: https://bugs.gentoo.org/713788
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../files/xscreensaver-5.44-offensive.patch | 68 ----------------------
x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild | 12 +++-
2 files changed, 11 insertions(+), 69 deletions(-)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-offensive.patch
deleted file mode 100644
index 4b2d6189b1e..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-offensive.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/hacks/barcode.c
-+++ b/hacks/barcode.c
-@@ -121,8 +121,6 @@
- "belly",
- "bliss",
- "bogosity",
-- "boobies",
-- "boobs",
- "booty",
- "bread",
- "brogrammers",
-@@ -137,7 +135,6 @@
- "chocolate",
- "chupacabra",
- "CLONE",
-- "cock",
- "congress",
- "constriction",
- "contrition",
-@@ -280,7 +277,6 @@
- "punishment",
- "punk rock",
- "punk",
-- "pussy",
- "quagmire",
- "quarantine",
- "quartz",
-@@ -355,8 +351,6 @@
- "venom",
- "verifiability",
- "very fine people",
-- "viagra",
-- "vibrator",
- "victim",
- "vignette",
- "villainy",
---- a/hacks/glx/glsnake.c
-+++ b/hacks/glx/glsnake.c
-@@ -569,17 +569,17 @@
- ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- ZERO, PIN, ZERO }
- },
-- { "erect penis", /* thanks benno */
-+ { "shuffle board", /* thanks benno */
- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
- ZERO, ZERO }
- },
-- { "flaccid penis",
-+ { "flaccid anchor",
- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
- ZERO, ZERO }
- },
-- { "vagina",
-+ { "engagement ring",
- { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
- LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
- PIN, RIGHT, ZERO }
-@@ -999,7 +999,7 @@
- { "Parrot",
- { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
- },
-- { "Penis",
-+ { "Shuttle",
- { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
- },
- { "PictureComingSoon",
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
index 0bb17e073d4..8fd4a1daa6e 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
@@ -83,7 +83,17 @@ src_prepare() {
default
- use offensive || eapply "${FILESDIR}"/${PN}-5.44-offensive.patch
+ if ! use offensive; then
+ sed -i \
+ -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+ hacks/barcode.c || die
+ sed -i \
+ -e 's|erect penis|shuffle board|g' \
+ -e 's|flaccid penis|flaccid anchor|g' \
+ -e 's|vagina|engagement ring|g' \
+ -e 's|Penis|Shuttle|g' \
+ hacks/glx/glsnake.c || break
+ fi
eapply_user
next reply other threads:[~2020-03-22 8:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-22 8:05 Jeroen Roovers [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-09-06 10:51 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/ Florian Schmaus
2023-05-29 18:21 Sam James
2022-12-25 22:26 Ulrich Müller
2022-12-16 20:19 Sebastian Pipping
2022-10-30 9:40 Sam James
2022-03-12 0:10 Sam James
2021-09-05 5:16 Jakov Smolić
2021-07-25 7:08 Ulrich Müller
2021-07-17 22:17 Sebastian Pipping
2021-06-13 11:44 Sebastian Pipping
2021-06-11 15:36 Sebastian Pipping
2021-03-12 20:33 Sebastian Pipping
2021-03-12 17:14 Sebastian Pipping
2020-07-23 10:42 Jeroen Roovers
2020-05-03 1:35 Matt Turner
2020-03-21 6:39 Jeroen Roovers
2016-08-13 8:18 Jeroen Roovers
2015-11-08 6:09 Jeroen Roovers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1584864342.92a5fff7f88c315b7bdbeed017a090ba1d9ad79f.jer@gentoo \
--to=jer@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox