1 |
ssuominen 13/03/05 10:10:31 |
2 |
|
3 |
Modified: ChangeLog qingy-1.0.0.ebuild |
4 |
Log: |
5 |
Use pkg-config instead of AC_CHECK_LIB to get ncurses libraries wrt #459650 by Diego Elio Pettenò |
6 |
|
7 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
8 |
|
9 |
Revision Changes Path |
10 |
1.69 sys-apps/qingy/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qingy/ChangeLog?rev=1.69&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qingy/ChangeLog?rev=1.69&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qingy/ChangeLog?r1=1.68&r2=1.69 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/qingy/ChangeLog,v |
19 |
retrieving revision 1.68 |
20 |
retrieving revision 1.69 |
21 |
diff -u -r1.68 -r1.69 |
22 |
--- ChangeLog 2 Feb 2013 12:10:16 -0000 1.68 |
23 |
+++ ChangeLog 5 Mar 2013 10:10:31 -0000 1.69 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for sys-apps/qingy |
26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/ChangeLog,v 1.68 2013/02/02 12:10:16 pacho Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/ChangeLog,v 1.69 2013/03/05 10:10:31 ssuominen Exp $ |
29 |
+ |
30 |
+ 05 Mar 2013; Samuli Suominen <ssuominen@g.o> qingy-1.0.0.ebuild, |
31 |
+ +files/qingy-1.0.0-tinfo.patch: |
32 |
+ Use pkg-config instead of AC_CHECK_LIB to get ncurses libraries wrt #459650 |
33 |
+ by Diego Elio Pettenò |
34 |
|
35 |
02 Feb 2013; Pacho Ramos <pacho@g.o> metadata.xml: |
36 |
Cleanup up due #48914 |
37 |
|
38 |
|
39 |
|
40 |
1.6 sys-apps/qingy/qingy-1.0.0.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qingy/qingy-1.0.0.ebuild?rev=1.6&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qingy/qingy-1.0.0.ebuild?rev=1.6&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qingy/qingy-1.0.0.ebuild?r1=1.5&r2=1.6 |
45 |
|
46 |
Index: qingy-1.0.0.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-1.0.0.ebuild,v |
49 |
retrieving revision 1.5 |
50 |
retrieving revision 1.6 |
51 |
diff -u -r1.5 -r1.6 |
52 |
--- qingy-1.0.0.ebuild 4 May 2012 09:17:27 -0000 1.5 |
53 |
+++ qingy-1.0.0.ebuild 5 Mar 2013 10:10:31 -0000 1.6 |
54 |
@@ -1,12 +1,11 @@ |
55 |
-# Copyright 1999-2012 Gentoo Foundation |
56 |
+# Copyright 1999-2013 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-1.0.0.ebuild,v 1.5 2012/05/04 09:17:27 jdhore Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-1.0.0.ebuild,v 1.6 2013/03/05 10:10:31 ssuominen Exp $ |
60 |
|
61 |
-EAPI="2" |
62 |
+EAPI=5 |
63 |
+inherit autotools elisp-common eutils pam |
64 |
|
65 |
-inherit elisp-common eutils pam |
66 |
- |
67 |
-GENTOO_THEME_VERSION="2.1" |
68 |
+GENTOO_THEME_VERSION=2.1 |
69 |
|
70 |
DESCRIPTION="a DirectFB getty replacement" |
71 |
HOMEPAGE="http://qingy.sourceforge.net/" |
72 |
@@ -18,26 +17,31 @@ |
73 |
KEYWORDS="amd64 ppc x86" |
74 |
IUSE="crypt directfb emacs gpm opensslcrypt pam static X" |
75 |
|
76 |
-RDEPEND=">=sys-libs/ncurses-5.4-r6 |
77 |
- opensslcrypt? ( >=dev-libs/openssl-0.9.7e ) |
78 |
- crypt? ( >=dev-libs/libgcrypt-1.2.1 ) |
79 |
- directfb? ( >=dev-libs/DirectFB-1.4.2[fbcon,jpeg,png,truetype] ) |
80 |
- emacs? ( virtual/emacs ) |
81 |
- pam? ( >=sys-libs/pam-0.75-r11 ) |
82 |
- X? ( x11-libs/libX11 |
83 |
- x11-libs/libXScrnSaver |
84 |
- x11-proto/scrnsaverproto )" |
85 |
- |
86 |
+RDEPEND=">=sys-libs/ncurses-5.7-r7:= |
87 |
+ opensslcrypt? ( dev-libs/openssl:0= ) |
88 |
+ crypt? ( >=dev-libs/libgcrypt-1.2.1:= ) |
89 |
+ directfb? ( >=dev-libs/DirectFB-1.4.2[fbcon,jpeg,png,truetype] ) |
90 |
+ emacs? ( virtual/emacs ) |
91 |
+ pam? ( >=sys-libs/pam-0.75-r11 ) |
92 |
+ X? ( |
93 |
+ x11-libs/libX11:= |
94 |
+ x11-libs/libXScrnSaver:= |
95 |
+ x11-proto/scrnsaverproto |
96 |
+ )" |
97 |
DEPEND="${RDEPEND} |
98 |
- virtual/pkgconfig |
99 |
- >=sys-apps/sed-4.1.4-r1" |
100 |
+ >=sys-apps/sed-4.1.4-r1 |
101 |
+ virtual/pkgconfig" |
102 |
RDEPEND="${RDEPEND} |
103 |
pam? ( sys-auth/pambase )" |
104 |
|
105 |
SITEFILE=50${PN}-gentoo.el |
106 |
|
107 |
-src_configure() |
108 |
-{ |
109 |
+src_prepare() { |
110 |
+ epatch "${FILESDIR}"/${P}-tinfo.patch |
111 |
+ eautoreconf |
112 |
+} |
113 |
+ |
114 |
+src_configure() { |
115 |
local crypto_support="--disable-crypto" |
116 |
local emacs_support="--disable-emacs --without-lispdir" |
117 |
|
118 |
@@ -48,55 +52,51 @@ |
119 |
echo |
120 |
fi |
121 |
|
122 |
- use emacs && emacs_support="--enable-emacs --with-lispdir=${SITELISP}/${PN}" |
123 |
+ use emacs && emacs_support="--enable-emacs --with-lispdir=${SITELISP}/${PN}" |
124 |
use opensslcrypt && crypto_support="--enable-crypto=openssl" |
125 |
- use crypt && crypto_support="--enable-crypto=libgcrypt" |
126 |
- econf \ |
127 |
- --sbindir=/sbin \ |
128 |
- --disable-optimizations \ |
129 |
- `use_enable pam` \ |
130 |
- `use_enable static static-build` \ |
131 |
- `use_enable gpm gpm-lock` \ |
132 |
- `use_enable X x-support` \ |
133 |
- `use_enable directfb DirectFB-support` \ |
134 |
- ${crypto_support} \ |
135 |
- ${emacs_support} \ |
136 |
- || die "Configuration failed" |
137 |
+ use crypt && crypto_support="--enable-crypto=libgcrypt" |
138 |
+ econf \ |
139 |
+ --sbindir=/sbin \ |
140 |
+ --disable-optimizations \ |
141 |
+ $(use_enable pam) \ |
142 |
+ $(use_enable static static-build) \ |
143 |
+ $(use_enable gpm gpm-lock) \ |
144 |
+ $(use_enable X x-support) \ |
145 |
+ $(use_enable directfb DirectFB-support ) \ |
146 |
+ ${crypto_support} \ |
147 |
+ ${emacs_support} |
148 |
} |
149 |
|
150 |
-src_install() |
151 |
-{ |
152 |
+src_install() { |
153 |
# Copy documentation manually as make install only installs info files |
154 |
# INSTALL is left because it contains also configuration informations |
155 |
dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO |
156 |
|
157 |
# Install the program |
158 |
- emake DESTDIR="${D}" install || die "Installation failed" |
159 |
+ emake DESTDIR="${D}" install |
160 |
|
161 |
# Set the settings file umask to 600, in case somebody |
162 |
# wants to make use of the autologin feature |
163 |
- /bin/chmod 600 "${D}/etc/qingy/settings" |
164 |
+ /bin/chmod 600 "${D}"/etc/qingy/settings |
165 |
|
166 |
# Install Gentoo theme |
167 |
dodir /usr/share/${PN}/themes/gentoo |
168 |
- cp "${WORKDIR}"/gentoo/* "${D}/usr/share/${PN}/themes/gentoo" \ |
169 |
- || die "Gentoo theme installation failed" |
170 |
+ cp "${WORKDIR}"/gentoo/* "${D}"/usr/share/${PN}/themes/gentoo || die |
171 |
|
172 |
# Alter config file so that it uses our theme |
173 |
- sed -i 's/theme = "default"/theme = "gentoo"/' "${D}/etc/${PN}/settings" |
174 |
+ sed -i 's/theme = "default"/theme = "gentoo"/' "${D}"/etc/${PN}/settings |
175 |
|
176 |
# Install log rotation policy |
177 |
insinto /etc/logrotate.d |
178 |
- newins "${FILESDIR}/${PN}-logrotate" ${PN} || die "Log rotation policy installation failed" |
179 |
+ newins "${FILESDIR}"/${PN}-logrotate ${PN} |
180 |
|
181 |
- use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
182 |
+ use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
183 |
|
184 |
- rm "${D}/etc/pam.d/qingy" |
185 |
+ rm "${D}"/etc/pam.d/qingy |
186 |
pamd_mimic system-local-login qingy auth account password session |
187 |
} |
188 |
|
189 |
-pkg_postinst() |
190 |
-{ |
191 |
+pkg_postinst() { |
192 |
einfo "In order to use qingy you must first edit your /etc/inittab" |
193 |
einfo "Check the documentation at ${HOMEPAGE}" |
194 |
einfo "for instructions on how to do that." |