Add back in symlinks for /sbin #159319 and backport fix for missing asm/unaligned.h #153494.

(Portage version: 2.1.2_rc4-r1)

4 files changed, 79 insertions, 1 deletions

diff --git a/sys-fs/reiserfsprogs/ChangeLog b/sys-fs/reiserfsprogs/ChangeLog
index b4bcc1a25688..7be15774cbfa 100644
--- a/sys-fs/reiserfsprogs/ChangeLog
+++ b/sys-fs/reiserfsprogs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/reiserfsprogs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/ChangeLog,v 1.38 2006/10/31 07:18:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/ChangeLog,v 1.39 2006/12/29 21:48:12 vapier Exp $
+
+*reiserfsprogs-3.6.19-r1 (29 Dec 2006)
+
+  29 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/reiserfsprogs-3.6.19-unaligned.patch,
+  +reiserfsprogs-3.6.19-r1.ebuild:
+  Add back in symlinks for /sbin #159319 and backport fix for missing
+  asm/unaligned.h #153494.
 
 *reiserfsprogs-3.6.20 (31 Oct 2006)
 
diff --git a/sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.19-r1 b/sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.19-r1
new file mode 100644
index 000000000000..dafe8ed8d8bd
--- /dev/null
+++ b/sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.19-r1
@@ -0,0 +1,3 @@
+MD5 b42cf15f6651c3ceff5cb84996c0d539 reiserfsprogs-3.6.19.tar.gz 406895
+RMD160 a082eb9de980b3d24dd9d08e5028a19f448ed40a reiserfsprogs-3.6.19.tar.gz 406895
+SHA256 c0862c53aecd23724a72d32fb54706d61d9858925c78408a2852d042417e68bf reiserfsprogs-3.6.19.tar.gz 406895
diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-unaligned.patch b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-unaligned.patch
new file mode 100644
index 000000000000..5883ce85f827
--- /dev/null
+++ b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-unaligned.patch
@@ -0,0 +1,35 @@
+backported from 3.6.20
+
+http://bugs.gentoo.org/153494
+
+--- include/reiserfs_fs.h
++++ include/reiserfs_fs.h
+@@ -38,14 +38,22 @@
+ # define extern_inline
+ #endif
+ 
+-#include <asm/unaligned.h>
+-
+ #ifndef get_unaligned
+-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
+-    defined(__PPC) || defined(powerpc) || defined(__powerpc__)
+-#	define get_unaligned(ptr)	(*(ptr))
+-#	define put_unaligned(val,ptr)	((void)(*(ptr) = (val)))
++#define get_unaligned(ptr)                              \
++({                                                      \
++        __typeof__(*(ptr)) __tmp;                       \
++        memcpy(&__tmp, (ptr), sizeof(*(ptr)));      \
++        __tmp;                                          \
++})
+ #endif
++
++#ifndef put_unaligned
++#define put_unaligned(val, ptr)                         \
++({                                                      \
++        __typeof__(*(ptr)) __tmp = (val);               \
++        memcpy((ptr), &__tmp, sizeof(*(ptr)));      \
++        (void)0;                                        \
++})
+ #endif
+ 
+ #define get_leXX(xx,p,field)	(le##xx##_to_cpu ((p)->field))
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.19-r1.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.19-r1.ebuild
new file mode 100644
index 000000000000..fbf82754b4c3
--- /dev/null
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.19-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/reiserfsprogs-3.6.19-r1.ebuild,v 1.1 2006/12/29 21:48:12 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Reiserfs Utilities"
+HOMEPAGE="http://www.namesys.com/"
+SRC_URI="http://www.namesys.com/pub/reiserfsprogs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-unaligned.patch
+}
+
+src_compile() {
+	econf --prefix=/ || die "Failed to configure"
+	emake || die "Failed to compile"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Failed to install"
+	dosym reiserfsck /sbin/fsck.reiserfs
+	dosym mkreiserfs /sbin/mkfs.reiserfs
+	dodoc ChangeLog INSTALL README
+}