Fixed compilation issues on amd64.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 136 insertions, 21 deletions

diff --git a/x11-misc/xfractint/ChangeLog b/x11-misc/xfractint/ChangeLog
index 2fa06a6bc13a..fe66194ae4eb 100644
--- a/x11-misc/xfractint/ChangeLog
+++ b/x11-misc/xfractint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xfractint
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.35 2006/01/22 15:49:52 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.36 2006/01/29 22:37:37 spock Exp $
+
+  29 Jan 2006; Michał Januszewski <spock@gentoo.org>
+  +files/xfractint-20.4.03-makefile.patch, xfractint-20.4.03.ebuild:
+  Fixed compilation issues on amd64. Thanks to Chris White for the patch (bug
+  #119997).
 
   22 Jan 2006; Michał Januszewski <spock@gentoo.org>
   xfractint-20.3.01.ebuild, xfractint-20.3.02.ebuild,
diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest
index 40d9b611ca5f..981daf569ea6 100644
--- a/x11-misc/xfractint/Manifest
+++ b/x11-misc/xfractint/Manifest
@@ -1,24 +1,55 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ec899eb236a47db1f91a07c0e0bccbf1 ChangeLog 4826
+MD5 1edcd4f2d66add257fe1d4aaf1eb544c ChangeLog 5040
+RMD160 a890922caefd6f341a7fe700259282f30fb0ffd5 ChangeLog 5040
+SHA256 f1246b3ffca4c7a0f8f3a1ffa9d1b029e2dbdd0d270cb88c3d64444e83334c38 ChangeLog 5040
 MD5 77cbf948cbe69222901e61a0803ffd27 files/digest-xfractint-20.3.01 71
+RMD160 798dc9832daa3a50e95a60a400c2d6941377c1c8 files/digest-xfractint-20.3.01 71
+SHA256 fd5aa9fc609009e1681f4509c934d936df58d8eb6214be0467a2411b139e8ff7 files/digest-xfractint-20.3.01 71
 MD5 cb49b3df1715d0315e8a37576aaf6f8b files/digest-xfractint-20.3.02 66
+RMD160 022ed25f4f82a65d2e79b6fd6cf4fc914a2b5bca files/digest-xfractint-20.3.02 66
+SHA256 d6cd02ac2fd9d083153b3ff9edfb220f969f3f95b65d64a2f0ab0a1a174ccb4c files/digest-xfractint-20.3.02 66
 MD5 25aca5a90ed8893184cdd8164391ede4 files/digest-xfractint-20.4.00 66
+RMD160 9fd50cffbacb27cf3c1d7c3a4bd155d607a6f8a2 files/digest-xfractint-20.4.00 66
+SHA256 ebb0dc8f6e0e6ac56a12dbb7e9e2f553f18339d03d84889dec31803bb5bcd7a1 files/digest-xfractint-20.4.00 66
 MD5 085968f047735e8d230ab2a6b54759c5 files/digest-xfractint-20.4.03 71
+RMD160 3a13c942d6f5e8c4a596b8de8a620a3c69827bfc files/digest-xfractint-20.4.03 71
+SHA256 b0593d1229ef236383dc667782fff4fab37f556ace06056627209a86b8a3d79b files/digest-xfractint-20.4.03 71
 MD5 82d07ede201e8702d8735435519b2fda files/xfractint-20.02p05.patch 14678
+RMD160 dd14003f0b811e8bffcfb66f0edce9a523d4ddb0 files/xfractint-20.02p05.patch 14678
+SHA256 289998e58ad85b1e99a2fead35803da8c6d34a5b5db0d22cf4a0f22620c0f1e7 files/xfractint-20.02p05.patch 14678
 MD5 c5567d70857de4263075a5518c379360 files/xfractint-20.03p00.patch 12271
+RMD160 f6b666f1dce177018b033130c6873445143b283a files/xfractint-20.03p00.patch 12271
+SHA256 8acc945cb24d7ca238714be70bd0992cee9354551618808b45f015679fe4e866 files/xfractint-20.03p00.patch 12271
 MD5 b0cd97be52866e9cea98a9a5e38d75a9 files/xfractint-20.03p01-make.patch 875
+RMD160 27836e2ba4b93556878e1bd5ed50af50ec6ad61f files/xfractint-20.03p01-make.patch 875
+SHA256 c616b5730693e0fab9130c3f20ba15c13733f9d3673537ab507b93775e8c9912 files/xfractint-20.03p01-make.patch 875
+MD5 49bd40c8708434634d370ec9b7fa1afd files/xfractint-20.4.03-makefile.patch 3486
+RMD160 6d2fb98eaf97ddc72354d5c79026eb57d4b4eb7f files/xfractint-20.4.03-makefile.patch 3486
+SHA256 3b225bca198337d4070dbe74d658d61c46fd15262cfc6745e723eb4aa93f1d44 files/xfractint-20.4.03-makefile.patch 3486
 MD5 96bd1e33e0ca901e1922403576c26437 files/xfractint.envd 63
+RMD160 92d25450705083ff387d2cb702d24f6529dc31a0 files/xfractint.envd 63
+SHA256 e79fe65b29137d40f6d4e26cff359be9e5422c1408138c5657f85380e9b82b4d files/xfractint.envd 63
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
+RMD160 399f78e98260d4f311124e71c6d294e368a76976 metadata.xml 255
+SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5 metadata.xml 255
 MD5 d727cad0009bc7a366851cd3f7953a05 xfractint-20.3.01.ebuild 1396
+RMD160 23cf5feb8a1a8ee20410b454b3adcf186a071221 xfractint-20.3.01.ebuild 1396
+SHA256 c34da0d053b79c73d517a301650df20aeffcedafff709083caf1f106ca4ff936 xfractint-20.3.01.ebuild 1396
 MD5 f883179c2142eadc2775fc3b7406e2a9 xfractint-20.3.02.ebuild 1407
+RMD160 147d104c84a393298237942f9c0e31dd6215949d xfractint-20.3.02.ebuild 1407
+SHA256 ee0eeb3df4484f47880544c6f80a800e473736b4289e9565756eaf06032efbf8 xfractint-20.3.02.ebuild 1407
 MD5 fc74856f345b5e0c4e56f2a260381438 xfractint-20.4.00.ebuild 1405
-MD5 a9d2c0e3ba3615552884a704d33ff099 xfractint-20.4.03.ebuild 1362
+RMD160 8e2ad1901c120087f8901caa4b29b87fa070437e xfractint-20.4.00.ebuild 1405
+SHA256 8dc77be524e81cf80d0728779b17d699ab4a9b884a01cb285951811c2bc538dc xfractint-20.4.00.ebuild 1405
+MD5 505ef79f92cb5aabc4861c2c73d6b71d xfractint-20.4.03.ebuild 1222
+RMD160 022b33ee4607bbe00826869987805a7fd30af02e xfractint-20.4.03.ebuild 1222
+SHA256 103f316ef9ea8ebfd1ebb740883aa223eb0706af0d2aaef4991ab60ceb74602c xfractint-20.4.03.ebuild 1222
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD06mtchej4aZK9/cRAv1OAJ4rngWDHSKo0MfA1g6u5pXwgUX/SQCfSDqt
-rTD6h/zyVv6E2Ez7ph1BawY=
-=nPtK
+iD8DBQFD3UPIchej4aZK9/cRAufpAJ0aMkPE/BoJg69cYCv7EVpGJqSktwCfb+yq
+4lYcUG1Q3Xk6OSIr1JYxOBQ=
+=MpoP
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xfractint/files/xfractint-20.4.03-makefile.patch b/x11-misc/xfractint/files/xfractint-20.4.03-makefile.patch
new file mode 100644
index 000000000000..54f61ff04772
--- /dev/null
+++ b/x11-misc/xfractint/files/xfractint-20.4.03-makefile.patch
@@ -0,0 +1,85 @@
+diff -Naurp xfractint-20.04p03-orig/Makefile xfractint-20.04p03/Makefile
+--- xfractint-20.04p03-orig/Makefile	2006-01-29 23:08:39.000000000 +0100
++++ xfractint-20.04p03/Makefile	2006-01-29 23:28:09.000000000 +0100
+@@ -2,11 +2,11 @@ SHELL=/bin/sh
+ 
+ # SRCDIR should be a path to the directory that will hold fractint.hlp
+ # SRCDIR should also hold the .par, .frm, etc. files
+-SRCDIR = /usr/share/xfractint
++SRCDIR = $(DESTDIR)/usr/share/xfractint
+ # BINDIR is where you put your X11 binaries
+-BINDIR = /usr/X11R6/bin
++BINDIR = $(DESTDIR)/usr/X11R6/bin
+ # MANDIR is where you put your chapter 1 man pages
+-MANDIR = /usr/X11R6/man/man1
++MANDIR = $(DESTDIR)/usr/X11R6/man/man1
+ 
+ HFD = ./headers
+ UDIR = ./unix
+@@ -85,14 +85,14 @@ AFLAGS = -f elf -w+orphan-labels
+ ifeq ($(AS),/usr/bin/nasm)
+ 
+ #CFLAGS = -I. -D_CONST $(DEFINES)
+-CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os \
+-         -mcpu=pentium -DNASM -fno-builtin
++CFLAGS += -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin
++HCFLAGS += -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin
+ #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -DNASM -fno-builtin
+ 
+ else
+ 
+-CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os \
+-         -mcpu=pentium -fno-builtin
++CFLAGS += -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -fno-builtin
++HCFLAGS += -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin
+ #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -fno-builtin
+ 
+ endif
+@@ -257,18 +257,20 @@ clean:
+ install: xfractint fractint.hlp
+ 	strip xfractint
+ # only next 4 lines might need su
++	if [ ! -d $(BINDIR) ]; then mkdir -p $(BINDIR) ; fi
+ 	cp xfractint $(BINDIR)/xfractint;
+ 	chmod a+x $(BINDIR)/xfractint;
++	if [ ! -d $(MANDIR) ]; then mkdir -p $(MANDIR) ; fi
+ 	cp $(UDIR)/xfractint.man $(MANDIR)/xfractint.1;
+ 	chmod a+r $(MANDIR)/xfractint.1
+ # create directories if they don't exist
+-	if [ ! -d $(SRCDIR) ] ; then mkdir $(SRCDIR) ; fi
+-	if [ ! -d $(SRCDIR)/$(PDIR) ] ; then mkdir $(SRCDIR)/$(PDIR) ; fi
+-	if [ ! -d $(SRCDIR)/$(FDIR) ] ; then mkdir $(SRCDIR)/$(FDIR) ; fi
+-	if [ ! -d $(SRCDIR)/$(IDIR) ] ; then mkdir $(SRCDIR)/$(IDIR) ; fi
+-	if [ ! -d $(SRCDIR)/$(LDIR) ] ; then mkdir $(SRCDIR)/$(LDIR) ; fi
+-	if [ ! -d $(SRCDIR)/$(MDIR) ] ; then mkdir $(SRCDIR)/$(MDIR) ; fi
+-	if [ ! -d $(SRCDIR)/$(XDIR) ] ; then mkdir $(SRCDIR)/$(XDIR) ; fi
++	if [ ! -d $(SRCDIR) ] ; then mkdir -p $(SRCDIR) ; fi
++	if [ ! -d $(SRCDIR)/$(PDIR) ] ; then mkdir -p $(SRCDIR)/$(PDIR) ; fi
++	if [ ! -d $(SRCDIR)/$(FDIR) ] ; then mkdir -p $(SRCDIR)/$(FDIR) ; fi
++	if [ ! -d $(SRCDIR)/$(IDIR) ] ; then mkdir -p $(SRCDIR)/$(IDIR) ; fi
++	if [ ! -d $(SRCDIR)/$(LDIR) ] ; then mkdir -p $(SRCDIR)/$(LDIR) ; fi
++	if [ ! -d $(SRCDIR)/$(MDIR) ] ; then mkdir -p $(SRCDIR)/$(MDIR) ; fi
++	if [ ! -d $(SRCDIR)/$(XDIR) ] ; then mkdir -p $(SRCDIR)/$(XDIR) ; fi
+ # copy all the files to the appropriate directories
+ 	cp fractint.hlp sstools.ini $(DOCS) $(SRCDIR)
+ 	cd ./$(PDIR); cp $(PARFILES) $(SRCDIR)/$(PDIR)
+@@ -312,10 +314,10 @@ doc: hc $(HELP)
+ 	./hc /p
+ 
+ hc:	$(HOBJS)
+-	$(CC) -o hc $(CFLAGS) $(HOBJS)
++	$(CC) -o hc $(HCFLAGS) $(HOBJS)
+ 
+ unix.o: $(UDIR)/unix.c
+-	$(CC) $(CFLAGS) -DSRCDIR=\"$(SRCDIR)\" -c $(UDIR)/unix.c
++	$(CC) $(HCFLAGS) -DSRCDIR=\"$(SRCDIR)\" -c $(UDIR)/unix.c
+ 
+ copy: $(FILES)
+ 	mv $(FILES) backup
+@@ -324,3 +326,6 @@ copy: $(FILES)
+ 
+ hc.o: $(COMDIR)/hc.c $(HFD)/helpcom.h $(HFD)/port.h
+ 
++$(COMDIR)/hc.o: $(COMDIR)/hc.c
++	$(CC) $(HCFLAGS) $(COMDIR)/hc.c -c -o $(COMDIR)/hc.o
++
diff --git a/x11-misc/xfractint/xfractint-20.4.03.ebuild b/x11-misc/xfractint/xfractint-20.4.03.ebuild
index 55d2dfbae744..665ae7cd2d68 100644
--- a/x11-misc/xfractint/xfractint-20.4.03.ebuild
+++ b/x11-misc/xfractint/xfractint-20.4.03.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/x11-misc/xfractint/xfractint-20.4.03.ebuild,v 1.1 2006/01/22 15:46:55 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.4.03.ebuild,v 1.2 2006/01/29 22:37:37 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -22,25 +22,19 @@ RDEPEND="virtual/libc
 DEPEND="${RDEPEND}
 	|| ( x11-proto/xproto virtual/x11 )"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
 	cd ${S}
-	cp Makefile Makefile.orig
-	replace-flags "-funroll-all-loops" "-funroll-loops"
-	sed -e "s:CFLAGS = :CFLAGS = $CFLAGS :" Makefile.orig >Makefile
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
 
-	emake -j1
+src_compile() {
+	replace-flags "-funroll-all-loops" "-funroll-loops"
+	emake -j1 || die "make failed"
 }
 
 src_install() {
-	dodir /usr/bin
-	dodir /usr/share/xfractint
-	dodir /usr/man/man1
-
-	make \
-		BINDIR=${D}usr/bin \
-		MANDIR=${D}usr/man/man1 \
-		SRCDIR=${D}usr/share/xfractint \
-		install || die
+	make DESTDIR="${D}"	install || die
 
 	chmod 0644 -R ${D}usr/share/xfractint/*