* [gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/
@ 2019-12-13 3:25 Aaron Bauman
0 siblings, 0 replies; 9+ messages in thread
From: Aaron Bauman @ 2019-12-13 3:25 UTC (permalink / raw
To: gentoo-commits
commit: 27f9342a1e5d29177177fcc47eabc58f19a54557
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 03:23:31 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 03:25:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27f9342a
www-misc/mergelog: port to EAPI 7
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
www-misc/mergelog/mergelog-4.5-r2.ebuild | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/www-misc/mergelog/mergelog-4.5-r2.ebuild b/www-misc/mergelog/mergelog-4.5-r2.ebuild
index 936acbb1f57..8872f314123 100644
--- a/www-misc/mergelog/mergelog-4.5-r2.ebuild
+++ b/www-misc/mergelog/mergelog-4.5-r2.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils eutils
+inherit autotools
DESCRIPTION="A utility to merge apache logs in chronological order"
-SRC_URI="mirror://sourceforge/mergelog/${P}.tar.gz"
HOMEPAGE="http://mergelog.sourceforge.net"
+SRC_URI="mirror://sourceforge/mergelog/${P}.tar.gz"
IUSE=""
SLOT="0"
@@ -18,8 +17,12 @@ KEYWORDS="amd64 ppc x86"
RDEPEND="sys-libs/zlib"
DEPEND="${DEPEND}"
-DOCS=( AUTHORS ChangeLog README)
PATCHES=(
"${FILESDIR}"/${P}-splitlog.patch
"${FILESDIR}"/${P}-asneeded.patch
)
+
+src_prepare() {
+ eapply_user
+ eautoreconf
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/
@ 2020-09-30 2:46 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2020-09-30 2:46 UTC (permalink / raw
To: gentoo-commits
commit: 177a1fa776504c2b93f3bd20bd7e759925b8f50e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 30 02:46:02 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 30 02:46:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=177a1fa7
www-misc/mergelog: Keyword 4.5-r2 arm64, #741798
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-misc/mergelog/mergelog-4.5-r2.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-r2.ebuild
index 8872f314123..74b4b251293 100644
--- a/www-misc/mergelog/mergelog-4.5-r2.ebuild
+++ b/www-misc/mergelog/mergelog-4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mergelog/${P}.tar.gz"
IUSE=""
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~arm64 ppc x86"
RDEPEND="sys-libs/zlib"
DEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/
@ 2021-04-02 14:01 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2021-04-02 14:01 UTC (permalink / raw
To: gentoo-commits
commit: 36097cffd23eb698e8e82146f33574d2ee99e397
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 2 11:24:35 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 2 14:00:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36097cff
www-misc/mergelog: fix DEPEND typo
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-misc/mergelog/mergelog-4.5-r2.ebuild | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/www-misc/mergelog/mergelog-4.5-r2.ebuild b/www-misc/mergelog/mergelog-4.5-r2.ebuild
index 74b4b251293..f689153b358 100644
--- a/www-misc/mergelog/mergelog-4.5-r2.ebuild
+++ b/www-misc/mergelog/mergelog-4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,13 +9,12 @@ DESCRIPTION="A utility to merge apache logs in chronological order"
HOMEPAGE="http://mergelog.sourceforge.net"
SRC_URI="mirror://sourceforge/mergelog/${P}.tar.gz"
-IUSE=""
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
KEYWORDS="amd64 ~arm64 ppc x86"
RDEPEND="sys-libs/zlib"
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-splitlog.patch
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/
@ 2022-10-20 3:54 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-10-20 3:54 UTC (permalink / raw
To: gentoo-commits
commit: 4229fbf8bf318fe9972bd9db3294fb001ed01ae6
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Wed Oct 19 09:08:15 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 03:52:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4229fbf8
www-misc/mergelog: align longdescription opening and closing tags
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-misc/mergelog/metadata.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-misc/mergelog/metadata.xml b/www-misc/mergelog/metadata.xml
index c260728144b3..ff9b3e159d55 100644
--- a/www-misc/mergelog/metadata.xml
+++ b/www-misc/mergelog/metadata.xml
@@ -3,8 +3,8 @@
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>
-The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
-</longdescription>
+ The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
+ </longdescription>
<upstream>
<remote-id type="sourceforge">mergelog</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/
@ 2025-02-24 4:55 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2025-02-24 4:55 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/
@ 2025-07-13 0:53 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2025-07-13 0:53 UTC (permalink / raw
To: gentoo-commits
commit: 4d13fd7c2f1dcad8d4f512fbaecccf7af4434f83
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 13 00:52:51 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 13 00:52:51 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d13fd7c
www-misc/mergelog: Stabilize 4.5-r4 x86, #960034
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-misc/mergelog/mergelog-4.5-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-misc/mergelog/mergelog-4.5-r4.ebuild b/www-misc/mergelog/mergelog-4.5-r4.ebuild
index d9a2c7ba5e80..ea64f8776dca 100644
--- a/www-misc/mergelog/mergelog-4.5-r4.ebuild
+++ b/www-misc/mergelog/mergelog-4.5-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/mergelog/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~x86"
+KEYWORDS="amd64 ~arm64 ppc x86"
RDEPEND="sys-libs/zlib"
DEPEND="${RDEPEND}"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/
@ 2025-07-13 0:53 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2025-07-13 0:53 UTC (permalink / raw
To: gentoo-commits
commit: ffc3c6e96258519c80620f9ee61785a7cc1dd01b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 13 00:52:48 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 13 00:52:48 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc3c6e9
www-misc/mergelog: Stabilize 4.5-r4 amd64, #960034
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-misc/mergelog/mergelog-4.5-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-misc/mergelog/mergelog-4.5-r4.ebuild b/www-misc/mergelog/mergelog-4.5-r4.ebuild
index 62f71dd84e1a..135f1d19aed6 100644
--- a/www-misc/mergelog/mergelog-4.5-r4.ebuild
+++ b/www-misc/mergelog/mergelog-4.5-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/mergelog/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~x86"
RDEPEND="sys-libs/zlib"
DEPEND="${RDEPEND}"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/
@ 2025-07-13 0:53 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2025-07-13 0:53 UTC (permalink / raw
To: gentoo-commits
commit: 7bca56303ff7c6df2cd775e46f21c6c06881d559
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 13 00:52:50 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 13 00:52:50 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bca5630
www-misc/mergelog: Stabilize 4.5-r4 ppc, #960034
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-misc/mergelog/mergelog-4.5-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-misc/mergelog/mergelog-4.5-r4.ebuild b/www-misc/mergelog/mergelog-4.5-r4.ebuild
index 135f1d19aed6..d9a2c7ba5e80 100644
--- a/www-misc/mergelog/mergelog-4.5-r4.ebuild
+++ b/www-misc/mergelog/mergelog-4.5-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/mergelog/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ppc ~x86"
RDEPEND="sys-libs/zlib"
DEPEND="${RDEPEND}"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/
@ 2025-07-27 18:01 Arthur Zamarin
0 siblings, 0 replies; 9+ messages in thread
From: Arthur Zamarin @ 2025-07-27 18:01 UTC (permalink / raw
To: gentoo-commits
commit: de498e93290313287eada329b0bbdcec70968360
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 27 17:59:16 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 27 17:59:16 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de498e93
www-misc/mergelog: drop 4.5-r3, EAPI=7--
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
www-misc/mergelog/mergelog-4.5-r3.ebuild | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/www-misc/mergelog/mergelog-4.5-r3.ebuild b/www-misc/mergelog/mergelog-4.5-r3.ebuild
deleted file mode 100644
index 71df4cd0275d..000000000000
--- a/www-misc/mergelog/mergelog-4.5-r3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A utility to merge apache logs in chronological order"
-HOMEPAGE="http://mergelog.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/mergelog/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-splitlog.patch
- "${FILESDIR}"/${P}-asneeded.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2025-07-27 18:01 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-24 4:55 [gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-07-27 18:01 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox