Bug #265840:

 - Version bump to 0.3.9.1
 - -r1 to -r2: go into source directory and then apply patch
 - remove old -r1

svn path=/sunrise/; revision=8424

4 files changed, 118 insertions, 2 deletions

diff --git a/net-misc/apt-cacher-ng/ChangeLog b/net-misc/apt-cacher-ng/ChangeLog
index 108ce0347..855e4ec21 100644
--- a/net-misc/apt-cacher-ng/ChangeLog
+++ b/net-misc/apt-cacher-ng/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*apt-cacher-ng-0.3.9.1 (25 Apr 2009)
+  25 Apr 2009; Sergey Dryabzhinsky <sergey.dryabzhinsky@gmail.com> 
+  +apt-cacher-ng-0.3.9.1.ebuild
+  +apt-cacher-ng-0.3.8.1-r2.ebuild
+  -apt-cacher-ng-0.3.8.1-r1.ebuild
+  Version bump,
+  -r1 to -r2: go into source directory and then apply patch
+
 *apt-cacher-ng-0.3.8.1-r1 (12 Apr 2009)
 
   12 Apr 2009; Sergey Dryabzhinsky <sergey.dryabzhinsky@gmail.com> 
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 7c8a55eb0..6b0bdbcf4 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -5,6 +5,9 @@ AUX initd 785 RMD160 56dd07e923ef664e8fd192d6a153f2b922ee4835 SHA1 eef235be0317b
 AUX logrotate 377 RMD160 ef3824ff3484b00195fad7153332ce33f702d937 SHA1 d5606fceb5f3296aff7a7111ffadb440761286f2 SHA256 6f1624d655383452a6d56d69327d41b80379cc667ad2d481ca94f8ea78f7a65b
 DIST apt-cacher-ng_0.3.8-1.diff.gz 10747 RMD160 1b1accdc721d79cf5dd28a57c27bee4c0ba09cee SHA1 cd828d0d66d260974bd93e093db5f308f7a575cd SHA256 b950bfe11e9038c61828896284d47a6b2d11b04dfa01ff847ba08e57b647967b
 DIST apt-cacher-ng_0.3.8.orig.tar.gz 211989 RMD160 e4b29385b59813104d1a79e5dca3ebd526934626 SHA1 830c5bb3164e381eaee5de7c364005f2923cdff2 SHA256 76a5314f3191aeae3fabf7730e8fcf509e93a8c2d609dd2b3b2f8bc312eee26b
-EBUILD apt-cacher-ng-0.3.8.1-r1.ebuild 3222 RMD160 90e90dd0468c62ab9c413d1bfd9b68bb588b703f SHA1 dfa90afce376434e4e3ff9104f567eb221db9676 SHA256 166c656301c6a8c7ca7f7d96aab4c9dd0025aca7c78d3918f8b39579f5324103
+DIST apt-cacher-ng_0.3.9-1.diff.gz 10794 RMD160 6c0bf2b631a34bb35f736db898d7989f6b6dcd7e SHA1 1844493a1621d141d0484d33e1b62ed3d939052d SHA256 f6d18508adca4bf634da78a7d3f94c3bcdf789fcb8e5c5a33e99b8922fc5682d
+DIST apt-cacher-ng_0.3.9.orig.tar.gz 213906 RMD160 b1d6608fa0e6024b006a15e4002aa467433133ac SHA1 2f8330a65cf32aa9141ab3e8a139d4407e25a979 SHA256 44516daad3182f14ce8d9215379b93728017529a4db99c46af9fb5a14ecd39bf
+EBUILD apt-cacher-ng-0.3.8.1-r2.ebuild 3235 RMD160 360c3c028f9aea65d55cd4fa03f3b1e46cce4e1f SHA1 dbe3efd3cfe693bda6b3cea16595e2f3ddaed470 SHA256 64ae3de15bcac591d7ddb3d3e17659e79da479765baad7b284328d18515affe6
+EBUILD apt-cacher-ng-0.3.9.1.ebuild 3232 RMD160 74c6ec3eb314e8ac963a7bead838c067833c46de SHA1 0467cd5a1b37746f969181f1f7e30a750229f24b SHA256 0f6bf5795eb22936e2246d3388a392d9723bceec766e847eb7cd0263e99dd567
 MISC ChangeLog 453 RMD160 98278c7838be1aba500561f83710ef14649a7576 SHA1 de87808f793554f94de8ab56cc6b3e5481e714cc SHA256 4c0de0fc90b810798c12bab0c224b0b4cf0ef2d4c20bd785129ad7c009819236
 MISC metadata.xml 390 RMD160 40659c355f410c97959c1cc60b8aa8e4e00950dd SHA1 176a70493d5c09c2e0e10db57b6f2305ffeeb5e9 SHA256 cfa296bbf435f33a61f87b507401841d70dfdf000623861b534f3d35490a81cf
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.3.8.1-r2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.3.8.1-r2.ebuild
new file mode 100644
index 000000000..15bd10aab
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.3.8.1-r2.ebuild
@@ -0,0 +1,105 @@
+# 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}-${MY_PV}-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."
+}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.3.8.1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.3.9.1.ebuild
index a0ca79922..b312d1a51 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.3.8.1-r1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.3.9.1.ebuild
@@ -34,7 +34,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	epatch "${WORKDIR}/${PN}_${MY_PV}-${MY_DPV}.diff" # Debian patchset number 1.2.3.x
-	epatch "${FILESDIR}/${PN}-${MY_PV}-respect-portage-qa-build-unstripped.patch" # Respect portage
+	cd "${S}" && epatch "${FILESDIR}/${PN}-0.3.8-respect-portage-qa-build-unstripped.patch" # Respect portage
 }
 
 src_compile() {