| 1 |
vapier 08/06/16 21:34:43 |
| 2 |
|
| 3 |
Modified: utempter-0.5.5.6.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Drop bindnow-flags #227019 by Diego Pettenò. Switch to emake. Fix ROOT support in pkg_postinst. Respect CPPFLAGS/LDFLAGS. |
| 6 |
(Portage version: 2.2_pre8/cvs/Linux 2.6.25 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.15 sys-apps/utempter/utempter-0.5.5.6.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/utempter/utempter-0.5.5.6.ebuild?rev=1.15&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/utempter/utempter-0.5.5.6.ebuild?rev=1.15&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/utempter/utempter-0.5.5.6.ebuild?r1=1.14&r2=1.15 |
| 14 |
|
| 15 |
Index: utempter-0.5.5.6.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/utempter/utempter-0.5.5.6.ebuild,v |
| 18 |
retrieving revision 1.14 |
| 19 |
retrieving revision 1.15 |
| 20 |
diff -u -r1.14 -r1.15 |
| 21 |
--- utempter-0.5.5.6.ebuild 12 Jul 2007 05:10:21 -0000 1.14 |
| 22 |
+++ utempter-0.5.5.6.ebuild 16 Jun 2008 21:34:42 -0000 1.15 |
| 23 |
@@ -1,8 +1,8 @@ |
| 24 |
-# Copyright 1999-2006 Gentoo Foundation |
| 25 |
+# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/utempter-0.5.5.6.ebuild,v 1.14 2007/07/12 05:10:21 mr_bones_ Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/utempter-0.5.5.6.ebuild,v 1.15 2008/06/16 21:34:42 vapier Exp $ |
| 29 |
|
| 30 |
-inherit rpm eutils flag-o-matic |
| 31 |
+inherit rpm eutils |
| 32 |
|
| 33 |
MY_P=${P%.*}-${PV##*.} |
| 34 |
S=${WORKDIR}/${P%.*} |
| 35 |
@@ -16,9 +16,6 @@ |
| 36 |
IUSE="" |
| 37 |
|
| 38 |
DEPEND="!virtual/utempter" |
| 39 |
-RDEPEND="virtual/libc |
| 40 |
- !virtual/utempter" |
| 41 |
- |
| 42 |
PROVIDE="virtual/utempter" |
| 43 |
|
| 44 |
pkg_setup() { |
| 45 |
@@ -27,41 +24,34 @@ |
| 46 |
|
| 47 |
src_unpack() { |
| 48 |
rpm_src_unpack |
| 49 |
- cd ${S} |
| 50 |
- epatch ${FILESDIR}/${P}-soname-makefile-fix.patch |
| 51 |
- epatch ${FILESDIR}/${P}-no_utmpx.patch |
| 52 |
+ cd "${S}" |
| 53 |
+ epatch "${FILESDIR}"/${P}-soname-makefile-fix.patch |
| 54 |
+ epatch "${FILESDIR}"/${P}-no_utmpx.patch |
| 55 |
+ epatch "${FILESDIR}"/${P}-build.patch |
| 56 |
} |
| 57 |
|
| 58 |
src_compile() { |
| 59 |
- append-ldflags $(bindnow-flags) |
| 60 |
- |
| 61 |
- make RPM_OPT_FLAGS="${CFLAGS}" || die |
| 62 |
+ emake RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" || die |
| 63 |
} |
| 64 |
|
| 65 |
src_install() { |
| 66 |
- make \ |
| 67 |
+ emake \ |
| 68 |
RPM_BUILD_ROOT="${D}" \ |
| 69 |
LIBDIR=/usr/$(get_libdir) \ |
| 70 |
install || die |
| 71 |
- dobin utmp |
| 72 |
+ dobin utmp || die |
| 73 |
|
| 74 |
fowners root:utmp /usr/sbin/utempter |
| 75 |
fperms 2755 /usr/sbin/utempter |
| 76 |
} |
| 77 |
|
| 78 |
pkg_postinst() { |
| 79 |
- if [ "${ROOT}" = "/" ] |
| 80 |
- then |
| 81 |
- if [ -f /var/log/wtmp ] |
| 82 |
- then |
| 83 |
- chown root:utmp /var/log/wtmp |
| 84 |
- chmod 664 /var/log/wtmp |
| 85 |
- fi |
| 86 |
- |
| 87 |
- if [ -f /var/run/utmp ] |
| 88 |
- then |
| 89 |
- chown root:utmp /var/run/utmp |
| 90 |
- chmod 664 /var/run/utmp |
| 91 |
- fi |
| 92 |
+ if [ -f "${ROOT}"/var/log/wtmp ] ; then |
| 93 |
+ chown root:utmp "${ROOT}"/var/log/wtmp |
| 94 |
+ chmod 664 "${ROOT}"/var/log/wtmp |
| 95 |
+ fi |
| 96 |
+ if [ -f "${ROOT}"/var/run/utmp ] ; then |
| 97 |
+ chown root:utmp "${ROOT}"/var/run/utmp |
| 98 |
+ chmod 664 "${ROOT}"/var/run/utmp |
| 99 |
fi |
| 100 |
} |
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
1.44 sys-apps/utempter/ChangeLog |
| 105 |
|
| 106 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/utempter/ChangeLog?rev=1.44&view=markup |
| 107 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/utempter/ChangeLog?rev=1.44&content-type=text/plain |
| 108 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/utempter/ChangeLog?r1=1.43&r2=1.44 |
| 109 |
|
| 110 |
Index: ChangeLog |
| 111 |
=================================================================== |
| 112 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/utempter/ChangeLog,v |
| 113 |
retrieving revision 1.43 |
| 114 |
retrieving revision 1.44 |
| 115 |
diff -u -r1.43 -r1.44 |
| 116 |
--- ChangeLog 25 Dec 2007 15:19:21 -0000 1.43 |
| 117 |
+++ ChangeLog 16 Jun 2008 21:34:42 -0000 1.44 |
| 118 |
@@ -1,6 +1,11 @@ |
| 119 |
# ChangeLog for sys-apps/utempter |
| 120 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 121 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/ChangeLog,v 1.43 2007/12/25 15:19:21 phreak Exp $ |
| 122 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 123 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/ChangeLog,v 1.44 2008/06/16 21:34:42 vapier Exp $ |
| 124 |
+ |
| 125 |
+ 16 Jun 2008; Mike Frysinger <vapier@g.o> |
| 126 |
+ +files/utempter-0.5.5.6-build.patch, utempter-0.5.5.6.ebuild: |
| 127 |
+ Drop bindnow-flags #227019 by Diego Pettenò. Switch to emake. Fix ROOT |
| 128 |
+ support in pkg_postinst. Respect CPPFLAGS/LDFLAGS. |
| 129 |
|
| 130 |
25 Dec 2007; Christian Heim <phreak@g.o> metadata.xml: |
| 131 |
Removing seemant from metadata.xml as per #202469. |
| 132 |
|
| 133 |
|
| 134 |
|
| 135 |
-- |
| 136 |
gentoo-commits@l.g.o mailing list |
Archives