From 9a1e8a368c3f6646106268bf4d84ca4c1b650a73 Mon Sep 17 00:00:00 2001 From: Sergey Dryabzhinsky Date: Sat, 23 May 2009 18:57:08 +0000 Subject: Bug #265840: - Update to 0.3.11.1-r1 - fix race with creating files, use make -j1 - Drop old svn path=/sunrise/; revision=8586 --- net-misc/apt-cacher-ng/ChangeLog | 5 + net-misc/apt-cacher-ng/Manifest | 4 +- .../apt-cacher-ng/apt-cacher-ng-0.3.11.1-r1.ebuild | 106 +++++++++++++++++++++ .../apt-cacher-ng/apt-cacher-ng-0.3.11.1.ebuild | 105 -------------------- 4 files changed, 113 insertions(+), 107 deletions(-) create mode 100644 net-misc/apt-cacher-ng/apt-cacher-ng-0.3.11.1-r1.ebuild delete mode 100644 net-misc/apt-cacher-ng/apt-cacher-ng-0.3.11.1.ebuild (limited to 'net-misc') diff --git a/net-misc/apt-cacher-ng/ChangeLog b/net-misc/apt-cacher-ng/ChangeLog index 831d92b81..77271d929 100644 --- a/net-misc/apt-cacher-ng/ChangeLog +++ b/net-misc/apt-cacher-ng/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 23 May 2009; Sergey Dryabzhinsky + +apt-cacher-ng-0.3.11.1-r1.ebuild + -apt-cacher-ng-0.3.11.1.ebuild + File creation race then make jobs more than 1 + 10 May 2009; Thomas Sachau (Tommy[D]) -apt-cacher-ng-0.3.10.1.ebuild: Drop old version diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest index 42df309a4..6cc8f7143 100644 --- a/net-misc/apt-cacher-ng/Manifest +++ b/net-misc/apt-cacher-ng/Manifest @@ -5,6 +5,6 @@ AUX initd 785 RMD160 56dd07e923ef664e8fd192d6a153f2b922ee4835 SHA1 eef235be0317b AUX logrotate 377 RMD160 ef3824ff3484b00195fad7153332ce33f702d937 SHA1 d5606fceb5f3296aff7a7111ffadb440761286f2 SHA256 6f1624d655383452a6d56d69327d41b80379cc667ad2d481ca94f8ea78f7a65b DIST apt-cacher-ng_0.3.11-1.diff.gz 10965 RMD160 7a9e8ca09f7600bfe0f6d16fab39dca9a3fc7879 SHA1 5731043a1f38c1d8e216e5cdc549d6d579f4d9b1 SHA256 24637e9bfe29fa72bd8a5c57da724ba27c57097d59f46c5e886c78759f47c446 DIST apt-cacher-ng_0.3.11.orig.tar.gz 214624 RMD160 32760125ebbdde4c91d208a6d6db0644bab0194c SHA1 0cb763318610bfbe129c435d595a846f9824a621 SHA256 e722586ba372b7a49ea192b3362c4f0c5e3534a652e568cc7d3f413978218809 -EBUILD apt-cacher-ng-0.3.11.1.ebuild 3232 RMD160 74c6ec3eb314e8ac963a7bead838c067833c46de SHA1 0467cd5a1b37746f969181f1f7e30a750229f24b SHA256 0f6bf5795eb22936e2246d3388a392d9723bceec766e847eb7cd0263e99dd567 -MISC ChangeLog 1343 RMD160 c9addf63c6143176a7ff17946460efc0c1f99f20 SHA1 d16b738c7bbf6cf7934f9bca314492acdbdd7199 SHA256 417fdcf89789ae69bf55bcd1bfb8a8b96587d11656dd82ad60f14a0c91a3705d +EBUILD apt-cacher-ng-0.3.11.1-r1.ebuild 3284 RMD160 59a1e4c0d54a8581958b59ecdfa4f1cbc7ce796f SHA1 788f55bf391bf023bf448a0401ae78f6c481bb56 SHA256 f54c9c0e2f79c6a99f7c8c9563838b1c678138c44a0f4f3b22caba806b8b5367 +MISC ChangeLog 1529 RMD160 a57a5ab1ce1ba893e17e8465831e5fb6ac32b74f SHA1 6c4f44d79087bdd41a6d07aafe199df5d8ee55b0 SHA256 3ff333c45b4d7b4228d47a394a6a88a369da7c52b331300180ad1f81e2ebe8f6 MISC metadata.xml 390 RMD160 40659c355f410c97959c1cc60b8aa8e4e00950dd SHA1 176a70493d5c09c2e0e10db57b6f2305ffeeb5e9 SHA256 cfa296bbf435f33a61f87b507401841d70dfdf000623861b534f3d35490a81cf diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.3.11.1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.3.11.1-r1.ebuild new file mode 100644 index 000000000..9f1d9f83a --- /dev/null +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.3.11.1-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils + +MY_PV=${PV%.*} +MY_DPV=${PV#*.*.*.} + +DESCRIPTION="Yet another implementation of a HTTP proxy for Debian/Ubuntu software packages written in C++" +HOMEPAGE="http://www.unix-ag.uni-kl.de/~bloch/acng/" +SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${MY_PV}.orig.tar.gz + mirror://debian/pool/main/a/${PN}/${PN}_${MY_PV}-${MY_DPV}.diff.gz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~x86" +IUSE="doc fuse" + +DEPEND="app-arch/bzip2 + sys-libs/zlib" +RDEPEND="${DEPEND} + dev-lang/perl + fuse? ( sys-fs/fuse )" + +S=${WORKDIR}/${PN}-${MY_PV} + +pkg_setup() { + # add new user & group for daemon + enewgroup ${PN} + enewuser ${PN} -1 -1 -1 ${PN} +} + +src_unpack() { + unpack ${A} + epatch "${WORKDIR}/${PN}_${MY_PV}-${MY_DPV}.diff" # Debian patchset number 1.2.3.x + cd "${S}" && epatch "${FILESDIR}/${PN}-0.3.8-respect-portage-qa-build-unstripped.patch" # Respect portage +} + +src_compile() { + local build="acng" + use fuse && build="${build} acngfs" + # -j1 fix race noted in bug #265840 comment #5 + emake -j1 CURDIR="${S}" ${build} || die "make '${build}' failed!" +} + +src_install() { + # There is no any install target :( + # So we do all stuff here + + dosbin apt-cacher-ng || die "Can't install apt-cacher-ng" + if use fuse; then dobin acngfs || die "Can't install acngfs"; fi + + newinitd "${FILESDIR}"/initd ${PN} || die "Can't add new init.d ${PN}" + newconfd "${FILESDIR}"/confd ${PN} || die "Can't add new conf.d ${PN}" + + # for logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}"/logrotate ${PN} || die "Can't install new file ${PN} into '/etc/logrotate.d'" + + doman doc/man/${PN}* || die "Can't install mans" + if use fuse; then doman doc/man/acngfs* || die "Can't install man pages for fusefs"; fi + + # Documentation + dodoc README TODO VERSION INSTALL ChangeLog || die "Can't install common docs" + if use doc; then + dodoc doc/*.pdf || die "Can't install docs" + dohtml doc/html/* || die "Can't install html docs" + docinto examples/conf + dodoc conf/* || die "Can't install config examples" + fi + + # perl daily cron script + dosbin expire-caller.pl || die "Can't install cache cleaner perl script" + exeinto /etc/cron.daily + newexe "${FILESDIR}"/cron.daily ${PN} || die "Can't install new daily cron script" + + # default configuration + insinto /etc/${PN} + newins conf/acng.conf ${PN}.conf || die "Can't install ${PN} configuration file" + newins conf/report.html acng-report.html || die "Can't install ${PN} report page" + + # Some directories must exists + keepdir /var/log/${PN} + keepdir /var/run/${PN} + fowners ${PN}:${PN} \ + /etc/${PN} \ + /etc/${PN}/${PN}.conf \ + /etc/${PN}/acng-report.html \ + /var/log/${PN} \ + /var/run/${PN} || die "Can't change owners" +} + +pkg_postinst() { + elog "Do not forget about edit configuration file and read manuals!" + elog " Default file : /etc/${PN}/${PN}.conf" + elog " Manual page : man 8 apt-cache-ng" + elog " Documentation: /usr/share/doc/${PF}" + if use fuse; then + elog "You have choose to build fuse httpfs named 'acngfs'." + elog "It's can be used to mount apt cache on server to client" + elog "filesystem." + elog " Manual page : man 8 acngfs" + fi + elog "Please note: this ebuild installs /etc/cron.daily/${PN} cron job." +} diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.3.11.1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.3.11.1.ebuild deleted file mode 100644 index b312d1a51..000000000 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.3.11.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils - -MY_PV=${PV%.*} -MY_DPV=${PV#*.*.*.} - -DESCRIPTION="Yet another implementation of a HTTP proxy for Debian/Ubuntu software packages written in C++" -HOMEPAGE="http://www.unix-ag.uni-kl.de/~bloch/acng/" -SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${MY_PV}.orig.tar.gz - mirror://debian/pool/main/a/${PN}/${PN}_${MY_PV}-${MY_DPV}.diff.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~x86" -IUSE="doc fuse" - -DEPEND="app-arch/bzip2 - sys-libs/zlib" -RDEPEND="${DEPEND} - dev-lang/perl - fuse? ( sys-fs/fuse )" - -S=${WORKDIR}/${PN}-${MY_PV} - -pkg_setup() { - # add new user & group for daemon - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} -} - -src_unpack() { - unpack ${A} - epatch "${WORKDIR}/${PN}_${MY_PV}-${MY_DPV}.diff" # Debian patchset number 1.2.3.x - cd "${S}" && epatch "${FILESDIR}/${PN}-0.3.8-respect-portage-qa-build-unstripped.patch" # Respect portage -} - -src_compile() { - local build="acng" - use fuse && build="${build} acngfs" - emake CURDIR="${S}" ${build} || die "make '${build}' failed!" -} - -src_install() { - # There is no any install target :( - # So we do all stuff here - - dosbin apt-cacher-ng || die "Can't install apt-cacher-ng" - if use fuse; then dobin acngfs || die "Can't install acngfs"; fi - - newinitd "${FILESDIR}"/initd ${PN} || die "Can't add new init.d ${PN}" - newconfd "${FILESDIR}"/confd ${PN} || die "Can't add new conf.d ${PN}" - - # for logrotate - insinto /etc/logrotate.d - newins "${FILESDIR}"/logrotate ${PN} || die "Can't install new file ${PN} into '/etc/logrotate.d'" - - doman doc/man/${PN}* || die "Can't install mans" - if use fuse; then doman doc/man/acngfs* || die "Can't install man pages for fusefs"; fi - - # Documentation - dodoc README TODO VERSION INSTALL ChangeLog || die "Can't install common docs" - if use doc; then - dodoc doc/*.pdf || die "Can't install docs" - dohtml doc/html/* || die "Can't install html docs" - docinto examples/conf - dodoc conf/* || die "Can't install config examples" - fi - - # perl daily cron script - dosbin expire-caller.pl || die "Can't install cache cleaner perl script" - exeinto /etc/cron.daily - newexe "${FILESDIR}"/cron.daily ${PN} || die "Can't install new daily cron script" - - # default configuration - insinto /etc/${PN} - newins conf/acng.conf ${PN}.conf || die "Can't install ${PN} configuration file" - newins conf/report.html acng-report.html || die "Can't install ${PN} report page" - - # Some directories must exists - keepdir /var/log/${PN} - keepdir /var/run/${PN} - fowners ${PN}:${PN} \ - /etc/${PN} \ - /etc/${PN}/${PN}.conf \ - /etc/${PN}/acng-report.html \ - /var/log/${PN} \ - /var/run/${PN} || die "Can't change owners" -} - -pkg_postinst() { - elog "Do not forget about edit configuration file and read manuals!" - elog " Default file : /etc/${PN}/${PN}.conf" - elog " Manual page : man 8 apt-cache-ng" - elog " Documentation: /usr/share/doc/${PF}" - if use fuse; then - elog "You have choose to build fuse httpfs named 'acngfs'." - elog "It's can be used to mount apt cache on server to client" - elog "filesystem." - elog " Manual page : man 8 acngfs" - fi - elog "Please note: this ebuild installs /etc/cron.daily/${PN} cron job." -} -- cgit v1.2.3-65-gdbad