net-misc/gvpe: Merge both inherits

svn path=/sunrise/; revision=7006

diff --git a/net-misc/gvpe/ChangeLog b/net-misc/gvpe/ChangeLog
index d06cfb79004728dfd7425d309aad5ab3dcca8ac3..9a7b711e52af0942e054a9a683752b24dbf5163f 100644 (file)
--- a/net-misc/gvpe/ChangeLog
+++ b/net-misc/gvpe/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Sep 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> gvpe-2.2.ebuild:
+  Merge both inherits
+
   06 Sep 2008; Tiago Cunha (tcunha) <me@tiagocunha.org> gvpe-2.2.ebuild:
   Remove trailing whitespace
 

diff --git a/net-misc/gvpe/Manifest b/net-misc/gvpe/Manifest
index 62538e0e1d01f2650b4302e85c2d8afc2d544298..ca86888ac609dd826f3e95b7832d51d371941ee9 100644 (file)
--- a/net-misc/gvpe/Manifest
+++ b/net-misc/gvpe/Manifest
@@ -4,6 +4,6 @@ AUX gvpe.confd 67 RMD160 2461af00b5ef9d52ad2cd839e6bdc591c9db07fa SHA1 a06f54612
 AUX gvpe.rc 607 RMD160 865a1e6a06ff6ecc77cd4e4949d73bad2262cf15 SHA1 24c755c14ae244a6fed8f5e6f8ac99be8221573a SHA256 513201fbf999da25b2b5a65c4e9ff69ac765591bb805a695278b0fe5c0e47326
 AUX if-up 135 RMD160 430e49544bd5410c02827b600d691d8906fb6532 SHA1 851be6d4ffec694758c68bed901c4000be4d64df SHA256 f658c1512ad81c549c1aee49fccdd0f02005b23805f88712252bd00314e4212d
 DIST gvpe-2.2.tar.gz 492509 RMD160 fa2432d18ca949b3fd7551a3e19bba3cff3293bf SHA1 35d8e32243acb8ce51e63b0b386d2206018f551c SHA256 989ff85d77edff3f6bef01b6cffa2a0e2aa0e9bec81d4b9af11346f103ff2df3
-EBUILD gvpe-2.2.ebuild 3562 RMD160 7c07990bc00853bf4b26ac54b60d38312ef52588 SHA1 afbf4bce06dfc3579b151d21ec4d3f798332d699 SHA256 f39b2603bec9840a71c2a733df249ce00fe578a195acc2a6776ff5d052f561c9
-MISC ChangeLog 509 RMD160 f5e4dfa63b875b21c951b433c8c2d2be34486838 SHA1 aac9a75c7d5cb27cf5087438c832827a0214a7f6 SHA256 75f0cd6a6e4d05a097806294ed7f6759de46c09decd4a1458ea66534edecc440
+EBUILD gvpe-2.2.ebuild 3554 RMD160 4fb88abb6ff2abad46260d1ab7768853a8a9fc5c SHA1 9d0b7768c9ebc0255b6ccc3818c45afbb8eab317 SHA256 4527719dc0d64db367933b549886e256aee7f7b585b45d01d698ffaae8e8b841
+MISC ChangeLog 608 RMD160 ba8fed36fda90e4c996455c361eb8b71b2ccc2b0 SHA1 010cfc5e038ad7169d56e65b2df9f61f6fb6c855 SHA256 dc38b35ea011d6d27b893d0c29f86a5105c1e5ff24927ba2398c17aa06e8f109
 MISC metadata.xml 1491 RMD160 ca3c83150c365e9b831a74036304f8b4e85cfa3d SHA1 6eb4f5185919c070ad8421a9fc14ab4c263e82b2 SHA256 358ced45dfa0c4e2d4fa9edc40672d1ac0fb65b6dc37ecf089f54968a606e49e

diff --git a/net-misc/gvpe/gvpe-2.2.ebuild b/net-misc/gvpe/gvpe-2.2.ebuild
index 0beb0e7d83477f053601d99e980901c5b62d3e6d..892290746851a142497546d0eb5d04ade0513936 100644 (file)
--- a/net-misc/gvpe/gvpe-2.2.ebuild
+++ b/net-misc/gvpe/gvpe-2.2.ebuild
@@ -3,8 +3,7 @@
 # $Header$
 EAPI="1"
 
-inherit eutils
-inherit linux-info
+inherit eutils linux-info
 
 DESCRIPTION="GNU Virtual Private Ethernet"
 HOMEPAGE="http://savannah.gnu.org/projects/gvpe"