1 |
jlec 11/01/19 12:48:54 |
2 |
|
3 |
Modified: ChangeLog nut-16.5.ebuild |
4 |
Log: |
5 |
X support included |
6 |
|
7 |
(Portage version: 2.2.0_alpha17/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.15 app-misc/nut/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/ChangeLog?rev=1.15&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/ChangeLog?rev=1.15&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/ChangeLog?r1=1.14&r2=1.15 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v |
19 |
retrieving revision 1.14 |
20 |
retrieving revision 1.15 |
21 |
diff -u -r1.14 -r1.15 |
22 |
--- ChangeLog 13 Jan 2011 17:52:43 -0000 1.14 |
23 |
+++ ChangeLog 19 Jan 2011 12:48:54 -0000 1.15 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for app-misc/nut |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.14 2011/01/13 17:52:43 jlec Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.15 2011/01/19 12:48:54 jlec Exp $ |
29 |
+ |
30 |
+ 14 Jan 2011; Justin Lecher <jlec@g.o> nut-16.5.ebuild, |
31 |
+ files/nut-16.5-build-fixes.patch, +files/nut-16.5-int.patch: |
32 |
+ X support included |
33 |
|
34 |
*nut-16.5 (13 Jan 2011) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.2 app-misc/nut/nut-16.5.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/nut-16.5.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/nut-16.5.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/nut-16.5.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: nut-16.5.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/nut/nut-16.5.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- nut-16.5.ebuild 13 Jan 2011 17:52:43 -0000 1.1 |
52 |
+++ nut-16.5.ebuild 19 Jan 2011 12:48:54 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-16.5.ebuild,v 1.1 2011/01/13 17:52:43 jlec Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-16.5.ebuild,v 1.2 2011/01/19 12:48:54 jlec Exp $ |
58 |
|
59 |
EAPI=2 |
60 |
|
61 |
@@ -13,25 +13,37 @@ |
62 |
LICENSE="GPL-2" |
63 |
SLOT="0" |
64 |
KEYWORDS="~arm ~alpha ~amd64 ~ppc ~x86 ~amd64" |
65 |
-IUSE="" |
66 |
+IUSE="X" |
67 |
+ |
68 |
+RDEPEND="X? ( >=x11-libs/fltk-1.3:1.1 )" |
69 |
+DEPEND="${RDEPEN}" |
70 |
|
71 |
src_prepare() { |
72 |
- epatch "${FILESDIR}"/${P}-build-fixes.patch |
73 |
- tc-export CC |
74 |
+ epatch \ |
75 |
+ "${FILESDIR}"/${P}-build-fixes.patch \ |
76 |
+ "${FILESDIR}"/${P}-int.patch |
77 |
+ tc-export CC CXX |
78 |
+ sed \ |
79 |
+ -e "s:/usr/local/lib:/usr/share:g" \ |
80 |
+ -i Makefile fltk/Makefile || die |
81 |
} |
82 |
|
83 |
src_compile() { |
84 |
emake || die |
85 |
# need fltk-1.3 |
86 |
-# if use X; then |
87 |
-# cd fltk |
88 |
-# emake || die |
89 |
-# fi |
90 |
+ if use X; then |
91 |
+ cd fltk |
92 |
+ emake || die |
93 |
+ fi |
94 |
} |
95 |
|
96 |
src_install() { |
97 |
insinto /usr/share/nut |
98 |
doins raw.data/* || die |
99 |
dobin nut || die |
100 |
+ if use X; then |
101 |
+ dobin fltk/Nut || die |
102 |
+ fi |
103 |
doman nut.1 || die |
104 |
+ |
105 |
} |