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

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

5 files changed, 64 insertions, 25 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/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
 }