diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
| commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
| tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /www-misc/htdig | |
| parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) | |
gentoo resync : 03.11.2019
Diffstat (limited to 'www-misc/htdig')
| -rw-r--r-- | www-misc/htdig/Manifest | 2 | ||||
| -rw-r--r-- | www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild | 24 |
2 files changed, 16 insertions, 10 deletions
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest index e7861057d687..e852eecea95f 100644 --- a/www-misc/htdig/Manifest +++ b/www-misc/htdig/Manifest @@ -5,5 +5,5 @@ AUX htdig-3.2.0_beta6-gcc6.patch 3673 BLAKE2B 819647e4b323f795645e7375b301559ac7 AUX htdig-3.2.0_beta6-musl.patch 1188 BLAKE2B f481706f23d60ff5c72086c4ff9539a280f1b0cde19e834edacfbc2bec080819ecb4d087147b182aaa60cbafa639de9194ce35473f5b4ccc33516f51346894f7 SHA512 2c766f4d49e941de8c56b3858ed32d9e90efff9f43ec699cd30c0a87c19bab786e113412087a5bec698de26b4454f5df4306a95f9e16c6cd829f5ef8572ea0a3 AUX htdig-3.2.0_beta6-quoting.patch 1130 BLAKE2B 0257d3f79e544c13f4d17caa71bf4265aa7668c91e15f5c38b502fbc50415feb6a378430af6a147f6a2e3f087ad79fc2ab426b97b6191166a1c930e7a416e2e6 SHA512 7edadb8cecb378eac8352e43ce12d5fa6af711f847f1e1ca0a49303daedffb1cef9795b74eb8cd64120e981c57c947f082f60d857985ee5ac0d54537fd6b4181 DIST htdig-3.2.0b6.tar.gz 3104936 BLAKE2B aa70026ce6fb10910c42b4091900980c78f81fc9d07b1dec4071811aee21c6d6a67a7fbb2ca59b785c457b13b508773f8ca8f96042f23def82b071fc40b00870 SHA512 29832f4aebd2b1f944cc4d800a5202342c8ce66936980476d49f679ec169c0268a902e85cd7440a3b6bea9db0a3b640bb1a9719c680d857ff00d34590af63064 -EBUILD htdig-3.2.0_beta6-r5.ebuild 1713 BLAKE2B 85939cfafa6631ac7dc581778f4e41fa7fe96390aa9f78aa479b1fecae109a5ef32f0be761ee96a6170c9d3d456278deb4225e355c4572f34b1f6a265c0beb49 SHA512 e5e2917bd08a10963344213899695793a302c776354d5a5f93b5d284d85b51dcf53bda969e3e8033898ffee1901d79dca5136c66a388f2e6765ad2bd283256ab +EBUILD htdig-3.2.0_beta6-r5.ebuild 1819 BLAKE2B 62941188cdcaafe76c55d9f565375c38741d8cb1c9e07f6431ac56ba65dc4872be64baef26f5dd9c758fa46577918490f13ff2fdb71f0352292920fb8c5d868b SHA512 b163d418533109c2f0256a7237eb6ea870067ae7b52c7533c98d6202dfd56a01046ecc185cfbf4b14910611e06d74a6d82b567943e6ec9ebdd5c47d5c9e91fb5 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild index cac6067ae058..97a63976bca2 100644 --- a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild +++ b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools -MY_PV=${PV/_beta/b} -S=${WORKDIR}/${PN}-${MY_PV} +MY_PV="${PV/_beta/b}" DESCRIPTION="HTTP/HTML indexing and searching system" HOMEPAGE="http://www.htdig.org" @@ -18,12 +17,15 @@ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-lin IUSE="libressl ssl" DEPEND=" - >=sys-libs/zlib-1.1.3 + sys-libs/zlib app-arch/unzip ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}-${MY_PV}" PATCHES=( "${FILESDIR}"/${P}-gcc4.patch @@ -33,8 +35,7 @@ PATCHES=( "${FILESDIR}"/${P}-musl.patch "${FILESDIR}"/${P}-drop-bogus-assignment.patch #638720 ) - -HTML_DOCS=( htdoc ) +HTML_DOCS=( htdoc/. ) src_prepare() { default @@ -44,6 +45,7 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-static --with-config-dir="${EPREFIX}"/etc/${PN} --with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf --with-database-dir="${EPREFIX}"/var/lib/${PN}/db @@ -61,6 +63,10 @@ src_install () { "${ED}"/etc/${PN}/${PN}.conf \ "${ED}"/usr/bin/rundig \ || die "sed failed (removing \${D} from installed files)" + # symlink htsearch so it can be easily found. see bug #62087 dosym ../../var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch + + # no static archives + find "${D}" -name '*.la' -delete || die } |