titanofold 14/11/19 15:40:10 Modified: ChangeLog rt-4.2.9-r1.ebuild Log: Fix bug 529854. Properly install all docs by letting dodoc -r do its thing. (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)
Revision Changes Path 1.91 www-apps/rt/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/rt/ChangeLog?rev=1.91&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/rt/ChangeLog?rev=1.91&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/rt/ChangeLog?r1=1.90&r2=1.91 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- ChangeLog 18 Nov 2014 20:25:29 -0000 1.90 +++ ChangeLog 19 Nov 2014 15:40:10 -0000 1.91 @@ -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 <titanof...@gentoo.org> 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) 1.2 www-apps/rt/rt-4.2.9-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/rt/rt-4.2.9-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/rt/rt-4.2.9-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/rt/rt-4.2.9-r1.ebuild?r1=1.1&r2=1.2 Index: rt-4.2.9-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-apps/rt/rt-4.2.9-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rt-4.2.9-r1.ebuild 18 Nov 2014 20:25:29 -0000 1.1 +++ rt-4.2.9-r1.ebuild 19 Nov 2014 15:40:10 -0000 1.2 @@ -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 @@ 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 @@ 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 @@ 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
