From 06597a69fe5d604eee25b1975a681db558788a8e Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Mon, 1 Sep 2014 15:21:48 +0000 Subject: Replace einstall with emake install, bug #521688. Remove old version (Portage version: 2.2.12-r1/cvs/Linux x86_64, signed Manifest commit with key C74525F2) --- x11-plugins/wmnetload/ChangeLog | 10 +++- .../files/add_support_for_libdockapp_0.5.patch | 63 ---------------------- .../wmnetload/files/wmnetload-1.3-norpath.patch | 57 -------------------- x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild | 31 ----------- x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild | 6 +-- 5 files changed, 11 insertions(+), 156 deletions(-) delete mode 100644 x11-plugins/wmnetload/files/add_support_for_libdockapp_0.5.patch delete mode 100644 x11-plugins/wmnetload/files/wmnetload-1.3-norpath.patch delete mode 100644 x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild (limited to 'x11-plugins') diff --git a/x11-plugins/wmnetload/ChangeLog b/x11-plugins/wmnetload/ChangeLog index 727d7e5a6328..3732a60c1b1e 100644 --- a/x11-plugins/wmnetload/ChangeLog +++ b/x11-plugins/wmnetload/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-plugins/wmnetload -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/ChangeLog,v 1.36 2012/03/18 19:56:30 armin76 Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/ChangeLog,v 1.37 2014/09/01 15:21:48 voyageur Exp $ + + 01 Sep 2014; Bernard Cafarelli + -wmnetload-1.3-r2.ebuild, wmnetload-1.3-r3.ebuild, + -files/add_support_for_libdockapp_0.5.patch, + -files/wmnetload-1.3-norpath.patch: + Replace einstall with emake install, bug #521688. Remove old version 18 Mar 2012; Raúl Porcel wmnetload-1.3-r2.ebuild, wmnetload-1.3-r3.ebuild: diff --git a/x11-plugins/wmnetload/files/add_support_for_libdockapp_0.5.patch b/x11-plugins/wmnetload/files/add_support_for_libdockapp_0.5.patch deleted file mode 100644 index ba43f5f811ba..000000000000 --- a/x11-plugins/wmnetload/files/add_support_for_libdockapp_0.5.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- configure 2004-06-10 20:59:32.970436153 -0500 -+++ configure 2004-06-10 20:38:51.655962203 -0500 -@@ -4627,9 +4627,9 @@ - - LDFLAGS_old="$LDFLAGS" - LDFLAGS="$LDFLAGS $LIBRARY_SEARCH_PATH" --echo "$as_me:$LINENO: checking for DAInitialize in -ldockapp" >&5 --echo $ECHO_N "checking for DAInitialize in -ldockapp... $ECHO_C" >&6 --if test "${ac_cv_lib_dockapp_DAInitialize+set}" = set; then -+echo "$as_me:$LINENO: checking for DAOpenDisplay in -ldockapp" >&5 -+echo $ECHO_N "checking for DAOpenDisplay in -ldockapp... $ECHO_C" >&6 -+if test "${ac_cv_lib_dockapp_DAOpenDisplay+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -4648,11 +4648,11 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char DAInitialize (); -+char DAOpenDisplay (); - int - main () - { --DAInitialize (); -+DAOpenDisplay (); - ; - return 0; - } -@@ -4669,19 +4669,19 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_dockapp_DAInitialize=yes -+ ac_cv_lib_dockapp_DAOpenDisplay=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_dockapp_DAInitialize=no -+ac_cv_lib_dockapp_DAOpenDisplay=no - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dockapp_DAInitialize" >&5 --echo "${ECHO_T}$ac_cv_lib_dockapp_DAInitialize" >&6 --if test $ac_cv_lib_dockapp_DAInitialize = yes; then -+echo "$as_me:$LINENO: result: $ac_cv_lib_dockapp_DAOpenDisplay" >&5 -+echo "${ECHO_T}$ac_cv_lib_dockapp_DAOpenDisplay" >&6 -+if test $ac_cv_lib_dockapp_DAOpenDisplay = yes; then - yes=yes - else - no=no -@@ -4689,7 +4689,7 @@ - - LDFLAGS="$LDFLAGS_old" - --if test "x$ac_cv_lib_dockapp_DAInitialize" = xyes; then -+if test "x$ac_cv_lib_dockapp_DAOpenDisplay" = xyes; then - - CPPFLAGS_old="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $HEADER_SEARCH_PATH $XCFLAGS" diff --git a/x11-plugins/wmnetload/files/wmnetload-1.3-norpath.patch b/x11-plugins/wmnetload/files/wmnetload-1.3-norpath.patch deleted file mode 100644 index a75b5b2bd9da..000000000000 --- a/x11-plugins/wmnetload/files/wmnetload-1.3-norpath.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -ru wmnetload-1.3.orig/Makefile.in wmnetload-1.3/Makefile.in ---- wmnetload-1.3.orig/Makefile.in 2003-02-23 20:08:31.000000000 +1100 -+++ wmnetload-1.3/Makefile.in 2005-10-02 22:12:01.000000000 +1000 -@@ -89,7 +89,7 @@ - MAKEINFO = @MAKEINFO@ - OS = @OS@ - PACKAGE = @PACKAGE@ --RPATH = @RPATH@ -+ - VERSION = @VERSION@ - WN_LOOK = @WN_LOOK@ - XCFLAGS = @XCFLAGS@ -diff -ru wmnetload-1.3.orig/configure wmnetload-1.3/configure ---- wmnetload-1.3.orig/configure 2003-02-23 20:08:00.000000000 +1100 -+++ wmnetload-1.3/configure 2005-10-02 22:12:01.000000000 +1000 -@@ -6017,7 +6017,7 @@ - s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t - s,@X_LIBS@,$X_LIBS,;t t - s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t --s,@RPATH@,$RPATH,;t t -+ - s,@X_LIBRARY_PATH@,$X_LIBRARY_PATH,;t t - s,@XCFLAGS@,$XCFLAGS,;t t - s,@XLFLAGS@,$XLFLAGS,;t t -diff -ru wmnetload-1.3.orig/src/Makefile.am wmnetload-1.3/src/Makefile.am ---- wmnetload-1.3.orig/src/Makefile.am 2003-02-18 17:30:48.000000000 +1100 -+++ wmnetload-1.3/src/Makefile.am 2005-10-02 22:12:01.000000000 +1000 -@@ -25,7 +25,7 @@ - EXTRA_wmnetload_SOURCES = ifstat_linux.c ifstat_netbsd.c ifstat_solaris.c \ - ifstat_freebsd.c - --LDFLAGS = @RPATH@ -+ - - LDADD = @LIBRARY_SEARCH_PATH@ @XLFLAGS@ @XLIBS@ -ldockapp -lXpm -lm - CPPFLAGS = @CPPFLAGS@ @XCFLAGS@ -DVERSION=\"@VERSION@\" -diff -ru wmnetload-1.3.orig/src/Makefile.in wmnetload-1.3/src/Makefile.in ---- wmnetload-1.3.orig/src/Makefile.in 2003-02-23 20:08:35.000000000 +1100 -+++ wmnetload-1.3/src/Makefile.in 2005-10-02 22:12:01.000000000 +1000 -@@ -89,7 +89,7 @@ - MAKEINFO = @MAKEINFO@ - OS = @OS@ - PACKAGE = @PACKAGE@ --RPATH = @RPATH@ -+ - VERSION = @VERSION@ - WN_LOOK = @WN_LOOK@ - XCFLAGS = @XCFLAGS@ -@@ -102,7 +102,7 @@ - EXTRA_wmnetload_SOURCES = ifstat_linux.c ifstat_netbsd.c ifstat_solaris.c ifstat_freebsd.c - - --LDFLAGS = @RPATH@ -+ - - LDADD = @LIBRARY_SEARCH_PATH@ @XLFLAGS@ @XLIBS@ -ldockapp -lXpm -lm - CPPFLAGS = @CPPFLAGS@ @XCFLAGS@ -DVERSION=\"@VERSION@\" diff --git a/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild b/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild deleted file mode 100644 index aa146521aeda..000000000000 --- a/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild,v 1.6 2012/03/18 19:56:30 armin76 Exp $ - -inherit eutils - -DESCRIPTION="Network interface monitor dockapp" -HOMEPAGE="http://freshmeat.net/projects/wmnetload/" -SRC_URI="ftp://truffula.com/pub/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -DEPEND="x11-libs/libdockapp" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Add support for libdockapp 0.5 - epatch "${FILESDIR}"/add_support_for_libdockapp_0.5.patch - - epatch "${FILESDIR}"/wmnetload-1.3-norpath.patch -} - -src_install() { - einstall || die "einstall failed." - dodoc AUTHORS README NEWS -} diff --git a/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild b/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild index fd12bc004f12..f130c6afd1d3 100644 --- a/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild +++ b/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild,v 1.8 2012/03/18 19:56:30 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild,v 1.9 2014/09/01 15:21:48 voyageur Exp $ inherit autotools eutils @@ -25,6 +25,6 @@ src_unpack() { } src_install() { - einstall || die "einstall failed." + emake DESTDIR="${D}" install || die "einstall failed." dodoc AUTHORS README NEWS } -- cgit v1.2.3-65-gdbad