public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Tk-CursorControl/files/, dev-perl/Tk-CursorControl/
@ 2018-03-17  2:34 Kent Fredric
  0 siblings, 0 replies; 2+ messages in thread
From: Kent Fredric @ 2018-03-17  2:34 UTC (permalink / raw
  To: gentoo-commits

commit:     818ffedb39f77197765b244891bcb67172147b48
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 02:33:27 2018 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 02:33:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818ffedb

dev-perl/Tk-CursorControl: EAPI6 + tests + fixes

- EAPI6ify
- Enable tests (w/ X11)
- Cease installing demos to @INC as that's the wrong place for examples
- Don't install demos at all due to RT#124794, which basically makes
  the demo useless without the Makefile, which basically makes
  installing it a waste of time (for now)

Bug: https://rt.cpan.org/Ticket/Display.html?id=124794
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../Tk-CursorControl-0.400.0-r2.ebuild             | 30 ++++++++++++++++
 .../files/Tk-CursorControl-0.4-nodemo.patch        | 40 ++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r2.ebuild b/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r2.ebuild
new file mode 100644
index 00000000000..0cb384cb448
--- /dev/null
+++ b/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DUNNIGANJ
+DIST_VERSION=0.4
+
+# https://rt.cpan.org/Ticket/Display.html?id=124794
+# DIST_EXAMPLES=( "demos/*" )
+inherit eutils perl-module virtualx
+
+DESCRIPTION="Manipulate the mouse cursor programmatically"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/Tk"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.4-nodemo.patch" )
+
+src_prepare() {
+	perl-module_src_prepare
+	edos2unix "${S}"/{CursorControl.pm,demos/cursor.pl}
+}
+src_test() {
+	virtx perl-module_src_test
+}

diff --git a/dev-perl/Tk-CursorControl/files/Tk-CursorControl-0.4-nodemo.patch b/dev-perl/Tk-CursorControl/files/Tk-CursorControl-0.4-nodemo.patch
new file mode 100644
index 00000000000..386a6f0aa25
--- /dev/null
+++ b/dev-perl/Tk-CursorControl/files/Tk-CursorControl-0.4-nodemo.patch
@@ -0,0 +1,40 @@
+From 299ab08346de3f8f670d3a50c6180bccf0402067 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sat, 17 Mar 2018 14:52:48 +1300
+Subject: Stop installing demo's to @INC
+
+---
+ Makefile.PL | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index c229779..2503a8e 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -14,11 +14,7 @@ WriteMakefile(
+ 		'CursorControl.pm'	=> '$(INST_LIB)/Tk/CursorControl.pm',
+ 		'trans_cur.xbm'	=> '$(INST_LIB)/Tk/trans_cur.xbm',
+ 		'trans_cur.mask'	=> '$(INST_LIB)/Tk/trans_cur.mask',
+-		'demos/cursor.pl'	=> ($] >= 5.005
+-					? '$(INST_ARCHLIB)'
+-					: '$(INST_LIB)') . '/Tk/demos/widtrib/cursor.pl',
+-			},
+-	
++  },
+ 	'PREREQ_PM'	=> {
+ 		'Tk'	=> 800.015,
+ 		($^O =~ /(MSWin32|cygwin)/ ? ('Win32::API' => 0.20) : ()),
+@@ -28,10 +24,3 @@ WriteMakefile(
+ 		'CursorControl.pm'   => '$(INST_MAN3DIR)/Tk::CursorControl.$(MAN3EXT)',
+ 		},
+ );
+-
+-sub MY::postamble {
+-	'
+-demo :: pure_all
+-	$(FULLPERL) -w -I$(SITELIBEXP)/Tk/demos/widget_lib -I$(SITEARCHEXP)/Tk/demos/widget_lib -Mblib demos/cursor.pl
+-';
+-}
+-- 
+2.16.2
+


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Tk-CursorControl/files/, dev-perl/Tk-CursorControl/
@ 2019-07-17  8:47 Kent Fredric
  0 siblings, 0 replies; 2+ messages in thread
From: Kent Fredric @ 2019-07-17  8:47 UTC (permalink / raw
  To: gentoo-commits

commit:     fb95b792b4dbe1e84cfa3ff3d191b3cda4860bd4
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 08:45:12 2019 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 08:47:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb95b792

dev-perl/Tk-CursorControl: Undo my removal of demos

The demos with the Tk system are a bit quirky, and you can't really
handle them the same way we typically handle examples in Gentoo.

These demos have to be installed in a location that the "widget" program
that ships with Tk can find and load, and it has special spice to make
it work.

There may be a compromise of some kind, but it requires the ability to
gut the demo system from Tk itself, which is far more work than we have
time for, and the added complexity with handling that with USE and USE
dependencies just isn't worth it.

Bug: https://rt.cpan.org/Ticket/Display.html?id=124794
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org>

 ...2.ebuild => Tk-CursorControl-0.400.0-r3.ebuild} |  6 ++--
 .../files/Tk-CursorControl-0.4-nodemo.patch        | 40 ----------------------
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r2.ebuild b/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r3.ebuild
similarity index 72%
rename from dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r2.ebuild
rename to dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r3.ebuild
index 0cb384cb448..5b2f36f7067 100644
--- a/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r2.ebuild
+++ b/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,6 @@ EAPI=6
 DIST_AUTHOR=DUNNIGANJ
 DIST_VERSION=0.4
 
-# https://rt.cpan.org/Ticket/Display.html?id=124794
-# DIST_EXAMPLES=( "demos/*" )
 inherit eutils perl-module virtualx
 
 DESCRIPTION="Manipulate the mouse cursor programmatically"
@@ -19,7 +17,7 @@ IUSE=""
 RDEPEND="dev-perl/Tk"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-0.4-nodemo.patch" )
+PATCHES=( "${FILESDIR}/0.4-demo.patch" )
 
 src_prepare() {
 	perl-module_src_prepare

diff --git a/dev-perl/Tk-CursorControl/files/Tk-CursorControl-0.4-nodemo.patch b/dev-perl/Tk-CursorControl/files/Tk-CursorControl-0.4-nodemo.patch
deleted file mode 100644
index 386a6f0aa25..00000000000
--- a/dev-perl/Tk-CursorControl/files/Tk-CursorControl-0.4-nodemo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 299ab08346de3f8f670d3a50c6180bccf0402067 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sat, 17 Mar 2018 14:52:48 +1300
-Subject: Stop installing demo's to @INC
-
----
- Makefile.PL | 13 +------------
- 1 file changed, 1 insertion(+), 12 deletions(-)
-
-diff --git a/Makefile.PL b/Makefile.PL
-index c229779..2503a8e 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -14,11 +14,7 @@ WriteMakefile(
- 		'CursorControl.pm'	=> '$(INST_LIB)/Tk/CursorControl.pm',
- 		'trans_cur.xbm'	=> '$(INST_LIB)/Tk/trans_cur.xbm',
- 		'trans_cur.mask'	=> '$(INST_LIB)/Tk/trans_cur.mask',
--		'demos/cursor.pl'	=> ($] >= 5.005
--					? '$(INST_ARCHLIB)'
--					: '$(INST_LIB)') . '/Tk/demos/widtrib/cursor.pl',
--			},
--	
-+  },
- 	'PREREQ_PM'	=> {
- 		'Tk'	=> 800.015,
- 		($^O =~ /(MSWin32|cygwin)/ ? ('Win32::API' => 0.20) : ()),
-@@ -28,10 +24,3 @@ WriteMakefile(
- 		'CursorControl.pm'   => '$(INST_MAN3DIR)/Tk::CursorControl.$(MAN3EXT)',
- 		},
- );
--
--sub MY::postamble {
--	'
--demo :: pure_all
--	$(FULLPERL) -w -I$(SITELIBEXP)/Tk/demos/widget_lib -I$(SITEARCHEXP)/Tk/demos/widget_lib -Mblib demos/cursor.pl
--';
--}
--- 
-2.16.2
-


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-07-17  8:47 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-17  2:34 [gentoo-commits] repo/gentoo:master commit in: dev-perl/Tk-CursorControl/files/, dev-perl/Tk-CursorControl/ Kent Fredric
  -- strict thread matches above, loose matches on Subject: below --
2019-07-17  8:47 Kent Fredric

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox