From: Markus Ullmann Date: Wed, 20 Dec 2006 12:00:12 +0000 (+0000) Subject: Adding patch to fix dep-compile bug #151308 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a831aa71f1bcde8a8bc9f3e7e6b9a9ccf6c16761;p=gentoo.git Adding patch to fix dep-compile bug #151308 Package-Manager: portage-2.1.2_rc3-r7 --- diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest index b6edb91dd2ce..ab457c0d23a7 100644 --- a/app-misc/lcdproc/Manifest +++ b/app-misc/lcdproc/Manifest @@ -45,6 +45,10 @@ AUX 0.5.1-lcdproc.initd 480 RMD160 27bea68560caee6e23e2d1742eff5fe01627602a SHA1 MD5 f7fa34302843a0cd4980466fc3dbda1a files/0.5.1-lcdproc.initd 480 RMD160 27bea68560caee6e23e2d1742eff5fe01627602a files/0.5.1-lcdproc.initd 480 SHA256 0db323adbebad0cac3dc9cb9fa28788546dc9b8b620e4e4f7332f5d98e77409f files/0.5.1-lcdproc.initd 480 +AUX 0.5.1-serialvfd-parallel.patch 9495 RMD160 32239e6dbaea8b2f5c4736f8fcd4e6646daa1b1a SHA1 21d4f4373f5790e8ba04bc5cff427f65c5590637 SHA256 a2410f993193338b1e490d8c272f8e447c8de740e3282c405676b40e88e366d5 +MD5 e1fc2b23bb01656e78748ec6ba0cd4ab files/0.5.1-serialvfd-parallel.patch 9495 +RMD160 32239e6dbaea8b2f5c4736f8fcd4e6646daa1b1a files/0.5.1-serialvfd-parallel.patch 9495 +SHA256 a2410f993193338b1e490d8c272f8e447c8de740e3282c405676b40e88e366d5 files/0.5.1-serialvfd-parallel.patch 9495 DIST lcdproc-0.4.5.tar.bz2 291703 RMD160 07067bfb681a098494a105a290711d973ea0171a SHA1 9680b83d18da8569e8f58d6d0b7b0158f543c94d SHA256 8707767a1ddf85b7894f4f62d9af53121fefff4ab8182eb9491b49a6d56b8127 DIST lcdproc-0.5.0.tar.gz 711118 RMD160 44153db5fe24cc45aa1b7a4be8afb87a9cd58062 SHA1 e3e1b32ff2f1c534e4f31b5866cbbcd6fbea50fc SHA256 a7567f3f68517008e68d15b33630f36ba539540fbb361a2f9c440ce2ceb8393b DIST lcdproc-0.5.1.tar.gz 800205 RMD160 2672f660afac8437a9b6a1791bff80466cdfde64 SHA1 9f2628a6e55f930d5eeaf99ed999ecf83e3ea78c SHA256 f459280eb4eeb70be584895364c97ffab22b888235b2351a31e1c87ca9710727 @@ -56,14 +60,14 @@ EBUILD lcdproc-0.5.0-r2.ebuild 5798 RMD160 345e0a3d62dc62c1e8e94b822822890914dc3 MD5 b3b7fdff71335e9ee5bcb428ace1c275 lcdproc-0.5.0-r2.ebuild 5798 RMD160 345e0a3d62dc62c1e8e94b822822890914dc32ee lcdproc-0.5.0-r2.ebuild 5798 SHA256 7202fa08ad4d26e2e262591eaaedf030694d963c1525e79e0ce3ff979491a31f lcdproc-0.5.0-r2.ebuild 5798 -EBUILD lcdproc-0.5.1.ebuild 5911 RMD160 7729c787e89384da08be98a953d422f34d7b231a SHA1 284f34b65ab4577534636e1397d02e9aef8036fc SHA256 4b38b494416d69e98898ce696b95b9ad3a36c9deb66bb942aea454261db2e347 -MD5 f2f828348aa2fd1be442ec99886d88f9 lcdproc-0.5.1.ebuild 5911 -RMD160 7729c787e89384da08be98a953d422f34d7b231a lcdproc-0.5.1.ebuild 5911 -SHA256 4b38b494416d69e98898ce696b95b9ad3a36c9deb66bb942aea454261db2e347 lcdproc-0.5.1.ebuild 5911 -MISC ChangeLog 7197 RMD160 7179c4332f016e56a3cd34d3b8eb3c9b231a5f55 SHA1 5c76fee186746918881c25460c85e3ba4614ebbb SHA256 8ed404785a8f8395ce9d9f15cc02e8e814bdba95c012e4ebb5a39f0d69fddb9e -MD5 d7e48e8874098a16b5e7b85508b4f29c ChangeLog 7197 -RMD160 7179c4332f016e56a3cd34d3b8eb3c9b231a5f55 ChangeLog 7197 -SHA256 8ed404785a8f8395ce9d9f15cc02e8e814bdba95c012e4ebb5a39f0d69fddb9e ChangeLog 7197 +EBUILD lcdproc-0.5.1-r1.ebuild 5967 RMD160 a2cc20478ef6e8180b12bf52007c7f90c6c01b61 SHA1 a2a778ce3b235e5da7c9756db9191e504f26eafa SHA256 cbbfae93bfcd8ca741091a419e886df871d88c1977961c090be116d266dfbc98 +MD5 8993bce6f2dcc808516a89c392bfc2d8 lcdproc-0.5.1-r1.ebuild 5967 +RMD160 a2cc20478ef6e8180b12bf52007c7f90c6c01b61 lcdproc-0.5.1-r1.ebuild 5967 +SHA256 cbbfae93bfcd8ca741091a419e886df871d88c1977961c090be116d266dfbc98 lcdproc-0.5.1-r1.ebuild 5967 +MISC ChangeLog 7418 RMD160 976e7e68fc5eb66ff143d048c6bf8a74e5e7c544 SHA1 4428c3891c83edca0c3cb98b88e78238391b65c3 SHA256 79aa107e54dcfc9e23cfe34fbb95e87502b5f6a2329cb597d786fe898443bf40 +MD5 0968e77322f77dde8690cbec60612508 ChangeLog 7418 +RMD160 976e7e68fc5eb66ff143d048c6bf8a74e5e7c544 ChangeLog 7418 +SHA256 79aa107e54dcfc9e23cfe34fbb95e87502b5f6a2329cb597d786fe898443bf40 ChangeLog 7418 MISC metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 SHA1 c212d5a20354a60471162a82c403f1a5235d1d9d SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a MD5 be4a34ac317e81ea820c84bc04b9c0d8 metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 metadata.xml 250 @@ -74,13 +78,13 @@ SHA256 ec3e28b7b2139bc95d6d832b07f789aa55db4f469147309e40a5c06ae587511a files/di MD5 6d44a04cfda3b2fc4e142c9e5f6c030f files/digest-lcdproc-0.5.0-r2 241 RMD160 0f9866a631a7ba250b3f31cd775862102e1f6a46 files/digest-lcdproc-0.5.0-r2 241 SHA256 93b5ec62e59ce1da93698995d0e96d014ab04be84ab1639c2a6f185033c7dd0c files/digest-lcdproc-0.5.0-r2 241 -MD5 11d9d2dd9490ce4743643fba29935c3d files/digest-lcdproc-0.5.1 241 -RMD160 a6283dd23a9e00ade61a9f86261e8b8f77b800c6 files/digest-lcdproc-0.5.1 241 -SHA256 9756a02fc35bbb6fd64b59252ad8f42b68c6994e8f45569438c739e4b48b4977 files/digest-lcdproc-0.5.1 241 +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 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFdqzLz974XjDVpbkRAvawAJ9dH0WS8GqcQ7FNxwYHKa/r2Gyh6wCdEBHZ -S1Af6K016OuXrbM37/iEU64= -=A7DY +iD8DBQFFiSXHz974XjDVpbkRAvofAKDPHfS4ezQUs3ntBkMizz62ewLJVgCg0c+E +5rpkQu4nE1JH0SRwc4N8weg= +=mtYe -----END PGP SIGNATURE----- diff --git a/app-misc/lcdproc/files/digest-lcdproc-0.5.1 b/app-misc/lcdproc/files/digest-lcdproc-0.5.1 deleted file mode 100644 index 247c7eae1867..000000000000 --- a/app-misc/lcdproc/files/digest-lcdproc-0.5.1 +++ /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.ebuild b/app-misc/lcdproc/lcdproc-0.5.1.ebuild deleted file mode 100644 index f8eabc4ca450..000000000000 --- a/app-misc/lcdproc/lcdproc-0.5.1.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2006 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.ebuild,v 1.4 2006/12/06 11:42:59 jokey Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" -inherit eutils flag-o-matic autotools - -DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices" -HOMEPAGE="http://lcdproc.org/" -SRC_URI="mirror://sourceforge/lcdproc/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -# general use keywords in first line, drivers in line 2 -IUSE="doc debug ldap nfs samba seamless-hbars usb - g15 graphlcd irman lirc ncurses svga ula200 xosd" - -DEPEND=" - doc? ( app-text/xmlto ) - ldap? ( net-nds/openldap ) - usb? ( dev-libs/libusb ) - - graphlcd? ( app-misc/graphlcd-base app-misc/glcdprocdriver ) - g15? ( app-misc/g15daemon dev-libs/libg15 >=dev-libs/libg15render-1.1.1 ) - irman? ( media-libs/libirman ) - lirc? ( app-misc/lirc ) - ncurses? ( sys-libs/ncurses ) - svga? ( media-libs/svgalib ) - ula200? ( dev-embedded/libftdi dev-libs/libusb ) - xosd? ( x11-libs/xosd x11-libs/libX11 x11-libs/libXext ) " -RDEPEND=${DEPEND} - -USE_DRIVERS="curses g15 glcdlib irman lirc svga ula200 xosd" -EXTRA_DRIVERS="bayrad CFontz CFontz633 CFontzPacket CwLnx EyeboxOne \ - glk hd44780 icp_a106 imon IOWarrior joy lb216 lcdm001 \ - lcterm MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD pyramid sed1330 \ - sed1520 serialVFD sli stv5730 t6963 text tyan " -ALL_DRIVERS="${USE_DRIVERS} ${EXTRA_DRIVERS}" - - -# compatibility with 1.4-ebuild format -LCDPROC_DRIVERS=${LCDPROC_DRIVERS//,/ } - -# if no drivers or all are set, select the defaults -has all ${LCDPROC_DRIVERS} \ - && LCDPROC_DRIVERS="${EXTRA_DRIVERS}" -[ -z "${LCDPROC_DRIVERS}" ] \ - && LCDPROC_DRIVERS="${EXTRA_DRIVERS}" -has none ${LCDPROC_DRIVERS} \ - && LCDPROC_DRIVERS="" - - -pkg_setup() { - echo - einfo "If you are updating from lcdproc-0.4, note that the setup of drivers has changed:" - einfo "The drivers ${USE_DRIVERS// /, } are controlled by use flags." - einfo "All other drivers are built by default, or in respect to the env variable" - einfo "LCDPROC_DRIVERS which can be a space separated list. Example:" - einfo " LCDPROC_DRIVERS=\"text CFontz\" emerge lcdproc" - einfo "You can also set this variable in your make.conf." - echo - einfo "Possible choices for LCDPROC_DRIVERS are:" - - # Nice Output of EXTRA_DRIVERS - local LINE=" " - local ELEM=0 - for driver in ${EXTRA_DRIVERS}; do - ELEM=$((${ELEM}+1)) - LINE="${LINE} ${driver}" - if [ "${ELEM}" = 8 ]; then - einfo "${LINE}" - ELEM=0 - LINE=" " - fi - done - if [ ! "${ELEM}" = 0 ]; then - einfo "${LINE}" - fi - - einfo " 'all' if you want to include all drivers (default)." - einfo " 'none' will not include any extra drivers." - echo - - local FILTERED_DRIVERS - for driver in ${LCDPROC_DRIVERS}; do - if has ${driver} ${EXTRA_DRIVERS} ; then - FILTERED_DRIVERS="${FILTERED_DRIVERS} ${driver}" - else - eerror "The extra driver '${driver}' is not available or has to be enabled by a USE flag." - eerror "Please check your LCDPROC_DRIVERS variable!" - echo - fi - done - LCDPROC_DRIVERS="${FILTERED_DRIVERS}" - - # add use-flag specific drivers to LCDPROC_DRIVERS - use graphlcd && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} glcdlib" - use g15 && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} g15" - use irman && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} irman" - use lirc && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} lirc" - use ncurses && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} curses" - use svga && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} svga" - use ula200 && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} ula200" - use xosd && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} xosd" - - einfo "The following drivers will be built: " - echo - - for driver in ${ALL_DRIVERS}; do - has ${driver} ${LCDPROC_DRIVERS} && einfo $driver - if (! use usb) && (has ${driver} "CFontzPacket CwLnx pyramid"); then - ewarn "${driver} might not compile if you do not enable USE=\"usb\"" - fi - done -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PV}-LCDd-conf-driver-path.patch" - epatch "${FILESDIR}/${PV}-as-needed.patch" - eautoreconf -} - -src_compile() { - # avoid executable stack as mentioned - # in http://www.gentoo.org/proj/en/hardened/gnu-stack.xml - append-ldflags -Wl,-z,noexecstack - - # convert space separated LCDPROC_DRIVERS to comma separated COMMA_DRIVERS - local COMMA_DRIVERS - for driver in ${LCDPROC_DRIVERS}; do - if [ -z "${COMMA_DRIVERS}" ] ; then - COMMA_DRIVERS="${driver}" - else - COMMA_DRIVERS="${COMMA_DRIVERS},${driver}" - fi - done - - econf \ - $(use_enable debug) \ - $(use_enable ldap) \ - $(use_enable nfs stat-nfs) \ - $(use_enable samba stat-smbfs ) \ - $(use_enable seamless-hbars) \ - $(use_enable usb libusb) \ - "--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 0 - ebegin "Creating dev documentation" - cd ${S}/docs/lcdproc-dev - xmlto html lcdproc-dev.docbook - eend 0 - fi -} - -src_install() { - dosbin server/LCDd - dobin clients/lcdexec/lcdexec - dobin clients/lcdproc/lcdproc - dobin clients/lcdvc/lcdvc - - insinto /usr/share/lcdproc/drivers - doins server/drivers/*.so - - insinto /usr/share/lcdproc/clients - doins clients/examples/*.pl - doins clients/metar/lcdmetar.pl - - insinto /etc - doins LCDd.conf - doins clients/lcdexec/lcdexec.conf - doins clients/lcdproc/lcdproc.conf - doins clients/lcdvc/lcdvc.conf - - newinitd "${FILESDIR}/${PV}-LCDd.initd" LCDd - newinitd "${FILESDIR}/${PV}-lcdproc.initd" lcdproc - - doman docs/*.1 docs/*.5 docs/*.8 - dodoc README CREDITS ChangeLog INSTALL TODO - dodoc docs/README.* docs/*.txt - - if use doc; then - insinto /usr/share/doc/${PF}/lcdproc-user - doins docs/lcdproc-user/*.html - insinto /usr/share/doc/${PF}/lcdproc-dev - doins docs/lcdproc-dev/*.html - fi -}