[gentoo-commits] repo/gentoo:master commit in: net-nds/phpldapadmin/

[Viorel Munteanu]

commit:     ae06bbee68009bb048bc0473a0c3c035b317c5ba
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  9 09:28:53 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Aug 10 07:36:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae06bbee

net-nds/phpldapadmin: remove not merged patches

I did not merge 2 patches, remove them from the ebuild too.
Handle pngfix return value.

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 net-nds/phpldapadmin/metadata.xml                |  1 +
 net-nds/phpldapadmin/phpldapadmin-1.2.6.6.ebuild | 11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/net-nds/phpldapadmin/metadata.xml 
b/net-nds/phpldapadmin/metadata.xml
index 072d8a766584..ca612ab12d9d 100644
--- a/net-nds/phpldapadmin/metadata.xml
+++ b/net-nds/phpldapadmin/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">phpldapadmin</remote-id>
+    <remote-id type="github">leenooks/phpLDAPadmin</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.6.6.ebuild 
b/net-nds/phpldapadmin/phpldapadmin-1.2.6.6.ebuild
index 2ab8d8eb0bf6..788ef2ef4e64 100644
--- a/net-nds/phpldapadmin/phpldapadmin-1.2.6.6.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-1.2.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 RDEPEND="
        >=dev-lang/php-8.0[hash(+),ldap,session,xml,nls]
-       dev-libs/openssl:=
+       dev-libs/openssl
        virtual/httpd-php
 "
 BDEPEND="
@@ -25,20 +25,17 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 PATCHES=(
        "${FILESDIR}/${PN}-1.2.1.1-fix-magic-quotes.patch"
-       "${FILESDIR}/${PN}-1.2.6.2-r1-default-templates.patch"
        "${FILESDIR}/${PN}-1.2.6.4-getDN-htmlspecialchars.patch"
 )
 
 need_httpd_cgi
 
 src_prepare() {
-       has_version "dev-libs/openssl:0/1.1" && \
-               eapply "${FILESDIR}/${PN}-1.2.6.5-openssl-1.patch"
        mv config/config.php.example config/config.php || die
        default
        # fix QA notice about broken IDAT window length
-       pngfix --out=network.png htdocs/images/default/network.png || die
-       pngfix --out=document.png htdocs/images/default/document.png || die
+       pngfix --out=network.png htdocs/images/default/network.png; [[ $? -lt 
16 ]] || die
+       pngfix --out=document.png htdocs/images/default/document.png; [[ $? -lt 
16 ]] || die
        mv -f network.png document.png htdocs/images/default/ || die
 }