Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/
Date: Sat, 03 Jun 2017 21:27:02
Message-Id: 1496525182.a1956cb78426714fd8f0fcc55b5a60e5390724b0.asturm@gentoo
1 commit: a1956cb78426714fd8f0fcc55b5a60e5390724b0
2 Author: Kacper KoƂodziej <kacper <AT> kolodziej <DOT> in>
3 AuthorDate: Sat Mar 11 11:34:59 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 3 21:26:22 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1956cb7
7
8 dev-libs/tvision: Bump to EAPI=6
9
10 Package-Manager: Portage-2.3.4, Repoman-2.3.2
11 Closes: https://github.com/gentoo/gentoo/pull/4182
12
13 .../files/tvision-2.1.0_pre2-build-system.patch | 30 +++++++++++++++
14 dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild | 44 ++++++++++++++++++++++
15 2 files changed, 74 insertions(+)
16
17 diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
18 new file mode 100644
19 index 00000000000..8ba26208948
20 --- /dev/null
21 +++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
22 @@ -0,0 +1,30 @@
23 +index 8b78ba3..92aa570 100644
24 +--- a/config.pl
25 ++++ b/config.pl
26 +@@ -1111,7 +1111,7 @@ sub GenerateMakefile
27 + $rep.="\t\$(MAKE) prefix=\$(prefix) -C intl\n";
28 + }
29 + $text=~s/\@target_rules\@/$rep/g;
30 +- $rep="intl-dummy:\n\t\$(MAKE) -C intl/dummy\n";
31 ++ $rep="intl-dummy:\n\t\$(MAKE) prefix=\$(prefix) -C intl/dummy\n";
32 + $rep.="\tcp intl/dummy/libtvfintl.a $makeDir\n";
33 + $rep.="\tranlib $makeDir/libtvfintl.a\n" if $conf{'UseRanLib'};
34 + $text=~s/\@intl_dummy_rule\@/$rep/g;
35 +@@ -1196,7 +1196,7 @@ sub GenerateMakefile
36 + }
37 + if ($internac)
38 + {
39 +- $rep.="\ninstall-internac:\n\t\$(MAKE) -C intl install\n";
40 ++ $rep.="\ninstall-internac:\n\t\$(MAKE) prefix=\$(prefix) -C intl install\n";
41 + }
42 + $text=~s/\@install_rules\@/$rep/g;
43 +
44 +@@ -1216,7 +1216,7 @@ sub GenerateMakefile
45 + $rep.="\trm -f intl/dummy/*.lo\n";
46 + $rep.="\trm -f intl/dummy/*.a\n";
47 + $rep.="\t-\$(MAKE) -C examples clean\n";
48 +- $rep.="\t-\$(MAKE) -C intl clean\n";
49 ++ $rep.="\t-\$(MAKE) prefix=\$(prefix) -C intl clean\n";
50 + $rep.="\trm -f configure.cache\n";
51 + $rep.="\trm -f rhtv-config\$(EXE_EXT)\n";
52 + $text=~s/\@clean\@/$rep/g;
53
54 diff --git a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
55 new file mode 100644
56 index 00000000000..3e21aab2f9e
57 --- /dev/null
58 +++ b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
59 @@ -0,0 +1,44 @@
60 +# Copyright 1999-2017 Gentoo Foundation
61 +# Distributed under the terms of the GNU General Public License v2
62 +
63 +EAPI=6
64 +
65 +DESCRIPTION="Text User Interface that implements the well known CUA widgets"
66 +HOMEPAGE="http://tvision.sourceforge.net/"
67 +SRC_URI="mirror://sourceforge/tvision/rhtvision_${PV/_pre/-}.tar.gz"
68 +
69 +LICENSE="GPL-2"
70 +SLOT="0"
71 +KEYWORDS="~amd64 ~ppc ~x86"
72 +IUSE=""
73 +
74 +DOCS=( readme.txt THANKS TODO )
75 +
76 +HTML_DOCS=( www-site/. )
77 +
78 +S=${WORKDIR}/${PN}
79 +
80 +PATCHES=(
81 + "${FILESDIR}/${P}-gcc41.patch"
82 + "${FILESDIR}/${P}-outb.patch"
83 + "${FILESDIR}/${P}-underflow.patch"
84 + "${FILESDIR}/${P}-asneeded.patch"
85 + "${FILESDIR}/${P}-gcc44.patch"
86 + "${FILESDIR}/${P}-ldconfig.patch"
87 + "${FILESDIR}/${P}-flags.patch"
88 + "${FILESDIR}/${P}-gcc6.patch" # bug #594176
89 + "${FILESDIR}/${P}-build-system.patch" # for EAPI=6
90 +)
91 +
92 +src_configure() {
93 + ./configure --fhs || die
94 +}
95 +
96 +src_install() {
97 + emake DESTDIR="${D}" install \
98 + prefix="\${DESTDIR}/usr" \
99 + libdir="\$(prefix)/$(get_libdir)"
100 +
101 + einstalldocs
102 + dosym rhtvision /usr/include/tvision
103 +}