diff options
author | Markus Ullmann <jokey@gentoo.org> | 2006-12-18 13:28:01 +0000 |
---|---|---|
committer | Markus Ullmann <jokey@gentoo.org> | 2006-12-18 13:28:01 +0000 |
commit | 801762c81a0e488ef6db9563d06f674993db842f (patch) | |
tree | b318b5fa9f071b26c005593dbb9f773c3087a3e3 /app-misc | |
parent | Fix for bug #151308 ? (diff) | |
download | jokey-801762c81a0e488ef6db9563d06f674993db842f.tar.gz jokey-801762c81a0e488ef6db9563d06f674993db842f.tar.bz2 jokey-801762c81a0e488ef6db9563d06f674993db842f.zip |
Ported to tree
svn path=/trunk/; revision=96
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/lcd4linux/Manifest | 16 | ||||
-rw-r--r-- | app-misc/lcd4linux/files/digest-lcd4linux-0.10.0 | 3 | ||||
-rw-r--r-- | app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch | 34 | ||||
-rw-r--r-- | app-misc/lcd4linux/files/lcd4linux-0.10.0-kernel2.6.19.patch | 13 | ||||
-rw-r--r-- | app-misc/lcd4linux/lcd4linux-0.10.0.ebuild | 119 |
5 files changed, 0 insertions, 185 deletions
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest deleted file mode 100644 index 54b8c15..0000000 --- a/app-misc/lcd4linux/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -AUX lcd4linux-0.10.0-gcc4-compat.patch 1062 RMD160 9d1cfbd4bdcab36712e91054ffe738efb154f75e SHA1 00486e55acb1c7e8bf223ec812cd41f90463f5fe SHA256 4e10734eb528a0b1f29bb2860c5ecbfdf09eeb955f7905e960bfbbda92efce4a -MD5 ee1bd63f943879b8a0d38273fc12922d files/lcd4linux-0.10.0-gcc4-compat.patch 1062 -RMD160 9d1cfbd4bdcab36712e91054ffe738efb154f75e files/lcd4linux-0.10.0-gcc4-compat.patch 1062 -SHA256 4e10734eb528a0b1f29bb2860c5ecbfdf09eeb955f7905e960bfbbda92efce4a files/lcd4linux-0.10.0-gcc4-compat.patch 1062 -AUX lcd4linux-0.10.0-kernel2.6.19.patch 412 RMD160 abf01325ffa51e0dbeb3b044c8c59659d1d5b4ea SHA1 fc50cc9e2a20beb18a43aa37959cb84566595ca7 SHA256 66b077e6a98aa679e31f5346d428734bf8d584edef0f0db015a0630cd161ec48 -MD5 caf89e4008f3326f1b5528e2ca4752fb files/lcd4linux-0.10.0-kernel2.6.19.patch 412 -RMD160 abf01325ffa51e0dbeb3b044c8c59659d1d5b4ea files/lcd4linux-0.10.0-kernel2.6.19.patch 412 -SHA256 66b077e6a98aa679e31f5346d428734bf8d584edef0f0db015a0630cd161ec48 files/lcd4linux-0.10.0-kernel2.6.19.patch 412 -DIST lcd4linux-0.10.0.tar.gz 294851 RMD160 98f810297de3d746d559998516b83a2939fc8568 SHA1 325d8549c83bb62e31492285001a1007d1f9960b SHA256 0b880d4baf612e5689d3b97d7c699df864cdb690b354eadd2a3d4e341511e909 -EBUILD lcd4linux-0.10.0.ebuild 3004 RMD160 b354c31ac64ea27381f46a2cd9fa43d61c463a42 SHA1 5d409a40d900f311828a5dfcf1ee4a2ecf9b3326 SHA256 29130adbae0c7c68cbc8ec283a4b1d6c1515f418f3a10b8cc0176e60680a6baf -MD5 cdee33b4b4a0a5ec8ebe8c7efc53f9eb lcd4linux-0.10.0.ebuild 3004 -RMD160 b354c31ac64ea27381f46a2cd9fa43d61c463a42 lcd4linux-0.10.0.ebuild 3004 -SHA256 29130adbae0c7c68cbc8ec283a4b1d6c1515f418f3a10b8cc0176e60680a6baf lcd4linux-0.10.0.ebuild 3004 -MD5 0b746369033d8d0fffea2ec67f83ad4e files/digest-lcd4linux-0.10.0 250 -RMD160 018c8b34815a32a9902122a5e67b6acbc2e3e41a files/digest-lcd4linux-0.10.0 250 -SHA256 4c83e624811751fc7f8241bb9f0a7b904460fa18841ebce93b464c7858988afd files/digest-lcd4linux-0.10.0 250 diff --git a/app-misc/lcd4linux/files/digest-lcd4linux-0.10.0 b/app-misc/lcd4linux/files/digest-lcd4linux-0.10.0 deleted file mode 100644 index de6c25a..0000000 --- a/app-misc/lcd4linux/files/digest-lcd4linux-0.10.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b7fb1c24b940482cd730cf212d1b5062 lcd4linux-0.10.0.tar.gz 294851 -RMD160 98f810297de3d746d559998516b83a2939fc8568 lcd4linux-0.10.0.tar.gz 294851 -SHA256 0b880d4baf612e5689d3b97d7c699df864cdb690b354eadd2a3d4e341511e909 lcd4linux-0.10.0.tar.gz 294851 diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch deleted file mode 100644 index 1149ae6..0000000 --- a/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch +++ /dev/null @@ -1,34 +0,0 @@ -GCC4 fixes, see bug #147388. -Patch from upstream SVN - ---- /trunk/drv_SimpleLCD.c (revision 547) -+++ /trunk/drv_SimpleLCD.c (revision 581) -@@ -199,4 +202,5 @@ - { - int rows = -1, cols = -1; -+ int value; - unsigned int flags = 0; - char *s; -@@ -210,7 +214,8 @@ - } - -- cfg_number(section, "BarCharValue", 0, 0, 255, &flags); -- bar_char = flags; -- cfg_number(section, "Options", 0, 0, 0xffff, &flags); -+ cfg_number(section, "BarCharValue", 0, 0, 255, &value); -+ bar_char = value; -+ cfg_number(section, "Options", 0, 0, 0xffff, &value); -+ flags = value; - if (drv_generic_serial_open(section, Name, flags) < 0) - return -1; -Index: /trunk/lcd4linux_i2c.h -=================================================================== ---- /trunk/lcd4linux_i2c.h (revision 562) -+++ /trunk/lcd4linux_i2c.h (revision 581) -@@ -79,5 +82,5 @@ - /* Transfer num messages. - */ --extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num); -+extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num); - - /* diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.0-kernel2.6.19.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.0-kernel2.6.19.patch deleted file mode 100644 index 9738014..0000000 --- a/app-misc/lcd4linux/files/lcd4linux-0.10.0-kernel2.6.19.patch +++ /dev/null @@ -1,13 +0,0 @@ -patch by Guillaume Lecerf <foxcore@gmail.com> -see http://sourceforge.net/mailarchive/message.php?msg_id=37594448 - ---- lcd4linux-0.10.0.orig/plugin_wireless.c 2006-12-04 18:11:41.000000000 +0100 -+++ lcd4linux-0.10.0/plugin_wireless.c 2006-12-04 18:12:01.000000000 +0100 -@@ -92,6 +92,7 @@ - - #include <sys/ioctl.h> - #include <net/if_arp.h> -+#include <linux/if.h> - #include <linux/wireless.h> - #include <math.h> - diff --git a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild deleted file mode 100644 index 4d686e0..0000000 --- a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild +++ /dev/null @@ -1,119 +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/lcd4linux/lcd4linux-0.10.0.ebuild,v 1.5 2006/12/06 11:31:16 jokey Exp $ - -inherit eutils - -DESCRIPTION="Shows system and ISDN information on an external display or in a X11 window" -HOMEPAGE="http://ssl.bulix.org/projects/lcd4linux/" -SRC_URI="mirror://sourceforge/lcd4linux/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -# contains x86 asm, upstream is working on a portable version -KEYWORDS="~x86" -IUSE="kde png serdisp X usb mysql python" - -DEPEND="png? ( media-libs/libpng - media-libs/gd ) - X? ( x11-libs/libX11 ) - usb? ( dev-libs/libusb ) - serdisp? ( dev-libs/serdisplib ) - mysql? ( virtual/mysql )" -# python? ( dev-lang/python ) -# mpd is needed soon -# python is broken - -pkg_preinst() { - einfo "If you wish to compile only specific drivers or plugins, please use" - einfo "the LCD4LINUX_PLUGINS and LCD4LINUX_DRIVERS environment variables." -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-kernel2.6.19.patch" - epatch "${FILESDIR}/${P}-gcc4-compat.patch" -} - -src_compile() { - local myconf myp myd - - # need to grab upstream's *.m4 and fix python building - # they didn't have python properly set up originally. - #myconf="${myconf} $(use_with python)" - myconf="${myconf} --without-python" - - # plugins - if [ -n "$LCD4LINUX_PLUGINS" ]; then - myp="$LCD4LINUX_PLUGINS" - einfo "Active plugins (overridden): ${myp}" - else - myp="all" - use mysql || myp="${myp},!mysql" - #use python || myp="${myp},!python" - myp="${myp},!python" - einfo "Active plugins: ${myp}" - fi - - # drivers - if [ -n "$LCD4LINUX_DRIVERS" ]; then - myd="$LCD4LINUX_DRIVERS" - einfo "Active drivers (overridden): ${myd}" - else - myd="all" - use serdisp || myd="${myd},!serdisplib" - use usb || myd="${myd},!USBLCD" - use png || myd="${myd},!PNG" - use X || myd="${myd},!X11" - einfo "Active drivers: ${myd}" - fi - - # avoid package brokenness - use X && myconf="${myconf} --x-libraries=/usr/lib --x-include=/usr/include" - use X || myconf="${myconf} --without-x" - - econf \ - --sysconfdir=/etc/lcd4linux \ - --with-drivers="${myd}" \ - --with-plugins="${myp}" \ - ${myconf} \ - || die "econf failed" - - sed -i.orig -e 's,-L -lX11, -lX11 ,g' Makefile || die "sed fixup failed" - - emake || die -} - -src_install() { - # upstream's makefile acts weird, and tries to recompile stuff - into /usr - dobin lcd4linux - - dodoc README* NEWS TODO CREDITS FAQ AUTHORS ChangeLog - - #newconfd ${FILESDIR}/${PN}.confd ${PN} - #newinitd ${FILESDIR}/${PN}.initd ${PN} - - dodir /etc/lcd4linux - - if use X || use kde; then - insinto /usr/share/pixmaps - doins lcd4linux.xpm - fi - use X && touch ${D}/etc/lcd4linux/lcd4X11.conf - - if use kde ; then - insinto /usr/share/applnk/apps/System - doins lcd4linux.kdelnk - insinto /etc/lcd4linux - insopts -o root -g root -m 0600 - doins lcd4kde.conf - fi - - insinto /etc/lcd4linux - insopts -o root -g root -m 0600 - newins lcd4linux.conf.sample lcd4linux.conf -} - |