summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-09-07 10:48:04 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-09-07 10:48:04 +0000
commit2bff2e520d9ed2617cf08e3baa2187b5212f187e (patch)
treecdb1d3f160b32d7e60d104431a1b2fde145a164c /sys-process
parentUpdate gnome-keyring dependencies. (diff)
downloadgentoo-2-2bff2e520d9ed2617cf08e3baa2187b5212f187e.tar.gz
gentoo-2-2bff2e520d9ed2617cf08e3baa2187b5212f187e.tar.bz2
gentoo-2-2bff2e520d9ed2617cf08e3baa2187b5212f187e.zip
Version bump.
(Portage version: 2.2_rc75/cvs/Linux x86_64)
Diffstat (limited to 'sys-process')
-rw-r--r--sys-process/psmisc/ChangeLog8
-rw-r--r--sys-process/psmisc/files/psmisc-22.13-no-nls.patch32
-rw-r--r--sys-process/psmisc/psmisc-22.13.ebuild55
3 files changed, 94 insertions, 1 deletions
diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index 286dd485e905..e9299ab29ac3 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-process/psmisc
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.105 2010/08/22 20:20:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.106 2010/09/07 10:48:04 ssuominen Exp $
+
+*psmisc-22.13 (07 Sep 2010)
+
+ 07 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> +psmisc-22.13.ebuild,
+ +files/psmisc-22.13-no-nls.patch:
+ Version bump.
22 Aug 2010; Mike Frysinger <vapier@gentoo.org> psmisc-22.12.ebuild:
Ignore all peekfd build failures #330631 by Raúl Porcel.
diff --git a/sys-process/psmisc/files/psmisc-22.13-no-nls.patch b/sys-process/psmisc/files/psmisc-22.13-no-nls.patch
new file mode 100644
index 000000000000..d18b36af3f6c
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.13-no-nls.patch
@@ -0,0 +1,32 @@
+http://bugs.gentoo.org/193920
+
+--- configure.ac
++++ configure.ac
+@@ -57,10 +57,6 @@
+ AC_CHECK_MEMBERS([struct stat.st_rdev])
+ AC_TYPE_UID_T
+
+-dnl Check for language stuff
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.16.1])
+-
+ dnl Must be after the gettext stuff as it sets build_cpu
+ AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax,
+ struct user_regs_struct.eax,
+@@ -120,6 +116,5 @@
+ AC_CONFIG_FILES([Makefile
+ doc/Makefile
+ src/Makefile
+- icons/Makefile
+- po/Makefile.in])
++ icons/Makefile])
+ AC_OUTPUT
+--- Makefile.am
++++ Makefile.am
+@@ -1,5 +1,5 @@
+
+-SUBDIRS = doc src po icons
++SUBDIRS = doc src icons
+
+ #EXTRA_DIST = config.rpath ABOUT-NLS mkinstalldirs
+
diff --git a/sys-process/psmisc/psmisc-22.13.ebuild b/sys-process/psmisc/psmisc-22.13.ebuild
new file mode 100644
index 000000000000..8d69040c9383
--- /dev/null
+++ b/sys-process/psmisc/psmisc-22.13.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.13.ebuild,v 1.1 2010/09/07 10:48:04 ssuominen Exp $
+
+EAPI=3
+inherit autotools eutils
+
+DESCRIPTION="A set of tools that use the proc filesystem"
+HOMEPAGE="http://psmisc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="ipv6 nls selinux X"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2
+ selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+ sys-devel/libtool
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ use nls || epatch "${FILESDIR}"/${PN}-22.13-no-nls.patch
+ eautoreconf
+}
+
+src_configure() {
+ # the nls looks weird, but it's because we actually delete the nls stuff
+ # above when USE=-nls. this should get cleaned up so we dont have to patch
+ # it out, but until then, let's not confuse users ... #220787
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable selinux) \
+ $(use_enable ipv6) \
+ $(use nls && use_enable nls)
+}
+
+src_compile() {
+ # peekfd is a fragile crap hack #330631
+ emake -C src peekfd || touch src/peekfd{.o,}
+ emake || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog NEWS README
+ [[ -s ${D}/usr/bin/peekfd ]] || rm -f "${D}"/usr/bin/peekfd
+ use X || rm "${ED}"/usr/bin/pstree.x11
+ # fuser is needed by init.d scripts
+ dodir /bin
+ mv "${ED}"/usr/bin/fuser "${ED}"/bin/ || die
+ # easier to do this than forcing regen of autotools
+ [[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
+}