From 3d92bd162a0ed612d020988b6350a5665c9f1ece Mon Sep 17 00:00:00 2001 From: ormorph Date: Mon, 6 Dec 2021 00:15:19 +0300 Subject: Dependencies fixes Signed-off-by: ormorph --- dev-libs/libr/Manifest | 1 + dev-libs/libr/libr-14.0.11.ebuild | 31 ++++++++++++++++++++++ dev-libs/libr/metadata.xml | 5 +++- dev-libs/skyutils/skyutils-2.9.ebuild | 7 ++--- media-video/emovix/emovix-0.9.0.ebuild | 2 +- trinity-apps/smartcardauth/metadata.xml | 5 +++- .../smartcardauth/smartcardauth-9999.ebuild | 4 +-- trinity-base/krdc/krdc-14.0.11.ebuild | 5 ++-- trinity-base/krdc/krdc-9999.ebuild | 5 ++-- trinity-base/krdc/metadata.xml | 8 +++--- trinity-base/krfb/krfb-14.0.11.ebuild | 4 +-- trinity-base/krfb/krfb-9999.ebuild | 4 +-- trinity-base/krfb/metadata.xml | 8 +++--- trinity-base/quanta/quanta-14.0.11.ebuild | 2 +- trinity-base/quanta/quanta-9999.ebuild | 2 +- trinity-base/tdelibs/tdelibs-14.0.11.ebuild | 5 ++-- trinity-base/tdelibs/tdelibs-9999.ebuild | 5 ++-- www-misc/hldig/hldig-1.0.2.ebuild | 10 +++---- www-misc/hldig/metadata.xml | 5 +++- 19 files changed, 72 insertions(+), 46 deletions(-) create mode 100644 dev-libs/libr/Manifest create mode 100644 dev-libs/libr/libr-14.0.11.ebuild diff --git a/dev-libs/libr/Manifest b/dev-libs/libr/Manifest new file mode 100644 index 00000000..f16086d0 --- /dev/null +++ b/dev-libs/libr/Manifest @@ -0,0 +1 @@ +DIST libr-trinity-14.0.11.tar.xz 83208 BLAKE2B 2ac314c374bc07b0d914a47decd02c44a89a19db272ce6f2427a9348a9324e9245a91b255ac36f5e2636b09b9670fea55cbd31f27c86032beb5a2c0873336f71 SHA512 d18fa1ba243addfdbb2df4c0d4dc103d80de17c328c61de349ec2eacf6f49f5a6427a906802ea55a9398a3361a6e56a46b36397b183a846d60745aeb2eb1303b diff --git a/dev-libs/libr/libr-14.0.11.ebuild b/dev-libs/libr/libr-14.0.11.ebuild new file mode 100644 index 00000000..ffce1f98 --- /dev/null +++ b/dev-libs/libr/libr-14.0.11.ebuild @@ -0,0 +1,31 @@ +# Copyright 2021 The Trinity Desktop Project +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +TRINITY_MODULE_TYPE="dependencies" +TRINITY_MODULE_NAME="libr" +inherit trinity-base-2 + +DESCRIPTION="ELF resource access and editing library" +HOMEPAGE="https://trinitydesktop.org/" + +LICENSE="LGPL-2.1" +SLOT="0" +if [[ ${PV} != *9999* ]] ; then + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +DEPEND="sys-libs/binutils-libs:=" +DEPEND="${RDEPEND} + app-doc/doxygen +" + +src_configure() { + local mycmakeargs=( + -DWITH_BACKEND_LIBBFD=ON + -DWITH_BACKEND_LIBELF=OFF + -DWITH_BACKEND_READONLY=OFF + ) + cmake-utils_src_configure +} diff --git a/dev-libs/libr/metadata.xml b/dev-libs/libr/metadata.xml index 7a38bb90..689e1534 100644 --- a/dev-libs/libr/metadata.xml +++ b/dev-libs/libr/metadata.xml @@ -1,5 +1,8 @@ - + + team-gentoo@trinitydesktop.org + Trinity Gentoo ebuilds project + diff --git a/dev-libs/skyutils/skyutils-2.9.ebuild b/dev-libs/skyutils/skyutils-2.9.ebuild index cf551732..31fc8fc1 100644 --- a/dev-libs/skyutils/skyutils-2.9.ebuild +++ b/dev-libs/skyutils/skyutils-2.9.ebuild @@ -13,16 +13,13 @@ SRC_URI="https://mirror.amdmi3.ru/distfiles/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86" -IUSE="ssl libressl" +IUSE="ssl" # Don't use Gentoo mirrors RESTRICT="mirror" DEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) - )" + ssl? ( dev-libs/openssl:= )" RDEPEND="${DEPEND}" PATCHES=( diff --git a/media-video/emovix/emovix-0.9.0.ebuild b/media-video/emovix/emovix-0.9.0.ebuild index 038e8a9b..b51d8aec 100644 --- a/media-video/emovix/emovix-0.9.0.ebuild +++ b/media-video/emovix/emovix-0.9.0.ebuild @@ -15,7 +15,7 @@ KEYWORDS="amd64 ppc ppc64 x86" # Don't use Gentoo mirrors RESTRICT="mirror" -RDEPEND="virtual/cdrtools" +RDEPEND="app-cdr/cdrtools" DEPEND="dev-lang/perl virtual/awk" diff --git a/trinity-apps/smartcardauth/metadata.xml b/trinity-apps/smartcardauth/metadata.xml index 7a38bb90..689e1534 100644 --- a/trinity-apps/smartcardauth/metadata.xml +++ b/trinity-apps/smartcardauth/metadata.xml @@ -1,5 +1,8 @@ - + + team-gentoo@trinitydesktop.org + Trinity Gentoo ebuilds project + diff --git a/trinity-apps/smartcardauth/smartcardauth-9999.ebuild b/trinity-apps/smartcardauth/smartcardauth-9999.ebuild index 49c5746f..beb2f430 100644 --- a/trinity-apps/smartcardauth/smartcardauth-9999.ebuild +++ b/trinity-apps/smartcardauth/smartcardauth-9999.ebuild @@ -15,12 +15,10 @@ SLOT="14" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~x86" fi -IUSE="libressl" DEPEND=" dev-libs/pkcs11-helper net-libs/gnutls - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) + dev-libs/openssl:= " RDEPEND="${DEPEND}" diff --git a/trinity-base/krdc/krdc-14.0.11.ebuild b/trinity-base/krdc/krdc-14.0.11.ebuild index 91d65f57..c016aec9 100644 --- a/trinity-base/krdc/krdc-14.0.11.ebuild +++ b/trinity-base/krdc/krdc-14.0.11.ebuild @@ -12,11 +12,10 @@ DESCRIPTION="Trinity remote desktop connection (RDP and VNC) client" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi -IUSE="rdp libressl" +IUSE="rdp" DEPEND=" - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) + dev-libs/openssl:= x11-libs/libXext " RDEPEND="${DEPEND} diff --git a/trinity-base/krdc/krdc-9999.ebuild b/trinity-base/krdc/krdc-9999.ebuild index 5de0c87c..fb270673 100644 --- a/trinity-base/krdc/krdc-9999.ebuild +++ b/trinity-base/krdc/krdc-9999.ebuild @@ -12,11 +12,10 @@ DESCRIPTION="Trinity remote desktop connection (RDP and VNC) client" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~x86" fi -IUSE="rdp libressl" +IUSE="rdp" DEPEND=" - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) + dev-libs/openssl:= x11-libs/libXext " RDEPEND="${DEPEND} diff --git a/trinity-base/krdc/metadata.xml b/trinity-base/krdc/metadata.xml index 6e9f5e4a..689e1534 100644 --- a/trinity-base/krdc/metadata.xml +++ b/trinity-base/krdc/metadata.xml @@ -1,8 +1,8 @@ - - fatzer2@gmail.com - Alexander Golubev - + + team-gentoo@trinitydesktop.org + Trinity Gentoo ebuilds project + diff --git a/trinity-base/krfb/krfb-14.0.11.ebuild b/trinity-base/krfb/krfb-14.0.11.ebuild index 667c6637..fcfcd83b 100644 --- a/trinity-base/krfb/krfb-14.0.11.ebuild +++ b/trinity-base/krfb/krfb-14.0.11.ebuild @@ -12,11 +12,9 @@ DESCRIPTION="VNC-compatible server to share Trinity desktops" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi -IUSE="libressl" DEPEND=" - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) + dev-libs/openssl:= x11-libs/libXext " RDEPEND="${DEPEND}" diff --git a/trinity-base/krfb/krfb-9999.ebuild b/trinity-base/krfb/krfb-9999.ebuild index 9050d652..ecdd47a4 100644 --- a/trinity-base/krfb/krfb-9999.ebuild +++ b/trinity-base/krfb/krfb-9999.ebuild @@ -12,11 +12,9 @@ DESCRIPTION="VNC-compatible server to share Trinity desktops" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~x86" fi -IUSE="libressl" DEPEND=" - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) + dev-libs/openssl:= x11-libs/libXext " RDEPEND="${DEPEND}" diff --git a/trinity-base/krfb/metadata.xml b/trinity-base/krfb/metadata.xml index 6e9f5e4a..689e1534 100644 --- a/trinity-base/krfb/metadata.xml +++ b/trinity-base/krfb/metadata.xml @@ -1,8 +1,8 @@ - - fatzer2@gmail.com - Alexander Golubev - + + team-gentoo@trinitydesktop.org + Trinity Gentoo ebuilds project + diff --git a/trinity-base/quanta/quanta-14.0.11.ebuild b/trinity-base/quanta/quanta-14.0.11.ebuild index efc3e687..0caba6e4 100644 --- a/trinity-base/quanta/quanta-14.0.11.ebuild +++ b/trinity-base/quanta/quanta-14.0.11.ebuild @@ -25,7 +25,7 @@ fi IUSE="" DEPEND=" - app-text/tidy-html5 + app-text/htmltidy dev-libs/libxml2 dev-libs/libxslt ~trinity-base/klinkstatus-${PV} diff --git a/trinity-base/quanta/quanta-9999.ebuild b/trinity-base/quanta/quanta-9999.ebuild index f8cfc37c..a4dccfb1 100644 --- a/trinity-base/quanta/quanta-9999.ebuild +++ b/trinity-base/quanta/quanta-9999.ebuild @@ -25,7 +25,7 @@ fi IUSE="" DEPEND=" - app-text/tidy-html5 + app-text/htmltidy dev-libs/libxml2 dev-libs/libxslt ~trinity-base/klinkstatus-${PV} diff --git a/trinity-base/tdelibs/tdelibs-14.0.11.ebuild b/trinity-base/tdelibs/tdelibs-14.0.11.ebuild index d65ff997..36ff31c3 100644 --- a/trinity-base/tdelibs/tdelibs-14.0.11.ebuild +++ b/trinity-base/tdelibs/tdelibs-14.0.11.ebuild @@ -19,7 +19,7 @@ fi # NOTE: Building without tdehwlib segfaults, but you can try and report. IUSE="alsa arts cryptsetup cups debug elficons elogind fam +hwlib +idn jpeg2k - kernel_linux libressl lua lzma malloc networkmanager openexr +pcre pcsc-lite + kernel_linux lua lzma malloc networkmanager openexr +pcre pcsc-lite pkcs11 +shm spell +ssl sudo +svg systemd tiff udevil udisks upower utempter xcomposite +xrandr zeroconf" @@ -50,8 +50,7 @@ DEPEND=" spell? ( app-text/aspell ) ssl? ( app-misc/ca-certificates - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) + dev-libs/openssl:= ) sudo? ( app-admin/sudo ) svg? ( media-libs/libart_lgpl ) diff --git a/trinity-base/tdelibs/tdelibs-9999.ebuild b/trinity-base/tdelibs/tdelibs-9999.ebuild index 93dfd3f9..455e67b6 100644 --- a/trinity-base/tdelibs/tdelibs-9999.ebuild +++ b/trinity-base/tdelibs/tdelibs-9999.ebuild @@ -19,7 +19,7 @@ fi # NOTE: Building without tdehwlib segfaults, but you can try and report. IUSE="alsa arts cryptsetup cups debug elficons elogind fam +hwlib +idn jpeg2k - kernel_linux libressl lua lzma malloc networkmanager openexr +pcre pcsc-lite + kernel_linux lua lzma malloc networkmanager openexr +pcre pcsc-lite pkcs11 +shm spell +ssl sudo +svg systemd tiff udevil udisks upower utempter xcomposite +xrandr zeroconf" @@ -50,8 +50,7 @@ DEPEND=" spell? ( app-text/aspell ) ssl? ( app-misc/ca-certificates - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) + dev-libs/openssl:= ) sudo? ( app-admin/sudo ) svg? ( media-libs/libart_lgpl ) diff --git a/www-misc/hldig/hldig-1.0.2.ebuild b/www-misc/hldig/hldig-1.0.2.ebuild index e25cdb4f..51cdf926 100644 --- a/www-misc/hldig/hldig-1.0.2.ebuild +++ b/www-misc/hldig/hldig-1.0.2.ebuild @@ -4,7 +4,7 @@ EAPI="7" -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="HTTP/HTML indexing and searching system" HOMEPAGE="https://github.com/solbu/hldig" @@ -13,7 +13,7 @@ SRC_URI="https://github.com/solbu/${PN}/archive/v${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 arm arm64 ppc ppc64 x86" -IUSE="libressl ssl" +IUSE="ssl" # Don't use Gentoo mirrors RESTRICT="mirror" @@ -21,10 +21,7 @@ RESTRICT="mirror" DEPEND=" app-arch/unzip sys-libs/zlib - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + ssl? ( dev-libs/openssl:= ) " RDEPEND="${DEPEND} !www-misc/htdig @@ -41,6 +38,7 @@ src_prepare() { } src_configure() { + append-cxxflags "-std=c++11" local myeconfargs=( --disable-static --with-config-dir="${EPREFIX}"/etc/${PN} diff --git a/www-misc/hldig/metadata.xml b/www-misc/hldig/metadata.xml index 7a38bb90..689e1534 100644 --- a/www-misc/hldig/metadata.xml +++ b/www-misc/hldig/metadata.xml @@ -1,5 +1,8 @@ - + + team-gentoo@trinitydesktop.org + Trinity Gentoo ebuilds project + -- cgit v1.2.1