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

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

5 files changed, 83 insertions, 4 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/Manifest b/sys-fs/siefs/Manifest
index c7f324308242..ca58a545d5b1 100644
--- a/sys-fs/siefs/Manifest
+++ b/sys-fs/siefs/Manifest
@@ -1,5 +1,17 @@
-AUX siefs-0.5-qa-fixes.patch 1207 RMD160 6d97fcbf257330cf078d84ac7f44d251565a486e SHA1 94895153a1582fb2be8686cab8c16d9718daa9ec SHA256 23abbe17ae710c8f8edc5983180024b4b72db80e6c329fd6c0d9fa8d147c5880
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX siefs-0.5-external-vmoconv.patch 370 RMD160 223ce4aec628900d79f729cc61b8f92c7a6faca4 SHA1 a12d8f302c688fdebc12d45128f2daa0ac961212 SHA256 c30023634b3dae8e6a8b82fc15bffdd73dab73e1b099a3c4218123fefbed2cc9
+AUX siefs-0.5-qa-fixes.patch 1794 RMD160 810a78fb282fd35b1abb4b52c4426c739facf64b SHA1 b5f02475a97bb6248bf8dc081ed8cdfa86ce86d1 SHA256 def4d4bc0b314a8dae6946de566097f0c052a2a8dd3d502ba8525a40a8932c39
 DIST siefs-0.5.tar.gz 112466 RMD160 2b3edc0b325a4b422b7190369fb6c371819edcb7 SHA1 ba01dca2d0b7cc5333856bfa50a7323bf7a00704 SHA256 9e1d829de412446c7b2ce5ba1c9ca1f89206c42e8a510c920907d684e0b7f525
 EBUILD siefs-0.5-r1.ebuild 918 RMD160 feac948585efd543225fe8886f06ab10f642a8f2 SHA1 fe0c4c98ebb5ddc6fe6a53af3c1a2daafb030d02 SHA256 f4c8e01eecfa85232f4af9987efda588d99f3f9b4e5b9536bccd7a7f55a4d078
-MISC ChangeLog 1677 RMD160 1dd9c1670b74c22ecdcc9458a0de154898596b48 SHA1 b84126e99fe6ba3bf0c17f211db5d9ee200f26ec SHA256 8ee2b58bab1f94ae100b0f91511982bcf631b91cf2f7d374f6d656203cc525b2
+EBUILD siefs-0.5-r2.ebuild 748 RMD160 4be21743f210a79eec79bfbf4f9a0bf318fb4500 SHA1 6a9a29b03ea633e3c8e4ca31469253c30cb6df94 SHA256 aad15e6ba810eaf5793e699bf2b788bd189fc2575fa1c12bb23391b21e4142e5
+MISC ChangeLog 1908 RMD160 de6971519ff6b6b16ac2a576fbaf334528e586c2 SHA1 8dac4b8dff2666fd3bf756a82e524b6ff5e3d00e SHA256 0e5a75453ee0372dc27d0be071e7f5079a846ae1f65fb1d279ca843684e4d97e
 MISC metadata.xml 416 RMD160 28f6e542c04da06f4639ef905e3f76eb87d7e061 SHA1 9b3104959768af3821b2cbac265663ea53f22f01 SHA256 63360b1099e0b063517efdfbd9b49b35ed43d018fc91f1812187e3bd8c10d101
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknGFewACgkQts85UDFmaOXQMACaA+g1mKYTY7/U0oodb18oAqus
+M3sAn2Cbnz7iCdQDzs0cj7LEjdp6T7Yz
+=cE3G
+-----END PGP SIGNATURE-----
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
+}