From c697a3afe5719978aa45c702f606bd807913690d Mon Sep 17 00:00:00 2001 From: James Broadhead Date: Sat, 17 Jan 2015 13:50:05 +0000 Subject: Fix dev-perl/File-KeePass ebuild --- dev-perl/File-KeePass/File-KeePass-2.30.0.ebuild | 4 ---- dev-perl/File-KeePass/Manifest | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dev-perl/File-KeePass/File-KeePass-2.30.0.ebuild b/dev-perl/File-KeePass/File-KeePass-2.30.0.ebuild index f7f5186..ef6f521 100644 --- a/dev-perl/File-KeePass/File-KeePass-2.30.0.ebuild +++ b/dev-perl/File-KeePass/File-KeePass-2.30.0.ebuild @@ -2,11 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -<<<<<<< HEAD EAPI=5 -======= -EAPI=4 ->>>>>>> 128e0df7d8d45773efea3a26acb5d1a762b7a8d2 MODULE_AUTHOR="RHANDOM" MODULE_VERSION="2.03" diff --git a/dev-perl/File-KeePass/Manifest b/dev-perl/File-KeePass/Manifest index 98eac0b..b6c6757 100644 --- a/dev-perl/File-KeePass/Manifest +++ b/dev-perl/File-KeePass/Manifest @@ -1,3 +1,3 @@ DIST File-KeePass-2.03.tar.gz 37010 SHA256 c30c688027a52ff4f58cd69d6d8ef35472a7cf106d4ce94eb73a796ba7c7ffa7 SHA512 f50cdcc52e3f4eb9da17e9e823ae268547f9fafaa534bdc52db1da53564fcc28ebf975e71b9968b5cad617f2964ed3c55022063bc52f910d2478d06ce35d4ba1 WHIRLPOOL 8812a8c02c53f4b1eb3d4958b8a82828cd6815be7cda4b1695f73ba5dcc30dc81f9a90bcad39cdd694a283208f73162d306341ab4cf20dc9f5e3659fa6c6964e -EBUILD File-KeePass-2.30.0.ebuild 322 SHA256 2453eab3f19578a0aac177031b5035068ff2c6b536e955467336b5f9128d5ac9 SHA512 57f59681a3ed74bb68595af331b841bf494745b3737e4ff0ef391fec5c3f21c1dffef98b9122534c011f14f3655bfcfdf91f2d532ee4532063dcbfa68524bcba WHIRLPOOL 2c56065327803e966301385ddd290d63ad1e162be8e16824f620cceb35cc0d2976212c9ca6793796a383b6d650fcfb4bba055f596a5220c6a257c3f81036dabc +EBUILD File-KeePass-2.30.0.ebuild 322 SHA256 2f120ac531db148620815a2dcfcba3b78398fd64d8efba24163f379c14d82437 SHA512 f559c823b256af35b369b77bbeed02a91c76f685d5462dc441b9f485d46b08423ab89fddd5283cbdc6224f86d562e5ad803c161c7be5779012dbcb660c898489 WHIRLPOOL cd39451025ba612538d64a78b29adcbfffd5c517597a42f7bea5f9afa507322b19c5b05b0b8fb54993d89ca64d838631ab0e3c7549b7d2aa0e3ea05b445ee2cc MISC metadata.xml 214 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154 SHA512 aeb2fb354a9ddf41c45a071091a58b91eaf8b25d6d2c49e3e3daa547b591a54530144de4533573160b48dc356289c909612c4e3c80e387f081f88cb39263e130 WHIRLPOOL 54d8861daedd18ca38e4ada0fb71026c612b63946d47a9b34de90d1d6d85c8ce05c0a4b97730f554ea637d73ccce8ed207d33e707c2b8c1dd28af24cf44dd186 -- cgit v1.2.3-65-gdbad