From: Daniel Black Date: Thu, 19 Apr 2007 20:43:38 +0000 (+0000) Subject: version bump thanks to Sebastian Biallas in bug #169829 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=08352d62702ee802fb0ef7ead330f6f4091eb3c2;p=gentoo.git version bump thanks to Sebastian Biallas in bug #169829 Package-Manager: portage-2.1.2.2 --- diff --git a/app-editors/hteditor/ChangeLog b/app-editors/hteditor/ChangeLog index 82388dad5250..66e9cc04c541 100644 --- a/app-editors/hteditor/ChangeLog +++ b/app-editors/hteditor/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-editors/hteditor # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/ChangeLog,v 1.26 2007/03/08 11:18:29 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/ChangeLog,v 1.27 2007/04/19 20:43:38 dragonheart Exp $ + +*hteditor-2.0.3 (19 Apr 2007) + + 19 Apr 2007; Daniel Black + -files/hteditor-0.9.4-asneeded.patch, + -files/hteditor-2.0_beta2-optionallzo.patch, + -files/hteditor-2.0_beta2-regexneedstdlib.patch, -hteditor-0.9.1.ebuild, + -hteditor-0.9.4.ebuild, -hteditor-2.0_beta2.ebuild, + +hteditor-2.0.3.ebuild: + version bump thanks to Sebastian Biallas in bug #169829 *hteditor-2.0 (08 Mar 2007) diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest index 2686ccd35ca8..676410765fc1 100644 --- a/app-editors/hteditor/Manifest +++ b/app-editors/hteditor/Manifest @@ -1,51 +1,26 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX hteditor-0.9.4-asneeded.patch 1367 RMD160 a2ac52a510a262847f8f7da93bf6291b4a3e4f40 SHA1 c3a7af651f01339148b3700130c22fcd0ece1428 SHA256 a957feef530297a05e9b7b724be4333b8e6037ae8713c2eab62b1e0cade34bb7 -MD5 5efe40552a2abbd635d74ba8f16bc9f0 files/hteditor-0.9.4-asneeded.patch 1367 -RMD160 a2ac52a510a262847f8f7da93bf6291b4a3e4f40 files/hteditor-0.9.4-asneeded.patch 1367 -SHA256 a957feef530297a05e9b7b724be4333b8e6037ae8713c2eab62b1e0cade34bb7 files/hteditor-0.9.4-asneeded.patch 1367 -AUX hteditor-2.0_beta2-optionallzo.patch 6041 RMD160 73b8df07cabf8549c995848ce15882561c23cc5f SHA1 2cf1c6c85782c4ff1ac2cd8cfb753fb660297beb SHA256 6e54cfd21f09f83693141a72b48e5d458e9836fdee1d57f2d8c16987c7134b90 -MD5 1c3879512b2ca5e9a9c6b873b2b38a89 files/hteditor-2.0_beta2-optionallzo.patch 6041 -RMD160 73b8df07cabf8549c995848ce15882561c23cc5f files/hteditor-2.0_beta2-optionallzo.patch 6041 -SHA256 6e54cfd21f09f83693141a72b48e5d458e9836fdee1d57f2d8c16987c7134b90 files/hteditor-2.0_beta2-optionallzo.patch 6041 -AUX hteditor-2.0_beta2-regexneedstdlib.patch 754 RMD160 7424d2f9379e121501ad63e226afd5220e6ad19b SHA1 29504c76b75cd28557ab3802957002f650af2f01 SHA256 d196f35aae6b7a2700a7d49f42f9570fedf361d8f9571de7c85da96a20a4e9a1 -MD5 eef74700249e5ca5e3eec7a764e4eca8 files/hteditor-2.0_beta2-regexneedstdlib.patch 754 -RMD160 7424d2f9379e121501ad63e226afd5220e6ad19b files/hteditor-2.0_beta2-regexneedstdlib.patch 754 -SHA256 d196f35aae6b7a2700a7d49f42f9570fedf361d8f9571de7c85da96a20a4e9a1 files/hteditor-2.0_beta2-regexneedstdlib.patch 754 AUX hteditor-gcc41.patch 300 RMD160 c2b2737169141915b43b21b720b71a8ec4950e35 SHA1 0e20c3306bc92710eeaa47ccd611f66af8566a53 SHA256 4b7d8d1861d4695626f4919fdaca5f9e1bd37a3025c3becd2902ff4e41f4caa0 MD5 c9f2bfe29da030ed0855dd5745855e41 files/hteditor-gcc41.patch 300 RMD160 c2b2737169141915b43b21b720b71a8ec4950e35 files/hteditor-gcc41.patch 300 SHA256 4b7d8d1861d4695626f4919fdaca5f9e1bd37a3025c3becd2902ff4e41f4caa0 files/hteditor-gcc41.patch 300 DIST ht-0.9.0.tar.bz2 765072 RMD160 63d7d2dfef96d231a6da1fdb86d35183bc7d8e3d SHA1 0a70c15936c2f4070cb3d173e3ff58041d7c6712 SHA256 52a174020c5b604b0e5ebee3d056ad1f6ed85480a51d4cd7c8b9b8de20af66bb -DIST ht-0.9.1.tar.bz2 737690 RMD160 dd14227fe5c7d93f5db2965fcd61e832f2f1bbd9 SHA1 f77723739a929ad48ba5381fd6882d1d54a7cd55 SHA256 8b2aca19b1a81af9191df812d4b2c7f38492f24ea2725262d2e2f335d6e14b78 -DIST ht-0.9.4.tar.bz2 773249 RMD160 01670635667856bf28b3c72296d34a99ed10b141 SHA1 edf5058c9791716c812a55d6d277613ec6a5ce6f SHA256 dc594b08ec4f5997269d217875fc8a9bef43dc316151e45b949a3942ea6af9ec +DIST ht-2.0.3.tar.bz2 855191 RMD160 672fb8dad95a4cc17a35f6aac1d767d8fe2f3ca8 SHA1 a3d7e6ec00ded45bd0feaea7689c32b855c59b08 SHA256 485d9b6a3c442811c0c464ee143d4a04b5b1118d99935bf3a56a5086bc2cf2c1 DIST ht-2.0.tar.bz2 854003 RMD160 06f61f6b09a31d04830c57c347a21160ac2e60ee SHA1 f8523815854b1ccc2a364babd0521533f6c5a194 SHA256 1d0025030fb9bb22b8b14043611fff5003e8cbc3a9689977b79c14eba0c6829f -DIST ht-2.0beta2.tar.bz2 851033 RMD160 d6b9111c1a0db98e8f3600e8a07280aef6d10549 SHA1 20d96a94f6d74a5fbd13db5e06cdb0995fae2b6d SHA256 46945bec0a4d4e346e7237ff23393f2415d10eda2de49a9cdf52b43d8e39d379 EBUILD hteditor-0.9.0.ebuild 939 RMD160 363821953256d3b0361f88fbd29c5e818470b93d SHA1 8e9e80e461fdff120fed0579faf31890a6a4be20 SHA256 610fd9b4b661fe9cdcc5898a88b4c05918c82bbe600cd9f3e95a9d178b49a2da MD5 2fb26c48d6e3f7c68d1ff1f9c74d9d74 hteditor-0.9.0.ebuild 939 RMD160 363821953256d3b0361f88fbd29c5e818470b93d hteditor-0.9.0.ebuild 939 SHA256 610fd9b4b661fe9cdcc5898a88b4c05918c82bbe600cd9f3e95a9d178b49a2da hteditor-0.9.0.ebuild 939 -EBUILD hteditor-0.9.1.ebuild 944 RMD160 52b4c0f791e2a8e256f846ff7198456b6a377312 SHA1 8fc7285c9da94fd0570ab90cbc9beeffcea22c6a SHA256 c0597dcc5e94b1cf9d848bc293c107aa61a1c09ec885f7d8a51f4cf43774af5a -MD5 b440cbb8dcfde384b9096d556873b564 hteditor-0.9.1.ebuild 944 -RMD160 52b4c0f791e2a8e256f846ff7198456b6a377312 hteditor-0.9.1.ebuild 944 -SHA256 c0597dcc5e94b1cf9d848bc293c107aa61a1c09ec885f7d8a51f4cf43774af5a hteditor-0.9.1.ebuild 944 -EBUILD hteditor-0.9.4.ebuild 966 RMD160 13dc5c7449d7e6071e6897e48185e0d875a85741 SHA1 f42e2066531595451505cfc2a2dfaa152d3767e3 SHA256 964238df55c8fcb612b5fe9e88abd9ee9c7b820f87d62912951fb4d474c3ccfc -MD5 bb45115e97552210683d595a9495d953 hteditor-0.9.4.ebuild 966 -RMD160 13dc5c7449d7e6071e6897e48185e0d875a85741 hteditor-0.9.4.ebuild 966 -SHA256 964238df55c8fcb612b5fe9e88abd9ee9c7b820f87d62912951fb4d474c3ccfc hteditor-0.9.4.ebuild 966 +EBUILD hteditor-2.0.3.ebuild 901 RMD160 e9b48fb30481df9824a993f92b6d6acef3d7fc1b SHA1 f1587f1b519bfe4202035a4935cef4261fd11753 SHA256 02bb5244c27b9022e78ec23f7f79dbee9293c108b5975e244fc6feb0f4504162 +MD5 3ce92e713c46689b823319503772169e hteditor-2.0.3.ebuild 901 +RMD160 e9b48fb30481df9824a993f92b6d6acef3d7fc1b hteditor-2.0.3.ebuild 901 +SHA256 02bb5244c27b9022e78ec23f7f79dbee9293c108b5975e244fc6feb0f4504162 hteditor-2.0.3.ebuild 901 EBUILD hteditor-2.0.ebuild 899 RMD160 c3941c200a7dbdd9808af9702791963ca83acebc SHA1 1144643aa549c86a0d46e2cbf0b77a5e25d0aac8 SHA256 8906479dfbd9f1731e345bdf378b75ac455de300217847f6be08ea6c718564c5 MD5 16755ae0f4b23bfa68e8aa0ece14470d hteditor-2.0.ebuild 899 RMD160 c3941c200a7dbdd9808af9702791963ca83acebc hteditor-2.0.ebuild 899 SHA256 8906479dfbd9f1731e345bdf378b75ac455de300217847f6be08ea6c718564c5 hteditor-2.0.ebuild 899 -EBUILD hteditor-2.0_beta2.ebuild 1053 RMD160 616928b28c7021185323eca0ed3e1f4ae0d514f9 SHA1 885bc4394b7a9c57f09c5b4ed8e46b9b6698aef0 SHA256 20c98c86164a27efe522312d5b65ba942baed8dba1fea61d96854713cd49c1d7 -MD5 0f1283d05d4c8d7ec5f7af5f53cecd4c hteditor-2.0_beta2.ebuild 1053 -RMD160 616928b28c7021185323eca0ed3e1f4ae0d514f9 hteditor-2.0_beta2.ebuild 1053 -SHA256 20c98c86164a27efe522312d5b65ba942baed8dba1fea61d96854713cd49c1d7 hteditor-2.0_beta2.ebuild 1053 -MISC ChangeLog 4398 RMD160 d94611d1644cabd136f5e37a4c286ee57073971d SHA1 72fa880aff5b34bbff22fa6c265862dbb05c148f SHA256 74ed959e4264eebd8a9375dee742a782d02627da4dfa6be7f65732501ab05a0f -MD5 278d9cb6cee091d404c52a2e6fbd0d8f ChangeLog 4398 -RMD160 d94611d1644cabd136f5e37a4c286ee57073971d ChangeLog 4398 -SHA256 74ed959e4264eebd8a9375dee742a782d02627da4dfa6be7f65732501ab05a0f ChangeLog 4398 +MISC ChangeLog 4783 RMD160 a38d49bb3b92b474da7a03aeab0408f87386d139 SHA1 93b1fe451d2bf929c891446bc9bdfcb05ddce58e SHA256 5613d491eb8d500caa8a020e5eb3a1160b475f817e270df1fbc1551d5bfbb394 +MD5 267ff35c8e933aee9c5a5200d3c25fef ChangeLog 4783 +RMD160 a38d49bb3b92b474da7a03aeab0408f87386d139 ChangeLog 4783 +SHA256 5613d491eb8d500caa8a020e5eb3a1160b475f817e270df1fbc1551d5bfbb394 ChangeLog 4783 MISC metadata.xml 230 RMD160 df46c6fe6aecbf764587ac6f76f0bbb5ba9a62d7 SHA1 410310eb018b0f84121dab6c9520675be6985a5d SHA256 ce5541de8411e3693cbcbe7a9a68cf451206ab15240cedcbd49f6f67c24ef88b MD5 5e83aa40741c7ae458653fb9ed8b7805 metadata.xml 230 RMD160 df46c6fe6aecbf764587ac6f76f0bbb5ba9a62d7 metadata.xml 230 @@ -53,22 +28,9 @@ SHA256 ce5541de8411e3693cbcbe7a9a68cf451206ab15240cedcbd49f6f67c24ef88b metadata MD5 1f963330d43ecec43768abe2bffb0742 files/digest-hteditor-0.9.0 229 RMD160 f646b5783d391d3d74ba644e40eda580636c5791 files/digest-hteditor-0.9.0 229 SHA256 7871dc8f77625dc4c054de8ad8d2a1c79a30f921a8451b9fae6a33f48ae73674 files/digest-hteditor-0.9.0 229 -MD5 6cfda386c971fc743e63d324d97337fa files/digest-hteditor-0.9.1 229 -RMD160 4db1a6ac3aff21cda0d81d455b4d9677c58aa37e files/digest-hteditor-0.9.1 229 -SHA256 2b38df3097f67c9faf8cd96cff005a3ff8d8f5ec7336f1afff06e6263c6261a4 files/digest-hteditor-0.9.1 229 -MD5 0470cf04455a9baf0e0163f4b72be627 files/digest-hteditor-0.9.4 229 -RMD160 f08c433c7d60a770e66f75bbeeb15e6ff2bc0e15 files/digest-hteditor-0.9.4 229 -SHA256 0e1e4a9cb893b1c5dc9811c75d23513e99e2301c2fa3d2e9b1bd18768f6ccf94 files/digest-hteditor-0.9.4 229 MD5 16bf92c11487c297e8f60a924183c506 files/digest-hteditor-2.0 223 RMD160 f1d7303af85c4e55a5d61a4a497475207411fd7e files/digest-hteditor-2.0 223 SHA256 08a041cf83dd95437c9978b47676033e344fe4e53c844e4bd19936e0bf58a564 files/digest-hteditor-2.0 223 -MD5 5a470a63ce26c084d65b7cdf55644e6d files/digest-hteditor-2.0_beta2 238 -RMD160 e7386e7172ce360cc31539ec944a81ae780e7129 files/digest-hteditor-2.0_beta2 238 -SHA256 c1aaf7f2b977f1ecdb58daba54e569fc56f92093d89872fe291fba045384c37d files/digest-hteditor-2.0_beta2 238 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF7/EemdTrptrqvGERAjN6AJ4xN/Ys7biwmfBItGnzuYshEmbyyACcCY4Y -Zx/qky4oMSMYmU0lYvIbHzc= -=mqZ7 ------END PGP SIGNATURE----- +MD5 12fe6d9f5281c9347e5bbe44e342ceb8 files/digest-hteditor-2.0.3 229 +RMD160 1676abb5e44761aa3cb9a22d9bfabda3535c4823 files/digest-hteditor-2.0.3 229 +SHA256 9b949ffb4abe9ce15b86c8d4e724656c4da79a7a613d3b3fd73f278552bec9d0 files/digest-hteditor-2.0.3 229 diff --git a/app-editors/hteditor/files/digest-hteditor-0.9.1 b/app-editors/hteditor/files/digest-hteditor-0.9.1 deleted file mode 100644 index 36129542fd79..000000000000 --- a/app-editors/hteditor/files/digest-hteditor-0.9.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 2dd4bf6ae959b2ed2c9d8373164d2693 ht-0.9.1.tar.bz2 737690 -RMD160 dd14227fe5c7d93f5db2965fcd61e832f2f1bbd9 ht-0.9.1.tar.bz2 737690 -SHA256 8b2aca19b1a81af9191df812d4b2c7f38492f24ea2725262d2e2f335d6e14b78 ht-0.9.1.tar.bz2 737690 diff --git a/app-editors/hteditor/files/digest-hteditor-0.9.4 b/app-editors/hteditor/files/digest-hteditor-0.9.4 deleted file mode 100644 index eb013850336c..000000000000 --- a/app-editors/hteditor/files/digest-hteditor-0.9.4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 00031f3d71596e2874ec6bd066da9054 ht-0.9.4.tar.bz2 773249 -RMD160 01670635667856bf28b3c72296d34a99ed10b141 ht-0.9.4.tar.bz2 773249 -SHA256 dc594b08ec4f5997269d217875fc8a9bef43dc316151e45b949a3942ea6af9ec ht-0.9.4.tar.bz2 773249 diff --git a/app-editors/hteditor/files/digest-hteditor-2.0.3 b/app-editors/hteditor/files/digest-hteditor-2.0.3 new file mode 100644 index 000000000000..1a4a6054d58c --- /dev/null +++ b/app-editors/hteditor/files/digest-hteditor-2.0.3 @@ -0,0 +1,3 @@ +MD5 8ede64d20b4671fa218f6bc499db64ee ht-2.0.3.tar.bz2 855191 +RMD160 672fb8dad95a4cc17a35f6aac1d767d8fe2f3ca8 ht-2.0.3.tar.bz2 855191 +SHA256 485d9b6a3c442811c0c464ee143d4a04b5b1118d99935bf3a56a5086bc2cf2c1 ht-2.0.3.tar.bz2 855191 diff --git a/app-editors/hteditor/files/digest-hteditor-2.0_beta2 b/app-editors/hteditor/files/digest-hteditor-2.0_beta2 deleted file mode 100644 index 82692d1122f7..000000000000 --- a/app-editors/hteditor/files/digest-hteditor-2.0_beta2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 54c5b419caf3b30d23c05f6e17160991 ht-2.0beta2.tar.bz2 851033 -RMD160 d6b9111c1a0db98e8f3600e8a07280aef6d10549 ht-2.0beta2.tar.bz2 851033 -SHA256 46945bec0a4d4e346e7237ff23393f2415d10eda2de49a9cdf52b43d8e39d379 ht-2.0beta2.tar.bz2 851033 diff --git a/app-editors/hteditor/files/hteditor-0.9.4-asneeded.patch b/app-editors/hteditor/files/hteditor-0.9.4-asneeded.patch deleted file mode 100644 index 425b27e2d8e0..000000000000 --- a/app-editors/hteditor/files/hteditor-0.9.4-asneeded.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.in.orig 2006-10-29 19:44:25.000000000 +1100 -+++ configure.in 2006-10-29 19:45:02.000000000 +1100 -@@ -147,9 +147,9 @@ - fi - - dnl Makefile vars. --HT_LDFLAGS="$HT_LIBS $HT_LDFLAGS" - AC_SUBST(IO_DIR) - AC_SUBST(HT_LDFLAGS) -+AC_SUBST(HT_LIBS) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST ---- Makefile.am.orig 2006-10-29 19:44:31.000000000 +1100 -+++ Makefile.am 2006-10-29 19:45:38.000000000 +1100 -@@ -17,9 +17,8 @@ - - INCLUDES = -I$(srcdir)/$(ANALYSER_DIR) -I$(srcdir)/$(ASM_DIR) -I$(srcdir)/$(INFO_DIR) -I$(srcdir)/$(IO_DIR) -I$(srcdir)/$(COMIO_DIR) -I$(srcdir)/$(OUTPUT_DIR) -I$(srcdir)/$(EVAL_DIR) -I$(srcdir)/$(MINILZO_DIR) -I$(srcdir)/$(SRT_DIR) -I$(srcdir) - --ht_LDADD = $(ANALYSER_DIR)/libanalyser.a $(ASM_DIR)/libasm.a $(INFO_DIR)/libinfo.a $(IO_DIR)/libhtio.a $(OUTPUT_DIR)/liboutput.a $(COMIO_DIR)/libcomio.a $(EVAL_DIR)/libhteval.a $(MINILZO_DIR)/liblzo.a $(SRT_DIR)/libsrt.a -+ht_LDADD = $(ANALYSER_DIR)/libanalyser.a $(ASM_DIR)/libasm.a $(INFO_DIR)/libinfo.a $(IO_DIR)/libhtio.a $(OUTPUT_DIR)/liboutput.a $(COMIO_DIR)/libcomio.a $(EVAL_DIR)/libhteval.a $(MINILZO_DIR)/liblzo.a $(SRT_DIR)/libsrt.a @HT_LIBS@ - ht_LDFLAGS = @HT_LDFLAGS@ --ht_LIBS = @HT_LIBS@ - - ht_SOURCES = htdoc.c htdoc.h blockop.cc blockop.h coff_s.h common.cc common.h \ - config.h cstream.cc cstream.h demangle.h elfstruc.h htendian.cc \ diff --git a/app-editors/hteditor/files/hteditor-2.0_beta2-optionallzo.patch b/app-editors/hteditor/files/hteditor-2.0_beta2-optionallzo.patch deleted file mode 100644 index 0384d717181e..000000000000 --- a/app-editors/hteditor/files/hteditor-2.0_beta2-optionallzo.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff -ru ht-2.0beta2.orig/config.h.in ht-2.0beta2/config.h.in ---- ht-2.0beta2.orig/config.h.in 2006-11-24 02:08:37.000000000 +1100 -+++ ht-2.0beta2/config.h.in 2007-01-27 17:42:22.000000000 +1100 -@@ -18,6 +18,12 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_INTTYPES_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_LZO1X_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_LZO_LZO1X_H -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_MEMORY_H - -@@ -48,6 +54,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_UNISTD_H - -+/* Name of package */ -+#undef PACKAGE -+ - /* Define to the address where bug reports for this package should be sent. */ - #undef PACKAGE_BUGREPORT - -@@ -81,6 +90,12 @@ - /* Location of io/$IO_DIR/types.h */ - #undef SYSTEM_OSAPI_SPECIFIC_TYPES_HDR - -+/* whether to use the included minilzo */ -+#undef USE_MINILZO -+ -+/* Version number of package */ -+#undef VERSION -+ - /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ - #undef YYTEXT_POINTER -diff -ru ht-2.0beta2.orig/cstream.cc ht-2.0beta2/cstream.cc ---- ht-2.0beta2.orig/cstream.cc 2006-06-12 06:19:23.000000000 +1000 -+++ ht-2.0beta2/cstream.cc 2007-01-27 17:42:22.000000000 +1100 -@@ -22,7 +22,13 @@ - #include "htdebug.h" - #include "except.h" - #include "endianess.h" --#include "minilzo.h" -+# ifdef USE_MINILZO -+# include "minilzo/minilzo.h" -+# elif HAVE_LZO_LZO1X_H -+# include -+# elif HAVE_LZO1X_H -+# include -+# endif - #include "tools.h" - - #include ---- /tmp/ht-2.0beta2/Makefile.am 2006-11-03 00:00:56.000000000 +1100 -+++ ht-2.0beta2/Makefile.am 2007-01-27 19:02:55.000000000 +1100 -@@ -9,17 +9,20 @@ - IO_DIR = io/@IO_DIR@ - OUTPUT_DIR = output - EVAL_DIR = eval --MINILZO_DIR = minilzo - #SRT_DIR = srt -- - EXTRA_DIST = TODO ChangeLog README KNOWNBUGS INSTALL COPYING AUTHORS --SUBDIRS = tools analyser asm doc info io output eval minilzo -+SUBDIRS = tools analyser asm doc info io output eval - --INCLUDES = -I$(srcdir)/$(ANALYSER_DIR) -I$(srcdir)/$(ASM_DIR) -I$(srcdir)/$(INFO_DIR) -I$(srcdir)/$(IO_DIR) -I$(srcdir)/$(COMIO_DIR) -I$(srcdir)/$(OUTPUT_DIR) -I$(srcdir)/$(EVAL_DIR) -I$(srcdir)/$(MINILZO_DIR) -I$(srcdir) -+INCLUDES = -I$(srcdir)/$(ANALYSER_DIR) -I$(srcdir)/$(ASM_DIR) -I$(srcdir)/$(INFO_DIR) -I$(srcdir)/$(IO_DIR) -I$(srcdir)/$(COMIO_DIR) -I$(srcdir)/$(OUTPUT_DIR) -I$(srcdir)/$(EVAL_DIR) -I$(srcdir) - --ht_LDADD = $(ANALYSER_DIR)/libanalyser.a $(ASM_DIR)/libasm.a $(INFO_DIR)/libinfo.a $(IO_DIR)/libhtio.a $(OUTPUT_DIR)/liboutput.a $(COMIO_DIR)/libcomio.a $(EVAL_DIR)/libhteval.a $(MINILZO_DIR)/liblzo.a @HT_LIBS@ -+ht_LDADD = $(ANALYSER_DIR)/libanalyser.a $(ASM_DIR)/libasm.a $(INFO_DIR)/libinfo.a $(IO_DIR)/libhtio.a $(OUTPUT_DIR)/liboutput.a $(COMIO_DIR)/libcomio.a $(EVAL_DIR)/libhteval.a @HT_LIBS@ @LZO_LIBS@ - ht_LDFLAGS = @HT_LDFLAGS@ - -+if ENABLE_INCLUDED_LZO -+SUBDIRS += minilzo -+ht_LDADD += minilzo/liblzo.a -+endif -+ - ht_SOURCES = atom.cc atom.h except.cc except.h data.cc data.h \ - str.cc str.h strtools.cc strtools.h endianess.h endianess.cc \ - htdoc.c htdoc.h blockop.cc blockop.h coff_s.h \ ---- /tmp/ht-2.0beta2/configure.in 2006-11-24 02:07:40.000000000 +1100 -+++ ht-2.0beta2/configure.in 2007-01-27 20:43:36.000000000 +1100 -@@ -1,22 +1,21 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(data.h) - --PACKAGE=ht --VERSION=2.0beta2 -+AC_INIT(ht,[2.0beta2],[https://sourceforge.net/tracker/?group_id=1066]) -+AC_PREREQ(2.59) - - dnl Check the system. - AC_CANONICAL_SYSTEM - --AC_SUBST(PACKAGE) --AC_SUBST(VERSION) -- - AC_ARG_ENABLE(x11-textmode, - [ --enable-x11-textmode build with x11 textmode support [default=yes]],,enable_x11_textmode="yes") -+AC_ARG_ENABLE(maintainermode, -+ [ --enable-maintainermode minimise autodetection for package mantainers [default=no]],,enable_maintainermode="no") - AC_ARG_ENABLE(release, - [ --enable-release make a release build [default=yes]],,enable_release="yes") - AC_ARG_ENABLE(profiling, - [ --enable-profiling make a profile build [default=no]],,enable_profiling="no") - -+if test "x$enable_maintainermode" = "xno"; then - if test "x$enable_release" = "xyes"; then - FLAGS_ALL="-O2 -fomit-frame-pointer -Wall -fsigned-char" - else -@@ -26,8 +25,9 @@ - if test "x$enable_profiling" = "xyes"; then - FLAGS_ALL="$FLAGS_ALL -pg -g" - fi -+fi - --AM_INIT_AUTOMAKE($PACKAGE,$VERSION,no-define) -+AM_INIT_AUTOMAKE - AM_CONFIG_HEADER(config.h) - - dnl Check OS specifica -@@ -107,6 +107,7 @@ - AC_PATH_PROGS(MAKE, gmake make, :) - AC_PROG_MAKE_SET - AC_PROG_CC -+AC_PROG_CPP - AC_PROG_CXX - AC_PROG_YACC - AM_PROG_LEX -@@ -119,6 +120,45 @@ - - dnl Checks for libraries. - -+minilzo_enabled=no -+ -+AC_ARG_WITH(included-lzo, -+ AS_HELP_STRING([--with-included-lzo], -+ [use included minilzo]), -+ minilzo_enabled=$withval, -+ minilzo_enabled=no) -+ -+AC_MSG_CHECKING([whether to use the included lzo compression library]) -+AC_MSG_RESULT($minilzo_enabled) -+ -+LZO_LIBS= -+if test "$minilzo_enabled" != "yes"; then -+ AC_CHECK_LIB(lzo2, lzo1x_1_compress, LZO_LIBS=-llzo2) -+ if test "$LZO_LIBS" = ""; then -+ AC_CHECK_LIB(lzo, lzo1x_1_compress, LZO_LIBS=-llzo, [ -+ minilzo_enabled=yes -+ AC_MSG_WARN( -+*** -+*** Could not find liblzo or liblzo2. Will use the included minilzo. -+) -+ ]) -+ fi -+fi -+AC_SUBST(LZO_LIBS) -+ -+if test "$LZO_LIBS" = "-llzo"; then -+ AC_CHECK_HEADERS(lzo1x.h) -+elif test "$LZO_LIBS" = "-llzo2"; then -+ AC_CHECK_HEADERS(lzo/lzo1x.h) -+fi -+ -+if test "$minilzo_enabled" = "yes"; then -+ AC_DEFINE(USE_MINILZO, 1, [whether to use the included minilzo]) -+fi -+ -+AM_CONDITIONAL(USE_LZO, test "$use_lzo" = "yes") -+AM_CONDITIONAL(ENABLE_INCLUDED_LZO, test "$minilzo_enabled" = "yes") -+ - HAVE_X11=0 - - if test "x$enable_x11_textmode" = "xyes"; then -@@ -198,3 +238,4 @@ - fi - echo "enable profiling: $enable_profiling" 1>&2 - echo "make a release build: $enable_release" 1>&2 -+echo "using included minilzo: $minilzo_enabled" 1>&2 diff --git a/app-editors/hteditor/files/hteditor-2.0_beta2-regexneedstdlib.patch b/app-editors/hteditor/files/hteditor-2.0_beta2-regexneedstdlib.patch deleted file mode 100644 index 67bae0087848..000000000000 --- a/app-editors/hteditor/files/hteditor-2.0_beta2-regexneedstdlib.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- /tmp/ht-2.0beta2/regex.c 2002-06-30 23:47:48.000000000 +1000 -+++ ht-2.0beta2/regex.c 2007-01-27 21:08:15.000000000 +1100 -@@ -32,6 +32,7 @@ - - /* We need this for `regex.h', and perhaps for the Emacs include files. */ - #include -+#include - - /* This is for other GNU distributions with internationalized messages. */ - #if HAVE_LIBINTL_H || defined (_LIBC) -@@ -55,13 +56,6 @@ - even if config.h says that we can. */ - #undef REL_ALLOC - --#if defined (STDC_HEADERS) || defined (_LIBC) --#include --#else --char *malloc (); --char *realloc (); --#endif -- - /* When used in Emacs's lib-src, we need to get bzero and bcopy somehow. - If nothing else has been done, use the method below. */ - #ifdef INHIBIT_STRING_HEADER diff --git a/app-editors/hteditor/hteditor-0.9.1.ebuild b/app-editors/hteditor/hteditor-0.9.1.ebuild deleted file mode 100644 index 95b79a931d8f..000000000000 --- a/app-editors/hteditor/hteditor-0.9.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-0.9.1.ebuild,v 1.2 2006/05/22 10:09:05 dragonheart Exp $ - -inherit eutils - -DESCRIPTION="editor for executable files" -HOMEPAGE="http://hte.sourceforge.net/" -SRC_URI="mirror://sourceforge/hte/ht-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND="virtual/libc - sys-libs/ncurses" -DEPEND="${RDEPEND} - >=sys-devel/automake-1.4 - sys-devel/autoconf - sys-devel/bison - sys-devel/flex" - -S="${WORKDIR}/ht-${PV}" - -src_unpack() { - unpack "${A}" - cd "${S}" - epatch "${FILESDIR}/hteditor-gcc41.patch" -} - - -src_compile() { - econf || die - emake \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc AUTHORS KNOWNBUGS TODO README - dohtml doc/ht.html - doinfo doc/*.info -} diff --git a/app-editors/hteditor/hteditor-0.9.4.ebuild b/app-editors/hteditor/hteditor-0.9.4.ebuild deleted file mode 100644 index e5b4e794969e..000000000000 --- a/app-editors/hteditor/hteditor-0.9.4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-0.9.4.ebuild,v 1.1 2006/10/29 08:50:30 dragonheart Exp $ - -inherit eutils autotools - -DESCRIPTION="editor for executable files" -HOMEPAGE="http://hte.sourceforge.net/" -SRC_URI="mirror://sourceforge/hte/ht-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND="virtual/libc - sys-libs/ncurses" -DEPEND="${RDEPEND} - >=sys-devel/automake-1.4 - sys-devel/autoconf - sys-devel/bison - sys-devel/flex" - -S="${WORKDIR}/ht-${PV}" - -src_unpack() { - unpack "${A}" - cd "${S}" - epatch "${FILESDIR}/${P}-asneeded.patch" - eautoreconf -} - - -src_compile() { - econf || die - emake \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc AUTHORS KNOWNBUGS TODO README - dohtml doc/ht.html - doinfo doc/*.info -} diff --git a/app-editors/hteditor/hteditor-2.0_beta2.ebuild b/app-editors/hteditor/hteditor-2.0.3.ebuild similarity index 80% rename from app-editors/hteditor/hteditor-2.0_beta2.ebuild rename to app-editors/hteditor/hteditor-2.0.3.ebuild index e010c33a75ca..6b4e0efe4345 100644 --- a/app-editors/hteditor/hteditor-2.0_beta2.ebuild +++ b/app-editors/hteditor/hteditor-2.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-2.0_beta2.ebuild,v 1.1 2007/01/27 10:32:57 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-2.0.3.ebuild,v 1.1 2007/04/19 20:43:38 dragonheart Exp $ inherit eutils autotools @@ -24,13 +24,6 @@ DEPEND="${RDEPEND} S="${WORKDIR}/ht-${MY_PV}" -src_unpack() { - unpack ${A} - epatch "${FILESDIR}"/${P}-optionallzo.patch - epatch "${FILESDIR}"/${P}-regexneedstdlib.patch - cd "${S}" - eautoreconf -} src_compile() { econf --disable-release --enable-maintainer-mode $(use_enable X x11-textmode) || die emake || die