+++ /dev/null
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic eutils
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND="=dev-libs/apr-1*
- =dev-libs/apr-util-1*
- dev-libs/expat
- dev-libs/libpcre
- kernel_linux? ( sys-apps/util-linux )
- ssl? ( dev-libs/openssl:0= )
- !<www-servers/apache-2.2.4"
-
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.2.20-Makefile.patch"
-)
-
-src_configure() {
- # Brain dead check.
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
- # Instead of filtering --as-needed (bug #128505), append --no-as-needed
- append-ldflags $(no-as-needed)
-
- # econf overwrites the stuff from config.layout.
- econf \
- --sbindir=/usr/sbin \
- --with-z=/usr \
- --with-apr=/usr \
- --with-apr-util=/usr \
- --with-pcre=/usr \
- $(use_enable ssl) \
- $(usex ssl '--with-ssl=/usr' '')
-}
-
-src_compile() {
- cd support || die
- emake
-}
-
-src_install () {
- cd support || die
-
- make DESTDIR="${D}" install || die
-
- # install manpages
- doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
- "${S}"/docs/man/{htcacheclean,rotatelogs,ab,logresolve}.8
-
- # Providing compatiblity symlinks for #177697 (which we'll stop to install
- # at some point).
- pushd "${D}"/usr/sbin/ >/dev/null || die
- for i in *; do
- dosym /usr/sbin/${i} /usr/sbin/${i}2
- done
- popd >/dev/null || die
-
- # Provide a symlink for ab-ssl
- if use ssl; then
- dosym /usr/sbin/ab /usr/sbin/ab-ssl
- dosym /usr/sbin/ab /usr/sbin/ab2-ssl
- fi
-
- # make htpasswd accessible for non-root users
- dosym /usr/sbin/htpasswd /usr/bin/htpasswd
- dosym /usr/sbin/htdigest /usr/bin/htdigest
-
- dodoc "${S}"/CHANGES
-}
+++ /dev/null
-=== modified file 'support/Makefile.in'
---- a/support/Makefile.in
-+++ b/support/Makefile.in
-@@ -1,9 +1,10 @@
- DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
-- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
-+ logresolve.pl phf_abuse_log.cgi split-logfile
-
- CLEAN_TARGETS = suexec
-
--PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT)
-+PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm \
-+ $(NONPORTABLE_SUPPORT) log_server_status split-logfile dbmmanage
- TARGETS = $(PROGRAMS)
-
- PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
-@@ -12,22 +13,13 @@
- include $(top_builddir)/build/rules.mk
-
- install:
-- @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
- @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
-- @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
-- @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
-- @for i in apxs apachectl dbmmanage; do \
-+ @for i in $(PROGRAMS) ; do \
- if test -f "$(builddir)/$$i"; then \
- cp -p $$i $(DESTDIR)$(sbindir); \
- chmod 755 $(DESTDIR)$(sbindir)/$$i; \
- fi ; \
- done
-- @if test -f "$(builddir)/envvars-std"; then \
-- cp -p envvars-std $(DESTDIR)$(sbindir); \
-- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
-- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
-- fi ; \
-- fi
-
- htpasswd_OBJECTS = htpasswd.lo
- htpasswd: $(htpasswd_OBJECTS)
-