diff options
Diffstat (limited to 'app-arch/arj')
| -rw-r--r-- | app-arch/arj/ChangeLog | 8 | ||||
| -rw-r--r-- | app-arch/arj/Manifest | 14 | ||||
| -rw-r--r-- | app-arch/arj/arj-3.10.22-r2.ebuild | 22 | ||||
| -rw-r--r-- | app-arch/arj/files/arj-3.10.22-darwin.patch | 41 | ||||
| -rw-r--r-- | app-arch/arj/files/arj-3.10.22-interix.patch | 45 |
5 files changed, 113 insertions, 17 deletions
diff --git a/app-arch/arj/ChangeLog b/app-arch/arj/ChangeLog index 7221df48f9d6..243d7e34bb51 100644 --- a/app-arch/arj/ChangeLog +++ b/app-arch/arj/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/arj -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.39 2009/10/12 16:38:22 halcy0n Exp $ +# 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 $ + + 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: + Bump to EAPI=3, add prefix keywords & patches 12 Oct 2009; Mark Loeser <halcy0n@gentoo.org> arj-3.10.22-r1.ebuild: QA fixes; WANT_AUTOCONF redundantly set to latest diff --git a/app-arch/arj/Manifest b/app-arch/arj/Manifest index 92d3201c1670..03e4199a9d7a 100644 --- a/app-arch/arj/Manifest +++ b/app-arch/arj/Manifest @@ -4,19 +4,21 @@ Hash: SHA1 AUX 001_arches_align.patch 1424 RMD160 582ad74d357523ca99f833b02c4db30fcd6a8aa0 SHA1 7f8904f8c89bacbbeec8c431d627efbb8da2f259 SHA256 63a1f369fd7d23c1132293a75419fa00324b2da0578ab436483f156d43687792 AUX 002_no_remove_static_const.patch 530 RMD160 f796238452c903213684060adfce196a5910c6b2 SHA1 919a3c02a1e039803502c21175d69f7703d13026 SHA256 4a48bec5bfac3efd9ebeb463a4ce3fdeeac2fd0ebf11eb4b64a6cfc96e25e306 AUX 003_64_bit_clean.patch 5948 RMD160 755dd1ee9822cbaef43aa29b4c8215d8a97220af SHA1 d506338e34b40ef5cac6ec14c858fd651a354aaf SHA256 6253fdb216a9f617648ee3977f8ab38c376cc029ae55a8414203df3275484db1 +AUX arj-3.10.22-darwin.patch 825 RMD160 b33ca8ab28b6bedb36db29425598ddb3c3bc4454 SHA1 b1b7054671e10dad64b4a7ff78d80ea21f4a0069 SHA256 cc67a0983aa29ffc3248ed36004cf3885f0315a9616e7e085fd33466682362ea AUX arj-3.10.22-glibc2.10.patch 515 RMD160 12a15b266dac3eb33dbd122a19285972be472e53 SHA1 d31bdbb61c96809fae5e0c09411c39c3f80de0fb SHA256 b4b4b4a774620cd9ec79dd26201f4b64cfe7c8f2f117221c0f8091bd35c55508 AUX arj-3.10.22-implicit-declarations.patch 833 RMD160 df4cc1eb6d5a0d7fd097cd65fdea4f7686c2c3d2 SHA1 86dc2094017698f6a248e31dc828e1c91bc51e0b SHA256 016de0f1ab252081a13bfcc3d73161e2fea87812d7fa3411b3a8fb5608ddf860 +AUX arj-3.10.22-interix.patch 1257 RMD160 fc0cba212e10850f9cf0018f6c7839d7ac0fa3c7 SHA1 280d4794fbe87db719ee5d3ac7659f7dbe7e414a SHA256 167a3a2aa02bd95c346cf0bc859b0c0327901c5616dbd761f83065367c761feb DIST arj-3.10.22.tar.gz 431467 RMD160 80f8a1a8cd203f73def8e957d96563a4dba80153 SHA1 e8470f480e9eee14906e5485a8898e5c24738c8b SHA256 589e4c9bccc8669e7b6d8d6fcd64e01f6a2c21fe10aad56a83304ecc3b96a7db DIST arj_3.10.22-4.diff.gz 31492 RMD160 9acfb9a3e3a400aedcb27508975d48d1fb02c15c SHA1 b1fa204d904aafca018a8ad18c01af657697e3d5 SHA256 0807ad8d0404fc17e9cf6566d16a92eb2b06afd2cef71e79629e027cab9aec2b DIST arj_3.10.22.orig.tar.gz 431467 RMD160 80f8a1a8cd203f73def8e957d96563a4dba80153 SHA1 e8470f480e9eee14906e5485a8898e5c24738c8b SHA256 589e4c9bccc8669e7b6d8d6fcd64e01f6a2c21fe10aad56a83304ecc3b96a7db EBUILD arj-3.10.22-r1.ebuild 1850 RMD160 d7a3aebe7ebc6dfb10977ae6ad7130eaa28e8152 SHA1 659764852df4d07a068c4d61be1911542478dd6e SHA256 0d407718bd2874a7de016b4ef0158ca7dd62ae1314a6cb14a9dacc379558676c -EBUILD arj-3.10.22-r2.ebuild 1259 RMD160 5cbf501180afc105d06ed164310a46ee6568ac27 SHA1 c7e07bf1480ff7e7f18b0d00e250c2259544bec5 SHA256 5a34c81cd1128945ac66f00de36de065e00cb1c1c08e7a4931b9acb4ea1acaea -MISC ChangeLog 5239 RMD160 317689e6458a2b0700d3e5cf17573da6c775e775 SHA1 06d1dfc4a9737d5c0429f7d0ce53e9246ce8e00a SHA256 b02d8b44d11e9861d14019efe9b6d783fee29ecd67c5d98be859c098e9c11fe1 +EBUILD arj-3.10.22-r2.ebuild 1404 RMD160 9d83ecf58b9e3d987da5e9538c922a19c2f649a3 SHA1 6cdb08f8ba58efcf106ce055d5c3ee61a17008be SHA256 02221016f3e8a97ba4ffeaa5b79ee63eec791a6192fe7e149837407eba97a994 +MISC ChangeLog 5426 RMD160 d5af8a79b6328e5213a49649cbb0f019b9278575 SHA1 5d6dab47c33b744da5f0891e0d0c9ca2dc5bf743 SHA256 4cb92221e66ec1e9c08855ee13f474268c9313f10ded791d08160b418d1d9c53 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkrTW4QACgkQCRZPokWLroSUSwCePLV3rhbOURbYKlkmtacmcI7n -28sAn1//hghKkpHNkuaHtyNBsu1chyXS -=bHeF +iEYEARECAAYFAkuxOzUACgkQOypDUo0oQOpzUQCgoZJ7w+SWNFnkYUZVSx8EUPpg +RvwAn3lMkO4kIz/7R4wu8jV3He5K687P +=Szzp -----END PGP SIGNATURE----- diff --git a/app-arch/arj/arj-3.10.22-r2.ebuild b/app-arch/arj/arj-3.10.22-r2.ebuild index f7a77b9d5f9b..3c6db394b5d2 100644 --- a/app-arch/arj/arj-3.10.22-r2.ebuild +++ b/app-arch/arj/arj-3.10.22-r2.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# 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-r2.ebuild,v 1.9 2009/09/23 15:09:53 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10.22-r2.ebuild,v 1.10 2010/03/29 23:43:41 abcd Exp $ + +EAPI=3 inherit autotools eutils toolchain-funcs @@ -13,14 +15,12 @@ SRC_URI="mirror://debian/pool/main/a/arj/${P/-/_}.orig.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="amd64 ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="" DEPEND="" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${WORKDIR}"/${P/-/_}-${PATCH_LEVEL}.diff \ "${FILESDIR}"/${P}-implicit-declarations.patch epatch "${FILESDIR}/${P}-glibc2.10.patch" @@ -28,18 +28,22 @@ src_unpack() { EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ epatch debian/patches + epatch "${FILESDIR}"/${P}-darwin.patch + epatch "${FILESDIR}"/${P}-interix.patch + cd gnu eautoconf } -src_compile() { +src_configure() { cd gnu CFLAGS="${CFLAGS} -Wall" econf +} - cd "${S}" +src_compile() { sed -i -e '/stripgcc/d' GNUmakefile || die "sed failed." - ARJLIBDIR="/usr/$(get_libdir)" + ARJLIBDIR="${EPREFIX}/usr/$(get_libdir)" emake CC=$(tc-getCC) libdir="${ARJLIBDIR}" \ pkglibdir="${ARJLIBDIR}" all || die "emake failed." diff --git a/app-arch/arj/files/arj-3.10.22-darwin.patch b/app-arch/arj/files/arj-3.10.22-darwin.patch new file mode 100644 index 000000000000..a09c30d3126d --- /dev/null +++ b/app-arch/arj/files/arj-3.10.22-darwin.patch @@ -0,0 +1,41 @@ +--- arj-3.10.22/environ.c ++++ arj-3.10.22/environ.c +@@ -58,7 +58,7 @@ + #include <sys/ioctl.h> + #include <sys/statfs.h> + #include <sys/statvfs.h> +- #elif defined(__FreeBSD__)||defined(__NetBSD__) ++ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) + #include <sys/param.h> + #include <sys/mount.h> + #elif defined(__QNXNTO__) +--- arj-3.10.22/gnu/configure.in ++++ arj-3.10.22/gnu/configure.in +@@ -62,6 +62,11 @@ + DLL_FLAGS="-shared -export-dynamic" + LD_STRIP="gnu/stripgcc.lnk" + ;; ++*darwin*) ++ # not ELF ++ DLL_EXT=".dylib" ++ DLL_FLAGS="" ++ ;; + interix3*) + # not ELF + DLL_FLAGS="-shared" +--- arj-3.10.22/arjcrypt.c ++++ arj-3.10.22/arjcrypt.c +@@ -329,6 +329,13 @@ + } + #endif + ++#if defined(__APPLE__) ++int main() ++{ ++ return(0); ++} ++#endif ++ + /* External entry */ + + #if TARGET==DOS diff --git a/app-arch/arj/files/arj-3.10.22-interix.patch b/app-arch/arj/files/arj-3.10.22-interix.patch new file mode 100644 index 000000000000..8294f1e96bb4 --- /dev/null +++ b/app-arch/arj/files/arj-3.10.22-interix.patch @@ -0,0 +1,45 @@ +diff -ru arj-3.10.22.orig/environ.c arj-3.10.22/environ.c +--- arj-3.10.22.orig/environ.c 2008-03-30 16:51:40 +0200 ++++ arj-3.10.22/environ.c 2008-03-30 16:50:16 +0200 +@@ -61,7 +61,7 @@ + #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) + #include <sys/param.h> + #include <sys/mount.h> +- #elif defined(__QNXNTO__) ++ #elif defined(__QNXNTO__) || defined(__INTERIX) + #include <sys/statvfs.h> + #else + #include <sys/statfs.h> +@@ -2286,7 +2286,7 @@ + else + return((LONG_MAX/(spclu*bps)<fclu)?LONG_MAX:spclu*bps*fclu); + #elif TARGET==UNIX +- #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS) ++ #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX) + struct statvfs vfs; + + if(statvfs(name, &vfs)==-1) +@@ -3802,7 +3802,9 @@ + #elif TARGET==WIN32 + return(0); + #elif TARGET==UNIX ++ #ifndef __INTERIX + sync(); ++ #endif + return(0); + #endif + } +diff -ru arj-3.10.22.orig/gnu/configure.in arj-3.10.22/gnu/configure.in +--- arj-3.10.22.orig/gnu/configure.in 2008-03-30 16:51:40 +0200 ++++ arj-3.10.22/gnu/configure.in 2008-03-30 16:41:37 +0200 +@@ -67,8 +67,9 @@ + DLL_EXT=".dylib" + DLL_FLAGS="" + ;; +-interix3*) ++interix*) + # not ELF ++ DYN_LIBS="-ldl" + DLL_FLAGS="-shared" + DLL_CFLAGS="" + ;; |