Clean up, fix USE=debug build #267508 by mimosinnet, and fix FEATURES=test 277557 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc91/cvs/Linux x86_64

3 files changed, 44 insertions, 20 deletions

diff --git a/net-fs/djmount/ChangeLog b/net-fs/djmount/ChangeLog
index 57cb5067556c..5c3f8e657be4 100644
--- a/net-fs/djmount/ChangeLog
+++ b/net-fs/djmount/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/djmount
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/djmount/ChangeLog,v 1.5 2008/03/20 03:34:21 cardoe Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/djmount/ChangeLog,v 1.6 2010/10/11 05:33:32 vapier Exp $
+
+  11 Oct 2010; Mike Frysinger <vapier@gentoo.org> djmount-0.71-r1.ebuild:
+  Clean up, fix USE=debug build #267508 by mimosinnet, and fix FEATURES=test
+  277557 by Diego E. Pettenò.
 
 *djmount-0.71-r1 (20 Mar 2008)
 
diff --git a/net-fs/djmount/Manifest b/net-fs/djmount/Manifest
index 3b5e3a485670..7fd74a4268d1 100644
--- a/net-fs/djmount/Manifest
+++ b/net-fs/djmount/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST djmount-0.71.tar.gz 1159653 RMD160 695e2ea0cd3fe654339f82c5101eb74da739d3f7 SHA1 527d4603d85b7fb86dc97d326b78c97bdcc4d687 SHA256 aa5bb482af4cbd42695a7e396043d47b53d075ac2f6aa18a8f8e11383c030e4f
-EBUILD djmount-0.71-r1.ebuild 740 RMD160 0f4826dfb1904a6a3e8961492fd834813e61f252 SHA1 517dc0459deb05435208d5a8180769824896e7d8 SHA256 43801119d630f9d2e6863256e4e337289f084c09ddb62851ba03312cb79050f6
-MISC ChangeLog 1185 RMD160 9ea458e2771053ddb952ff266a9dd452ff414595 SHA1 5480e3136dbd1a7566101a0ee0455af004ccd527 SHA256 04641cabd8e8963a4bc44bf64da878c2b3409bfa941dfb99a57bffa659af0a4f
+EBUILD djmount-0.71-r1.ebuild 1081 RMD160 c9173bba872472498ff319b4cccdb689d2251217 SHA1 5f9a1a9c031577640fee34ff8184f0aa333d8c33 SHA256 d301178a4194905d693fa075a082b556e23630ae1850c4077fa6f9b56dee3cfd
+MISC ChangeLog 1368 RMD160 9f04ca57a3808c3e4a27237f5bb1de45c60d641c SHA1 b42d96eee3d59b4d9786219d6b52dedac22bf544 SHA256 d02887019c328687ba37e2269beb16b0f9378083586d7a8cd86145ca7654e2cd
 MISC metadata.xml 222 RMD160 d1a3fdf35754f259a53541e6f3fdf4685c621b4c SHA1 2669a0aa4051cb9d7eca5b8e5719f5039bf850b9 SHA256 2744b911fd4a893fc26fd4fbfcf4bad6189fbbd14a6b525c84c95d012e8c06da
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iD8DBQFH4dtGoeSe8B0zEfwRAn5IAJ9bmlAU3IHZggd4+EqHqt2xwGgNNQCfR0hY
-6W5F+uQcfp7L41YmU1Ibcw0=
-=Ws1B
+iF4EAREIAAYFAkyyoSsACgkQTwhj9JtAlp5zcAEAk9s0bpk+d16pUP77bn2fvWRn
+K3pX9IYiGVYulZT5MrYA/0JjS+matKyeZwS2aC3WE42dWf63JMfzbTCoA9slfb00
+=B2Gw
 -----END PGP SIGNATURE-----
diff --git a/net-fs/djmount/djmount-0.71-r1.ebuild b/net-fs/djmount/djmount-0.71-r1.ebuild
index c644c76d793f..3d95697426ec 100644
--- a/net-fs/djmount/djmount-0.71-r1.ebuild
+++ b/net-fs/djmount/djmount-0.71-r1.ebuild
@@ -1,24 +1,44 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/djmount/djmount-0.71-r1.ebuild,v 1.1 2008/03/20 03:34:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/djmount/djmount-0.71-r1.ebuild,v 1.2 2010/10/11 05:33:32 vapier Exp $
+
+EAPI="2"
 
 DESCRIPTION="Mount UPnP audio/video servers as a filesystem"
 HOMEPAGE="http://djmount.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="sys-fs/fuse
-		net-libs/libupnp"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf $(use_enable debug) --with-external-libupnp || die "econf failed"
-	emake || die "emake failed"
+IUSE="debug test"
+
+RDEPEND="sys-fs/fuse
+	net-libs/libupnp"
+DEPEND="${RDEPEND}
+	test? ( sys-libs/readline )"
+
+src_unpack() {
+	default
+	rm -rf libupnp/*/{src,inc} libupnp/configure # make sure we use external
+}
+
+src_prepare() {
+	sed -i 's:SetLogFileNames:UpnpSetLogFileNames:' djmount/fuse_main.c #267508
+	sed -i 's:InitLog:UpnpInitLog:' djmount/test_device.c #277557
+}
+
+src_configure() {
+	econf $(use_enable debug) --with-external-libupnp
+}
+
+src_test() {
+	# wants to do mounts :x
+	printf '#!/bin/sh\nexit 0\n' > djmount/test_vfs.sh
+	default
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README search_help.txt THANKS
 }