Moved to EAPI=4 and autotools-utils.eclass, handle examples static-libs and threading support correctly, added missing deps

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

6 files changed, 74 insertions, 34 deletions

diff --git a/dev-tcltk/tkTheme/ChangeLog b/dev-tcltk/tkTheme/ChangeLog
index ffadd9ba9935..42c6ce28bc5e 100644
--- a/dev-tcltk/tkTheme/ChangeLog
+++ b/dev-tcltk/tkTheme/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/tkTheme
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkTheme/ChangeLog,v 1.21 2010/03/22 20:43:12 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkTheme/ChangeLog,v 1.22 2012/01/02 23:30:17 jlec Exp $
+
+  02 Jan 2012; Justin Lecher <jlec@gentoo.org> +files/1.0-cflags.patch,
+  tkTheme-1.0-r2.ebuild, files/1.0-Makefile.in.diff, metadata.xml:
+  Moved to EAPI=4 and autotools-utils.eclass, handle examples static-libs and
+  threading support correctly, added missing deps
 
 *tkTheme-1.0-r2 (22 Mar 2010)
 
diff --git a/dev-tcltk/tkTheme/Manifest b/dev-tcltk/tkTheme/Manifest
index a8838cd0694b..6fd1ca14d887 100644
--- a/dev-tcltk/tkTheme/Manifest
+++ b/dev-tcltk/tkTheme/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX 1.0-Makefile.in.diff 972 RMD160 3d33e4f0c9d3ea0307ae9fdeb71f4aa38bfca8ea SHA1 b7f31530855670e1f8fb2c3caf9b79abdd8d066b SHA256 892751a0e77c6f5901f222c88fdd1c944e36de3feed1c6457e880ebd9b10a589
+AUX 1.0-Makefile.in.diff 1072 RMD160 387f822fefcb0126cca05bb232dd8f0aef233629 SHA1 3fd604befcf77444f93c7f0f75cdbed78dc984aa SHA256 1cd64e5b07bfa0397ec697f8418b76b42db06e8c3b2ebb395f5f43b3c5387552
+AUX 1.0-cflags.patch 471 RMD160 9cdf1d1984a897955abdd2d371ccc0b8ca78c642 SHA1 be8a20990fc38fad82345ed85bba44f37d4b798e SHA256 4db5736b9aed911d9680ab066820916c84d06282a9d02bd37e4632e966606e3d
 AUX 1.0-configure.diff 289 RMD160 2056ce9e3015a20f026105f8104fbfe83424c8d3 SHA1 63da8a66df5661c17d03080218f749c0e8eec81c SHA256 1889f9519b234308e445020233117b223646ac1c304aa2b2a1413da3a0a9eeb0
 DIST tkTheme.tgz 335061 RMD160 f54e94cc2f6b717f14534b2c605cab3d39897698 SHA1 6a9cbe876a82b26272a91fd163593feaa4831b37 SHA256 e6a2024d4a70ef69108020604de47885d21df09e558ba5cbfde7ccf67fc8a148
 EBUILD tkTheme-1.0-r1.ebuild 917 RMD160 84a33f19055a64b5cb95df3cb09a959e760c96e8 SHA1 ce2892bacf195aa7a119c13b60a35d0ef389a2f5 SHA256 0f1cdf256cc507e82764f7a5b598a5f8d3a8ff4e1b85826eaf9104a1df5a44f8
-EBUILD tkTheme-1.0-r2.ebuild 925 RMD160 265bc1834a4ff5c84f54726605cb2ec57d6356c2 SHA1 e1942552397ff25f35a22946bd5eefd03309e0d5 SHA256 e2cac5731c686e0fa7793214bc0c2871ba7e9e3f57c5eb21fc0a6123f74d553e
+EBUILD tkTheme-1.0-r2.ebuild 1138 RMD160 fc187fa991c97f4f5ba27c94dc16ec7fd77e52d8 SHA1 10e068dc5d1d564eea025eed71c158a841d73e35 SHA256 6fc14739900470f932934f098a82d75660e9e31424464128d58387147b27bb01
 EBUILD tkTheme-1.0.ebuild 817 RMD160 f4232b73c5177d78dae44e754e03e6a3a8f9a3c8 SHA1 971a491d581691f96ad6c5a04bf4314601caeebf SHA256 cb85c2a646fe15c40a7f40737697565a323b3b746b17eba106c553942799416c
-MISC ChangeLog 2096 RMD160 97a051050388217cd9f11e7b30cce6840ee75dc3 SHA1 a192cee83df803333855738768067bd51740dd17 SHA256 83b31036e48e71e86d96765c6a71d8d6c8765fe46a45c7a5eb7d920efaa42ae2
-MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
+MISC ChangeLog 2364 RMD160 8867e6fb4a9699b82e4eb6d6f4dbde3f6a28189e SHA1 e65de1969726a3d68d6dbbf60efa1db0175775d6 SHA256 d3fb7c311c08e316011699a92464601becd84ee5528f677dd7cd781d3d1175eb
+MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkun1q4ACgkQgAnW8HDreRZ2igCfdrX1RNsB3c6aZsOQs36hsPnj
-cEAAn0g+Y+NsC7FIKv3Asb72P67sHq9O
-=9YPX
+iEYEAREKAAYFAk8CPhUACgkQgAnW8HDreRaqtgCgsrxFSYV/Bsqa6LuVQXtdEpjX
+0OwAn2yMPAKIUjsFnML3hZyMv7emONRs
+=3wnQ
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff b/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff
index a6babdfbf275..6076a0455c9b 100644
--- a/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff
+++ b/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff
@@ -1,11 +1,16 @@
---- Makefile.in.orig	2003-02-01 16:56:40.000000000 -0500
-+++ Makefile.in	2003-02-01 17:04:07.000000000 -0500
-@@ -428,16 +428,16 @@
+ Makefile.in |   11 +++++------
+ 1 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7cf8b1e..c2c7d3b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -428,16 +428,15 @@ mostlyclean distclean maintainer-clean
  
  
  install-exec-hook:
 -	$(mkinstalldirs) @PKG_TCL@ @PKG_TCL@/demo
-+	$(mkinstalldirs) $(DESTDIR)@PKG_TCL@ $(DESTDIR)@PKG_TCL@/demo
++	$(mkinstalldirs) $(DESTDIR)@PKG_TCL@
  	echo	"package ifneeded tkTheme"				   \
  		`echo $(VERSION) | awk -F. '{ printf "%s.%s", $$1, $$2 }'` \
 -		"[list load $(DESTDIR)$(libdir)/libtkTheme.so]"	   \
@@ -13,12 +18,12 @@
 +		"[list load $(libdir)/libtkTheme.so]"	   \
 +	    > $(DESTDIR)@PKG_TCL@/pkgIndex.tcl
  	sed -e 's%load .libs/libtkTheme.so%package require tkTheme%' \
- 	    < test.tcl      					     \
+-	    < test.tcl      					     \
++	    < $(srcdir)/test.tcl      					     \
  	    | sed -e 's%cd demo/%cd @PKG_TCL@/demo/%'                \
 -	    > @PKG_TCL@/test.tcl
 -	cp demo/* @PKG_TCL@/demo
 +	    > $(DESTDIR)@PKG_TCL@/test.tcl
-+	cp demo/* $(DESTDIR)@PKG_TCL@/demo
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dev-tcltk/tkTheme/files/1.0-cflags.patch b/dev-tcltk/tkTheme/files/1.0-cflags.patch
new file mode 100644
index 000000000000..34063d365fd7
--- /dev/null
+++ b/dev-tcltk/tkTheme/files/1.0-cflags.patch
@@ -0,0 +1,18 @@
+ configure |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index 373c332..6fc1a14 100755
+--- a/configure
++++ b/configure
+@@ -3341,9 +3341,7 @@ fi
+ 
+ 
+ if test "${SHARED_BUILD}" = "1" ; then
+-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}'
+-else
+-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING}'
++    CFLAGS+=' ${SHLIB_CFLAGS}'
+ fi
+ 
+ #--------------------------------------------------------------------
diff --git a/dev-tcltk/tkTheme/metadata.xml b/dev-tcltk/tkTheme/metadata.xml
index d9408d8ab078..815cc916f2b6 100644
--- a/dev-tcltk/tkTheme/metadata.xml
+++ b/dev-tcltk/tkTheme/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+	<herd>tcltk</herd>
 </pkgmetadata>
diff --git a/dev-tcltk/tkTheme/tkTheme-1.0-r2.ebuild b/dev-tcltk/tkTheme/tkTheme-1.0-r2.ebuild
index 1aab9b401a78..c567992b3684 100644
--- a/dev-tcltk/tkTheme/tkTheme-1.0-r2.ebuild
+++ b/dev-tcltk/tkTheme/tkTheme-1.0-r2.ebuild
@@ -1,38 +1,49 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkTheme/tkTheme-1.0-r2.ebuild,v 1.3 2010/03/22 20:44:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkTheme/tkTheme-1.0-r2.ebuild,v 1.4 2012/01/02 23:30:17 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit eutils toolchain-funcs
+inherit autotools-utils  eutils toolchain-funcs
 
-DESCRIPTION="Tcl/Tk Theming library."
+DESCRIPTION="Tcl/Tk Theming library"
 HOMEPAGE="http://www.xmission.com/~georgeps/Tk_Theme/other/"
 SRC_URI="http://www.xmission.com/~georgeps/Tk_Theme/other/${PN}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
+IUSE="debug examples static-libs threads"
 
 DEPEND="
-	>=dev-lang/tk-8.3.3
+	dev-lang/tk
+	x11-libs/libXext
+	x11-libs/libXmu
 	x11-libs/libXpm"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}"/${PN}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-Makefile.in.diff
-	epatch "${FILESDIR}"/${PV}-configure.diff
-	tc-export CC
-}
+PATCHES=(
+	"${FILESDIR}"/${PV}-Makefile.in.diff
+	"${FILESDIR}"/${PV}-configure.diff
+	"${FILESDIR}"/${PV}-cflags.patch
+	)
 
 src_configure() {
-	econf --with-tcl="${EPREFIX}"/usr/$(get_libdir) --with-tk="${EPREFIX}"/usr/$(get_libdir)
+	tc-export CC
+	local myeconfargs=(
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+		--with-tk="${EPREFIX}/usr/$(get_libdir)"
+		--with-x
+		$(use_with debug symbols)
+		$(use_enable threads)
+		)
+	autotools-utils_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README TODO || die
+	autotools-utils_src_install
+	insinto /usr/share/${PN}
+	use examples && doins -r demo
 }