Removed append-ldflags, bug #226869 and #226951. Removed old versions.

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.27-gentoo-r2 x86_64

6 files changed, 18 insertions, 103 deletions

diff --git a/app-i18n/fbiterm/ChangeLog b/app-i18n/fbiterm/ChangeLog
index 8d2417cf75ef..408bd3beb501 100644
--- a/app-i18n/fbiterm/ChangeLog
+++ b/app-i18n/fbiterm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/fbiterm
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/ChangeLog,v 1.9 2008/05/17 00:57:49 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/ChangeLog,v 1.10 2008/11/24 16:52:22 matsuu Exp $
+
+*fbiterm-0.5-r2 (24 Nov 2008)
+
+  24 Nov 2008; MATSUU Takuto <matsuu@gentoo.org>
+  -files/fbiterm-0.5-gentoo.diff, -files/fbiterm-0.5-r1-gentoo.diff,
+  +files/fbiterm-0.5-r2-gentoo.diff, -fbiterm-0.5.ebuild,
+  -fbiterm-0.5-r1.ebuild, +fbiterm-0.5-r2.ebuild:
+  Removed append-ldflags, bug #226869 and #226951. Removed old versions.
 
 *fbiterm-0.5-r1 (17 May 2008)
 
diff --git a/app-i18n/fbiterm/Manifest b/app-i18n/fbiterm/Manifest
index 00919ec14990..dc2560f2d867 100644
--- a/app-i18n/fbiterm/Manifest
+++ b/app-i18n/fbiterm/Manifest
@@ -1,7 +1,5 @@
-AUX fbiterm-0.5-gentoo.diff 1218 RMD160 9bc6f0fc7671563be5f55c93cc1ee3263588fc1e SHA1 3d3135fe0637436759de8e4832d827b070ae2c3a SHA256 6593b2647f8810ed381261312c8897bd23c108fcca4215d8f156b36e6f3a56af
-AUX fbiterm-0.5-r1-gentoo.diff 1128 RMD160 e53ab2e4c779e6eb26088f3b54a13e7bfd3d3eac SHA1 2f9b5b5b17f72e165f8ac0564619dd1daa50e894 SHA256 ef629b84b651b0091896355bc1330a3c670003acd765ec2b27e948dfa2ee1685
+AUX fbiterm-0.5-r2-gentoo.diff 1139 RMD160 065184bd4fdbecde518ac29194ca0c5d3b96b10d SHA1 b5fc8ef2987b99b3e1e03cc0303e7513824662bf SHA256 86cd5e2e6dcd0a54d5a5858bd4cff6398d248acdf0032833c79212587c252cb7
 DIST iterm-0.5.tar.gz 608170 RMD160 3b6ffe074f7f4fac19971105d6f532278105a79b SHA1 0b0f19af81d25bfc019d763163151189b8e1efe3 SHA256 4b0d2310f5e4a42bfe90c394cae51a26d2a9437716b7e4eee6a5202db9ef1424
-EBUILD fbiterm-0.5-r1.ebuild 1759 RMD160 9fd105cc24a7a1a2ed95ddba7fca7ed2a1889d7d SHA1 3898765a974438697c504c32be0175fcf15e4e41 SHA256 30915c0e4f84640a7892b0727e39b5cee5ea4a251e23647d8c73a8a791f228f2
-EBUILD fbiterm-0.5.ebuild 1660 RMD160 ae044276ab7cfe47fd6dd5feb060c74e08ac607f SHA1 b31f3660e3bab219ebb59f16e04dc0c9e55f787e SHA256 c7a779995a27c896625e1ba3830841a4af25cb022362c3ee72467b8a7f03d385
-MISC ChangeLog 1173 RMD160 696253d90e4be3df24bfab17b5e4f68ebce0a7d8 SHA1 3356407b9bb3bdc8427d2cb7b6bf899b91ab62d6 SHA256 461499786703a6337cb4bef97d3e4e15cda0ccc0ba4ae1756e542b17c3565fc5
+EBUILD fbiterm-0.5-r2.ebuild 1693 RMD160 1c267813def2189f5227fbf9b5d87b6ffd31de67 SHA1 46ff2ec72963ac1869c930973ec39a5a002ff2f6 SHA256 0530b97c5881ba4d77d19a1683c4bdaed067d9adf2dcf1715a02ed2d79c232e7
+MISC ChangeLog 1505 RMD160 6d441efb91063014d265e5256139833f8b5966ab SHA1 c42ad0e505220d3f85f27675e8b6d6cb7277829b SHA256 d5569fc7b4ce67b254eef7f8a7c249b0f0d82d4955635bc68c46aae6cc1e8a77
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/app-i18n/fbiterm/fbiterm-0.5-r1.ebuild b/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild
index efc551291923..04cf6852e859 100644
--- a/app-i18n/fbiterm/fbiterm-0.5-r1.ebuild
+++ b/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/fbiterm-0.5-r1.ebuild,v 1.1 2008/05/17 00:57:49 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild,v 1.1 2008/11/24 16:52:22 matsuu Exp $
 
-inherit autotools eutils flag-o-matic multilib
+inherit autotools eutils multilib
 
 IUSE=""
 
@@ -12,7 +12,7 @@ SRC_URI="http://www-124.ibm.com/linux/projects/iterm/releases/iterm-${PV}.tar.gz
 
 LICENSE="CPL-0.5"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="x11-libs/libXfont
 	>=media-libs/freetype-2
@@ -32,8 +32,6 @@ src_unpack() {
 }
 
 src_compile() {
-	append-ldflags -lfreetype
-	append-ldflags $(bindnow-flags)
 	econf --x-includes=/usr/include \
 		--x-libraries=/usr/$(get_libdir) || die
 	emake || die
diff --git a/app-i18n/fbiterm/fbiterm-0.5.ebuild b/app-i18n/fbiterm/fbiterm-0.5.ebuild
deleted file mode 100644
index fcdd53684685..000000000000
--- a/app-i18n/fbiterm/fbiterm-0.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/fbiterm-0.5.ebuild,v 1.10 2007/01/05 16:16:19 flameeyes Exp $
-
-inherit eutils flag-o-matic
-
-IUSE=""
-
-DESCRIPTION="Framebuffer internationalized terminal emulator"
-HOMEPAGE="http://www-124.ibm.com/linux/projects/iterm/"
-SRC_URI="http://www-124.ibm.com/linux/projects/iterm/releases/iterm-${PV}.tar.gz"
-
-LICENSE="CPL-0.5"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="x11-libs/libXfont
-	>=media-libs/freetype-2
-	x11-libs/libiterm-mbt
-	sys-libs/zlib
-	media-fonts/unifont"
-
-S=${WORKDIR}/iterm/unix/fbiterm
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	append-ldflags -lfreetype
-	append-ldflags $(bindnow-flags)
-	econf --x-includes=/usr/include \
-		--x-libraries=/usr/lib || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog README*
-}
-
-pkg_postinst() {
-	elog
-	elog "1. If you haven't created your locale, run localedef."
-	elog "# localedef -v -c -i en_GB -f UTF-8 en_GB.UTF-8"
-	elog "(If you want to use other locales such as Japanese, replace"
-	elog "en_GB with ja_JP and en_GB.UTF-8 with ja_JP.UTF-8, respectively)"
-	elog
-	elog "2. Set enviroment variable."
-	elog "% export LC_CTYPE=en_GB.UTF-8 (sh, bash, zsh, ...)"
-	elog "> setenv LC_CTYPE en_GB.UTF-8 (csh, tcsh, ...)"
-	elog "(Again, if you want to use Japanese locale, create ja_JP.UTF-8"
-	elog " locale by localedef and set LC_CTYPE to ja_JP.UTF-8)"
-	elog
-	elog "3. Run unicode_start."
-	elog "% unicode_start"
-	elog
-	elog "4. Run fbiterm."
-	elog "% fbiterm"
-	elog
-}
diff --git a/app-i18n/fbiterm/files/fbiterm-0.5-gentoo.diff b/app-i18n/fbiterm/files/fbiterm-0.5-gentoo.diff
deleted file mode 100644
index 18828bd2d360..000000000000
--- a/app-i18n/fbiterm/files/fbiterm-0.5-gentoo.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urN fbiterm.ORIG/src/Makefile.in fbiterm/src/Makefile.in
---- fbiterm.ORIG/src/Makefile.in	2002-12-17 16:40:00.000000000 +0900
-+++ fbiterm/src/Makefile.in	2003-11-24 22:38:48.000000000 +0900
-@@ -78,7 +78,7 @@
- fbiterm_SOURCES =  	fbiterm.c fb.c fb_true8.c fb_true16.c fb_true24.c fb_true32.c 	font.c font_stubs.c input.c term.c util.c 	vt.c VTScreenView.c fbiterm.h palette.h VTScreenView.h
- 
- 
--fbiterm_LDADD =  	-L$(libdir) @X_LIBS@ -lXfont -literm
-+fbiterm_LDADD =  	-L$(libdir) @X_LIBS@ -lm -lXfont -literm
- 
- 
- CFLAGS = -I$(includedir) @X_CFLAGS@ -I$(top_srcdir)/include -I/usr/local/include $(EXTRA_CFLAGS)
-diff -urN fbiterm.ORIG/src/fbiterm.h fbiterm/src/fbiterm.h
---- fbiterm.ORIG/src/fbiterm.h	2002-10-24 21:44:01.000000000 +0900
-+++ fbiterm/src/fbiterm.h	2003-11-24 22:41:11.000000000 +0900
-@@ -53,8 +53,8 @@
- #define FB_ENV    "FRAMEBUFFER"
- #define FB_DEFDEV "/dev/fb0"
- 
--#define DefaultAsc	"/usr/lib/X11/fonts/misc/8x16.pcf.gz"
--#define DefaultMB	"/usr/lib/X11/fonts/misc/unifont.pcf.gz"
-+#define DefaultAsc	"/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz"
-+#define DefaultMB	"/usr/share/fonts/unifont/unifont.pcf.gz"
- #define DefaultFont	"/usr/local/share/iterm/fonts/8x16.pcf.gz"
- 
- enum ITERM_RETCODE
diff --git a/app-i18n/fbiterm/files/fbiterm-0.5-r1-gentoo.diff b/app-i18n/fbiterm/files/fbiterm-0.5-r2-gentoo.diff
index 6c4dc2533021..7a63ebce786b 100644
--- a/app-i18n/fbiterm/files/fbiterm-0.5-r1-gentoo.diff
+++ b/app-i18n/fbiterm/files/fbiterm-0.5-r2-gentoo.diff
@@ -1,18 +1,18 @@
 diff -Naur fbiterm.orig/src/Makefile.am fbiterm/src/Makefile.am
 --- fbiterm.orig/src/Makefile.am	2002-12-17 16:39:43.000000000 +0900
-+++ fbiterm/src/Makefile.am	2008-05-17 09:27:27.000000000 +0900
++++ fbiterm/src/Makefile.am	2008-11-25 01:35:18.000000000 +0900
 @@ -15,7 +15,7 @@
  	vt.c VTScreenView.c fbiterm.h palette.h VTScreenView.h
  
  fbiterm_LDADD = \
 -	-L$(libdir) @X_LIBS@ -lXfont -literm
-+	-L$(libdir) @X_LIBS@ -lm -lXfont -literm
++	-L$(libdir) @X_LIBS@ -lm -lXfont -literm -lfreetype
  
  CFLAGS = -I$(includedir) @X_CFLAGS@ -I$(top_srcdir)/include -I/usr/local/include $(EXTRA_CFLAGS)
  
 diff -Naur fbiterm.orig/src/fbiterm.h fbiterm/src/fbiterm.h
 --- fbiterm.orig/src/fbiterm.h	2002-10-24 21:44:01.000000000 +0900
-+++ fbiterm/src/fbiterm.h	2008-05-17 08:58:04.000000000 +0900
++++ fbiterm/src/fbiterm.h	2008-11-25 01:34:12.000000000 +0900
 @@ -53,9 +53,9 @@
  #define FB_ENV    "FRAMEBUFFER"
  #define FB_DEFDEV "/dev/fb0"