Split package into vagrant and vagrant-substrate

5 files changed, 23 insertions, 108 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09d58925523d..d97fb5ac65c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,17 @@
 pkgbase = vagrant-git
 	pkgdesc = Build and distribute virtualized development environments
-	pkgver = 1.7.4.40.gb79f0bb
+	pkgver = 1.7.4.43.gb721eb6
 	pkgrel = 1
 	url = http://vagrantup.com
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = git
-	makedepends = puppet
-	makedepends = chrpath
-	makedepends = wget
-	depends = lzo
-	depends = libidn
-	depends = rtmpdump
+	depends = vagrant-substrate
 	conflicts = vagrant
 	options = !emptydirs
 	source = git://github.com/mitchellh/vagrant.git
-	source = git://github.com/mitchellh/vagrant-installers.git
-	source = puppet_module_libiconv.patch
-	source = libiconv.patch
-	source = readline.patch
 	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = 293e1a9bbb8c510f1bc79d9a0bd477ed
-	md5sums = c1bd61a5617b64654c33a2afc506e499
-	md5sums = a4f87b2483c7bd724bb94a69aa5cf733
 
 pkgname = vagrant-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 0ea8384be9d5..5caffcd463bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=vagrant
 pkgname=vagrant-git
-pkgver=1.7.4.40.gb79f0bb
+pkgver=1.7.4.43.gb721eb6
 pkgrel=1
 pkgdesc="Build and distribute virtualized development environments"
 arch=('i686' 'x86_64')
@@ -10,18 +10,10 @@ url="http://vagrantup.com"
 license=('MIT')
 conflicts=('vagrant')
 options=('!emptydirs')
-makedepends=('git' 'puppet' 'chrpath' 'wget')
-depends=('lzo' 'libidn' 'rtmpdump')
-source=(git://github.com/mitchellh/$_pkgname.git
-        git://github.com/mitchellh/$_pkgname-installers.git
-        puppet_module_libiconv.patch
-        libiconv.patch
-        readline.patch)
-md5sums=('SKIP'
-         'SKIP'
-         '293e1a9bbb8c510f1bc79d9a0bd477ed'
-         'c1bd61a5617b64654c33a2afc506e499'
-         'a4f87b2483c7bd724bb94a69aa5cf733')
+makedepends=('git')
+depends=('vagrant-substrate')
+source=(git://github.com/mitchellh/$_pkgname.git)
+md5sums=('SKIP')
 
 pkgver() {
   cd $_pkgname
@@ -29,52 +21,34 @@ pkgver() {
   git describe --tags --long | sed 's/-/./g;s/^v//'
 }
 
-prepare() {
-  cd $_pkgname-installers/substrate
-
-  # Use $srcdir for the working directory
-  sed -i "s:/vagrant-substrate:$srcdir/vagrant-substrate:" hiera/common.yaml
-
-  # Don't create a zip of the substrate
-  sed -i '48,50d' modules/vagrant_substrate/manifests/init.pp
-
-  # Do not set file ownership
-  find . -name *.pp -exec sed -i "/owner.*.=.*.root/d" {} +
-  find . -name *.pp -exec sed -i "/group.*.=.*.root/d" {} +
-
-  # Fix compile issues
-  patch -Np0 -i "$srcdir"/puppet_module_libiconv.patch
-  patch -Np0 -i "$srcdir"/readline.patch
-
-  # https://github.com/mitchellh/vagrant-installers/issues/60
-  sed -i '61 s/^/#/' modules/ruby/manifests/source.pp
-}
-
 build() {
-  cd $_pkgname-installers/substrate
-
-  # Create the substrate
-  FACTER_param_output_dir="$srcdir" puppet apply --hiera_config=config/hiera.yaml \
-    --confdir=config --modulepath=modules manifests/init.pp
+  cd $_pkgname
 
-  cd "$srcdir"/$_pkgname
+  EMBEDDED_DIR=/opt/vagrant/embedded
 
-  REV=$( git log -n 1 --pretty=format:"%H" )
+  "$EMBEDDED_DIR"/bin/gem build $_pkgname.gemspec
+  cp vagrant-*.gem vagrant.gem
 
-  "$srcdir"/$_pkgname-installers/package/support/install_$_pkgname.sh \
-    "$srcdir"/vagrant-substrate/staging/ $REV "$srcdir"/vagrant-substrate/staging/${_pkgname}_version
+  GEM_PATH="$srcdir"/$_pkgname/gems-$pkgver-$pkgrel GEM_HOME="$GEM_PATH" \
+  GEMRC="$EMBEDDED_DIR"/etc/gemrc CPPFLAGS="-I$EMBEDDED_DIR"/include \
+  LDFLAGS="-L$EMBEDDED_DIR"/lib PATH="$EMBEDDED_DIR/bin:$PATH" \
+  SSL_CERT_FILE="$EMBEDDED_DIR"/cacert.pem \
+    "$EMBEDDED_DIR"/bin/gem install $_pkgname.gem --no-ri --no-rdoc
 }
 
 package() {
-  install -d "$pkgdir"/{opt/,usr/bin/,usr/share/bash-completion/completions/}
+  cd $_pkgname
+
+  install -d "$pkgdir"/usr/{bin,share/bash-completion/completions}
+  install -d "$pkgdir"/opt/vagrant/embedded
 
-  cp -r "$srcdir"/vagrant-substrate/staging/ "$pkgdir"/opt/$_pkgname/
+  cp -r gems-$pkgver-$pkgrel "$pkgdir"/opt/vagrant/embedded/gems
 
   ln -s /opt/$_pkgname/bin/$_pkgname "$pkgdir"/usr/bin/$_pkgname
 
-  install -Dm644 "$srcdir"/$_pkgname/contrib/bash/completion.sh \
+  install -Dm644 contrib/bash/completion.sh \
     "$pkgdir"/usr/share/bash-completion/completions/$_pkgname
 
-  install -Dm644 "$srcdir"/$_pkgname/LICENSE \
+  install -Dm644 LICENSE \
     "$pkgdir"/usr/share/licenses/$_pkgname/LICENSE
 }
diff --git a/libiconv.patch b/libiconv.patch
deleted file mode 100644
index f14e4c5da884..000000000000
--- a/libiconv.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libiconv-1.14/srclib/stdio.in.h.orig	2015-07-20 12:35:55.202286213 +0100
-+++ libiconv-1.14/srclib/stdio.in.h	2015-07-20 12:36:05.922285829 +0100
-@@ -1007,8 +1007,10 @@
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-+#endif
- 
- 
- #if 0 || 0
diff --git a/puppet_module_libiconv.patch b/puppet_module_libiconv.patch
deleted file mode 100644
index a2f6325d5606..000000000000
--- a/puppet_module_libiconv.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- modules/libiconv/manifests/init.pp.orig	2015-07-20 09:32:21.162683278 +0100
-+++ modules/libiconv/manifests/init.pp	2015-07-20 12:28:16.068969435 +0100
-@@ -46,6 +46,12 @@
-     require => Wget::Fetch["libiconv"],
-   }
- 
-+  exec { "patch-libiconv":
-+    command => 'patch -Np0 -i ../../libiconv.patch',
-+    cwd     => $file_cache_dir,
-+    require => Exec["untar-libiconv"],
-+  }
-+
-   autotools { "libiconv":
-     configure_flags  => "--prefix=${prefix} --disable-dependency-tracking",
-     cwd              => $source_dir_path,
-@@ -53,6 +59,6 @@
-     install_sentinel => "${prefix}/lib/libiconv.a",
-     make_notify      => $make_notify,
-     make_sentinel    => "${source_dir_path}/lib/.libs/iconv.o",
--    require          => Exec["untar-libiconv"],
-+    require          => Exec["untar-libiconv", "patch-libiconv"],
-   }
- }
diff --git a/readline.patch b/readline.patch
deleted file mode 100644
index 7a4eb19bf489..000000000000
--- a/readline.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/readline/manifests/init.pp
-+++ modules/readline/manifests/init.pp
-@@ -61,6 +61,7 @@ class readline(
-     cwd              => $source_dir_path,
-     environment      => $real_autotools_environment,
-     install_sentinel => "${prefix}/lib/libreadline.a",
-+    make_command     => "make SHLIB_LIBS=-lncurses",
-     make_notify      => $make_notify,
-     make_sentinel    => "${source_dir_path}/libreadline.a",
-     require          => Exec["untar-readline"]