Cleanup build and fix compile failure with gcc4 #152133.

Package-Manager: portage-2.1.2_pre3-r5

5 files changed, 85 insertions, 23 deletions

diff --git a/app-misc/twin/ChangeLog b/app-misc/twin/ChangeLog
index 69e7e3f34e7d..12b75380c5e3 100644
--- a/app-misc/twin/ChangeLog
+++ b/app-misc/twin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/twin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/ChangeLog,v 1.19 2006/07/09 01:36:38 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/ChangeLog,v 1.20 2006/10/22 05:55:19 vapier Exp $
+
+  22 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/twin-0.4.6-build.patch, files/twin-0.4.6-gcc.patch,
+  twin-0.4.6.ebuild:
+  Cleanup build and fix compile failure with gcc4 #152133.
 
   09 Jul 2006; Joshua Kinard <kumba@gentoo.org> twin-0.4.6.ebuild:
   Marked stable on mips to satisfy eterm dep.
diff --git a/app-misc/twin/Manifest b/app-misc/twin/Manifest
index 371f17721018..9fde4df0ea1a 100644
--- a/app-misc/twin/Manifest
+++ b/app-misc/twin/Manifest
@@ -5,19 +5,23 @@ AUX twin-0.4.6-autotools.patch 248 RMD160 4818c4f64090cdcf26611db35c2f61921f0060
 MD5 f170881843dd34e43adcd5cbab719927 files/twin-0.4.6-autotools.patch 248
 RMD160 4818c4f64090cdcf26611db35c2f61921f0060dc files/twin-0.4.6-autotools.patch 248
 SHA256 8cd2a1a266b40d8f7ed09837c9fd66661205150da8411a24008ab5c80707e8a5 files/twin-0.4.6-autotools.patch 248
-AUX twin-0.4.6-gcc.patch 396 RMD160 9adaff3f6c8b878ee82c800cd8aa29ad088e16cf SHA1 08b5be9ac3f9d4aeddd76419a628c3844f649199 SHA256 3d3d2919ba69e3ab1f4d6bb885aec98c99ea5d02974603c00df2a67d6f06332e
-MD5 767e120670b3324ae0958743e71a9fc3 files/twin-0.4.6-gcc.patch 396
-RMD160 9adaff3f6c8b878ee82c800cd8aa29ad088e16cf files/twin-0.4.6-gcc.patch 396
-SHA256 3d3d2919ba69e3ab1f4d6bb885aec98c99ea5d02974603c00df2a67d6f06332e files/twin-0.4.6-gcc.patch 396
+AUX twin-0.4.6-build.patch 657 RMD160 bc0a806051922e4b22146251d6212c9b7a2787b2 SHA1 a226a1554c3e2c772c69e37b57e2a6e1aefbfd5c SHA256 7980324b6e399e8b135174cb8c1e4f6ac5826ed435f0b5afadf4822c06b25007
+MD5 69d8db50dc2b762e924ec4da1eb39a6b files/twin-0.4.6-build.patch 657
+RMD160 bc0a806051922e4b22146251d6212c9b7a2787b2 files/twin-0.4.6-build.patch 657
+SHA256 7980324b6e399e8b135174cb8c1e4f6ac5826ed435f0b5afadf4822c06b25007 files/twin-0.4.6-build.patch 657
+AUX twin-0.4.6-gcc.patch 936 RMD160 093fd36ad30ae809d7e5daa439ebf5c81b10af1c SHA1 e68056b0fba1d95f86f1dd5619c2ed1475ef0f86 SHA256 aea915937ee0b394c640a889a90522ad1540b16a975639b4f28fa310379d7673
+MD5 1049b05d7201a82da49d161c1b35a735 files/twin-0.4.6-gcc.patch 936
+RMD160 093fd36ad30ae809d7e5daa439ebf5c81b10af1c files/twin-0.4.6-gcc.patch 936
+SHA256 aea915937ee0b394c640a889a90522ad1540b16a975639b4f28fa310379d7673 files/twin-0.4.6-gcc.patch 936
 DIST twin-0.4.6.tar.gz 1139714 RMD160 9c3f9355879f988bf374eccd3b54019bfbfc8a20 SHA1 9c43b94f31102e2b8761ddd559f8a16d5563459c SHA256 67c4b7677469040b4fc37c084bc4f1ef4c365477e79862c3dc7c256c9f9257c2
-EBUILD twin-0.4.6.ebuild 1915 RMD160 88e29bed64af133cf667852efc0bc5980242f27b SHA1 94f308fe1ae56f83b23535808978dd2db0319bef SHA256 61cb0e568c3c43ae41a9952ad55ae69c5493b1ffd817bf2b3b1e72e3a2304f43
-MD5 733e09c25396c8a3977c5fa73318ebd7 twin-0.4.6.ebuild 1915
-RMD160 88e29bed64af133cf667852efc0bc5980242f27b twin-0.4.6.ebuild 1915
-SHA256 61cb0e568c3c43ae41a9952ad55ae69c5493b1ffd817bf2b3b1e72e3a2304f43 twin-0.4.6.ebuild 1915
-MISC ChangeLog 2491 RMD160 47f632012b8260e3a25c5fc4e6808b4be66790d6 SHA1 c4f64d1f0ef4a53b2b6de8b70e4925839c0eb0ac SHA256 80b2e4612ca2cf113cea813915986d1c8f5770a89df6d67eaf8caed37cec40b2
-MD5 659e6c69bb2e3d19c09980e88b4c6609 ChangeLog 2491
-RMD160 47f632012b8260e3a25c5fc4e6808b4be66790d6 ChangeLog 2491
-SHA256 80b2e4612ca2cf113cea813915986d1c8f5770a89df6d67eaf8caed37cec40b2 ChangeLog 2491
+EBUILD twin-0.4.6.ebuild 1932 RMD160 2a02475fcef1bcee4234353de1166350cbd1c8a1 SHA1 cb148595417994212d02e368d47de63da0d7f9e8 SHA256 0f4367d574206587f5be30ee4fa3f46eb6ca42d419cb1f57c13588295d9d5335
+MD5 a8ac6f261875909464bebd1474a21c6b twin-0.4.6.ebuild 1932
+RMD160 2a02475fcef1bcee4234353de1166350cbd1c8a1 twin-0.4.6.ebuild 1932
+SHA256 0f4367d574206587f5be30ee4fa3f46eb6ca42d419cb1f57c13588295d9d5335 twin-0.4.6.ebuild 1932
+MISC ChangeLog 2684 RMD160 81b67226a76c085c3057ee9df4e4178461363524 SHA1 32305ce2f01ed4ec7d653c66e3c184d49835d729 SHA256 2e6f5421441d0072b37a4e2835852bea291893f891ede053faea9d0aa54664ee
+MD5 d17a30c58780ab11a0b0f8ef8b7a69de ChangeLog 2684
+RMD160 81b67226a76c085c3057ee9df4e4178461363524 ChangeLog 2684
+SHA256 2e6f5421441d0072b37a4e2835852bea291893f891ede053faea9d0aa54664ee ChangeLog 2684
 MISC metadata.xml 1396 RMD160 e2c352ff46384d0aa587cb3c7d8be3fdc2b76a38 SHA1 90fe83c3e4e3b971daca5d297ed5f01f876b6cc9 SHA256 d1d4bda554db8668b585ee7bde3f9b6d6e8b132ca366098268a36d06cdfe1502
 MD5 75659ae17937f732013a241bbc2b9529 metadata.xml 1396
 RMD160 e2c352ff46384d0aa587cb3c7d8be3fdc2b76a38 metadata.xml 1396
@@ -28,7 +32,7 @@ SHA256 0de7f920407236ee01d260c7eee81a5e54e14596760c38854ce56179c9b330e1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE++dhamhnQswr0vIRAoM+AKC5o241fHwDzmzSytsErCYz5LLbTwCeN/SP
-uy6lL9QWF1fw+jEZaKFrrkQ=
-=VR3d
+iD8DBQFFOwfvamhnQswr0vIRAnJHAKCLz6TnBNm18NgWWjyIgymG8wVkYACgnhhU
+l/LT9k/uGzNMGSEUe3CP24Y=
+=gTlY
 -----END PGP SIGNATURE-----
diff --git a/app-misc/twin/files/twin-0.4.6-build.patch b/app-misc/twin/files/twin-0.4.6-build.patch
new file mode 100644
index 000000000000..fb7a8d033330
--- /dev/null
+++ b/app-misc/twin/files/twin-0.4.6-build.patch
@@ -0,0 +1,31 @@
+just respect the settings from portage, local strip stuff be damned
+
+--- makerules
++++ makerules
+@@ -27,25 +27,7 @@
+ #
+ # compile/link flags. Used if no CFLAGS/LDFLAGS given in `make' command line
+ #
+-ifdef DEBUG
+- CFLAGS+=-g -DINLINE=static
+- LDFLAGS+=-g
+-else
+- ifdef PROFILE
+-   CFLAGS+=-p -pg
+-   LDFLAGS+=-p -pg
+- else
+-   ifeq ($(CC),gcc)
+-     CFLAGS+=-O2 -fomit-frame-pointer
+-     LDFLAGS+=-s
+-   else
+-     # detected by `./configure' :
+-     CFLAGS+=$(CC_AC_FLAGS)
+-   endif
+-   # strip installed binaries
+-   INSTALLFLAGS+=-s
+- endif
+-endif
++CFLAGS+=$(CC_AC_FLAGS)
+ 
+ #
+ # how picky should your compiler be? uncomment for paranoid gcc settings.
diff --git a/app-misc/twin/files/twin-0.4.6-gcc.patch b/app-misc/twin/files/twin-0.4.6-gcc.patch
index 88fa69d70a73..62fd7f62e983 100644
--- a/app-misc/twin/files/twin-0.4.6-gcc.patch
+++ b/app-misc/twin/files/twin-0.4.6-gcc.patch
@@ -17,3 +17,24 @@
      s_tw_errno *E;
      byte *q;
      int i;
+--- server/HW/hw_tty.c
++++ server/HW/hw_tty.c
+@@ -389,8 +389,9 @@
+ 	
+ static byte xterm_MouseData[10] = "\033[M#!!!!";
+ 
++static void xterm_MouseEvent(int fd, display_hw hw);
++
+ static void stdin_KeyboardEvent(int fd, display_hw hw) {
+-    static void xterm_MouseEvent(int, display_hw);
+     static byte *match;
+     byte got, chunk, buf[SMALLBUFF], *s, *sret;
+     udat Code, ShiftFlags;
+@@ -574,7 +575,6 @@
+  */
+ 
+ static void xterm_QuitMouse(void);
+-static void xterm_MouseEvent(int fd, display_hw hw);
+ 
+ 
+ /* return FALSE if failed */
diff --git a/app-misc/twin/twin-0.4.6.ebuild b/app-misc/twin/twin-0.4.6.ebuild
index cc5c4f0a30b8..275da26d1e90 100644
--- a/app-misc/twin/twin-0.4.6.ebuild
+++ b/app-misc/twin/twin-0.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/twin-0.4.6.ebuild,v 1.11 2006/09/04 08:43:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/twin-0.4.6.ebuild,v 1.12 2006/10/22 05:55:19 vapier Exp $
 
 inherit eutils fixheadtails
 
@@ -13,18 +13,19 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
 IUSE="X gtk ggi gpm"
 
-RDEPEND="X? ( || ( ( x11-libs/libXpm x11-libs/libX11 ) virtual/x11 ) )
+RDEPEND="X? ( x11-libs/libXpm x11-libs/libX11 )
 	ggi? ( >=media-libs/libggi-1.9 )
 	gtk? ( =x11-libs/gtk+-1.2* )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
 	>=sys-libs/ncurses-5.2"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/xproto ) virtual/x11 ) )"
+	X? ( x11-proto/xproto )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-autotools.patch
+	epatch "${FILESDIR}"/${P}-build.patch
 	epatch "${FILESDIR}"/${P}-gcc.patch
 	ht_fix_file configure
 }
@@ -59,17 +60,17 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die
+	emake install DESTDIR="${D}" || die
 
 	if use X ; then
 		insinto /usr/lib/X11/fonts/misc
 		doins fonts/vga.pcf.gz
 	fi
 
-	rm -rf ${D}/usr/share/twin/{BUGS,docs,COP*,READ*,Change*,INSTALL*}
+	rm -rf "${D}"/usr/share/twin/{BUGS,docs,COP*,READ*,Change*,INSTALL*}
 
 	dodoc BUGS Change* README* TODO/TODO TODO/twin-thoughts
-	doman docs/twin.1; rm -rf docs/twin.1
+	doman docs/twin.1
 	dodoc docs/*
-
+	rm -f "${D}"/usr/share/doc/${PF}/twin.1*
 }