bircoph 15/03/30 11:25:00 Modified: ChangeLog polipo-9999.ebuild Added: polipo-1.1.1-r1.ebuild Log: add systemd support, wrt bug 510898 Signed-off-by: Andrew Savchenko <birc...@gentoo.org> (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 565953B95372756C)
Revision Changes Path 1.47 net-proxy/polipo/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/ChangeLog?rev=1.47&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/ChangeLog?rev=1.47&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/ChangeLog?r1=1.46&r2=1.47 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- ChangeLog 12 Jan 2015 16:16:12 -0000 1.46 +++ ChangeLog 30 Mar 2015 11:25:00 -0000 1.47 @@ -1,6 +1,13 @@ # ChangeLog for net-proxy/polipo # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.46 2015/01/12 16:16:12 bircoph Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.47 2015/03/30 11:25:00 bircoph Exp $ + +*polipo-1.1.1-r1 (30 Mar 2015) + + 30 Mar 2015; Andrew Savchenko <birc...@gentoo.org> +polipo-1.1.1-r1.ebuild, + polipo-9999.ebuild, +files/polipo_at.service: + Add systemd support (patch from Yichao Zhou + <broken.z...@gmail.com>, bug 510898). 12 Jan 2015; Andrew Savchenko <birc...@gentoo.org> -polipo-1.0.4.1-r1.ebuild, -files/polipo.crond, -files/polipo.initd: 1.4 net-proxy/polipo/polipo-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/polipo-9999.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/polipo-9999.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/polipo-9999.ebuild?r1=1.3&r2=1.4 Index: polipo-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-9999.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- polipo-9999.ebuild 9 Jan 2015 00:13:32 -0000 1.3 +++ polipo-9999.ebuild 30 Mar 2015 11:25:00 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-9999.ebuild,v 1.3 2015/01/09 00:13:32 bircoph Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-9999.ebuild,v 1.4 2015/03/30 11:25:00 bircoph Exp $ EAPI="5" @@ -14,12 +14,13 @@ KEYWORDS="~amd64 ~x86" fi -inherit ${_GIT} toolchain-funcs user +inherit ${_GIT} toolchain-funcs user systemd DESCRIPTION="A caching web proxy" HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/" LICENSE="MIT GPL-2" SLOT="0" +IUSE="systemd" DEPEND="sys-apps/texinfo" RDEPEND="" @@ -39,18 +40,23 @@ newinitd "${FILESDIR}/${PN}.initd-2" ${PN} insinto /etc/${PN} ; doins "${FILESDIR}/config" - exeinto /etc/cron.weekly ; newexe "${FILESDIR}/${PN}.crond-2" ${PN} + systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service" + if ! use systemd; then + exeinto /etc/cron.weekly ; newexe "${FILESDIR}/${PN}.crond-2" ${PN} + fi dodoc CHANGES README dohtml html/* } pkg_postinst() { - einfo "Do not forget to read the manual." - einfo "Change the config file in /etc/${PN} to suit your needs." - einfo "" - einfo "Polipo OpenRC init scripts can now be multiplexed:" - einfo "1. create /etc/${PN}/config.foo" - einfo "2. symlink /etc/init.d/{${PN}.foo -> ${PN}}" - einfo "3. make sure all instances use unique ip:port pair and cachedir, if any" + elog "Do not forget to read the manual." + elog "Change the config file in /etc/${PN} to suit your needs." + elog "" + elog "Polipo init scripts can now be multiplexed:" + elog "1. create /etc/${PN}/config.foo" + elog "2. symlink /etc/init.d/{${PN}.foo -> ${PN}}" + elog " a. if you are using OpenRC, symlink /etc/init.d/{${PN}.foo -> ${PN}}" + elog " b. if you are using systemd, execute \"systemctl enable pol...@config.foo\"" + elog "3. make sure all instances use unique ip:port pair and cachedir, if any" } 1.1 net-proxy/polipo/polipo-1.1.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/polipo-1.1.1-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/polipo-1.1.1-r1.ebuild?rev=1.1&content-type=text/plain Index: polipo-1.1.1-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-1.1.1-r1.ebuild,v 1.1 2015/03/30 11:25:00 bircoph Exp $ EAPI="5" if [[ ${PV} == "9999" ]] ; then _GIT=git-r3 EGIT_REPO_URI="https://github.com/jech/${PN}.git" SRC_URI="" KEYWORDS="" else SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${PN}/${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi inherit ${_GIT} toolchain-funcs user systemd DESCRIPTION="A caching web proxy" HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/" LICENSE="MIT GPL-2" SLOT="0" IUSE="systemd" DEPEND="sys-apps/texinfo" RDEPEND="" pkg_setup() { enewgroup ${PN} enewuser ${PN} -1 -1 /var/cache/${PN} ${PN} } src_compile() { tc-export CC emake PREFIX=/usr "CDEBUGFLAGS=${CFLAGS}" all } src_install() { einstall PREFIX=/usr MANDIR=/usr/share/man INFODIR=/usr/share/info "TARGET=${D}" newinitd "${FILESDIR}/${PN}.initd-2" ${PN} insinto /etc/${PN} ; doins "${FILESDIR}/config" systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service" if ! use systemd; then exeinto /etc/cron.weekly ; newexe "${FILESDIR}/${PN}.crond-2" ${PN} fi dodoc CHANGES README dohtml html/* } pkg_postinst() { elog "Do not forget to read the manual." elog "Change the config file in /etc/${PN} to suit your needs." elog "" elog "Polipo init scripts can now be multiplexed:" elog "1. create /etc/${PN}/config.foo" elog "2. symlink /etc/init.d/{${PN}.foo -> ${PN}}" elog " a. if you are using OpenRC, symlink /etc/init.d/{${PN}.foo -> ${PN}}" elog " b. if you are using systemd, execute \"systemctl enable pol...@config.foo\"" elog "3. make sure all instances use unique ip:port pair and cachedir, if any" }