use sha256, remove reverse conflict

2 files changed, 4 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9e03f30a252..158f06ac4a6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,11 +7,10 @@ pkgbase = heirloom-sh
 	arch = x86_64
 	license = BSD
 	license = CDDL
-	conflicts = heirloom-sh-cvs
 	source = http://sourceforge.net/projects/heirloom/files/heirloom-sh/050706/heirloom-sh-050706.tar.bz2
 	source = 000-config.diff
-	md5sums = 9169d9b3b845cb63c598ea29b8d2dfa0
-	md5sums = 991b32bee780ce48685dfd4d39d41443
+	sha256sums = 25fb8409e1eb75bb5da21ca32baf2d5eebcb8b84a1288d66e65763a125809e1d
+	sha256sums = f0452b9fb1c58a6f0fba6d49bcd7598f875c94f64ddd8b60bb8ab12bbbaf7c9b
 
 pkgname = heirloom-sh
 
diff --git a/PKGBUILD b/PKGBUILD
index a2d5d6a672be..f96dcd693e5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,11 +9,10 @@ pkgdesc="Traditional sh derived from OpenSolaris code"
 arch=('i686' 'x86_64')
 url="http://heirloom.sourceforge.net/sh.html"
 license=('BSD' 'CDDL')
-conflicts=("$pkgname-cvs")
 source=("http://sourceforge.net/projects/heirloom/files/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2"
 	'000-config.diff')
-md5sums=('9169d9b3b845cb63c598ea29b8d2dfa0'
-         '991b32bee780ce48685dfd4d39d41443')
+sha256sums=('25fb8409e1eb75bb5da21ca32baf2d5eebcb8b84a1288d66e65763a125809e1d'
+            'f0452b9fb1c58a6f0fba6d49bcd7598f875c94f64ddd8b60bb8ab12bbbaf7c9b')
 
 build() {
 	cd "$pkgname-$pkgver"