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@gentoo.org>

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 (file)
index 4b2d618..0000000
--- 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 0bb17e073d4a7b7937831ee2b44dafed6e61287b..8fd4a1daa6e8e6dcdb0ac38f7b23d91825d69587 100644 (file)
--- 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