paches removed, epoch added

4 files changed, 7 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index adbd9315ea17..2ad6bd81ee9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,10 @@
+# Generated by mksrcinfo v8
+# Sun Oct 28 15:18:49 UTC 2018
 pkgbase = guile-git
 	pkgdesc = A portable, embeddable Scheme implementation (Git snapshot)
 	pkgver = 2.9.1.1.gbb0860a0e
 	pkgrel = 1
+	epoch = 1
 	url = http://www.gnu.org/software/guile/
 	arch = i686
 	arch = x86_64
@@ -21,11 +24,7 @@ pkgbase = guile-git
 	options = !makeflags
 	options = libtool
 	source = git://git.sv.gnu.org/guile.git
-	source = version.patch
-	source = rename_scm.h.patch
 	sha256sums = SKIP
-	sha256sums = 7f902891a717cd6606a6a768e6e59b40c96757cbfa9a2262722567bea31b3774
-	sha256sums = c43e79fd27442e039a7c21d958eae059ec3d7ce5b9f0c9cf680141683a2a64f8
 
 pkgname = guile-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 47d713b9b81a..bc03e1eed5b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=guile-git
+epoch=1
 pkgver=2.9.1.1.gbb0860a0e
 pkgrel=1
 pkgdesc="A portable, embeddable Scheme implementation (Git snapshot)"
@@ -12,20 +13,13 @@ depends=('gc' 'libtool' 'libffi' 'libunistring' 'gmp' 'readline')
 provides=('guile')
 conflicts=('guile4emacs')
 options=('!strip' '!makeflags' 'libtool')
-source=("git://git.sv.gnu.org/${pkgname%-git}.git" version.patch rename_scm.h.patch)
+source=("git://git.sv.gnu.org/${pkgname%-git}.git")
 url="http://www.gnu.org/software/guile/"
-sha256sums=('SKIP'
-            '7f902891a717cd6606a6a768e6e59b40c96757cbfa9a2262722567bea31b3774'
-            'c43e79fd27442e039a7c21d958eae059ec3d7ce5b9f0c9cf680141683a2a64f8')
+sha256sums=('SKIP')
 
 pkgver() {
   cd ${pkgname%-git}
-  git describe --tags |sed 's+-+.+g'|sed 's+^v++'|sed 's+2.2.2+3.0.0+'
-}
-
-prepare() {
-  cd ${pkgname%-git}
-  patch -Np1 < "$srcdir"/version.patch || true
+  git describe --tags |sed 's+-+.+g'|sed 's+^v++'
 }
 
 build() {
diff --git a/rename_scm.h.patch b/rename_scm.h.patch
deleted file mode 100644
index fcb684b3bef1..000000000000
--- a/rename_scm.h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/GUILE-VERSION b/GUILE-VERSION
-index a44c254fb..0db8a3b45 100644
---- a/GUILE-VERSION
-+++ b/GUILE-VERSION
-@@ -1,8 +1,8 @@
- # -*-shell-script-*-
- 
- # Note: `GUILE_VERSION' is defined in `configure.ac' using `git-version-gen'.
--GUILE_MAJOR_VERSION=2
--GUILE_MINOR_VERSION=3
-+GUILE_MAJOR_VERSION=3
-+GUILE_MINOR_VERSION=0
- GUILE_MICRO_VERSION=0
- 
- GUILE_EFFECTIVE_VERSION=3.0
diff --git a/version.patch b/version.patch
deleted file mode 100644
index fd985b078519..000000000000
--- a/version.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/GUILE-VERSION b/GUILE-VERSION
-index a44c254fb..0db8a3b45 100644
---- a/GUILE-VERSION
-+++ b/GUILE-VERSION
-@@ -1,8 +1,8 @@
- # -*-shell-script-*-
- 
- # Note: `GUILE_VERSION' is defined in `configure.ac' using `git-version-gen'.
--GUILE_MAJOR_VERSION=2
--GUILE_MINOR_VERSION=3
-+GUILE_MAJOR_VERSION=3
-+GUILE_MINOR_VERSION=0
- GUILE_MICRO_VERSION=0
- 
- GUILE_EFFECTIVE_VERSION=3.0
-diff --git a/meta/guile-config.in b/meta/guile-config.in
-index b3e4c3d94..5236476c4 100755
---- a/meta/guile-config.in
-+++ b/meta/guile-config.in
-@@ -77,7 +77,7 @@ exec "@installed_guile@" -e main -s $0 "$@"
-     (dle "  " p " --help      - show usage info (this message)")
-     (dle "  " p " --help SUBCOMMAND - show help for SUBCOMMAND")))
- 
--(define guile-module "guile-2.2")
-+(define guile-module "guile-3.0")
- 
- (define (pkg-config . args)
-   (let* ((real-args (cons %pkg-config-program args))