Update to version 2.3.28-1

2 files changed, 8 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5bc8e9607ba..d6a11188908d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = etc-update
 	pkgdesc = CLI to interactively merge .pacnew in /etc
-	pkgver = 2.3.24
+	pkgver = 2.3.28
 	pkgrel = 1
 	url = https://wiki.gentoo.org/wiki/Handbook:X86/Portage/Tools#etc-update
 	arch = any
 	license = GPL
 	makedepends = git
 	depends = bash
-	source = https://github.com/gentoo/portage/archive/portage-2.3.24.tar.gz
-	md5sums = 27e4be95612157b29725a49fffd33b9e
+	source = https://github.com/gentoo/portage/archive/portage-2.3.28.tar.gz
+	md5sums = da606572600d37f8e61cb6ad7dba644c
 
 pkgname = etc-update
 
diff --git a/PKGBUILD b/PKGBUILD
index 379e04016e28..e9be1b3cdd78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,30 +3,17 @@
 
 pkgname='etc-update'
 pkgdesc="CLI to interactively merge .pacnew in /etc"
-pkgver=2.3.24
+pkgver=2.3.28
 pkgrel=1
 arch=('any')
 url="https://wiki.gentoo.org/wiki/Handbook:X86/Portage/Tools#etc-update"
 license=('GPL')
 depends=('bash')
 makedepends=('git')
-source=("https://github.com/gentoo/portage/archive/portage-$pkgver.tar.gz")
-md5sums=('27e4be95612157b29725a49fffd33b9e')
-
-prepare() {
-  sed -e "/Public License v2/a # Ported to Arch Linux by:\n# Kewl <xrjy@nygb.rh.bet(rot13)>
-    /^OS_RELEASE_ID=/c\OS_RELEASE_ID=arch
-    s/suse|opensuse/arch/
-    s/'suse'/'arch'/g
-    s/\.rpmnew/\.pacnew/g
-    s/Gentoo's/Arch/g
-    s/PROTECT='\/etc'/PROTECT='\/etc \/usr\/lib \/usr\/share\/config'/
-    s/PROTECT_MASK=''/PROTECT_MASK='\/etc\/udev\/rules.d'/
-    s/local file ofile /local file ofile='.pacnew' /
-    s/file:10/file::-7/g" "portage-portage-$pkgver/bin/$pkgname" > "$pkgname"
-}
+source=("https://github.com/gentoo/portage/archive/portage-${pkgver}.tar.gz")
+md5sums=('da606572600d37f8e61cb6ad7dba644c')
 
 package() {
-  install -Dm 0755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
-  install -Dm 0644 "portage-portage-$pkgver/cnf/$pkgname.conf" "$pkgdir/etc/$pkgname.conf"
+  install -Dm 0755 "portage-portage-${pkgver}/bin/${pkgname}" "$pkgdir/usr/bin/${pkgname}"
+  install -Dm 0644 "portage-portage-${pkgver}/cnf/${pkgname}.conf" "$pkgdir/etc/${pkgname}.conf"
 }