From: Robert Buchholz Date: Mon, 29 Jan 2007 00:19:24 +0000 (+0000) Subject: No symlink installed, manual fixing of conf necessary, to avoid blocking older versions X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b22e6f39bbcb53d7ab8410f9e2134236ced34616;p=gentoo.git No symlink installed, manual fixing of conf necessary, to avoid blocking older versions Package-Manager: portage-2.1.1-r2 --- diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest index f4c4e650452b..15ef1b2321a1 100644 --- a/app-misc/lcdproc/Manifest +++ b/app-misc/lcdproc/Manifest @@ -43,14 +43,14 @@ EBUILD lcdproc-0.5.1-r1.ebuild 5974 RMD160 b63bd6a2cf50801bfeb264e9ed393e6c0a406 MD5 256491474dae47ff4b7af2e93a86f3f9 lcdproc-0.5.1-r1.ebuild 5974 RMD160 b63bd6a2cf50801bfeb264e9ed393e6c0a406cf5 lcdproc-0.5.1-r1.ebuild 5974 SHA256 5a9163906cb26564801333b57f8c8c358db0f243895478548b126fa56a1342ad lcdproc-0.5.1-r1.ebuild 5974 -EBUILD lcdproc-0.5.1-r2.ebuild 5692 RMD160 372efadde0e3e4167eb6e74419fccce153119cb1 SHA1 62a96ae94b2aff6a9cdf9c55cddd28908907c6d2 SHA256 f739f9e290b273ef5e4829dd627a0b1d2147acb6710aaad10cd1002515a2de4e -MD5 36620fd972af335b532e46815efa3b2e lcdproc-0.5.1-r2.ebuild 5692 -RMD160 372efadde0e3e4167eb6e74419fccce153119cb1 lcdproc-0.5.1-r2.ebuild 5692 -SHA256 f739f9e290b273ef5e4829dd627a0b1d2147acb6710aaad10cd1002515a2de4e lcdproc-0.5.1-r2.ebuild 5692 -MISC ChangeLog 8363 RMD160 f56d31d481a4f36dd06eeb4bb07adf52aa357fc5 SHA1 55e0747820813941ef987379fa9df5b31bcb2799 SHA256 f508d5323c0ee759bf64f42d4eb41cc044292581277981801b96760f79eb5907 -MD5 9c1a5830a25de9aa5cca1d855b3f6f03 ChangeLog 8363 -RMD160 f56d31d481a4f36dd06eeb4bb07adf52aa357fc5 ChangeLog 8363 -SHA256 f508d5323c0ee759bf64f42d4eb41cc044292581277981801b96760f79eb5907 ChangeLog 8363 +EBUILD lcdproc-0.5.1-r3.ebuild 5590 RMD160 1f4b8ca55f30e8d6a34c61c166e6b0567656ea91 SHA1 266bdaba159a8b905eeb69bc4e9fe0bc5f390a45 SHA256 78122f463aa4d1e9935753e073f9d0e0715b8d68b3b79da62875d8405c8683de +MD5 648358a322ab0ed746f25dd41221f51e lcdproc-0.5.1-r3.ebuild 5590 +RMD160 1f4b8ca55f30e8d6a34c61c166e6b0567656ea91 lcdproc-0.5.1-r3.ebuild 5590 +SHA256 78122f463aa4d1e9935753e073f9d0e0715b8d68b3b79da62875d8405c8683de lcdproc-0.5.1-r3.ebuild 5590 +MISC ChangeLog 8591 RMD160 322c4e9d573b2a916ed408950cf0435bf2ae2010 SHA1 e2ebe355554bf3d0efe044e4bdba3dca56a0b3b9 SHA256 9f1d846bc2c711ed0c514da2fc04cee86c0f0d2e2d9b8a89df2eed1e1d424300 +MD5 cffc5d562c4d514b321e580a964efdea ChangeLog 8591 +RMD160 322c4e9d573b2a916ed408950cf0435bf2ae2010 ChangeLog 8591 +SHA256 9f1d846bc2c711ed0c514da2fc04cee86c0f0d2e2d9b8a89df2eed1e1d424300 ChangeLog 8591 MISC metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 SHA1 c212d5a20354a60471162a82c403f1a5235d1d9d SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a MD5 be4a34ac317e81ea820c84bc04b9c0d8 metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 metadata.xml 250 @@ -61,13 +61,13 @@ SHA256 ec3e28b7b2139bc95d6d832b07f789aa55db4f469147309e40a5c06ae587511a files/di MD5 11d9d2dd9490ce4743643fba29935c3d files/digest-lcdproc-0.5.1-r1 241 RMD160 a6283dd23a9e00ade61a9f86261e8b8f77b800c6 files/digest-lcdproc-0.5.1-r1 241 SHA256 9756a02fc35bbb6fd64b59252ad8f42b68c6994e8f45569438c739e4b48b4977 files/digest-lcdproc-0.5.1-r1 241 -MD5 11d9d2dd9490ce4743643fba29935c3d files/digest-lcdproc-0.5.1-r2 241 -RMD160 a6283dd23a9e00ade61a9f86261e8b8f77b800c6 files/digest-lcdproc-0.5.1-r2 241 -SHA256 9756a02fc35bbb6fd64b59252ad8f42b68c6994e8f45569438c739e4b48b4977 files/digest-lcdproc-0.5.1-r2 241 +MD5 11d9d2dd9490ce4743643fba29935c3d files/digest-lcdproc-0.5.1-r3 241 +RMD160 a6283dd23a9e00ade61a9f86261e8b8f77b800c6 files/digest-lcdproc-0.5.1-r3 241 +SHA256 9756a02fc35bbb6fd64b59252ad8f42b68c6994e8f45569438c739e4b48b4977 files/digest-lcdproc-0.5.1-r3 241 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFvL7pyZx3L/ph1soRAt1jAKDtemfLJNYjl5zJ14RN+9ex+2PqmgCdFMjR -no0a8Uw/ohFjQW0GYggKl8g= -=uN5u +iD8DBQFFvT2IyZx3L/ph1soRAuwEAJ0WabJcMn1/MOwd2714D/ecmF1EJgCeL5MK +VybNtQdYaK2XSrEvNukdnog= +=C1xv -----END PGP SIGNATURE----- diff --git a/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r2 b/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r2 deleted file mode 100644 index 247c7eae1867..000000000000 --- a/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ad13d6cce7a7e068d85a66d30285af95 lcdproc-0.5.1.tar.gz 800205 -RMD160 2672f660afac8437a9b6a1791bff80466cdfde64 lcdproc-0.5.1.tar.gz 800205 -SHA256 f459280eb4eeb70be584895364c97ffab22b888235b2351a31e1c87ca9710727 lcdproc-0.5.1.tar.gz 800205 diff --git a/app-misc/lcdproc/lcdproc-0.5.1-r2.ebuild b/app-misc/lcdproc/lcdproc-0.5.1-r2.ebuild deleted file mode 100644 index 44381ef97175..000000000000 --- a/app-misc/lcdproc/lcdproc-0.5.1-r2.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.1-r2.ebuild,v 1.3 2007/01/28 15:18:55 rbu Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" -inherit eutils autotools multilib - -DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices" -HOMEPAGE="http://lcdproc.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" - -IUSE="doc debug ldap nfs samba seamless-hbars usb lirc irman joystick" - -# The following array holds the USE_EXPANDed keywords -IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontz633 cfontzpacket - cwlinux eyeboxone g15 graphlcd glk - hd44780 icpa106 imon iowarrior - lb216 lcdm001 lcterm - md8800 ms6931 mtcs16209x mtxorb noritakevfd - pyramid sed1330 sed1520 serialvfd sli - stv5730 svga t6963 text tyan - ula200 xosd) - -# Iterate through the array and add the lcd_devices_* that we support -NUM_DEVICES=${#IUSE_LCD_DEVICES[@]} -index=0 -while [ "${index}" -lt "${NUM_DEVICES}" ] ; do - IUSE="${IUSE} lcd_devices_${IUSE_LCD_DEVICES[${index}]}" - let "index = ${index} + 1" -done - -RDEPEND=" - ldap? ( net-nds/openldap ) - usb? ( dev-libs/libusb ) - lirc? ( app-misc/lirc ) - irman? ( media-libs/libirman ) - - lcd_devices_graphlcd? ( app-misc/graphlcd-base app-misc/glcdprocdriver ) - lcd_devices_g15? ( dev-libs/libg15 >=dev-libs/libg15render-1.1.1 ) - lcd_devices_ncurses? ( sys-libs/ncurses ) - lcd_devices_svga? ( media-libs/svgalib ) - lcd_devices_ula200? ( dev-embedded/libftdi dev-libs/libusb ) - lcd_devices_xosd? ( x11-libs/xosd x11-libs/libX11 x11-libs/libXext ) - lcd_devices_cfontzpacket? ( dev-libs/libusb ) - lcd_devices_cwlinux? ( dev-libs/libusb ) - lcd_devices_pyramid? ( dev-libs/libusb )" -DEPEND="${RDEPEND} - doc? ( app-text/xmlto )" -RDEPEND="${RDEPEND} - lcd_devices_g15? ( app-misc/g15daemon )" - -pkg_setup() { - if [ -n "${LCDPROC_DRIVERS}" ] ; then - ewarn "Setting the drivers to compile via LCDPROC_DRIVERS is not supported anymore." - ewarn "Please use LCD_DEVICES now and see emerge -pv output for the options." - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i "79s:server/drivers:/usr/$(get_libdir)/lcdproc:" LCDd.conf - einfo "Patching LCDd.conf to use DriverPath=/usr/$(get_libdir)/lcdproc/" - - epatch "${FILESDIR}/${PV}-as-needed.patch" - epatch "${FILESDIR}/${PV}-serialvfd-parallel.patch" - epatch "${FILESDIR}/${PV}-nested-functions.patch" - eautoreconf -} - -src_compile() { - # This array contains the driver names required by configure --with-drivers= - # The positions must be the same as the corresponding use_expand flags - local DEVICE_DRIVERS=(curses bayrad CFontz CFontz633 CFontzPacket - CwLnx EyeboxOne g15 glcdlib glk - hd44780 icp_a106 imon IOWarrior - lb216 lcdm001 lcterm - MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD - pyramid sed1330 sed1520 serialVFD sli - stv5730 svga t6963 text tyan - ula200 xosd) - - # Generate comma separated list of drivers - COMMA_DRIVERS="" - FIRST_DRIVER="" - local index=0 - - while [ "${index}" -lt "${NUM_DEVICES}" ] ; do - if use "lcd_devices_${IUSE_LCD_DEVICES[${index}]}" ; then - append-driver "${DEVICE_DRIVERS[${index}]}" - fi - let "index = ${index} + 1" - done - - # Append the not-lcd-drivers (input) - use lirc && append-driver "lirc" - use irman && append-driver "irman" - use joystick && append-driver "joy" - - if [ -z "${COMMA_DRIVERS}" ] ; then - ewarn "You are compiling LCDd without support for any LCD drivers at all." - else - # Patch the config to contain a driver that is actually installed instead of the default - elog "Compiling the following drivers for LCDd: ${COMMA_DRIVERS}" - elog "Setting Driver=${FIRST_DRIVER} in LCDd.conf" - sed -i "44s:curses:${FIRST_DRIVER}:" LCDd.conf - fi - - local ENABLEUSB - if use lcd_devices_cfontzpacket || use lcd_devices_cwlinux || use lcd_devices_pyramid; then - ENABLEUSB="--enable-libusb" - else - ENABLEUSB="$(use_enable usb libusb)" - fi - - econf \ - $(use_enable debug) \ - $(use_enable ldap) \ - $(use_enable nfs stat-nfs) \ - $(use_enable samba stat-smbfs ) \ - $(use_enable seamless-hbars) \ - ${ENABLEUSB} \ - "--enable-drivers=${COMMA_DRIVERS}" \ - || die "configure failed" - - emake || die "make failed" - - if use doc; then - ebegin "Creating user documentation" - cd ${S}/docs/lcdproc-user - xmlto html lcdproc-user.docbook - eend $? - - ebegin "Creating dev documentation" - cd ${S}/docs/lcdproc-dev - xmlto html lcdproc-dev.docbook - eend $? - fi -} - -append-driver() { - [[ -z $* ]] && return 0 - if [ -z "${COMMA_DRIVERS}" ] ; then - # First in the list - COMMA_DRIVERS="$*" - FIRST_DRIVER="$*" - else - # Second, third, ... include a comma at the front - COMMA_DRIVERS="${COMMA_DRIVERS},$*" - fi - return 0 -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - # move example clients installed to /usr/bin - rm -f "${D}"/usr/bin/{tail,lcdmetar,iosock,fortune,x11amp}.pl - insinto /usr/share/lcdproc/clients - doins clients/examples/*.pl - doins clients/metar/ - - # backwards compat with