summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2023-03-11 18:46:44 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2023-03-11 18:46:44 +0000
commitf8dc6fff6be3888e7895f1f998eca1e5a2b1d877 (patch)
tree0fb7b29bc7d204d39116c3d829626f4dc00b8de0
parent2023-03-11 18:41:24 UTC (diff)
parentmedia-gfx/graphviz: drop 5.0.1-r2 (diff)
downloadgentoo-f8dc6fff6be3888e7895f1f998eca1e5a2b1d877.tar.gz
gentoo-f8dc6fff6be3888e7895f1f998eca1e5a2b1d877.tar.bz2
gentoo-f8dc6fff6be3888e7895f1f998eca1e5a2b1d877.zip
Merge updates from master
-rw-r--r--dev-tcltk/tclperl/Manifest1
-rw-r--r--dev-tcltk/tclperl/metadata.xml8
-rw-r--r--dev-tcltk/tclperl/tclperl-3.2-r2.ebuild43
-rw-r--r--games-strategy/wargus-data/metadata.xml11
-rw-r--r--games-strategy/wargus-data/wargus-data-0-r1.ebuild45
-rw-r--r--media-gfx/graphviz/Manifest1
-rw-r--r--media-gfx/graphviz/graphviz-5.0.1-r2.ebuild216
-rw-r--r--profiles/package.mask25
-rw-r--r--www-client/dillo/Manifest3
-rw-r--r--www-client/dillo/dillo-3.0.5-r3.ebuild68
-rw-r--r--www-client/dillo/dillo-3.1_pre20181005.ebuild66
-rw-r--r--www-client/dillo/files/dillo-3.0.5-disable-ssl.patch22
-rw-r--r--www-client/dillo/files/dillo-3.0.5-fno-common.patch100
-rw-r--r--www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch26
-rw-r--r--www-client/dillo/files/dillo2-inbuf.patch15
-rw-r--r--www-client/dillo/metadata.xml8
16 files changed, 0 insertions, 658 deletions
diff --git a/dev-tcltk/tclperl/Manifest b/dev-tcltk/tclperl/Manifest
deleted file mode 100644
index 6d7ed26e54fd..000000000000
--- a/dev-tcltk/tclperl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tclperl-3.2.tar.bz2 11765 BLAKE2B 408bfa98a706edfed45d57183f2152bfdc9e0a8fa7b53b3d612f1d15e3e3733fc1eb6ef8df501a28446429ec78912b937f143ce43d23ceebc2ced58c6668a6f5 SHA512 aed6fb4b0275cf75e6024336e81e3cd1502d82ae697e79b6142d2f9b3cfb0891541cc585fa83d6219632f11d6eda43b141d009caf5fe7433b2b2ca92aa875c00
diff --git a/dev-tcltk/tclperl/metadata.xml b/dev-tcltk/tclperl/metadata.xml
deleted file mode 100644
index 7c79d6b524d2..000000000000
--- a/dev-tcltk/tclperl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>tcltk@gentoo.org</email>
- <name>Gentoo Tcltk Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-tcltk/tclperl/tclperl-3.2-r2.ebuild b/dev-tcltk/tclperl/tclperl-3.2-r2.ebuild
deleted file mode 100644
index 850c9507c6ff..000000000000
--- a/dev-tcltk/tclperl/tclperl-3.2-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Perl package for Tcl"
-HOMEPAGE="http://jfontain.free.fr/tclperl.htm"
-SRC_URI="http://jfontain.free.fr/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="
- >=dev-lang/tcl-8.3.3:=
- >=dev-lang/perl-5.6.0:=
- sys-libs/binutils-libs:="
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGES README)
-HTML_DOCS=( tclperl.htm )
-
-src_compile() {
- append-flags -fPIC
-
- # ./build.sh
- perl Makefile.PL || die
- emake OPTIMIZE="${CFLAGS}" Tcl.o
-
- $(tc-getCC) -shared ${LDFLAGS} ${CFLAGS} -o tclperl.so.${PV} -DUSE_TCL_STUBS \
- tclperl.c tclthread.c `perl -MExtUtils::Embed -e ccopts -e ldopts` \
- /usr/$(get_libdir)/libtclstub`echo 'puts $tcl_version' | tclsh`.a Tcl.o || die
-}
-
-src_install() {
- exeinto /usr/$(get_libdir)/${P}
- doexe tclperl.so.${PV}
- doexe pkgIndex.tcl
- einstalldocs
-}
diff --git a/games-strategy/wargus-data/metadata.xml b/games-strategy/wargus-data/metadata.xml
deleted file mode 100644
index cc7f88c680c1..000000000000
--- a/games-strategy/wargus-data/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">wargus</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/games-strategy/wargus-data/wargus-data-0-r1.ebuild b/games-strategy/wargus-data/wargus-data-0-r1.ebuild
deleted file mode 100644
index 9636a8e03f33..000000000000
--- a/games-strategy/wargus-data/wargus-data-0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cdrom
-
-DESCRIPTION="Warcraft II data for wargus (needs DOS CD)"
-HOMEPAGE="http://wargus.sourceforge.net/"
-SRC_URI=""
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# wargus is needed for wartool (bug #578340)
-DEPEND="
- games-strategy/wargus
- media-sound/cdparanoia
- media-sound/timidity++
- media-video/ffmpeg2theora"
-# wrt bug #419331
-RESTRICT="userpriv"
-
-S=${WORKDIR}
-
-src_configure() {
- export CDROM_NAME="WARCRAFT2"
- cdrom_get_cds data/rezdat.war
-}
-
-src_compile() {
- # cdparanoia needs write acces to the cdrom device
- # this fixes sandbox violation wrt #418051
- local save_sandbox_write=${SANDBOX_WRITE}
- addwrite /dev
- "${EPREFIX}"/usr/bin/wartool -v -r "${CDROM_ROOT}"/data "${S}"/ || die
- SANDBOX_WRITE=${save_sandbox_write}
-}
-
-src_install() {
- insinto /usr/share/stratagus/wargus
- doins -r .
-}
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 05a1386c4e39..20dc9175ae8c 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,2 +1 @@
-DIST graphviz-5.0.1.tar.xz 21493276 BLAKE2B 1eabf7dc175cde4827db682ae7c0cb00f5bec4bee8aa9801bc6ac86b06011588260ce261e25613d6d4a1e708ccb4fd65aba73210df8cf0af84f2e20b7c914167 SHA512 c1c5784558fd6f32cd8ce9b63c2bc5232f47ea1c4abf8fbfc1b8b0175aa30845af452dbc6651642f07f2c5b7a73f5c792934ca99561608a104ae99898eca3bc7
DIST graphviz-7.0.5.tar.xz 21484456 BLAKE2B 82fd4e97e946aaf603eeeda2d9e0628c46b5268323121262bb5b84c3b0d8bb78f35b695100c15e4a879d3b92324ae1b17e888b709be72e608e951f6f81dafe48 SHA512 2e4b4d5847503403f1bba6967095c8a24f68eedc852ffc532d397437c45d2a77f9791a2fef82fdbc7e18fd0556088fe4c2f240f1b6c276e5f12a5b68c003f4d4
diff --git a/media-gfx/graphviz/graphviz-5.0.1-r2.ebuild b/media-gfx/graphviz/graphviz-5.0.1-r2.ebuild
deleted file mode 100644
index a3f82af4f72b..000000000000
--- a/media-gfx/graphviz/graphviz-5.0.1-r2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
-# Unfortunately upstream uses an "artifact" store for the pre-generated
-# tarball now, which makes predictable URLs impossible.
-SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
-
-REQUIRED_USE="
- !cairo? ( !X !gtk2 !postscript !lasi )
- pdf? ( cairo )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Requires ksh, tests against installed package, missing files and directory
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/expat-2
- >=dev-libs/glib-2.11.1:2
- dev-libs/libltdl:0
- >=media-libs/fontconfig-2.3.95
- >=media-libs/freetype-2.1.10
- >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
- media-libs/libjpeg-turbo:=
- >=media-libs/libpng-1.2:0=
- sys-libs/zlib
- virtual/libiconv
- cairo? (
- >=x11-libs/cairo-1.1.10[svg(+)]
- >=x11-libs/pango-1.12
- )
- devil? ( media-libs/devil[png,jpeg] )
- gtk2? (
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:2
- )
- gts? ( sci-libs/gts )
- guile? ( dev-scheme/guile )
- lasi? ( media-libs/lasi )
- pdf? ( app-text/poppler )
- perl? ( dev-lang/perl:= )
- postscript? ( app-text/ghostscript-gpl:= )
- python? ( ${PYTHON_DEPS} )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- )
- ruby? ( dev-lang/ruby:* )
- svg? ( gnome-base/librsvg )
- tcl? ( >=dev-lang/tcl-8.3:0= )
- webp? ( media-libs/libwebp:= )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
-BDEPEND="
- sys-devel/flex
- sys-devel/libtool
- virtual/pkgconfig
- doc? (
- app-text/ghostscript-gpl
- sys-apps/groff
- )
- guile? (
- dev-lang/swig
- dev-scheme/guile
- )
- nls? ( >=sys-devel/gettext-0.14.5 )
- perl? ( dev-lang/swig )
- python? ( dev-lang/swig )
- ruby? ( dev-lang/swig )
- tcl? ( dev-lang/swig )"
-
-# Dependency description / Maintainer info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-# the ones which are always compiled in, depend on zlib, gd
-# - gtk
-# Directly depends on gtk-2.
-# needs 'pangocairo' enabled in graphviz configuration
-# gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-# Directly depends on gtk-2 and gdk-pixbuf.
-# needs 'pangocairo' enabled in graphviz configuration
-# - ming
-# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-# incomplete.
-# - cairo/pango:
-# Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-# needs cairo+pango,
-# can make use of gnomeui and inotify support (??? unsure),
-# needs libXaw for UI
-# UI also links directly against libX11, libXmu, and libXt
-# and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - go (disabled)
-# - io (disabled)
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, gvedit, gvpr, smyrna, tools/* :)
-# sci-libs/gts can be used for some of these
-# - gvedit (via 'qt5'):
-# based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-# currently disabled -- it segfaults a lot
-# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png'
-# with flags enabled at configure time
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myconf=(
- # Speeds up the libltdl configure
- --cache-file="${S}"/config.cache
- --enable-ltdl
- $(use_enable doc man-pdfs)
- $(use_with cairo pangocairo)
- $(use_with examples demos '$(docdir)/examples')
- $(use_with devil)
- $(use_with gtk2 gdk)
- $(use_with gtk2 gdk-pixbuf)
- $(use_with gtk2)
- $(use_with gts)
- $(use_with qt5 qt)
- $(use_with lasi)
- $(use_with pdf poppler)
- $(use_with postscript ghostscript)
- $(use_with svg rsvg)
- $(use_with webp)
- $(use_with X x)
- --with-digcola
- --with-fontconfig
- --with-freetype2
- --with-ipsepcola
- --with-libgd
- --with-sfdp
- --without-ming
- # New/experimental features, to be tested, disable for now
- --without-ipsepcola
- --without-smyrna
- --without-visio
- # Bindings
- $(use_enable guile)
- $(use_enable perl)
- $(use_enable python python3)
- $(use_enable ruby)
- $(use_enable tcl)
- --disable-go
- --disable-io
- --disable-lua
- --disable-java
- --disable-ocaml
- --disable-php
- --disable-python
- --disable-r
- --disable-sharp
- # libtool file collision, bug #276609
- --without-included-ltdl
- --disable-ltdl-install
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete || die
-
- use python && python_optimize \
- "${D}"$(python_get_sitedir) \
- "${ED}"/usr/$(get_libdir)/graphviz/python3
-}
-
-pkg_postinst() {
- # We need to register all plugins before they become usable
- dot -c || die
-}
-
-pkg_postrm() {
- # Remove cruft, bug #547344
- rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 57dd34156031..b0c0c2e2ac7c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -391,12 +391,6 @@ media-plugins/vdr-vaapidevice
media-sound/potamus
media-video/ffmpeg2theora
-# Michał Górny <mgorny@gentoo.org> (2023-01-21)
-# Obsoleted in favor of using extract-on-the-first-run feature
-# of games-strategy/wargus.
-# Removal on 2023-02-20. Bug #578340.
-games-strategy/wargus-data
-
# Hans de Graaff <graaff@gentoo.org> (2023-01-21)
# No longer maintained upstream and missing recent security fixes.
# Use a newer Rails version instead.
@@ -416,12 +410,6 @@ dev-ruby/railties:5.2
dev-ruby/arel
=www-apps/redmine-4.2.9
-# Alfredo Tupone <tupone@gentoo.org> (2023-01-18)
-# Masked for removal in 30 days.
-# Not maintained (2006), no rev dep, bugs
-# (bug #891283)
-dev-tcltk/tclperl
-
# David Seifert <soap@gentoo.org> (2023-01-14)
# Py3.8 only backports
dev-python/backports-tempfile
@@ -429,19 +417,6 @@ dev-python/backports-weakref
dev-python/backports-zoneinfo
dev-python/pkgutil_resolve_name
-# Andreas Sturmlechner <asturm@gentoo.org> (2023-01-10)
-# Unmaintained and reportedly broken by KDE Plasma 5.25 already.
-# Masking current stable version is the first step towards last-rites.
-# Consider migrating away from latte-dock for your workflow.
-# See also: https://tinyurl.com/39dkw43a (links to reddit)
-# Removal on 2023-01-30.
-=kde-misc/latte-dock-0.10.8*
-
-# Jonas Stein <jstein@gentoo.org> (2023-01-09)
-# Dead upstream, open bugs unmaintained.
-# Removal after 2023-03-01. Bug #890244.
-www-client/dillo
-
# Sam James <sam@gentoo.org> (2023-01-05)
# Breaks reverse dependencies: bug #889694, bug #888579.
=sys-fs/btrfs-progs-6.1.1
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
deleted file mode 100644
index 94b5f61b5221..000000000000
--- a/www-client/dillo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dillo-3.0.5.tar.bz2 734472 BLAKE2B c8a7ac3a875740d2d64269b0d368e6f9395c89a56737dda9d6dcb013f5d46631e4f6f68e251f7104c0ec9bbb14bcc10b67a7f519558f857743d7cf15976f197c SHA512 d0e86f57e50da762debf592b6deb94de5ee58f84e0cae1159890262540a463aea8143d2b99c634021c1f273f91c2fe0918f30d72c3eaf91fdb541e741469b155
-DIST dillo-3.1_pre20181005.tar.xz 907752 BLAKE2B a894583e2c50baf2c2ff615dadfbe79e7652154cc0f7b80a4253d27dbe2e5463fa9c7a44622a6cfdcc60822cee0e1c38c31231b5bc5ee9c7b22bb16a15cc8c90 SHA512 f1916c6261bfcae9264037eaee37497660e43e46641c42fbcc9c2592fa41602a83fc91ddce6aeabc0122c575bcff72339d181210f3039e5d4c5a7c25f88aa642
-DIST dillo.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7ec67018b17044a417209954d67f22e2000b0871d315a25388bacffab9599230fc9615877a2f08 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833
diff --git a/www-client/dillo/dillo-3.0.5-r3.ebuild b/www-client/dillo/dillo-3.0.5-r3.ebuild
deleted file mode 100644
index ca952fe8090d..000000000000
--- a/www-client/dillo/dillo-3.0.5-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop multilib toolchain-funcs
-
-DESCRIPTION="Lean FLTK based web browser"
-HOMEPAGE="https://www.dillo.org/"
-SRC_URI="
- https://www.dillo.org/download/${P}.tar.bz2
- mirror://gentoo/${PN}.png
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="doc +gif ipv6 +jpeg +png ssl"
-
-RDEPEND="
- >=x11-libs/fltk-1.3
- sys-libs/zlib
- jpeg? ( virtual/jpeg:0 )
- png? ( >=media-libs/libpng-1.2:0 )
- ssl? (
- dev-libs/openssl:0=
- )
-"
-BDEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}2-inbuf.patch
- "${FILESDIR}"/${PN}-3.0.5-fno-common.patch
- "${FILESDIR}"/${PN}-3.0.5-openssl-1.1.patch
-)
-DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable gif) \
- $(use_enable ipv6) \
- $(use_enable jpeg) \
- $(use_enable png) \
- $(use_enable ssl)
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
- if use doc; then
- doxygen Doxyfile || die
- fi
-}
-
-src_install() {
- dodir /etc
- default
-
- use doc && dodoc -r html
-
- doicon "${DISTDIR}"/${PN}.png
- make_desktop_entry ${PN} Dillo
-}
diff --git a/www-client/dillo/dillo-3.1_pre20181005.ebuild b/www-client/dillo/dillo-3.1_pre20181005.ebuild
deleted file mode 100644
index b2571abda654..000000000000
--- a/www-client/dillo/dillo-3.1_pre20181005.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop toolchain-funcs
-
-DESCRIPTION="Lean FLTK based web browser"
-HOMEPAGE="https://www.dillo.org/"
-SRC_URI="
- https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz
- mirror://gentoo/${PN}.png
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="doc +gif ipv6 +jpeg +png ssl +xembed"
-
-RDEPEND="
- >=x11-libs/fltk-1.3
- sys-libs/zlib
- jpeg? ( virtual/jpeg:0 )
- png? ( >=media-libs/libpng-1.2:0 )
- ssl? ( net-libs/mbedtls:= )
-"
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}2-inbuf.patch
- "${FILESDIR}"/${PN}-3.0.5-fno-common.patch
- "${FILESDIR}"/${PN}-3.0.5-disable-ssl.patch
-)
-DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable gif) \
- $(use_enable ipv6) \
- $(use_enable jpeg) \
- $(use_enable png) \
- $(use_enable ssl) \
- $(use_enable xembed)
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
- if use doc; then
- doxygen Doxyfile || die
- fi
-}
-
-src_install() {
- default
-
- use doc && dodoc -r html
-
- doicon "${DISTDIR}"/${PN}.png
- make_desktop_entry ${PN} Dillo
-}
diff --git a/www-client/dillo/files/dillo-3.0.5-disable-ssl.patch b/www-client/dillo/files/dillo-3.0.5-disable-ssl.patch
deleted file mode 100644
index de96ea6c1586..000000000000
--- a/www-client/dillo/files/dillo-3.0.5-disable-ssl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# HG changeset patch
-# User Johannes Hofmann <Johannes.Hofmann@gmx.de>
-# Date 1612905342 -3600
-# Node ID 67b70f024568b505633524be61fcfbde5337849f
-# Parent f60d55c0256759b578b54c577da94670a7737c8a
-fix build with --disable-ssl
-
-submitted-by: John DiMarco <jdd@cs.toronto.edu>
-
-diff -r f60d55c02567 -r 67b70f024568 src/IO/tls.h
---- a/src/IO/tls.h Fri Oct 05 22:05:08 2018 +0200
-+++ b/src/IO/tls.h Tue Feb 09 22:15:42 2021 +0100
-@@ -35,6 +35,7 @@
- #define a_Tls_connect_ready(url) TLS_CONNECT_NEVER
- #define a_Tls_reset_server_state(url) ;
- #define a_Tls_handshake(fd, url) ;
-+#define a_Tls_connect(fd, url) ;
- #define a_Tls_connection(fd) NULL
- #define a_Tls_freeall() ;
- #define a_Tls_close_by_fd(fd) ;
-
diff --git a/www-client/dillo/files/dillo-3.0.5-fno-common.patch b/www-client/dillo/files/dillo-3.0.5-fno-common.patch
deleted file mode 100644
index df80f55afaf8..000000000000
--- a/www-client/dillo/files/dillo-3.0.5-fno-common.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- a/dpid/dpid.c
-+++ b/dpid/dpid.c
-@@ -41,6 +41,26 @@
- volatile sig_atomic_t caught_sigchld = 0;
- char *SharedKey = NULL;
-
-+char *srs_name;
-+
-+/*! dpid's service request socket file descriptor */
-+int srs_fd;
-+
-+/*! Number of available plugins */
-+int numdpis;
-+
-+/*! Number of sockets being watched */
-+int numsocks;
-+
-+/*! State information for each plugin. */
-+struct dp *dpi_attr_list;
-+
-+/*! service served for each plugin */
-+Dlist *services_list;
-+
-+/*! Set of sockets watched for connections */
-+fd_set sock_set;
-+
- /*! Remove dpid_comm_keys file.
- * This avoids that dillo instances connect to a stale port after dpid
- * has exited (e.g. after a reboot).
---- a/dpid/dpid.h
-+++ b/dpid/dpid.h
-@@ -25,10 +25,10 @@
-
- /*! \TODO: Should read this from dillorc */
- #define SRS_NAME "dpid.srs"
--char *srs_name;
-+extern char *srs_name;
-
- /*! dpid's service request socket file descriptor */
--int srs_fd;
-+extern int srs_fd;
-
- /*! plugin state information
- */
-@@ -49,19 +49,19 @@
- };
-
- /*! Number of available plugins */
--int numdpis;
-+extern int numdpis;
-
- /*! Number of sockets being watched */
--int numsocks;
-+extern int numsocks;
-
- /*! State information for each plugin. */
--struct dp *dpi_attr_list;
-+extern struct dp *dpi_attr_list;
-
- /*! service served for each plugin */
--Dlist *services_list;
-+extern Dlist *services_list;
-
- /*! Set of sockets watched for connections */
--fd_set sock_set;
-+extern fd_set sock_set;
-
- /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
- extern volatile sig_atomic_t caught_sigchld;
---- a/dpid/dpid_common.c
-+++ b/dpid/dpid_common.c
-@@ -14,6 +14,9 @@
- #include <unistd.h>
- #include "dpid_common.h"
-
-+/*! Error codes for dpid */
-+dpi_errno_t dpi_errno;
-+
- /*
- * Send a verbose error message.
- */
---- a/dpid/dpid_common.h
-+++ b/dpid/dpid_common.h
-@@ -35,12 +35,13 @@
- #define CKD_WRITE(fd, msg) ckd_write(fd, msg, __FILE__, __LINE__)
- #define CKD_CLOSE(fd) ckd_close(fd, __FILE__, __LINE__)
-
--
- /*! Error codes for dpid */
--enum {
-+typedef enum {
- no_errors,
- dpid_srs_addrinuse /* dpid service request socket address already in use */
--} dpi_errno;
-+} dpi_errno_t;
-+
-+extern dpi_errno_t dpi_errno;
-
- /*! Intended for identifying dillo plugins
- * and related files
diff --git a/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch b/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch
deleted file mode 100644
index f21694113c2b..000000000000
--- a/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -286,7 +286,7 @@
-
- if test "x$ssl_ok" = "xyes"; then
- old_libs="$LIBS"
-- AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto)
-+ AC_CHECK_LIB(ssl, OPENSSL_config, ssl_ok=yes, ssl_ok=no, -lcrypto)
- LIBS="$old_libs"
- fi
-
---- a/dpi/https.c
-+++ b/dpi/https.c
-@@ -476,7 +476,11 @@
- case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
- /*Either self signed and untrusted*/
- /*Extract CN from certificate name information*/
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
-+#else
-+ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
-+#endif
- strcpy(buf, "(no CN given)");
- } else {
- char *cn_end;
-
diff --git a/www-client/dillo/files/dillo2-inbuf.patch b/www-client/dillo/files/dillo2-inbuf.patch
deleted file mode 100644
index bc351c252fe6..000000000000
--- a/www-client/dillo/files/dillo2-inbuf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/form.cc
-+++ b/src/form.cc
-@@ -1240,8 +1240,9 @@
- int rc = 0;
- Dstr *output;
- const int bufsize = 128;
-- inbuf_t *inPtr;
-- char *buffer, *outPtr;
-+ //inbuf_t *inPtr;
-+ //char *buffer, *outPtr;
-+ char *buffer, *outPtr, *inPtr;
- size_t inLeft, outRoom;
- bool bad_chars = false;
-
-
diff --git a/www-client/dillo/metadata.xml b/www-client/dillo/metadata.xml
deleted file mode 100644
index f55ea9cc39b2..000000000000
--- a/www-client/dillo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-<use>
-<flag name="xembed">Enable X11 XEmbed support</flag>
-</use>
-</pkgmetadata>