net-misc/apt-cacher-ng: Version bump wrt #356319. Migrated to cmake-utils.

(Portage version: 2.2.0_alpha24_p18/git/Linux x86_64, signed Manifest commit with key 05DE07BB)

svn path=/sunrise/; revision=11793

4 files changed, 47 insertions, 30 deletions

diff --git a/net-misc/apt-cacher-ng/ChangeLog b/net-misc/apt-cacher-ng/ChangeLog
index ea7169174..a5da9765e 100644
--- a/net-misc/apt-cacher-ng/ChangeLog
+++ b/net-misc/apt-cacher-ng/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for net-misc/apt-cacher-ng
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*apt-cacher-ng-0.5.14 (25 Feb 2011)
+
+  25 Feb 2011; Michał Górny <mgorny@gentoo.org> -apt-cacher-ng-0.4.9.ebuild,
+  +apt-cacher-ng-0.5.14.ebuild, metadata.xml:
+  Version bump wrt #356319. Migrated to cmake-utils.
+
 *apt-cacher-ng-0.4.9 (06 Jul 2010)
 
   06 Jul 2010; Michał Górny (sedzimir) <mgorny.3ehbo@mailnull.com>
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 549fd8ba2..837d5a20c 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX confd 90 RMD160 d29e3c43d1b7856a5ac6a2e47249955b4aa0e467 SHA1 e60450e1261082df039aad6fe8367e22ee1846c6 SHA256 cabcc9da711514913e5136c82842c750bab8a9658aeeb88da5a266e0d69b29a1
 AUX cron.daily 459 RMD160 774e42915dc408831f088b87f8f5de9b15423e44 SHA1 09bae26f2752cb12d4f7fa9eff492b3bb24a360e SHA256 6ec7ceeead17ef5a84d5ec5472d38810d9e1478213643da5f3fd9863dde40094
 AUX initd 785 RMD160 56dd07e923ef664e8fd192d6a153f2b922ee4835 SHA1 eef235be0317bb95a03fdf22136c793847139ef9 SHA256 0fe59cd17b7a4b7afc68e27f776c7c1b2b83b6bf3c461725eca7a732538f893b
 AUX logrotate 377 RMD160 ef3824ff3484b00195fad7153332ce33f702d937 SHA1 d5606fceb5f3296aff7a7111ffadb440761286f2 SHA256 6f1624d655383452a6d56d69327d41b80379cc667ad2d481ca94f8ea78f7a65b
-DIST apt-cacher-ng_0.4.9.orig.tar.gz 228486 RMD160 293b7e0153621bb9180ea5a8aa1cdf90679d85a8 SHA1 f736e77c063e09ac1b1c5cf85a6553e51542dbca SHA256 da132ad39bee693bb0a1ec54d04a25b50d0b9621e7a3a26cf23cc952e2ea5e25
-EBUILD apt-cacher-ng-0.4.9.ebuild 2490 RMD160 c333826f6ad32ce56be7b0317e59c0ddec6f6983 SHA1 aa6df33de8aaf23351347d0857ad2299d53628a0 SHA256 6ca27bf3744f60a3dff0941314eb04a26e08d5dda43bb220d9f9018012530a48
-MISC ChangeLog 2022 RMD160 eefa5981bf80f38f08b8027ee0873dad825e5bb5 SHA1 7fb2b1e02e6cfd3e838c6d018c587f515f5618df SHA256 d989b5ede57d5654419e3d237d06dd18aa00d269e7ec9493686c905c86499798
-MISC metadata.xml 529 RMD160 4401cf891e8806984f641d12bf1ba6bac18a2625 SHA1 844f5a50cba6a65322349fb04b4b676c03c1b854 SHA256 fac9efaa0bbaade8299ec83aedd17a5aec49f6153ffe3f77c6e6027debbbec10
+DIST apt-cacher-ng_0.5.14.tar.gz 306179 RMD160 a8c3b525b2552cb1777903e0bdbb4f821ec770e4 SHA1 5dc039cfd521a7f5abdf5a97c8bd4d99e790d23e SHA256 7143c1ae0539bd7e5b5b4c7a62e6e29380f7605617b26762f16e2797081f6204
+EBUILD apt-cacher-ng-0.5.14.ebuild 2549 RMD160 a777e2ab843b68a4b13bea5f7fa99441c6067706 SHA1 7d2b901c8adeaafa3ab58e55e23991151b02561e SHA256 efe415e986f0491c67027b30b0d9a1940ec5317f7410598d3e755371e37c8a98
+MISC ChangeLog 2238 RMD160 f75a9edeb2890b93a696156d3ed73b5192aa9bd2 SHA1 444a94b5166c3711972957cccbcc4d87fa726f7d SHA256 a118d4ad5a182f2a75ca45a8daa9d6c045b1e8c11e3682aae676ca9817be8bca
+MISC metadata.xml 450 RMD160 4776fca96d8c1abf99b1efe71d7e77a0f024a167 SHA1 477fd3dbcc37f9488747d7df3941b1000f09997e SHA256 5c3d70ff08512bc5ae879f160737c9e0b6dc6e2b0464081b5b6a7bf54af418cc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1n4iEACgkQnGSe5QXeB7tpuACg269jCcbITSe4eRZcswrCg2fd
+8U8An12mFRzFGwAOt0mcDPgGKIe3LxW1
+=0lYj
+-----END PGP SIGNATURE-----
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.4.9.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.5.14.ebuild
index b3d400274..2119720aa 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.4.9.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.5.14.ebuild
@@ -1,21 +1,25 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils toolchain-funcs
+EAPI=3
+inherit cmake-utils eutils
 
-PATCHSET_V=1
 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}_${PV}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="doc examples fuse logrotate"
+IUSE="doc examples fuse lzma"
 
 DEPEND="app-arch/bzip2
-	sys-libs/zlib"
+	sys-libs/zlib
+	lzma? (
+		|| ( app-arch/xz-utils
+			app-arch/lzma-utils )
+	)"
 RDEPEND="${DEPEND}
 	dev-lang/perl
 	fuse? ( sys-fs/fuse )"
@@ -26,25 +30,25 @@ pkg_setup() {
 	enewuser ${PN} -1 -1 -1 ${PN}
 }
 
-src_prepare() {
-	# Respect our LDFLAGS for all targets.
-	sed -i \
-		-e 's:\($(CXX)\)\(.*\)-Wl,--as-needed:\1 $(LDFLAGS)\2:' \
-		Makefile || die
-}
+src_configure() {
+	mycmakeargs=(
+		# avoid forcing in LDFLAGS
+		-DHAVE_WL_AS_NEEDED=OFF
+		# assert for possible boost automagic
+		-DHAVE_BOOST_SMARTPTR=OFF
+
+		$(cmake-utils_use_has lzma LZMA)
+		$(cmake-utils_use_has fuse FUSE_26)
+	)
 
-src_compile() {
-	tc-export CXX
-	local build=
-	use fuse && build=acngfs
-	emake CURDIR="${S}" acng ${build} || die
+	cmake-utils_src_configure
 }
 
 src_install() {
-	dosbin ${PN} || die
+	dosbin "${CMAKE_BUILD_DIR}"/${PN} || die
 	doman doc/man/${PN}.8 || die
 	if use fuse; then
-		dobin acngfs || die
+		dobin "${CMAKE_BUILD_DIR}"/acngfs || die
 		doman doc/man/acngfs.8 || die
 	fi
 
@@ -52,13 +56,11 @@ src_install() {
 	newconfd "${FILESDIR}"/confd ${PN} || die
 
 	# for logrotate
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/logrotate ${PN} || die
-	fi
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/logrotate ${PN} || die
 
 	# Documentation
-	dodoc ChangeLog README TODO || die
+	dodoc ChangeLog doc/README TODO || die
 	if use doc; then
 		dodoc doc/*.pdf || die
 		dohtml doc/html/* || die
diff --git a/net-misc/apt-cacher-ng/metadata.xml b/net-misc/apt-cacher-ng/metadata.xml
index 80ff40517..b2d8f7b45 100644
--- a/net-misc/apt-cacher-ng/metadata.xml
+++ b/net-misc/apt-cacher-ng/metadata.xml
@@ -6,6 +6,5 @@
 	<use>
 		<flag name="doc">Installs some documentation and config examples.</flag>
 		<flag name="fuse">Build fuse httpfs named 'acngfs'. It's can be used to mount apt cache on server to client filesystem.</flag>
-		<flag name="logrotate">Install support files for app-admin/logrotate.</flag>
 	</use>
 </pkgmetadata>