From 0167a0c60de3b5ef2fee787e6ad85c23a314bd9d Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Fri, 3 Apr 2015 05:44:08 +0000 Subject: [PATCH] Clean up patches. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- net-analyzer/fe3d/ChangeLog | 6 +++++- net-analyzer/fe3d/Manifest | 12 ++++++------ net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch | 8 ++++---- net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch | 4 ++-- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/net-analyzer/fe3d/ChangeLog b/net-analyzer/fe3d/ChangeLog index 8db2c4a02d18..faed739a3541 100644 --- a/net-analyzer/fe3d/ChangeLog +++ b/net-analyzer/fe3d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/fe3d # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fe3d/ChangeLog,v 1.17 2015/04/03 05:42:40 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fe3d/ChangeLog,v 1.18 2015/04/03 05:44:07 jer Exp $ + + 03 Apr 2015; Jeroen Roovers + files/fe3d-0.11.2-asneeded.patch, files/fe3d-0.11.2-coreutils.patch: + Clean up patches. 03 Apr 2015; Jeroen Roovers fe3d-0.11.2.ebuild: Use wxwidgets.eclass (bug #544992 by Toralf Förster). diff --git a/net-analyzer/fe3d/Manifest b/net-analyzer/fe3d/Manifest index 6b2a60855bc2..a4c7ad04435f 100644 --- a/net-analyzer/fe3d/Manifest +++ b/net-analyzer/fe3d/Manifest @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX fe3d-0.11.2-asneeded.patch 1440 SHA256 2e509aa790fa522d57fbc2aaf8d3ea90b553b9a965a682771a14ee2ffa52c984 SHA512 ce540de59980b688f7ba7f7b02291bd63727fb1439e8eb4ab2e4c64fa786f65e24aa975882bbfa6a47be013968dc2f53c85b06301833f526675972b7545d5431 WHIRLPOOL aa5843f72d092d4e2b05ed4f72a36e1b28a0a48bd0c572e53431068d250fc1f71cbfca91429d0860d758cd6c7fca58f8de183999f52e44dc872dc96d2ec0bbd4 -AUX fe3d-0.11.2-coreutils.patch 324 SHA256 88d438498e68835d2aa67a1b81819350781ff44ca63a3c1b26d9e8d5530fe92b SHA512 af418c8e4f69a345852e3571a39e8f08d56eac3ab8811bab8f84c347470ea5c9dad50cc04738c95fab341d5ca1ed1afcb61d30975335f73ff376da669c5eb2a0 WHIRLPOOL 51b2e218a74521387c58eb7da6d555da924d77895f890868ad82ffa05d9c6e8d753be6172310e656049d8c8f6cc644d8a91da5ddcfad53cb4af2d738534951f2 +AUX fe3d-0.11.2-asneeded.patch 1448 SHA256 35742dff01cc0812166aeb95b6099329aac7da73393f77d686f2dd45796d5b13 SHA512 fa5830930571b629e6182933a5a9589cc2aa04999c4b28287066fee2afb0ba68ced08ca3893c54025c49561506bf1167659b4b8f394e9ccebd143a30ef086788 WHIRLPOOL efb4e009fbacd88c5504201d61faba5fc01b65f127066a43da07e3883aebbab9607428a347825bbfcf19e90f153b0405ae314b807d5b49a83d374a0a4b1e42a5 +AUX fe3d-0.11.2-coreutils.patch 328 SHA256 1eac6119e84f7e7531d624e189b1e0eeff6223e8ca502bd726c289163a1dce5e SHA512 981ad1bcbc69786fc4f2ecd6b859ab9f6aac822ce0b62e09516d87d87c003bd5c3d71611a874651d03e0fb7e1db505f574e569045ac287b2433e4a508fdf7250 WHIRLPOOL 3e9db29ea971fcd5574548c56b23474f1752a820a8ffc9dd460261d0d5d16c4303dc79c8d2121e63dbceb211ae6d8e4a0e25fb582b1c986e5cf3ab3e9490cdb6 DIST fe3d_0.11.2-src.tar.bz2 322740 SHA256 8aef228d72c17d9dc060de15c751abbf12e1445f938f27c50cd33cb43d76d833 SHA512 989ca9d19f3f23c8c10afad978cc5226e190d6d0c28ea8402e1894598c136eda345258d96ffce3585af7a8cd993ce377f863a7c43620ceda8d3b0ce674eb616f WHIRLPOOL b5686ea9427149573be4b26a6786eda2ce091069ea22de9b607e30c46670553771c1d11379417ad8ccb29fd3706c151848b80aebe393a22b29353c4b91cee509 EBUILD fe3d-0.11.2.ebuild 1402 SHA256 5ad136f13492c3cfec1e68adfc59f16753c6525e5f25f8c35fc4bbdf8d2714da SHA512 1f365af7a988b340e82d371923371d83b07f2f5483625f50367732824a4b1f7237d02cd82000178e00c112282e29cf7bdbc27ecc2ebb1510dcb35e3d36f41f48 WHIRLPOOL aaa638871960dcde818db2f308f0add897109a8515fe25b7e59d25b3bab1a0622147229b8b9dbbfd1e82e7c61d9cbc250e6fec2ee0f28006d3f2ad7b5703ba32 -MISC ChangeLog 2490 SHA256 766efe5121cfaf9941fb08dcbee882c74334c93aa56e76d77eda52515932c608 SHA512 cde6a5eb105a4822458af942d13d81a8b49be749ce33172772618abe41c02714574481c8aa21817b2cc6c05ca5c0cefce3534cdd42012de8d1cb1c60e357f9fe WHIRLPOOL 5ec4606b3c63b091d04a099f43703fe6188bd44a699827a5fb7ffd3ec39c6c2c2e1132dbebf0dadfd33535119642748b412f1da439541bfcfd8c93bd7ef23a51 +MISC ChangeLog 2629 SHA256 3dd5ac4ff153ea4bd9dc4433b98a411b8d6b4d9a36e861ea4e22a2f7bbd21cf9 SHA512 6593fc072c3caac0076e4bf4edfc284fdd4e7ec199ace74f23a0b5b86f5dfd12bf3d1afa5c8981e5bc37607940531c5d4be6ebdc1796cda231a27430a8036a1a WHIRLPOOL 8a4dd674f8df926ffc3cb475be703f585506988c5c4c31d26c7ab961d2aa27b62d9008894ecbc380f5a0f6fa9fb17c79ab505ec06d564796dd1d04be951c82e6 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlUeKFEACgkQVWmRsqeSphMdEgCePrmYzxEcg7Wy4wyCI7eNIFag -4J4AmgLlUUU0Z+lqjOGOws5j37qo0H23 -=cSyg +iEYEAREIAAYFAlUeKKgACgkQVWmRsqeSphPvTACfd2n9RgsspKr7l6l4Z1MV9mmH +mJsAn2vsObh1EyCx9YbpEvNDeBr4MpI8 +=mBsZ -----END PGP SIGNATURE----- diff --git a/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch b/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch index 5399da4b8e97..63d475194162 100644 --- a/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch +++ b/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch @@ -1,5 +1,5 @@ ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -46,16 +46,15 @@ ]) fi @@ -22,8 +22,8 @@ AC_OUTPUT ---- src/Makefile.am -+++ src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -1,8 +1,10 @@ -fe3d_CPPFLAGS = -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\"" +fe3d_CPPFLAGS = -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\"" @WX_CPPFLAGS@ diff --git a/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch b/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch index bcc0db6893e1..547d86fb5cab 100644 --- a/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch +++ b/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch @@ -1,7 +1,7 @@ http://bugs.gentoo.org/330047 ---- src/Makefile.am -+++ src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -5,5 +5,5 @@ fe3ddir = @datadir@/@PACKAGE@ -- 2.26.2