Fix collision with app-mobilephone/vmoconv (#256570).

(Portage version: 2.1.6.7/cvs/Linux x86_64)

4 files changed, 69 insertions, 2 deletions

diff --git a/sys-fs/siefs/ChangeLog b/sys-fs/siefs/ChangeLog
index b785dc597e1e..09e7ef59a43b 100644
--- a/sys-fs/siefs/ChangeLog
+++ b/sys-fs/siefs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/siefs
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/siefs/ChangeLog,v 1.11 2008/11/08 01:46:50 darkside Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/siefs/ChangeLog,v 1.12 2009/03/22 10:41:39 mrness Exp $
+
+*siefs-0.5-r2 (22 Mar 2009)
+
+  22 Mar 2009; Alin Năstac <mrness@gentoo.org>
+  +files/siefs-0.5-external-vmoconv.patch, files/siefs-0.5-qa-fixes.patch,
+  +siefs-0.5-r2.ebuild:
+  Fix collision with app-mobilephone/vmoconv (#256570).
 
   08 Nov 2008; Jeremy Olexa <darkside@gentoo.org> siefs-0.5-r1.ebuild:
   amd64 stable, bug #244348
diff --git a/sys-fs/siefs/files/siefs-0.5-external-vmoconv.patch b/sys-fs/siefs/files/siefs-0.5-external-vmoconv.patch
new file mode 100644
index 000000000000..cb9688e24979
--- /dev/null
+++ b/sys-fs/siefs/files/siefs-0.5-external-vmoconv.patch
@@ -0,0 +1,12 @@
+diff -Nru siefs-0.5.orig/configure.in siefs-0.5/configure.in
+--- siefs-0.5.orig/configure.in	2005-04-04 05:15:31.000000000 +0000
++++ siefs-0.5/configure.in	2009-03-03 20:55:08.000000000 +0000
+@@ -50,7 +50,7 @@
+ AC_MSG_RESULT(${fuseinst})
+ AC_SUBST(fuseinst)
+ 
+-subdirs="siefs converter"
++subdirs="siefs"
+ AC_SUBST(subdirs)
+ 
+ AC_DEFINE_UNQUOTED(FUSEINST, "${fuseinst}")
diff --git a/sys-fs/siefs/files/siefs-0.5-qa-fixes.patch b/sys-fs/siefs/files/siefs-0.5-qa-fixes.patch
index 59feeae61e11..dbd8a30fb1c7 100644
--- a/sys-fs/siefs/files/siefs-0.5-qa-fixes.patch
+++ b/sys-fs/siefs/files/siefs-0.5-qa-fixes.patch
@@ -1,3 +1,18 @@
+diff -Nru siefs-0.5.orig/siefs/Makefile.am siefs-0.5/siefs/Makefile.am
+--- siefs-0.5.orig/siefs/Makefile.am	2005-04-05 14:36:28.000000000 +0000
++++ siefs-0.5/siefs/Makefile.am	2009-03-03 20:59:05.000000000 +0000
+@@ -9,8 +9,8 @@
+ slink_SOURCES = slink.c obex.c obex.h transport.c transport.h comm.c comm.h \
+ 	crcmodel.c crcmodel.h
+ 
+-LDADD = $(fuseinst)/lib/libfuse.a -lpthread
++LDADD = -lfuse -lpthread
+ 
+ install-exec-hook:
+-	-rm -f /sbin/mount.siefs
+-	-ln -s $(DESTDIR)$(bindir)/siefs /sbin/mount.siefs
++	-mkdir $(DESTDIR)/sbin/
++	-ln -s ..$(bindir)/siefs $(DESTDIR)/sbin/mount.siefs
 diff -Nru siefs-0.5.orig/siefs/charset.c siefs-0.5/siefs/charset.c
 --- siefs-0.5.orig/siefs/charset.c	2005-04-05 17:15:47.000000000 +0300
 +++ siefs-0.5/siefs/charset.c	2007-05-23 14:13:19.000000000 +0300
diff --git a/sys-fs/siefs/siefs-0.5-r2.ebuild b/sys-fs/siefs/siefs-0.5-r2.ebuild
new file mode 100644
index 000000000000..ae55576ea9e3
--- /dev/null
+++ b/sys-fs/siefs/siefs-0.5-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/siefs/siefs-0.5-r2.ebuild,v 1.1 2009/03/22 10:41:39 mrness Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Siemens FS"
+HOMEPAGE="http://chaos.allsiemens.com/siefs"
+SRC_URI="http://chaos.allsiemens.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="sys-fs/fuse"
+RDEPEND="${DEPEND}
+	app-mobilephone/vmoconv"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-qa-fixes.patch
+	epatch "${FILESDIR}"/${P}-external-vmoconv.patch
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc README AUTHORS
+}