10 files changed, 20 insertions, 28 deletions
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>fatzer2@gmail.com</email>
-		<name>Alexander Golubev</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>fatzer2@gmail.com</email>
-		<name>Alexander Golubev</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
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 )