From: Samuli Suominen Date: Mon, 10 Mar 2008 13:58:16 +0000 (+0000) Subject: amd64 stable wrt #211990 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c50efd34d863600ba954908073da690e914a8356;p=gentoo.git amd64 stable wrt #211990 Package-Manager: portage-2.1.4.4 --- diff --git a/app-editors/fte/ChangeLog b/app-editors/fte/ChangeLog index 88504b68205c..3cf252c1af12 100644 --- a/app-editors/fte/ChangeLog +++ b/app-editors/fte/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/fte # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.46 2008/03/09 14:39:51 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.47 2008/03/10 13:58:16 drac Exp $ + + 10 Mar 2008; Samuli Suominen -fte-20051115.ebuild, + fte-20051115-r1.ebuild: + amd64 stable wrt #211990 09 Mar 2008; nixnut fte-20051115-r1.ebuild: Stable on ppc wrt bug 211990 diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest index 4245e138959a..3a35912c932a 100644 --- a/app-editors/fte/Manifest +++ b/app-editors/fte/Manifest @@ -4,7 +4,6 @@ AUX fte-new_keyword.patch 340 RMD160 05ab1d867f830814255834bb35226a0c1712c485 SH AUX fte-slang.patch 3595 RMD160 4a16c00a29e84bfec5ea179d19d044f3f92aef4f SHA1 511df0fe643ec06e7b199be1804115e964430a24 SHA256 9bd83f97782446fb7ed7dbfca735f8302fa0bc6e0130b5cef05ba54106e8f372 DIST fte-20051115-common.zip 187849 RMD160 07b0406abd9dfafcce83b39d175bac54ad6bc21d SHA1 a4a8088bdafbfc649ed9819bdcb274f617fedf4e SHA256 794031dd1d06156259d21ddcb3dec3196001818ea7116e9786b54314484dabf4 DIST fte-20051115-src.zip 549216 RMD160 0db9941c1dfeb48a651b004590ef0cac9bfdf4b7 SHA1 2ef22f36b523c7c89ccff93849b7b9009b9065d9 SHA256 bb4135e5c39223fa346d20613052e69090b14ed46855d5134bf2dbc4ba40d962 -EBUILD fte-20051115-r1.ebuild 2158 RMD160 1ba84350009b09773568f900e33725a7fe2f9683 SHA1 934c4dcd4c4914896ffc7e8ab9c0448e7f162088 SHA256 befaf34a7a00b522ab61e0ae247e85ee9875ad501a1ca8167491fb9b98c85d4f -EBUILD fte-20051115.ebuild 2108 RMD160 dc5c603a070549f596ac8240c348bad56e474f01 SHA1 6d001e6e2d6e6e1bf28dc9d3bfc688c94424efb7 SHA256 7fa8dc4837d989e62c711d1be2b38d60c49359fb5b50cd9496665bcb62392426 -MISC ChangeLog 7174 RMD160 1f943c0073d0e35922180f8ace873686f6170b5b SHA1 4caaa2dd676e5e1e4223d5340da9371ae78f7763 SHA256 1c35a6b93df8e0ca57dfee090bd01adfeaca90feb25e0fd5375566491c0e96a7 +EBUILD fte-20051115-r1.ebuild 2155 RMD160 f02ca07fe10e032286533e0657c4fd193b75aecf SHA1 a6bc76ed207a62d41fc2a530bd8c1f3f34c6560f SHA256 0bd8b9e960b9688b1f32b9a7f2ea3dd8b83b276d5df9da365a8910fe12a62e37 +MISC ChangeLog 7297 RMD160 cc76a8c4d267765ddc07bdd02f37d96b739ad701 SHA1 4031e8472b97519ccb6889fa870cd28e65718588 SHA256 426cd660ee8468be5fbc6c0e8c94a057b36944a9fb595b6efc7f2d6cc9c95f61 MISC metadata.xml 339 RMD160 44e3b1b9ab2233175c8e911e5a4cecf48f091256 SHA1 09899b913d87f132809a52f03ed97f46f17694b8 SHA256 3f3e49bb8203f32507cc563ddc9c09368a1f1403e2786e204fbd2b528ede185d diff --git a/app-editors/fte/fte-20051115-r1.ebuild b/app-editors/fte/fte-20051115-r1.ebuild index b164634e062d..e7a9185dce60 100644 --- a/app-editors/fte/fte-20051115-r1.ebuild +++ b/app-editors/fte/fte-20051115-r1.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/fte/fte-20051115-r1.ebuild,v 1.3 2008/03/09 14:39:51 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20051115-r1.ebuild,v 1.4 2008/03/10 13:58:16 drac Exp $ inherit eutils @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/fte/${P}-src.zip LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ppc -sparc x86" +KEYWORDS="~alpha amd64 ppc -sparc x86" IUSE="gpm slang X" S=${WORKDIR}/${PN} diff --git a/app-editors/fte/fte-20051115.ebuild b/app-editors/fte/fte-20051115.ebuild deleted file mode 100644 index 521965b47392..000000000000 --- a/app-editors/fte/fte-20051115.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20051115.ebuild,v 1.9 2008/02/16 08:59:59 drac Exp $ - -inherit eutils - -DESCRIPTION="Lightweight text-mode editor" -HOMEPAGE="http://fte.sourceforge.net" -SRC_URI="mirror://sourceforge/fte/${P}-src.zip - mirror://sourceforge/fte/${P}-common.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc -sparc x86" -IUSE="gpm slang X" -S=${WORKDIR}/${PN} - -RDEPEND=">=sys-libs/ncurses-5.2 - X? ( - x11-libs/libXdmcp - x11-libs/libXau - x11-libs/libX11 - ) - gpm? ( >=sys-libs/gpm-1.20 )" -DEPEND="${RDEPEND} - slang? ( =sys-libs/slang-1* ) - app-arch/unzip" - -set_targets() { - export TARGETS="" - use slang && TARGETS="$TARGETS sfte" - use X && TARGETS="$TARGETS xfte" - - TARGETS="$TARGETS vfte" -} - -src_unpack() { - unpack ${P}-src.zip - unpack ${P}-common.zip - - cd "${S}" - - epatch "${FILESDIR}"/fte-gcc34 - epatch "${FILESDIR}"/${PN}-new_keyword.patch - - set_targets - sed \ - -e "s:@targets@:${TARGETS}:" \ - -e "s:@cflags@:${CFLAGS}:" \ - -i src/fte-unix.mak - - if ! use gpm; then - sed \ - -e "s:#define USE_GPM://#define USE_GPM:" \ - -i src/con_linux.cpp - sed \ - -e "s:-lgpm::" \ - -i src/fte-unix.mak - fi - - cat /usr/include/linux/keyboard.h \ - | grep -v "wait.h" \ - > src/hacked_keyboard.h - - sed \ - -e "s::\"hacked_keyboard.h\":" \ - -i src/con_linux.cpp -} - -src_compile() { - DEFFLAGS="PREFIX=/usr CONFIGDIR=/usr/share/fte \ - DEFAULT_FTE_CONFIG=../config/main.fte OPTIMIZE=" - - set_targets - emake $DEFFLAGS TARGETS="$TARGETS" all || die -} - -src_install() { - local files - - keepdir /etc/fte - - into /usr - - set_targets - files="${TARGETS} cfte" - - for i in ${files} ; do - dobin src/$i ; - done - - dobin "${FILESDIR}"/fte - - dodoc Artistic CHANGES BUGS HISTORY README TODO - dohtml doc/* - - dodir usr/share/fte - insinto /usr/share/fte - doins -r config/* - - rm -rf "${D}"/usr/share/fte/CVS -} - -pkg_postinst() { - ebegin "Compiling configuration" - cd /usr/share/fte || die "missing configuration dir" - /usr/bin/cfte main.fte /etc/fte/system.fterc - eend $? -}