summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2014-06-26 12:26:59 +0000
committerMichael Palimaka <kensington@gentoo.org>2014-06-26 12:26:59 +0000
commit46a10acbbe404fe9ce5165bd8a06751df68c88b8 (patch)
tree1b219e31753a80134cb5ab52287d3cf877197f1f /app-misc
parentDrop old versions (diff)
downloadhistorical-46a10acbbe404fe9ce5165bd8a06751df68c88b8.tar.gz
historical-46a10acbbe404fe9ce5165bd8a06751df68c88b8.tar.bz2
historical-46a10acbbe404fe9ce5165bd8a06751df68c88b8.zip
Remove unused patches.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x06B1F38DCA45A1EC!
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/flasm/ChangeLog6
-rw-r--r--app-misc/flasm/Manifest23
-rw-r--r--app-misc/flasm/files/flasm-1.62-bison-2.patch254
-rw-r--r--app-misc/flasm/files/flasm-1.62-makefile.patch38
4 files changed, 20 insertions, 301 deletions
diff --git a/app-misc/flasm/ChangeLog b/app-misc/flasm/ChangeLog
index e165833f2bfa..faaeaa9b1021 100644
--- a/app-misc/flasm/ChangeLog
+++ b/app-misc/flasm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/flasm
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/flasm/ChangeLog,v 1.13 2014/01/17 18:02:25 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/flasm/ChangeLog,v 1.14 2014/06/26 12:26:47 kensington Exp $
+
+ 26 Jun 2014; Michael Palimaka <kensington@gentoo.org>
+ -files/flasm-1.62-bison-2.patch, -files/flasm-1.62-makefile.patch:
+ Remove unused patches.
17 Jan 2014; Chris Reffett <creffett@gentoo.org> flasm-1.63.ebuild:
EAPI bump
diff --git a/app-misc/flasm/Manifest b/app-misc/flasm/Manifest
index bfa094d93dd2..75923b00d4f4 100644
--- a/app-misc/flasm/Manifest
+++ b/app-misc/flasm/Manifest
@@ -1,19 +1,26 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX flasm-1.62-bison-2.patch 16828 SHA256 86c5fdb60d7195610a9be73cd968292cb51dd3211086c00b9d6c02168c3f2574 SHA512 63da73f466f7a4b8ccaac58a28e8dc5192e92886253f2d185cb52bf72190243ca99abc6bdbe3739b335d37191bd2a5ce3f08c63961341fea18b105d5ac5af03e WHIRLPOOL 261ea38e8ce0786f9a6b7851ae21516823346cb23800a033fa4a0ec433d2087aceef9b72915a66439db82a319ad17dfd876cb10f422c44324d85005823b75b48
-AUX flasm-1.62-makefile.patch 1325 SHA256 ae8ea0553e8ce78a27ac749a78070cedb96ea22b436e59236f2815a604490199 SHA512 b54fe818663819f4c5bc53b5e3e62a90571913ec919a5ab81218f59d39cddabea264e7678218fee87e1d78e76dc4b7617758f053f151890f14418e8a9ee82e8b WHIRLPOOL ebde393746230b2eb973273d36cdb7436d0e09abf1c8dd41f972e2469aef21e86da06b7483f24f337e0c01bbe0f3b8f6d42ed46e0c665d9b5df6c0edd7785205
AUX flasm-1.63-makefile.patch 938 SHA256 32c18823518b436f6cd38dda429477f815a24f2057317f4931ca2aec8e0b21d8 SHA512 3f693296eaa66ca6477db7d4c3c189162bf19c4fe8bcdc8563a7f4324c211eb69a79bbbe13f6eb9fc0f2743e248bae961fbd561628cbe80ede1f5ed6bd7c305f WHIRLPOOL f88f39a8694af4917744cb9396d6c0592b9edb6b0618e617c0f3f0f3b456ebaf64de4b3e627c5ab900b191236a82a9fe0a649a6a4f1f383d069934925245a1a4
DIST flasm-1.63.zip 111912 SHA256 df1273a506e2479cf95775197f5b7fa94e29fe1e0aae5aa190ed5bbebc4be5c6 SHA512 af53c8902bac9bc03a4274f51280abe7e595f19d8ee367c0237868634df58a42144bb6c335a99f860c494da90d483072c66064897ef1ad467b7621c648ca322a WHIRLPOOL e69860fdfa5be54235c0a02f2b77e30e4a2735b6785aa45260a2bdb55ff8a2edd366c1c9dadc93c7ac76886bd0070c4b6220a38365b6ba3135a1ade19a7ef103
EBUILD flasm-1.63.ebuild 938 SHA256 3cc8278dfb3373f8ecdd289e864ab859e8a11a515304942c47f18c1be405163d SHA512 8cdd3e695e066aa1863e8427cda52fcbc39b2bb147057a23e679bb0bc820d026d2231524e2b3108df5c275781a49271f27de38a86b9d2bdba95ccf8e7988acfb WHIRLPOOL 14f7debc581fae11d72d45f41ecaf1280f2b2707b754b13a1ccef2e24232ae86061e38361a5ebe26382ee94fbb39ee40f97bf8aaaad1532ba9fd984ea2f2650e
-MISC ChangeLog 2180 SHA256 e16b0ed3b75e6e7f7a5d01ef5f544fc55cf57a43ccd0beaa36cd9cf740410d77 SHA512 da8af4fa71ac96a620c608022cd3e0a9714ed03ea775d25f1340161b6b5bd8391169212d29a3d2c6f75848c6f2fc2b2ee2a78bfbd93d5a2888e7783da6dc9fda WHIRLPOOL 41f0f9607c9344eb42853bab6d6ce07d6d39bc6f4fe30eaeb6e09034688453127823943e802d3cf61941de06c00bd26357c2d83ff4c1904d0563fb7de6934daf
+MISC ChangeLog 2333 SHA256 deba97dca5c5ec6729ff96dd7092da8f8b1a74425e3cbfee664837a6b7a3cf54 SHA512 75dd2355e478040604afd426d405f86eb0fb9d5e1f41fab5c3872bbb06c50735d57c0786c02aa70ed3e75cba7f08f0ec5765ba7bde11446cd8fad614549411ea WHIRLPOOL 9b50cf05a65b1a3c3f97b81f013b43e78b01b1c2e6f576e484e8529909cbe5b9324db027b864d4a297524279b2d3b8a33921a303488c75f155542bbd8c8dd915
MISC metadata.xml 650 SHA256 04a79e030019e7763db9d9485b33db44958f0c9ec1a889a6a574c256733842a5 SHA512 f34a29c2cde616643f75d6aa95b4ae15bf70164828fddf2601cac5bec8659f5d9af6bc0a268a3372f32e872e26b3629e6fa541e5a6ac5ce1a9c334f2468268ad WHIRLPOOL 20e57f072f260869355979866e916ab7845ccde325c5fb82875aaf14d43052f867bb7c45cb844e115a20102360aaf65b2a25f47ec1e5503474d13bb44bba2fb5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iKYEAREIAGYFAlLZcBNfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1QHjACeNP2EcOS3Ak6KYLlgygQnGtWO
-e4kAni75WIW6e4dulaCqYEh8zWA4hlcg
-=ax+E
+iQJiBAEBCABMBQJTrBGKRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7PFND/42Eiblk3uOCxDQbFsexxBWsQhHrIhDpXOvg54VmEGWMVEimszaoZvrPxTw
+B3oDArVu3megzS1/6I36HxUUdHMEeTcGxfNYyDTHL4z8kYeoZ/fUDSy68G3tMo/8
+DPRAj/7+Wp+GlplmwUGqfmV4dWSZ/2bj96OFH9ASs0GSG9E54jw2Ji5UEdeLmcht
+GK/0IH4scAaM1VVJcwzVbjaz76JZUzS7NsEhyTfSWYzPGOJVnqulVrlCnTULtcsm
+cGWQ592Va82+/PqZ7ERoKZxh/Rqy7lpVFG4ccfJ+6BDLC1/oYMCNsJcZAFD34dcw
+JjFvqq0U4nGSQMybD8ZXDfYZ7FbxHOIHdFraYMkUVZqyNO1QoRxrukLdPsnQBIAe
+SHFjH5P9kmTn3Us10A1UjLen1G6mp7TRGAZ108vTyqXOdWJ+RnD9h4HUA6hTZwe3
+48tUo5iMefXtBT1ozTP4jUzw1UnQA2USlUa3Gf7sJyTJQbvDRroq0XEsKrZbhiCs
+8RI8ooRZelTsu09AT8NOG3d8DD4TA6RNqq+sbxPm34fW4lBiEopB7xyOOxiEPVx4
+DqfZXKrdZVmwJse8jKCucJ3XQVNrh4H/fVAnnqK1LQuXS/5Yy1gqBaSDvgfID/oh
+lNPEZ5c7yHlP3xluMCQCnmyyd9EkWKPHSR4rNX9gc61v6M5MuA==
+=XTlg
-----END PGP SIGNATURE-----
diff --git a/app-misc/flasm/files/flasm-1.62-bison-2.patch b/app-misc/flasm/files/flasm-1.62-bison-2.patch
deleted file mode 100644
index 65f7a30f02f1..000000000000
--- a/app-misc/flasm/files/flasm-1.62-bison-2.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-diff -up flasm-1.62/assembler.y.midrule flasm-1.62/assembler.y
---- flasm-1.62/assembler.y.midrule 2008-12-20 22:44:50.000000000 +0100
-+++ flasm-1.62/assembler.y 2008-12-20 22:54:03.000000000 +0100
-@@ -605,24 +605,24 @@ finally_opt
-
- trycatchfinally
- : TRY name_opt {
-- $$ = writeByte(SWFACTION_TRY);
-+ $<num>$ = writeByte(SWFACTION_TRY);
- /* action length */
-- $$ += writeShort(strlen($2)+8);
-+ $<num>$ += writeShort(strlen($2)+8);
- /* zero flag */
-- $$ += writeByte(0);
-+ $<num>$ += writeByte(0);
- /* zero try length */
-- $$ += writeShort(0);
-+ $<num>$ += writeShort(0);
- /* zero catch length */
-- $$ += writeShort(0);
-+ $<num>$ += writeShort(0);
- /* zero finally length */
-- $$ += writeShort(0);
-+ $<num>$ += writeShort(0);
- /* error variable name */
-- $$ += writeString($2);
-+ $<num>$ += writeString($2);
- }
-
-- statements_opt { $$ = $<num>3 + $4; patchLength($$ - 6, $4); }
-- catch_opt { $$ = $<num>5 + $6; patchLength($$ - 8, $6); }
-- finally_opt { $$ = $<num>7 + $8; patchLength($$ - 10, $8); }
-+ statements_opt { $<num>$ = $<num>3 + $4; patchLength($<num>$ - 6, $4); }
-+ catch_opt { $<num>$ = $<num>5 + $6; patchLength($<num>$ - 8, $6); }
-+ finally_opt { $<num>$ = $<num>7 + $8; patchLength($<num>$ - 10, $8); }
- END {
- byte flag = 0;
- $$ = $<num>9;
-@@ -634,24 +634,24 @@ trycatchfinally
- }
-
- | TRY register {
-- $$ = writeByte(SWFACTION_TRY);
-+ $<num>$ = writeByte(SWFACTION_TRY);
- /* action length */
-- $$ += writeShort(8);
-+ $<num>$ += writeShort(8);
- /* zero flag */
-- $$ += writeByte(0);
-+ $<num>$ += writeByte(0);
- /* zero try length */
-- $$ += writeShort(0);
-+ $<num>$ += writeShort(0);
- /* zero catch length */
-- $$ += writeShort(0);
-+ $<num>$ += writeShort(0);
- /* zero finally length */
-- $$ += writeShort(0);
-+ $<num>$ += writeShort(0);
- /* error register number */
-- $$ += writeByte((byte) $2);
-+ $<num>$ += writeByte((byte) $2);
- }
-
-- statements_opt { $$ = $<num>3 + $4; patchLength($$ - 6, $4); }
-- catch_opt { $$ = $<num>5 + $6; patchLength($$ - 8, $6); }
-- finally_opt { $$ = $<num>7 + $8; patchLength($$ - 10, $8); }
-+ statements_opt { $<num>$ = $<num>3 + $4; patchLength($<num>$ - 6, $4); }
-+ catch_opt { $<num>$ = $<num>5 + $6; patchLength($<num>$ - 8, $6); }
-+ finally_opt { $<num>$ = $<num>7 + $8; patchLength($<num>$ - 10, $8); }
- END {
- byte flag = 4;
- $$ = $<num>9;
-@@ -707,25 +707,25 @@ name_opt
-
- function
- : FUNCTION name_opt {
-- $$ = writeByte(SWFACTION_DEFINEFUNCTION);
-+ $<num>$ = writeByte(SWFACTION_DEFINEFUNCTION);
- /* zero block length */
-- $$ += writeShort(0);
-- $$ += writeString($2);
-+ $<num>$ += writeShort(0);
-+ $<num>$ += writeString($2);
- }
-
- '(' function_args ')' {
- unsigned int i;
- numArgs = $5;
-
-- $$ = $<num>3 + writeShort(numArgs);
-+ $<num>$ = $<num>3 + writeShort(numArgs);
-
- for(i = 0; i < numArgs; ++i)
-- $$ += writeString(func_args[i]);
-+ $<num>$ += writeString(func_args[i]);
-
- /* zero function length */
-- $$ += writeShort(0);
-+ $<num>$ += writeShort(0);
- /* patch block length */
-- patchLength($$-3, $$-3);
-+ patchLength($<num>$-3, $<num>$-3);
- }
-
- statements_opt END {
-@@ -837,25 +837,25 @@ autoregarglist
-
- function2
- : FUNCTION2 name_opt {
-- $$ = writeByte(SWFACTION_DEFINEFUNCTION2);
-+ $<num>$ = writeByte(SWFACTION_DEFINEFUNCTION2);
- /* zero block length */
-- $$ += writeShort(0);
-+ $<num>$ += writeShort(0);
- /* function name */
-- $$ += writeString($2);
-+ $<num>$ += writeString($2);
- curFunc++;
- memset(regfunc_args[curFunc], 0, sizeof (regfunc_args[curFunc]));
- numArgs = 0;
- /* zero num of function arguments */
-- $$ += writeShort(numArgs);
-+ $<num>$ += writeShort(numArgs);
- /* allocate zero registers */
- numRegisters[curFunc] = 0;
-- $$ += writeByte(numRegisters[curFunc]);
-+ $<num>$ += writeByte(numRegisters[curFunc]);
- /* zero automatic register flags */
-- $$ += writeShort(0);
-+ $<num>$ += writeShort(0);
- }
-
- '(' regarglist ')' {
-- $$ = $<num>3 + $5;
-+ $<num>$ = $<num>3 + $5;
- /* patch num of function arguments */
- patchLength($5 + 3, numArgs);
- autoregFlags = 0;
-@@ -866,9 +866,9 @@ function2
- byte curautoreg = 1;
- unsigned int i;
-
-- $$ = $<num>7;
-+ $<num>$ = $<num>7;
- /* zero body length */
-- $$ += writeShort(0);
-+ $<num>$ += writeShort(0);
-
- /* make sure auto registers are allocated in the right order */
- for (i = 0; i < MAX_AUTO_REGS; i++) {
-@@ -883,9 +883,9 @@ function2
- }
-
- /* patch automatic register flags */
-- patchLength($$ - $<num>3, autoregFlags);
-+ patchLength($<num>$ - $<num>3, autoregFlags);
- /* patch block length */
-- patchLength($$ - 3, $$ - 3);
-+ patchLength($<num>$ - 3, $<num>$ - 3);
- }
-
- statements_opt END {
-@@ -905,11 +905,11 @@ function2
-
- with
- : WITH {
-- $$ = writeByte(SWFACTION_WITH);
-+ $<num>$ = writeByte(SWFACTION_WITH);
- /* length of with action */
-- $$ += writeShort(2);
-+ $<num>$ += writeShort(2);
- /* length of with block - will be patched */
-- $$ += writeShort(0);
-+ $<num>$ += writeShort(0);
- }
-
- statements_opt END {
-@@ -921,9 +921,9 @@ with
-
- settarget
- : SETTARGET STRING {
-- $$ = writeByte(SWFACTION_SETTARGET);
-- $$ += writeShort(strlen($2)+1);
-- $$ += writeString($2);
-+ $<num>$ = writeByte(SWFACTION_SETTARGET);
-+ $<num>$ += writeShort(strlen($2)+1);
-+ $<num>$ += writeString($2);
- }
-
- statements_opt END {
-@@ -934,7 +934,7 @@ settarget
- ;
-
- settargetexpression
-- : SETTARGETEXPR { $$ = writeByte(SWFACTION_SETTARGETEXPRESSION); }
-+ : SETTARGETEXPR { $<num>$ = writeByte(SWFACTION_SETTARGETEXPRESSION); }
- statements_opt END {
- $$ = $3 + writeByte(SWFACTION_SETTARGET);
- $$ += $<num>2 + writeShort(1);
-@@ -946,9 +946,9 @@ ifframeloadedexpression
- : IFFRAMELOADEDEXPR {
- if (frameloadedStart>-1)
- yyerror("IfFrameLoaded actions can't be nested");
-- $$ = writeByte(SWFACTION_IFFRAMELOADEDEXPRESSION);
-- $$ += writeShort(1);
-- $$ += writeByte(0);
-+ $<num>$ = writeByte(SWFACTION_IFFRAMELOADEDEXPRESSION);
-+ $<num>$ += writeShort(1);
-+ $<num>$ += writeByte(0);
- frameloadedStart = numActions;
- }
-
-@@ -963,10 +963,10 @@ ifframeloaded
- : IFFRAMELOADED INTEGER {
- if (frameloadedStart>-1)
- yyerror("IfFrameLoaded actions can't be nested");
-- $$ = writeByte(SWFACTION_IFFRAMELOADED);
-- $$ += writeShort(3);
-- $$ += writeShort($2);
-- $$ += writeByte(0);
-+ $<num>$ = writeByte(SWFACTION_IFFRAMELOADED);
-+ $<num>$ += writeShort(3);
-+ $<num>$ += writeShort($2);
-+ $<num>$ += writeByte(0);
- frameloadedStart = numActions;
- }
-
-@@ -1199,9 +1199,9 @@ opcode
- constant_list_opt { $$ = writeConstants(); }
-
- | PUSH {
-- $$ = writeByte(SWFACTION_PUSHDATA);
-+ $<num>$ = writeByte(SWFACTION_PUSHDATA);
- /* length */
-- $$ += writeShort(0);
-+ $<num>$ += writeShort(0);
- }
-
- push_list {
-@@ -1212,10 +1212,10 @@ opcode
- | SWFACTION HEX {
- if (xtoi($2)>0xff)
- yyerror("Action code out of range");
-- $$ = writeByte((char)xtoi($2));
-+ $<num>$ = writeByte((char)xtoi($2));
- if (xtoi($2)>=0x80)
- /* length */
-- $$ += writeShort(0);
-+ $<num>$ += writeShort(0);
- }
-
- hexlist_opt {
-
diff --git a/app-misc/flasm/files/flasm-1.62-makefile.patch b/app-misc/flasm/files/flasm-1.62-makefile.patch
deleted file mode 100644
index ecc3d3e91ad7..000000000000
--- a/app-misc/flasm/files/flasm-1.62-makefile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.orig 2010-02-23 11:13:31.000000000 +0100
-+++ Makefile 2010-02-23 11:13:37.000000000 +0100
-@@ -1,6 +1,4 @@
- UNAME = $(shell uname)
--CC = gcc
--CFLAGS = -g -Wall -O2
- LIBS = -lz
- OFILES = util.o keywords.o flasm.o unflasm.o lex.yy.o assembler.tab.o
- GARBAGE = assembler.tab.* lex.yy.c memwatch.o gmon.out memwatch.log core
-@@ -9,8 +7,6 @@
- ifneq (,$(findstring debug,$(MAKECMDGOALS)))
- CFLAGS += -DMEMWATCH -pg -p -pedantic -W -Wcast-align -Wcast-qual -Wshadow -Wnested-externs -Wstrict-prototypes -Waggregate-return -Wmissing-prototypes -Wpointer-arith
- OFILES += memwatch.o
--else
-- CFLAGS += -s
- endif
-
- # executable should not depend on cygwin.dll
-@@ -26,13 +22,15 @@
- -rm -f ${OFILES} ${GARBAGE}
-
- flasm: ${OFILES}
-- ${CC} $(CFLAGS) -o flasm ${OFILES} ${LIBS}
-+ ${CC} $(CFLAGS) $(LDFLAGS) -o flasm ${OFILES} ${LIBS}
-
--assembler.tab.c assembler.tab.h: assembler.y
-+assembler.tab.c: assembler.tab.h
-+
-+assembler.tab.h: assembler.y
- bison --defines --debug assembler.y
-
- lex.yy.c: assembler.flex assembler.tab.h
- flex -i assembler.flex
-
- keywords.c: keywords.gperf assembler.tab.h
-- gperf --language=ANSI-C -t -T -E -o -k 1,$$,2,5 -S8 keywords.gperf > keywords.c
-\ No newline at end of file
-+ gperf --language=ANSI-C -t -T -E -o -k 1,$$,2,5 -S8 keywords.gperf > keywords.c