diff options
author | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-07-09 09:32:17 +0000 |
---|---|---|
committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-07-09 09:32:17 +0000 |
commit | 08c1c87561d250c9b97ba90c8479536d585c4a99 (patch) | |
tree | 8b959407e57fdc88b36b9aec7a7ab2b1754d78f2 /x11-terms/mrxvt | |
parent | Remove old versions. (diff) | |
download | gentoo-2-08c1c87561d250c9b97ba90c8479536d585c4a99.tar.gz gentoo-2-08c1c87561d250c9b97ba90c8479536d585c4a99.tar.bz2 gentoo-2-08c1c87561d250c9b97ba90c8479536d585c4a99.zip |
Remove old versions.
(Portage version: 2.1.1_pre2-r6)
(Signed Manifest commit)
Diffstat (limited to 'x11-terms/mrxvt')
-rw-r--r-- | x11-terms/mrxvt/Manifest | 62 | ||||
-rw-r--r-- | x11-terms/mrxvt/files/digest-mrxvt-0.3.13-r1 | 1 | ||||
-rw-r--r-- | x11-terms/mrxvt/files/digest-mrxvt-0.4.1 | 1 | ||||
-rw-r--r-- | x11-terms/mrxvt/files/digest-mrxvt-0.4.2 | 3 | ||||
-rw-r--r-- | x11-terms/mrxvt/files/digest-mrxvt-0.5.0 | 3 | ||||
-rw-r--r-- | x11-terms/mrxvt/files/mrxvt-0.3.13-xdefaults.patch | 221 | ||||
-rw-r--r-- | x11-terms/mrxvt/files/noflicker-0.4.2.patch | 159 | ||||
-rw-r--r-- | x11-terms/mrxvt/files/xft-colorbd-0.4.2.patch | 53 | ||||
-rw-r--r-- | x11-terms/mrxvt/mrxvt-0.3.13-r1.ebuild | 101 | ||||
-rw-r--r-- | x11-terms/mrxvt/mrxvt-0.4.1.ebuild | 75 | ||||
-rw-r--r-- | x11-terms/mrxvt/mrxvt-0.4.2.ebuild | 97 | ||||
-rw-r--r-- | x11-terms/mrxvt/mrxvt-0.5.0.ebuild | 106 |
12 files changed, 14 insertions, 868 deletions
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest index 216f6427dc85..8821b1bf38c7 100644 --- a/x11-terms/mrxvt/Manifest +++ b/x11-terms/mrxvt/Manifest @@ -1,60 +1,26 @@ -AUX mrxvt-0.3.13-xdefaults.patch 7709 RMD160 430eafecd6f8984b4e1b60e58b64bdd53d8e93f5 SHA1 0449acc7893f3df809f25df9e24014ea6ce92b95 SHA256 9391593a3bf7c953d95a2b9a3f6c973f17b3551608448b934fbc0260e917babd -MD5 d7ac26627011150a523bf15955a9067d files/mrxvt-0.3.13-xdefaults.patch 7709 -RMD160 430eafecd6f8984b4e1b60e58b64bdd53d8e93f5 files/mrxvt-0.3.13-xdefaults.patch 7709 -SHA256 9391593a3bf7c953d95a2b9a3f6c973f17b3551608448b934fbc0260e917babd files/mrxvt-0.3.13-xdefaults.patch 7709 -AUX noflicker-0.4.2.patch 4337 RMD160 98faac46ce09c5590a74c4ccec053f9a59cf0d55 SHA1 ff970cc1b481239d76454a281892764fb059a634 SHA256 12ec5f47d1ba97440bd0fabc316cf93cda96bcadea3c75cecb324e1b6655ad3a -MD5 8fc70687c58b893461be92289f5e4f3d files/noflicker-0.4.2.patch 4337 -RMD160 98faac46ce09c5590a74c4ccec053f9a59cf0d55 files/noflicker-0.4.2.patch 4337 -SHA256 12ec5f47d1ba97440bd0fabc316cf93cda96bcadea3c75cecb324e1b6655ad3a files/noflicker-0.4.2.patch 4337 -AUX xft-colorbd-0.4.2.patch 1716 RMD160 d095ae59d35022c7826f16b4dde7974d187e3dd8 SHA1 ed1557747bdc0cbcad1a583b3c1d384bad3b84a4 SHA256 bd875cceebbdd1a1329404883680f9859f32dc58b46a5e5dd5654c4f16b1e013 -MD5 4e65bda48b0b3bffda7ecccb2ffadfd8 files/xft-colorbd-0.4.2.patch 1716 -RMD160 d095ae59d35022c7826f16b4dde7974d187e3dd8 files/xft-colorbd-0.4.2.patch 1716 -SHA256 bd875cceebbdd1a1329404883680f9859f32dc58b46a5e5dd5654c4f16b1e013 files/xft-colorbd-0.4.2.patch 1716 -DIST mrxvt-0.3.13.tar.gz 497798 -DIST mrxvt-0.4.1.tar.gz 504370 -DIST mrxvt-0.4.2.tgz 508718 RMD160 205a5df674ea37639108d60d4bc78373749ce58e SHA256 a6d348670641b043aa3cb7b55c2f3ebb4fbb521f8134b67e0821991b959f1830 -DIST mrxvt-0.5.0.tar.gz 592847 RMD160 d197767075577ada0679ce1ab0c2c3dd9f900e22 SHA1 62452bc92b85260652445f62d52b8abd94972d66 SHA256 0c99edffab6293913c40c2d538d6f72059fed28571cf967350bdc87b553fbead +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST mrxvt-0.5.1.tar.gz 711657 RMD160 fc133e9ae6835c5e0881909e77c6298128a9779c SHA1 f6d442341e1071c5eae42c08ecd50b97234a5392 SHA256 f33bbef378a59d4a209650d57822fdc4b4147a51200f0b30484509749c119d71 -EBUILD mrxvt-0.3.13-r1.ebuild 2322 RMD160 445237ce9cfdfbc00934f7fb81b37005e2c00ab2 SHA1 849035ebe376844afd35641fca61dccb485dcaba SHA256 1d47a344244c18ab004a0bd103f4134d3a5956e956da8a69445b97b8516bfb04 -MD5 5c96f5c2722316375233fd932c21e190 mrxvt-0.3.13-r1.ebuild 2322 -RMD160 445237ce9cfdfbc00934f7fb81b37005e2c00ab2 mrxvt-0.3.13-r1.ebuild 2322 -SHA256 1d47a344244c18ab004a0bd103f4134d3a5956e956da8a69445b97b8516bfb04 mrxvt-0.3.13-r1.ebuild 2322 -EBUILD mrxvt-0.4.1.ebuild 1869 RMD160 92ac8c602cc4b35694bd0e7838df7942c8e5fba1 SHA1 effe1bd0eeb1e8fe2863987fabcf30321df20d6a SHA256 934b3dac132521031a3213acc0b17b4c8db1af6a451b6c4cbe7015af2dbc1d08 -MD5 40c3cc4fd2ceb4531369cd4c3943e548 mrxvt-0.4.1.ebuild 1869 -RMD160 92ac8c602cc4b35694bd0e7838df7942c8e5fba1 mrxvt-0.4.1.ebuild 1869 -SHA256 934b3dac132521031a3213acc0b17b4c8db1af6a451b6c4cbe7015af2dbc1d08 mrxvt-0.4.1.ebuild 1869 -EBUILD mrxvt-0.4.2.ebuild 2241 RMD160 6f909eb8c92469a702fd3dde4757e91a98bec877 SHA1 118be00ae74787319be7422f8b9180f42aebbf8d SHA256 8377c7a912b5a9fec51a457cc4dd7a1db21fec419bc78b18df28950fa289e88b -MD5 a2dcfc8e1bac38da271f106ec1b6c1d6 mrxvt-0.4.2.ebuild 2241 -RMD160 6f909eb8c92469a702fd3dde4757e91a98bec877 mrxvt-0.4.2.ebuild 2241 -SHA256 8377c7a912b5a9fec51a457cc4dd7a1db21fec419bc78b18df28950fa289e88b mrxvt-0.4.2.ebuild 2241 -EBUILD mrxvt-0.5.0.ebuild 2817 RMD160 52b12c812d19eabc0e1e72019d0729fbf353dd78 SHA1 0723a7cf5dc67d92e31077f8ec1a4e79ef12a69c SHA256 b8db40d2ef063352121be1b2fb4896d64edf6a00eefd733c5cb27161c6f5a93f -MD5 2ea20f8170f60858596c94f20c724246 mrxvt-0.5.0.ebuild 2817 -RMD160 52b12c812d19eabc0e1e72019d0729fbf353dd78 mrxvt-0.5.0.ebuild 2817 -SHA256 b8db40d2ef063352121be1b2fb4896d64edf6a00eefd733c5cb27161c6f5a93f mrxvt-0.5.0.ebuild 2817 EBUILD mrxvt-0.5.1.ebuild 2816 RMD160 b0427c932dea5764f741a335fa27d1b0cff29312 SHA1 4a9f392e182b127c7eadd99a05389893dfafc848 SHA256 c389991a1b15cf4e1191f052857bcd4e33b7079034576c488e9ac1b5d162dc34 MD5 25016d2806b4703a7dea49d8fb6befbb mrxvt-0.5.1.ebuild 2816 RMD160 b0427c932dea5764f741a335fa27d1b0cff29312 mrxvt-0.5.1.ebuild 2816 SHA256 c389991a1b15cf4e1191f052857bcd4e33b7079034576c488e9ac1b5d162dc34 mrxvt-0.5.1.ebuild 2816 -MISC ChangeLog 5974 RMD160 262da7298937a9e1b76105c3e5928b46da656764 SHA1 62ec5dc14858e8d853e0940fb3a932145d5975dd SHA256 5a2d7805db8eb7a3cce1eb62bb5bb85a160b1ba770e03b75fd1787869fb1d43c -MD5 4a0a8308bb93664f6290246cbf6e6942 ChangeLog 5974 -RMD160 262da7298937a9e1b76105c3e5928b46da656764 ChangeLog 5974 -SHA256 5a2d7805db8eb7a3cce1eb62bb5bb85a160b1ba770e03b75fd1787869fb1d43c ChangeLog 5974 +MISC ChangeLog 6247 RMD160 a92386cdfb88614a35f23e470520574de5cbb101 SHA1 012b8dd565f611bdee68a17aae13264edfcdec20 SHA256 e902f99685aa7e628cc92a42bd201dd8a091b4101c39ff88123d123decabac81 +MD5 bd7684d76c8e8cb84a489b81077bc1ad ChangeLog 6247 +RMD160 a92386cdfb88614a35f23e470520574de5cbb101 ChangeLog 6247 +SHA256 e902f99685aa7e628cc92a42bd201dd8a091b4101c39ff88123d123decabac81 ChangeLog 6247 MISC metadata.xml 285 RMD160 7a393ddbd1e4bc0b8c8105de7db5fb64469ab0eb SHA1 e33da3adbda26c1cc1f8ea6c2773b114d22fcfd1 SHA256 849e6d884378550f853c172d2a2f5095b9a167259155c0ec629c893c3ac13b83 MD5 3d61af9a82832d3ee3595f41c1bcff41 metadata.xml 285 RMD160 7a393ddbd1e4bc0b8c8105de7db5fb64469ab0eb metadata.xml 285 SHA256 849e6d884378550f853c172d2a2f5095b9a167259155c0ec629c893c3ac13b83 metadata.xml 285 -MD5 c1c69c0365b65e6fe61bb9d71061a16a files/digest-mrxvt-0.3.13-r1 64 -RMD160 0311466376bbc5db4551cee49b4e11976dfc2e14 files/digest-mrxvt-0.3.13-r1 64 -SHA256 bb0751a44e20533826a2cabd1a5effbd9054b00d4bb4984805a8cff06564afc0 files/digest-mrxvt-0.3.13-r1 64 -MD5 7543e73c29de0cdf2bb56ee68aa5ef86 files/digest-mrxvt-0.4.1 63 -RMD160 038313bfe42e3fb02d807f68e247ee3f39254b76 files/digest-mrxvt-0.4.1 63 -SHA256 c9dd762163a821f858e63528556d1953c70eacba8fd2393501b2407514edb4bc files/digest-mrxvt-0.4.1 63 -MD5 2165d78cb316cb30ab32d841eaf21484 files/digest-mrxvt-0.4.2 226 -RMD160 b2e10bb46a57a45d23bcecffffd07a4f878e8927 files/digest-mrxvt-0.4.2 226 -SHA256 32ccd3351bac6db9ff26ef64872fa6461312c13ff181c4158e417de186c1ace1 files/digest-mrxvt-0.4.2 226 -MD5 2ecbd83b55934b3aefeaae73d3c8c0b4 files/digest-mrxvt-0.5.0 235 -RMD160 7490e5522b0df9d0e3b5c6ea57faf5d54b97630b files/digest-mrxvt-0.5.0 235 -SHA256 8c4328f338de7a0aa7519821f402f5626c8c09333f65ffecdc1ba98817986018 files/digest-mrxvt-0.5.0 235 MD5 11fad6a50eb52027502e54d0f3eaf2b1 files/digest-mrxvt-0.5.1 235 RMD160 503eae99b635a56ebdb97642c8f37b2a21a66347 files/digest-mrxvt-0.5.1 235 SHA256 78149106af20984e8ebc740292bb2b82eb63ccdd15b9f1b76694dcfd3b38eb8f files/digest-mrxvt-0.5.1 235 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.4 (GNU/Linux) + +iD8DBQFEsM0Tgo/w9rxVVVERAq5qAJ96YqKktyvh50WUN3vNY1ul86pSQACfeAGs +nMh65wUo4EulUbV8/seJ5tQ= +=u7ZB +-----END PGP SIGNATURE----- diff --git a/x11-terms/mrxvt/files/digest-mrxvt-0.3.13-r1 b/x11-terms/mrxvt/files/digest-mrxvt-0.3.13-r1 deleted file mode 100644 index 579a5967d027..000000000000 --- a/x11-terms/mrxvt/files/digest-mrxvt-0.3.13-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 880bc53d17af9f177cc68d7ce1abd1a2 mrxvt-0.3.13.tar.gz 497798 diff --git a/x11-terms/mrxvt/files/digest-mrxvt-0.4.1 b/x11-terms/mrxvt/files/digest-mrxvt-0.4.1 deleted file mode 100644 index 5e645e803175..000000000000 --- a/x11-terms/mrxvt/files/digest-mrxvt-0.4.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 bd41f496e11d2a318e2fa59aca056793 mrxvt-0.4.1.tar.gz 504370 diff --git a/x11-terms/mrxvt/files/digest-mrxvt-0.4.2 b/x11-terms/mrxvt/files/digest-mrxvt-0.4.2 deleted file mode 100644 index 701f387b5efa..000000000000 --- a/x11-terms/mrxvt/files/digest-mrxvt-0.4.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 1e930a35ca2892f854b3d34e1ee0b6d0 mrxvt-0.4.2.tgz 508718 -RMD160 205a5df674ea37639108d60d4bc78373749ce58e mrxvt-0.4.2.tgz 508718 -SHA256 a6d348670641b043aa3cb7b55c2f3ebb4fbb521f8134b67e0821991b959f1830 mrxvt-0.4.2.tgz 508718 diff --git a/x11-terms/mrxvt/files/digest-mrxvt-0.5.0 b/x11-terms/mrxvt/files/digest-mrxvt-0.5.0 deleted file mode 100644 index 2d91d1bf0392..000000000000 --- a/x11-terms/mrxvt/files/digest-mrxvt-0.5.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ee0e6f5d7afaddfd399ae174f6adfcef mrxvt-0.5.0.tar.gz 592847 -RMD160 d197767075577ada0679ce1ab0c2c3dd9f900e22 mrxvt-0.5.0.tar.gz 592847 -SHA256 0c99edffab6293913c40c2d538d6f72059fed28571cf967350bdc87b553fbead mrxvt-0.5.0.tar.gz 592847 diff --git a/x11-terms/mrxvt/files/mrxvt-0.3.13-xdefaults.patch b/x11-terms/mrxvt/files/mrxvt-0.3.13-xdefaults.patch deleted file mode 100644 index 9adf02874660..000000000000 --- a/x11-terms/mrxvt/files/mrxvt-0.3.13-xdefaults.patch +++ /dev/null @@ -1,221 +0,0 @@ ---- xdefaults.c.orig 2005-02-04 04:57:51.000000000 +0900 -+++ xdefaults.c 2005-02-18 17:36:49.168153000 +0900 -@@ -58,7 +58,7 @@ - # ifndef USE_XGETDEFAULT - void rxvt_get_xdefaults (rxvt_t*, FILE*, const char*); - # else --char* get_xdefault_resource (XrmDatabase database, char *name, char *subClass, char *fullClass, char *resource); -+char* get_xdefault_resource (XrmDatabase database, const char *name, char *subClass, char *fullClass, char *resource); - # endif - #endif - /*--------------------------------------------------------------------* -@@ -100,7 +100,7 @@ - {(flag), -1, NULL, (opt), NULL, (desc), (multiple)} - - /* convenient macros */ --#define optList_strlen(i) \ -+#define optList_STRLEN(i) \ - (optList[i].flag ? 0 : (optList[i].arg ? STRLEN(optList[i].arg) : 1)) - #define optList_isBool(i) \ - (optList[i].flag & Opt_Boolean) -@@ -735,7 +735,7 @@ - int len = 0; - - if (!optList_isBool(i)) { -- len = optList_strlen(i); -+ len = optList_STRLEN(i); - if (len > 0) - len++; /* account for space */ - } -@@ -750,7 +750,7 @@ - } - fprintf(stderr, " [-%s%s", (optList_isBool(i) ? - "/+" : ""), optList[i].opt); -- if (optList_strlen(i)) -+ if (optList_STRLEN(i)) - fprintf(stderr, " %s]", optList[i].arg); - else - fprintf(stderr, "]"); -@@ -1002,7 +1002,7 @@ - if (entry < optList_size()) { - if (optList_isReverse(entry)) - flag = (flag == On) ? Off : On; -- if (optList_strlen(entry)) { /* string value */ -+ if (optList_STRLEN(entry)) { /* string value */ - const char *str = argv[++i]; - - DBG_MSG(2, (stderr, "string (%s,%s) = ", -@@ -1437,86 +1437,97 @@ - #ifdef USE_XGETDEFAULT - /* INTPROTO */ - char* --get_xdefault_resource(XrmDatabase database, char *name, char *subClass, char *fullClass, char *resource) -+get_xdefault_resource(XrmDatabase database, const char *name, char *subClass, char *fullClass, char *resource) - { -- char *resourceClass; -- char *str_class; -- char *str_name; -- char *generic_return_str_type = NULL; -- char *return_str_type = NULL; -- int i; -- -- Bool foundGeneric; -- Bool found; -- -- XrmValue return_value; -- static char *invalidPrefix = "! invalid name !"; -- -- int prefix_len = strlen(invalidPrefix); -- if (strlen(name) > prefix_len) { -- prefix_len = strlen(name); -- } -- if (strlen(subClass) > prefix_len) { -- prefix_len = strlen(subClass); -- } -- if (strlen(fullClass) > prefix_len) { -- prefix_len = strlen(fullClass); -- } -- str_class = malloc(prefix_len + strlen(resource) + 1); -- str_name = malloc(prefix_len + strlen(resource) + 1); -- sprintf(str_name, "%s.%s", name, resource); -- -- /* translate resource to class */ -- resourceClass = malloc(strlen(resource) + 1); -- resourceClass[0] = toupper(resource[0]); -- for (i = 1; i < strlen(resource); i++) { -- if (resource[i - 1] == '.') { -- resourceClass[i] = toupper(resource[i]); -- } else { -- resourceClass[i] = resource[i]; -- } -- } -- resourceClass[strlen(resource)] = 0; -+ char* resourceClass; -+ char* str_class; -+ char* str_name; -+ char* generic_return_str_type = NULL; -+ char* return_str_type = NULL; -+ int len, i; -+ Bool foundGeneric; -+ Bool found; -+ XrmValue return_value; -+ -+ static char* invalidPrefix = "! invalid name !"; -+ int prefix_len = STRLEN(invalidPrefix); -+ /* find the maximal prefix_len */ -+ if (STRLEN(name) > prefix_len) { -+ prefix_len = STRLEN(name); -+ } -+ if (STRLEN(subClass) > prefix_len) { -+ prefix_len = STRLEN(subClass); -+ } -+ if (STRLEN(fullClass) > prefix_len) { -+ prefix_len = STRLEN(fullClass); -+ } -+ -+ /* allocate memory for str_class and str_name */ -+ len = prefix_len + STRLEN(resource) + 2; -+ str_class = malloc(len); -+ str_name = malloc(len); -+ -+ snprintf(str_name, len-1, "%s.%s", name, resource); -+ str_name[len-1] = (char) 0; -+ -+ /* translate resource to class */ -+ resourceClass = malloc(STRLEN(resource) + 1); -+ resourceClass[0] = toupper(resource[0]); -+ for (i = 1; i < STRLEN(resource); i++) { -+ if (resource[i - 1] == '.') { -+ resourceClass[i] = toupper(resource[i]); -+ } -+ else { -+ resourceClass[i] = resource[i]; -+ } -+ } -+ resourceClass[STRLEN(resource)] = 0; - -- /* -- ** We need to get resources with two different class names. If -+ /* -+ ** We need to get resources with two different class names. If - ** both subClass and fullClass exist, then subClass takes - ** precedence. -- ** -- ** The original algorithm for this was to get null-prefix resource -- ** (i.e. *resource) as well as the subClass resource. If they -+ ** -+ ** The original algorithm for this was to get null-prefix resource -+ ** (i.e. *resource) as well as the subClass resource. If they - ** matched, then the fullClass was used. Unfortunately this has - ** a weakness; with the following database: -- ** *resource: value1 -- ** subClass.resource: value1 -- ** fullClass.resource: value2 -- ** the value used will be 'value2' instead of 'value1'. This is -+ ** *resource: value1 -+ ** subClass.resource: value1 -+ ** fullClass.resource: value2 -+ ** the value used will be 'value2' instead of 'value1'. This is - ** incorrect. -- ** -- ** However, we can cheat. XrmGetResource returns string pointers -+ ** -+ ** However, we can cheat. XrmGetResource returns string pointers - ** that are actually pointing to the internal string in the - ** database. Thus, if the *pointer* returned when looking for - ** the generic resource is the same as that for the subClass, - ** then they found the same thing. -- ** -- ** Note that XGetDefault *cannot* be used, as we may be getting -+ ** -+ ** Note that XGetDefault *cannot* be used, as we may be getting - ** multi-level resources, something that it does not support. -- */ -- sprintf(str_class, "%s.%s", invalidPrefix, resourceClass); -- foundGeneric = XrmGetResource(database, str_name, str_class, &generic_return_str_type, &return_value); -- -- sprintf(str_class, "%s.%s", subClass, resourceClass); -- found = XrmGetResource(database, str_name, str_class, &return_str_type, &return_value); -- -- if (!found || (foundGeneric && found && generic_return_str_type == return_str_type) ) { -- /* Subclass returned nothing or the same physical thing as the the generic. Try fullClass. */ -- sprintf(str_class, "%s.%s", fullClass, resourceClass); -- found = XrmGetResource(database, str_name, str_class, &return_str_type, &return_value); -- } -- -- free(str_class); -- free(str_name); -- return found ? (char *) return_value.addr : NULL; -+ */ -+ snprintf(str_class, len-1, "%s.%s", invalidPrefix, resourceClass); -+ str_name[len-1] = (char) 0; -+ foundGeneric = XrmGetResource(database, str_name, str_class, &generic_return_str_type, &return_value); -+ -+ snprintf(str_class, len-1, "%s.%s", subClass, resourceClass); -+ str_name[len-1] = (char) 0; -+ found = XrmGetResource(database, str_name, str_class, &return_str_type, &return_value); -+ -+ if (!found || -+ (foundGeneric && found && generic_return_str_type == return_str_type) ) { -+ /* Subclass returned nothing or the same physical thing as the the generic. Try fullClass. */ -+ snprintf(str_class, len-1, "%s.%s", fullClass, resourceClass); -+ str_name[len-1] = (char) 0; -+ found = XrmGetResource(database, str_name, str_class, &return_str_type, &return_value); -+ } -+ -+ /* free memory */ -+ free(str_class); -+ free(str_name); -+ -+ return found ? (char *) return_value.addr : NULL; - } - #endif /* USE_XGETDEFAULT */ - -@@ -1619,7 +1630,6 @@ - for (entry = 0; entry < optList_size(); entry++) { - int s; - char* p; -- char* p0; - register int i; - register int loop = optList[entry].multiple ? MAX_PAGES : 1; - diff --git a/x11-terms/mrxvt/files/noflicker-0.4.2.patch b/x11-terms/mrxvt/files/noflicker-0.4.2.patch deleted file mode 100644 index 9ce42c0a9c27..000000000000 --- a/x11-terms/mrxvt/files/noflicker-0.4.2.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff -ru /tmp/mrxvt-0.4.2/src/command.c ./src/command.c ---- /tmp/mrxvt-0.4.2/src/command.c 2005-06-24 17:16:26.000000000 -0500 -+++ ./src/command.c 2005-12-21 12:57:21.000000000 -0600 -@@ -36,6 +36,12 @@ - /* - ** $Id: noflicker-0.4.2.patch,v 1.1 2006/02/03 14:01:29 nelchael Exp $ - */ -+/* Modified 2005-12-21 by Gautam Iyer <gautam@math.uchicago.edu> -+ * -+ * 1. Eliminated the "BadMatch" XError sometimes generated -+ * 2. Eliminated "flicker" seen when using a transparent shaded terminal -+ * while changing desktop pages. -+ */ - - #include "../config.h" - #include "rxvt.h" -@@ -3740,10 +3746,22 @@ - } - #endif - --#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ -+#ifdef TRANSPARENT -+ /* -+ * Check to see if the previous position we grabbed the background is -+ * different from the current window position. If yes, then update -+ * everything. -+ */ - if (r->Options & Opt_transparent) { -- rxvt_check_our_parents(r); -- r->h->want_full_refresh = 1; -+ if( !r->bgGrabbed -+ || r->prevPos.x != ev->x -+ || r->prevPos.y != ev->y -+ || r->prevPos.width != ev->width -+ || r->prevPos.height != ev->height -+ ) { -+ rxvt_check_our_parents(r); -+ r->h->want_full_refresh = 1; -+ } - } - #endif - } -@@ -3782,7 +3800,9 @@ - if (ev->atom != r->h->xa[XA_XROOTPMAPID]) - return ; - -- if ((r->Options & Opt_transparent) && rxvt_check_our_parents(r)) { -+ if (r->Options & Opt_transparent) { -+ r->bgGrabbed = False; -+ rxvt_check_our_parents(r); - r->h->want_full_refresh = 1; - } - #endif /* TRANSPARENT */ -@@ -4549,6 +4569,14 @@ - 0, 0, &sx, &sy, &cr); - nw = r->szHint.width; - nh = r->szHint.height; -+ -+#if DEBUG_LEVEL -+ if( sx + nw <= 0 || sx >= (int) rootw || sy + nh <= 0 || sy >= (int) rooth) { -+ DBG_MSG( 1, (stderr, "Possible error: grabbing offscreen (%d, %d, %u, %u)\n", -+ sx, sy, nw, nh)); -+ } -+#endif -+ - *nx = *ny = 0; - if (sx < 0) { - nw += sx; -@@ -4707,8 +4735,14 @@ - rootpixmap = *((Pixmap*) prop); - XFree(prop); - } -+ else r->bgGrabbed = False; -+ -+ /* -+ * Use "while" instead of "if" so we can break out if transparency -+ * updates don't need to be performed. -+ */ -+ while (have_pixmap) { - -- if (have_pixmap) { - /* - ** Copy XROOT pixmap transparency - */ -@@ -4716,13 +4750,21 @@ - XImage* imagetw; - - /* -- ** handle BadMatch - usually because we're outside the -- ** pixmap. may need a delay here? -- */ -- r->h->allowedxerror = -1; -+ * Calling get_parent_ximage when the terminal window is off -+ * screen is pointless and generates a "Bad Match" XError while -+ * calling XGetImage. -+ */ -+ -+ if ( r->szHint.x + r->szHint.width <= 0 -+ || r->szHint.x >= (int) wrootattr.width -+ || r->szHint.y + r->szHint.height <= 0 -+ || r->szHint.y >= (int) wrootattr.height -+ ) -+ /* We're off screen. Don't update */ -+ break; -+ - imagetw = get_parent_ximage (r, rootpixmap, - wrootattr.width, wrootattr.height, &nx, &ny); -- r->h->allowedxerror = 0; - - if (NULL == imagetw) { - if (r->h->am_transparent && r->h->am_pixmap_trans) { -@@ -4746,10 +4788,18 @@ - if ((!r->h->am_transparent || !r->h->am_pixmap_trans) && - retvt) - */ -- if (retvt) -+ if (retvt) { -+ r->bgGrabbed = True; -+ r->prevPos.x = r->szHint.x; -+ r->prevPos.y = r->szHint.y; -+ r->prevPos.width = r->szHint.width; -+ r->prevPos.height = r->szHint.height; -+ - have_changed = 1; -+ } - r->h->am_transparent = r->h->am_pixmap_trans = 1; - } -+ break; - } - - /* -diff -ru /tmp/mrxvt-0.4.2/src/init.c ./src/init.c ---- /tmp/mrxvt-0.4.2/src/init.c 2005-10-07 20:07:45.000000000 -0500 -+++ ./src/init.c 2005-12-21 12:57:21.000000000 -0600 -@@ -1927,6 +1927,10 @@ - r->szHint.x = 0; - r->szHint.y = 0; - -+#ifdef TRANSPARENT -+ r->bgGrabbed = False; -+#endif -+ - /* Parse geometry */ - if (r->h->rs[Rs_geometry]) - flags = XParseGeometry(r->h->rs[Rs_geometry], &x, &y, &w, &h); -diff -ru /tmp/mrxvt-0.4.2/src/rxvtlib.h ./src/rxvtlib.h ---- /tmp/mrxvt-0.4.2/src/rxvtlib.h 2005-06-23 20:54:07.000000000 -0500 -+++ ./src/rxvtlib.h 2005-12-21 12:57:21.000000000 -0600 -@@ -757,6 +757,10 @@ - unsigned long Options; - unsigned long Options2; - XSizeHints szHint; -+#ifdef TRANSPARENT -+ XRectangle prevPos; /* previous onscreen position */ -+ Bool bgGrabbed; /* weather the bg was succesfully grabbed at prevPos */ -+#endif - - /* hotkeys */ - hotkeys_t* hotkeys; diff --git a/x11-terms/mrxvt/files/xft-colorbd-0.4.2.patch b/x11-terms/mrxvt/files/xft-colorbd-0.4.2.patch deleted file mode 100644 index a0b45f0c238f..000000000000 --- a/x11-terms/mrxvt/files/xft-colorbd-0.4.2.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -ru /tmp/mrxvt-0.4.2-orig/src/screen.c ./src/screen.c ---- /tmp/mrxvt-0.4.2-orig/src/screen.c 2005-06-23 23:26:55.000000000 -0500 -+++ ./src/screen.c 2005-12-22 14:33:46.000000000 -0600 -@@ -3278,7 +3278,7 @@ - } - } /* if (wbyte) */ - #else -- { -+ { /* } for correct % bouncing*/ - #endif - if (!fprop) { - /* single stepping - `normal' mode */ -@@ -3380,8 +3380,20 @@ - if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_BD) && - r->PixColors[fore] != r->PixColors[Color_BD] && - r->PixColors[back] != r->PixColors[Color_BD]) { -- gcvalue.foreground = r->PixColors[Color_BD]; -- gcmask |= GCForeground; -+# ifdef XFT_SUPPORT -+ /* -+ * XFT won't use the colors from the GC, so we need to set -+ * fore. Setting fore even when we're not using XFT -+ * shouldn't make a difference, but why take a chance :) -+ */ -+ if( (r->Options & Opt_xft) && PVTS(r, page)->xftvt ) -+ fore = Color_BD; -+ else -+# endif -+ { -+ gcvalue.foreground = r->PixColors[Color_BD]; -+ gcmask |= GCForeground; -+ } - if (!(r->Options2 & Opt2_veryBold)) - rend &= ~RS_Bold; /* we've taken care of it */ - } -@@ -3390,8 +3402,15 @@ - if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_UL) && - r->PixColors[fore] != r->PixColors[Color_UL] && - r->PixColors[back] != r->PixColors[Color_UL]) { -- gcvalue.foreground = r->PixColors[Color_UL]; -- gcmask |= GCForeground; -+# ifdef XFT_SUPPORT -+ if( (r->Options & Opt_xft) && PVTS(r, page)->xftvt ) -+ fore = Color_UL; -+ else -+# endif -+ { -+ gcvalue.foreground = r->PixColors[Color_UL]; -+ gcmask |= GCForeground; -+ } - rend &= ~RS_Uline; /* we've taken care of it */ - } - } diff --git a/x11-terms/mrxvt/mrxvt-0.3.13-r1.ebuild b/x11-terms/mrxvt/mrxvt-0.3.13-r1.ebuild deleted file mode 100644 index ed54b1d266c3..000000000000 --- a/x11-terms/mrxvt/mrxvt-0.3.13-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.3.13-r1.ebuild,v 1.5 2006/02/03 14:01:29 nelchael Exp $ - -inherit eutils - -IUSE="debug truetype xgetdefault" -#IUSE="${IUSE} utempter" - -DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support" -HOMEPAGE="http://materm.sourceforge.net/" -SRC_URI="mirror://sourceforge/materm/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc-macos ~amd64 ppc alpha" - -RDEPEND="dev-libs/expat - media-libs/libpng - media-libs/jpeg - truetype? ( virtual/xft - media-libs/fontconfig - media-libs/freetype ) - || ( ( - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXpm - x11-libs/libXrender ) - virtual/x11 )" -# utempter? ( sys-apps/utempter ) - -DEPEND="${RDEPEND} - || ( x11-proto/xproto virtual/x11 )" - -src_unpack() { - unpack ${A} - cd ${S}/src - epatch ${FILESDIR}/${P}-xdefaults.patch -} - -src_compile() { - local myconf - - # if you want to pass any other flags, use EXTRA_ECONF. - if use linguas_el ; then - myconf="${myconf} --enable-greek" - fi - if use linguas_ja ; then - # --with-encoding=sjis - myconf="${myconf} --enable-kanji --with-encoding=eucj" - fi - if use linguas_ko ; then - myconf="${myconf} --enable-kr --with-encoding=kr" - fi - if use linguas_th ; then - myconf="${myconf} --enable-thai" - fi - if use linguas_zh_CN ; then - # --with-encoding=gbk - myconf="${myconf} --enable-gb --with-encoding=gb" - fi - if use linguas_zh_TW ; then - myconf="${myconf} --enable-big5 --with-encoding=big5" - fi - - ./bootstrap.sh - - econf \ - --enable-everything \ - --enable-rxvt-scroll \ - --enable-next-scroll \ - --enable-xterm-scroll \ - --enable-transparency \ - --enable-xpm-background \ - --enable-fading \ - --enable-utmp \ - --enable-wtmp \ - --enable-mousewheel \ - --enable-slipwheeling \ - --enable-smart-resize \ - --enable-ttygid \ - --enable-256-color \ - --enable-xim \ - --enable-shared \ - --enable-keepscrolling \ - --enable-xft \ - $(use_enable xgetdefault) \ - $(use_enable truetype xft) \ - $(use_enable debug) \ - --disable-text-blink \ - --disable-menubar \ - ${myconf} || die - - emake || die -} - -src_install() { - make DESTDIR=${D} docdir=/usr/share/doc/${PF} install || die - - dodoc AUTHORS CREDITS ChangeLog FAQ NEWS README* TODO -} diff --git a/x11-terms/mrxvt/mrxvt-0.4.1.ebuild b/x11-terms/mrxvt/mrxvt-0.4.1.ebuild deleted file mode 100644 index f3a9f030f52a..000000000000 --- a/x11-terms/mrxvt/mrxvt-0.4.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.4.1.ebuild,v 1.6 2006/01/13 23:57:55 nelchael Exp $ - -IUSE="debug truetype xgetdefault menubar" -#IUSE="${IUSE} utempter" - -DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support" -HOMEPAGE="http://materm.sourceforge.net/" -SRC_URI="mirror://sourceforge/materm/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha ~amd64 ~mips ppc ~ppc-macos x86" - -RDEPEND="dev-libs/expat - media-libs/libpng - media-libs/jpeg - truetype? ( virtual/xft - media-libs/fontconfig - media-libs/freetype ) - || ( ( - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXpm - x11-libs/libXrender ) - virtual/x11 )" -# utempter? ( sys-apps/utempter ) - -DEPEND="${RDEPEND} - || ( x11-proto/xproto virtual/x11 )" - -src_compile() { - local myconf - - # if you want to pass any other flags, use EXTRA_ECONF. - if use linguas_el ; then - myconf="${myconf} --enable-greek" - fi - if use linguas_ja ; then - # --with-encoding=sjis - myconf="${myconf} --enable-kanji --with-encoding=eucj" - fi - if use linguas_ko ; then - myconf="${myconf} --enable-kr --with-encoding=kr" - fi - if use linguas_th ; then - myconf="${myconf} --enable-thai" - fi - if use linguas_zh_CN ; then - # --with-encoding=gbk - myconf="${myconf} --enable-gb --with-encoding=gb" - fi - if use linguas_zh_TW ; then - myconf="${myconf} --enable-big5 --with-encoding=big5" - fi - - econf \ - --enable-everything \ - $(use_enable xgetdefault) \ - $(use_enable truetype xft) \ - $(use_enable debug) \ - $(use_enable menubar) \ - --disable-text-blink \ - ${myconf} || die - - emake || die -} - -src_install() { - make DESTDIR=${D} docdir=/usr/share/doc/${PF} install || die - - gzip -9 ${D}/usr/share/doc/${PF}/* - dodoc AUTHORS CREDITS ChangeLog FAQ NEWS README* TODO -} diff --git a/x11-terms/mrxvt/mrxvt-0.4.2.ebuild b/x11-terms/mrxvt/mrxvt-0.4.2.ebuild deleted file mode 100644 index 61c8f28db3f7..000000000000 --- a/x11-terms/mrxvt/mrxvt-0.4.2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.4.2.ebuild,v 1.3 2006/04/16 22:33:53 hansmi Exp $ - -inherit eutils - -IUSE="debug truetype xgetdefault menubar" -#IUSE="${IUSE} utempter" - -DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support" -HOMEPAGE="http://materm.sourceforge.net/" -SRC_URI="mirror://sourceforge/materm/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ppc ~ppc-macos x86" - -RDEPEND="dev-libs/expat - media-libs/libpng - media-libs/jpeg - truetype? ( virtual/xft - media-libs/fontconfig - media-libs/freetype ) - || ( ( - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXpm - x11-libs/libXrender ) - virtual/x11 )" -# utempter? ( sys-apps/utempter ) - -DEPEND="${RDEPEND} - || ( x11-proto/xproto virtual/x11 )" - -src_unpack() { - - unpack "${A}" - cd "${S}" - - # 2005-12-21: Eliminate flicker for transparent terminals - epatch "${FILESDIR}/noflicker-${PV}.patch" - - # 2005-12-22: Fix bug #1337635. Use ColorBD / ColorUL with xft - epatch "${FILESDIR}/xft-colorbd-${PV}.patch" - - # 2005-12-22: Enable hilight color for selection - sed -ie '99s/\/\* \(.*\) \*\//\1/' src/feature.h - -} - -src_compile() { - - local myconf - - # if you want to pass any other flags, use EXTRA_ECONF. - if use linguas_el ; then - myconf="${myconf} --enable-greek" - fi - if use linguas_ja ; then - # --with-encoding=sjis - myconf="${myconf} --enable-kanji --with-encoding=eucj" - fi - if use linguas_ko ; then - myconf="${myconf} --enable-kr --with-encoding=kr" - fi - if use linguas_th ; then - myconf="${myconf} --enable-thai" - fi - if use linguas_zh_CN ; then - # --with-encoding=gbk - myconf="${myconf} --enable-gb --with-encoding=gb" - fi - if use linguas_zh_TW ; then - myconf="${myconf} --enable-big5 --with-encoding=big5" - fi - - econf \ - --enable-everything \ - $(use_enable xgetdefault) \ - $(use_enable truetype xft) \ - $(use_enable debug) \ - $(use_enable menubar) \ - --disable-text-blink \ - ${myconf} || die - - emake || die - -} - -src_install() { - - make DESTDIR=${D} docdir=/usr/share/doc/${PF} install || die - - gzip -9 ${D}/usr/share/doc/${PF}/* - dodoc AUTHORS CREDITS ChangeLog FAQ NEWS README* TODO - -} diff --git a/x11-terms/mrxvt/mrxvt-0.5.0.ebuild b/x11-terms/mrxvt/mrxvt-0.5.0.ebuild deleted file mode 100644 index 0a415c65d90c..000000000000 --- a/x11-terms/mrxvt/mrxvt-0.5.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.5.0.ebuild,v 1.6 2006/07/09 01:29:35 kumba Exp $ - -inherit eutils - -IUSE="debug png jpeg session truetype menubar" - -DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support" -HOMEPAGE="http://materm.sourceforge.net/" -SRC_URI="mirror://sourceforge/materm/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 mips ppc ~ppc-macos x86" - -RDEPEND="png? ( media-libs/libpng ) - jpeg? ( media-libs/jpeg ) - truetype? ( virtual/xft - media-libs/fontconfig - media-libs/freetype ) - || ( ( - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXpm - x11-libs/libXrender ) - virtual/x11 )" - -DEPEND="${RDEPEND} - || ( x11-proto/xproto virtual/x11 )" - -src_compile() { - - local myconf - - # if you want to pass any other flags, use EXTRA_ECONF. - if use linguas_el ; then - myconf="${myconf} --enable-greek" - fi - if use linguas_ja ; then - # --with-encoding=sjis - myconf="${myconf} --enable-kanji --with-encoding=eucj" - fi - if use linguas_ko ; then - myconf="${myconf} --enable-kr --with-encoding=kr" - fi - if use linguas_th ; then - myconf="${myconf} --enable-thai" - fi - if use linguas_zh_CN ; then - # --with-encoding=gbk - myconf="${myconf} --enable-gb --with-encoding=gb" - fi - if use linguas_zh_TW ; then - myconf="${myconf} --enable-big5 --with-encoding=big5" - fi - - # 2006-03-13 gi1242: mrxvt works best with TERM=rxvt AND correctly set - # termcap / terminfo entries. If the rxvt termcap / terminfo entries are - # messed up then then it's better to set TERM=xterm. - # - # Provide support for this by setting the or RXVT_TERM environment variables - # before emerging, as done in the rxvt ebuild. - - if [[ -n ${RXVT_TERM} ]]; then - myconf="${myconf} --with-term=${RXVT_TERM}" - fi - - econf \ - --enable-everything \ - $(use_enable debug) \ - $(use_enable png) \ - $(use_enable jpeg) \ - $(use_enable session sessionmgr) \ - $(use_enable truetype xft) \ - $(use_enable menubar) \ - ${myconf} || die - - emake || die - -} - -src_install() { - - make DESTDIR=${D} docdir=/usr/share/doc/${PF} install || die - dodoc AUTHORS CREDITS ChangeLog FAQ NEWS README* TODO - -} - -pkg_postinst() { - - if [[ -z $RXVT_TERM ]]; then - einfo - einfo "If you experience problems with curses programs, then this is" - einfo "most likely because of incorrectly set termcap / terminfo" - einfo "entries. If you are unsure how to fix them, then you can try" - einfo "setting TERM=xterm." - einfo - einfo "To emerge mrxvt with TERM=xterm by default, set the RXVT_TERM" - einfo "environment variable to 'xterm', or your desired default" - einfo "terminal name. Alternately you can put 'Mrxvt.termName: xterm'" - einfo "in your ~/.mrxvtrc, or /etc/mrxvt/mrxvtrc." - einfo - fi - -} |