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

(Portage version: 2.2_rc91/cvs/Linux x86_64)

2 files changed, 37 insertions, 13 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/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
 }