Moved to EAPI=4, respect EPREFIX and multitb

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

7 files changed, 195 insertions, 55 deletions

diff --git a/dev-tcltk/ck/ChangeLog b/dev-tcltk/ck/ChangeLog
index 264b322b71dd..7d48203eef4a 100644
--- a/dev-tcltk/ck/ChangeLog
+++ b/dev-tcltk/ck/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tcltk/ck
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/ck/ChangeLog,v 1.7 2009/08/11 23:10:28 mescalinum Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/ck/ChangeLog,v 1.8 2011/12/12 09:10:27 jlec Exp $
+
+*ck-8.0-r3 (12 Dec 2011)
+
+  12 Dec 2011; Justin Lecher <jlec@gentoo.org> ck-8.0.ebuild,
+  -ck-8.0-r1.ebuild, ck-8.0-r2.ebuild, +ck-8.0-r3.ebuild,
+  +files/ck-8.0-gentoo.patch, metadata.xml:
+  Moved to EAPI=4, respect EPREFIX and multitb
 
 *ck-8.0-r2 (11 Aug 2009)
 
diff --git a/dev-tcltk/ck/ck-8.0-r1.ebuild b/dev-tcltk/ck/ck-8.0-r1.ebuild
deleted file mode 100644
index 311853dfbb6d..000000000000
--- a/dev-tcltk/ck/ck-8.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/ck/ck-8.0-r1.ebuild,v 1.1 2009/05/03 19:24:53 mescalinum Exp $
-
-EAPI=2
-
-MY_P=${PN}${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A curses based toolkit for tcl"
-HOMEPAGE="http://www.ch-werner.de/ck/"
-SRC_URI="http://www.ch-werner.de/ck/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=">=dev-lang/tk-8.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# patch Makefile
-	sed -i \
-		-e "s:mkdir:mkdir -p:g" \
-		-e "s|install: |install: install-man |" \
-		-e 's:^.*\(MAN_INSTALL_DIR\).*=.*$:\1 = $(INSTALL_ROOT)$(prefix)/share/man:g' \
-		Makefile.in
-}
-
-src_configure() {
-	econf --with-tcl=/usr/lib --enable-shared || die "econf failed"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	dodoc README
-	einstall || die "Failed to install."
-}
diff --git a/dev-tcltk/ck/ck-8.0-r2.ebuild b/dev-tcltk/ck/ck-8.0-r2.ebuild
index 266af4d2dc7b..0de751159af9 100644
--- a/dev-tcltk/ck/ck-8.0-r2.ebuild
+++ b/dev-tcltk/ck/ck-8.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/ck/ck-8.0-r2.ebuild,v 1.2 2009/08/11 23:12:02 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/ck/ck-8.0-r2.ebuild,v 1.3 2011/12/12 09:10:27 jlec Exp $
 
 EAPI=2
 
@@ -10,11 +10,13 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="A curses based toolkit for tcl"
 HOMEPAGE="http://www.ch-werner.de/ck/"
 SRC_URI="http://www.ch-werner.de/ck/${MY_P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND=">=dev-lang/tk-8.0"
+
+DEPEND="dev-lang/tk"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -23,11 +25,11 @@ src_prepare() {
 		-e "s:mkdir:mkdir -p:g" \
 		-e "s|install: |install: install-man |" \
 		-e 's:^.*\(MAN_INSTALL_DIR\).*=.*$:\1 = $(INSTALL_ROOT)$(prefix)/share/man:g' \
-		Makefile.in
+		Makefile.in || die
 }
 
 src_configure() {
-	econf --with-tcl=/usr/lib --enable-shared || die "econf failed"
+	econf --with-tcl=/usr/lib --enable-shared
 }
 
 src_compile() {
diff --git a/dev-tcltk/ck/ck-8.0-r3.ebuild b/dev-tcltk/ck/ck-8.0-r3.ebuild
new file mode 100644
index 000000000000..fee7052a1ca6
--- /dev/null
+++ b/dev-tcltk/ck/ck-8.0-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/ck/ck-8.0-r3.ebuild,v 1.1 2011/12/12 09:10:27 jlec Exp $
+
+EAPI=4
+
+inherit eutils multilib
+
+MY_P=${PN}${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A curses based toolkit for tcl"
+HOMEPAGE="http://www.ch-werner.de/ck/"
+SRC_URI="http://www.ch-werner.de/ck/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/tk"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	sed \
+		-e "/^LIB_INSTALL_DIR/s:lib$:$(get_libdir):g" \
+		-i Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--enable-shared
+}
diff --git a/dev-tcltk/ck/ck-8.0.ebuild b/dev-tcltk/ck/ck-8.0.ebuild
index 8f93ef5a84de..09f4eee67032 100644
--- a/dev-tcltk/ck/ck-8.0.ebuild
+++ b/dev-tcltk/ck/ck-8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/ck/ck-8.0.ebuild,v 1.11 2007/07/15 03:37:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/ck/ck-8.0.ebuild,v 1.12 2011/12/12 09:10:27 jlec Exp $
 
 MY_P=${PN}${PV}
 S=${WORKDIR}/${MY_P}
@@ -8,24 +8,27 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="A curses based toolkit for tcl"
 HOMEPAGE="http://www.ch-werner.de/ck/"
 SRC_URI="http://www.ch-werner.de/ck/${MY_P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
-DEPEND=">=dev-lang/tk-8.0
-		>=sys-apps/sed-4"
+
+DEPEND="dev-lang/tk
+		sys-apps/sed"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	local myconf="--with-tcl=/usr/lib --enable-shared"
-	econf ${myconf} || die "econf failed"
+	econf ${myconf}
 	emake CFLAGS="${CFLAGS}" || die
 
 	# patch Makefile
 	sed -i -e "s:mkdir:mkdir -p:g"  \
-		-e "s|install: |install: install-man |" Makefile
+		-e "s|install: |install: install-man |" Makefile || die
 }
 
 src_install() {
-	dodoc README license.terms
+	dodoc README || die
 	einstall || die "Failed to install."
 }
diff --git a/dev-tcltk/ck/files/ck-8.0-gentoo.patch b/dev-tcltk/ck/files/ck-8.0-gentoo.patch
new file mode 100644
index 000000000000..727f7e8b5356
--- /dev/null
+++ b/dev-tcltk/ck/files/ck-8.0-gentoo.patch
@@ -0,0 +1,133 @@
+ Makefile.in |   40 ++++++++++++++++------------------------
+ 1 files changed, 16 insertions(+), 24 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 00960d9..16d4123 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -29,9 +29,9 @@ exec_prefix =		@exec_prefix@
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication.  It allows the pathnames used for installation
+ # to be different than those used for actually reference files at
+-# run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
++# run-time.  DESTDIR is prepended to $prefix and $exec_prefix
+ # when installing files.
+-INSTALL_ROOT =
++DESTDIR =
+ 
+ # Directory from which applications will reference the library of Tcl
+ # scripts (note: you can set the CK_LIBRARY environment variable at
+@@ -39,22 +39,22 @@ INSTALL_ROOT =
+ CK_LIBRARY =		$(prefix)/lib/ck$(VERSION)
+ 
+ # Path name to use when installing library scripts:
+-SCRIPT_INSTALL_DIR =	$(INSTALL_ROOT)$(CK_LIBRARY)
++SCRIPT_INSTALL_DIR =	$(DESTDIR)$(CK_LIBRARY)
+ 
+ # Directory in which to install the archive libck*:
+-LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR =	$(DESTDIR)$(exec_prefix)/lib
+ 
+ # Directory in which to install the program cwsh:
+-BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR =	$(DESTDIR)$(exec_prefix)/bin
+ 
+ # Directory from which the program cwsh should be referenced by scripts:
+ BIN_DIR =		$(exec_prefix)/bin
+ 
+ # Directory in which to install the include file ck.h:
+-INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR =	$(DESTDIR)$(prefix)/include
+ 
+ # Top-level directory for manual entries:
+-MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
++MAN_INSTALL_DIR = $(DESTDIR)$(prefix)/share/man
+ 
+ # Directory in which to install manual entry for cwsh:
+ MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man1
+@@ -96,7 +96,7 @@ LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(CURSES_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@
+ 
+ # To change the compiler switches, for example to change from -O
+ # to -g, change the following line:
+-CFLAGS = -O
++#CFLAGS = -O
+ 
+ # To disable ANSI-C procedure prototypes reverse the comment characters
+ # on the following lines:
+@@ -231,14 +231,14 @@ configInfo: Makefile
+ 	@echo "CK_CURSES_INCLUDES = ${CURSES_INCLUDES}" >> configInfo
+ 	@echo "CK_LIBS = ${CURSES_LIB_SWITCHES} @LIBS@" >> configInfo
+ 
+-install: install-binaries install-libraries
++install: install-man install-binaries install-libraries
+ 
+ install-binaries: $(CK_LIB_FILE) cwsh
+ 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
+ 	    do \
+ 	    if [ ! -d $$i ] ; then \
+ 		echo "Making directory $$i"; \
+-		mkdir $$i; \
++		mkdir -p $$i; \
+ 		chmod 755 $$i; \
+ 		else true; \
+ 		fi; \
+@@ -251,12 +251,12 @@ install-binaries: $(CK_LIB_FILE) cwsh
+ 	@$(INSTALL_PROGRAM) cwsh $(BIN_INSTALL_DIR)/cwsh
+ 
+ install-libraries:
+-	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
++	@for i in $(DESTDIR)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
+ 		$(SCRIPT_INSTALL_DIR) ; \
+ 	    do \
+ 	    if [ ! -d $$i ] ; then \
+ 		echo "Making directory $$i"; \
+-		mkdir $$i; \
++		mkdir -p $$i; \
+ 		chmod 755 $$i; \
+ 		else true; \
+ 		fi; \
+@@ -270,13 +270,13 @@ install-libraries:
+ 	    done;
+ 
+ install-demos:
+-	@for i in $(INSTALL_ROOT)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \
++	@for i in $(DESTDIR)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \
+ 		$(SCRIPT_INSTALL_DIR)/demos \
+ 		$(SCRIPT_INSTALL_DIR)/demos/images ; \
+ 	    do \
+ 	    if [ ! -d $$i ] ; then \
+ 		echo "Making directory $$i"; \
+-		mkdir $$i; \
++		mkdir -p $$i; \
+ 		chmod 755 $$i; \
+ 		else true; \
+ 		fi; \
+@@ -301,11 +301,11 @@ install-demos:
+ 	    done;
+ 
+ install-man:
+-	@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
++	@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR); \
+ 	    do \
+ 	    if [ ! -d $$i ] ; then \
+ 		echo "Making directory $$i"; \
+-		mkdir $$i; \
++		mkdir -p $$i; \
+ 		chmod 755 $$i; \
+ 		else true; \
+ 		fi; \
+@@ -326,14 +326,6 @@ install-man:
+ 		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
+ 	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
+ 	    done;
+-	@cd $(SRC_DIR)/doc; for i in *.n; \
+-	    do \
+-	    echo "Installing doc/$$i"; \
+-	    rm -f $(MANN_INSTALL_DIR)/$$i; \
+-	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
+-		    $$i > $(MANN_INSTALL_DIR)/$$i; \
+-	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
+-	    done;
+ 
+ Makefile: $(SRC_DIR)/Makefile.in
+ 	$(SHELL) config.status
diff --git a/dev-tcltk/ck/metadata.xml b/dev-tcltk/ck/metadata.xml
index d9408d8ab078..815cc916f2b6 100644
--- a/dev-tcltk/ck/metadata.xml
+++ b/dev-tcltk/ck/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>