From: Justin Lecher Date: Tue, 22 Jun 2010 13:40:00 +0000 (+0000) Subject: Including X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d1c1cf2349b487a67d291a413cdb4b89a570d4ef;p=gentoo.git Including Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/sci-calculators/hexcalc/ChangeLog b/sci-calculators/hexcalc/ChangeLog index 1519fb6d3634..a6f5b04e67e6 100644 --- a/sci-calculators/hexcalc/ChangeLog +++ b/sci-calculators/hexcalc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-calculators/hexcalc -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/ChangeLog,v 1.9 2008/11/17 22:05:07 flameeyes Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/ChangeLog,v 1.10 2010/06/22 13:40:00 jlec Exp $ + +*hexcalc-1.11-r2 (22 Jun 2010) + + 22 Jun 2010; Justin Lecher -hexcalc-1.11-r1.ebuild, + +hexcalc-1.11-r2.ebuild, +files/hexcalc-keypad.diff: + Including patch for Keypad, #156390; respecting users choices of CC and + FLAGS 17 Nov 2008; Diego E. Pettenò files/hexcalc-order.diff: diff --git a/sci-calculators/hexcalc/Manifest b/sci-calculators/hexcalc/Manifest index cfaf08f49d2d..b7874412ac2f 100644 --- a/sci-calculators/hexcalc/Manifest +++ b/sci-calculators/hexcalc/Manifest @@ -1,16 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX hexcalc-keypad.diff 3787 RMD160 f13d192b48cb2fa4c441d4774982bd45c5e01a06 SHA1 d6682c87510ebe6ceebe6fea3a03e1de3058e35c SHA256 9a4d797d5807ec04814b2c33793614a53782d8c74c23fe38eae4da8eb87897e7 AUX hexcalc-order.diff 972 RMD160 ea7b1b4fb9d85efce3da4363e1fe9d042f50a585 SHA1 efb7774446e573cfcd06dd5da1178c25e0ae8093 SHA256 d7a7b4317b97b2ba45a8fb6180b772fb213d08d11efc151aa72223e15fd66ff9 DIST hexcalc.tar.Z 18033 RMD160 8a31ed80478e79995d76d8e64a9671fc84ad161c SHA1 7212f58cea26252db6b9233b3931a0474874465c SHA256 726dae5803538cdae658e6b8b9184ec34f23af7fdfdc4412fecae040d66c5480 -EBUILD hexcalc-1.11-r1.ebuild 739 RMD160 3588e6de26ffb271427abf6fa3cb54392078ab2c SHA1 8e32e1eb3bdd742e9b17155ce8ee49ebadb2d788 SHA256 d4095e53cfb1af012f22bfee8f565ea7fdcf57e4b3a4af58c231d1c2393b8e44 +EBUILD hexcalc-1.11-r2.ebuild 850 RMD160 c6330ca77879b461b3ada84051aac958ca10ef6e SHA1 60089751a407feef408dd2326d07006fd27c2e03 SHA256 83bb47a8a09eaede2094a58f72a840b45033e51939d91d798c5225b17836921a EBUILD hexcalc-1.11.ebuild 639 RMD160 769d47764f0e804475ab53f210888c55de15416d SHA1 6d81635117726b65591591147bf88886c5fe4765 SHA256 6026fd852944d014e4ce56802b5f937f2306c205ddb5eb02fbcc33534253a03c -MISC ChangeLog 1439 RMD160 b64f62366fb50fc55d734e6528f8ebedf157df3d SHA1 1365228612085b46bc16c0f81b9cdaaf5c9faf50 SHA256 0f6c06cab5ab30a00a0874fc41f23f085e9d97195f36c119dc94a43084d006a0 +MISC ChangeLog 1677 RMD160 d906df0ef5bf0d7c6bd2dc537c3188f62ba3f79c SHA1 75868942167ed6825c3e7eff843268ba1b223f79 SHA256 30ce2a08c54e8980a3248cb149c9ed187a69d01a1cdf93fc7c9d87d3a4e030a9 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkkh6pkACgkQAiZjviIA2XhqZgCffDoYa4SGlHu/GMvsbivk+K2X -7sMAnA3YG7A+Rfstpec3E8ejvQ7T8SaV -=9/gF +iEYEARECAAYFAkwgvTUACgkQgAnW8HDreRbN7wCgzD5tO/lr26/+1pvW8KZW9bbR +bxAAoIH/jpFx6LVg9dsO6P5PnXeCA9Hh +=UGc8 -----END PGP SIGNATURE----- diff --git a/sci-calculators/hexcalc/files/hexcalc-keypad.diff b/sci-calculators/hexcalc/files/hexcalc-keypad.diff new file mode 100644 index 000000000000..1becd895c1c3 --- /dev/null +++ b/sci-calculators/hexcalc/files/hexcalc-keypad.diff @@ -0,0 +1,116 @@ +--- hexcalc.c 1989-11-22 22:29:06.000000000 +0100 ++++ hexcalc.c.new 2006-11-27 11:38:07.000000000 +0100 +@@ -208,46 +208,73 @@ + }; + + static String defaultTranslations = +- ":(: DoKey(\"(\")\n\ +- :&: DoKey(&)\n\ +- :^: DoKey(^)\n\ +- :): DoKey(\")\")\n\ +- Ctrlc: DoKey(off)\n\ +- :H: DoKey(hex)\n\ +- :O: DoKey(oct)\n\ +- :D: DoKey(dec)\n\ +- :B: DoKey(bin)\n\ +- :R: DoKey(Rcl)\n\ +- :S: DoKey(Sto)\n\ +- :s: DoKey(16)\n\ +- :l: DoKey(32)\n\ +- :+: DoKey(+)\n\ +- :-: DoKey(-)\n\ +- :*: DoKey(*)\n\ +- :/: DoKey(/)\n\ +- :%: DoKey(%)\n\ +- :>: DoKey(>>)\n\ +- :<: DoKey(<<)\n\ +- :0: DoKey(0)\n\ +- :1: DoKey(1)\n\ +- :2: DoKey(2)\n\ +- :3: DoKey(3)\n\ +- :4: DoKey(4)\n\ +- :5: DoKey(5)\n\ +- :6: DoKey(6)\n\ +- :7: DoKey(7)\n\ +- :8: DoKey(8)\n\ +- :9: DoKey(9)\n\ +- :a: DoKey(a)\n\ +- :b: DoKey(b)\n\ +- :c: DoKey(c)\n\ +- :d: DoKey(d)\n\ +- :e: DoKey(e)\n\ +- :f: DoKey(f)\n\ +- Ctrlh: Delete()\n\ +- Delete: Delete()\n\ +- :=: DoKey(=)\n\ +- :Return: DoKey(=)" ++ ":(: DoKey(\"(\")\n\ ++ :&: DoKey(&)\n\ ++ :^: DoKey(^)\n\ ++ :): DoKey(\")\")\n\ ++ Ctrlc: DoKey(off)\n\ ++ :H: DoKey(hex)\n\ ++ :O: DoKey(oct)\n\ ++ :D: DoKey(dec)\n\ ++ :B: DoKey(bin)\n\ ++ :R: DoKey(Rcl)\n\ ++ :S: DoKey(Sto)\n\ ++ :s: DoKey(16)\n\ ++ :l: DoKey(32)\n\ ++ :+: DoKey(+)\n\ ++ :KP_Add: DoKey(+)\n\ ++ :-: DoKey(-)\n\ ++ :KP_Subtract: DoKey(-)\n\ ++ :*: DoKey(*)\n\ ++ :KP_Multiply: DoKey(*)\n\ ++ :/: DoKey(/)\n\ ++ :KP_Divide: DoKey(/)\n\ ++ :%: DoKey(%)\n\ ++ :>: DoKey(>>)\n\ ++ :<: DoKey(<<)\n\ ++ :0: DoKey(0)\n\ ++ :KP_0: DoKey(0)\n\ ++ :KP_Insert: DoKey(0)\n\ ++ :1: DoKey(1)\n\ ++ :KP_1: DoKey(1)\n\ ++ :KP_End: DoKey(1)\n\ ++ :2: DoKey(2)\n\ ++ :KP_2: DoKey(2)\n\ ++ :KP_Down: DoKey(2)\n\ ++ :3: DoKey(3)\n\ ++ :KP_3: DoKey(3)\n\ ++ :KP_Next: DoKey(3)\n\ ++ :4: DoKey(4)\n\ ++ :KP_4: DoKey(4)\n\ ++ :KP_Left: DoKey(4)\n\ ++ :5: DoKey(5)\n\ ++ :KP_5: DoKey(5)\n\ ++ :KP_Begin: DoKey(5)\n\ ++ :6: DoKey(6)\n\ ++ :KP_6: DoKey(6)\n\ ++ :KP_Right: DoKey(6)\n\ ++ :7: DoKey(7)\n\ ++ :KP_7: DoKey(7)\n\ ++ :KP_Home: DoKey(7)\n\ ++ :8: DoKey(8)\n\ ++ :KP_8: DoKey(8)\n\ ++ :KP_Up: DoKey(8)\n\ ++ :9: DoKey(9)\n\ ++ :KP_9: DoKey(9)\n\ ++ :KP_Prior: DoKey(9)\n\ ++ :a: DoKey(a)\n\ ++ :b: DoKey(b)\n\ ++ :c: DoKey(c)\n\ ++ :d: DoKey(d)\n\ ++ :e: DoKey(e)\n\ ++ :f: DoKey(f)\n\ ++ Ctrlh: Delete()\n\ ++ Delete: Delete()\n\ ++ KP_Delete: Delete()\n\ ++ KP_Decimal: Delete()\n\ ++ :=: DoKey(=)\n\ ++ :KP_Enter: DoKey(=)\n\ ++ :Return: DoKey(=)" + ; + + diff --git a/sci-calculators/hexcalc/hexcalc-1.11-r1.ebuild b/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild similarity index 59% rename from sci-calculators/hexcalc/hexcalc-1.11-r1.ebuild rename to sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild index 06e3581b9a03..aa39bedb520a 100644 --- a/sci-calculators/hexcalc/hexcalc-1.11-r1.ebuild +++ b/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11-r1.ebuild,v 1.2 2007/07/22 07:29:44 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild,v 1.1 2010/06/22 13:40:00 jlec Exp $ -inherit eutils +EAPI="3" + +inherit eutils toolchain-funcs DESCRIPTION="A simple hex calculator for X" HOMEPAGE="ftp://ftp.x.org/R5contrib/" @@ -19,21 +21,22 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN} -src_unpack() { - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${PN}-order.diff +src_prepare() { + epatch ${FILESDIR}/${PN}-* || die } src_compile() { xmkmf || die - make || die + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + CCLINK="$(tc-getCC)" \ + LDOPTIONS="${LDFLAGS}" \ + || die } src_install() { - - dobin hexcalc + dobin hexcalc || die mv hexcalc.man hexcalc.1 - doman hexcalc.1 + doman hexcalc.1 || die }