[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: f15611a577733c7d7c422d28d77eaf568f2afefd
Author: John Helmert III gentoo org>
AuthorDate: Sun Dec 18 22:40:40 2022 +
Commit: John Helmert III gentoo org>
CommitDate: Mon Dec 19 02:48:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f15611a5
app-text/htmldoc: drop 1.9.11-r1
Bug: https://bugs.gentoo.org/780489
Signed-off-by: John Helmert III gentoo.org>
app-text/htmldoc/Manifest | 1 -
app-text/htmldoc/htmldoc-1.9.11-r1.ebuild | 58 ---
2 files changed, 59 deletions(-)
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index 0b1b95718187..aec781289683 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,2 +1 @@
-DIST htmldoc-1.9.11-source.tar.gz 4471815 BLAKE2B
a76da0f5129d8d637c440ee1880bdc4c314db02294f8e7387abe28ab7f76a81b47c4670a27d34759f89b82e9b1d7c259d154fac7cb8c2b7caa6e1f99f3a35ebf
SHA512
5ee6a61f129be9a7d26c554f1acb533f1edfbf34eefd8f4924e07bcead2680407c68b4e2c9840203d7bb07daf51ea18c422d7c04e33c4b346dd207531f330678
DIST htmldoc-1.9.16-source.tar.gz 3389563 BLAKE2B
1c83e37313fb0a1196d4db3ddca47d4a418ab7aeb8f910c9a27178312a1b0239beddaf81f322b24dcf75dff7e838278fcfa0eed17b5aa493790de2393bcddebf
SHA512
c901ed259ef8c0520ed03e314149e7a2fc3b5bffa9c8e9c6c3b023a8c9de1e37b7fa72d224fa7d072f3a5d4b379635d7cfaa016df672da296be8395b49fa935b
diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
deleted file mode 100644
index de7e4f8afa89..
--- a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs xdg
-
-DESCRIPTION="Convert HTML pages into a PDF document"
-HOMEPAGE="https://www.msweet.org/htmldoc/;
-SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="fltk ssl"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- >=media-libs/libpng-1.4:0=
- sys-libs/zlib
- virtual/jpeg:0
- ssl? ( net-libs/gnutls )
- fltk? ( x11-libs/fltk:1 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- eautoreconf
-
- # Make sure not to use the libs htmldoc ships with
- rm -r jpeg png zlib || die "failed to unbundle jpeg, png, and zlib"
-
- # Fix the documentation path in a few places. Some Makefiles aren't
- # autotoolized =(
- for file in configure doc/Makefile doc/htmldoc.man; do
- sed -i "${file}" \
- -e "s:/doc/htmldoc:/doc/${PF}/html:g" \
- || die "failed to fix documentation path in ${file}"
- done
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with fltk gui)
- $(use_enable ssl)
- $(use_enable ssl gnutls)
- --disable-localjpeg
- --disable-localpng
- --disable-localzlib
- )
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake STRIPPROG="true" DSTROOT="${ED}" install
-}
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 434479a35a9e480321aee17abb9c867f53bc1708
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Dec 18 19:50:38 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Dec 18 19:50:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=434479a3
app-text/htmldoc: Stabilize 1.9.16 amd64, #886677
Signed-off-by: Arthur Zamarin gentoo.org>
app-text/htmldoc/htmldoc-1.9.16.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/htmldoc/htmldoc-1.9.16.ebuild
b/app-text/htmldoc/htmldoc-1.9.16.ebuild
index 5b3a0e839a86..20805c240a90 100644
--- a/app-text/htmldoc/htmldoc-1.9.16.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.16.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="fltk ssl"
BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 6ea586258c5ea848fa458db7c86cdb7bd4e48373
Author: Sam James gentoo org>
AuthorDate: Sun Dec 18 12:46:09 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 18 12:46:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea58625
app-text/htmldoc: Stabilize 1.9.16 sparc, #886677
Signed-off-by: Sam James gentoo.org>
app-text/htmldoc/htmldoc-1.9.16.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/htmldoc/htmldoc-1.9.16.ebuild
b/app-text/htmldoc/htmldoc-1.9.16.ebuild
index 462256e23500..f1333de90689 100644
--- a/app-text/htmldoc/htmldoc-1.9.16.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.16.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc ~x86"
IUSE="fltk ssl"
BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 2ed24131c1275088833ea4bd573756fc8e3ca382
Author: Sam James gentoo org>
AuthorDate: Sun Dec 18 11:43:24 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 18 11:43:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed24131
app-text/htmldoc: Stabilize 1.9.16 ppc64, #886677
Signed-off-by: Sam James gentoo.org>
app-text/htmldoc/htmldoc-1.9.16.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/htmldoc/htmldoc-1.9.16.ebuild
b/app-text/htmldoc/htmldoc-1.9.16.ebuild
index 4318763da708..462256e23500 100644
--- a/app-text/htmldoc/htmldoc-1.9.16.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.16.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
IUSE="fltk ssl"
BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 108967397568dac873ec439127693335ae9c2622
Author: Sam James gentoo org>
AuthorDate: Sun Dec 18 11:37:26 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 18 11:37:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10896739
app-text/htmldoc: Stabilize 1.9.16 ppc, #886677
Signed-off-by: Sam James gentoo.org>
app-text/htmldoc/htmldoc-1.9.16.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/htmldoc/htmldoc-1.9.16.ebuild
b/app-text/htmldoc/htmldoc-1.9.16.ebuild
index 01ef5f97775f..4318763da708 100644
--- a/app-text/htmldoc/htmldoc-1.9.16.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.16.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
IUSE="fltk ssl"
BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 220a34fb87577682cf03af955c65fc977a7d17db
Author: John Helmert III gentoo org>
AuthorDate: Wed Nov 16 17:19:27 2022 +
Commit: John Helmert III gentoo org>
CommitDate: Wed Nov 16 17:23:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=220a34fb
app-text/htmldoc: add 1.9.16
Bug: https://bugs.gentoo.org/780489
Signed-off-by: John Helmert III gentoo.org>
app-text/htmldoc/Manifest | 1 +
app-text/htmldoc/htmldoc-1.9.16.ebuild | 52 ++
2 files changed, 53 insertions(+)
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index ba674f8ca501..0b1b95718187 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1 +1,2 @@
DIST htmldoc-1.9.11-source.tar.gz 4471815 BLAKE2B
a76da0f5129d8d637c440ee1880bdc4c314db02294f8e7387abe28ab7f76a81b47c4670a27d34759f89b82e9b1d7c259d154fac7cb8c2b7caa6e1f99f3a35ebf
SHA512
5ee6a61f129be9a7d26c554f1acb533f1edfbf34eefd8f4924e07bcead2680407c68b4e2c9840203d7bb07daf51ea18c422d7c04e33c4b346dd207531f330678
+DIST htmldoc-1.9.16-source.tar.gz 3389563 BLAKE2B
1c83e37313fb0a1196d4db3ddca47d4a418ab7aeb8f910c9a27178312a1b0239beddaf81f322b24dcf75dff7e838278fcfa0eed17b5aa493790de2393bcddebf
SHA512
c901ed259ef8c0520ed03e314149e7a2fc3b5bffa9c8e9c6c3b023a8c9de1e37b7fa72d224fa7d072f3a5d4b379635d7cfaa016df672da296be8395b49fa935b
diff --git a/app-text/htmldoc/htmldoc-1.9.16.ebuild
b/app-text/htmldoc/htmldoc-1.9.16.ebuild
new file mode 100644
index ..01ef5f97775f
--- /dev/null
+++ b/app-text/htmldoc/htmldoc-1.9.16.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs xdg
+
+DESCRIPTION="Convert HTML pages into a PDF document"
+HOMEPAGE="https://www.msweet.org/htmldoc/;
+SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="fltk ssl"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ media-libs/libjpeg-turbo:=
+ >=media-libs/libpng-1.4:0=
+ sys-libs/zlib
+ ssl? ( net-libs/gnutls:= )
+ fltk? ( x11-libs/fltk:1 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+
+ # Fix the documentation path in a few places. Some Makefiles aren't
+ # autotoolized =(
+ for file in configure doc/Makefile doc/htmldoc.man; do
+ sed -i "${file}" \
+ -e "s:/doc/htmldoc:/doc/${PF}/html:g" \
+ || die "failed to fix documentation path in ${file}"
+ done
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with fltk gui)
+ $(use_enable ssl)
+ $(use_enable ssl gnutls)
+ )
+
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake STRIPPROG="true" DSTROOT="${ED}" install
+}
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: ddbcaa8271b039b4195e3c835a68c8bc07ae685b
Author: Sam James gentoo org>
AuthorDate: Tue Jun 1 00:36:36 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 1 00:36:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddbcaa82
app-text/htmldoc: fix VariableScope (ED)
Signed-off-by: Sam James gentoo.org>
app-text/htmldoc/htmldoc-1.9.11-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
index f34baa19af1..de7e4f8afa8 100644
--- a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -9,8 +9,8 @@ DESCRIPTION="Convert HTML pages into a PDF document"
HOMEPAGE="https://www.msweet.org/htmldoc/;
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz;
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="fltk ssl"
@@ -50,7 +50,7 @@ src_configure() {
--disable-localzlib
)
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" DSTROOT="${ED}" econf
"${myeconfargs[@]}"
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" econf "${myeconfargs[@]}"
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 024a602a7a316718dece30757a0ffc5840658999
Author: John Helmert III posteo net>
AuthorDate: Sun Jan 24 19:48:08 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 24 20:21:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024a602a
app-text/htmldoc: security cleanup (drop <1.9.11)
Bug: https://bugs.gentoo.org/766018
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: John Helmert III posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19197
Signed-off-by: Sam James gentoo.org>
app-text/htmldoc/Manifest | 1 -
app-text/htmldoc/htmldoc-1.8.30.ebuild | 44 --
2 files changed, 45 deletions(-)
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index 22ce11af61b..ba674f8ca50 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,2 +1 @@
-DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B
1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac
SHA512
713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
DIST htmldoc-1.9.11-source.tar.gz 4471815 BLAKE2B
a76da0f5129d8d637c440ee1880bdc4c314db02294f8e7387abe28ab7f76a81b47c4670a27d34759f89b82e9b1d7c259d154fac7cb8c2b7caa6e1f99f3a35ebf
SHA512
5ee6a61f129be9a7d26c554f1acb533f1edfbf34eefd8f4924e07bcead2680407c68b4e2c9840203d7bb07daf51ea18c422d7c04e33c4b346dd207531f330678
diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild
b/app-text/htmldoc/htmldoc-1.8.30.ebuild
deleted file mode 100644
index cbff036765a..000
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs xdg
-
-DESCRIPTION="Convert HTML pages into a PDF document"
-HOMEPAGE="https://www.msweet.org/htmldoc/;
-SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz;
-IUSE="fltk"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
-
-DEPEND=">=media-libs/libpng-1.4:0=
- virtual/jpeg:0
- fltk? ( x11-libs/fltk:1 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
- default
-
- # make sure not to use the libs htmldoc ships with
- rm -r jpeg png zlib || die 'failed to unbundle jpeg, png, and zlib'
-
- # Fix the documentation path in a few places. Some Makefiles aren't
- # autotoolized =(
- for file in configure doc/Makefile doc/htmldoc.man; do
- sed -i "${file}" \
- -e "s:/doc/htmldoc:/doc/${PF}/html:g" \
- || die "failed to fix documentation path in ${file}"
- done
-}
-
-src_configure() {
- CC=$(tc-getCC) CXX=$(tc-getCXX) DSTROOT="${D}" econf $(use_with fltk
gui)
-}
-
-src_install() {
- emake DSTROOT="${D}" install
-}
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 39a1df5dca4baf59b7514292e08e3b4e27e193d3
Author: Sam James gentoo org>
AuthorDate: Sun Jan 24 13:34:26 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 24 13:34:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a1df5d
app-text/htmldoc: Stabilize 1.9.11-r1 ppc, #766018
Signed-off-by: Sam James gentoo.org>
app-text/htmldoc/htmldoc-1.9.11-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
index 195bd1ac5af..f34baa19af1 100644
--- a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="fltk ssl"
BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 910689350a9c307b76ccd07b774f0abab9a6c046
Author: Sam James gentoo org>
AuthorDate: Sun Jan 24 13:32:31 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 24 13:32:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91068935
app-text/htmldoc: Stabilize 1.9.11-r1 ppc64, #766018
Signed-off-by: Sam James gentoo.org>
app-text/htmldoc/htmldoc-1.9.11-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
index c9f975b0f2b..195bd1ac5af 100644
--- a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 sparc x86"
IUSE="fltk ssl"
BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: d7f329385c882391c06ca965fed0cf8ecf9d2a65
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Fri Jan 22 20:11:18 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 22 20:29:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f32938
app-text/htmldoc: stable 1.9.11-r1 for sparc, bug #766018
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sam James gentoo.org>
app-text/htmldoc/htmldoc-1.9.11-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
index 0ae71c6d592..79d0aa46bd2 100644
--- a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
IUSE="fltk ssl"
BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 039d0734fecd85ac704e9365e1a00446bdc3ffb7
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Jan 22 16:53:15 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Jan 22 16:53:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=039d0734
app-text/htmldoc: amd64 stable wrt bug #766018
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-text/htmldoc/htmldoc-1.9.11-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
index 7c364dc21f2..0ae71c6d592 100644
--- a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="fltk ssl"
BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: e052c574b5b6906a09ef202fd9fcb0e6ce316608
Author: Sam James gentoo org>
AuthorDate: Mon Jan 18 16:22:23 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Jan 18 16:22:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e052c574
app-text/htmldoc: fix HOMEPAGE
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
app-text/htmldoc/htmldoc-1.8.30.ebuild| 4 ++--
app-text/htmldoc/htmldoc-1.9.11-r1.ebuild | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild
b/app-text/htmldoc/htmldoc-1.8.30.ebuild
index 61956c4652b..cbff036765a 100644
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.30.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=6
@@ -6,7 +6,7 @@ EAPI=6
inherit toolchain-funcs xdg
DESCRIPTION="Convert HTML pages into a PDF document"
-HOMEPAGE="http://www.msweet.org/projects.php?Z1;
+HOMEPAGE="https://www.msweet.org/htmldoc/;
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz;
IUSE="fltk"
SLOT="0"
diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
index b506567a49a..7c364dc21f2 100644
--- a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit autotools toolchain-funcs xdg
DESCRIPTION="Convert HTML pages into a PDF document"
-HOMEPAGE="http://www.msweet.org/projects.php?Z1;
+HOMEPAGE="https://www.msweet.org/htmldoc/;
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz;
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: beaab2345228bffa096f61ed644314ab6bfe4c2e Author: Sam James gentoo org> AuthorDate: Mon Jan 18 16:23:22 2021 + Commit: Sam James gentoo org> CommitDate: Mon Jan 18 16:23:22 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beaab234 app-text/htmldoc: add github remote-id Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> app-text/htmldoc/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-text/htmldoc/metadata.xml b/app-text/htmldoc/metadata.xml index 7a38bb90096..f6208173d9c 100644 --- a/app-text/htmldoc/metadata.xml +++ b/app-text/htmldoc/metadata.xml @@ -2,4 +2,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> + + michaelrsweet/htmldoc +
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: fc0f500c1a04345e8e114dce39883fd4c26d17c9 Author: Sam James gentoo org> AuthorDate: Mon Jan 18 16:22:46 2021 + Commit: Sam James gentoo org> CommitDate: Mon Jan 18 16:22:46 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc0f500c app-text/htmldoc: fix metadata indentation Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> app-text/htmldoc/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/htmldoc/metadata.xml b/app-text/htmldoc/metadata.xml index 6f49eba8f49..7a38bb90096 100644 --- a/app-text/htmldoc/metadata.xml +++ b/app-text/htmldoc/metadata.xml @@ -1,5 +1,5 @@ http://www.gentoo.org/dtd/metadata.dtd;> - +
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: b2bc8bae175d3f227a459509b0cdbc6401ab8dc9
Author: Sam James gentoo org>
AuthorDate: Mon Jan 18 16:17:15 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Jan 18 16:20:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2bc8bae
app-text/htmldoc: fix automagic dep on gnutls
* Forcibly disabled bundled libs (just to be sure)
* Make ssl optional (gnutls only)
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
.../{htmldoc-1.9.11.ebuild => htmldoc-1.9.11-r1.ebuild} | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/app-text/htmldoc/htmldoc-1.9.11.ebuild
b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
similarity index 78%
rename from app-text/htmldoc/htmldoc-1.9.11.ebuild
rename to app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
index fb0d4a82ad1..b506567a49a 100644
--- a/app-text/htmldoc/htmldoc-1.9.11.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -9,14 +9,17 @@ DESCRIPTION="Convert HTML pages into a PDF document"
HOMEPAGE="http://www.msweet.org/projects.php?Z1;
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz;
-IUSE="fltk"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="fltk ssl"
+BDEPEND="virtual/pkgconfig"
DEPEND="
>=media-libs/libpng-1.4:0=
+ sys-libs/zlib
virtual/jpeg:0
+ ssl? ( net-libs/gnutls )
fltk? ( x11-libs/fltk:1 )
"
RDEPEND="${DEPEND}"
@@ -38,8 +41,16 @@ src_prepare() {
}
src_configure() {
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" DSTROOT="${ED}" econf \
+ local myeconfargs=(
$(use_with fltk gui)
+ $(use_enable ssl)
+ $(use_enable ssl gnutls)
+ --disable-localjpeg
+ --disable-localpng
+ --disable-localzlib
+ )
+
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" DSTROOT="${ED}" econf
"${myeconfargs[@]}"
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 66fbdf6808cf31dae20984f2c0474fcff8de3d1d
Author: Sam James gentoo org>
AuthorDate: Mon Jan 18 16:02:23 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Jan 18 16:02:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66fbdf68
app-text/htmldoc: bump to 1.9.11
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
app-text/htmldoc/Manifest | 1 +
app-text/htmldoc/htmldoc-1.9.11.ebuild | 47 ++
2 files changed, 48 insertions(+)
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index 404d247221e..22ce11af61b 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1 +1,2 @@
DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B
1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac
SHA512
713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
+DIST htmldoc-1.9.11-source.tar.gz 4471815 BLAKE2B
a76da0f5129d8d637c440ee1880bdc4c314db02294f8e7387abe28ab7f76a81b47c4670a27d34759f89b82e9b1d7c259d154fac7cb8c2b7caa6e1f99f3a35ebf
SHA512
5ee6a61f129be9a7d26c554f1acb533f1edfbf34eefd8f4924e07bcead2680407c68b4e2c9840203d7bb07daf51ea18c422d7c04e33c4b346dd207531f330678
diff --git a/app-text/htmldoc/htmldoc-1.9.11.ebuild
b/app-text/htmldoc/htmldoc-1.9.11.ebuild
new file mode 100644
index 000..fb0d4a82ad1
--- /dev/null
+++ b/app-text/htmldoc/htmldoc-1.9.11.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs xdg
+
+DESCRIPTION="Convert HTML pages into a PDF document"
+HOMEPAGE="http://www.msweet.org/projects.php?Z1;
+SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz;
+
+IUSE="fltk"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+ >=media-libs/libpng-1.4:0=
+ virtual/jpeg:0
+ fltk? ( x11-libs/fltk:1 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+
+ # Make sure not to use the libs htmldoc ships with
+ rm -r jpeg png zlib || die "failed to unbundle jpeg, png, and zlib"
+
+ # Fix the documentation path in a few places. Some Makefiles aren't
+ # autotoolized =(
+ for file in configure doc/Makefile doc/htmldoc.man; do
+ sed -i "${file}" \
+ -e "s:/doc/htmldoc:/doc/${PF}/html:g" \
+ || die "failed to fix documentation path in ${file}"
+ done
+}
+
+src_configure() {
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" DSTROOT="${ED}" econf \
+ $(use_with fltk gui)
+}
+
+src_install() {
+ emake STRIPPROG="true" DSTROOT="${ED}" install
+}
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 7f739b276f0e65b983914d891246d4ab85cffcad Author: Jakov Smolic sartura hr> AuthorDate: Sun Sep 20 13:50:21 2020 + Commit: David Seifert gentoo org> CommitDate: Sun Sep 20 13:50:21 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f739b27 app-text/htmldoc: update mime-info cache Closes: https://bugs.gentoo.org/742959 Closes: https://github.com/gentoo/gentoo/pull/17458 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> app-text/htmldoc/htmldoc-1.8.30.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild b/app-text/htmldoc/htmldoc-1.8.30.ebuild index cc2c5a5a566..61956c4652b 100644 --- a/app-text/htmldoc/htmldoc-1.8.30.ebuild +++ b/app-text/htmldoc/htmldoc-1.8.30.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit toolchain-funcs + +inherit toolchain-funcs xdg DESCRIPTION="Convert HTML pages into a PDF document" HOMEPAGE="http://www.msweet.org/projects.php?Z1;
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/files/
commit: 013e029fbbd3a42dbb2c90512af276ab28754769 Author: Michael Orlitzky gentoo org> AuthorDate: Sun Sep 3 21:26:37 2017 + Commit: Michael Orlitzky gentoo org> CommitDate: Sun Sep 3 21:34:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013e029f app-text/htmldoc: remove unused patches. Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-text/htmldoc/files/htmldoc-break.patch | 30 - app-text/htmldoc/files/htmldoc-destdir.patch | 91 2 files changed, 121 deletions(-) diff --git a/app-text/htmldoc/files/htmldoc-break.patch b/app-text/htmldoc/files/htmldoc-break.patch deleted file mode 100644 index 33c4aaef544..000 --- a/app-text/htmldoc/files/htmldoc-break.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur htmldoc-1.8.29b/Makefile.in htmldoc-1.8.29c/Makefile.in htmldoc-1.8.29b/Makefile.in2016-04-13 17:02:29.706811414 + -+++ htmldoc-1.8.29c/Makefile.in2016-04-13 17:03:37.713630261 + -@@ -39,7 +39,7 @@ - all: Makedefs Makefile config.h htmldoc.list - for dir in $(DIRS); do\ - echo Making all in $$dir...;\ -- (cd $$dir; $(MAKE) -$(MAKEFLAGS)) || break;\ -+ (cd $$dir; $(MAKE) -$(MAKEFLAGS)) || exit 1;\ - done - - -@@ -50,7 +50,7 @@ - clean: - for dir in $(DIRS); do\ - echo Cleaning in $$dir...;\ -- (cd $$dir; $(MAKE) -$(MAKEFLAGS) clean) || break;\ -+ (cd $$dir; $(MAKE) -$(MAKEFLAGS) clean) || exit 1;\ - done - $(RM) *.bak - $(RM) *.bck -@@ -77,7 +77,7 @@ - $(MAKE) all - for dir in $(INSTALLDIRS); do\ - echo Installing in $$dir...;\ -- (cd $$dir; $(MAKE) -$(MAKEFLAGS) install) || break;\ -+ (cd $$dir; $(MAKE) -$(MAKEFLAGS) install) || exit 1;\ - done - - diff --git a/app-text/htmldoc/files/htmldoc-destdir.patch b/app-text/htmldoc/files/htmldoc-destdir.patch deleted file mode 100644 index 488bb0beb31..000 --- a/app-text/htmldoc/files/htmldoc-destdir.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -Naur htmldoc-1.8.29/data/Makefile htmldoc-1.8.29b/data/Makefile htmldoc-1.8.29/data/Makefile 2011-12-23 06:23:11.0 + -+++ htmldoc-1.8.29b/data/Makefile 2016-04-13 16:59:35.074270457 + -@@ -41,11 +41,11 @@ - # - - install: -- if [ ! -d $(datadir)/htmldoc/data ]; then\ -- $(MKDIR) $(datadir)/htmldoc/data;\ -+ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\ -+ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\ - fi -- $(CP) $(FILES) $(datadir)/htmldoc/data -- $(CHMOD) ugo+r $(datadir)/htmldoc/data/* -+ $(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data -+ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/* - - - # -diff -Naur htmldoc-1.8.29/doc/Makefile htmldoc-1.8.29b/doc/Makefile htmldoc-1.8.29/doc/Makefile2016-01-02 22:58:41.0 + -+++ htmldoc-1.8.29b/doc/Makefile 2016-04-13 16:57:46.628550948 + -@@ -45,16 +45,16 @@ - # - - install: $(DOCUMENTS) -- if test ! -d $(datadir)/doc/htmldoc; then\ -- $(MKDIR) $(datadir)/doc/htmldoc;\ -+ if test ! -d $(DESTDIR)$(datadir)/doc/htmldoc; then\ -+ $(MKDIR) $(DESTDIR)$(datadir)/doc/htmldoc;\ - fi -- $(CP) $(DOCFILES) $(datadir)/doc/htmldoc -- $(CHMOD) ugo+r $(datadir)/doc/htmldoc/* -- if test ! -d $(mandir)/man1; then\ -- $(MKDIR) $(mandir)/man1;\ -+ $(CP) $(DOCFILES) $(DESTDIR)$(datadir)/doc/htmldoc -+ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/doc/htmldoc/* -+ if test ! -d $(DESTDIR)$(mandir)/man1; then\ -+ $(MKDIR) $(DESTDIR)$(mandir)/man1;\ - fi -- $(CP) htmldoc.man $(mandir)/man1/htmldoc.1 -- $(CHMOD) ugo+r $(mandir)/man1/htmldoc.1 -+ $(CP) htmldoc.man $(DESTDIR)$(mandir)/man1/htmldoc.1 -+ $(CHMOD) ugo+r $(DESTDIR)$(mandir)/man1/htmldoc.1 - - - # -diff -Naur htmldoc-1.8.29/fonts/Makefile htmldoc-1.8.29b/fonts/Makefile htmldoc-1.8.29/fonts/Makefile 2011-12-23 06:23:11.0 + -+++ htmldoc-1.8.29b/fonts/Makefile 2016-04-13 16:56:35.317733427 + -@@ -62,15 +62,15 @@ - # - - install: -- echo "Installing font files in $(datadir)/htmldoc/fonts..." -- if [ ! -d $(datadir)/htmldoc/fonts ]; then\ -- $(MKDIR) $(datadir)/htmldoc/fonts;\ -+ echo "Installing font files in $(DESTDIR)$(datadir)/htmldoc/fonts..." -+ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/fonts ]; then\ -+ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/fonts;\ - fi - for font in $(FONTS); do \ -- $(CP) $$font.afm $(datadir)/htmldoc/fonts; \ -- $(CP) $$font.pfa $(datadir)/htmldoc/fonts; \ -+ $(CP) $$font.afm $(DESTDIR)$(datadir)/htmldoc/fonts; \ -+ $(CP) $$font.pfa $(DESTDIR)$(datadir)/htmldoc/fonts; \ - done -- $(CHMOD) ugo+r
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/files/
commit: 03051a29e85276b1bbc05ce58e07a6d1bc1348f0
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Aug 19 13:00:32 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Sep 2 14:46:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03051a29
app-text/htmldoc: remove unused patches
app-text/htmldoc/files/htmldoc-1.8.27-crash.patch | 11 --
app-text/htmldoc/files/htmldoc-fortify-fail.patch | 21
app-text/htmldoc/files/htmldoc-libpng15.patch | 116 -
.../htmldoc/files/htmldoc-sscanf-overflows.patch | 38 ---
4 files changed, 186 deletions(-)
diff --git a/app-text/htmldoc/files/htmldoc-1.8.27-crash.patch
b/app-text/htmldoc/files/htmldoc-1.8.27-crash.patch
deleted file mode 100644
index b339904ae41..000
--- a/app-text/htmldoc/files/htmldoc-1.8.27-crash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
htmldoc/ps-pdf.cxx 2006-08-01 18:58:50.0 +0200
-+++ htmldoc/ps-pdf.cxx 2008-04-26 21:19:49.0 +0200
-@@ -3624,7 +3624,7 @@
- * Get the width of the page number, leave room for three dots...
- */
-
-- if (heading >= 0)
-+ if (heading >= 0 && heading < num_headings)
- {
- hpage = heading_pages[heading];
- numberwidth = get_width((uchar *)pages[hpage].page_text,
diff --git a/app-text/htmldoc/files/htmldoc-fortify-fail.patch
b/app-text/htmldoc/files/htmldoc-fortify-fail.patch
deleted file mode 100644
index 32ec8873567..000
--- a/app-text/htmldoc/files/htmldoc-fortify-fail.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
htmldoc-1.8.27~/htmldoc/ps-pdf.cxx 2009-08-13 19:32:21.846860508 -0400
-+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx 2009-08-13 19:40:29.185857503 -0400
-@@ -8619,7 +8619,7 @@
- return (NULL);
- }
- // Safe because buffer is allocated...
--strcpy((char *)r->data.text.buffer, (char *)data);
-+memcpy((char *)r->data.text.buffer, (char *)data, strlen((char
*)data));
- get_color(_htmlTextColor, r->data.text.rgb);
- break;
- case RENDER_IMAGE :
-@@ -8640,7 +8640,7 @@
- return (NULL);
- }
- // Safe because buffer is allocated...
--strcpy((char *)r->data.link, (char *)data);
-+memcpy((char *)r->data.link, (char *)data, strlen((char *)data));
- break;
- }
-
diff --git a/app-text/htmldoc/files/htmldoc-libpng15.patch
b/app-text/htmldoc/files/htmldoc-libpng15.patch
deleted file mode 100644
index 7b834c304d2..000
--- a/app-text/htmldoc/files/htmldoc-libpng15.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-http://bugs.gentoo.org/385521
-http://www.htmldoc.org/str.php?L243+P0+S-2+C0+I0+E0+M10+Q
-
htmldoc/image.cxx
-+++ htmldoc/image.cxx
-@@ -1472,6 +1472,9 @@ image_load_png(image_t *img, /* I - Imag
- png_bytep *rows; /* PNG row pointers */
- uchar *inptr, /* Input pixels */
- *outptr;/* Output pixels */
-+ png_bytep trans_alpha;
-+ int num_trans;
-+ png_color_16p trans_color;
-
-
- /*
-@@ -1499,7 +1502,7 @@ image_load_png(image_t *img, /* I - Imag
-
- rows = NULL;
-
-- if (setjmp(pp->jmpbuf))
-+ if (setjmp(png_jmpbuf(pp)))
- {
- progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!");
-
-@@ -1526,7 +1529,7 @@ image_load_png(image_t *img, /* I - Imag
-
- png_read_info(pp, info);
-
-- if (info->color_type & PNG_COLOR_MASK_PALETTE)
-+ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE)
- {
- png_set_expand(pp);
-
-@@ -1535,15 +1538,15 @@ image_load_png(image_t *img, /* I - Imag
- if (Encryption)
- img->use ++;
- }
-- else if (info->bit_depth < 8)
-+ else if (png_get_bit_depth(pp, info) < 8)
- {
- png_set_packing(pp);
- png_set_expand(pp);
- }
-- else if (info->bit_depth == 16)
-+ else if (png_get_bit_depth(pp, info) == 16)
- png_set_strip_16(pp);
-
-- if (info->color_type & PNG_COLOR_MASK_COLOR)
-+ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
- {
- depth = 3;
- img->depth = gray ? 1 : 3;
-@@ -1554,10 +1557,11 @@ image_load_png(image_t *img, /* I - Imag
- img->depth = 1;
- }
-
-- img->width = info->width;
-- img->height = info->height;
-+ img->width = png_get_image_width(pp, info);
-+ img->height = png_get_image_height(pp, info);
-
-- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
-+ png_get_tRNS(pp, info, _alpha, _trans, _color);
-+ if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
- {
- if ((PSLevel == 0 && PDFVersion >= 14) || PSLevel == 3)
- image_need_mask(img, 8);
-@@ -1571,14 +1575,14 @@ image_load_png(image_t *img, /* I - Imag
-
- #ifdef DEBUG
- printf("color_type=0x%04x, depth=%d, img->width=%d, img->height=%d,
img->depth=%d\n",
-- info->color_type, depth, img->width, img->height, img->depth);
-- if
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 86926e54106f071a9288095e1a20d47b7be62e5e
Author: Michael Palimaka gentoo org>
AuthorDate: Sat Sep 2 14:41:47 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Sep 2 14:46:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86926e54
app-text/htmldoc: remove 1.8.29
Package-Manager: Portage-2.3.6, Repoman-2.3.3
app-text/htmldoc/Manifest | 1 -
app-text/htmldoc/htmldoc-1.8.29.ebuild | 57 --
2 files changed, 58 deletions(-)
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index 8df11ba658f..d8ed8a5b357 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,2 +1 @@
-DIST htmldoc-1.8.29-source.tar.bz2 4089227 SHA256
e8c96ad740d19169eab8305c8e2ee1c795c4afa59ba99d18786ad191a2853f31 SHA512
06c4367b84005624564dfb33d2cc632cbfc711268ffce9efe00c17760da17637949fc7415fd29fcd63edc26ba96ff18cf57d1e9d36e7205b92ac2095cf4acfc8
WHIRLPOOL
3efe016ce4e071d164e3ca44fe3c8cba9ba830eb0847215116fbccab45b7ae913bfe94c723d4c8ba952c48ce31c68e5c4a71bd7048030a03c8fb3dffe42ea6d3
DIST htmldoc-1.8.30-source.tar.gz 3901592 SHA256
7fb7a532f590f7ce1b7c8486d9fe30adaea3c7c32cb412ba7cf093d67cba5fc6 SHA512
713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
WHIRLPOOL
873cc5785bc295197e8461214f02279b6225b9ea07345a86e855341abc5a827aeef0c715b4c77ed8a74028e2a5a61ae6b0412055c09cbe39a92be54764561d7f
diff --git a/app-text/htmldoc/htmldoc-1.8.29.ebuild
b/app-text/htmldoc/htmldoc-1.8.29.ebuild
deleted file mode 100644
index 97ce52de2d9..000
--- a/app-text/htmldoc/htmldoc-1.8.29.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Convert HTML pages into a PDF document"
-SRC_URI="http://www.msweet.org/files/project1/${P}-source.tar.bz2;
-HOMEPAGE="http://www.msweet.org/projects.php?Z1;
-
-IUSE="fltk"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-
-DEPEND=">=media-libs/libpng-1.4:0=
- virtual/jpeg:0
- fltk? ( x11-libs/fltk:1 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # make sure not to use the libs htmldoc ships with
- mkdir foo ; mv jpeg foo/ ; mv png foo/ ; mv zlib foo/
-
- sed -i "s:^#define DOCUMENTATION \"\$prefix/share/doc/htmldoc\":#define
DOCUMENTATION \"\$prefix/share/doc/${PF}/html\":" \
- configure || die
-
- eapply "${FILESDIR}/${PN}-destdir.patch" \
- "${FILESDIR}/${PN}-break.patch"
-
- default
-}
-
-src_configure() {
- local myconf="$(use_with fltk gui)"
-
- CC=$(tc-getCC) CXX=$(tc-getCXX) \
- econf ${myconf}
- # Add missing -lfltk_images to LIBS
- if use fltk; then
- sed -i 's:-lfltk :-lfltk -lfltk_images :g' Makedefs || die
- fi
-}
-
-src_compile() {
- emake
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Minor cleanups
- mv "${D}/usr/share/doc/htmldoc" "${D}/usr/share/doc/${PF}"
- dodir /usr/share/doc/${PF}/html
- mv "${D}"/usr/share/doc/${PF}/*.html "${D}/usr/share/doc/${PF}/html"
-}
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 254b4604b4e1835295ded21c5e3f959743a5c8e7
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Jun 30 07:11:22 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Jun 30 07:11:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=254b4604
app-text/htmldoc: ia64 stable, bug #617642
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-text/htmldoc/htmldoc-1.8.30.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild
b/app-text/htmldoc/htmldoc-1.8.30.ebuild
index 2ec65718755..3678220fd15 100644
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.30.ebuild
@@ -10,7 +10,7 @@
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
IUSE="fltk"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
DEPEND=">=media-libs/libpng-1.4:0=
virtual/jpeg:0
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 99a82a0bd419f480a90583865acbf5926be3abd3
Author: Michael Orlitzky gentoo org>
AuthorDate: Sat May 6 05:54:34 2017 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Sat May 6 05:54:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a82a0b
app-text/htmldoc: new version 1.8.30.
This new version makes use of the DSTROOT build system variable,
avoiding the need to patch in DESTDIR everywhere. It also fixes some
more installation paths to avoid moving things around in src_install,
and avoids a (now-pointless) sed on the LIBS variable.
Gentoo-Bug: 615208
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-text/htmldoc/Manifest | 1 +
app-text/htmldoc/htmldoc-1.8.30.ebuild | 43 ++
2 files changed, 44 insertions(+)
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index db40799ac30..8df11ba658f 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1 +1,2 @@
DIST htmldoc-1.8.29-source.tar.bz2 4089227 SHA256
e8c96ad740d19169eab8305c8e2ee1c795c4afa59ba99d18786ad191a2853f31 SHA512
06c4367b84005624564dfb33d2cc632cbfc711268ffce9efe00c17760da17637949fc7415fd29fcd63edc26ba96ff18cf57d1e9d36e7205b92ac2095cf4acfc8
WHIRLPOOL
3efe016ce4e071d164e3ca44fe3c8cba9ba830eb0847215116fbccab45b7ae913bfe94c723d4c8ba952c48ce31c68e5c4a71bd7048030a03c8fb3dffe42ea6d3
+DIST htmldoc-1.8.30-source.tar.gz 3901592 SHA256
7fb7a532f590f7ce1b7c8486d9fe30adaea3c7c32cb412ba7cf093d67cba5fc6 SHA512
713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
WHIRLPOOL
873cc5785bc295197e8461214f02279b6225b9ea07345a86e855341abc5a827aeef0c715b4c77ed8a74028e2a5a61ae6b0412055c09cbe39a92be54764561d7f
diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild
b/app-text/htmldoc/htmldoc-1.8.30.ebuild
new file mode 100644
index 000..6d672ebc0ad
--- /dev/null
+++ b/app-text/htmldoc/htmldoc-1.8.30.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Convert HTML pages into a PDF document"
+HOMEPAGE="http://www.msweet.org/projects.php?Z1;
+SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz;
+IUSE="fltk"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=media-libs/libpng-1.4:0=
+ virtual/jpeg:0
+ fltk? ( x11-libs/fltk:1 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ default
+
+ # make sure not to use the libs htmldoc ships with
+ rm -r jpeg png zlib || die 'failed to unbundle jpeg, png, and zlib'
+
+ # Fix the documentation path in a few places. Some Makefiles aren't
+ # autotoolized =(
+ for file in configure doc/Makefile doc/htmldoc.man; do
+ sed -i "${file}" \
+ -e "s:/doc/htmldoc:/doc/${PF}/html:g" \
+ || die "failed to fix documentation path in ${file}"
+ done
+}
+
+src_configure() {
+ CC=$(tc-getCC) CXX=$(tc-getCXX) DSTROOT="${D}" econf $(use_with fltk
gui)
+}
+
+src_install() {
+ emake DSTROOT="${D}" install
+}
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 5734ce51ae989c6d907f680ede2a6e9dca75f585
Author: Aaron Bauman gentoo org>
AuthorDate: Thu Jan 19 10:39:32 2017 +
Commit: Aaron Bauman gentoo org>
CommitDate: Thu Jan 19 10:39:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5734ce51
app-text/htmldoc: security cleanup wrt bug #554262
Package-Manager: portage-2.3.0
app-text/htmldoc/Manifest | 1 -
app-text/htmldoc/htmldoc-1.8.27-r3.ebuild | 60 ---
2 files changed, 61 deletions(-)
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index 356f17d..db40799 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,2 +1 @@
-DIST htmldoc-1.8.27-source.tar.bz2 3960271 SHA256
89ffd223734268375dc959c200622dc5f167576c5cad9d7ce4bd7567faeb9613 SHA512
f0b2b6fec4925e549e74d6721f15b5de00c8c4889b0c67689945c408ed88074acb1330cae155655a1986adc0ca549cea32e242aa1ecac8e6338a1739f7c85438
WHIRLPOOL
0716ef8e70d11208668685b3b2cc742111940c91264a97531e705351721f3f14260c05479f35f73c2961238e163e0f5407c5bb2769984ccbcb5063736ebd4b39
DIST htmldoc-1.8.29-source.tar.bz2 4089227 SHA256
e8c96ad740d19169eab8305c8e2ee1c795c4afa59ba99d18786ad191a2853f31 SHA512
06c4367b84005624564dfb33d2cc632cbfc711268ffce9efe00c17760da17637949fc7415fd29fcd63edc26ba96ff18cf57d1e9d36e7205b92ac2095cf4acfc8
WHIRLPOOL
3efe016ce4e071d164e3ca44fe3c8cba9ba830eb0847215116fbccab45b7ae913bfe94c723d4c8ba952c48ce31c68e5c4a71bd7048030a03c8fb3dffe42ea6d3
diff --git a/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild
b/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild
deleted file mode 100644
index b863c8b..
--- a/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils
-
-DESCRIPTION="Convert HTML pages into a PDF document"
-SRC_URI="http://www.msweet.org/files/project1/${P}-source.tar.bz2;
-HOMEPAGE="http://www.msweet.org/projects.php?Z1;
-
-IUSE="fltk ssl"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-
-DEPEND=">=media-libs/libpng-1.4
- virtual/jpeg
- fltk? ( x11-libs/fltk:1 )
- ssl? ( >=dev-libs/openssl-0.9.6e )"
-RDEPEND="${DEPEND}"
-
-# this needs to be figured out, since htmldoc looks for all three libs
-# right now there's no virtual/ssl
-#
-# --enable-openssluse OpenSSL for SSL/TLS support, default=yes
-# --enable-gnutls use GNU TLS for SSL/TLS support, default=yes
-# --enable-cdsassluse CDSA for SSL/TLS support, default=yes
-
-src_prepare() {
- # make sure not to use the libs htmldoc ships with
- mkdir foo ; mv jpeg foo/ ; mv png foo/ ; mv zlib foo/
-
- epatch \
- "${FILESDIR}"/${PN}-sscanf-overflows.patch \
- "${FILESDIR}"/${PN}-fortify-fail.patch \
- "${FILESDIR}"/${PN}-libpng15.patch \
- "${FILESDIR}"/${P}-crash.patch
-
- sed -i "s:^#define DOCUMENTATION \"\$prefix/share/doc/htmldoc\":#define
DOCUMENTATION \"\$prefix/share/doc/${PF}/html\":" \
- configure || die
-}
-
-src_configure() {
- local myconf="$(use_enable ssl openssl) $(use_with fltk gui)"
- econf ${myconf}
- # Add missing -lfltk_images to LIBS
- if use fltk; then
- sed -i 's:-lfltk :-lfltk -lfltk_images :g' Makedefs || die
- fi
-}
-
-src_install() {
- einstall bindir="${D}/usr/bin"
-
- # Minor cleanups
- mv "${D}/usr/share/doc/htmldoc" "${D}/usr/share/doc/${PF}"
- dodir /usr/share/doc/${PF}/html
- mv "${D}"/usr/share/doc/${PF}/*.html "${D}/usr/share/doc/${PF}/html"
-}
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 26d12bfb81993a155aa86cef6f0cc5c7a201bb88 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Jan 14 12:47:30 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Sat Jan 14 12:47:55 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d12bfb app-text/htmldoc: Stable for HPPA (bug #554262). Package-Manager: Portage-2.3.3, Repoman-2.3.1 RepoMan-Options: --ignore-arches app-text/htmldoc/htmldoc-1.8.29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/htmldoc/htmldoc-1.8.29.ebuild b/app-text/htmldoc/htmldoc-1.8.29.ebuild index 5f7c959..478baec 100644 --- a/app-text/htmldoc/htmldoc-1.8.29.ebuild +++ b/app-text/htmldoc/htmldoc-1.8.29.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://www.msweet.org/projects.php?Z1; IUSE="fltk" SLOT="0" LICENSE="GPL-2" -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 sparc x86" DEPEND=">=media-libs/libpng-1.4:0= virtual/jpeg:0
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: 633b2eb8bcf297c86cc5186d5360186327e1e693 Author: Tobias Klausmann gentoo org> AuthorDate: Fri Dec 2 14:20:53 2016 + Commit: Tobias Klausmann gentoo org> CommitDate: Fri Dec 2 14:20:53 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633b2eb8 app-text/htmldoc-1.8.29-r0: stable on alpha Gentoo-Bug: 554262 app-text/htmldoc/htmldoc-1.8.29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/htmldoc/htmldoc-1.8.29.ebuild b/app-text/htmldoc/htmldoc-1.8.29.ebuild index ab8cc31..d5d6fc0 100644 --- a/app-text/htmldoc/htmldoc-1.8.29.ebuild +++ b/app-text/htmldoc/htmldoc-1.8.29.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://www.msweet.org/projects.php?Z1; IUSE="fltk" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" DEPEND=">=media-libs/libpng-1.4:0= virtual/jpeg:0
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: b1811ea3c3f9ae55a34d19dccffd5ba4edc08b03 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Dec 1 12:53:27 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Dec 1 12:53:27 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1811ea3 app-text/htmldoc: x86 stable wrt bug #554262 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> app-text/htmldoc/htmldoc-1.8.29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/htmldoc/htmldoc-1.8.29.ebuild b/app-text/htmldoc/htmldoc-1.8.29.ebuild index 33eb9ad..ab8cc31 100644 --- a/app-text/htmldoc/htmldoc-1.8.29.ebuild +++ b/app-text/htmldoc/htmldoc-1.8.29.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://www.msweet.org/projects.php?Z1; IUSE="fltk" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" DEPEND=">=media-libs/libpng-1.4:0= virtual/jpeg:0
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: de14f34593f7e30e451dad3a068b61d79d38d420 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Dec 1 12:50:39 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Dec 1 12:50:52 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de14f345 app-text/htmldoc: amd64 stable wrt bug #554262 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> app-text/htmldoc/htmldoc-1.8.29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/htmldoc/htmldoc-1.8.29.ebuild b/app-text/htmldoc/htmldoc-1.8.29.ebuild index c7cd08a..33eb9ad 100644 --- a/app-text/htmldoc/htmldoc-1.8.29.ebuild +++ b/app-text/htmldoc/htmldoc-1.8.29.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://www.msweet.org/projects.php?Z1; IUSE="fltk" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" DEPEND=">=media-libs/libpng-1.4:0= virtual/jpeg:0
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
commit: e5a4e48fe6bb76ef62fae3f22601b801dbe59a06
Author: Andrew Savchenko gentoo org>
AuthorDate: Thu Jun 2 07:32:10 2016 +
Commit: Andrew Savchenko gentoo org>
CommitDate: Thu Jun 2 07:33:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5a4e48f
app-text/htmldoc: respect system toolchain settings
If CC and CXX variables are not exported to configure, it ignores
system toolchain setup and forces its own compiler preferences,
where clang/clang++ are on the first place if found. This is likely
not what users want and causes configure failure if CFLAGS/CXXFLAGS
contain flag(s) not supported by clang, but supported by gcc.
Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko gentoo.org>
app-text/htmldoc/htmldoc-1.8.29.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app-text/htmldoc/htmldoc-1.8.29.ebuild
b/app-text/htmldoc/htmldoc-1.8.29.ebuild
index db8e075..c7cd08a 100644
--- a/app-text/htmldoc/htmldoc-1.8.29.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.29.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=6
-inherit eutils
+inherit eutils toolchain-funcs
DESCRIPTION="Convert HTML pages into a PDF document"
SRC_URI="http://www.msweet.org/files/project1/${P}-source.tar.bz2;
@@ -36,6 +36,7 @@ src_prepare() {
src_configure() {
local myconf="$(use_with fltk gui)"
+ CC=$(tc-getCC) CXX=$(tc-getCXX) \
econf ${myconf}
# Add missing -lfltk_images to LIBS
if use fltk; then
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/, app-text/htmldoc/files/
commit: f58c0f6d0c3fac33eb1957ff908d65d2f74ca36a Author: Kent Fredric gmail com> AuthorDate: Wed Apr 13 17:39:36 2016 + Commit: Andreas Hüttel gentoo org> CommitDate: Fri Apr 15 19:55:31 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f58c0f6d app-text/htmldoc: Bump to version 1.8.29 This bump includes 2 patches: - One to patch out the complete lack of DESTDIR support upstream - The other is to patch an annoying defect where failures in child Make targets result in "make" returning true, and the build finishing and installing in a broken state. Upstream have dropped SSL Support. This will hopefully resolve several bugs: - https://bugs.gentoo.org/572262 - Toralf - https://bugs.gentoo.org/549960 - Toralf - https://bugs.gentoo.org/527624 - Diego Thanks to Toralf Förster and Diego Elio Pettenò for reporting the bugs. Package-Manager: portage-2.2.28 RepoMan-Options: --include-arches="alpha amd64 amd64-fbsd arm arm64 hppa ia64 m68k mips nios2 ppc ppc64 riscv s390 sh sparc sparc-fbsd x86 x86-fbsd" app-text/htmldoc/Manifest| 1 + app-text/htmldoc/files/htmldoc-break.patch | 30 + app-text/htmldoc/files/htmldoc-destdir.patch | 91 app-text/htmldoc/htmldoc-1.8.29.ebuild | 57 + 4 files changed, 179 insertions(+) diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest index 3ebde95..356f17d 100644 --- a/app-text/htmldoc/Manifest +++ b/app-text/htmldoc/Manifest @@ -1 +1,2 @@ DIST htmldoc-1.8.27-source.tar.bz2 3960271 SHA256 89ffd223734268375dc959c200622dc5f167576c5cad9d7ce4bd7567faeb9613 SHA512 f0b2b6fec4925e549e74d6721f15b5de00c8c4889b0c67689945c408ed88074acb1330cae155655a1986adc0ca549cea32e242aa1ecac8e6338a1739f7c85438 WHIRLPOOL 0716ef8e70d11208668685b3b2cc742111940c91264a97531e705351721f3f14260c05479f35f73c2961238e163e0f5407c5bb2769984ccbcb5063736ebd4b39 +DIST htmldoc-1.8.29-source.tar.bz2 4089227 SHA256 e8c96ad740d19169eab8305c8e2ee1c795c4afa59ba99d18786ad191a2853f31 SHA512 06c4367b84005624564dfb33d2cc632cbfc711268ffce9efe00c17760da17637949fc7415fd29fcd63edc26ba96ff18cf57d1e9d36e7205b92ac2095cf4acfc8 WHIRLPOOL 3efe016ce4e071d164e3ca44fe3c8cba9ba830eb0847215116fbccab45b7ae913bfe94c723d4c8ba952c48ce31c68e5c4a71bd7048030a03c8fb3dffe42ea6d3 diff --git a/app-text/htmldoc/files/htmldoc-break.patch b/app-text/htmldoc/files/htmldoc-break.patch new file mode 100644 index 000..33c4aae --- /dev/null +++ b/app-text/htmldoc/files/htmldoc-break.patch @@ -0,0 +1,30 @@ +diff -Naur htmldoc-1.8.29b/Makefile.in htmldoc-1.8.29c/Makefile.in +--- htmldoc-1.8.29b/Makefile.in2016-04-13 17:02:29.706811414 + htmldoc-1.8.29c/Makefile.in2016-04-13 17:03:37.713630261 + +@@ -39,7 +39,7 @@ + all: Makedefs Makefile config.h htmldoc.list + for dir in $(DIRS); do\ + echo Making all in $$dir...;\ +- (cd $$dir; $(MAKE) -$(MAKEFLAGS)) || break;\ ++ (cd $$dir; $(MAKE) -$(MAKEFLAGS)) || exit 1;\ + done + + +@@ -50,7 +50,7 @@ + clean: + for dir in $(DIRS); do\ + echo Cleaning in $$dir...;\ +- (cd $$dir; $(MAKE) -$(MAKEFLAGS) clean) || break;\ ++ (cd $$dir; $(MAKE) -$(MAKEFLAGS) clean) || exit 1;\ + done + $(RM) *.bak + $(RM) *.bck +@@ -77,7 +77,7 @@ + $(MAKE) all + for dir in $(INSTALLDIRS); do\ + echo Installing in $$dir...;\ +- (cd $$dir; $(MAKE) -$(MAKEFLAGS) install) || break;\ ++ (cd $$dir; $(MAKE) -$(MAKEFLAGS) install) || exit 1;\ + done + + diff --git a/app-text/htmldoc/files/htmldoc-destdir.patch b/app-text/htmldoc/files/htmldoc-destdir.patch new file mode 100644 index 000..488bb0b --- /dev/null +++ b/app-text/htmldoc/files/htmldoc-destdir.patch @@ -0,0 +1,91 @@ +diff -Naur htmldoc-1.8.29/data/Makefile htmldoc-1.8.29b/data/Makefile +--- htmldoc-1.8.29/data/Makefile 2011-12-23 06:23:11.0 + htmldoc-1.8.29b/data/Makefile 2016-04-13 16:59:35.074270457 + +@@ -41,11 +41,11 @@ + # + + install: +- if [ ! -d $(datadir)/htmldoc/data ]; then\ +- $(MKDIR) $(datadir)/htmldoc/data;\ ++ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\ ++ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\ + fi +- $(CP) $(FILES) $(datadir)/htmldoc/data +- $(CHMOD) ugo+r $(datadir)/htmldoc/data/* ++ $(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data ++ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/* + + + # +diff -Naur htmldoc-1.8.29/doc/Makefile htmldoc-1.8.29b/doc/Makefile +--- htmldoc-1.8.29/doc/Makefile2016-01-02 22:58:41.0 + htmldoc-1.8.29b/doc/Makefile 2016-04-13 16:57:46.628550948 + +@@ -45,16 +45,16 @@ + # + + install: $(DOCUMENTS) +- if test ! -d $(datadir)/doc/htmldoc; then\ +- $(MKDIR) $(datadir)/doc/htmldoc;\ ++ if test ! -d
