| 1 |
bircoph 15/03/30 11:25:00 |
| 2 |
|
| 3 |
Modified: ChangeLog polipo-9999.ebuild |
| 4 |
Added: polipo-1.1.1-r1.ebuild |
| 5 |
Log: |
| 6 |
add systemd support, wrt bug 510898 |
| 7 |
|
| 8 |
Signed-off-by: Andrew Savchenko <bircoph@g.o> |
| 9 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 565953B95372756C) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.47 net-proxy/polipo/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/ChangeLog?rev=1.47&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/ChangeLog?rev=1.47&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/ChangeLog?r1=1.46&r2=1.47 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v |
| 21 |
retrieving revision 1.46 |
| 22 |
retrieving revision 1.47 |
| 23 |
diff -u -r1.46 -r1.47 |
| 24 |
--- ChangeLog 12 Jan 2015 16:16:12 -0000 1.46 |
| 25 |
+++ ChangeLog 30 Mar 2015 11:25:00 -0000 1.47 |
| 26 |
@@ -1,6 +1,13 @@ |
| 27 |
# ChangeLog for net-proxy/polipo |
| 28 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.46 2015/01/12 16:16:12 bircoph Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.47 2015/03/30 11:25:00 bircoph Exp $ |
| 31 |
+ |
| 32 |
+*polipo-1.1.1-r1 (30 Mar 2015) |
| 33 |
+ |
| 34 |
+ 30 Mar 2015; Andrew Savchenko <bircoph@g.o> +polipo-1.1.1-r1.ebuild, |
| 35 |
+ polipo-9999.ebuild, +files/polipo_at.service: |
| 36 |
+ Add systemd support (patch from Yichao Zhou |
| 37 |
+ <broken.zhou@×××××.com>, bug 510898). |
| 38 |
|
| 39 |
12 Jan 2015; Andrew Savchenko <bircoph@g.o> -polipo-1.0.4.1-r1.ebuild, |
| 40 |
-files/polipo.crond, -files/polipo.initd: |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.4 net-proxy/polipo/polipo-9999.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/polipo-9999.ebuild?rev=1.4&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/polipo-9999.ebuild?rev=1.4&content-type=text/plain |
| 48 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/polipo-9999.ebuild?r1=1.3&r2=1.4 |
| 49 |
|
| 50 |
Index: polipo-9999.ebuild |
| 51 |
=================================================================== |
| 52 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-9999.ebuild,v |
| 53 |
retrieving revision 1.3 |
| 54 |
retrieving revision 1.4 |
| 55 |
diff -u -r1.3 -r1.4 |
| 56 |
--- polipo-9999.ebuild 9 Jan 2015 00:13:32 -0000 1.3 |
| 57 |
+++ polipo-9999.ebuild 30 Mar 2015 11:25:00 -0000 1.4 |
| 58 |
@@ -1,6 +1,6 @@ |
| 59 |
# Copyright 1999-2015 Gentoo Foundation |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-9999.ebuild,v 1.3 2015/01/09 00:13:32 bircoph Exp $ |
| 62 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-9999.ebuild,v 1.4 2015/03/30 11:25:00 bircoph Exp $ |
| 63 |
|
| 64 |
EAPI="5" |
| 65 |
|
| 66 |
@@ -14,12 +14,13 @@ |
| 67 |
KEYWORDS="~amd64 ~x86" |
| 68 |
fi |
| 69 |
|
| 70 |
-inherit ${_GIT} toolchain-funcs user |
| 71 |
+inherit ${_GIT} toolchain-funcs user systemd |
| 72 |
|
| 73 |
DESCRIPTION="A caching web proxy" |
| 74 |
HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/" |
| 75 |
LICENSE="MIT GPL-2" |
| 76 |
SLOT="0" |
| 77 |
+IUSE="systemd" |
| 78 |
|
| 79 |
DEPEND="sys-apps/texinfo" |
| 80 |
RDEPEND="" |
| 81 |
@@ -39,18 +40,23 @@ |
| 82 |
|
| 83 |
newinitd "${FILESDIR}/${PN}.initd-2" ${PN} |
| 84 |
insinto /etc/${PN} ; doins "${FILESDIR}/config" |
| 85 |
- exeinto /etc/cron.weekly ; newexe "${FILESDIR}/${PN}.crond-2" ${PN} |
| 86 |
+ systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service" |
| 87 |
+ if ! use systemd; then |
| 88 |
+ exeinto /etc/cron.weekly ; newexe "${FILESDIR}/${PN}.crond-2" ${PN} |
| 89 |
+ fi |
| 90 |
|
| 91 |
dodoc CHANGES README |
| 92 |
dohtml html/* |
| 93 |
} |
| 94 |
|
| 95 |
pkg_postinst() { |
| 96 |
- einfo "Do not forget to read the manual." |
| 97 |
- einfo "Change the config file in /etc/${PN} to suit your needs." |
| 98 |
- einfo "" |
| 99 |
- einfo "Polipo OpenRC init scripts can now be multiplexed:" |
| 100 |
- einfo "1. create /etc/${PN}/config.foo" |
| 101 |
- einfo "2. symlink /etc/init.d/{${PN}.foo -> ${PN}}" |
| 102 |
- einfo "3. make sure all instances use unique ip:port pair and cachedir, if any" |
| 103 |
+ elog "Do not forget to read the manual." |
| 104 |
+ elog "Change the config file in /etc/${PN} to suit your needs." |
| 105 |
+ elog "" |
| 106 |
+ elog "Polipo init scripts can now be multiplexed:" |
| 107 |
+ elog "1. create /etc/${PN}/config.foo" |
| 108 |
+ elog "2. symlink /etc/init.d/{${PN}.foo -> ${PN}}" |
| 109 |
+ elog " a. if you are using OpenRC, symlink /etc/init.d/{${PN}.foo -> ${PN}}" |
| 110 |
+ elog " b. if you are using systemd, execute \"systemctl enable polipo@××××××.foo\"" |
| 111 |
+ elog "3. make sure all instances use unique ip:port pair and cachedir, if any" |
| 112 |
} |
| 113 |
|
| 114 |
|
| 115 |
|
| 116 |
1.1 net-proxy/polipo/polipo-1.1.1-r1.ebuild |
| 117 |
|
| 118 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/polipo/polipo-1.1.1-r1.ebuild?rev=1.1&view=markup |
| 119 |
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 |
| 120 |
|
| 121 |
Index: polipo-1.1.1-r1.ebuild |
| 122 |
=================================================================== |
| 123 |
# Copyright 1999-2015 Gentoo Foundation |
| 124 |
# Distributed under the terms of the GNU General Public License v2 |
| 125 |
# $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 $ |
| 126 |
|
| 127 |
EAPI="5" |
| 128 |
|
| 129 |
if [[ ${PV} == "9999" ]] ; then |
| 130 |
_GIT=git-r3 |
| 131 |
EGIT_REPO_URI="https://github.com/jech/${PN}.git" |
| 132 |
SRC_URI="" |
| 133 |
KEYWORDS="" |
| 134 |
else |
| 135 |
SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${PN}/${P}.tar.gz" |
| 136 |
KEYWORDS="~amd64 ~x86" |
| 137 |
fi |
| 138 |
|
| 139 |
inherit ${_GIT} toolchain-funcs user systemd |
| 140 |
|
| 141 |
DESCRIPTION="A caching web proxy" |
| 142 |
HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/" |
| 143 |
LICENSE="MIT GPL-2" |
| 144 |
SLOT="0" |
| 145 |
IUSE="systemd" |
| 146 |
|
| 147 |
DEPEND="sys-apps/texinfo" |
| 148 |
RDEPEND="" |
| 149 |
|
| 150 |
pkg_setup() { |
| 151 |
enewgroup ${PN} |
| 152 |
enewuser ${PN} -1 -1 /var/cache/${PN} ${PN} |
| 153 |
} |
| 154 |
|
| 155 |
src_compile() { |
| 156 |
tc-export CC |
| 157 |
emake PREFIX=/usr "CDEBUGFLAGS=${CFLAGS}" all |
| 158 |
} |
| 159 |
|
| 160 |
src_install() { |
| 161 |
einstall PREFIX=/usr MANDIR=/usr/share/man INFODIR=/usr/share/info "TARGET=${D}" |
| 162 |
|
| 163 |
newinitd "${FILESDIR}/${PN}.initd-2" ${PN} |
| 164 |
insinto /etc/${PN} ; doins "${FILESDIR}/config" |
| 165 |
systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service" |
| 166 |
if ! use systemd; then |
| 167 |
exeinto /etc/cron.weekly ; newexe "${FILESDIR}/${PN}.crond-2" ${PN} |
| 168 |
fi |
| 169 |
|
| 170 |
dodoc CHANGES README |
| 171 |
dohtml html/* |
| 172 |
} |
| 173 |
|
| 174 |
pkg_postinst() { |
| 175 |
elog "Do not forget to read the manual." |
| 176 |
elog "Change the config file in /etc/${PN} to suit your needs." |
| 177 |
elog "" |
| 178 |
elog "Polipo init scripts can now be multiplexed:" |
| 179 |
elog "1. create /etc/${PN}/config.foo" |
| 180 |
elog "2. symlink /etc/init.d/{${PN}.foo -> ${PN}}" |
| 181 |
elog " a. if you are using OpenRC, symlink /etc/init.d/{${PN}.foo -> ${PN}}" |
| 182 |
elog " b. if you are using systemd, execute \"systemctl enable polipo@××××××.foo\"" |
| 183 |
elog "3. make sure all instances use unique ip:port pair and cachedir, if any" |
| 184 |
} |
Archives