commit: 0197e44b213e11b93bdea29eaed0064c073236ea Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jul 15 07:39:10 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jul 15 07:39:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0197e44b
net-p2p/ed2k_hash: EAPI 8 Signed-off-by: Sam James <sam <AT> gentoo.org> ...h-0.4.0-r2.ebuild => ed2k_hash-0.4.0-r3.ebuild} | 22 ++++++++++++---------- net-p2p/ed2k_hash/files/ed2k_64bit.patch | 4 ++-- .../files/ed2k_hash-0.4.0-missing-includes.patch | 20 ++++++++++++++++++++ 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild similarity index 73% rename from net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild rename to net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild index d415e2ec2ecd..2f50faf76f65 100644 --- a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild +++ b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 #inherit flag-o-matic DESCRIPTION="Tool for generating eDonkey2000 links" HOMEPAGE="http://ed2k-tools.sourceforge.net/ed2k_hash.shtml"; -RESTRICT="mirror" SRC_URI="mirror://sourceforge/ed2k-tools/${P}.tar.gz" LICENSE="GPL-2" @@ -15,19 +14,22 @@ SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" IUSE="" # fltk support is broken, bug #359643 -DEPEND="" -RDEPEND="" +RESTRICT="mirror" + #DEPEND="fltk? ( x11-libs/fltk:1 )" -PATCHES=( "${FILESDIR}/ed2k_64bit.patch" ) +PATCHES=( + "${FILESDIR}/ed2k_64bit.patch" + "${FILESDIR}/${PN}-0.4.0-missing-includes.patch" +) src_configure() { -# if use fltk; then -# append-ldflags "$(fltk-config --ldflags)" -# export CPPFLAGS="$(fltk-config --cxxflags)" -# else + #if use fltk; then + # append-ldflags "$(fltk-config --ldflags)" + # export CPPFLAGS="$(fltk-config --cxxflags)" + #else export ac_cv_lib_fltk_main='no' -# fi + #fi econf } diff --git a/net-p2p/ed2k_hash/files/ed2k_64bit.patch b/net-p2p/ed2k_hash/files/ed2k_64bit.patch index 3523b1febecd..2f1520e137ec 100644 --- a/net-p2p/ed2k_hash/files/ed2k_64bit.patch +++ b/net-p2p/ed2k_hash/files/ed2k_64bit.patch @@ -1,5 +1,5 @@ ---- a/ed2k_hash/md4.h 2002-09-04 18:24:37.000000000 +0100 -+++ b/ed2k_hash/md4.h 2004-09-02 21:13:49.900613616 +0100 +--- a/ed2k_hash/md4.h ++++ b/ed2k_hash/md4.h @@ -66,7 +66,8 @@ typedef unsigned short int UINT2; diff --git a/net-p2p/ed2k_hash/files/ed2k_hash-0.4.0-missing-includes.patch b/net-p2p/ed2k_hash/files/ed2k_hash-0.4.0-missing-includes.patch new file mode 100644 index 000000000000..4b9fcc109a38 --- /dev/null +++ b/net-p2p/ed2k_hash/files/ed2k_hash-0.4.0-missing-includes.patch @@ -0,0 +1,20 @@ +--- a/ed2k_hash/cl_ui.c ++++ b/ed2k_hash/cl_ui.c +@@ -18,6 +18,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <stdarg.h> ++#include <string.h> + + #include "global.h" + +--- a/ed2k_hash/options.c ++++ b/ed2k_hash/options.c +@@ -16,6 +16,7 @@ + ***************************************************************************/ + + #include <stdlib.h> ++#include <string.h> + + #include "global.h" +
