Fix building against sys-libs/ncurses[tinfo] (bug #528360). Fix CFLAGS mangling,...
authorJeroen Roovers <jer@gentoo.org>
Sat, 15 Nov 2014 12:13:29 +0000 (12:13 +0000)
committerJeroen Roovers <jer@gentoo.org>
Sat, 15 Nov 2014 12:13:29 +0000 (12:13 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

net-irc/tirc/ChangeLog
net-irc/tirc/Manifest
net-irc/tirc/files/tirc-1.2-configure.patch [new file with mode: 0644]
net-irc/tirc/tirc-0.54_alpha.ebuild [deleted file]
net-irc/tirc/tirc-1.2.ebuild

index 51b0cd6234c9b9529a36f4ea6aad1e947abbf8da..682a28161814a69aaa3e0339fdb004aa72e6ea9f 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/tirc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/tirc/ChangeLog,v 1.6 2013/03/30 14:43:52 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/tirc/ChangeLog,v 1.7 2014/11/15 12:13:28 jer Exp $
+
+  15 Nov 2014; Jeroen Roovers <jer@gentoo.org> +files/tirc-1.2-configure.patch,
+  -tirc-0.54_alpha.ebuild, tirc-1.2.ebuild:
+  Fix building against sys-libs/ncurses[tinfo] (bug #528360). Fix CFLAGS
+  mangling, resoect CC (bug #423835).
 
   30 Mar 2013; Ulrich Müller <ulm@gentoo.org> tirc-0.54_alpha.ebuild:
   Fix LICENSE, BSD according to COPYRIGHT file.
@@ -25,4 +30,3 @@
   16 Jul 2004; Sven Wegener <swegener@gentoo.org> +metadata.xml,
   +tirc-0.54_alpha.ebuild:
   Initial import, ebuild written by me.
-
index 7cb8c6d9f80ed34c7eb292e2ed790d086c98bf25..45a422d5e02b4a05ff617a7d1dc4436ae1483f55 100644 (file)
@@ -1,23 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST tirc-0.54a-patched.tar.gz 316846 SHA256 0610f47f5385618db1612ec03fe22bb89c745649aade7a72752b250e9f497c62 SHA512 f66ecdf60dfdd647d78ca34fb8b8cb4f62436c09e0012c68ec53988a51a7d0d451f21cb12830588db34128252a23b928c7edc40b7a99b14ec767a18e3072dfa3 WHIRLPOOL 6e46643f6059920496e615f40ed80a172aa69f2bf9aa75964a4c0c5c78bc3a17919c2f28bc3c8c4c4d77cd3ca01fcc2a20f7c4c16934c3520bbfb847c5b420a6
+AUX tirc-1.2-configure.patch 896 SHA256 f9262f17c9aace552834e81693897894d6f393831f5dc024f013abc6c9ddc570 SHA512 b186d7eb3d173df51717a02cbddc7c445f6d24c3f1af93ec3ab8f227d531aad93702c5f5d2cf6a2196765be10256e5a50de34269a7a49a501f3f00c0b56b3e8e WHIRLPOOL e13113094524aed4539d430809506c381135f8d2401727d026c01a48c98a63f985a254abea12a8878eb7b63e39327e055ce83ae9b57cc6cb99d69069c54b9052
 DIST tirc_1.2.orig.tar.gz 300089 SHA256 769566ff1c2ca52b90a6784d46268a8613660a47e68b6f7954b83d7f682ed29f SHA512 2cb4280707c06e16e7f79ca68c39144aa1e72c8076c2299e7658d9e897a9afefc5101961ad7ced240488a3a014ce5886cbcbb7b282b28adef0553585d49c58a2 WHIRLPOOL d40bb765a60e36311e8b344b887101afb96257d4c7ec68802e4461b81b02f0b83a470922c4b3abe36da284995592d510fba5312e6947c158210ecb8f39c38c86
-EBUILD tirc-0.54_alpha.ebuild 832 SHA256 bfd3dc5c4d0751654cd616524544b079f460ebbfe92f8257163e1899d9fbd747 SHA512 0cee3daae8e26eef0a732ed0b430ed33bd718afa4f56ea0f9c37a013d68093451e383f16b7de80f87f8b664b547afdfc53ebc4b974828e3cb41656e2c40b3a80 WHIRLPOOL 935f7364a546df521adcdc7291261eba0b67c581a5d98106f07651ae5192c04f14960ccf8078f1f309196bc667f4724ad91e6b9d06cd16785edd87ca76edd65e
-EBUILD tirc-1.2.ebuild 754 SHA256 84d093b652eff6b8ba1909b449b6c207a78a5480679167a5a3b605762dffa3bb SHA512 82c5bfa7ceb9ae6e6ad4e6f2f6b3cec25e00bebd2e3acded041f63ef811110a1070dbcea68c6f3f7f8e02459af502cdbb6a173513f9dac93f5f3283026a17bde WHIRLPOOL 2d86f3fc4cb9b65de7d7b010bc4ff22024afacb5ac86bc54d0ea7d73b10d044a53f9861ff284978b80808fce5e168b66d12e37f67f625c2dfde67267d931efd8
-MISC ChangeLog 951 SHA256 74f2d9d5314950cca984665bbd1abd8ca932a1743ef0dd04168997eb7520aa3d SHA512 571c62d17662925dde4f9ab590280f51c9134f67e071423f654bc5e2ae1a589275a9cf4d9563fc445723948d71a934943f6cf42156ba89c592ae5db1c06d26d7 WHIRLPOOL e398841500cdc777be6adbcd4701708859eeabe864ca55c48d971eb545d9a797e5304ca9e9675002f69521c376672f0401d21fabc87ef35d06559e477a5e2ae4
+EBUILD tirc-1.2.ebuild 864 SHA256 d32e2be77893db7767f9ccc94589a7e0a6097436cc0354522497011ef0fc110d SHA512 375e9ee3e2e955f408f988076af6f820054c5e04e1aadd0497f09d334fec3c71f6df45c83da9632af7145a829603f1e0ba315c2c9914e17c452c6581642f29e2 WHIRLPOOL 6b6eea34e0ccf3ab25ca8726add8a1734c0a05613b4ecd510d2909dd92e2bfae1accc33b9cb329b6d63c4283104d33e195281a9e48ad115613558d79a31de113
+MISC ChangeLog 1186 SHA256 c2013ba4a799035a1d3cac77a8b6cea948eed8085831e87023300653650d447c SHA512 c60b7a1f7ad5e027701e361902d590603756c5097b1ba1eb0c66b3dabb1901135046b46df1d79efdc745b93f3048d256164252430075dbfc28523e6cf4c8c949 WHIRLPOOL 3e18152919515ea07771bddd62735870583325db9a3a995a7ede7b0cce7a299e5be2cf728da9771cc036876e57e4eb6e6992f0546acd13e793b9be5805d0dd44
 MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJRVvpJAAoJEJQzkH1pP7W4vkYMALA+/zqf2sHS9QTT8OVoeD0V
-CGDpM8rM7YX15gcvFbPxE3tIZ/pgDdIFgW1PHLU7F8RXx29Snc3P2yCR7yK7gSyM
-4ywoz3ruRmR6/oJrnTb23gxk5MmxjHvh0sqm9RvoC/n7RFkJm6YpTAmIMaKi3ylm
-nE677PoH5N1iM92ZAcf27dd1Knkeq7TF8jCUf39aKS8qZXq43uMiZD0/qG97pdT0
-vCr9Y8dN6yWu0TvhMJ/ZBY7z8bs6qKPd1JBmCuI0GaTjSKJi5SI6dCM7h9f3OHKY
-x1dxk6cQam9UVQtePXYLVvzOUCXZRhVUMl7sl/RhiGabEJaJVtBBht7/McAmAFTv
-tZi7tw1X3I3M6b+0T3EqGsrDwpjLM9zsgItRajricNIiwOC+XGOAy86IFuA1P4kI
-WV86aUWAuzPLIq2lAD2+WeliKkPfk+uF9F6jKl5gX0sCeQ2EV7retFbJjNguGe1g
-G26J+8OTm0oXoSpZjhhM9HJfADaSaLpSHH00NM1RCQ==
-=WjaP
+iEYEAREIAAYFAlRnQ2kACgkQVWmRsqeSphO2OQCfbYhTUjKigSyyasMoNR5NGAlu
+KLsAmwQYRTz09gB/dMdsLmADBA6xKilq
+=niAu
 -----END PGP SIGNATURE-----
diff --git a/net-irc/tirc/files/tirc-1.2-configure.patch b/net-irc/tirc/files/tirc-1.2-configure.patch
new file mode 100644 (file)
index 0000000..34cee9b
--- /dev/null
@@ -0,0 +1,30 @@
+--- a/configure.in
++++ b/configure.in
+@@ -30,7 +30,6 @@
+       [tirc_cv_debug="yes"], [tirc_cv_debug="no"])
+ if test "$tirc_cv_debug" = yes; then
+       AC_DEFINE(DEBUGV)
+-      OPTFLAG=${OPTFLAG-"-g"}
+ else
+       dnl Defining NDEBUG disables the assert() macro.
+       AC_DEFINE(NDEBUG)
+@@ -351,6 +350,10 @@
+               [tirc_cv_have_tparm=no])
+ fi
+ if test "$tirc_cv_have_tparm" = no; then
++      AC_CHECK_LIB(tinfo, tparm, [tirc_cv_have_tparm=tinfo],
++              [tirc_cv_have_tparm=no])
++fi
++if test "$tirc_cv_have_tparm" = no; then
+       AC_CHECK_LIB(curses, tparm, [tirc_cv_have_tparm=curses],
+               [tirc_cv_have_tparm=no])
+ fi
+@@ -715,7 +718,7 @@
+ 
+ dnl Get the optimization and debug stuff out of CFLAGS where the darn stupid
+ dnl autoconf dumps them into.
+-CFLAGS=`echo $CFLAGS | sed -e 's/-O.//' -e 's/-g//'`
++dnl CFLAGS=`echo $CFLAGS | sed -e 's/-O.//' -e 's/-g//'`
+ 
+ dnl Add efence if configured.
+ if test "$tirc_cv_efence" = yes; then
diff --git a/net-irc/tirc/tirc-0.54_alpha.ebuild b/net-irc/tirc/tirc-0.54_alpha.ebuild
deleted file mode 100644 (file)
index 10a6f63..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/tirc/tirc-0.54_alpha.ebuild,v 1.3 2013/03/30 14:43:52 ulm Exp $
-
-MY_P=${P/_alpha/a}-patched
-
-DESCRIPTION="Token's IRC client"
-HOMEPAGE="http://home.mayn.de/jean-luc/alt/tirc/"
-SRC_URI="http://home.mayn.de/jean-luc/alt/tirc/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="debug"
-
-DEPEND="sys-libs/ncurses"
-
-S=${WORKDIR}/${PN}-alpha
-
-src_compile() {
-       econf \
-               --with-all \
-               $(use_enable debug) \
-               || die "econf failed"
-       emake depend || die "emake depend failed"
-       emake tirc || die "emake tirc failed"
-}
-
-src_install() {
-       dobin tirc || die "dobin failed"
-       doman tirc.1 || die "doman failed"
-       dodoc COMMENT Changelog FAQ Notes README doc/* || die "dodoc failed"
-}
index 9e21e04a676c1bff2630444ede237bd659d2e3d7..c92f72c54e318f9330b48cd7efc8eaba887cb021 100644 (file)
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/tirc/tirc-1.2.ebuild,v 1.2 2011/05/16 16:38:38 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/tirc/tirc-1.2.ebuild,v 1.3 2014/11/15 12:13:28 jer Exp $
 
-EAPI=4
+EAPI=5
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Token's IRC client"
 HOMEPAGE="http://home.mayn.de/jean-luc/alt/tirc/"
@@ -19,9 +20,13 @@ RDEPEND="${DEPEND}"
 src_prepare() {
        # Don't call dodoc on a directory, bug #367505.
        rm -rf doc/RCS || die
+
+       epatch "${FILESDIR}"/${P}-configure.patch
+       eautoreconf
 }
 
 src_configure() {
+       tc-export CC
        econf \
                $(use_enable debug)
 }