From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 14 Jul 2018 20:57:42 +0100
Subject: gentoo resync : 14.07.2018
---
dev-tcltk/tix/Manifest | 6 -
dev-tcltk/tix/files/tix-8.4.3-link.patch | 11 --
dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch | 190 -----------------------------
dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch | 18 ---
dev-tcltk/tix/metadata.xml | 11 --
dev-tcltk/tix/tix-8.4.3-r1.ebuild | 60 ---------
6 files changed, 296 deletions(-)
delete mode 100644 dev-tcltk/tix/Manifest
delete mode 100644 dev-tcltk/tix/files/tix-8.4.3-link.patch
delete mode 100644 dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch
delete mode 100644 dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch
delete mode 100644 dev-tcltk/tix/metadata.xml
delete mode 100644 dev-tcltk/tix/tix-8.4.3-r1.ebuild
(limited to 'dev-tcltk/tix')
diff --git a/dev-tcltk/tix/Manifest b/dev-tcltk/tix/Manifest
deleted file mode 100644
index 3d94164e3034..000000000000
--- a/dev-tcltk/tix/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX tix-8.4.3-link.patch 402 BLAKE2B 229737acefdcea3f424ab0e961cbd6561b981b061c8e418139ccf4802e8057f198b95a64bc4cac17fc4daa259f925d4b8e831f035a702f2931b80f15d5d67984 SHA512 e220035cc8d71592dfe72e73e1fb92f79f7750b5c8a97d749bdb67aef9488a3684aad7873041ba6054083287c758889cb243d6cac5b83281f738b1392f29a821
-AUX tix-8.4.3-tcl8.5.patch 6808 BLAKE2B f7344618960c685302192cfb4420cf1a18a973eb9e8baf9f7815938439d3a463035ee2724339700a75ace4705e7d03761bccf76b4f2b177a38876d945da4d58a SHA512 e3dacb53df3852c195306f9d7220f931592ea3ec606b121ac02e3b4f84684efb9da9cae4e51e4fb3b818d7277860bf72378fe63ae835d9eb3a2b7539aee9f9cd
-AUX tix-8.4.3-tcl8.6.patch 665 BLAKE2B 188df36874cedc7aade7f04b567dabbfe95c2451fc095d4ece12b1750bc4837c26bb6cb93ad33ee61632cf7d1e5ad82de479030d73b81bf2db7b6b8f8ec1f051 SHA512 3b390b551c6d59d4af695d5c60c8c47c9dc270f97b5e8fd8dab23540c2c0f41b2ef2a43d6dc21249930f294354012718866bcbf773f58c43df7c5e8ee8f22f9e
-DIST Tix8.4.3-src.tar.gz 1831503 BLAKE2B ec3a388bd8ce4f2b433defece3cafcd64aa07da9d8f9b1e23dc5c62f2dca0170cae3c5fc2e8df0ceeada7c48a749929ae9138346d8d38b528ba99b52d036f8da SHA512 f13217dad0f52c0b706d2fb8ee0886942db64be0325e5d0d51801dbf9a92a7919c743c1445b76dbfa98815817685205e238e2d63f9366a8745ace1e1e9a01852
-EBUILD tix-8.4.3-r1.ebuild 1376 BLAKE2B 36ed6ae6b88948af499fbf4ed3e972526372e9e4c37cdeabc4e48bb28638bc6f4d52f0b7cd1febdc656aa53ee79ce96d314a57e4615f6461e283314f1f89e6e8 SHA512 3889acc7b693196c1804da46dc20ee9ab60354e2dd11f39ca65465daec1e3934962321b5e21a839a8daef788b4f4f23a2ad5ae6205dd9677f57ca700fa00f1ee
-MISC metadata.xml 326 BLAKE2B 3dd7044d395bacde28195a421c60be7f696572b5e308ecc2e1f8e2012f6a3e1645f849fd67a577bd00f756ab1ed8baa1efce1e64ea3b758fd79a012b9391c9d9 SHA512 dff5470f4f3ea0164cd7bac8ea41ea6589134bd59f8a0992021bcec2962cbaecdfb4f76e68ea417c8b9ec4c573f89dcb109821208d429672dd5467814148aae7
diff --git a/dev-tcltk/tix/files/tix-8.4.3-link.patch b/dev-tcltk/tix/files/tix-8.4.3-link.patch
deleted file mode 100644
index d2d402dc8e49..000000000000
--- a/dev-tcltk/tix/files/tix-8.4.3-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Tix8.4.2/Makefile.in.link 2006-11-18 04:41:06.000000000 +0100
-+++ Tix8.4.2/Makefile.in 2006-11-18 04:43:13.000000000 +0100
-@@ -124,7 +124,7 @@
- RANLIB = @RANLIB@
- RANLIB_STUB = @RANLIB_STUB@
- SHLIB_CFLAGS = @SHLIB_CFLAGS@
--SHLIB_LD = @SHLIB_LD@
-+SHLIB_LD = @SHLIB_LD@ $(CFLAGS) -Wl,-soname=$(PKG_LIB_FILE)
- SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@
- SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
- STLIB_LD = @STLIB_LD@
diff --git a/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch b/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch
deleted file mode 100644
index d87cbff7e9a2..000000000000
--- a/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-diff -up Tix8.4.2/generic/tixImgXpm.c_old Tix8.4.2/generic/tixImgXpm.c
---- Tix8.4.2/generic/tixImgXpm.c_old 2008-01-08 11:53:37.000000000 +0100
-+++ Tix8.4.2/generic/tixImgXpm.c 2008-01-08 12:04:49.000000000 +0100
-@@ -45,19 +45,19 @@ static int ImgXpmConfigureMaster _ANSI_
- int flags));
- static int ImgXpmGetData _ANSI_ARGS_((Tcl_Interp *interp,
- PixmapMaster *masterPtr));
--static char ** ImgXpmGetDataFromFile _ANSI_ARGS_((Tcl_Interp * interp,
-+static CONST84 char ** ImgXpmGetDataFromFile _ANSI_ARGS_((Tcl_Interp * interp,
- char * string, int * numLines_return));
--static char ** ImgXpmGetDataFromId _ANSI_ARGS_((Tcl_Interp * interp,
-+static CONST84 char ** ImgXpmGetDataFromId _ANSI_ARGS_((Tcl_Interp * interp,
- CONST84 char * id));
--static char ** ImgXpmGetDataFromString _ANSI_ARGS_((Tcl_Interp*interp,
-+static CONST84 char ** ImgXpmGetDataFromString _ANSI_ARGS_((Tcl_Interp*interp,
- char * string, int * numLines_return));
- static void ImgXpmGetPixmapFromData _ANSI_ARGS_((
- Tcl_Interp * interp,
- PixmapMaster *masterPtr,
- PixmapInstance *instancePtr));
--static char * GetType _ANSI_ARGS_((char * colorDefn,
-+static CONST84 char * GetType _ANSI_ARGS_((CONST84 char * colorDefn,
- int * type_ret));
--static char * GetColor _ANSI_ARGS_((char * colorDefn,
-+static CONST84 char * GetColor _ANSI_ARGS_((CONST84 char * colorDefn,
- char * colorName, int * type_ret));
-
- /*
-@@ -286,7 +286,7 @@ ImgXpmGetData(interp, masterPtr)
- Tcl_Interp *interp; /* For reporting errors. */
- PixmapMaster *masterPtr;
- {
-- char ** data = NULL;
-+ CONST84 char ** data = NULL;
- int isAllocated = 0; /* do we need to free "data"? */
- int listArgc;
- CONST84 char ** listArgv = NULL;
-@@ -363,7 +363,7 @@ ImgXpmGetData(interp, masterPtr)
- return code;
- }
-
--static char ** ImgXpmGetDataFromId(interp, id)
-+static CONST84 char ** ImgXpmGetDataFromId(interp, id)
- Tcl_Interp * interp;
- CONST84 char * id;
- {
-@@ -378,13 +378,13 @@ static char ** ImgXpmGetDataFromId(inter
- if (hashPtr == NULL) {
- Tcl_AppendResult(interp, "unknown pixmap ID \"", id,
- "\"", NULL);
-- return (char**)NULL;
-+ return NULL;
- } else {
-- return (char**)Tcl_GetHashValue(hashPtr);
-+ return (CONST84 char**)Tcl_GetHashValue(hashPtr);
- }
- }
-
--static char ** ImgXpmGetDataFromString(interp, string, numLines_return)
-+static CONST84 char ** ImgXpmGetDataFromString(interp, string, numLines_return)
- Tcl_Interp * interp;
- char * string;
- int * numLines_return;
-@@ -392,7 +392,7 @@ static char ** ImgXpmGetDataFromString(i
- int quoted;
- char * p, * list;
- int numLines;
-- char ** data;
-+ CONST84 char ** data;
-
- /* skip the leading blanks (leading blanks are not defined in the
- * the XPM definition, but skipping them shouldn't hurt. Also, the ability
-@@ -510,17 +510,17 @@ static char ** ImgXpmGetDataFromString(i
-
- error:
- Tcl_AppendResult(interp, "File format error", NULL);
-- return (char**) NULL;
-+ return NULL;
- }
-
--static char ** ImgXpmGetDataFromFile(interp, fileName, numLines_return)
-+static CONST84 char ** ImgXpmGetDataFromFile(interp, fileName, numLines_return)
- Tcl_Interp * interp;
- char * fileName;
- int * numLines_return;
- {
- FILE * fd = NULL;
- int size, n;
-- char ** data;
-+ CONST84 char ** data;
- char *cmdBuffer = NULL;
- Tcl_DString buffer; /* initialized by Tcl_TildeSubst */
-
-@@ -588,16 +588,16 @@ static char ** ImgXpmGetDataFromFile(int
- ckfree(cmdBuffer);
- }
- Tcl_DStringFree(&buffer);
-- return (char**)NULL;
-+ return NULL;
- }
-
-
--static char *
-+static CONST84 char *
- GetType(colorDefn, type_ret)
-- char * colorDefn;
-+ CONST84 char * colorDefn;
- int * type_ret;
- {
-- char * p = colorDefn;
-+ CONST84 char * p = colorDefn;
-
- /* skip white spaces */
- while (*p && isspace(*p)) {
-@@ -642,9 +642,9 @@ GetType(colorDefn, type_ret)
- /*
- * colorName is guaranteed to be big enough
- */
--static char *
-+static CONST84 char *
- GetColor(colorDefn, colorName, type_ret)
-- char * colorDefn;
-+ CONST84 char * colorDefn;
- char * colorName; /* if found, name is copied to this array */
- int * type_ret;
- {
-@@ -751,7 +751,7 @@ ImgXpmGetPixmapFromData(interp, masterPt
- }
-
- for (i=0; i<masterPtr->ncolors; i++) {
-- char * colorDefn; /* the color definition line */
-+ CONST84 char * colorDefn; /* the color definition line */
- char * colorName; /* temp place to hold the color name
- * defined for one type of visual */
- char * useName; /* the color name used for this
-@@ -842,7 +842,7 @@ ImgXpmGetPixmapFromData(interp, masterPt
- * Parse the main body of the image
- */
- for (i=0; i<masterPtr->size[1]; i++) {
-- char * p = masterPtr->data[i+lOffset];
-+ CONST84 char * p = masterPtr->data[i+lOffset];
-
- for (j=0; j<masterPtr->size[0]; j++) {
- if (masterPtr->cpp == 1) {
-diff -up Tix8.4.2/generic/tixImgXpm.h_old Tix8.4.2/generic/tixImgXpm.h
---- Tix8.4.2/generic/tixImgXpm.h_old 2008-01-08 12:04:59.000000000 +0100
-+++ Tix8.4.2/generic/tixImgXpm.h 2008-01-08 12:05:26.000000000 +0100
-@@ -55,7 +55,7 @@ typedef struct PixmapMaster {
- int size[2]; /* width and height */
- int ncolors; /* number of colors */
- int cpp; /* characters per pixel */
-- char ** data; /* The data that defines this pixmap
-+ CONST84 char ** data; /* The data that defines this pixmap
- * image (array of strings). It is
- * converted into an X Pixmap when this
- * image is instanciated
-diff -up Tix8.4.2/generic/tixInt.h_old Tix8.4.2/generic/tixInt.h
---- Tix8.4.2/generic/tixInt.h_old 2008-01-08 12:05:53.000000000 +0100
-+++ Tix8.4.2/generic/tixInt.h 2008-01-08 12:09:35.000000000 +0100
-@@ -23,6 +23,10 @@
- #include <tixPort.h>
- #endif
-
-+#include <stdlib.h>
-+#include <string.h>
-+#include <ctype.h>
-+
- /*----------------------------------------------------------------------
- *
- * Tix Display Item Types
-diff -up Tix8.4.2/Makefile.in_old Tix8.4.2/Makefile.in
---- Tix8.4.2/Makefile.in_old 2008-01-08 11:43:41.000000000 +0100
-+++ Tix8.4.2/Makefile.in 2008-01-08 11:46:22.000000000 +0100
-@@ -128,6 +128,7 @@ SHLIB_LD = @SHLIB_LD@ $(CFLAGS) -Wl,-son
- SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@
- SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
- STLIB_LD = @STLIB_LD@
-+TCL_VERSION = @TCL_VERSION@
- TCL_DEFS = @TCL_DEFS@
- TCL_SRC_DIR = @TCL_SRC_DIR@
- TCL_BIN_DIR = @TCL_BIN_DIR@
-@@ -294,7 +295,7 @@ VPATH = $(srcdir):$(srcdir)/generic:$(sr
-
- pkgIndex.tcl:
- (\
-- echo 'if {[catch {package require Tcl 8.4}]} return';\
-+ echo 'if {[catch {package require Tcl $(TCL_VERSION)}]} return';\
- echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
- [list load [file join $$dir $(PKG_LIB_FILE)] $(PACKAGE_NAME)]'\
- ) > pkgIndex.tcl
diff --git a/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch b/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch
deleted file mode 100644
index 0ed17503a56f..000000000000
--- a/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- generic/tixGrSort.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/generic/tixGrSort.c b/generic/tixGrSort.c
-index 7dee30f..26ec054 100644
---- a/generic/tixGrSort.c
-+++ b/generic/tixGrSort.c
-@@ -447,8 +447,8 @@ SortCompareProc(first, second)
- * Parse the result of the command.
- */
-
-- order = strtol(sortInterp->result, &end, 0);
-- if ((end == sortInterp->result) || (*end != 0)) {
-+ order = strtol(Tcl_GetStringResult(sortInterp), &end, 0);
-+ if ((end == Tcl_GetStringResult(sortInterp)) || (*end != 0)) {
- Tcl_ResetResult(sortInterp);
- Tcl_AppendResult(sortInterp,
- "comparison command returned non-numeric result",
diff --git a/dev-tcltk/tix/metadata.xml b/dev-tcltk/tix/metadata.xml
deleted file mode 100644
index 1925cd538b7d..000000000000
--- a/dev-tcltk/tix/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>tcltk@gentoo.org</email>
- <name>Gentoo Tcltk Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">tix</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-tcltk/tix/tix-8.4.3-r1.ebuild b/dev-tcltk/tix/tix-8.4.3-r1.ebuild
deleted file mode 100644
index fea8efa756fc..000000000000
--- a/dev-tcltk/tix/tix-8.4.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-MY_P="Tix${PV}"
-DESCRIPTION="A widget library for Tcl/Tk"
-HOMEPAGE="http://tix.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tix/${MY_P}-src.tar.gz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-RESTRICT="test"
-
-DEPEND="
- dev-lang/tk:0=
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- (use x86-macos || use x64-macos) || epatch "${FILESDIR}"/${P}-link.patch
- sed \
- -e 's:-Os::g' \
- -i configure tclconfig/tcl.m4 || die
- epatch \
- "${FILESDIR}"/${P}-tcl8.5.patch \
- "${FILESDIR}"/${P}-tcl8.6.patch
-}
-
-src_configure() {
- econf \
- --with-tcl="${EPREFIX}/usr/$(get_libdir)" \
- --with-tk="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
- default
-
- # Bug 168897
- doheader generic/tix.h
- # Bug 201138
- if use x86-macos || use x64-macos; then
- mv "${ED}"/usr/$(get_libdir)/${MY_P}/libTix{,.}${PV}.dylib
- dosym ${MY_P}/libTix.${PV}.dylib /usr/$(get_libdir)/libTix.${PV}.dylib
- else
- dosym ${MY_P}/lib${MY_P}.so /usr/$(get_libdir)/lib${MY_P}.so
- fi
-
- dodoc ChangeLog README.txt docs/*.txt
- dohtml -r index.html ABOUT.html docs/
-}
--
cgit v1.2.3