From: Krzysztof Pawlik Date: Tue, 11 Mar 2008 11:24:56 +0000 (+0000) Subject: Remove old versions, use tc-getCC instead of gcc (see bug #213019). X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d54bdbf2b5f2cde56fcbe57e88db89fbc4538643;p=gentoo.git Remove old versions, use tc-getCC instead of gcc (see bug #213019). Package-Manager: portage-2.1.4.4 --- diff --git a/app-editors/elvis/ChangeLog b/app-editors/elvis/ChangeLog index 7fff9ebacb46..d4364daac5bc 100644 --- a/app-editors/elvis/ChangeLog +++ b/app-editors/elvis/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/elvis # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.40 2008/03/11 08:53:47 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.41 2008/03/11 11:24:56 nelchael Exp $ + + 11 Mar 2008; Krzysiek Pawlik -elvis-2.2.0-r1.ebuild, + -elvis-2.2.0-r2.ebuild, elvis-2.2.0-r3.ebuild: + Remove old versions, use tc-getCC instead of gcc (see bug #213019). 11 Mar 2008; Markus Rothe elvis-2.2.0-r3.ebuild: Stable on ppc64; bug #205722 diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest index 9b22154815e0..1c4b82ee70cd 100644 --- a/app-editors/elvis/Manifest +++ b/app-editors/elvis/Manifest @@ -1,7 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX ft2.3-symbol-collision-fix.patch 2396 RMD160 c80ec1c5e7a15e2dea185e2d0d83da5fccd39b1b SHA1 3957feb87b9d8fe0a3a58ec8715d0c328545c086 SHA256 59960b0498863f0793b5c33a824efc62c6255d26455d3ec6c87f62cb1969f008 DIST elvis-2.2_0.tar.gz 1439293 RMD160 9867a3941a84a3db0bcfe4e36dd14132fbcf5805 SHA1 8c16574b6d36529735b8ced70972ddaf6275a477 SHA256 9a8466b2293798441056bc279736af3a616baaba2f11940396cc60ff71924ea0 -EBUILD elvis-2.2.0-r1.ebuild 1879 RMD160 f72124242155f6e84f8b74eebdd2883195e70ec0 SHA1 6d7e12f99ed78184c60c9646f7bc58b0a1df400c SHA256 9e73893f2c8d0409f3c8c4f2afd0d30d212d1495e9bfbe3ebca3082e38455cc7 -EBUILD elvis-2.2.0-r2.ebuild 2126 RMD160 d03ce275f15814e5ec126f23907be0dfe2cf5e7d SHA1 7bcfc1ec253098c90f3e5b92e971f223cf5f60d1 SHA256 51ecc57bb4d0c48e17be9745d7ac18f3fdc323e88e00a818364346e1c14413c6 -EBUILD elvis-2.2.0-r3.ebuild 2220 RMD160 76a11fe13678d3a741f788c8bf9639fad782dff2 SHA1 373e4a56070359ea99e53eed9df1894fa3f82be2 SHA256 8bf5de01744ad40fb2d31f12f0074b4ee847c4a6ea7dcb0b017fb59028897ca9 -MISC ChangeLog 4732 RMD160 c498ab1d62a155b040b5356779dde7a5f1fa2fa3 SHA1 6c5b80d1120e506245035b914a7dfdd624435b67 SHA256 2321b70b603ab7fbc74136cea5ecbbfb02802412fa6a5c3afe8bd9af7c551cb4 +EBUILD elvis-2.2.0-r3.ebuild 2230 RMD160 563a98e9967368941d1f9cadb2b545415190dfe9 SHA1 aee97aa18e1a5acc517962e845e051998555b5ac SHA256 dc831a3415a9d6a223c680bd2cf570ba2d732fe5cb15935e8a01de415748f3e9 +MISC ChangeLog 4930 RMD160 449874bdc2336f1fa7a207e3c4026e61f1b5f799 SHA1 1baaace537b685003e1384a22843aa901757de44 SHA256 3188e96f6fde72da8d2c7b1b156784cfa750849eb68ac5792587346b181cad34 MISC metadata.xml 156 RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 SHA1 fe63ba71f6fd04f1e293fb238af2eba994b0335d SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFH1mwOgo/w9rxVVVERAkD7AJ0WzD+DiispWvn7g/gXbF14KvsUJQCfRmkV +GOCOBy8hMBU8b0qI5SrEv8U= +=8ST9 +-----END PGP SIGNATURE----- diff --git a/app-editors/elvis/elvis-2.2.0-r1.ebuild b/app-editors/elvis/elvis-2.2.0-r1.ebuild deleted file mode 100644 index 392c5bf07d7e..000000000000 --- a/app-editors/elvis/elvis-2.2.0-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r1.ebuild,v 1.9 2007/10/10 06:16:37 opfer Exp $ - -inherit eutils - -MY_P="${PN}-2.2_0" -S="${WORKDIR}/${MY_P}" -DESCRIPTION="A vi/ex clone" -HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/" -SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${MY_P}.tar.gz" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="alpha amd64 ppc ppc64 sparc x86" -IUSE="X" - -DEPEND=">=sys-libs/ncurses-5.2 - X? ( >=x11-proto/xproto-7.0.4 - >=x11-libs/libX11-1.0.0 - >=x11-libs/libXt-1.0.0 - >=x11-libs/libXpm-3.5.4.2 - >=x11-libs/libXft-2.1.8.2 )" - -src_compile() { - ./configure \ - --prefix=/usr \ - --bindur=/usr/bin \ - --datadir=/usr/share/elvis \ - --docdir=/usr/share/doc/${PF} \ - `use_with X x` || die 'configure failed' - - # Some Makefile fixups (must happen after configure) - # Use our CFLAGS - sed -i -e "s:gcc -O2:gcc ${CFLAGS}:" Makefile || die "sed 1 failed" - - # We'll install the man-pages ourselves - sed -i -e '/^ sh instman.sh/d' Makefile || die "sed 2 failed" - - # Don't try to write to /etc - sed -i -e 's,/etc/elvis,${D}/etc/elvis,g' Makefile || die "sed 3 failed" - - emake || die "make failed" -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man/man1 - dodir /usr/share/elvis - dodir /usr/share/doc/${PF} - dodir /etc - make install \ - PREFIX="${D}"/usr \ - BINDIR="${D}"/usr/bin \ - DATADIR="${D}"/usr/share/elvis \ - DOCDIR="${D}"/usr/share/doc/${PF} || die 'make install failed' - - # Install the man-pages - mv doc/elvis.man doc/elvis.1 - mv doc/elvtags.man doc/elvtags.1 - mv doc/ref.man doc/ref.1 - doman doc/*.1 || die 'doman failed' - - # Fixup some READMEs - sed -i -e "s,${D},,g" "${D}"/etc/elvis/README \ - || die 'sed /etc/elvis/README failed' - sed -i -e "s,${D},,g" "${D}"/usr/share/elvis/README \ - || die 'sed /usr/share/elvis/README failed' -} diff --git a/app-editors/elvis/elvis-2.2.0-r2.ebuild b/app-editors/elvis/elvis-2.2.0-r2.ebuild deleted file mode 100644 index a981c09101b0..000000000000 --- a/app-editors/elvis/elvis-2.2.0-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r2.ebuild,v 1.5 2007/10/10 06:16:37 opfer Exp $ - -inherit eutils versionator - -MY_PV="$(replace_version_separator 2 '_')" - -DESCRIPTION="A vi/ex clone" -HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/" -SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="X" - -DEPEND=">=sys-libs/ncurses-5.2 - X? ( >=x11-proto/xproto-7.0.4 - >=x11-libs/libX11-1.0.0 - >=x11-libs/libXt-1.0.0 - >=x11-libs/libXpm-3.5.4.2 - >=x11-libs/libXft-2.1.8.2 ) - app-admin/eselect-vi" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_compile() { - ./configure \ - --prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share/elvis \ - --docdir=/usr/share/doc/"${PF}" \ - $(use_with X x) \ - || die "configure failed" - - # Some Makefile fixups (must happen after configure) - # Use our CFLAGS - sed -i -e "s:gcc -O2:gcc ${CFLAGS}:" Makefile || die "sed 1 failed" - - # We'll install the man-pages ourselves - sed -i -e '/^ sh instman.sh/d' Makefile || die "sed 2 failed" - - # Don't try to write to /etc - sed -i -e 's,/etc/elvis,${D}/etc/elvis,g' Makefile || die "sed 3 failed" - - emake || die "make failed" -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man/man1 - dodir /usr/share/elvis - dodir /usr/share/doc/"${PF}" - dodir /etc - make install \ - PREFIX="${D}"/usr \ - BINDIR="${D}"/usr/bin \ - DATADIR="${D}"/usr/share/elvis \ - DOCDIR="${D}"/usr/share/doc/"${PF}" || die 'make install failed' - - # Install the man-pages - mv doc/elvis.man doc/elvis.1 - mv doc/elvtags.man doc/elvtags.1 - mv doc/ref.man doc/ref.1 - doman doc/*.1 || die 'doman failed' - - # Fixup some READMEs - sed -i -e "s,${D},,g" "${D}"/etc/elvis/README \ - || die 'sed /etc/elvis/README failed' - sed -i -e "s,${D},,g" "${D}"/usr/share/elvis/README \ - || die 'sed /usr/share/elvis/README failed' -} - -pkg_postinst() { - einfo "Setting /usr/bin/vi symlink" - eselect vi set "${PN}" -} - -pkg_postrm() { - einfo "Updating /usr/bin/vi symlink" - eselect vi update -} diff --git a/app-editors/elvis/elvis-2.2.0-r3.ebuild b/app-editors/elvis/elvis-2.2.0-r3.ebuild index 829fb42c4a49..e3cdd0416b3e 100644 --- a/app-editors/elvis/elvis-2.2.0-r3.ebuild +++ b/app-editors/elvis/elvis-2.2.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r3.ebuild,v 1.9 2008/03/11 08:53:47 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r3.ebuild,v 1.10 2008/03/11 11:24:56 nelchael Exp $ inherit eutils versionator @@ -43,7 +43,7 @@ src_compile() { # Some Makefile fixups (must happen after configure) # Use our CFLAGS - sed -i -e "s:gcc -O2:gcc ${CFLAGS}:" Makefile || die "sed 1 failed" + sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed" # We'll install the man-pages ourselves sed -i -e '/^ sh instman.sh/d' Makefile || die "sed 2 failed"