From 3120ae01ac61f83196fbca7f499009570910e73a Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Thu, 18 Jan 2007 00:04:33 +0000 Subject: [PATCH] Fix bug with recent flex versions breaking build for bug #137223. Also patch Makefile to pass proper CFLAGS and not prestrip binaries. Package-Manager: portage-2.1.2_rc4-r9 --- app-misc/boxes/Manifest | 27 +++++++++++++++++--- app-misc/boxes/files/boxes-1.0.1-gentoo.diff | 24 ----------------- 2 files changed, 23 insertions(+), 28 deletions(-) delete mode 100644 app-misc/boxes/files/boxes-1.0.1-gentoo.diff diff --git a/app-misc/boxes/Manifest b/app-misc/boxes/Manifest index 6e5382d7bca5..6b7b690ef196 100644 --- a/app-misc/boxes/Manifest +++ b/app-misc/boxes/Manifest @@ -1,5 +1,24 @@ -MD5 a81dd7b11119a71f2a4b08ac1173d906 ChangeLog 1672 -MD5 753220408ce31a97b544dbb8911decb2 boxes-1.0.1.ebuild 781 +AUX boxes-1.0.1-Makefile.patch 1506 RMD160 54ca6a4bc520353cd14a6f19371c9b811444f20b SHA1 73f98d25a2437df8a7d371a1ce4246c02a6f0551 SHA256 b5784202767ac9cb91772df95a14cc736da67ddf08c098a2d94599cbf92234fa +MD5 b5150b7ba01f1314b22cb5bce9fca985 files/boxes-1.0.1-Makefile.patch 1506 +RMD160 54ca6a4bc520353cd14a6f19371c9b811444f20b files/boxes-1.0.1-Makefile.patch 1506 +SHA256 b5784202767ac9cb91772df95a14cc736da67ddf08c098a2d94599cbf92234fa files/boxes-1.0.1-Makefile.patch 1506 +AUX boxes-1.0.1-flex.patch 733 RMD160 d9160f2c5566ff6e75f829b354404f6823fb86f4 SHA1 12afa0ed52217a916f357d7baeca3e3d25b28ce2 SHA256 cd4886260be3b8444689c3109588e6caa4ff8dd86a0f6e709d5e317c6b121a6f +MD5 ecdfaafe34b7ed8d72587889fe346703 files/boxes-1.0.1-flex.patch 733 +RMD160 d9160f2c5566ff6e75f829b354404f6823fb86f4 files/boxes-1.0.1-flex.patch 733 +SHA256 cd4886260be3b8444689c3109588e6caa4ff8dd86a0f6e709d5e317c6b121a6f files/boxes-1.0.1-flex.patch 733 +DIST boxes-1.0.1.src.tar.gz 125071 RMD160 4c602d99c6a84fdba6ad89f88eb7c1126ddc9c86 SHA1 3e593d5fa13c0be4cd1b424c0d77becef67f71d0 SHA256 27d507c6419c724eabd18288881d4a426720754bb0832de4205bda65bdcfb67c +EBUILD boxes-1.0.1.ebuild 769 RMD160 98cc881b3404a2b273ad671510ca4a402ddaf8c2 SHA1 69e0af6d24803dc4d442d64b3ef1b3aaa939114f SHA256 a77e118b01ec40ec5dbeaa45e7d21d9191565057dc6118562b92b714e3c99a63 +MD5 5840729d13ca6edee57b58cc0c157119 boxes-1.0.1.ebuild 769 +RMD160 98cc881b3404a2b273ad671510ca4a402ddaf8c2 boxes-1.0.1.ebuild 769 +SHA256 a77e118b01ec40ec5dbeaa45e7d21d9191565057dc6118562b92b714e3c99a63 boxes-1.0.1.ebuild 769 +MISC ChangeLog 1986 RMD160 f903362fb8c7a10c3b525c0552f3ef541c4e4568 SHA1 4bc5efd893f76f312204ad7a0784aa862634644f SHA256 70503931242eac31e5a9f78391f514518f33ce4b64716cae8aa54ee203c1370b +MD5 b77d9d63205a5e6a0e3595b085365c78 ChangeLog 1986 +RMD160 f903362fb8c7a10c3b525c0552f3ef541c4e4568 ChangeLog 1986 +SHA256 70503931242eac31e5a9f78391f514518f33ce4b64716cae8aa54ee203c1370b ChangeLog 1986 +MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd MD5 0c131a7201c4670302767f93643876fa metadata.xml 165 -MD5 bf4032f1789c065bc41cb8e676754f98 files/boxes-1.0.1-gentoo.diff 877 -MD5 4239b8e99990692b95ae0b09df637519 files/digest-boxes-1.0.1 67 +RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 metadata.xml 165 +SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd metadata.xml 165 +MD5 97f050e4ad465d2e7646542e553dc5b6 files/digest-boxes-1.0.1 247 +RMD160 ab694177ff12a3b84348b282ef6af72ed8e72ffc files/digest-boxes-1.0.1 247 +SHA256 4c828a5bbf1a8ccbda89ecaf97de79aff2cab95ea9b4df9d183686eb4a3f9f61 files/digest-boxes-1.0.1 247 diff --git a/app-misc/boxes/files/boxes-1.0.1-gentoo.diff b/app-misc/boxes/files/boxes-1.0.1-gentoo.diff deleted file mode 100644 index 16330205cbdf..000000000000 --- a/app-misc/boxes/files/boxes-1.0.1-gentoo.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru boxes-1.0.1.orig/Makefile boxes-1.0.1/Makefile ---- boxes-1.0.1.orig/Makefile Sun May 20 16:19:18 2001 -+++ boxes-1.0.1/Makefile Sun May 20 16:19:39 2001 -@@ -51,7 +51,7 @@ - - - # The following line (GLOBALCONF) is the only line you should need to edit! --GLOBALCONF = /usr/local/share/boxes -+GLOBALCONF = /usr/share/boxes/boxes-config - BVERSION = 1.0.1 - - SNAPFILE = boxes-SNAP-$(shell date +%Y%m%d) -diff -ru boxes-1.0.1.orig/src/regexp/Makefile boxes-1.0.1/src/regexp/Makefile ---- boxes-1.0.1.orig/src/regexp/Makefile Sun May 20 16:19:18 2001 -+++ boxes-1.0.1/src/regexp/Makefile Sun May 20 16:21:01 2001 -@@ -32,7 +32,7 @@ - #============================================================================ - - --CFLAGS = -traditional -O -I. $(CFLAGS_ADDTL) -+CFLAGS = -O -I. $(CFLAGS_ADDTL) - - ALL_CL = regexp/regexp.c regexp/regsub.c - C_SRC = $(notdir $(ALL_CL)) -- 2.26.2