Respect LDFLAGS in the ebuild, switch to EAPI 2 (bug #336340).

Package-Manager: portage-2.1.9.12/cvs/Linux x86_64

4 files changed, 72 insertions, 7 deletions

diff --git a/x11-misc/xfractint/ChangeLog b/x11-misc/xfractint/ChangeLog
index a6b2f2abf0f1..2551b3412326 100644
--- a/x11-misc/xfractint/ChangeLog
+++ b/x11-misc/xfractint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xfractint
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.54 2008/10/15 17:29:01 spock Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.55 2010/09/30 10:50:53 spock Exp $
+
+*xfractint-20.04_p09-r1 (30 Sep 2010)
+
+  30 Sep 2010; Michał Januszewski <spock@gentoo.org>
+  +xfractint-20.04_p09-r1.ebuild, +files/xfractint-20.04p09-ldflags.patch:
+  Respect LDFLAGS in the ebuild, switch to EAPI 2 (bug #336340).
 
   15 Oct 2008; Michał Januszewski <spock@gentoo.org>
   -files/xfractint-20.4.03-makefile.patch, -xfractint-20.04_p03.ebuild:
diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest
index 81e8467ce931..12fcac21f54e 100644
--- a/x11-misc/xfractint/Manifest
+++ b/x11-misc/xfractint/Manifest
@@ -5,19 +5,21 @@ AUX xfractint-20.04_p07-Makefile.patch 5492 RMD160 9ce83e16cfc4481f79619417c5d5a
 AUX xfractint-20.04p07-filename-buffer-overflow-fix.patch 4695 RMD160 e3b2a3e4e9f002b9fe55dcf3392ed1b9e8843a80 SHA1 aa693b0d9ecb4628f221fe92105c8fc974b41ad3 SHA256 5cd6dd38f15eb32e6a10743a5043b256647356998fb8b24ff7e4e997026db7be
 AUX xfractint-20.04p07-xioerror.patch 1435 RMD160 af77ce4a9d7c8ff62690e96a6271ede36edb06fe SHA1 c3fdebe3eb3590807cf1711059d428fe1f97e698 SHA256 0bc72fee9d4ab1444c88290a5f5318d4c9c1b0c52aaf0cf858e637b47c250858
 AUX xfractint-20.04p08-Makefile.patch 3151 RMD160 8cf77cab75743cbb58edc62e61b3fcca81b8e82d SHA1 7ef95daffde2be3ebba8a4f12f3db5eb26ee4de9 SHA256 b4ee61978f96b34cc7acd781225a43fb30edb368274adfc1626224f9b68951d5
+AUX xfractint-20.04p09-ldflags.patch 607 RMD160 62c9c869b8baff96ee2c68e359b4dc9e17dfc595 SHA1 21d1bba05e01b9c5c728a3ac5af8248818a0408a SHA256 3f07f6ff21c41c6fc68c3250e424c26f536234be75d30bdc935d23e8ec5cfb4c
 AUX xfractint.envd 63 RMD160 92d25450705083ff387d2cb702d24f6529dc31a0 SHA1 4440d9f8b824438a5aae28191d9801a5d38e1dce SHA256 e79fe65b29137d40f6d4e26cff359be9e5422c1408138c5657f85380e9b82b4d
 DIST xfractint-20.04p07.tar.gz 1322518 RMD160 1a51654fe43db03c91c03fca6826b299ac1212c6 SHA1 d7fd0aa64f7e991006a8cdd30d5c2078afd41e14 SHA256 557118b6ba9f6e14800ca932a2ec2a11528c707aa5bf06b0816fad2820fdf520
 DIST xfractint-20.04p08.tar.gz 1331158 RMD160 58bda513e20414941f185c1ce77940269d32ebc1 SHA1 3d7f83d68d84a70af2a05324cec8f972abbd5e87 SHA256 6c952e0f5d6b982603b3c0cdcc9e89babda75c9c7fbaa9684e3c654ce0d71a30
 DIST xfractint-20.04p09.tar.gz 1333141 RMD160 7a5cae14a56ef9127d76f2a1d4b6a33b91df4fd6 SHA1 4305bfd2f839e2f9023fc75a68183594f3a19c04 SHA256 296e6da82a81210b2d9ccde0eb15059d27f561f23ef1221f39fbefe48ebe5d69
 EBUILD xfractint-20.04_p07.ebuild 1295 RMD160 6e82f1ac27e87d0528b4257514dfdcdff784acbe SHA1 490e05a7333076ce15c0c991842cfe6977e10adf SHA256 983bdbab05f91ba6b5de6b85758bd46cb6720d2eb36a5b651893c00af857baf3
 EBUILD xfractint-20.04_p08.ebuild 1197 RMD160 55dcccf1494bfb75abb04ce6e837e688b6136b5b SHA1 0e5b74be44782b80c98dd817540ab8812dd84b36 SHA256 af1ea3b34be6c1bbd57ff304b891121e99c0e9a3016723dbbea49f4f049959f1
+EBUILD xfractint-20.04_p09-r1.ebuild 1221 RMD160 88920aab2fbe6253c5eda05ac1bdbad966d3e59e SHA1 9581de33bae59434116f035e4209f54db21a7bf4 SHA256 9e87fbf06cb21fd4a3466d6593f8292530342a5acbf2e43dcb4ba9b6c9fb5cc2
 EBUILD xfractint-20.04_p09.ebuild 1115 RMD160 de74edf9670a3349ce1d89b4288b43d7acac49c7 SHA1 30e894a81cef144b799a033b594ff3dbc0ea99b4 SHA256 ae6b81a5cce1bab044714c532550f5d14b3b3785f7b35a9145eb6fff4a1554f9
-MISC ChangeLog 8154 RMD160 733354b05da57159cebf106c68fe83476e36b753 SHA1 1e0b12ac89ee1de33fceda683909a96fc0e4ea78 SHA256 06892ca74c90cb246fc8ae999f68d986da30749ef7f2a2b19cfa4d468c80af98
+MISC ChangeLog 8388 RMD160 456214cad185d415cf7f20ad4ca5146a5993fb68 SHA1 e4f11b33eae60eea32a93c43f3a2aec7c01b45e7 SHA256 dc91c90d561e466d550ef25bdafc746b8a0c9bea5aafff7678dc11829b08ff3d
 MISC metadata.xml 255 RMD160 399f78e98260d4f311124e71c6d294e368a76976 SHA1 61f663af9ea0cb4967a12878352e65b095dcd473 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkj2KFoACgkQchej4aZK9/eulgCfU4JfxhxwOB36cWsFu323vhjW
-v48An2K98LHGxo2Rz0vdwtHv93oCDOfj
-=hlLs
+iEYEARECAAYFAkyka5cACgkQchej4aZK9/eDIwCfb5BAVIgW26aJhgo31fIcoqcX
+hGgAn1YKAKtrzczt/kmSC8ZRzx490S8G
+=BuVf
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch b/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch
new file mode 100644
index 000000000000..81805066717c
--- /dev/null
+++ b/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch
@@ -0,0 +1,12 @@
+diff -Naurp xfractint-20.04p09-orig//Makefile xfractint-20.04p09/Makefile
+--- xfractint-20.04p09-orig//Makefile	2010-09-30 12:40:42.713823642 +0200
++++ xfractint-20.04p09/Makefile	2010-09-30 12:42:36.539819331 +0200
+@@ -301,7 +301,7 @@ xfractint: fractint.hlp $(SRCFILES)
+ 	          "HFD=.${HFD}"
+ 	cd unix ; ${MAKE} all "CFLAGS= -I.${HFD} ${CFLAGS} ${OPT}" "SRCDIR=${SHRDIR}" \
+ 	          "AS=${AS}" "AFLAGS=${AFLAGS}" "HFD=.${HFD}"
+-	$(CC) -o xfractint $(CFLAGS) $(OPT) $(OBJS) $(U_OBJS) $(LIBS)
++	$(CC) -o xfractint $(CFLAGS) $(LDFLAGS) $(OPT) $(OBJS) $(U_OBJS) $(LIBS)
+ #	strip xfractint
+ 
+ fractint:
diff --git a/x11-misc/xfractint/xfractint-20.04_p09-r1.ebuild b/x11-misc/xfractint/xfractint-20.04_p09-r1.ebuild
new file mode 100644
index 000000000000..faaaa58ee05e
--- /dev/null
+++ b/x11-misc/xfractint/xfractint-20.04_p09-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.04_p09-r1.ebuild,v 1.1 2010/09/30 10:50:53 spock Exp $
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+MY_P=${P/_}
+
+DESCRIPTION="a fractal generator"
+HOMEPAGE="http://www.fractint.org"
+SRC_URI="http://www.fractint.org/ftp/current/linux/${MY_P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+#	x86? ( dev-lang/nasm )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/xfractint-20.04p09-ldflags.patch"
+}
+
+src_compile() {
+	# Untested, any x86 archteam dev. is allowed to uncomment this.
+	local myasm="foo"
+#	use x86 && myasm="/usr/bin/nasm"
+	emake CC="$(tc-getCC)" AS="${myasm}" OPT="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}/usr" STRIP="true" install || die "emake install failed."
+	newenvd "${FILESDIR}"/xfractint.envd 60xfractint
+}
+
+pkg_postinst() {
+	elog "XFractInt requires the FRACTDIR variable to be set in order to start."
+	elog "Please re-login or \`source /etc/profile\` to have this variable set."
+}