summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/wdd/Manifest10
-rw-r--r--sys-apps/wdd/files/digest-wdd-02
-rw-r--r--sys-apps/wdd/wdd-0.ebuild2
3 files changed, 11 insertions, 3 deletions
diff --git a/sys-apps/wdd/Manifest b/sys-apps/wdd/Manifest
index 5746864f..25221304 100644
--- a/sys-apps/wdd/Manifest
+++ b/sys-apps/wdd/Manifest
@@ -12,6 +12,15 @@ RMD160 f42dd9c91bbd1efe38253db237b7fee70f303c67 files/wdd.initd 421
SHA256 9d123e1ea41d90404520f33922d12cb2622cc4b913f62277d4b11bdfe0d3b684 files/wdd.initd 421
DIST wdd.8 3198 RMD160 34aa288bd79e0f15229ca75f8567bde8d45f76a1 SHA1 1f83bdc0fd2f8aaeb439ac60f1d79487a8e88f88 SHA256 7129d465b7fa4c96dd488f22a4dc265a0d2d343e1c40ac0aa6827e53dd8aec2b
DIST wdd.c 2841 RMD160 f4555a2132545e371d7325bc71755c48f64a57b9 SHA1 b68d654ec1511bbce66a1a07d40bf9b7c3272243 SHA256 66be5e748b6199f7afbdbc7b6aaed6cbbfa2e0634aa90d3c0aefa743756ae6a7
+<<<<<<< master
+EBUILD wdd-0.ebuild 686 RMD160 daa4c86d9a64d990b06a11ec1179ded165e1784e SHA1 25bae85d0b0961cc05c5e5ccfe9f3a375975f766 SHA256 96b94172c62b2c126b401cc5f4aa837a4d4b268c3ad1f8de0f5e4670a968f5aa
+MD5 4fda60dac245add9de418d0579ed3031 wdd-0.ebuild 686
+RMD160 daa4c86d9a64d990b06a11ec1179ded165e1784e wdd-0.ebuild 686
+SHA256 96b94172c62b2c126b401cc5f4aa837a4d4b268c3ad1f8de0f5e4670a968f5aa wdd-0.ebuild 686
+MD5 fb7f1f6d3fb445ac0d3615885d5574bc files/digest-wdd-0 284
+RMD160 b234d844c53139ee925a02df7391a8b40f14ee92 files/digest-wdd-0 284
+SHA256 4c27a04299038d35a3a0a8fbb02de8f50c8eb014298bfe4b56bfe74a63ddb927 files/digest-wdd-0 284
+=======
EBUILD wdd-0.ebuild 752 RMD160 04f16d8ca59c2f61c15595c2879607362ddbc168 SHA1 0949ee55942787a46959bee0365d169436514b3d SHA256 2233dcdeebc1c9a8294b2fd0bdeeaf8784238e549062a52bed2f5c55c7727ac4
MD5 7137ec752cae8f193cd1dbfa5112176c wdd-0.ebuild 752
RMD160 04f16d8ca59c2f61c15595c2879607362ddbc168 wdd-0.ebuild 752
@@ -19,3 +28,4 @@ SHA256 2233dcdeebc1c9a8294b2fd0bdeeaf8784238e549062a52bed2f5c55c7727ac4 wdd-0.eb
MD5 daf370de16bb7113a86e207d54e19b78 files/digest-wdd-0 380
RMD160 710fd022e21ffbba48307977288272fdeed7d8a4 files/digest-wdd-0 380
SHA256 6e41671e09cefce5f0cc7b22630bb8b31eaa4b11e723822913b75c710b5c79ad files/digest-wdd-0 380
+>>>>>>> origin
diff --git a/sys-apps/wdd/files/digest-wdd-0 b/sys-apps/wdd/files/digest-wdd-0
index 554d8ddd..905620c8 100644
--- a/sys-apps/wdd/files/digest-wdd-0
+++ b/sys-apps/wdd/files/digest-wdd-0
@@ -1,6 +1,4 @@
-MD5 51bae2fba47ded6d09385f179afe3e39 wdd.8 3198
RMD160 34aa288bd79e0f15229ca75f8567bde8d45f76a1 wdd.8 3198
SHA256 7129d465b7fa4c96dd488f22a4dc265a0d2d343e1c40ac0aa6827e53dd8aec2b wdd.8 3198
-MD5 c86cb0063b5a5969f7592ab0a0de6b37 wdd.c 2841
RMD160 f4555a2132545e371d7325bc71755c48f64a57b9 wdd.c 2841
SHA256 66be5e748b6199f7afbdbc7b6aaed6cbbfa2e0634aa90d3c0aefa743756ae6a7 wdd.c 2841
diff --git a/sys-apps/wdd/wdd-0.ebuild b/sys-apps/wdd/wdd-0.ebuild
index f036b9df..56f3a1ec 100644
--- a/sys-apps/wdd/wdd-0.ebuild
+++ b/sys-apps/wdd/wdd-0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://linux.exosec.net/watchdog/daemon/wdd.c
LICENSE="Public-Domain"
SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
IUSE=""
DEPEND=""