[gentoo-commits] repo/gentoo:master commit in: net-p2p/ed2k_hash/, net-p2p/ed2k_hash/files/
commit: 0197e44b213e11b93bdea29eaed0064c073236ea Author: Sam James gentoo org> AuthorDate: Fri Jul 15 07:39:10 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jul 15 07:39:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0197e44b net-p2p/ed2k_hash: EAPI 8 Signed-off-by: Sam James 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.0 +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 ..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 + #include + #include ++#include + + #include "global.h" + +--- a/ed2k_hash/options.c b/ed2k_hash/options.c +@@ -16,6 +16,7 @@ + ***/ + + #include ++#include + + #include "global.h" +
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ed2k_hash/
commit: 42c4ef61e2656e94fd2f0e9042ba875928d5534e Author: Sam James gentoo org> AuthorDate: Mon Jul 11 03:04:07 2022 + Commit: Sam James gentoo org> CommitDate: Mon Jul 11 03:04:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c4ef61 net-p2p/ed2k_hash: fix UnusedInherits Signed-off-by: Sam James gentoo.org> net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 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-r2.ebuild index 6434f3486bc6..d415e2ec2ecd 100644 --- a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild +++ b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit flag-o-matic + +#inherit flag-o-matic DESCRIPTION="Tool for generating eDonkey2000 links" HOMEPAGE="http://ed2k-tools.sourceforge.net/ed2k_hash.shtml";
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ed2k_hash/
commit: 697812dc497cf241f2158c4e0d917050e82784d1 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Feb 15 19:34:52 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Feb 15 19:35:11 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=697812dc net-p2p/ed2k_hash: Drop old Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 net-p2p/ed2k_hash/ed2k_hash-0.4.0-r1.ebuild | 35 - 1 file changed, 35 deletions(-) diff --git a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r1.ebuild b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r1.ebuild deleted file mode 100644 index f7ed1638c4d..000 --- a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit flag-o-matic eutils - -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" -SLOT="0" -KEYWORDS="amd64 ppc ~sparc x86" -IUSE="fltk" -DEPEND="fltk? ( x11-libs/fltk:1 )" - -src_prepare() { - epatch "${FILESDIR}/ed2k_64bit.patch" -} - -src_configure() { - if use fltk; then - append-ldflags "$(fltk-config --ldflags)" - export CPPFLAGS="$(fltk-config --cxxflags)" - else - export ac_cv_lib_fltk_main='no' - fi - - econf --disable-dependency-tracking -} - -src_install() { - emake install DESTDIR="${D}" mydocdir=/usr/share/doc/${PF}/html - dodoc AUTHORS INSTALL README TODO -}
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ed2k_hash/
commit: 5d836b5c7baec6fd06e2a961a8c2468effc7cfb9 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Feb 15 19:33:42 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Feb 15 19:35:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d836b5c net-p2p/ed2k_hash: amd64 stable wrt bug #676752 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 RepoMan-Options: --include-arches="amd64" net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild index bafb7b1fccf..6434f3486bc 100644 --- a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild +++ b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ed2k-tools/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc ~sparc x86" +KEYWORDS="amd64 ppc ~sparc x86" IUSE="" # fltk support is broken, bug #359643 DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ed2k_hash/
commit: 90a4d74e057afd6c3ca600d01e827ae47d783c95 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Feb 15 01:28:48 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Feb 15 01:36:51 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90a4d74e net-p2p/ed2k_hash: x86 stable (bug #676752) Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild index 439d72e3ebc..bafb7b1fccf 100644 --- a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild +++ b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ed2k-tools/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc ~sparc ~x86" +KEYWORDS="~amd64 ppc ~sparc x86" IUSE="" # fltk support is broken, bug #359643 DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ed2k_hash/
commit: 86a0f4407a28c5992e4e1cc37e0d77ee6b2f2d44 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Feb 2 20:20:08 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Feb 2 20:44:20 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a0f440 net-p2p/ed2k_hash: stable 0.4.0-r2 for ppc, bug #676752 Package-Manager: Portage-2.3.59, Repoman-2.3.12 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 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-r2.ebuild index 1e2ab6041d0..439d72e3ebc 100644 --- a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild +++ b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ed2k-tools/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ppc ~sparc ~x86" IUSE="" # fltk support is broken, bug #359643 DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ed2k_hash/, net-p2p/ed2k_hash/files/
commit: 35c183ce3b6c41fbea8bdaafc01e5e12009b7724 Author: Pacho Ramos gentoo org> AuthorDate: Thu Aug 18 17:40:43 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Thu Aug 18 17:43:00 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c183ce net-p2p/ed2k_hash: fltk support is completely broken (#359643) Package-Manager: portage-2.3.0 net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild | 38 + net-p2p/ed2k_hash/files/ed2k_64bit.patch| 4 +-- 2 files changed, 40 insertions(+), 2 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-r2.ebuild new file mode 100644 index 000..0d94638 --- /dev/null +++ b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +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" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="" # fltk support is broken, bug #359643 + +DEPEND="" +RDEPEND="" +#DEPEND="fltk? ( x11-libs/fltk:1 )" + +PATCHES=( "${FILESDIR}/ed2k_64bit.patch" ) + +src_configure() { +# if use fltk; then +# append-ldflags "$(fltk-config --ldflags)" +# export CPPFLAGS="$(fltk-config --cxxflags)" +# else + export ac_cv_lib_fltk_main='no' +# fi + + econf +} + +src_install() { + emake install DESTDIR="${D}" mydocdir=/usr/share/doc/${PF}/html + einstalldocs +} diff --git a/net-p2p/ed2k_hash/files/ed2k_64bit.patch b/net-p2p/ed2k_hash/files/ed2k_64bit.patch index 7425bb0..3523b1f 100644 --- a/net-p2p/ed2k_hash/files/ed2k_64bit.patch +++ b/net-p2p/ed2k_hash/files/ed2k_64bit.patch @@ -1,5 +1,5 @@ ed2k_hash-0.4.0/work/ed2k_hash-0.4.0/ed2k_hash/md4.h 2002-09-04 18:24:37.0 +0100 -+++ ed2k_hash-0.4.0_orig/work/ed2k_hash-0.4.0/ed2k_hash/md4.h 2004-09-02 21:13:49.900613616 +0100 +--- a/ed2k_hash/md4.h 2002-09-04 18:24:37.0 +0100 b/ed2k_hash/md4.h 2004-09-02 21:13:49.900613616 +0100 @@ -66,7 +66,8 @@ typedef unsigned short int UINT2;