| 1 |
mgorny 11/07/28 14:01:48 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: procps-3.2.8_p10-r1.ebuild |
| 5 |
Removed: procps-3.2.8_p10.ebuild |
| 6 |
Log: |
| 7 |
Fix libproc.so symlink, per bug #376299. Reviewed by Tony Vroon. |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha47_p5/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.51 sys-process/procps/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/procps/ChangeLog?rev=1.51&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/procps/ChangeLog?rev=1.51&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/procps/ChangeLog?r1=1.50&r2=1.51 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v |
| 21 |
retrieving revision 1.50 |
| 22 |
retrieving revision 1.51 |
| 23 |
diff -u -r1.50 -r1.51 |
| 24 |
--- ChangeLog 23 Jul 2011 01:09:35 -0000 1.50 |
| 25 |
+++ ChangeLog 28 Jul 2011 14:01:48 -0000 1.51 |
| 26 |
@@ -1,6 +1,12 @@ |
| 27 |
# ChangeLog for sys-process/procps |
| 28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.50 2011/07/23 01:09:35 vapier Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.51 2011/07/28 14:01:48 mgorny Exp $ |
| 31 |
+ |
| 32 |
+*procps-3.2.8_p10-r1 (28 Jul 2011) |
| 33 |
+ |
| 34 |
+ 28 Jul 2011; Michał Górny <mgorny@g.o> -procps-3.2.8_p10.ebuild, |
| 35 |
+ +procps-3.2.8_p10-r1.ebuild: |
| 36 |
+ Fix libproc.so symlink, per bug #376299. Reviewed by Tony Vroon. |
| 37 |
|
| 38 |
23 Jul 2011; Mike Frysinger <vapier@g.o> procps-3.2.8_p10.ebuild: |
| 39 |
Delete Debian unicode patches when USE=-unicode. |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 sys-process/procps/procps-3.2.8_p10-r1.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/procps/procps-3.2.8_p10-r1.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/procps/procps-3.2.8_p10-r1.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: procps-3.2.8_p10-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2011 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8_p10-r1.ebuild,v 1.1 2011/07/28 14:01:48 mgorny Exp $ |
| 53 |
|
| 54 |
EAPI="2" |
| 55 |
|
| 56 |
inherit flag-o-matic eutils toolchain-funcs multilib |
| 57 |
|
| 58 |
DEB_VER=${PV#*_p} |
| 59 |
MY_PV=${PV%_p*} |
| 60 |
MY_P="${PN}-${MY_PV}" |
| 61 |
DESCRIPTION="Standard informational utilities and process-handling tools" |
| 62 |
HOMEPAGE="http://procps.sourceforge.net/" |
| 63 |
SRC_URI="http://procps.sourceforge.net/${MY_P}.tar.gz |
| 64 |
mirror://debian/pool/main/p/procps/${PN}_${MY_PV}-${DEB_VER}.debian.tar.gz" |
| 65 |
|
| 66 |
LICENSE="GPL-2" |
| 67 |
SLOT="0" |
| 68 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 69 |
IUSE="unicode" |
| 70 |
|
| 71 |
RDEPEND=">=sys-libs/ncurses-5.2-r2" |
| 72 |
|
| 73 |
S=${WORKDIR}/${MY_P} |
| 74 |
|
| 75 |
src_prepare() { |
| 76 |
local p d="${WORKDIR}"/debian/patches |
| 77 |
pushd "${d}" >/dev/null |
| 78 |
# makefile_dev_null: this bug is actually in gcc and is already fixed |
| 79 |
for p in $(use unicode || echo watch_{unicode,ansi_colour}) makefile_dev_null ; do |
| 80 |
rm ${p}.patch || die |
| 81 |
sed -i "/^${p}/d" series || die |
| 82 |
done |
| 83 |
popd >/dev/null |
| 84 |
EPATCH_SOURCE="${d}" \ |
| 85 |
epatch $(<"${d}"/series) |
| 86 |
# fixup debian watch_exec_beep.patch |
| 87 |
sed -i '1i#include <sys/wait.h>' watch.c || die |
| 88 |
|
| 89 |
epatch "${FILESDIR}"/${PN}-3.2.7-proc-mount.patch |
| 90 |
epatch "${FILESDIR}"/${PN}-3.2.3-noproc.patch |
| 91 |
epatch "${FILESDIR}"/${PN}-3.2.8-toprc-fixup.patch |
| 92 |
epatch "${FILESDIR}"/${PN}-3.2.8-r1-forest-prefix.patch |
| 93 |
|
| 94 |
# Clean up the makefile |
| 95 |
# - we do stripping ourselves |
| 96 |
# - punt fugly gcc flags |
| 97 |
sed -i \ |
| 98 |
-e '/install/s: --strip : :' \ |
| 99 |
-e '/ALL_CFLAGS += $(call check_gcc,-fweb,)/d' \ |
| 100 |
-e '/ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing=2,)/s,=2,,' \ |
| 101 |
-e "/^lib64/s:=.*:=$(get_libdir):" \ |
| 102 |
-e 's:-m64::g' \ |
| 103 |
Makefile || die "sed Makefile" |
| 104 |
|
| 105 |
# mips 2.4.23 headers (and 2.6.x) don't allow PAGE_SIZE to be defined in |
| 106 |
# userspace anymore, so this patch instructs procps to get the |
| 107 |
# value from sysconf(). |
| 108 |
epatch "${FILESDIR}"/${PN}-mips-define-pagesize.patch |
| 109 |
|
| 110 |
# lame unicode stuff checks glibc defines |
| 111 |
sed -i "s:__GNU_LIBRARY__ >= 6:0 == $(use unicode; echo $?):" proc/escape.c || die |
| 112 |
} |
| 113 |
|
| 114 |
src_compile() { |
| 115 |
replace-flags -O3 -O2 |
| 116 |
emake \ |
| 117 |
CC="$(tc-getCC)" \ |
| 118 |
CPPFLAGS="${CPPFLAGS}" \ |
| 119 |
CFLAGS="${CFLAGS}" \ |
| 120 |
LDFLAGS="${LDFLAGS}" \ |
| 121 |
|| die "make failed" |
| 122 |
} |
| 123 |
|
| 124 |
src_install() { |
| 125 |
emake \ |
| 126 |
ln_f="ln -sf" \ |
| 127 |
ldconfig="true" \ |
| 128 |
DESTDIR="${D}" \ |
| 129 |
install \ |
| 130 |
|| die "install failed" |
| 131 |
|
| 132 |
insinto /usr/include/proc |
| 133 |
doins proc/*.h || die |
| 134 |
|
| 135 |
dodoc sysctl.conf BUGS NEWS TODO ps/HACKING |
| 136 |
|
| 137 |
# compat symlink so people who shouldnt be using libproc can #170077 |
| 138 |
dosym libproc-${MY_PV}.so /$(get_libdir)/libproc.so || die |
| 139 |
} |
Archives