diff options
| -rw-r--r-- | x11-libs/libast/Manifest | 41 | ||||
| -rw-r--r-- | x11-libs/libast/files/digest-libast-0.5-r2 | 1 | ||||
| -rw-r--r-- | x11-libs/libast/files/digest-libast-0.6.1 | 1 | ||||
| -rw-r--r-- | x11-libs/libast/files/digest-libast-0.6.1-r1 | 1 | ||||
| -rw-r--r-- | x11-libs/libast/files/libast-0.6.1-config-warning.patch | 150 | ||||
| -rw-r--r-- | x11-libs/libast/files/libast-64bit.patch | 10 | ||||
| -rw-r--r-- | x11-libs/libast/libast-0.5-r2.ebuild | 38 | ||||
| -rw-r--r-- | x11-libs/libast/libast-0.6.1-r1.ebuild | 41 | ||||
| -rw-r--r-- | x11-libs/libast/libast-0.6.1.ebuild | 35 |
9 files changed, 10 insertions, 308 deletions
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest index b645deea4d6e..34fe74b292ab 100644 --- a/x11-libs/libast/Manifest +++ b/x11-libs/libast/Manifest @@ -1,26 +1,7 @@ -AUX libast-0.6.1-config-warning.patch 6797 RMD160 f018e0d082bb29c0341cd3fb721e91ac010ff0bb SHA1 442c62fad930c311a660f5da5f4e30544accbebb SHA256 5fec99a27c953331a717a31dd87d8e04fe98e39f1dac1832c1871f34bd573887 -MD5 e050b956ec4efca8d3dab20f609ba5c1 files/libast-0.6.1-config-warning.patch 6797 -RMD160 f018e0d082bb29c0341cd3fb721e91ac010ff0bb files/libast-0.6.1-config-warning.patch 6797 -SHA256 5fec99a27c953331a717a31dd87d8e04fe98e39f1dac1832c1871f34bd573887 files/libast-0.6.1-config-warning.patch 6797 -AUX libast-64bit.patch 295 RMD160 5e16b5a69e6b1b953df36262fecedd8d3cd96041 SHA1 f750cbf41a2af94f85586655987fea99733dd329 SHA256 37847cda4c01e0dafd330a94e2b51f0abe5469c94025979356aca5df729cdd9a -MD5 177b67afc64c8e52522833c7ce007ab5 files/libast-64bit.patch 295 -RMD160 5e16b5a69e6b1b953df36262fecedd8d3cd96041 files/libast-64bit.patch 295 -SHA256 37847cda4c01e0dafd330a94e2b51f0abe5469c94025979356aca5df729cdd9a files/libast-64bit.patch 295 -DIST libast-0.5.tar.gz 276591 -DIST libast-0.6.1.tar.gz 356881 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST libast-0.7.tar.gz 508654 RMD160 82dedafc23668f0bbecbf09433676d4b31e9e154 SHA1 8449049642c5a945336a326b8d512e4d261232d0 SHA256 52055cc0df0af58adc8c43cce6c9a2fff71c627a6bb0395073d353920dd1ebf0 -EBUILD libast-0.5-r2.ebuild 953 RMD160 1dbc6c0efcac37d0703e358bfd6a236e544f3ee7 SHA1 ac952d15b67822999908ff6919465758b5f7b469 SHA256 66dac372c59cf99323f3cedd0fdd94e993d1cce2bea88881f131c6f85227d78e -MD5 5b6e00417069cb5c9245a265c2850c92 libast-0.5-r2.ebuild 953 -RMD160 1dbc6c0efcac37d0703e358bfd6a236e544f3ee7 libast-0.5-r2.ebuild 953 -SHA256 66dac372c59cf99323f3cedd0fdd94e993d1cce2bea88881f131c6f85227d78e libast-0.5-r2.ebuild 953 -EBUILD libast-0.6.1-r1.ebuild 1048 RMD160 1b0c3c3dbe0328939054a76ad3b0f15b5a2c03c2 SHA1 0356e277a33d2ebf6b54fe9a33823851d6da662d SHA256 5ac93cd9f5748469815040613228905f8f28b9233e9722a3c95c6e908e9729bc -MD5 44c5a6b967f1259df4f297d7f1813368 libast-0.6.1-r1.ebuild 1048 -RMD160 1b0c3c3dbe0328939054a76ad3b0f15b5a2c03c2 libast-0.6.1-r1.ebuild 1048 -SHA256 5ac93cd9f5748469815040613228905f8f28b9233e9722a3c95c6e908e9729bc libast-0.6.1-r1.ebuild 1048 -EBUILD libast-0.6.1.ebuild 939 RMD160 e452e5027d66b0ff7f7559a6e5bc3915ea15b631 SHA1 efe0fa4cf58d60b98b8cc9d33462713778463f28 SHA256 7335531dea204158ae658ab45702cbd6f82b5a4f9ae8bb6fc943794b55f815cc -MD5 e464e528a3dc26dc83c6c722a03467f5 libast-0.6.1.ebuild 939 -RMD160 e452e5027d66b0ff7f7559a6e5bc3915ea15b631 libast-0.6.1.ebuild 939 -SHA256 7335531dea204158ae658ab45702cbd6f82b5a4f9ae8bb6fc943794b55f815cc libast-0.6.1.ebuild 939 EBUILD libast-0.7.ebuild 926 RMD160 f70c661b8c241beeb8d5d0e634c761d2dd240b90 SHA1 0d575ac9df83388288b515fac665cf1e33daa359 SHA256 3cb7b2e9083af0674ec4c2efded9fae52da5bfaa1a41e184c1aff4a022c9b2f5 MD5 30f7f44586690a798756069a5fa2b5a4 libast-0.7.ebuild 926 RMD160 f70c661b8c241beeb8d5d0e634c761d2dd240b90 libast-0.7.ebuild 926 @@ -37,18 +18,16 @@ MISC metadata.xml 820 RMD160 9843e0d03eb4fdf394087b9850e5c23be5b829de SHA1 c5045 MD5 ec45fec065a8eccc43870fc678126de7 metadata.xml 820 RMD160 9843e0d03eb4fdf394087b9850e5c23be5b829de metadata.xml 820 SHA256 1ce13b9a284552eb7d5b5b6f0ef1ce32136a353d86b87adf522958baafb01f0b metadata.xml 820 -MD5 2a9e814b7851e9e22178430153da8110 files/digest-libast-0.5-r2 62 -RMD160 d8b14753731dd4ce0bb8992e015060afbc997f60 files/digest-libast-0.5-r2 62 -SHA256 09da4abe23661eb92ce64e7ceb9195059fddc973890ac7793f472e2365fcc0d9 files/digest-libast-0.5-r2 62 -MD5 0cf4b65fa766332e528bddb7cf3d74e2 files/digest-libast-0.6.1 64 -RMD160 959d746ba11f8b071ad77df5d5382f82cf240e41 files/digest-libast-0.6.1 64 -SHA256 869013c933fff7a8549d00f44a49bec622db7996782be01cee7cc328b5ec595b files/digest-libast-0.6.1 64 -MD5 0cf4b65fa766332e528bddb7cf3d74e2 files/digest-libast-0.6.1-r1 64 -RMD160 959d746ba11f8b071ad77df5d5382f82cf240e41 files/digest-libast-0.6.1-r1 64 -SHA256 869013c933fff7a8549d00f44a49bec622db7996782be01cee7cc328b5ec595b files/digest-libast-0.6.1-r1 64 MD5 4a147abb4a7ba33a312c031387718bd6 files/digest-libast-0.7 232 RMD160 cf45fee608c42fd0229d6bb1a8ea984d2eab2015 files/digest-libast-0.7 232 SHA256 b1d1ccfd9e7af973adcb2f4a22ebee1d314777df19378adae9e3d9111a6fcfb7 files/digest-libast-0.7 232 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-libast-9999 1 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-libast-9999 1 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-libast-9999 1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.4 (GNU/Linux) + +iD8DBQFEubWsamhnQswr0vIRAjbRAJ9k4xd2wnAqVN4zF264s51GRF4qyACgqjNl +jbdkmVTXYWoSEGQjgQctZ3A= +=DFaa +-----END PGP SIGNATURE----- diff --git a/x11-libs/libast/files/digest-libast-0.5-r2 b/x11-libs/libast/files/digest-libast-0.5-r2 deleted file mode 100644 index 18efb6adbbc9..000000000000 --- a/x11-libs/libast/files/digest-libast-0.5-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 335ead8e8168bc06284c822f1f655eb8 libast-0.5.tar.gz 276591 diff --git a/x11-libs/libast/files/digest-libast-0.6.1 b/x11-libs/libast/files/digest-libast-0.6.1 deleted file mode 100644 index 0d9f22391cea..000000000000 --- a/x11-libs/libast/files/digest-libast-0.6.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 1cbbf86a0afb74a5905dc92982117250 libast-0.6.1.tar.gz 356881 diff --git a/x11-libs/libast/files/digest-libast-0.6.1-r1 b/x11-libs/libast/files/digest-libast-0.6.1-r1 deleted file mode 100644 index 0d9f22391cea..000000000000 --- a/x11-libs/libast/files/digest-libast-0.6.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 1cbbf86a0afb74a5905dc92982117250 libast-0.6.1.tar.gz 356881 diff --git a/x11-libs/libast/files/libast-0.6.1-config-warning.patch b/x11-libs/libast/files/libast-0.6.1-config-warning.patch deleted file mode 100644 index 0fe749b22bd8..000000000000 --- a/x11-libs/libast/files/libast-0.6.1-config-warning.patch +++ /dev/null @@ -1,150 +0,0 @@ -Grab fix from upstream CVS to address -http://bugs.gentoo.org/94479 - ----------------------------------------------------------------------- -Mon Mar 7 17:28:00 2005 Michael Jennings (mej) - -Finally found and fixed that stupid "Config file is designed for a -newer version of FOO" bullshit warning. ----------------------------------------------------------------------- - -Index: src/conf.c -=================================================================== -RCS file: /cvsroot/enlightenment/eterm/libast/src/conf.c,v -retrieving revision 1.25 -retrieving revision 1.26 -diff -u -r1.25 -r1.26 ---- src/conf.c 21 Oct 2004 20:03:16 -0000 1.25 -+++ src/conf.c 7 Mar 2005 22:29:07 -0000 1.26 -@@ -827,10 +827,12 @@ - /* Check version number against current application version. */ - begin_ptr = SPIF_STR_STR(ver_str) + spif_str_index(ver_str, SPIF_CAST(char) '-') + 1; - end_ptr = SPIF_STR_STR(ver_str) + spif_str_index(ver_str, SPIF_CAST(char) '>'); -+ D_CONF(("Begin pointer is %10p (%s), end pointer is %10p (%s), length is %d, buffer size is %d\n", -+ begin_ptr, begin_ptr, end_ptr, end_ptr, SPIF_CAST_C(int) (end_ptr - begin_ptr), sizeof(buff))); - if (SPIF_PTR_ISNULL(end_ptr)) { - spiftool_safe_strncpy(buff, begin_ptr, sizeof(buff)); - } else { -- testlen = MAX(SPIF_CAST_C(int) sizeof(buff), SPIF_CAST_C(int) (end_ptr - begin_ptr)); -+ testlen = MIN(SPIF_CAST_C(int) sizeof(buff), SPIF_CAST_C(int) (end_ptr - begin_ptr + 1)); - spiftool_safe_strncpy(buff, begin_ptr, testlen); - } - ver = spiftool_version_compare(buff, libast_program_version); -Index: src/strings.c -=================================================================== -RCS file: /cvsroot/enlightenment/eterm/libast/src/strings.c,v -retrieving revision 1.24 -retrieving revision 1.25 -diff -u -r1.24 -r1.25 ---- src/strings.c 23 Jul 2004 21:38:39 -0000 1.24 -+++ src/strings.c 7 Mar 2005 22:29:07 -0000 1.25 -@@ -710,21 +710,24 @@ - { - spif_char_t buff1[128], buff2[128]; - -+ D_CONF(("Comparing version strings \"%s\" and \"%s\"\n", NONULL(v1), NONULL(v2))); - SPIF_COMP_CHECK_NULL(v1, v2); - - for (; *v1 && *v2; ) { -+ D_CONF((" -> Looking at \"%s\" and \"%s\"\n", v1, v2)); - if (isalpha(*v1) && isalpha(*v2)) { - spif_charptr_t p1 = buff1, p2 = buff2; - spif_int8_t ival1 = 6, ival2 = 6; - - /* Compare words. First, copy each word into buffers. */ -- for (; isalpha(*v1); v1++, p1++) *p1 = *v1; -- for (; isalpha(*v2); v2++, p2++) *p2 = *v2; -+ for (; *v1 && isalpha(*v1); v1++, p1++) *p1 = *v1; -+ for (; *v2 && isalpha(*v2); v2++, p2++) *p2 = *v2; - *p1 = *p2 = 0; - - /* Change the buffered strings to lowercase for easier comparison. */ - spiftool_downcase_str(buff1); - spiftool_downcase_str(buff2); -+ D_CONF((" -> Comparing as words \"%s\" vs. \"%s\"\n", buff1, buff2)); - - /* Some strings require special handling. */ - if (!strcmp(SPIF_CHARPTR_C(buff1), "snap")) { -@@ -751,12 +754,14 @@ - } - if (ival1 != ival2) { - /* If the values are different, compare them. */ -+ D_CONF((" -> %d\n", (int) SPIF_CMP_FROM_INT(ival1 - ival2))); - return SPIF_CMP_FROM_INT(ival1 - ival2); - } else if (ival1 == 6) { - int c; - - /* Two arbitrary strings. Compare them too. */ - if ((c = strcmp(SPIF_CHARPTR_C(buff1), SPIF_CHARPTR_C(buff2))) != 0) { -+ D_CONF((" -> %d\n", (int) SPIF_CMP_FROM_INT(c))); - return SPIF_CMP_FROM_INT(c); - } - } -@@ -766,17 +771,19 @@ - spif_cmp_t c; - - /* Compare numbers. First, copy each number into buffers. */ -- for (; isdigit(*v1); v1++, p1++) *p1 = *v1; -- for (; isdigit(*v2); v2++, p2++) *p2 = *v2; -+ for (; *v1 && isdigit(*v1); v1++, p1++) *p1 = *v1; -+ for (; *v2 && isdigit(*v2); v2++, p2++) *p2 = *v2; - *p1 = *p2 = 0; - - /* Convert the strings into actual integers. */ - ival1 = SPIF_CAST(int32) strtol(SPIF_CHARPTR_C(buff1), (char **) NULL, 10); - ival2 = SPIF_CAST(int32) strtol(SPIF_CHARPTR_C(buff2), (char **) NULL, 10); -+ D_CONF((" -> Comparing as integers %d vs. %d\n", SPIF_CAST_C(int) ival1, SPIF_CAST_C(int) ival2)); - - /* Compare the integers and return if not equal. */ - c = SPIF_CMP_FROM_INT(ival1 - ival2); - if (!SPIF_CMP_IS_EQUAL(c)) { -+ D_CONF((" -> %d\n", (int) c)); - return c; - } - } else if (!isalnum(*v1) && !isalnum(*v2)) { -@@ -784,15 +791,19 @@ - spif_cmp_t c; - - /* Compare non-alphanumeric strings. */ -- for (; !isalnum(*v1); v1++, p1++) *p1 = *v1; -- for (; !isalnum(*v2); v2++, p2++) *p2 = *v2; -+ for (; *v1 && !isalnum(*v1); v1++, p1++) *p1 = *v1; -+ for (; *v2 && !isalnum(*v2); v2++, p2++) *p2 = *v2; - *p1 = *p2 = 0; - -+ D_CONF((" -> Comparing as non-alphanumeric strings \"%s\" vs. \"%s\"\n", buff1, buff2)); - c = SPIF_CMP_FROM_INT(strcasecmp(SPIF_CHARPTR_C(buff1), SPIF_CHARPTR_C(buff2))); - if (!SPIF_CMP_IS_EQUAL(c)) { -+ D_CONF((" -> %d\n", (int) c)); - return c; - } - } else { -+ D_CONF((" -> Comparing as alphanumeric strings \"%s\" vs. \"%s\"\n", buff1, buff2)); -+ D_CONF((" -> %d\n", (int) SPIF_CMP_FROM_INT(strcasecmp(SPIF_CHARPTR_C(buff1), SPIF_CHARPTR_C(buff2))))); - return SPIF_CMP_FROM_INT(strcasecmp(SPIF_CHARPTR_C(buff1), SPIF_CHARPTR_C(buff2))); - } - } -@@ -801,18 +812,23 @@ - if (*v1) { - if (!BEG_STRCASECMP(SPIF_CHARPTR_C(v1), "snap") || !BEG_STRCASECMP(SPIF_CHARPTR_C(v1), "pre") - || !BEG_STRCASECMP(SPIF_CHARPTR_C(v1), "alpha") || !BEG_STRCASECMP(SPIF_CHARPTR_C(v1), "beta")) { -+ D_CONF((" -> <\n")); - return SPIF_CMP_LESS; - } else { -+ D_CONF((" -> >\n")); - return SPIF_CMP_GREATER; - } - } else if (*v2) { - if (!BEG_STRCASECMP(SPIF_CHARPTR_C(v2), "snap") || !BEG_STRCASECMP(SPIF_CHARPTR_C(v2), "pre") - || !BEG_STRCASECMP(SPIF_CHARPTR_C(v2), "alpha") || !BEG_STRCASECMP(SPIF_CHARPTR_C(v2), "beta")) { -+ D_CONF((" -> >\n")); - return SPIF_CMP_GREATER; - } else { -+ D_CONF((" -> <\n")); - return SPIF_CMP_LESS; - } - } -+ D_CONF((" -> ==\n")); - return SPIF_CMP_EQUAL; - } - diff --git a/x11-libs/libast/files/libast-64bit.patch b/x11-libs/libast/files/libast-64bit.patch deleted file mode 100644 index 15ef6ee1d004..000000000000 --- a/x11-libs/libast/files/libast-64bit.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libast-0.5/include/libast.h -+++ libast-0.5/include/libast.h -@@ -337,6 +337,7 @@ - /* fill l with c. */ \ - l = (c) | (c)<<8; \ - l |= l<<16; \ -+ l |= l<<32; \ - MEMSET_LONG(); \ - \ - /* fill in 1-byte chunks until boundary of long is reached. */ \ diff --git a/x11-libs/libast/libast-0.5-r2.ebuild b/x11-libs/libast/libast-0.5-r2.ebuild deleted file mode 100644 index ad2c28776d96..000000000000 --- a/x11-libs/libast/libast-0.5-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/libast-0.5-r2.ebuild,v 1.13 2006/02/04 00:36:22 vapier Exp $ - -inherit eutils - -DESCRIPTION="LIBrary of Assorted Spiffy Things" -HOMEPAGE="http://www.eterm.org/download/" -SRC_URI="http://www.eterm.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86" -IUSE="imlib mmx pcre truetype" - -DEPEND="|| ( ( x11-libs/libXt x11-proto/xproto x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) virtual/x11 ) - truetype? ( =media-libs/freetype-1* ) - imlib? ( media-libs/imlib2 ) - pcre? ( dev-libs/libpcre )" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/libast-64bit.patch -} - -src_compile() { - econf \ - $(use_enable imlib) \ - $(use_enable mmx) \ - || die - emake || die -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc README DESIGN ChangeLog -} diff --git a/x11-libs/libast/libast-0.6.1-r1.ebuild b/x11-libs/libast/libast-0.6.1-r1.ebuild deleted file mode 100644 index 068f7b57215a..000000000000 --- a/x11-libs/libast/libast-0.6.1-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/libast-0.6.1-r1.ebuild,v 1.3 2006/01/07 08:04:50 vapier Exp $ - -inherit eutils - -DESCRIPTION="LIBrary of Assorted Spiffy Things" -HOMEPAGE="http://www.eterm.org/download/" -SRC_URI="http://www.eterm.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" -IUSE="imlib mmx pcre" - -DEPEND="|| ( ( x11-libs/libXt x11-proto/xproto x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) virtual/x11 ) - =media-libs/freetype-2* - imlib? ( media-libs/imlib2 ) - pcre? ( dev-libs/libpcre )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-config-warning.patch #94479 -} - -src_compile() { - local myregexp="posix" - use pcre && myregexp="pcre" - econf \ - $(use_with imlib) \ - $(use_enable mmx) \ - --with-regexp=${myregexp} \ - || die - emake || die -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc README DESIGN ChangeLog -} diff --git a/x11-libs/libast/libast-0.6.1.ebuild b/x11-libs/libast/libast-0.6.1.ebuild deleted file mode 100644 index df11b0d54b19..000000000000 --- a/x11-libs/libast/libast-0.6.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/libast-0.6.1.ebuild,v 1.7 2006/02/04 00:36:22 vapier Exp $ - -inherit eutils - -DESCRIPTION="LIBrary of Assorted Spiffy Things" -HOMEPAGE="http://www.eterm.org/download/" -SRC_URI="http://www.eterm.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sh sparc x86" -IUSE="imlib mmx pcre" - -DEPEND="|| ( ( x11-libs/libXt x11-proto/xproto x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) virtual/x11 ) - =media-libs/freetype-2* - imlib? ( media-libs/imlib2 ) - pcre? ( dev-libs/libpcre )" - -src_compile() { - local myregexp="posix" - use pcre && myregexp="pcre" - econf \ - $(use_with imlib) \ - $(use_enable mmx) \ - --with-regexp=${myregexp} \ - || die - emake || die -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc README DESIGN ChangeLog -} |