[gentoo-commits] repo/gentoo:master commit in: dev-util/dwdiff/, dev-util/dwdiff/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/dwdiff/, dev-util/dwdiff/files/

[David Seifert]

commit:     f1084565b1548a1cc7d9980c14a9fad582cba90a
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 14:15:36 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 14:15:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1084565

dev-util/dwdiff: Port to EAPI 7

Closes: https://bugs.gentoo.org/707140
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-util/dwdiff/dwdiff-2.1.3.ebuild                | 31 +++++++---------------
 .../{C99-fix.patch => dwdiff-2.1.3-C99-fix.patch}  |  0
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/dev-util/dwdiff/dwdiff-2.1.3.ebuild b/dev-util/dwdiff/dwdiff-2.1.3.ebuild
index 2c5dc4d45e8..973e44885e7 100644
--- a/dev-util/dwdiff/dwdiff-2.1.3.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="diff-like program operating at word level instead of line level"
 HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
@@ -14,38 +14,25 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="nls"
 
-CDEPEND="dev-libs/icu:="
-
 RDEPEND="
-	${CDEPEND}
+	dev-libs/icu:=
 	sys-apps/diffutils"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/C99-fix.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-C99-fix.patch )
 
 src_prepare() {
 	default
-
-	sed -i \
-		-e '/INSTALL/s:COPYING::' \
-		Makefile.in || die
+	sed -i -e '/INSTALL/s:COPYING::' Makefile.in || die
 }
 
 src_configure() {
 	./configure \
-		--prefix=/usr \
-		$(use_with nls gettext) || die "./configure error"
+		--prefix="${EPREFIX}"/usr \
+		$(use_with nls gettext) || die
 }
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
-
-src_install() {
-	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}

diff --git a/dev-util/dwdiff/files/C99-fix.patch b/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch
similarity index 100%
rename from dev-util/dwdiff/files/C99-fix.patch
rename to dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch

[gentoo-commits] repo/gentoo:master commit in: dev-util/dwdiff/, dev-util/dwdiff/files/

[Petr Vaněk]

commit:     2368d970709e223024868e32d0020976b5f11558
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 08:40:45 2025 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 08:40:45 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2368d970

dev-util/dwdiff: drop 2.1.3

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 dev-util/dwdiff/Manifest                         |  1 -
 dev-util/dwdiff/dwdiff-2.1.3.ebuild              | 38 ------------------------
 dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch | 15 ----------
 3 files changed, 54 deletions(-)

diff --git a/dev-util/dwdiff/Manifest b/dev-util/dwdiff/Manifest
index dccebf17fc54..a75ce182addd 100644
--- a/dev-util/dwdiff/Manifest
+++ b/dev-util/dwdiff/Manifest
@@ -1,2 +1 @@
-DIST dwdiff-2.1.3.tar.bz2 79862 BLAKE2B 72eb07071de413526b70ebfd30030394c8bc4958bd14128b9a8b87a76561e4bfbd61064def314a4b989da027664d999cfb9a4ac9ab6f1b06cbe3f38f271e538e SHA512 e4375658ddb919d763bedacd122e5597a4c3cd40ddff2c954c6cc88e5047d20d4d3b18eaf75c6835be21e1f72e2622e25b212ae9882d8eaa36874af3f6de4b3f
 DIST dwdiff-2.1.4.tar.bz2 79857 BLAKE2B b4b54c82137097c7e3e3438b08dcc9da83aa127f72dd30b995a18b2b11ed3f419dce44762872407f4070b6b9dbca6a2d33dc24e0ed1363405fdaa638852d036f SHA512 8a2bffcf5f170a5a1fc2885a04d8e7cd054cebeed98a5e2695b609d3199c8c8bdeda6f3a9497888237e6cbfb570a4699aa66f4e062cb6aa109cbb7792a75a5f3

diff --git a/dev-util/dwdiff/dwdiff-2.1.3.ebuild b/dev-util/dwdiff/dwdiff-2.1.3.ebuild
deleted file mode 100644
index 51adb419f8cc..000000000000
--- a/dev-util/dwdiff/dwdiff-2.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
-SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-libs/icu:=
-	sys-apps/diffutils"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${P}-C99-fix.patch )
-
-src_prepare() {
-	default
-	sed -i -e '/INSTALL/s:COPYING::' Makefile.in || die
-}
-
-src_configure() {
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		$(use_with nls gettext) || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}

diff --git a/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch b/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch
deleted file mode 100644
index 9d6d9ae2bca5..000000000000
--- a/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/definitions.h
-+++ b/src/definitions.h
-@@ -43,11 +43,11 @@
- 
- /*==== Misc definitions ====*/
- /* Define a bool type if not already defined (C++ and C99 do)*/
--#if !(defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L))
-+#if !(defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L))
- /*@-incondefs@*/
- typedef enum {false, true} bool;
- /*@+incondefs@*/
--#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L
-+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
- #include <stdbool.h>
- #endif