[gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/

[gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/

[Aaron Bauman]

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
+}

[gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/

[Sam James]

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}"

[gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/

[Sam James]

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

[gentoo-commits] repo/gentoo:master commit in: www-misc/mergelog/

[Sam James]

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>