diff options
| -rw-r--r-- | app-arch/arj/ChangeLog | 9 | ||||
| -rw-r--r-- | app-arch/arj/arj-3.10.22-r1.ebuild | 71 | ||||
| -rw-r--r-- | app-arch/arj/arj-3.10.22-r3.ebuild | 56 |
3 files changed, 64 insertions, 72 deletions
diff --git a/app-arch/arj/ChangeLog b/app-arch/arj/ChangeLog index 243d7e34bb51..6df69e63f123 100644 --- a/app-arch/arj/ChangeLog +++ b/app-arch/arj/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-arch/arj # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.40 2010/03/29 23:43:41 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.41 2010/10/14 19:18:57 jer Exp $ + +*arj-3.10.22-r3 (14 Oct 2010) + + 14 Oct 2010; Jeroen Roovers <jer@gentoo.org> -arj-3.10.22-r1.ebuild, + +arj-3.10.22-r3.ebuild: + Add newer Debian patches. Respect LDFLAGS (bug #337626). Remove empty + DEPEND. 29 Mar 2010; Jonathan Callen <abcd@gentoo.org> arj-3.10.22-r2.ebuild, +files/arj-3.10.22-darwin.patch, +files/arj-3.10.22-interix.patch: diff --git a/app-arch/arj/arj-3.10.22-r1.ebuild b/app-arch/arj/arj-3.10.22-r1.ebuild deleted file mode 100644 index 9390bbc4e2c6..000000000000 --- a/app-arch/arj/arj-3.10.22-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2009 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-r1.ebuild,v 1.11 2009/10/12 16:38:22 halcy0n Exp $ - -inherit eutils toolchain-funcs autotools - -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="amd64 ~ia64 ppc sparc x86 ~x86-fbsd" -IUSE="" -RESTRICT="strip" - -DEPEND="" - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}/001_arches_align.patch" - epatch "${FILESDIR}/002_no_remove_static_const.patch" - epatch "${FILESDIR}/003_64_bit_clean.patch" - - cd "${S}/gnu" - eautoreconf -} - -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 - - cd "${S}/gnu" - econf || die - - cd "${S}" - make prepare || die "make prepare failed" - make package || die "make package failed" -} - -src_install() { - cd "${S}/${CHOST#*-*-}/en/rs/u" - dobin bin/* || die - dodoc doc/arj/* "${S}/ChangeLog" -} diff --git a/app-arch/arj/arj-3.10.22-r3.ebuild b/app-arch/arj/arj-3.10.22-r3.ebuild new file mode 100644 index 000000000000..c4fea3c64e81 --- /dev/null +++ b/app-arch/arj/arj-3.10.22-r3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2010 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-r3.ebuild,v 1.1 2010/10/14 19:18:57 jer Exp $ + +EAPI=3 + +inherit autotools eutils toolchain-funcs + +PATCH_LEVEL=9 + +DESCRIPTION="Utility for opening arj archives" +HOMEPAGE="http://arj.sourceforge.net" +SRC_URI="mirror://debian/pool/main/a/arj/${P/-/_}.orig.tar.gz + mirror://debian/pool/main/a/arj/${P/-/_}-${PATCH_LEVEL}.debian.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +IUSE="" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-implicit-declarations.patch \ + "${FILESDIR}/${P}-glibc2.10.patch" + + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/debian/patches + + epatch "${FILESDIR}"/${P}-darwin.patch + epatch "${FILESDIR}"/${P}-interix.patch + + cd gnu + eautoconf +} + +src_configure() { + cd gnu + CFLAGS="${CFLAGS} -Wall" econf +} + +src_compile() { + sed -i -e '/stripgcc/d' GNUmakefile || die "sed failed." + + ARJLIBDIR="${EPREFIX}/usr/$(get_libdir)" + + emake CC=$(tc-getCC) libdir="${ARJLIBDIR}" \ + ADD_LDFLAGS="${LDFLAGS}" \ + pkglibdir="${ARJLIBDIR}" all || die "emake failed." +} + +src_install() { + emake pkglibdir="${ARJLIBDIR}" \ + DESTDIR="${D}" install || die "emake install failed." + + dodoc doc/rev_hist.txt +} |