Date: Sunday, February 7, 2010 @ 05:46:15 Author: thomas Revision: 67472
Merged revisions 67246,67469 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/v86d/trunk ........ r67246 | thomas | 2010-02-05 23:55:40 +0100 (Fr, 05 Feb 2010) | 2 lines Prepare for mkinitcpio 0.6 ........ r67469 | thomas | 2010-02-07 11:45:50 +0100 (So, 07 Feb 2010) | 2 lines Add conflict to old mkinitcpio ........ Modified: v86d/repos/testing-x86_64/ (properties) v86d/repos/testing-x86_64/PKGBUILD v86d/repos/testing-x86_64/v86d ----------+ PKGBUILD | 19 ++++++------------- v86d | 2 +- 2 files changed, 7 insertions(+), 14 deletions(-) Property changes on: v86d/repos/testing-x86_64 ___________________________________________________________________ Modified: svnmerge-integrated - /v86d/trunk:1-56467 + /v86d/trunk:1-67471 Modified: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2010-02-07 10:46:00 UTC (rev 67471) +++ testing-x86_64/PKGBUILD 2010-02-07 10:46:15 UTC (rev 67472) @@ -2,37 +2,30 @@ # Maintainer: Thomas Baechler <[email protected]> pkgname="v86d" pkgver=0.1.9 -pkgrel=8 +pkgrel=10 pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment" url="http://dev.gentoo.org/~spock/projects/uvesafb/"; license=('GPL2') arch=("i686" "x86_64") # The kernel is only required for building # There is no kernel-specific dependency -makedepends=('kernel26>=2.6.31' 'kernel26<2.6.32') -_kernver="2.6.31-ARCH" -depends=('glibc' 'klibc' $(basename /lib/klibc-*.so .so)) +makedepends=('kernel26>=2.6.32' 'kernel26<2.6.33') +_kernver="2.6.32-ARCH" +depends=('glibc') +conflicts=('mkinitcpio<0.5.99') backup=(etc/modprobe.d/uvesafb.conf) source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2 v86d v86d_hook modprobe.uvesafb) md5sums=('ebbbc8e7013c9544b6ba6981add43831' - 'ef0a9f2235cc3c00eb17457fc7eb6550' + '33f3131e7bf041ed6a67e92bff272f4c' '813958b8f6c75a7063e4858f31509694' '2d7cc8dc6a41916a13869212d0191147') options=(!makeflags) build() { cd $srcdir/v86d-$pkgver - - ./configure --with-klibc --with-x86emu - make KDIR=/lib/modules/${_kernver}/build || return 1 - make DESTDIR=$pkgdir install || return 1 - mv $pkgdir/sbin/v86d $pkgdir/sbin/v86d_klibc - - make clean - ./configure --with-x86emu make KDIR=/lib/modules/${_kernver}/build || return 1 make DESTDIR=$pkgdir install || return 1 Modified: testing-x86_64/v86d =================================================================== --- testing-x86_64/v86d 2010-02-07 10:46:00 UTC (rev 67471) +++ testing-x86_64/v86d 2010-02-07 10:46:15 UTC (rev 67472) @@ -1,5 +1,5 @@ install() { - add_binary "/sbin/v86d_klibc" "/sbin/v86d" + add_binary "/sbin/v86d" add_file "/etc/modprobe.d/uvesafb.conf" MODULES="uvesafb" SCRIPT="v86d"
