From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 55748138350 for ; Sun, 22 Mar 2020 08:05:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8643AE0A68; Sun, 22 Mar 2020 08:05:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28455E0A68 for ; Sun, 22 Mar 2020 08:05:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70A7834F435 for ; Sun, 22 Mar 2020 08:05:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A739101 for ; Sun, 22 Mar 2020 08:05:46 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1584864342.92a5fff7f88c315b7bdbeed017a090ba1d9ad79f.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xscreensaver/files/xscreensaver-5.44-offensive.patch x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild X-VCS-Directories: x11-misc/xscreensaver/files/ x11-misc/xscreensaver/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 92a5fff7f88c315b7bdbeed017a090ba1d9ad79f X-VCS-Branch: master Date: Sun, 22 Mar 2020 08:05:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8ce541a8-2003-4eb4-84b8-08b5b1cc54ea X-Archives-Hash: c0729d53daf45eaebe0a2a5e14ede493 commit: 92a5fff7f88c315b7bdbeed017a090ba1d9ad79f Author: Jeroen Roovers gentoo org> AuthorDate: Sun Mar 22 08:05:22 2020 +0000 Commit: Jeroen Roovers gentoo 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 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