[gentoo-commits] repo/gentoo:master commit in: app-doc/halibut/, app-doc/halibut/files/

[gentoo-commits] repo/gentoo:master commit in: app-doc/halibut/, app-doc/halibut/files/

[David Seifert]

commit:     de2c720021b8aad37dd392a1a395fb47cf474bb9
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Nov 28 23:08:43 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 23:08:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2c7200

app-doc/halibut: fix build with gcc-10

* Thanks to lekto <AT> o2.pl for submitting the patch

Closes: https://bugs.gentoo.org/707020
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>

 app-doc/halibut/files/halibut-1.2-fno-common.patch | 22 ++++++++++++++++++++++
 app-doc/halibut/halibut-1.2.ebuild                 |  5 +++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app-doc/halibut/files/halibut-1.2-fno-common.patch b/app-doc/halibut/files/halibut-1.2-fno-common.patch
new file mode 100644
index 00000000000..e547e304d9c
--- /dev/null
+++ b/app-doc/halibut/files/halibut-1.2-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/bk_paper.c
++++ b/bk_paper.c
+@@ -75,6 +75,8 @@
+ #include "halibut.h"
+ #include "paper.h"
+ 
++font_info *all_fonts;
++
+ typedef struct paper_conf_Tag paper_conf;
+ typedef struct paper_idx_Tag paper_idx;
+ 
+--- a/paper.h
++++ b/paper.h
+@@ -78,7 +78,7 @@ struct ligature_Tag {
+  * metrics are read in.
+  */
+ 
+-font_info *all_fonts;
++extern font_info *all_fonts;
+ 
+ struct font_info_Tag {
+     font_info *next;

diff --git a/app-doc/halibut/halibut-1.2.ebuild b/app-doc/halibut/halibut-1.2.ebuild
index 13c64206e3f..933b648f2be 100644
--- a/app-doc/halibut/halibut-1.2.ebuild
+++ b/app-doc/halibut/halibut-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,8 @@ SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_compile() {
 	tc-export CC

[gentoo-commits] repo/gentoo:master commit in: app-doc/halibut/, app-doc/halibut/files/

[Andreas Sturmlechner]

commit:     655ce4a88d6bf47b135c364a8b0a233265d2fb8f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 20:56:13 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 14:59:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=655ce4a8

app-doc/halibut: drop 1.2, EAPI-6--

Closes: https://bugs.gentoo.org/848528
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-doc/halibut/Manifest                           |  1 -
 app-doc/halibut/files/halibut-1.2-fno-common.patch | 22 -----------
 app-doc/halibut/halibut-1.2.ebuild                 | 46 ----------------------
 3 files changed, 69 deletions(-)

diff --git a/app-doc/halibut/Manifest b/app-doc/halibut/Manifest
index 20f9a931aeb7..f285e42d4109 100644
--- a/app-doc/halibut/Manifest
+++ b/app-doc/halibut/Manifest
@@ -1,2 +1 @@
-DIST halibut-1.2.tar.gz 991975 BLAKE2B e5751d2f90968240825e3ddadbc070de856f6a340e832bcf0977fb8d31f7b7c8eefa776f3bba4df58641d22cca7e9ac562eef236069e1d9a8e9cdb41324a7376 SHA512 b04cc5c52f2d7cd2bb9a36a1aa896c6a4fd11bcfc5fad3d9c74576bf2576ce237cd7ac3ceeff3bd10dfd5a229614d06d23323509d3a83ff74b4a1965e1d726fc
 DIST halibut-1.3.tar.gz 995916 BLAKE2B 78a4409ff1f787134f7cd4eb307e77c81865a2591b55b359b0ef7a45b303cd361f85d344972714dfe8b3e823345de715d99ea542bf3cdf63d6d92548d027c27b SHA512 872f0cdb398002843d7e1b19f6eaf80ff848ce5ffee8653fa88da63c57e89efcbfaadc09b476280d25d38136f7d8af286fa98b9b36598515e0eb50f1945ee34a

diff --git a/app-doc/halibut/files/halibut-1.2-fno-common.patch b/app-doc/halibut/files/halibut-1.2-fno-common.patch
deleted file mode 100644
index e547e304d9c3..000000000000
--- a/app-doc/halibut/files/halibut-1.2-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/bk_paper.c
-+++ b/bk_paper.c
-@@ -75,6 +75,8 @@
- #include "halibut.h"
- #include "paper.h"
- 
-+font_info *all_fonts;
-+
- typedef struct paper_conf_Tag paper_conf;
- typedef struct paper_idx_Tag paper_idx;
- 
---- a/paper.h
-+++ b/paper.h
-@@ -78,7 +78,7 @@ struct ligature_Tag {
-  * metrics are read in.
-  */
- 
--font_info *all_fonts;
-+extern font_info *all_fonts;
- 
- struct font_info_Tag {
-     font_info *next;

diff --git a/app-doc/halibut/halibut-1.2.ebuild b/app-doc/halibut/halibut-1.2.ebuild
deleted file mode 100644
index 087a75224d41..000000000000
--- a/app-doc/halibut/halibut-1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="yet another free document preparation system"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/halibut/"
-SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ~riscv x86"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-src_compile() {
-	tc-export CC
-	CFLAGS="${CFLAGS}" \
-	CPPFLAGS="${CPPFLAGS}" \
-	LFLAGS="${LDFLAGS}" \
-	BUILDDIR="${S}/build" \
-	VERSION="${PV}" \
-	emake
-	emake -C doc
-}
-
-DOCS=( doc/halibut.txt )
-HTML_DOCS=(
-	doc/index.html
-	doc/IndexPage.html
-	doc/input.html
-	doc/intro.html
-	doc/licence.html
-	doc/manpage.html
-	doc/output.html
-	doc/running.html
-)
-
-src_install() {
-	dobin build/halibut
-	doman doc/halibut.1
-	doinfo doc/halibut.info
-	einstalldocs
-}