From f8c113c615199cca822564a8d4861e1ab838db20 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Sun, 11 Sep 2005 19:42:17 +0000 Subject: udev rules fix Package-Manager: portage-1.589-cvs --- media-libs/svgalib/ChangeLog | 8 +- media-libs/svgalib/Manifest | 34 ++--- media-libs/svgalib/files/digest-svgalib-1.9.21 | 1 - media-libs/svgalib/files/digest-svgalib-1.9.21-r1 | 1 + media-libs/svgalib/files/svgalib.udev.rules.d | 2 +- media-libs/svgalib/svgalib-1.9.21-r1.ebuild | 155 ++++++++++++++++++++++ media-libs/svgalib/svgalib-1.9.21.ebuild | 155 ---------------------- 7 files changed, 176 insertions(+), 180 deletions(-) delete mode 100644 media-libs/svgalib/files/digest-svgalib-1.9.21 create mode 100644 media-libs/svgalib/files/digest-svgalib-1.9.21-r1 create mode 100644 media-libs/svgalib/svgalib-1.9.21-r1.ebuild delete mode 100644 media-libs/svgalib/svgalib-1.9.21.ebuild (limited to 'media-libs') diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog index 0c39f172c691..8b855e55794a 100644 --- a/media-libs/svgalib/ChangeLog +++ b/media-libs/svgalib/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/svgalib # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.61 2005/08/23 18:09:41 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.62 2005/09/11 19:42:17 dsd Exp $ + +*svgalib-1.9.21-r1 (11 Sep 2005) + + 11 Sep 2005; Daniel Drake files/svgalib.udev.rules.d, + -svgalib-1.9.21.ebuild, +svgalib-1.9.21-r1.ebuild: + udev rules fix 23 Aug 2005; Diego Pettenò svgalib-1.9.21.ebuild: Don't use cp -a. diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest index ef062a1cc9f6..85ba5fdbc457 100644 --- a/media-libs/svgalib/Manifest +++ b/media-libs/svgalib/Manifest @@ -1,29 +1,19 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 84ed5ecea1e344b92a568c411a8cb1cd ChangeLog 10996 -MD5 837fbcbd0f3e1cb94b7ac2ca212bf2a9 svgalib-1.9.21.ebuild 4452 MD5 c9619b54463a0330aa164eb8108eaa8e svgalib-1.9.19-r3.ebuild 5480 +MD5 301bdc7e28abb320c39ca5eef19df9a7 svgalib-1.9.21-r1.ebuild 4472 +MD5 efc619c247687c9e4a16746f6a94ad49 ChangeLog 11174 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310 -MD5 909fa2160bfb4ca66f2f73400a711431 files/svgalib-1.9.19-devfs.patch 440 -MD5 8a336e556b73e4107cb5403bc07e7dc3 files/svgalib-1.9.19-gentoo.patch 4107 -MD5 669918046939615fbe96031aa10be6d2 files/svgalib-1.9.21-linux2.6.patch 1550 MD5 71fa9630e100dc3a6ce8672b4b4b2cff files/digest-svgalib-1.9.19-r3 66 -MD5 4a5014126880edffad4f4f209e3e7e68 files/svgalib-1.9.19-linux2.6.patch 7776 +MD5 7c5fef40667dc2dd4c54518fbafa831b files/digest-svgalib-1.9.21-r1 66 +MD5 669918046939615fbe96031aa10be6d2 files/svgalib-1.9.21-linux2.6.patch 1550 +MD5 a4acf43a776fa24036c8bde9d951ee60 files/svgalib.udev.rules.d 54 +MD5 d137b721449f3fe88d6ec08a3cf6c51a files/svgalib.devfs 219 +MD5 8a336e556b73e4107cb5403bc07e7dc3 files/svgalib-1.9.19-gentoo.patch 4107 +MD5 909fa2160bfb4ca66f2f73400a711431 files/svgalib-1.9.19-devfs.patch 440 +MD5 8305fd946083dbe190a4fc42512e0e13 files/svgalib-1.9.21-gentoo.patch 3122 +MD5 1c4684bfc1f4a5ff9daf7cbf5da699b1 files/svgalib-1.9.19-pci-get-class.patch 458 MD5 0877788ea40d3673a0c50d82d4560e0a files/svgalib-1.9.18-lrmi-gentoo-cflags.patch 269 MD5 80fafe8076ab52d6f02f90b7f9580ddd files/svgalib.udev.perms.d 22 -MD5 8305fd946083dbe190a4fc42512e0e13 files/svgalib-1.9.21-gentoo.patch 3122 +MD5 91fa4baff3dfb211bcb57a068ed7495f files/svgalib-1.9.19-pic.patch 422 MD5 c136e25a99e0681344511eef09d410e6 files/svgalib-1.9.19-dont-touch-ld.conf.patch 350 -MD5 d137b721449f3fe88d6ec08a3cf6c51a files/svgalib.devfs 219 -MD5 7c5fef40667dc2dd4c54518fbafa831b files/digest-svgalib-1.9.21 66 -MD5 847406401f01e1e9d93d89365814cb27 files/svgalib.udev.rules.d 39 +MD5 4a5014126880edffad4f4f209e3e7e68 files/svgalib-1.9.19-linux2.6.patch 7776 MD5 627fcf9d82cd93cddcdef96a00248260 files/svgalib-1.9.18-utils-include.patch 413 -MD5 91fa4baff3dfb211bcb57a068ed7495f files/svgalib-1.9.19-pic.patch 422 -MD5 1c4684bfc1f4a5ff9daf7cbf5da699b1 files/svgalib-1.9.19-pci-get-class.patch 458 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDC2aBj5H05b2HAEkRApDQAJ4wEYUJLrTF03Imvgql0PTahqCvGACfW+/K -R5m+eGsv70+rBKwaTI2ZU4g= -=8X/w ------END PGP SIGNATURE----- diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.21 b/media-libs/svgalib/files/digest-svgalib-1.9.21 deleted file mode 100644 index b01ecc6bf94e..000000000000 --- a/media-libs/svgalib/files/digest-svgalib-1.9.21 +++ /dev/null @@ -1 +0,0 @@ -MD5 1bd8892ee38481051e4b4d85008c86be svgalib-1.9.21.tar.gz 950274 diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.21-r1 b/media-libs/svgalib/files/digest-svgalib-1.9.21-r1 new file mode 100644 index 000000000000..b01ecc6bf94e --- /dev/null +++ b/media-libs/svgalib/files/digest-svgalib-1.9.21-r1 @@ -0,0 +1 @@ +MD5 1bd8892ee38481051e4b4d85008c86be svgalib-1.9.21.tar.gz 950274 diff --git a/media-libs/svgalib/files/svgalib.udev.rules.d b/media-libs/svgalib/files/svgalib.udev.rules.d index d4554e308ef4..08ad2d6b55ae 100644 --- a/media-libs/svgalib/files/svgalib.udev.rules.d +++ b/media-libs/svgalib/files/svgalib.udev.rules.d @@ -1 +1 @@ -KERNEL="svga*", NAME="%k", MODE="0660" +KERNEL="svga*", NAME="%k", MODE="0660", GROUP="video" diff --git a/media-libs/svgalib/svgalib-1.9.21-r1.ebuild b/media-libs/svgalib/svgalib-1.9.21-r1.ebuild new file mode 100644 index 000000000000..1150bec0d11b --- /dev/null +++ b/media-libs/svgalib/svgalib-1.9.21-r1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.21-r1.ebuild,v 1.1 2005/09/11 19:42:17 dsd Exp $ + +inherit eutils flag-o-matic toolchain-funcs linux-mod + +DESCRIPTION="A library for running svga graphics on the console" +HOMEPAGE="http://www.svgalib.org/" +SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="-* ~x86" +IUSE="build no-helper" + +DEPEND="" + +MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)" +BUILD_TARGETS="default" +MODULESD_SVGALIB_HELPER_ADDITIONS="probeall /dev/svga svgalib_helper" + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KDIR=${KV_DIR}" +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # Misc makefile clean ups + epatch "${FILESDIR}"/${P}-gentoo.patch + + # Get it to work with kernel 2.6 + epatch "${FILESDIR}"/${PN}-1.9.21-linux2.6.patch + + # -fPIC does work for lrmi, see bug #51698 + epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch + + # Don't let the ebuild screw around with ld.so.conf #64829 + epatch "${FILESDIR}"/${PN}-1.9.19-dont-touch-ld.conf.patch + + # make sure the define wrapper is used #91118 + sed -i -e 's:devfs_mk_symlink:DEVFS_MK_SYMLINK:' kernel/svgalib_helper/main.c + + use no-helper && sed -i '/^# NO_HELPER/s:# ::' Makefile.cfg + + # Don't strip stuff, let portage do it + sed -i '/^INSTALL_PROGRAM/s: -s : :' Makefile.cfg +} + +src_compile() { + export CC="$(tc-getCC)" + + # First build static + make OPTIMIZE="${CFLAGS}" static || die "Failed to build static libraries!" + # Have to remove for shared to build ... + rm -f src/svgalib_helper.h + # Then build shared ... + make OPTIMIZE="${CFLAGS}" shared || die "Failed to build shared libraries!" + # Missing in some cases ... + ln -s libvga.so.${PV} sharedlib/libvga.so + # Build lrmi and tools ... + make OPTIMIZE="${CFLAGS}" LDFLAGS="-L../sharedlib" \ + textutils lrmi utils \ + || die "Failed to build libraries and utils!" + # Build the gl stuff tpp + make OPTIMIZE="${CFLAGS}" -C gl || die "Failed to build gl!" + make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} \ + || die "Failed to build libvgagl.so.${PV}!" + # Missing in some cases ... + ln -s libvgagl.so.${PV} sharedlib/libvgagl.so + rm -f src/svgalib_helper.h + make OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV} \ + || die "Failed to build libvga.so.${PV}!" + cp -pPR src/libvga.so.${PV} sharedlib/ + # Build threeDKit ... + make OPTIMIZE="${CFLAGS}" LDFLAGS='-L../sharedlib' \ + -C threeDKit lib3dkit.a || die "Failed to build threeDKit!" + # Build demo's ... + make OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS='-L../sharedlib' \ + demoprogs || die "Failed to build demoprogs!" + + ! use build && ! use no-helper && linux-mod_src_compile +} + +src_install() { + local x= + + dodir /etc/svgalib /usr/{include,lib,bin,share/man} + + make \ + TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \ + install || die "Failed to install svgalib!" + ! use build && ! use no-helper && linux-mod_src_install + + insinto /usr/include + doins gl/vgagl.h + dolib.a staticlib/libvga.a + dolib.a gl/libvgagl.a + dolib.a threeDKit/lib3dkit.a + dolib.so gl/libvgagl.so.${PV} + dosym libvgagl.so.${PV} /usr/lib/libvgagl.so + preplib + + insinto /usr/include + doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h + doins src/keyboard/vgakeyboard.h + + if best_version '>=sys-fs/udev-045' ; then + insinto /etc/udev/rules.d + newins "${FILESDIR}"/svgalib.udev.rules.d 30-svgalib.rules + elif best_version sys-fs/udev ; then + insinto /etc/udev/permissions.d + newins "${FILESDIR}"/svgalib.udev.perms.d 30-svgalib.permissions + elif best_version sys-fs/devfsd ; then + insinto /etc/devfs.d + newins "${FILESDIR}"/svgalib.devfs svgalib + fi + + exeinto /usr/lib/svgalib/demos + for x in "${S}"/demos/* ; do + [[ -x ${x} ]] && doexe ${x} + done + + cd "${S}"/threeDKit + exeinto /usr/lib/svgalib/threeDKit + local THREED_PROGS="plane wrapdemo" + doexe ${THREED_PROGS} + + cd "${S}" + dodoc 0-README + cd "${S}"/doc + dodoc CHANGES DESIGN TODO + docinto txt + dodoc Driver-programming-HOWTO README.* add_driver svgalib.lsm + + mv "${D}"/usr/man/* "${D}"/usr/share/man + rmdir "${D}"/usr/man +} + +pkg_postinst() { + ! use build && ! use no-helper && linux-mod_pkg_postinst + [[ ${ROOT} != "/" ]] && return 0 + + if [[ -e /dev/.devfsd ]] ; then + ebegin "Restarting devfsd to reread devfs rules" + killall -HUP devfsd + eend $? + elif [[ -e /dev/.udev ]] ; then + ebegin "Restarting udev to reread udev rules" + udevstart + eend $? + fi +} diff --git a/media-libs/svgalib/svgalib-1.9.21.ebuild b/media-libs/svgalib/svgalib-1.9.21.ebuild deleted file mode 100644 index 8307375df4ac..000000000000 --- a/media-libs/svgalib/svgalib-1.9.21.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.21.ebuild,v 1.11 2005/08/23 18:09:41 flameeyes Exp $ - -inherit eutils flag-o-matic toolchain-funcs linux-mod - -DESCRIPTION="A library for running svga graphics on the console" -HOMEPAGE="http://www.svgalib.org/" -SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="-* ~x86" -IUSE="build no-helper" - -DEPEND="" - -MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)" -BUILD_TARGETS="default" -MODULESD_SVGALIB_HELPER_ADDITIONS="probeall /dev/svga svgalib_helper" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KDIR=${KV_DIR}" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Misc makefile clean ups - epatch "${FILESDIR}"/${P}-gentoo.patch - - # Get it to work with kernel 2.6 - epatch "${FILESDIR}"/${PN}-1.9.21-linux2.6.patch - - # -fPIC does work for lrmi, see bug #51698 - epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch - - # Don't let the ebuild screw around with ld.so.conf #64829 - epatch "${FILESDIR}"/${PN}-1.9.19-dont-touch-ld.conf.patch - - # make sure the define wrapper is used #91118 - sed -i -e 's:devfs_mk_symlink:DEVFS_MK_SYMLINK:' kernel/svgalib_helper/main.c - - use no-helper && sed -i '/^# NO_HELPER/s:# ::' Makefile.cfg - - # Don't strip stuff, let portage do it - sed -i '/^INSTALL_PROGRAM/s: -s : :' Makefile.cfg -} - -src_compile() { - export CC="$(tc-getCC)" - - # First build static - make OPTIMIZE="${CFLAGS}" static || die "Failed to build static libraries!" - # Have to remove for shared to build ... - rm -f src/svgalib_helper.h - # Then build shared ... - make OPTIMIZE="${CFLAGS}" shared || die "Failed to build shared libraries!" - # Missing in some cases ... - ln -s libvga.so.${PV} sharedlib/libvga.so - # Build lrmi and tools ... - make OPTIMIZE="${CFLAGS}" LDFLAGS="-L../sharedlib" \ - textutils lrmi utils \ - || die "Failed to build libraries and utils!" - # Build the gl stuff tpp - make OPTIMIZE="${CFLAGS}" -C gl || die "Failed to build gl!" - make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} \ - || die "Failed to build libvgagl.so.${PV}!" - # Missing in some cases ... - ln -s libvgagl.so.${PV} sharedlib/libvgagl.so - rm -f src/svgalib_helper.h - make OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV} \ - || die "Failed to build libvga.so.${PV}!" - cp -pPR src/libvga.so.${PV} sharedlib/ - # Build threeDKit ... - make OPTIMIZE="${CFLAGS}" LDFLAGS='-L../sharedlib' \ - -C threeDKit lib3dkit.a || die "Failed to build threeDKit!" - # Build demo's ... - make OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS='-L../sharedlib' \ - demoprogs || die "Failed to build demoprogs!" - - ! use build && ! use no-helper && linux-mod_src_compile -} - -src_install() { - local x= - - dodir /etc/svgalib /usr/{include,lib,bin,share/man} - - make \ - TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \ - install || die "Failed to install svgalib!" - ! use build && ! use no-helper && linux-mod_src_install - - insinto /usr/include - doins gl/vgagl.h - dolib.a staticlib/libvga.a - dolib.a gl/libvgagl.a - dolib.a threeDKit/lib3dkit.a - dolib.so gl/libvgagl.so.${PV} - dosym libvgagl.so.${PV} /usr/lib/libvgagl.so - preplib - - insinto /usr/include - doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h - doins src/keyboard/vgakeyboard.h - - if best_version '>=sys-fs/udev-045' ; then - dodir /etc/udev/rules.d - newins "${FILESDIR}"/svgalib.udev.rules.d 30-svgalib - elif best_version sys-fs/udev ; then - insinto /etc/udev/permissions.d - newins "${FILESDIR}"/svgalib.udev.perms.d 30-svgalib - elif best_version sys-fs/devfsd ; then - insinto /etc/devfs.d - newins "${FILESDIR}"/svgalib.devfs svgalib - fi - - exeinto /usr/lib/svgalib/demos - for x in "${S}"/demos/* ; do - [[ -x ${x} ]] && doexe ${x} - done - - cd "${S}"/threeDKit - exeinto /usr/lib/svgalib/threeDKit - local THREED_PROGS="plane wrapdemo" - doexe ${THREED_PROGS} - - cd "${S}" - dodoc 0-README - cd "${S}"/doc - dodoc CHANGES DESIGN TODO - docinto txt - dodoc Driver-programming-HOWTO README.* add_driver svgalib.lsm - - mv "${D}"/usr/man/* "${D}"/usr/share/man - rmdir "${D}"/usr/man -} - -pkg_postinst() { - ! use build && ! use no-helper && linux-mod_pkg_postinst - [[ ${ROOT} != "/" ]] && return 0 - - if [[ -e /dev/.devfsd ]] ; then - ebegin "Restarting devfsd to reread devfs rules" - killall -HUP devfsd - eend $? - elif [[ -e /dev/.udev ]] ; then - ebegin "Restarting udev to reread udev rules" - udevstart - eend $? - fi -} -- cgit v1.2.3-65-gdbad