New cleaned up version and removal of non working ebuilds.

(Portage version: 2.0.53)

6 files changed, 151 insertions, 121 deletions

diff --git a/sys-devel/gcc-hppa64/ChangeLog b/sys-devel/gcc-hppa64/ChangeLog
index f11505bde607..c903b58a436a 100644
--- a/sys-devel/gcc-hppa64/ChangeLog
+++ b/sys-devel/gcc-hppa64/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gcc-hppa64
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-hppa64/ChangeLog,v 1.8 2004/07/02 09:32:39 eradicator Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-hppa64/ChangeLog,v 1.9 2006/01/08 13:22:50 gmsoft Exp $
+
+*gcc-hppa64-3.4.5 (08 Jan 2006)
+
+  08 Jan 2006; Guy Martin <gmsoft@gentoo.org> -gcc-hppa64-3.4.0.ebuild,
+  +gcc-hppa64-3.4.5.ebuild:
+  New cleaned up version and removal of non working ebuilds.
 
   02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   gcc-hppa64-3.3.2-r1.ebuild, gcc-hppa64-3.3.2.ebuild,
diff --git a/sys-devel/gcc-hppa64/Manifest b/sys-devel/gcc-hppa64/Manifest
index ee1383510728..17242376d93e 100644
--- a/sys-devel/gcc-hppa64/Manifest
+++ b/sys-devel/gcc-hppa64/Manifest
@@ -1,12 +1,14 @@
-MD5 83ef63e1e7d02336c0ebba43fa81aef5 gcc-hppa64-3.3.2.ebuild 2264
-MD5 1a1f047bfa2fd2e0b477ed8ce1a1d90c gcc-hppa64-3.4.0.ebuild 2352
-MD5 fd281452f7ed3759922fd322e26bfecc gcc-hppa64-3.3.2-r1.ebuild 2320
 MD5 ab3eb16034aefb4171b66565e38d5195 ChangeLog 1278
-MD5 016028badcf024e3ef4688435ffbce58 metadata.xml 223
-MD5 dcdd2cf7d57f6edf2fbe8c2063f76376 files/gcc-3.3.2-rtl-optimization.patch 6624
-MD5 23e11b0b1e3621760d3e4d831d000161 files/gcc-3.4.0-gentoo-branding.patch 843
-MD5 d9ae122db2768f8e504dfef256d4991f files/gcc-3.3.2-gentoo-branding.patch 874
-MD5 006481ae255582fae4fa22107dfb359e files/digest-gcc-hppa64-3.3.2-r1 64
 MD5 006481ae255582fae4fa22107dfb359e files/digest-gcc-hppa64-3.3.2 64
+MD5 006481ae255582fae4fa22107dfb359e files/digest-gcc-hppa64-3.3.2-r1 64
 MD5 c18300f698a8fd5c824c1ddb4d0685dd files/digest-gcc-hppa64-3.4.0 64
+MD5 ba0f5e25062066184f3513100252770f files/digest-gcc-hppa64-3.4.5 64
+MD5 d9ae122db2768f8e504dfef256d4991f files/gcc-3.3.2-gentoo-branding.patch 874
+MD5 dcdd2cf7d57f6edf2fbe8c2063f76376 files/gcc-3.3.2-rtl-optimization.patch 6624
+MD5 23e11b0b1e3621760d3e4d831d000161 files/gcc-3.4.0-gentoo-branding.patch 843
 MD5 b859dad4b64217f98ba18423c059e30f files/gcc-3.4.0-rtl-optimization.patch 5681
+MD5 fd281452f7ed3759922fd322e26bfecc gcc-hppa64-3.3.2-r1.ebuild 2320
+MD5 83ef63e1e7d02336c0ebba43fa81aef5 gcc-hppa64-3.3.2.ebuild 2264
+MD5 1a1f047bfa2fd2e0b477ed8ce1a1d90c gcc-hppa64-3.4.0.ebuild 2352
+MD5 ded34532e98b546a1d05af05a3c3830b gcc-hppa64-3.4.5.ebuild 3366
+MD5 016028badcf024e3ef4688435ffbce58 metadata.xml 223
diff --git a/sys-devel/gcc-hppa64/files/digest-gcc-hppa64-3.4.0 b/sys-devel/gcc-hppa64/files/digest-gcc-hppa64-3.4.0
deleted file mode 100644
index 710f9e1fbbc2..000000000000
--- a/sys-devel/gcc-hppa64/files/digest-gcc-hppa64-3.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 85c6fc83d51be0fbb4f8205accbaff59 gcc-3.4.0.tar.bz2 27258902
diff --git a/sys-devel/gcc-hppa64/files/digest-gcc-hppa64-3.4.5 b/sys-devel/gcc-hppa64/files/digest-gcc-hppa64-3.4.5
new file mode 100644
index 000000000000..ded991406cd1
--- /dev/null
+++ b/sys-devel/gcc-hppa64/files/digest-gcc-hppa64-3.4.5
@@ -0,0 +1 @@
+MD5 7c3c3c3e764dcee5eb771432062d69e1 gcc-3.4.5.tar.bz2 28254232
diff --git a/sys-devel/gcc-hppa64/gcc-hppa64-3.4.0.ebuild b/sys-devel/gcc-hppa64/gcc-hppa64-3.4.0.ebuild
deleted file mode 100644
index 7497ceb390fa..000000000000
--- a/sys-devel/gcc-hppa64/gcc-hppa64-3.4.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-hppa64/gcc-hppa64-3.4.0.ebuild,v 1.4 2004/07/15 03:23:32 agriffis Exp $
-
-inherit eutils
-
-
-# Variables
-MYARCH="$(echo ${PN} | cut -d- -f2)"
-TMP_P="${P/-${MYARCH}/}"
-TMP_PN="${PN/-${MYARCH}/}"
-I="/usr"
-
-
-DESCRIPTION="Gcc for 64bit hppa kernels"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${TMP_P}/${TMP_P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="-* -hppa"
-IUSE="build"
-
-DEPEND="virtual/libc
-	>=sys-devel/binutils-hppa64-2.14.90.0.7
-	>=sys-devel/binutils-2.14.90.0.7
-	>=sys-devel/gcc-config-1.3.1"
-
-RDEPEND="virtual/libc
-	>=sys-devel/gcc-config-1.3.1
-	>=sys-libs/zlib-1.1.4
-	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
-
-TARGET=hppa64-linux
-
-version_patch() {
-	[ ! -f "$1" ] && return 1
-	[ -z "$2" ] && return 1
-
-	sed -e "s:@GENTOO@:$2:g" ${1} > ${T}/${1##*/}
-	epatch ${T}/${1##*/}
-}
-
-src_unpack() {
-	unpack ${TMP_P}.tar.bz2
-	cd ${WORKDIR}
-	ln -s ${TMP_P} ${P}
-	cd ${S}
-
-	# Make gcc's version info specific to Gentoo
-	if [ -z "${PP_VER}" ]; then
-		version_patch ${FILESDIR}/${TMP_P}-gentoo-branding.patch \
-			"(Gentoo Linux ${PVR})" || die "Failed Branding"
-	fi
-
-	# rtl-optimization fix for pa2.0
-	epatch ${FILESDIR}/${TMP_P}-rtl-optimization.patch
-}
-
-src_compile() {
-	cd ${WORKDIR}
-
-	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
-
-	einfo "Configuring GCC..."
-
-	addwrite "/dev/zero"
-	${S}/configure --prefix=${I} \
-		--build=hppa-linux \
-		--host=hppa-linux \
-		--disable-shared \
-		--without-libc \
-		--enable-languages=c \
-		--target=${TARGET} \
-		${myconf} || die
-
-	einfo "Building GCC..."
-	S="${WORKDIR}/build" \
-	emake CPATH=/usr/include CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	# Do allow symlinks in ${I}/lib/gcc-lib/${CHOST}/${PV}/include as
-	# this can break the build.
-	for x in cd ${WORKDIR}/build/gcc/include/*
-	do
-		if [ -L ${x} ]
-		then
-			rm -f ${x}
-		fi
-	done
-
-	einfo "Installing GCC..."
-	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
-	S="${WORKDIR}/build" \
-	make prefix=${D}${I} \
-		FAKE_ROOT="${D}" \
-		install || die
-
-	#Remove unneeded files
-
-	for i in lib/libiberty.a man share include info
-	do
-		rm -R ${D}/usr/${i}
-	done
-}
diff --git a/sys-devel/gcc-hppa64/gcc-hppa64-3.4.5.ebuild b/sys-devel/gcc-hppa64/gcc-hppa64-3.4.5.ebuild
new file mode 100644
index 000000000000..fb6b7728e38a
--- /dev/null
+++ b/sys-devel/gcc-hppa64/gcc-hppa64-3.4.5.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-hppa64/gcc-hppa64-3.4.5.ebuild,v 1.1 2006/01/08 13:22:50 gmsoft Exp $
+
+inherit eutils flag-o-matic
+
+# Variables 
+MYARCH="$(echo ${PN} | cut -d- -f2)"
+TMP_P="${P/-${MYARCH}/}"
+TMP_PN="${PN/-${MYARCH}/}"
+I="/usr"
+BRANCH_UPDATE=""
+
+DESCRIPTION="HPPA 64bit Kernel Compiler"
+HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
+
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${TMP_P}/${TMP_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~hppa"
+
+DEPEND="virtual/libc
+	>=sys-devel/binutils-hppa64-2.16.1
+	>=sys-devel/gcc-config-1.3.12-r4"
+
+RDEPEND="virtual/libc
+	>=sys-devel/gcc-config-1.3.12-r4
+	>=sys-libs/zlib-1.1.4
+	>=sys-apps/texinfo-4.2-r4
+	!build? ( >=sys-libs/ncurses-5.2-r2 )"
+
+# Ripped from toolchain.eclass
+gcc_version_patch() {
+	[ -z "$1" ] && die "no arguments to gcc_version_patch"
+
+	sed -i -e 's~\(const char version_string\[\] = ".....\).*\(".*\)~\1 @GENTOO@\2~' ${S}/gcc/version.c || die "failed to add @GENTOO@"
+	sed -i -e "s:@GENTOO@:$1:g" ${S}/gcc/version.c || die "failed to patch version"
+	sed -i -e 's~http:\/\/gcc\.gnu\.org\/bugs\.html~http:\/\/bugs\.gentoo\.org\/~' ${S}/gcc/version.c || die "failed to update bugzilla URL"
+}
+
+pkg_setup() {
+	# glibc or uclibc?
+	if use elibc_glibc; then
+		MYUSERLAND="gnu"
+	elif use elibc_uclibc; then
+		MYUSERLAND="uclibc"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${WORKDIR}
+	ln -s ${TMP_P} ${P}
+	cd ${S}
+
+	# Patch in Branch update
+	if [ ! -z "${BRANCH_UPDATE}" ]; then
+		epatch ${WORKDIR}/${TMP_P}-branch-update-${BRANCH_UPDATE}.patch
+	fi
+
+	# Make gcc's version info specific to Gentoo
+	gcc_version_patch "(Gentoo Linux ${PVR})"
+}
+
+src_compile() {
+	cd ${WORKDIR}
+	ln -s ${TMP_P} ${P}
+
+	append-flags "-Dinhibit_libc"
+
+	# Build in a separate build tree
+	mkdir -p ${WORKDIR}/build
+	cd ${WORKDIR}/build
+
+	einfo "Configuring GCC..."
+	if [ "`uname -m | grep 64`" ]; then
+		myconf="${myconf} --host=${MYARCH/64/}-unknown-linux-${MYUSERLAND}"
+	fi
+
+	addwrite "/dev/zero"
+	${S}/configure --prefix=${I} \
+		--disable-shared \
+		--disable-multilib \
+		--target=${MYARCH}-unknown-linux-${MYUSERLAND} \
+		--enable-languages=c \
+		--enable-threads=single \
+		${myconf} || die
+
+	einfo "Building GCC..."
+	S="${WORKDIR}/build" \
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	# Do allow symlinks in ${I}/lib/gcc-lib/${CHOST}/${PV}/include as
+	# this can break the build.
+	for x in cd ${WORKDIR}/build/gcc/include/*
+	do
+		if [ -L ${x} ]
+		then
+			rm -f ${x}
+		fi
+	done
+
+	einfo "Installing GCC..."
+	# Do the 'make install' from the build directory
+	cd ${WORKDIR}/build
+	S="${WORKDIR}/build" \
+	make prefix=${D}${I} \
+		FAKE_ROOT="${D}" \
+		install || die
+
+	cd ${D}${I}/bin
+	ln -s ${MYARCH}-unknown-linux-${MYUSERLAND}-gcc gcc64
+	ln -s ${MYARCH}-unknown-linux-${MYUSERLAND}-gcc ${MYARCH}-linux-gcc
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "To facilitate an easier kernel build, you may wish to add the following line to your profile:"
+	einfo ""
+	einfo "alias ${MYARCH}make=\"make ARCH=${MYARCH} CROSS_COMPILE=${MYARCH}-unknown-linux-${MYUSERLAND}-\""
+	einfo ""
+	einfo "Then to compile a kernel, simply goto the kernel source directory, and issue:"
+	einfo "${MYARCH}make <target>"
+	einfo "Where <target> is one of the usual kernel targets"
+	einfo ""
+	epause 10
+}