version bump

(Portage version: 2.0.53_rc7)

6 files changed, 143 insertions, 17 deletions

diff --git a/app-arch/arj/ChangeLog b/app-arch/arj/ChangeLog
index 51d643f1445b..cc7d8b3bca78 100644
--- a/app-arch/arj/ChangeLog
+++ b/app-arch/arj/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/arj
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.15 2005/05/30 17:50:47 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.16 2005/11/11 23:54:36 carlo Exp $
+
+*arj-3.10.22 (11 Nov 2005)
+
+  11 Nov 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/001_arches_align.patch, +files/002_no_remove_static_const.patch,
+  +arj-3.10.22.ebuild:
+  version bump plus two patches from Debian
 
   30 May 2005; Sven Wegener <swegener@gentoo.org> arj-3.10.21.ebuild:
   Moved from gcc.eclass to toolchain-funcs.eclass.
diff --git a/app-arch/arj/Manifest b/app-arch/arj/Manifest
index 228472f0d172..f6fbe499181d 100644
--- a/app-arch/arj/Manifest
+++ b/app-arch/arj/Manifest
@@ -1,22 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c56ba07e37dec37c343269e23b35f156 arj-3.10.20.ebuild 757
-MD5 9b4b57af43fbbee01697da5fb90d0b0e arj-3.10g.ebuild 780
+MD5 373ceb8a627720c472d48daac8348020 ChangeLog 2280
 MD5 bf872d7977d0c5f4ad8a1b5ede6eb655 arj-3.10.18.ebuild 894
+MD5 c56ba07e37dec37c343269e23b35f156 arj-3.10.20.ebuild 757
 MD5 671f5a92021e0a863dc1f272985e5eaa arj-3.10.21.ebuild 1660
-MD5 2a454211dd53810cfe75a1b637c5e462 ChangeLog 2061
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 90b9ae2b489866e7b6dff47f7ea5ac4c arj-3.10.22.ebuild 1697
+MD5 9b4b57af43fbbee01697da5fb90d0b0e arj-3.10g.ebuild 780
+MD5 550bc972d825036f17f202a2b11b35c2 files/001_arches_align.patch 1424
+MD5 395dfa8cc500ffae648777f8f241be88 files/002_no_remove_static_const.patch 530
+MD5 5e2195c695615ccdb1ecbefe4bcad796 files/arj-3.10.18-2.6.headers.patch 402
+MD5 0187cf8866c2daa752565918b94e7ea0 files/arj-3.10.18-fPIC.patch 342
 MD5 7c4c01b5654eb39a7be1799abaad4c2f files/digest-arj-3.10.18 63
 MD5 6c06d74438839e6880711dddb5efd036 files/digest-arj-3.10.20 63
 MD5 f51bf31b56b6e0f9191beb570b38502c files/digest-arj-3.10.21 63
-MD5 5e2195c695615ccdb1ecbefe4bcad796 files/arj-3.10.18-2.6.headers.patch 402
+MD5 678545b31fd18e384761e80ed0f5bc50 files/digest-arj-3.10.22 63
 MD5 47ce44cd0bdc2037f4bfa8dc8e81dfbd files/digest-arj-3.10g 61
-MD5 0187cf8866c2daa752565918b94e7ea0 files/arj-3.10.18-fPIC.patch 342
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCm1KRI1lqEGTUzyQRAkM4AJ49HRcNz80yre10H4g0q9lsd6FyNwCgh64V
-b9Ei2fXOgbEqzVxOVnQ/NP8=
-=bQ0I
------END PGP SIGNATURE-----
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
diff --git a/app-arch/arj/arj-3.10.22.ebuild b/app-arch/arj/arj-3.10.22.ebuild
new file mode 100644
index 000000000000..a09ff6513ed7
--- /dev/null
+++ b/app-arch/arj/arj-3.10.22.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10.22.ebuild,v 1.1 2005/11/11 23:54:36 carlo Exp $
+
+inherit gnuconfig eutils toolchain-funcs
+
+DESCRIPTION="Utility for opening arj archives"
+HOMEPAGE="http://arj.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arj/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE=""
+RESTRICT="nostrip"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/001_arches_align.patch"
+	epatch "${FILESDIR}/002_no_remove_static_const.patch"
+}
+
+src_compile() {
+	if [ -x /usr/sbin/gcc-config ]
+	then
+		# Do we have a gcc that use the new layout and gcc-config ?
+		if /usr/sbin/gcc-config --get-current-profile &> /dev/null
+		then
+			export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
+
+			# Just recheck gcc version ...
+			if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ]
+			then
+				# See if we can get a gcc profile we know is proper ...
+				if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.3.4 &> /dev/null
+				then
+					export PATH="$(/usr/sbin/gcc-config --get-bin-path ${CHOST}-3.3.4):${PATH}"
+					export GCC_PROFILE="${CHOST}-3.3.4"
+				else
+					eerror "This build needs gcc-3.2 or gcc-3.3!"
+					eerror
+					eerror "Use gcc-config to change your gcc profile:"
+					eerror
+					eerror "  # gcc-config $CHOST-3.3.4"
+					eerror
+					eerror "or whatever gcc version is relevant."
+					die
+				fi
+			fi
+		fi
+	fi
+
+	gnuconfig_update
+
+	cd ${S}/gnu
+	autoconf
+	econf || die
+
+	cd ${S}
+	make prepare || die "make prepare failed"
+	make package || die "make package failed"
+}
+
+src_install() {
+	cd ${S}/linux-gnu/en/rs/u
+	dobin bin/* || die
+	dodoc doc/arj/* ${S}/ChangeLog
+}
diff --git a/app-arch/arj/files/001_arches_align.patch b/app-arch/arj/files/001_arches_align.patch
new file mode 100644
index 000000000000..c55d17ec4fe6
--- /dev/null
+++ b/app-arch/arj/files/001_arches_align.patch
@@ -0,0 +1,34 @@
+#DPATCHLEVEL=1
+diff -Naur arj-3.10.19.orig/arj_proc.c arj-3.10.19/arj_proc.c
+--- arj-3.10.19.orig/arj_proc.c	2004-02-20 14:18:52.000000000 +0100
++++ arj-3.10.22/arj_proc.c	2004-04-08 14:06:58.000000000 +0200
+@@ -2898,7 +2898,7 @@
+ }
+ #endif
+ 
+-#if defined(WORDS_BIGENDIAN)&&!defined(ARJDISP)&&!defined(REGISTER)
++#if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER)
+ /* Model-independent routine to get 2 bytes from far RAM */
+ 
+ unsigned int mget_word(char FAR *p)
+diff -Naur arj-3.10.19.orig/arj_proc.h arj-3.10.19/arj_proc.h
+--- arj-3.10.19.orig/arj_proc.h	2004-01-25 01:40:00.000000000 +0100
++++ arj-3.10.22/arj_proc.h	2004-04-08 14:07:18.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ #define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF)
+ #define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c)
+-#ifndef WORDS_BIGENDIAN
++#if !defined(ALIGN_POINTERS) && !defined(WORDS_BIGENDIAN)
+ #define mget_word(p) (*(unsigned short *)(p)&0xFFFF)
+ #define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w))
+ #define mget_dword(p) (*(unsigned long *)(p))
+@@ -60,7 +60,7 @@
+ void unpack_mem(struct mempack *mempack);
+ void strip_lf(char *str);
+ char *ltrim(char *str);
+-#ifdef WORDS_BIGENDIAN
++#if defined(ALIGN_POINTERS) || defined(WORDS_BIGENDIAN)
+ unsigned int mget_word(char FAR *p);
+ unsigned long mget_dword(char FAR *p);
+ void mput_word(unsigned int w, char FAR *p);
diff --git a/app-arch/arj/files/002_no_remove_static_const.patch b/app-arch/arj/files/002_no_remove_static_const.patch
new file mode 100644
index 000000000000..3656ba504a12
--- /dev/null
+++ b/app-arch/arj/files/002_no_remove_static_const.patch
@@ -0,0 +1,20 @@
+#DPATCHLEVEL=1
+diff -Naur arj-3.10.22.orig/gnu/makefile.in arj-3.10.22/gnu/makefile.in
+--- arj-3.10.22.orig/gnu/makefile.in	2004-04-17 14:28:06.000000000 +0300
++++ arj-3.10.22/gnu/makefile.in	2005-08-04 21:50:24.000000000 +0300
+@@ -192,6 +192,15 @@
+ dispose:
+ 
+ #
++# XXX: Do not use -O2, it removes the static const variable with gcc 4.x
++#
++
++INTEGR_DIRS = $(ARJ_DIR) $(REARJ_DIR) $(ARJCRYPT_DIR) $(REGISTER_DIR)
++
++$(patsubst %,%/integr.o, $(INTEGR_DIRS)): $(SRC_DIR)/integr.c
++	$(CC) -Wall -g -c -o$@ $<
++
++#
+ # The tools
+ #
+ 
diff --git a/app-arch/arj/files/digest-arj-3.10.22 b/app-arch/arj/files/digest-arj-3.10.22
new file mode 100644
index 000000000000..864c2b5bf8f6
--- /dev/null
+++ b/app-arch/arj/files/digest-arj-3.10.22
@@ -0,0 +1 @@
+MD5 f263bf3cf6d42a8b7e85b4fb514336d3 arj-3.10.22.tar.gz 431467