Fixed device-node to work with udev-115-r2+. Compiling fixed for Kernel 2.6.23+, Bug 195432.

Package-Manager: portage-2.1.3.12

5 files changed, 358 insertions, 9 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 67c93d39706a..b27f2ba4bc44 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.151 2007/09/01 08:12:58 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.152 2007/10/11 19:35:42 zzam Exp $
+
+*lirc-0.8.2-r2 (11 Oct 2007)
+
+  11 Oct 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/lirc-0.8.2-kernel-2.6.23.patch, +lirc-0.8.2-r2.ebuild:
+  Fixed device-node to work with udev-115-r2+. Compiling fixed for Kernel
+  2.6.23+, Bug 195432.
 
   01 Sep 2007; Joseph Jezak <josejx@gentoo.org> lirc-0.8.2-r1.ebuild:
   Marked ppc stable for bug #187822.
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 426582590aa6..b694970cb654 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -65,6 +65,10 @@ AUX lirc-0.8.2-kernel-2.6.22.patch 550 RMD160 789e168d93a1f7c6c329cd0c6f858efef1
 MD5 43ef322a202e002088ba82881923b395 files/lirc-0.8.2-kernel-2.6.22.patch 550
 RMD160 789e168d93a1f7c6c329cd0c6f858efef1d13e10 files/lirc-0.8.2-kernel-2.6.22.patch 550
 SHA256 1e934d597c2f6a918fabe8f54ee4afb4362da778d38a2f5ded0ac5104b906a4d files/lirc-0.8.2-kernel-2.6.22.patch 550
+AUX lirc-0.8.2-kernel-2.6.23.patch 1224 RMD160 6e780550ddeb24d2ef58702b01c263d6ab7b1695 SHA1 e90c105626a00f724b9444eae57250328154663d SHA256 7a3af1f27df60fdd6f281ea4064cd603e4e429f9989218bce262e954e709dcce
+MD5 c2fca4693f97f9bb5735f2b96ea6f205 files/lirc-0.8.2-kernel-2.6.23.patch 1224
+RMD160 6e780550ddeb24d2ef58702b01c263d6ab7b1695 files/lirc-0.8.2-kernel-2.6.23.patch 1224
+SHA256 7a3af1f27df60fdd6f281ea4064cd603e4e429f9989218bce262e954e709dcce files/lirc-0.8.2-kernel-2.6.23.patch 1224
 AUX lirc-remotewonderplus.patch 876 RMD160 5fa5bd312f60ec900a38b189134627f2c27449bc SHA1 b13a5c024b0eb6f9b65cb1a795c618832aad39e3 SHA256 12e296b694fa9f3889d191756cd9c3846822ca7e653ee3e26c00bf7bf5a73a88
 MD5 e68a17220295d3c72d78c9e78d9ec9b0 files/lirc-remotewonderplus.patch 876
 RMD160 5fa5bd312f60ec900a38b189134627f2c27449bc files/lirc-remotewonderplus.patch 876
@@ -109,6 +113,10 @@ EBUILD lirc-0.8.2-r1.ebuild 7790 RMD160 f9736092eb4c4db2dfa7ca8ec7bedf07c3a5a253
 MD5 8cd49a6a51e74702ef49f88ecbf6eda9 lirc-0.8.2-r1.ebuild 7790
 RMD160 f9736092eb4c4db2dfa7ca8ec7bedf07c3a5a253 lirc-0.8.2-r1.ebuild 7790
 SHA256 4b59e3bd074bd53b7e2658995871d1ffdf676519dba8cfc85e949e004012b4b8 lirc-0.8.2-r1.ebuild 7790
+EBUILD lirc-0.8.2-r2.ebuild 7784 RMD160 43ed5887776159851af58a19048f7d8e316471e3 SHA1 888f8a386172f10a7b8629db3b17f9fa08b85b9b SHA256 ea4056e9e242dcd9dd4703f0f9b3fd5b16c4628a0b2f0809f4c84af78ff248ce
+MD5 3f52b503770a6277ab9087b195a77f5c lirc-0.8.2-r2.ebuild 7784
+RMD160 43ed5887776159851af58a19048f7d8e316471e3 lirc-0.8.2-r2.ebuild 7784
+SHA256 ea4056e9e242dcd9dd4703f0f9b3fd5b16c4628a0b2f0809f4c84af78ff248ce lirc-0.8.2-r2.ebuild 7784
 EBUILD lirc-0.8.2.ebuild 7726 RMD160 292e5e190b6887cc4e6c3ad3582dec6b2323dda3 SHA1 57ce31333eb3934df22f71bece0c10ee032dec83 SHA256 9fc16a02a8fb7d8908bc28d62c044a43d5566be24005da988843342df83fe037
 MD5 6f2a562abbdf7738b467abb0977f6537 lirc-0.8.2.ebuild 7726
 RMD160 292e5e190b6887cc4e6c3ad3582dec6b2323dda3 lirc-0.8.2.ebuild 7726
@@ -117,10 +125,10 @@ EBUILD lirc-0.8.2_pre2.ebuild 7745 RMD160 2d63764827fc860f005c4498b1ff1709965db2
 MD5 fb4948861726364f93146946993e56fd lirc-0.8.2_pre2.ebuild 7745
 RMD160 2d63764827fc860f005c4498b1ff1709965db2d8 lirc-0.8.2_pre2.ebuild 7745
 SHA256 af936bdb32b53239bb8d3ba955b8c25c7afb231ae056fdf7dc12e1a0101bc6b7 lirc-0.8.2_pre2.ebuild 7745
-MISC ChangeLog 23205 RMD160 1cb19ed3d4dab224b11206388ca99a58e4dbe96a SHA1 7ca02ab14331da0f7447f27c09d56ad90b75593e SHA256 bdb60eb7a36e7438e753667bfb0717d661769c168ca66969c2a23b7af49915bd
-MD5 f048e1d0725a879e435029bfe55a63af ChangeLog 23205
-RMD160 1cb19ed3d4dab224b11206388ca99a58e4dbe96a ChangeLog 23205
-SHA256 bdb60eb7a36e7438e753667bfb0717d661769c168ca66969c2a23b7af49915bd ChangeLog 23205
+MISC ChangeLog 23448 RMD160 4a979e3780c90b4d8043b43354a536c3f7a4c1e8 SHA1 414d2a961ee731f1d7e903e0d0666575aa27fb33 SHA256 f9097bbd679a1a08cc9a08905a08fc6fb47bd0c5bab2a4c20f5f6b5ecd5a48e4
+MD5 e29a2d8055b736c34a47be2f9af6fd2d ChangeLog 23448
+RMD160 4a979e3780c90b4d8043b43354a536c3f7a4c1e8 ChangeLog 23448
+SHA256 f9097bbd679a1a08cc9a08905a08fc6fb47bd0c5bab2a4c20f5f6b5ecd5a48e4 ChangeLog 23448
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
 MD5 dcc0143f6508e9fd068845f98b7bb403 metadata.xml 162
 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af metadata.xml 162
@@ -137,13 +145,16 @@ SHA256 65c4eb9a309cecdbe32e8c7b884eb2759c4b43f79803a26fbe5f4428e78fb3ae files/di
 MD5 fb37a01ebd0200c3e87b3a547e320bf9 files/digest-lirc-0.8.2-r1 235
 RMD160 28c1fc930d2c77c787bf165f803c7232670ff4e5 files/digest-lirc-0.8.2-r1 235
 SHA256 65c4eb9a309cecdbe32e8c7b884eb2759c4b43f79803a26fbe5f4428e78fb3ae files/digest-lirc-0.8.2-r1 235
+MD5 fb37a01ebd0200c3e87b3a547e320bf9 files/digest-lirc-0.8.2-r2 235
+RMD160 28c1fc930d2c77c787bf165f803c7232670ff4e5 files/digest-lirc-0.8.2-r2 235
+SHA256 65c4eb9a309cecdbe32e8c7b884eb2759c4b43f79803a26fbe5f4428e78fb3ae files/digest-lirc-0.8.2-r2 235
 MD5 cec1b53dce7002d7bc8ef3c9d42b1f3c files/digest-lirc-0.8.2_pre2 247
 RMD160 0ed56503665fd4cdeb764c4afb8f1405325ec86c files/digest-lirc-0.8.2_pre2 247
 SHA256 85178d370b86564aebac9b79c8215c97625e85dc187208f93b64f3c9cea0552c files/digest-lirc-0.8.2_pre2 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG2R8ZcsIHjyDViGQRAgLtAJ9D+5wqhT/RDoApkjjIPUPLT0zMhACdFasK
-FqvcHHEDQm8IYMXQSSMK2ow=
-=DqsN
+iD8DBQFHDnsZt2vP6XvVdOcRAs9iAJ0YYDHGo0DwKaZa0mgVT6SC5FqB1ACeMB67
+9pfL6di02sDfhFKsw8eelTY=
+=I6Se
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/digest-lirc-0.8.2-r2 b/app-misc/lirc/files/digest-lirc-0.8.2-r2
new file mode 100644
index 000000000000..a48314f94f8f
--- /dev/null
+++ b/app-misc/lirc/files/digest-lirc-0.8.2-r2
@@ -0,0 +1,3 @@
+MD5 83e7060a6693b81075c178d7e3b215af lirc-0.8.2.tar.bz2 634331
+RMD160 e806608f8644a1d1f66689a40b2ed27b4cf43bd9 lirc-0.8.2.tar.bz2 634331
+SHA256 717e62ee763bad9c1ffc25dd096a8845d252eaa050f16f67c6fe3506194e7f62 lirc-0.8.2.tar.bz2 634331
diff --git a/app-misc/lirc/files/lirc-0.8.2-kernel-2.6.23.patch b/app-misc/lirc/files/lirc-0.8.2-kernel-2.6.23.patch
new file mode 100644
index 000000000000..be53f123ed6e
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.8.2-kernel-2.6.23.patch
@@ -0,0 +1,37 @@
+diff -u -r -p lirc-0.8.2-orig/drivers/lirc_dev/lirc_dev.c lirc-0.8.2/drivers/lirc_dev/lirc_dev.c
+--- lirc-0.8.2-orig/drivers/lirc_dev/lirc_dev.c	2007-02-13 07:45:15.000000000 +0100
++++ lirc-0.8.2/drivers/lirc_dev/lirc_dev.c	2007-10-11 20:45:01.000000000 +0200
+@@ -880,8 +880,13 @@ static int lirc_dev_init(void)
+ 	return SUCCESS;
+ 
+ out_unregister:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
++	/* unregister_chrdev returns void now */
++	unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
++#else
+ 	if(unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME))
+ 		printk(KERN_ERR "lirc_dev: unregister_chrdev failed!\n");
++#endif
+ out:
+ 	return -1;
+ }
+@@ -905,6 +910,11 @@ int init_module(void)
+  */
+ void cleanup_module(void)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
++	/* unregister_chrdev returns void now */
++	unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
++	class_destroy(lirc_class);
++#else
+ 	int ret;
+ 
+ 	ret = unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
+@@ -914,6 +924,7 @@ void cleanup_module(void)
+ 		printk("lirc_dev: error in module_unregister_chrdev: %d\n", ret);
+ 	else
+ 		dprintk("lirc_dev: module successfully unloaded\n");
++#endif
+ }
+ 
+ MODULE_DESCRIPTION("LIRC base driver module");
diff --git a/app-misc/lirc/lirc-0.8.2-r2.ebuild b/app-misc/lirc/lirc-0.8.2-r2.ebuild
new file mode 100644
index 000000000000..e51acd5ebf4a
--- /dev/null
+++ b/app-misc/lirc/lirc-0.8.2-r2.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.2-r2.ebuild,v 1.1 2007/10/11 19:35:42 zzam Exp $
+
+inherit eutils linux-mod flag-o-matic autotools
+
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
+HOMEPAGE="http://www.lirc.org/"
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+	SRC_URI="mirror://sourceforge/lirc/${P/_/}.tar.bz2"
+else
+	SRC_URI="http://lirc.sourceforge.net/software/snapshots/${P/_/}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug doc X hardware-carrier transmitter"
+
+S=${WORKDIR}/${P/_pre/pre}
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+	)
+	lirc_devices_alsa_usb? ( media-libs/alsa-lib )
+	lirc_devices_audio? ( media-libs/portaudio )
+	lirc_devices_irman? ( media-libs/libirman )"
+
+# This are drivers with names matching the
+# parameter --with-driver=NAME
+IUSE_LIRC_DEVICES_DIRECT="
+	all userspace accent act200l act220l
+	adaptec alsa_usb animax asusdh atilibusb
+	atiusb audio audio_alsa avermedia avermedia_vdomate
+	avermedia98 bestbuy bestbuy2 breakoutbox
+	bte bw6130 caraca chronos cmdir
+	cph06x creative creative_infracd
+	devinput digimatrix dsp dvico ea65
+	exaudio flyvideo gvbctv5pci hauppauge
+	hauppauge_dvb hercules_smarttv_stereo
+	igorplugusb imon imon_pad imon_rsc
+	irdeo irdeo_remote irman irreal it87
+	knc_one kworld leadtek_0007 leadtek_0010
+	leadtek_pvr2000 livedrive_midi
+	livedrive_seq logitech macmini mceusb
+	mceusb2 mediafocusI mouseremote
+	mouseremote_ps2 mp3anywhere nslu2
+	packard_bell parallel pcmak pcmak_usb
+	pctv pixelview_bt878 pixelview_pak
+	pixelview_pro provideo realmagic
+	remotemaster sa1100 sasem sb0540 serial
+	silitek sir slinke streamzap tekram
+	tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2
+	uirt2_raw usb_uirt_raw usbx"
+
+# drivers that need special handling and
+# must have another name specified for
+# parameter --with-driver=NAME
+IUSE_LIRC_DEVICES_SPECIAL="
+	imon_pad2keys serial_igor_cesko
+	remote_wonder_plus xboxusb usbirboy inputlirc"
+
+IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
+
+#device-driver which use libusb
+LIBUSB_USED_BY_DEV="
+	all atiusb sasem igorplugusb imon imon_pad imon_pad2keys
+	imon_rsc streamzap mceusb mceusb2 xboxusb"
+
+for dev in ${LIBUSB_USED_BY_DEV}; do
+	RDEPEND="${RDEPEND} lirc_devices_${dev}? ( dev-libs/libusb )"
+done
+
+# adding only compile-time depends
+DEPEND="${RDEPEND}
+	virtual/linux-sources"
+
+# adding only run-time depends
+RDEPEND="${RDEPEND}
+	lirc_devices_usbirboy? ( app-misc/usbirboy )
+	lirc_devices_inputlirc? ( app-misc/inputlircd )"
+
+# add all devices to IUSE
+for dev in ${IUSE_LIRC_DEVICES}; do
+	IUSE="${IUSE} lirc_devices_${dev}"
+done
+
+add_device() {
+	((lirc_device_count++))
+
+	if [[ ${lirc_device_count} -eq 2 ]]; then
+		ewarn
+		ewarn "When selecting multiple devices for lirc to be supported,"
+		ewarn "it can not be garanteed that the drivers play nice together."
+		ewarn
+		ewarn "If this is not intended, then abort emerge now with Ctrl-C,"
+		ewarn "Set LIRC_DEVICES and restart emerge."
+		ewarn
+		epause
+	fi
+
+	local dev="${1}"
+	local desc="device ${dev}"
+	if [[ -n "${2}" ]]; then
+		desc="${2}"
+	fi
+
+	elog "Compiling support for ${desc}"
+	MY_OPTS="${MY_OPTS} --with-driver=${dev}"
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	# set default configure options
+	MY_OPTS=""
+	lirc_driver_count=0
+
+	LIRC_DRIVER_DEVICE="/dev/lirc0"
+
+	local dev
+
+	if use lirc_devices_all; then
+		# compile in drivers for a lot of devices
+		add_device all "a lot of devices"
+	else
+		# compile in only requested drivers
+		for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
+			if use lirc_devices_${dev}; then
+				add_device ${dev}
+			fi
+		done
+
+		if use lirc_devices_remote_wonder_plus; then
+			add_device atiusb "device Remote Wonder Plus (atiusb-based)"
+		fi
+
+		if use lirc_devices_serial_igor_cesko; then
+			add_device serial "serial with Igor Cesko design"
+			MY_OPTS="${MY_OPTS} --with-igor"
+		fi
+
+		if use lirc_devices_imon_pad2keys; then
+			add_device imon_pad "device imon_pad (with converting pad input to keyspresses)"
+		fi
+
+		if use lirc_devices_xboxusb; then
+			add_device atiusb "device xboxusb"
+		fi
+
+		if use lirc_devices_usbirboy; then
+			add_device userspace "device usbirboy"
+			LIRC_DRIVER_DEVICE="/dev/usbirboy"
+		fi
+
+		if [[ "${MY_OPTS}" == "" ]]; then
+			if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
+				# on xbox: use special driver
+				add_device atiusb "device xboxusb"
+			else
+				# no driver requested
+				elog
+				elog "Compiling only the lirc-applications, but no drivers."
+				elog "Enable drivers with LIRC_DEVICES if you need them."
+				MY_OPTS="--with-driver=userspace"
+			fi
+		fi
+	fi
+
+	use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier"
+	use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter"
+
+	if [[ -n "${LIRC_OPTS}" ]] ; then
+		ewarn
+		ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on."
+		ewarn
+		ewarn "Please use LIRC_DEVICES from now on."
+		ewarn "e.g. LIRC_DEVICES=\"serial sir\""
+		ewarn
+		ewarn "Flags are now set per use-flags."
+		ewarn "e.g. transmitter, hardware-carrier"
+
+		local opt
+		local unsupported_opts=""
+
+		# test for allowed options for LIRC_OPTS
+		for opt in ${LIRC_OPTS}; do
+			case ${opt} in
+				--with-port=*|--with-irq=*|--with-timer=*|--with-tty=*)
+					MY_OPTS="${MY_OPTS} ${opt}"
+					;;
+				*)
+					unsupported_opts="${unsupported_opts} ${opt}"
+					;;
+			esac
+		done
+		if [[ -n ${unsupported_opts} ]]; then
+			ewarn "These options are no longer allowed to be set"
+			ewarn "with LIRC_OPTS: ${unsupported_opts}"
+			die "LIRC_OPTS is no longer recommended."
+		fi
+	fi
+
+	# Setup parameter for linux-mod.eclass
+	MODULE_NAMES="lirc(misc:${S})"
+	BUILD_TARGETS="all"
+
+	ECONF_PARAMS="	--localstatedir=/var
+			        --with-syslog=LOG_DAEMON
+			        --enable-sandboxed
+	    		    --with-kerneldir=${KV_DIR}
+			        --with-moduledir=/lib/modules/${KV_FULL}/misc
+	    		    $(use_enable debug)
+					$(use_with X x)
+					${MY_OPTS}"
+
+	einfo
+	einfo "lirc-configure-opts: ${MY_OPTS}"
+	elog  "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}"
+
+	filter-flags -Wl,-O1
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Rip out dos CRLF
+	edos2unix contrib/lirc.rules
+
+	# Apply patches needed for some special device-types
+	use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${PN}-0.8.1-imon-pad2keys.patch
+	use lirc_devices_remote_wonder_plus && epatch ${FILESDIR}/lirc-remotewonderplus.patch
+
+	# Bug 187822
+	epatch "${FILESDIR}/lirc-0.8.2-kernel-2.6.22.patch"
+	
+	# Bug 195432
+	epatch "${FILESDIR}/lirc-0.8.2-kernel-2.6.23.patch"
+
+	# remove parallel driver on SMP systems
+	if linux_chkconfig_present SMP ; then
+		sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
+	fi
+
+	# respect CFLAGS
+	sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.in
+
+	# setting default device-node
+	sed -i -e '/#define LIRC_DRIVER_DEVICE/d' acconfig.h
+	echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
+
+	eautoreconf
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	newinitd ${FILESDIR}/lircd lircd
+	newinitd ${FILESDIR}/lircmd lircmd
+	newconfd ${FILESDIR}/lircd.conf lircd
+
+	insinto /etc/modules.d/
+	newins ${FILESDIR}/modulesd.lirc lirc
+
+	newinitd ${FILESDIR}/irexec-initd irexec
+	newconfd ${FILESDIR}/irexec-confd irexec
+
+	if use doc ; then
+		dohtml doc/html/*.html
+		insinto /usr/share/doc/${PF}/images
+		doins doc/images/*
+	fi
+}
+
+pkg_preinst() {
+	linux-mod_pkg_preinst
+	[[ -f ${ROOT}/etc/lircd.conf ]] && cp "${ROOT}"/etc/lircd.conf "${D}"/etc/
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	echo
+	elog "The lirc Linux Infrared Remote Control Package has been"
+	elog "merged, please read the documentation at http://www.lirc.org"
+	echo
+}