*** empty log message ***

6 files changed, 94 insertions, 78 deletions

diff --git a/dev-tcltk/tix/ChangeLog b/dev-tcltk/tix/ChangeLog
index 345985e971e8..ed850bf02269 100644
--- a/dev-tcltk/tix/ChangeLog
+++ b/dev-tcltk/tix/ChangeLog
@@ -1,8 +1,49 @@
 # ChangeLog for dev-tcltk/tix
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL, v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/ChangeLog,v 1.1 2002/10/31 22:31:16 karltk Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/ChangeLog,v 1.1.1.1 2005/11/30 10:01:36 chriswhite Exp $
 
+  09 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> tix-8.2.0-r2.ebuild:
+  added ~amd64 KEYWORD, fixes #82914
+
+*tix-8.2.0-r2 (01 Feb 2005)
+
+  01 Feb 2005; Karl Trygve Kalleberg <karltk@gentoo.org> tix-8.2.0-r2.ebuild:
+  Bumped revision. Fixes #79474.
+
+  10 Jun 2004; Ferris McCormick <fmccor@gentoo.org> tix-8.2.0-r1.ebuild:
+  Marked stable for sparc.
+
+  23 May 2004; Ferris McCormick <fmccor@gentoo.org> tix-8.2.0-r1.ebuild:
+  Add ~sparc keyword.
+
+*tix-8.2.0-r1 (12 Apr 2004)
+
+  12 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> tix-8.2.0-r1.ebuild:
+  rev bump so the header file fix goes out.
+
+  12 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> tix-8.2.0.ebuild:
+  fix for bug #46561; inherit eutils for epatch; use emake -j1 for buggy
+  makefiles
+
+  04 Apr 2004; Chris Aniszczyk <zx@gentoo.org> metadata.xml, tix-8.2.0.ebuild:
+  Clean up.
+
+  24 Jan 2004; Alastair Tse <liquidx@gentoo.org> tix-8.2.0.ebuild:
+  applied more fixes for unresolved symbols (#29371)
+
+  18 Oct 2003; Alastair Tse <liquidx@gentoo.org> tix-8.2.0.ebuild:
+  add fix for unresolved symbols in X11 (#29371)
+
+  10 May 2003; Stanislav Brabec <sb@gentoo.org> tix-8.2.0.ebuild:
+  Removed obsolete fix_makefile (bug #20259) and removed dependency on
+  sed-4.0.5. Now should work with both tk-8.3.4-r1 and tk-8.4.*.
+
+*tix-8.2.0 (31 Oct 2002)
 *tix-8.2.0b1 (11 Oct 2002)
 
+  31 Jan 2003; Martin Holzer <mholzer@gentoo.org> tix-8.2.0b1.ebuild
+  files/tix-8.2.0-gentoo.diff ChangeLog :
+  Change SRC_URI to use mirror://sourceforge. Fixed diff. Closes #14141.
+
   11 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> tix-8.2.0b1.ebuild files/digest-tix-8.2.0b1 :
   Initial import. Ebuild submitted by Pete Gale <pete@SoulCoffee.org>.
diff --git a/dev-tcltk/tix/Manifest b/dev-tcltk/tix/Manifest
index e69de29bb2d1..1a50c0f6d263 100644
--- a/dev-tcltk/tix/Manifest
+++ b/dev-tcltk/tix/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c5a8b609a654bc52491d5da502000d90 tix-8.2.0-r2.ebuild 1135
+MD5 c6fef53b335b06b39d3fc77922daf928 tix-8.2.0.ebuild 1123
+MD5 3966141a2ccf534122aa1f54ce3d4139 tix-8.2.0-r1.ebuild 1126
+MD5 543356e14f8b2dee45e567de48a5f974 ChangeLog 1906
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 ea64edb8aaac879cf4c5d01ee6349394 files/digest-tix-8.2.0-r1 63
+MD5 ea64edb8aaac879cf4c5d01ee6349394 files/digest-tix-8.2.0-r2 63
+MD5 19bebbc485fa998898efa8592573adc5 files/tix-8.2.0-gentoo.diff 9779
+MD5 ea64edb8aaac879cf4c5d01ee6349394 files/digest-tix-8.2.0 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCLzlw06ebR+OMO78RAuB4AJ4wL+AizNQ5Ux4xzySmPWr4Y0G/QgCeN8Sv
+4Rhs3F9QYo6sHkybMw1qHdM=
+=D7Mx
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tix/files/tix-8.2.0-gentoo.diff b/dev-tcltk/tix/files/tix-8.2.0-gentoo.diff
index c254a0277f81..d50cfc9fe1c8 100644
--- a/dev-tcltk/tix/files/tix-8.2.0-gentoo.diff
+++ b/dev-tcltk/tix/files/tix-8.2.0-gentoo.diff
@@ -1,6 +1,6 @@
 diff -aurN tix8.2.0/unix/Makefile.in funkhouser's/patch/Makefile.in 
 --- tix8.2.0/unix/Makefile.in	2001-01-10 23:43:46.000000000 -0800
-+++ Makefile.in	2002-10-11 13:58:52.000000000 -0700
++++ unix/Makefile.in	2002-10-11 13:58:52.000000000 -0700
 @@ -44,6 +44,9 @@
  # Directory in which to install libtix.so or libtix.a:
  LIB_INSTALL_DIR		= $(INSTALL_ROOT)$(libdir)
@@ -41,16 +41,7 @@ diff -aurN tix8.2.0/unix/Makefile.in funkhouser's/patch/Makefile.in
 
 diff -aurN tix8.2.0/library/HList.tcl haneef's/patch/HList.tcl 
 --- tix8.2.0/library/HList.tcl	2001-01-23 23:28:35.000000000 -0800
-+++ HList.tcl	2002-10-11 13:57:35.000000000 -0700
-@@ -9,7 +9,7 @@
- # See the file "license.terms" for information on usage and redistribution
- # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- #
--# $Id: tix-8.2.0-gentoo.diff,v 1.1 2002/10/31 22:31:16 karltk Exp $
-+# $Id: tix-8.2.0-gentoo.diff,v 1.1 2002/10/31 22:31:16 karltk Exp $
- 
- 
- #--------------------------------------------------------------------------
++++ library/HList.tcl	2002-10-11 13:57:35.000000000 -0700
 @@ -394,6 +394,9 @@
  
  proc tixHList:AutoScan {w} {
diff --git a/dev-tcltk/tix/tix-8.2.0-r1.ebuild b/dev-tcltk/tix/tix-8.2.0-r1.ebuild
index 9de567b34bda..7363604b48bf 100644
--- a/dev-tcltk/tix/tix-8.2.0-r1.ebuild
+++ b/dev-tcltk/tix/tix-8.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/tix-8.2.0-r1.ebuild,v 1.1 2004/04/13 00:43:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/tix-8.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:01:36 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tixlibrary/${MY_P}b1.tar.gz"
 IUSE=""
 LICENSE="as-is BSD"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ~ppc sparc"
 
 DEPEND=">=sys-apps/portage-2.0.47-r10
 		>=sys-apps/sed-4
@@ -21,7 +21,7 @@ DEPEND=">=sys-apps/portage-2.0.47-r10
 src_unpack() {
 	unpack ${A}
 	cd ${S}/..
-	epatch "${FILESDIR}/${PF}-gentoo.diff"
+	epatch "${FILESDIR}/${P}-gentoo.diff"
 }
 
 src_compile() {
@@ -36,7 +36,7 @@ src_compile() {
 	ebegin "Fixing the Makefile..."
 	sed -e 's:TK_LIBS =:TK_LIBS = -L/usr/X11R6/lib -lX11:' \
 		-e 's:^\(SHLIBS_LD_LIBS.*\):\1 ${TK_LIBS}:' \
-		-i ${S}/unix/Makefile
+		-i ${S}/Makefile
 
 	eend $?
 	emake -j1 || die "emake failed"
diff --git a/dev-tcltk/tix/tix-8.2.0-r2.ebuild b/dev-tcltk/tix/tix-8.2.0-r2.ebuild
index 92e97672d596..3893aad28ff2 100644
--- a/dev-tcltk/tix/tix-8.2.0-r2.ebuild
+++ b/dev-tcltk/tix/tix-8.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/tix-8.2.0-r2.ebuild,v 1.1 2005/02/01 00:13:19 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/tix-8.2.0-r2.ebuild,v 1.1.1.1 2005/11/30 10:01:36 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tixlibrary/${MY_P}b1.tar.gz"
 IUSE=""
 LICENSE="as-is BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 DEPEND=">=sys-apps/portage-2.0.47-r10
 		>=sys-apps/sed-4
diff --git a/dev-tcltk/tix/tix-8.2.0.ebuild b/dev-tcltk/tix/tix-8.2.0.ebuild
index aee19c40f1fd..a7bbdcf2c92d 100644
--- a/dev-tcltk/tix/tix-8.2.0.ebuild
+++ b/dev-tcltk/tix/tix-8.2.0.ebuild
@@ -1,44 +1,31 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/tix-8.2.0.ebuild,v 1.1 2002/10/31 22:31:16 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/tix-8.2.0.ebuild,v 1.1.1.1 2005/11/30 10:01:36 chriswhite Exp $
 
-IUSE="gcc tcl tk threads shared"
-MY_P=${PN}${PV}
-S=${WORKDIR}/${MY_P}
+inherit eutils
+
+MY_P=${P/-/}
+S=${WORKDIR}/${MY_P}/unix
 DESCRIPTION="A widget library for Tcl/Tk. Has been ported to Python and Perl, too."
 HOMEPAGE="http://sourceforge.net/projects/tixlibrary/"
-#SRC_URI="http://unc.dl.sourceforge.net/sourceforge/${PN}/${MY_P}.tar.gz"
-SRC_URI="http://easynews.dl.sourceforge.net/sourceforge/tixlibrary/tix8.2.0b1.tar.gz"
-#SRC_URI="http://easynews.dl.sourceforge.net/sourceforge/tixlibrary/Tix_Reference_Manual.pdf"
-#SRC_URI="http://unc.dl.sourceforge.net/sourceforge/tixlibrary/tix8.2.0b1.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/tixlibrary/"
-
+SRC_URI="mirror://sourceforge/tixlibrary/${MY_P}b1.tar.gz"
+IUSE=""
 LICENSE="as-is BSD"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 
-DEPEND="dev-lang/tk"
-#RDEPEND=""
-
-fix_makefile() {
-	mv ${S}/$1/Makefile ${S}/$1/Makefile_orig
-	sed -e "s:$2:$3:" \
-		${S}/$1/Makefile_orig \
-		> ${S}/$1/Makefile
-}
+DEPEND=">=sys-apps/portage-2.0.47-r10
+		>=sys-apps/sed-4
+		dev-lang/tk"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff || die
+	cd ${S}/..
+	epatch "${FILESDIR}/${P}-gentoo.diff"
 }
 
 src_compile() {
-	cd ${S}/unix ; ./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
+	econf \
 		--enable-gcc \
 		--with-tcl=/usr/lib \
 		--with-tk=/usr/lib \
@@ -46,38 +33,16 @@ src_compile() {
 		--enable-threads \
 		--enable-shared || die "./configure failed"
 
-	echo "##"
-	echo "## Fixing the Makefile..."
-	echo "##"
-	fix_makefile unix	"\$(TK_SRC_DIR)"	"/usr/lib/tk8.3/include"
+	ebegin "Fixing the Makefile..."
+	sed -e 's:TK_LIBS =:TK_LIBS = -L/usr/X11R6/lib -lX11:' \
+		-e 's:^\(SHLIBS_LD_LIBS.*\):\1 ${TK_LIBS}:' \
+		-i ${S}/unix/Makefile
 
-	# emake (previously known as pmake) is a script that calls the
-	# standard GNU make with parallel building options for speedier
-	# builds (especially on SMP systems).  Try emake first.  It might
-	# not work for some packages, in which case you'll have to resort
-	# to normal "make".
-	make || die
-	#make test || die
-	#emake || die
+	eend $?
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	# You must *personally verify* that this trick doesn't install
-	# anything outside of DESTDIR; do this by reading and
-	# understanding the install part of the Makefiles.
-	#make DESTDIR=${D} install || die
-	# For Makefiles that don't make proper use of DESTDIR, setting
-	# prefix is often an alternative.  However if you do this, then
-	# you also need to specify mandir and infodir, since they were
-	# passed to ./configure as absolute paths (overriding the prefix
-	# setting).
-	#make \
-	#	prefix=${D}/usr \
-	#	mandir=${D}/usr/share/man \
-	#	infodir=${D}/usr/share/info \
-	#	install || die
-	# Again, verify the Makefiles!  We don't want anything falling
-	# outside of ${D}.
-	#make install || die
-	cd ${S}/unix ; einstall || die
+	dodir /usr/include
+	einstall || die
 }