| 1 |
jer 12/02/27 00:51:22 |
| 2 |
|
| 3 |
Modified: ChangeLog nut-17.4.ebuild |
| 4 |
Added: nut-17.4-r1.ebuild |
| 5 |
Log: |
| 6 |
Add missing dependency. Fix building with x11-libs/fltk[-static-libs] by Attila Stehr (bug #405819). Clean up patch. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.35 app-misc/nut/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/ChangeLog?rev=1.35&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/ChangeLog?rev=1.35&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/ChangeLog?r1=1.34&r2=1.35 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v |
| 20 |
retrieving revision 1.34 |
| 21 |
retrieving revision 1.35 |
| 22 |
diff -u -r1.34 -r1.35 |
| 23 |
--- ChangeLog 24 Feb 2012 23:43:14 -0000 1.34 |
| 24 |
+++ ChangeLog 27 Feb 2012 00:51:22 -0000 1.35 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for app-misc/nut |
| 27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.34 2012/02/24 23:43:14 radhermit Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.35 2012/02/27 00:51:22 jer Exp $ |
| 30 |
+ |
| 31 |
+*nut-17.4-r1 (27 Feb 2012) |
| 32 |
+ |
| 33 |
+ 27 Feb 2012; Jeroen Roovers <jer@g.o> files/nut-16.12-makefile.patch, |
| 34 |
+ nut-17.4.ebuild, +nut-17.4-r1.ebuild: |
| 35 |
+ Add missing dependency. Fix building with x11-libs/fltk[-static-libs] by |
| 36 |
+ Attila Stehr (bug #405819). Clean up patch. |
| 37 |
|
| 38 |
24 Feb 2012; Tim Harder <radhermit@g.o> |
| 39 |
-files/nut-16.5-build-fixes.patch, -nut-16.9.ebuild: |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.5 app-misc/nut/nut-17.4.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/nut-17.4.ebuild?rev=1.5&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/nut-17.4.ebuild?rev=1.5&content-type=text/plain |
| 47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/nut-17.4.ebuild?r1=1.4&r2=1.5 |
| 48 |
|
| 49 |
Index: nut-17.4.ebuild |
| 50 |
=================================================================== |
| 51 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/nut/nut-17.4.ebuild,v |
| 52 |
retrieving revision 1.4 |
| 53 |
retrieving revision 1.5 |
| 54 |
diff -u -r1.4 -r1.5 |
| 55 |
--- nut-17.4.ebuild 24 Feb 2012 19:33:06 -0000 1.4 |
| 56 |
+++ nut-17.4.ebuild 27 Feb 2012 00:51:22 -0000 1.5 |
| 57 |
@@ -1,6 +1,6 @@ |
| 58 |
# Copyright 1999-2012 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-17.4.ebuild,v 1.4 2012/02/24 19:33:06 ranger Exp $ |
| 61 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-17.4.ebuild,v 1.5 2012/02/27 00:51:22 jer Exp $ |
| 62 |
|
| 63 |
EAPI=4 |
| 64 |
|
| 65 |
@@ -15,7 +15,12 @@ |
| 66 |
KEYWORDS="~alpha amd64 ~arm ppc x86" |
| 67 |
IUSE="X" |
| 68 |
|
| 69 |
-RDEPEND="X? ( x11-libs/fltk:1 )" |
| 70 |
+RDEPEND=" |
| 71 |
+ X? ( |
| 72 |
+ x11-libs/fltk:1 |
| 73 |
+ x11-libs/libXpm |
| 74 |
+ ) |
| 75 |
+" |
| 76 |
DEPEND="${RDEPEND}" |
| 77 |
|
| 78 |
src_prepare() { |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
1.1 app-misc/nut/nut-17.4-r1.ebuild |
| 83 |
|
| 84 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/nut-17.4-r1.ebuild?rev=1.1&view=markup |
| 85 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/nut-17.4-r1.ebuild?rev=1.1&content-type=text/plain |
| 86 |
|
| 87 |
Index: nut-17.4-r1.ebuild |
| 88 |
=================================================================== |
| 89 |
# Copyright 1999-2012 Gentoo Foundation |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-17.4-r1.ebuild,v 1.1 2012/02/27 00:51:22 jer Exp $ |
| 92 |
|
| 93 |
EAPI=4 |
| 94 |
|
| 95 |
inherit eutils toolchain-funcs |
| 96 |
|
| 97 |
DESCRIPTION="Record what you eat and analyze your nutrient levels" |
| 98 |
HOMEPAGE="http://nut.sourceforge.net/" |
| 99 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 100 |
|
| 101 |
LICENSE="GPL-2" |
| 102 |
SLOT="0" |
| 103 |
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86" |
| 104 |
IUSE="X" |
| 105 |
|
| 106 |
RDEPEND=" |
| 107 |
X? ( |
| 108 |
x11-libs/fltk:1 |
| 109 |
x11-libs/libXpm |
| 110 |
) |
| 111 |
" |
| 112 |
DEPEND="${RDEPEND}" |
| 113 |
|
| 114 |
src_prepare() { |
| 115 |
epatch "${FILESDIR}"/${PN}-16.12-makefile.patch |
| 116 |
} |
| 117 |
|
| 118 |
src_compile() { |
| 119 |
emake CC=$(tc-getCC) FOODDIR=\\\"/usr/share/nut\\\" |
| 120 |
if use X ; then |
| 121 |
cd fltk |
| 122 |
emake CXX=$(tc-getCXX) FOODDIR=\\\"/usr/share/nut\\\" |
| 123 |
fi |
| 124 |
} |
| 125 |
|
| 126 |
src_install() { |
| 127 |
insinto /usr/share/nut |
| 128 |
doins raw.data/* |
| 129 |
dobin nut |
| 130 |
doman nut.1 |
| 131 |
if use X ; then |
| 132 |
dobin fltk/Nut |
| 133 |
doicon nut.xpm |
| 134 |
make_desktop_entry Nut nut nut Education |
| 135 |
fi |
| 136 |
} |
Archives