From: Aaron Swenson Date: Wed, 19 Nov 2014 15:40:15 +0000 (+0000) Subject: Fix bug 529854. Properly install all docs by letting dodoc -r do its thing. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d14043518518723eb5f804c4e3af2ae444164a80;p=gentoo.git Fix bug 529854. Properly install all docs by letting dodoc -r do its thing. Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0xD1BBFDA0 --- diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog index 7fa2cc1158b0..1ef4e452451c 100644 --- a/www-apps/rt/ChangeLog +++ b/www-apps/rt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-apps/rt # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.90 2014/11/18 20:25:29 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.91 2014/11/19 15:40:10 titanofold Exp $ + + 19 Nov 2014; Aaron W. Swenson rt-4.2.9-r1.ebuild: + Fix bug 529854. Properly install all docs by letting dodoc -r do its thing. *rt-4.2.9-r1 (18 Nov 2014) diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest index a33ce446dbfc..c55bf06c2b14 100644 --- a/www-apps/rt/Manifest +++ b/www-apps/rt/Manifest @@ -9,13 +9,13 @@ AUX rt.init.d.2 1424 SHA256 dcaddd4045fbc05f44b78505ebd6429026602910a65851eaab0d AUX rt_apache2.conf 498 SHA256 77a079f7a00e85e2e7f2b2534f553bf5d9e4e3ea8cdf67adc6c231018883158d SHA512 3a6c55593956f786401141f5bf9fcc6ee795985e69986161269e46cd52875bb788fbe96ea95d1038414c68a34275e3c7ea79a3ff6ea6edd8cc0ed49e2e515518 WHIRLPOOL 3dac1f5b351a6dfe036afbf165e6f162648159ebe396dd892ea3a13ca726ae33be1330acb7f153130c9c7c351abb181b8f666a5993286d9679aa0671a6b16c56 AUX rt_apache2_fcgi.conf 989 SHA256 7dff43c9fb73daa06c9c4841199e7618758250129946ec9d20adf5a1852e4e91 SHA512 58df2f37961eedec8260e2feeda75530b50ce2fa748e2188d47825e9da78ddbf12559a4d3485ab01df89a6ebcddab3fa75215fdca5b35583cf863a7be1c1ccc7 WHIRLPOOL c811079d962e9e5d810e612f017d3d5749a00f9ae2bc83ea19242592d440437d69a0dee446ac013ab4d36afea048d0a7e6219e5ce70af4780a735f300150af65 DIST rt-4.2.9.tar.gz 7496950 SHA256 1cbfe4f824637de45cc093ab87260ef9bbac11ba724b93c01f39a6d4e9592613 SHA512 a5a8b4cd1ca59a8e99a78634bd0fb6f4c9ac428b3088f5b3a8c87312a49b69273f332d3a6370c7be2d394ed2cd834f8b85b4bc1537f27e3687d79b17513d1aaa WHIRLPOOL 17799292d6700f28e7a462afbab64a2b7dae2e06e34992506a7c51efe9d9f9fe37e65cf76e0ca04130d2c49d7221185d6115040656e4d9d9d06cff281ff2f190 -EBUILD rt-4.2.9-r1.ebuild 7537 SHA256 61a70ba8451a291099d7439b82fd88fa543394ab7528242d11859a5e2e1ca345 SHA512 8804a11a22d9d723b5b09f48d29740a4c9a02ffa6fa5966ed85bd36425b23e60689b2ffad2fde2b4135230e09633b324b450dc9b53161a4c061fde30abac49ed WHIRLPOOL 5b4f274d685df91283bb091d1b9f31225c1aa089640add679a81286593a234c5605d5928b1bc3dfbcef670a041d61ce61dff5e9b95f5fad335ac13b517ba69d3 -MISC ChangeLog 14585 SHA256 8f153cd0aeea7a29bcc62d58d7253344ea943fb8d5b218b91ebf848bff304590 SHA512 66dff6989d5584f2dd517cb66dab7fbc3fe5ca3526042f2c335ccbc63926d484224fda322d95a8579970eedede0bf55b9a26dafc9f4a8b40ff47b2113f210ba7 WHIRLPOOL 5a6acd9d8240ef8ac85fcfb01f617f831593b9e302aad7ae826ec4c9db77e35249f013d3b08b0d211500ead8b31e6c4a241278a8d9fef1ec09cc61010185e501 +EBUILD rt-4.2.9-r1.ebuild 7433 SHA256 0d9e55f8528cb945e7b90e881df3c22976615f2d91bd18020bcd307fe1932029 SHA512 a6852ca9f912a449f3dcd4e4a30763b3491c4b8ecba4b8fc77dbf2d33006d10dd92b944eff8fa4e6f147c4445222a85049735bc501579877fafdbc8a1d9a83dc WHIRLPOOL 09e30d385d583e26590a42ec7f1c7153ead99ee8d4937aeec1c74889039db0e8f4092843dc90e145a0e7662be5fef5cef4ddbb60dbf13255d020785b5365b8ac +MISC ChangeLog 14740 SHA256 f89a5c1425ac381c94b31c6df01b8f5063e166204922b593d3221539d818ed18 SHA512 50857335aecc5ecf8279b1e671b4d4a6bd26f328b33d1c3707eee3db4eab751b42ce092532b272eabf681cd9c120e6814c855d0faeaa3a02038f5371defc106f WHIRLPOOL b3e4a126a1bc358a7958ff2edb360960c9eaa91ad445660d66e2f26a0bc78bd366639f30a731a5f97163c4fe1e66cce42be42fe26312d6eb1637912661b1c06a MISC metadata.xml 564 SHA256 a261da27b08561f8a52676e849b12974d6aa01ee8a6ca2d3ba8269d96332db94 SHA512 30ea53c1bd6bdb1e11573723c32324181e278e6006a06b9b17d9c22ab99ff5e1db963be09e073c2f7842b0bb30024a62629984fecff759e3b883a8da97998aa0 WHIRLPOOL d06b6e5a42dab1fc118ab71438b7e4a905dcea6f0084dca6c4e47d1d3ccbaa167430cefedb11046603671948c2dff56ea4ef0495afd5cc654fd3e5b31b24e410 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlRrqzsACgkQVxOqA9G7/aDqRAD+KB6oHH/nSEAmNkHkI0x1efuh -GoJLh1DV+7bwJ9HFND4A/2PQ/5p1BO55ZKPUe9f4RySMZEhZS52kiFDWvLIabfSC -=R9gB +iF4EAREIAAYFAlRsudsACgkQVxOqA9G7/aCOeAD9FbfrVjjpqLeWZcbgTtOgtrUs +ZdLL/w1DANOEyI0GVlsBAI7dR2wPoqkUvNc0xpSTPqM5qn14pZLAsPYkILgZ6GhJ +=I68d -----END PGP SIGNATURE----- diff --git a/www-apps/rt/rt-4.2.9-r1.ebuild b/www-apps/rt/rt-4.2.9-r1.ebuild index 52ef1f460e87..7d765163ac6b 100644 --- a/www-apps/rt/rt-4.2.9-r1.ebuild +++ b/www-apps/rt/rt-4.2.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-4.2.9-r1.ebuild,v 1.1 2014/11/18 20:25:29 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-4.2.9-r1.ebuild,v 1.2 2014/11/19 15:40:10 titanofold Exp $ EAPI=5 @@ -193,8 +193,8 @@ pkg_setup() { src_prepare() { # add Gentoo-specific layout cat "${FILESDIR}"/config.layout-gentoo >> config.layout - sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${PF}|g" \ - -e "s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" \ + sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \ + -e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \ -e 's|/\+|/|g' \ -i ./config.layout || die @@ -259,17 +259,15 @@ src_install() { webapp_src_preinst emake install - dodoc "${S}"/docs/UPGRADING* - dodoc "${S}"/docs/*.pod - dodoc "${S}"/docs/network-diagram.svg - cp -R "${S}"/docs/customizing/ "${D}"/usr/share/doc/"${P}"/ - cp -R "${S}"/docs/extending/ "${D}"/usr/share/doc/"${P}"/ + dodoc -r docs + # Disable compression because `perldoc` doesn't decompress transparently + docompress -x /usr/share/doc # make sure we don't clobber existing site configuration - rm -f "${D}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm + rm -f "${ED}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm # fix paths - find "${D}" -type f -print0 | xargs -0 sed -i -e "s:${D}::g" + find "${ED}" -type f -print0 | xargs -0 sed -i -e "s:${ED}::g" # copy upgrade files insinto "${MY_HOSTROOTDIR}/${PF}" @@ -278,9 +276,9 @@ src_install() { if use lighttpd ; then newinitd "${FILESDIR}"/${PN}.init.d.2 ${PN} newconfd "${FILESDIR}"/${PN}.conf.d.2 ${PN} - sed -i -e "s/@@PF@@/${PF}/g" "${D}"/etc/conf.d/${PN} || die + sed -i -e "s/@@PF@@/${PF}/g" "${ED}"/etc/conf.d/${PN} || die else - doins "${FILESDIR}"/{rt_apache2_fcgi.conf,rt_apache2.conf} + doins "${FILESDIR}"/rt_apache2{,_fcgi}.conf fi # require the web server's permissions