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: www-misc/mergelog/
Date: Mon, 24 Feb 2025 04:55:01 +0000 (UTC)	[thread overview]
Message-ID: <1740372847.c514c10c69546d54d0c13225fc13ae88585f4da9.sam@gentoo> (raw)

commit:     c514c10c69546d54d0c13225fc13ae88585f4da9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 04:50:59 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 04:54:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c514c10c

www-misc/mergelog: fix applying patches

Otherwise, we only apply user patches, not the ones in PATCHES(!)

Closes: https://bugs.gentoo.org/726088
Fixes: 27f9342a1e5d29177177fcc47eabc58f19a54557
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-misc/mergelog/{mergelog-4.5-r2.ebuild => mergelog-4.5-r3.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-misc/mergelog/mergelog-4.5-r2.ebuild b/www-misc/mergelog/mergelog-4.5-r3.ebuild
similarity index 90%
rename from www-misc/mergelog/mergelog-4.5-r2.ebuild
rename to www-misc/mergelog/mergelog-4.5-r3.ebuild
index 2bfb50ecbe16..71df4cd0275d 100644
--- a/www-misc/mergelog/mergelog-4.5-r2.ebuild
+++ b/www-misc/mergelog/mergelog-4.5-r3.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=7
@@ -22,6 +22,6 @@ PATCHES=(
 )
 
 src_prepare() {
-	eapply_user
+	default
 	eautoreconf
 }


             reply	other threads:[~2025-02-24  4:55 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-24  4:55 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-27 18:01 [gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/ Arthur Zamarin
2025-07-13  0:53 Sam James
2025-07-13  0:53 Sam James
2025-07-13  0:53 Sam James
2022-10-20  3:54 Sam James
2021-04-02 14:01 Sam James
2020-09-30  2:46 Sam James
2019-12-13  3:25 Aaron Bauman

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=1740372847.c514c10c69546d54d0c13225fc13ae88585f4da9.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