public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/ddccontrol/
Date: Sat, 10 May 2025 00:53:58 +0000 (UTC)	[thread overview]
Message-ID: <1746838221.3e16a6f093a3a974a79f39308dc6bcdd2592f942.sam@gentoo> (raw)

commit:     3e16a6f093a3a974a79f39308dc6bcdd2592f942
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 10 00:50:21 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 10 00:50:21 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e16a6f0

app-misc/ddccontrol: drop broken sed on non-amd64/x86

In...

commit e620abbc937619f3d69896ff4d7ace2696bc0c93
Author: Manuel Rüger <mrueg <AT> gentoo.org>
Date:   Wed Jul 10 09:46:16 2013 +0000

    Non-maintainer commit: Add support for fglrx (AMD ADL). Fix desktop file. See bug #475568

    (Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key )

... .in gets changed to .ini, which seems weird.

The line itself goes back to:

commit 3255c2e57a7c24147aa50ca7cf9603211e790e9a
Author: Robin H. Johnson <robbat2 <AT> gentoo.org>
Date:   Sun Jul 15 07:44:37 2007 +0000

    Bug #163057 - compile fix for zlib'd pciutils. Also fix compile on ppc for in/out/ioperm usage.
    (Portage version: 2.1.3_rc8)

Back then, it was:

+       if [ "${ARCH/64}" == "ppc" ]; then

It changed to the current arch check with:

commit 5cb6622ff2a100c12d020f1d03bf25ac9670e072
Author: Mike Frysinger <vapier <AT> gentoo.org>
Date:   Wed Jan 25 02:17:34 2012 +0000

    Migrate to EAPI=4, fix build with newer automake with patch from upstream, add USE=static-libs support, and add USE=ddcpci to control the setuid binary.

    (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

In any case, let's just drop it and see what happens. Especially given
it's been broken for non-amd64 + x86 (which is the case it's supposed
to help with) for several months at the very least.

Closes: https://bugs.gentoo.org/949965
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-misc/ddccontrol/ddccontrol-1.0.3.ebuild | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/app-misc/ddccontrol/ddccontrol-1.0.3.ebuild b/app-misc/ddccontrol/ddccontrol-1.0.3.ebuild
index 6cbf5efddb67..89dbde971c8f 100644
--- a/app-misc/ddccontrol/ddccontrol-1.0.3.ebuild
+++ b/app-misc/ddccontrol/ddccontrol-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -51,22 +51,6 @@ BDEPEND="
 "
 
 src_prepare() {
-	# ppc/ppc64 do not have inb/outb/ioperm
-	# they also do not have (sys|asm)/io.h
-	if ! use amd64 && ! use x86 ; then
-		local card
-		for card in sis intel810 ; do
-			sed -r -i \
-				-e "/${card}.Po/d" \
-				-e "s~${card}[^[:space:]]*~ ~g" \
-				src/ddcpci/Makefile.{am,ini} || die
-		done
-		sed -i \
-			-e '/sis_/d' \
-			-e '/i810_/d' \
-			src/ddcpci/main.c || die
-	fi
-
 	default
 
 	## Save for a rainy day or future patching


             reply	other threads:[~2025-05-10  0:54 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-10  0:53 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-03 17:45 [gentoo-commits] repo/gentoo:master commit in: app-misc/ddccontrol/ Petr Vaněk
2024-03-13  4:46 Sam James
2024-03-13  4:46 Sam James
2023-07-03  5:14 Robin H. Johnson
2023-07-01 23:38 Robin H. Johnson
2023-04-01 19:39 Conrad Kostecki
2022-01-10 16:39 Joonas Niilola
2022-01-10 16:31 Joonas Niilola
2022-01-10 16:27 Joonas Niilola
2022-01-10 16:27 Joonas Niilola
2021-06-07  8:33 Joonas Niilola
2020-08-03 23:12 Robin H. Johnson
2020-08-03 23:12 Robin H. Johnson
2017-11-24  6:06 Matt Turner
2016-10-01  8:02 Pacho Ramos
2016-01-16 18:03 Manuel Rüger

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=1746838221.3e16a6f093a3a974a79f39308dc6bcdd2592f942.sam@gentoo \
    --to=sam@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