Add --skip-validation to xmlto for bug 273214, will be fixed upstream in 0.5.3, clean up old ebuild.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 20 insertions, 203 deletions

diff --git a/app-misc/lcdproc/ChangeLog b/app-misc/lcdproc/ChangeLog
index 41fc436c9377..336417613525 100644
--- a/app-misc/lcdproc/ChangeLog
+++ b/app-misc/lcdproc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/lcdproc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.66 2009/06/08 15:18:51 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.67 2009/06/13 10:38:47 rbu Exp $
+
+  13 Jun 2009; Robert Buchholz <rbu@gentoo.org> -lcdproc-0.5.1-r4.ebuild,
+  lcdproc-0.5.2-r1.ebuild, lcdproc-0.5.2-r2.ebuild,
+  lcdproc-0.5.3_pre1.ebuild:
+  Add --skip-validation to xmlto for bug 273214, will be fixed upstream in
+  0.5.3, clean up old ebuild.
 
 *lcdproc-0.5.3_pre1 (08 Jun 2009)
 
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index d47058708bab..5420e9338f8e 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -1,15 +1,12 @@
 AUX 0.5.1-LCDd.initd 645 RMD160 69b059023b665ecfcce9306dd9be2933da38b12a SHA1 85260492305266e661e022e902914c976782179c SHA256 782142cc26b433bbfe1ac1ae152a8ecf62985e78c03e674f699f76847e6465b6
 AUX 0.5.1-lcdproc.initd 482 RMD160 dcf3178518a8a218c865d8d389e9f7ca9ff8133e SHA1 982f8e76282508a7087547693e164690f933c4c2 SHA256 40a5ce0b7cc5fe3fe78d4c3ab37178c087cdc8e1c1922e91fd29f9bffac063fd
 AUX 0.5.2-r2-lcdproc.initd 498 RMD160 81dfa0a2795b401ff9a74b12a84a1877dec44598 SHA1 0c8f45fa1ad3a837f67e85ad1a4e4e7396936e85 SHA256 f537d05e9bfc63623cd3e22d3b9bf9e777ca2e726d13009ae0e571e58b52494a
-DIST lcdproc-0.5.1-patches.tar.gz 5936 RMD160 c2dcf9e5f0e3b637c249b9b2252e27d9f51ac8ad SHA1 4f6bab3717b8c288c485b63f0c9bf0ddca39aa3b SHA256 5deb2d7ba524c3ebb1dba2ceb74a68839c1723b297d603de85e8c3046b57afce
-DIST lcdproc-0.5.1.tar.gz 800205 RMD160 2672f660afac8437a9b6a1791bff80466cdfde64 SHA1 9f2628a6e55f930d5eeaf99ed999ecf83e3ea78c SHA256 f459280eb4eeb70be584895364c97ffab22b888235b2351a31e1c87ca9710727
 DIST lcdproc-0.5.2-patches.tar.gz 6571 RMD160 31b4534ea0fe2d58b52bb1dda76f0b728abdb916 SHA1 3dee4d57366eac2603656557d7ff8a6beb27249d SHA256 b578bbb2e0e1adabfd8eda2101d9023652c8d3c112d7dc78fb77026d5f2db13d
 DIST lcdproc-0.5.2-r2-patches.tar.gz 20140 RMD160 a87095f9e643fe9c9cf293db5b54443a42535148 SHA1 54c47f2837c43e670703022a5172a538dda6729b SHA256 c222fb0867bdbc510a4fed4d72e6c71c10d341997432bed84d713e6fac1d4b37
 DIST lcdproc-0.5.2.tar.gz 822695 RMD160 73c275cc00f06dc256267e87e1c3b1dcac172fb1 SHA1 924fca84eb5a07464a3d38df86d9a4427fd06dd7 SHA256 3261910dd9155229a2a6067c82ec4cca0d7900420f2d74c87a24b41b9b961036
 DIST lcdproc-0.5.3-pre1.tar.gz 900158 RMD160 66bd71e5d00fcbb3e72db828f7a0450b79ca6d64 SHA1 2d190491b9bcf8ec2ebdd6c16394ab648516d445 SHA256 4b77a98a32abe52e9c2dd54ea3146d0e602b907e5ac77b22039b0815749a8234
-EBUILD lcdproc-0.5.1-r4.ebuild 5692 RMD160 df6ed3306a45ad3a6a66f2ee6fda1756405004b2 SHA1 5e2ea7ccef8f514743f91bf0540f2a2b6f424901 SHA256 687a57318082c8a77c826459dc8a5acaa1328ef1bf03726eab079ca33509f0fc
-EBUILD lcdproc-0.5.2-r1.ebuild 5565 RMD160 98c42d8cca4fd23b83357b2038621f93a48cfd91 SHA1 37f77a6a232253d1b739c2794e3cb6b0cb866081 SHA256 2b91b1419e1f0b395b7f381cdf6f08e0a1072342ec495902007c9a10ec75560f
-EBUILD lcdproc-0.5.2-r2.ebuild 5651 RMD160 b0a05b916382c398b9a1729d6b1877e3e4701b8a SHA1 076f8f22ba591147bd5961ecefa2a844723b1528 SHA256 83e2b22566c7c8f9e1639c06c67894660d5f7e84af7a03beeef35b39fb2dbff6
-EBUILD lcdproc-0.5.3_pre1.ebuild 5837 RMD160 b788ac85238a9b98fe92d2cd843c9b25e7d0a83e SHA1 e8391c837e0ac49ca278590d8dc2f4c44e86cace SHA256 2247c255e2305434b3834801c133728dfdb21580079d627a4fcf49d3a92d4c3f
-MISC ChangeLog 11940 RMD160 0d741e8dc58a0e0c54aeb8a1e7e43babb31fc7f6 SHA1 84a93683f2034a89a19f371b477949d926235d8f SHA256 4328d2272c993ef88e82b819ea13b43e8010680d4f7271758f112fbc123d6c8e
+EBUILD lcdproc-0.5.2-r1.ebuild 5598 RMD160 f0c8f31e14889b3ced74ce84ad5e1cec8090f553 SHA1 590606e1eda4fe87c62c95fb554cf9ba0f377858 SHA256 46be079ceeeab1962139024a5afb9cf6dc392b640232684fadd50f232e409030
+EBUILD lcdproc-0.5.2-r2.ebuild 5683 RMD160 01e1af199910bcc8f9b351441f72887ffc9b6067 SHA1 efdcf6077ac5d9a3d2fc0e1a2e48e0ccbf91eb82 SHA256 e2f7595f8f50372aa29ab1cbaa88cdb9fbfb09ab388a9b028e7878901ed44555
+EBUILD lcdproc-0.5.3_pre1.ebuild 5867 RMD160 023d11883b57103744835d0eeeb1043725a22aa8 SHA1 64510cc5a373f33e1801ae2f9b6be02156610a83 SHA256 872b18dbb20c89718431e0e1fb750779d21a3baea1807062e92dc9a5282c5add
+MISC ChangeLog 12201 RMD160 cb1fe9ea5438d63540707a5029cba39492e3d553 SHA1 4a99266f876945bc31783c46860fe7d3c0150e35 SHA256 0c848dcceee28fbebc28cc75c98a74c405ef1febd3dc372a43ff90bc060b4827
 MISC metadata.xml 1128 RMD160 0b8e10967ae17425a9f40c08de1d64512da134d2 SHA1 5d6f7cd01e9a27dfc23136627d7a9b8fb257d1bf SHA256 7e3cfa47a936d661292ed3270df10962a0895b426c3aec2dcf21358b61662701
diff --git a/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild b/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild
deleted file mode 100644
index a1c70aa6f89c..000000000000
--- a/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2009 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-r4.ebuild,v 1.9 2009/06/08 15:18:51 rbu Exp $
-
-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
-	mirror://gentoo/${P}-patches.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?      ( =virtual/libusb-0* )
-	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  =virtual/libusb-0* )
-	lcd_devices_xosd?     ( x11-libs/xosd  x11-libs/libX11  x11-libs/libXext )
-	lcd_devices_cfontzpacket? ( =virtual/libusb-0* )
-	lcd_devices_cwlinux?    ( =virtual/libusb-0* )
-	lcd_devices_pyramid?  ( =virtual/libusb-0* )"
-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 "${WORKDIR}/${P}-patches/${PV}-as-needed.patch"
-	epatch "${WORKDIR}/${P}-patches/${PV}-serialvfd-parallel.patch"
-	epatch "${WORKDIR}/${P}-patches/${PV}-nested-functions.patch"
-	epatch "${WORKDIR}/${P}-patches/${PV}-g15daemon-1.9.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/
-
-	newinitd "${FILESDIR}/${PV}-LCDd.initd" LCDd
-	newinitd "${FILESDIR}/${PV}-lcdproc.initd" lcdproc
-
-	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
-}
-
-pkg_postinst() {
-	ewarn "IMPORTANT: Please update your /etc/LCDd.conf"
-	ewarn "As of lcdproc-0.5.1-r2, the DriverPath changed from /usr/share/lcdproc to /usr/$(get_libdir)/lcdproc ."
-}
diff --git a/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild
index 3aeb55b87884..8b6a667cab4d 100644
--- a/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild,v 1.9 2009/05/16 08:57:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild,v 1.10 2009/06/13 10:38:47 rbu Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit eutils autotools multilib
@@ -132,12 +132,12 @@ src_compile() {
 	if use doc; then
 		ebegin "Creating user documentation"
 		cd "${S}"/docs/lcdproc-user
-		xmlto html lcdproc-user.docbook
+		xmlto html --skip-validation lcdproc-user.docbook
 		eend $?
 
 		ebegin "Creating dev documentation"
 		cd "${S}"/docs/lcdproc-dev
-		xmlto html lcdproc-dev.docbook
+		xmlto html --skip-validation lcdproc-dev.docbook
 		eend $?
 	fi
 }
diff --git a/app-misc/lcdproc/lcdproc-0.5.2-r2.ebuild b/app-misc/lcdproc/lcdproc-0.5.2-r2.ebuild
index 06d23719ad97..c49cab01fcbb 100644
--- a/app-misc/lcdproc/lcdproc-0.5.2-r2.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.2-r2.ebuild,v 1.2 2009/05/16 08:57:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.2-r2.ebuild,v 1.3 2009/06/13 10:38:47 rbu Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit eutils autotools multilib
@@ -134,12 +134,12 @@ src_compile() {
 	if use doc; then
 		ebegin "Creating user documentation"
 		cd "${S}"/docs/lcdproc-user
-		xmlto html lcdproc-user.docbook
+		xmlto html --skip-validation lcdproc-user.docbook
 		eend $?
 
 		ebegin "Creating dev documentation"
 		cd "${S}"/docs/lcdproc-dev
-		xmlto html lcdproc-dev.docbook
+		xmlto html --skip-validation lcdproc-dev.docbook
 		eend $?
 	fi
 }
diff --git a/app-misc/lcdproc/lcdproc-0.5.3_pre1.ebuild b/app-misc/lcdproc/lcdproc-0.5.3_pre1.ebuild
index 4b51924a6628..d72d62e941cd 100644
--- a/app-misc/lcdproc/lcdproc-0.5.3_pre1.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.3_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.3_pre1.ebuild,v 1.2 2009/06/08 23:36:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.3_pre1.ebuild,v 1.3 2009/06/13 10:38:47 rbu Exp $
 
 EAPI=2
 inherit multilib versionator
@@ -143,12 +143,12 @@ src_compile() {
 	if use doc; then
 		ebegin "Creating user documentation"
 		cd "${S}"/docs/lcdproc-user
-		xmlto html lcdproc-user.docbook
+		xmlto html --skip-validation lcdproc-user.docbook
 		eend $?
 
 		ebegin "Creating dev documentation"
 		cd "${S}"/docs/lcdproc-dev
-		xmlto html lcdproc-dev.docbook
+		xmlto html --skip-validation lcdproc-dev.docbook
 		eend $?
 	fi
 }