diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-05-07 15:11:59 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-05-07 15:11:59 -0300 |
| commit | 623f5c8974965d114020b2ed4e0090ff90b5b276 (patch) | |
| tree | f93392b0379a692dc580587b4d341f4419f1039b | |
| parent | 9c935049d4bac790ea47b6a19a00fc2115ebd82b (diff) | |
| parent | 08cc41ec173b7efbafd2062b7dba1cf36251dc95 (diff) | |
| download | abslibre-623f5c8974965d114020b2ed4e0090ff90b5b276.tar.gz abslibre-623f5c8974965d114020b2ed4e0090ff90b5b276.tar.bz2 abslibre-623f5c8974965d114020b2ed4e0090ff90b5b276.zip | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
| -rw-r--r-- | libre-testing/libretools/PKGBUILD | 15 | ||||
| -rw-r--r-- | libre/chroottools/PKGBUILD | 28 |
2 files changed, 8 insertions, 35 deletions
diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD index 88960ddba..4974e0dad 100644 --- a/libre-testing/libretools/PKGBUILD +++ b/libre-testing/libretools/PKGBUILD @@ -8,17 +8,18 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3+' 'GPL2') -pkgver=20130503 -_libretools_commit=0db5eebebe64db0d8c3b29b629b066a3909aa61d +pkgver=20130507 +_libretools_commit=4ce4e426012375a9b44df012a143139645880c0d _devtools_commit=a1a79ff77bb19166bd5631953a71e3d3222e5f1c -pkgrel=1 -arch=('any') - _packages_url=https://projects.parabolagnulinux.org/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 $_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2) +pkgrel=1 +arch=('any') +makedepends=(emacs) # emacs --batch is used during the build to process text + build() { cd "$srcdir" ln -sf devtools-par-$_devtools_commit devtools-par @@ -30,6 +31,7 @@ package_libretools() { backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) install=libretools.install groups=(base-devel) + replaces=(chroottools) depends=( arch-install-scripts # `archroot` uses `pacstrap` @@ -41,7 +43,6 @@ package_libretools() { wget # `aur` and `pkgbuild-check-nonfree` ) optdepends=('namcap: to check package files') - makedepends=(emacs) # emacs --batch is used during the build to process text cd "$srcdir/$pkgbase-$_libretools_commit" make install-libretools install-doc DESTDIR="$pkgdir" @@ -56,5 +57,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('dabae9bb6040431e8e2b84871a027237' +md5sums=('84fc56b35cca1a05a434d31218dbb891' 'c5cd04723119762701db766cb8f6e5ef') diff --git a/libre/chroottools/PKGBUILD b/libre/chroottools/PKGBUILD deleted file mode 100644 index 55a7e165f..000000000 --- a/libre/chroottools/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgname=chroottools -pkgver=20121202 -pkgdesc='Chroot tools for Arch and Parabola package maintainers' -url='https://projects.parabolagnulinux.org/packages/chroottools.git/' -license=('GPL') - -pkgrel=2 -arch=('any') -conflicts=(devtools) -depends=( - 'arch-install-scripts' # for pacstrap, used to make chroots - 'curl' # used by checkpkg -) -source=("https://projects.parabolagnulinux.org/packages/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar") - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr DESTDIR=${pkgdir} install -} - -md5sums=('68bb7fb792c55031ad68a970b65ab793') |