* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/iwidgets/files/, dev-tcltk/iwidgets/
@ 2018-09-27 7:25 Alfredo Tupone
0 siblings, 0 replies; 2+ messages in thread
From: Alfredo Tupone @ 2018-09-27 7:25 UTC (permalink / raw
To: gentoo-commits
commit: 5a158677cd637676afe4a04bd3de83e5d385a912
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 07:24:43 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 07:24:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a158677
dev-tcltk/iwidgets: EAPI 6
Closes: https://bugs.gentoo.org/379147
Package-Manager: Portage-2.3.49, Repoman-2.3.10
dev-tcltk/iwidgets/files/4.0.1-path.patch | 4 ++--
dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dev-tcltk/iwidgets/files/4.0.1-path.patch b/dev-tcltk/iwidgets/files/4.0.1-path.patch
index 095d9ed81e1..5d71eeb6474 100644
--- a/dev-tcltk/iwidgets/files/4.0.1-path.patch
+++ b/dev-tcltk/iwidgets/files/4.0.1-path.patch
@@ -1,5 +1,5 @@
---- iwidgets4.0.1/Makefile.in
-+++ iwidgets4.0.1/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
@@ -30,6 +30,7 @@
srcdir = @srcdir@
diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
index 1c42bf9071a..50ecc6a9de4 100644
--- a/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
+++ b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=6
inherit eutils multilib
@@ -26,8 +26,10 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${PV}-path.patch )
+
src_prepare() {
- epatch "${FILESDIR}"/${PV}-path.patch
+ default
sed \
-e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \
-i Makefile.in || die
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/iwidgets/files/, dev-tcltk/iwidgets/
@ 2019-10-04 21:35 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2019-10-04 21:35 UTC (permalink / raw
To: gentoo-commits
commit: 90cdbcbacca94538739545f8b1ee829c8686867f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 4 21:12:15 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 4 21:35:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90cdbcba
dev-tcltk/iwidgets: Drop old (EAPI 0)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-tcltk/iwidgets/Manifest | 2 -
dev-tcltk/iwidgets/files/4.0.1-path.patch | 63 ---------------------------
dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild | 66 -----------------------------
dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild | 41 ------------------
4 files changed, 172 deletions(-)
diff --git a/dev-tcltk/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest
index af0e621868b..c40fff60b3b 100644
--- a/dev-tcltk/iwidgets/Manifest
+++ b/dev-tcltk/iwidgets/Manifest
@@ -1,5 +1,3 @@
-DIST itcl3.2.1_src.tgz 427026 BLAKE2B f37612bc21916bfad082d60cd216e28f2e427307e0ea80aa0ca1506c1d247471bfcd20be744a16ef57f5e04db0c34fcc436f2fbe53715462417202377a6cf0e4 SHA512 f6b832f20e53bac66c8bcdbf64aa4aad932ee827fb8059ad2e0dca0c61db01affde6b67c1e0acb331a3837eebcb38282fa7bec90f5d6ed4b65799f4424679f3f
DIST itcl4.1.1.tar.gz 436718 BLAKE2B 50f5518460dc6569edcd0229b71439cb10a724b50c31387ebd1ffa85f9fbf58d5bd5163847a1d7ffa791d5acd5d72b08188f01f0e5c4730ba9060fc531071cd4 SHA512 1e08dbefe33e5464320c62e32d153b3e473462cded2d715ba1c504deacf190062672fbece40a021f25798440e2fbed4ecda763db5789fc6afb5eb2052bdf66e2
DIST itk4.1.0.tar.gz 253796 BLAKE2B 7d51689d41871f39fbdf940f1aede2c89ee0165cc6be989f7da65df85a0d15e5db037722a5e30a284e51129b7bfff20dfde0fbc78d2d72d8acb9031f328a5d16 SHA512 1deed09daf66ae1d0cc88550be13814edff650f3ef2ecb5ae8d28daf92e37550b0e46921eb161da8ccc3886aaf62a4a3087df0f13610839b7c2d6f4b39c9f07e
DIST iwidgets-4.1.1.tar.gz 720630 BLAKE2B f276159893b19d7af7cbbe3653f9e406184c76065ae7906c34388545bdfff1b9e427a6e9b1985f349e9229c69c935b5b85ae8a0fd15ef28b0a1312fc4fcec8f4 SHA512 56fd91d832c59426b030bde2ec7136e46751503dac1b650d195251cac7ef1d1a7024adb2d995fe835f1039a0f99eb616db97a9e9c591f827a911eea2c233c305
-DIST iwidgets4.0.1.tar.gz 647960 BLAKE2B 3dafbe73a40e4babff574a82b4bd68546f109a52197f15228877950560f8089f95a44da93c3ff2723e2a40f26bac0e00ca4f34099e716591b93e9aba846e4257 SHA512 61d1980eb8beb2821fbd8333f5d1f6faa8bf59d98392fee8d166eef213b27c6b66121d42b8eef64d151e5249009be56076a8cf8bb6635072ee6ee4075858182e
diff --git a/dev-tcltk/iwidgets/files/4.0.1-path.patch b/dev-tcltk/iwidgets/files/4.0.1-path.patch
deleted file mode 100644
index 5d71eeb6474..00000000000
--- a/dev-tcltk/iwidgets/files/4.0.1-path.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -30,6 +30,7 @@
-
- srcdir = @srcdir@
- bindir = @bindir@
-+mandir = @mandir@
-
- # The following definition can be set to non-null for special systems
- # like AFS with replication. It allows the pathnames used for installation
-@@ -48,7 +49,9 @@
- BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
-
- # Top-level directory in which to install manual entries:
--MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man/mann
-+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)/mann
-+
-+DATA_DIR = $(INSTALL_ROOT)$(prefix)/share/iwidgets$(IWIDGETS_VERSION)
-
- # Directory containing Tcl source code (for library used during test):
- TCL_SRC_DIR = @TCL_SRC_DIR@
-@@ -135,26 +138,26 @@
- done;
-
- install-demos:
-- @$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/demos/images $(SCRIPT_INSTALL_DIR)/demos/html
-- @echo "Installing demos from $(srcdir)/demos into $(SCRIPT_INSTALL_DIR)/demos"
-+ @$(MKINSTALLDIRS) $(DATA_DIR)/demos/images $(DATA_DIR)/demos/html
-+ @echo "Installing demos from $(srcdir)/demos into $(DATA_DIR)/demos"
- @for i in $(srcdir)/demos/*; \
- do \
- if [ -f $$i ] ; then \
-- $(INSTALL_SCRIPT) $$i $(SCRIPT_INSTALL_DIR)/demos; \
-+ $(INSTALL_SCRIPT) $$i $(DATA_DIR)/demos; \
- fi; \
- done;
-- @echo "Installing images from $(srcdir)/demos/images into $(SCRIPT_INSTALL_DIR)/demos/images"
-+ @echo "Installing images from $(srcdir)/demos/images into $(DATA_DIR)/demos/images"
- for i in $(srcdir)/demos/images/*; \
- do \
- if [ -f $$i ] ; then \
-- $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/images; \
-+ $(INSTALL_DATA) $$i $(DATA_DIR)/demos/images; \
- fi; \
- done;
-- @echo "Installing html man pages from $(srcdir)/demos/html into $(SCRIPT_INSTALL_DIR)/demos/html"
-+ @echo "Installing html man pages from $(srcdir)/demos/html into $(DATA_DIR)/demos/html"
- for i in $(srcdir)/demos/html/*; \
- do \
- if [ -f $$i ] ; then \
-- $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/html; \
-+ $(INSTALL_DATA) $$i $(DATA_DIR)/demos/html; \
- fi; \
- done;
-
-@@ -169,7 +172,6 @@
- $$i > $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
- chmod 444 $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
- done;
-- $(INSTALL_DATA) $(srcdir)/license.terms $(SCRIPT_INSTALL_DIR)
-
- Makefile: $(srcdir)/Makefile.in
- $(SHELL) config.status
diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
deleted file mode 100644
index 50ecc6a9de4..00000000000
--- a/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib
-
-MY_P="${PN}${PV}"
-ITCL_MY_P="itcl3.2.1"
-
-DESCRIPTION="Widget collection for incrTcl/incrTk"
-HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"
-SRC_URI="
- mirror://sourceforge/incrtcl/${MY_P}.tar.gz
- mirror://sourceforge/incrtcl/${ITCL_MY_P}_src.tgz"
-
-LICENSE="HPND Old-MIT tcltk"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
- >=dev-tcltk/itcl-3.2.1
- >=dev-tcltk/itk-3.2.1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PV}-path.patch )
-
-src_prepare() {
- default
- sed \
- -e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \
- -i Makefile.in || die
-
- # Bug 115470
- rm doc/panedwindow.n
-}
-
-src_configure() {
- econf \
- --with-itcl="${WORKDIR}/${ITCL_MY_P}" \
- --with-tcl="${EPREFIX}"/usr/$(get_libdir) \
- --with-tk="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- # parallel borks #177088
- emake -j1 INSTALL_ROOT="${D}" install
-
- dodoc CHANGES ChangeLog README
-
- # bug 247184 - iwidget installs man pages in /usr/man
-# mkdir -p "${ED}"/usr/share/man/mann
-# mv "${ED}"/usr/man/mann/* "${ED}"/usr/share/man/mann/
-# rm -rf "${ED}"/usr/man
-
- # demos are in the wrong place:
-# mkdir -p "${ED}/usr/share/doc/${PF}"
-# mv "${ED}/usr/$(get_libdir)/${MY_P}/demos" "${ED}/usr/share/doc/${PF}/"
-}
diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild
deleted file mode 100644
index a3b02f1740f..00000000000
--- a/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=${PN}${PV}
-ITCL_MY_PN="itcl"
-ITCL_MY_PV="3.2.1"
-ITCL_MY_P="${ITCL_MY_PN}${ITCL_MY_PV}"
-
-DESCRIPTION="Widget collection for incrTcl/incrTk"
-HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"
-SRC_URI="
- mirror://sourceforge/incrtcl/${MY_P}.tar.gz
- mirror://sourceforge/incrtcl/${ITCL_MY_P}_src.tgz"
-
-LICENSE="HPND Old-MIT tcltk"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND="
- >=dev-tcltk/itcl-3.2.1
- >=dev-tcltk/itk-3.3-r1"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
- local myconf
- myconf="${myconf} --with-itcl=${WORKDIR}/${ITCL_MY_P}"
- econf ${myconf}
-}
-
-src_install() {
- einstall || die "einstall failed"
- dodoc CHANGES ChangeLog README || die
- # Bug 115470
- rm doc/panedwindow.n
- doman doc/*.n || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-04 21:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-04 21:35 [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/iwidgets/files/, dev-tcltk/iwidgets/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2018-09-27 7:25 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox