From: Robert Buchholz Date: Mon, 12 Mar 2007 22:11:25 +0000 (+0000) Subject: Fixes by tove from bug #170417 and version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=803c053b7a2320a3c05d8596f9444ec1aa42b97e;p=gentoo.git Fixes by tove from bug #170417 and version bump Package-Manager: portage-2.1.2-r9 --- diff --git a/app-misc/g15daemon/ChangeLog b/app-misc/g15daemon/ChangeLog index 50a05399afef..300803f0c561 100644 --- a/app-misc/g15daemon/ChangeLog +++ b/app-misc/g15daemon/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-misc/g15daemon # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.10 2007/02/18 19:38:16 rbu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.11 2007/03/12 22:11:25 rbu Exp $ + +*g15daemon-1.9.0 (12 Mar 2007) + + 12 Mar 2007; Robert Buchholz + files/g15daemon-1.2.6a.confd, g15daemon-1.2.6a-r1.ebuild, + g15daemon-1.2.7.ebuild, +g15daemon-1.9.0.ebuild: + Fixes by tove from bug #170417 and version bump *g15daemon-1.2.7 (18 Feb 2007) diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest index a634a694cebe..e47cb28739e8 100644 --- a/app-misc/g15daemon/Manifest +++ b/app-misc/g15daemon/Manifest @@ -1,10 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX g15daemon-1.2.6a.confd 235 RMD160 74fafd433d56abbff7b12290803338ce1d1eb10b SHA1 7f61663aa17cd964b7268b45d7feed532a716ff2 SHA256 bf37d4ee5a80589909f1831ad6d7393c6b25818b61e65814ee074880245aa2cc -MD5 f733a28491f028a8747be6da883c4818 files/g15daemon-1.2.6a.confd 235 -RMD160 74fafd433d56abbff7b12290803338ce1d1eb10b files/g15daemon-1.2.6a.confd 235 -SHA256 bf37d4ee5a80589909f1831ad6d7393c6b25818b61e65814ee074880245aa2cc files/g15daemon-1.2.6a.confd 235 +AUX g15daemon-1.2.6a.confd 236 RMD160 8bd008853963292dcb63c3685ba39a8265fb8255 SHA1 3b315e7a12eb7375724f48f943862acc69963e57 SHA256 b5353ac723b8fc3184eaca3db84ced1904e89b43b448ee9713e2b1b9cffd7d01 +MD5 426cdcc0b01a44001170ffc920a6326c files/g15daemon-1.2.6a.confd 236 +RMD160 8bd008853963292dcb63c3685ba39a8265fb8255 files/g15daemon-1.2.6a.confd 236 +SHA256 b5353ac723b8fc3184eaca3db84ced1904e89b43b448ee9713e2b1b9cffd7d01 files/g15daemon-1.2.6a.confd 236 AUX g15daemon-1.2.6a.initd 1002 RMD160 5b30c2a2976fb42ae2d7b57caa89f86dbf52ca3f SHA1 1796fc22d68cd9c99a4ca9c4623403dc33e8762e SHA256 99270b912a1c0de2e707cd304216bf0388b2d7a8f3838a38e5491c9919883380 MD5 dd4224fb4be08287b1f977c89dbdfdf2 files/g15daemon-1.2.6a.initd 1002 RMD160 5b30c2a2976fb42ae2d7b57caa89f86dbf52ca3f files/g15daemon-1.2.6a.initd 1002 @@ -19,18 +19,23 @@ RMD160 33d59ace2b40f969962a47872a4b506bddca0795 files/g15daemon-1.2.7.initd 1077 SHA256 bed4adb30913a12268769d5e6abfe2a2b6e1b583d45f252dbc6aa86492f3ba30 files/g15daemon-1.2.7.initd 1077 DIST g15daemon-1.2.6a.tar.bz2 273767 RMD160 947441a1c89d1f45f02094a59735f488a76ce285 SHA1 473f3e0aee0122597c1e91cf54b18d3d6e28e8e9 SHA256 583c4bece816b712959aba51f49d78bb587e215fbb6a322efe832477c74f2564 DIST g15daemon-1.2.7.tar.bz2 275938 RMD160 e6490c9b3200c89cf88c574459eef7562a500161 SHA1 17ab942a389501c0b7b8a0ffdbf4397882d24daa SHA256 2f8cfa386c88e72dbb07c7112cbd943dbda4f56dd55d08a01c7bf9efd47d164f -EBUILD g15daemon-1.2.6a-r1.ebuild 3469 RMD160 1d3dc372c1fded7b7a02f3c6543e2d21e82636f8 SHA1 394a47dd7eb762925fc83223802c774cc695bf9f SHA256 81af5ab0a2b3c43c3de3aa241c8e9dbead7ba39f4f19c24e5e2265385b5495cf -MD5 2d2c178a959e4bcdd218c88943a8e26a g15daemon-1.2.6a-r1.ebuild 3469 -RMD160 1d3dc372c1fded7b7a02f3c6543e2d21e82636f8 g15daemon-1.2.6a-r1.ebuild 3469 -SHA256 81af5ab0a2b3c43c3de3aa241c8e9dbead7ba39f4f19c24e5e2265385b5495cf g15daemon-1.2.6a-r1.ebuild 3469 -EBUILD g15daemon-1.2.7.ebuild 3373 RMD160 20d20cb95028dcd566266ec1468d0d476020a110 SHA1 608f0c3499f3c45066646614a31e6aa99aa1ac95 SHA256 6dbba9ff2886fb13b4ce49d67ea90e06bc14eb9c4424ac4b2c02df6726837b3d -MD5 a57863625deecc754fb4bdec27ff4c3f g15daemon-1.2.7.ebuild 3373 -RMD160 20d20cb95028dcd566266ec1468d0d476020a110 g15daemon-1.2.7.ebuild 3373 -SHA256 6dbba9ff2886fb13b4ce49d67ea90e06bc14eb9c4424ac4b2c02df6726837b3d g15daemon-1.2.7.ebuild 3373 -MISC ChangeLog 2395 RMD160 c64e0819a0cf0f3e1303bdb8a7fe3d6e90bb73a6 SHA1 dfd3721071323584ae5df1711ecf9e5903840fc3 SHA256 75507e39163a81d146c2097c43a6a77802e0125ad0afa1c7a9a33b70006a8194 -MD5 79beae8c4606d5faa70bab4ace03d27b ChangeLog 2395 -RMD160 c64e0819a0cf0f3e1303bdb8a7fe3d6e90bb73a6 ChangeLog 2395 -SHA256 75507e39163a81d146c2097c43a6a77802e0125ad0afa1c7a9a33b70006a8194 ChangeLog 2395 +DIST g15daemon-1.9.0.tar.bz2 288639 RMD160 8695fadf63e84fb1e55067f32d2736f96665b6ab SHA1 1e74ea6f48732a4666ecb0e8da709da85971d65e SHA256 7a88bdb9464c6954a936efb8d1fc6bf2e7f90ce4e30ba2b982b7fdd1a9eb95e7 +EBUILD g15daemon-1.2.6a-r1.ebuild 3504 RMD160 020c000f26ca70c9734f3b28f91cc03ce7147dfa SHA1 57bce472065fc1ca4c89043ec886caa485640f28 SHA256 6b05ce2fa67f3fdf8c68c3f0ab82f4d2616cee281be766dd0dc260dead604c41 +MD5 03ec996d3f2a630de5ded4a17592ee22 g15daemon-1.2.6a-r1.ebuild 3504 +RMD160 020c000f26ca70c9734f3b28f91cc03ce7147dfa g15daemon-1.2.6a-r1.ebuild 3504 +SHA256 6b05ce2fa67f3fdf8c68c3f0ab82f4d2616cee281be766dd0dc260dead604c41 g15daemon-1.2.6a-r1.ebuild 3504 +EBUILD g15daemon-1.2.7.ebuild 3420 RMD160 234454b2c3ef49a843dc0a4fa8a914ed6d6787c8 SHA1 a24ac25d6595f92a2c053e4eb02310a529ed95d8 SHA256 6bf58a86054b5b6d22f79179acd25f08703ad66814b79f8935a43857d738d4a2 +MD5 11085ffcbbabb7505321bbb90fc78858 g15daemon-1.2.7.ebuild 3420 +RMD160 234454b2c3ef49a843dc0a4fa8a914ed6d6787c8 g15daemon-1.2.7.ebuild 3420 +SHA256 6bf58a86054b5b6d22f79179acd25f08703ad66814b79f8935a43857d738d4a2 g15daemon-1.2.7.ebuild 3420 +EBUILD g15daemon-1.9.0.ebuild 3430 RMD160 b2cffea9116d77d0e6c069e13e6e0c98254ecb90 SHA1 4539d9739d5287688fde8804fc51fd875f1fae5a SHA256 44c0961d4a6bd4a57c18ab6f838f67d772e6db7704653b4fa999a7ed4aa68f80 +MD5 a73b7884cac04db8770bc3d514569f96 g15daemon-1.9.0.ebuild 3430 +RMD160 b2cffea9116d77d0e6c069e13e6e0c98254ecb90 g15daemon-1.9.0.ebuild 3430 +SHA256 44c0961d4a6bd4a57c18ab6f838f67d772e6db7704653b4fa999a7ed4aa68f80 g15daemon-1.9.0.ebuild 3430 +MISC ChangeLog 2637 RMD160 db8c3182c56da46936dfac1046f5fd07465fd0aa SHA1 98bad6f99179cb5e65b12da0d2c2dceddeae7004 SHA256 0a5622810004f7375b78500fd86ba80545894fe79f095d7e8de13e15384ad9c4 +MD5 94b6f0df52a3097309e7abaf5793a253 ChangeLog 2637 +RMD160 db8c3182c56da46936dfac1046f5fd07465fd0aa ChangeLog 2637 +SHA256 0a5622810004f7375b78500fd86ba80545894fe79f095d7e8de13e15384ad9c4 ChangeLog 2637 MISC metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 SHA1 c212d5a20354a60471162a82c403f1a5235d1d9d SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a MD5 be4a34ac317e81ea820c84bc04b9c0d8 metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 metadata.xml 250 @@ -41,10 +46,13 @@ SHA256 57cb072b57547b3c4ac8ee0a30a0126ebe172891c88eb9ce55db453a84319b57 files/di MD5 c8faae8f604dd526fef48e6b92899135 files/digest-g15daemon-1.2.7 250 RMD160 62a7b3c10fd7ebac6ac836540a2e7ad83d5cfa83 files/digest-g15daemon-1.2.7 250 SHA256 c49a95965963f4611f9325524ec1402bade524bb0fc917cbe23c53b8d6ac6d50 files/digest-g15daemon-1.2.7 250 +MD5 f7a7897f552e4aac022d6e03764ba854 files/digest-g15daemon-1.9.0 250 +RMD160 07599fd676bb4dbd106d0f9fec6713edb9c01da4 files/digest-g15daemon-1.9.0 250 +SHA256 64fc705168e3caecd9207033bde17f6b44b242a1827dc1c32dbb7f0ee01c327f files/digest-g15daemon-1.9.0 250 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFF2KsvyZx3L/ph1soRApkjAKDSHwHmaxlqNic+jntGUXT9+iZewQCg1n7J -jbkb+ms/DH5PuoaMETol6Rs= -=gL7W +iD8DBQFF9dAVyZx3L/ph1soRAhiBAKCdLJb3tWnbA6fsDAGp0xI+uVTCDgCfUM4I +ce9XaebTpxmXWjj4QZx7bWE= +=1WoC -----END PGP SIGNATURE----- diff --git a/app-misc/g15daemon/files/digest-g15daemon-1.9.0 b/app-misc/g15daemon/files/digest-g15daemon-1.9.0 new file mode 100644 index 000000000000..0f5a8a3c5fe8 --- /dev/null +++ b/app-misc/g15daemon/files/digest-g15daemon-1.9.0 @@ -0,0 +1,3 @@ +MD5 3212e3e7f5b3f10a38d2cf3366206591 g15daemon-1.9.0.tar.bz2 288639 +RMD160 8695fadf63e84fb1e55067f32d2736f96665b6ab g15daemon-1.9.0.tar.bz2 288639 +SHA256 7a88bdb9464c6954a936efb8d1fc6bf2e7f90ce4e30ba2b982b7fdd1a9eb95e7 g15daemon-1.9.0.tar.bz2 288639 diff --git a/app-misc/g15daemon/files/g15daemon-1.2.6a.confd b/app-misc/g15daemon/files/g15daemon-1.2.6a.confd index c190c17f2b63..2d7cd51ce83b 100644 --- a/app-misc/g15daemon/files/g15daemon-1.2.6a.confd +++ b/app-misc/g15daemon/files/g15daemon-1.2.6a.confd @@ -2,4 +2,4 @@ # Key to switch the client-screens. Default is the MR key, # Set to "yes" to use L1 key instead (black round key below the LCD, above the multimedia keys). -CLIENT_SWITCH_L1="no" \ No newline at end of file +CLIENT_SWITCH_L1="no" diff --git a/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild b/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild index ee5a79932365..c71012685559 100644 --- a/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild +++ b/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild,v 1.3 2007/02/18 19:38:16 rbu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild,v 1.4 2007/03/12 22:11:25 rbu Exp $ inherit eutils linux-info perl-module python multilib DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver" HOMEPAGE="http://g15daemon.sourceforge.net/" -SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.bz2" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -66,25 +66,26 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" \ + docdir=/usr/share/doc/${PF} install || die "make install failed" # remove odd docs installed my make - rm "${D}/usr/share/doc/${P}/"{LICENSE,README.usage} - gzip "${D}/usr/share/doc/${P}/"* + rm "${D}/usr/share/doc/${PF}/"{LICENSE,README.usage} - insinto /usr/share/g15daemon/contrib + insinto /usr/share/${PN}/contrib doins contrib/xmodmaprc doins contrib/xmodmap.sh if use perl; then doins contrib/testbindings.pl fi - newconfd "${FILESDIR}/${P}.confd" g15daemon - newinitd "${FILESDIR}/${P}.initd" g15daemon + newconfd "${FILESDIR}/${P}.confd" ${PN} + newinitd "${FILESDIR}/${P}.initd" ${PN} if use perl; then ebegin "Installing Perl Bindings (G15Daemon.pm)" cd "${WORKDIR}/G15Daemon-0.2" + docinto perl perl-module_src_install fi @@ -95,13 +96,16 @@ src_install() { insinto /usr/$(get_libdir)/python${PYVER}/site-packages/g15daemon doins g15daemon.py - newdoc AUTHORS pyg15daemon_AUTHORS + docinto python + dodoc AUTHORS fi + + prepalldocs } pkg_postinst() { if use python; then - python_mod_optimize "/usr/lib/python*/site-packages/g15daemon" + python_mod_optimize "${ROOT}/usr/$(get_libdir)/python*/site-packages/g15daemon" echo "" fi @@ -124,6 +128,6 @@ pkg_postinst() { pkg_postrm() { if use python; then - python_mod_cleanup "/usr/lib/python*/site-packages/g15daemon" + python_mod_cleanup "/usr/$(get_libdir)/python*/site-packages/g15daemon" fi } diff --git a/app-misc/g15daemon/g15daemon-1.2.7.ebuild b/app-misc/g15daemon/g15daemon-1.2.7.ebuild index a36aaf877c32..db9700089f26 100644 --- a/app-misc/g15daemon/g15daemon-1.2.7.ebuild +++ b/app-misc/g15daemon/g15daemon-1.2.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.7.ebuild,v 1.1 2007/02/18 19:38:16 rbu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.7.ebuild,v 1.2 2007/03/12 22:11:25 rbu Exp $ inherit eutils linux-info perl-module python multilib @@ -66,13 +66,13 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" \ + docdir=/usr/share/doc/${PF} install || die "make install failed" # remove odd docs installed my make - rm "${D}/usr/share/doc/${P}/"{LICENSE,README.usage} - gzip "${D}/usr/share/doc/${P}/"* + rm "${D}/usr/share/doc/${PF}/"{LICENSE,README.usage} - insinto /usr/share/g15daemon/contrib + insinto /usr/share/${PN}/contrib doins contrib/xmodmaprc doins contrib/xmodmap.sh if use perl; then @@ -85,6 +85,7 @@ src_install() { if use perl; then ebegin "Installing Perl Bindings (G15Daemon.pm)" cd "${WORKDIR}/G15Daemon-0.2" + docinto perl perl-module_src_install fi @@ -95,13 +96,16 @@ src_install() { insinto /usr/$(get_libdir)/python${PYVER}/site-packages/g15daemon doins g15daemon.py - newdoc AUTHORS pyg15daemon_AUTHORS + docinto python + dodoc AUTHORS fi + + prepalldocs } pkg_postinst() { if use python; then - python_mod_optimize "/usr/lib/python*/site-packages/g15daemon" + python_mod_optimize "${ROOT}/usr/$(get_libdir)/python*/site-packages/g15daemon" echo "" fi @@ -122,6 +126,6 @@ pkg_postinst() { pkg_postrm() { if use python; then - python_mod_cleanup "/usr/lib/python*/site-packages/g15daemon" + python_mod_cleanup "/usr/$(get_libdir)/python*/site-packages/g15daemon" fi } diff --git a/app-misc/g15daemon/g15daemon-1.9.0.ebuild b/app-misc/g15daemon/g15daemon-1.9.0.ebuild new file mode 100644 index 000000000000..8b34290730e1 --- /dev/null +++ b/app-misc/g15daemon/g15daemon-1.9.0.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.0.ebuild,v 1.1 2007/03/12 22:11:25 rbu Exp $ + +inherit eutils linux-info perl-module python multilib + +DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver" +HOMEPAGE="http://g15daemon.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="perl python" + +DEPEND="dev-libs/libusb + >=dev-libs/libg15-1.2.0 + >=dev-libs/libg15render-1.2 + perl? ( >=dev-perl/Inline-0.4 ) + python? ( dev-lang/python )" + +RDEPEND="${DEPEND} + perl? ( dev-perl/GDGraph )" + +uinput_check() { + ebegin "Checking for uinput support" + linux_chkconfig_present INPUT_UINPUT + eend $? + + if [[ $? -ne 0 ]] ; then + eerror "To use g15daemon, you need to compile your kernel with uinput support." + eerror "Please enable uinput support in your kernel config, found at:" + eerror + eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support." + eerror + eerror "Once enabled, you should have the /dev/input/uinput device." + eerror "g15daemon will not work without the uinput device." + die "INPUT_UINPUT support not detected!" + fi +} + +pkg_setup() { + linux-info_pkg_setup + uinput_check +} + +src_unpack() { + unpack ${A} + if use perl; then + unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz" + fi + if use python; then + unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2" + fi +} + +src_compile() { + econf || die "configure failed" + + emake || die "make failed" + + if use perl; then + cd "${WORKDIR}/G15Daemon-0.2" + perl-module_src_compile + fi +} + +src_install() { + emake DESTDIR="${D}" \ + docdir=/usr/share/doc/${PF} install || die "make install failed" + + # remove odd docs installed my make + rm "${D}/usr/share/doc/${PF}/"{LICENSE,README.usage} + + insinto /usr/share/${PN}/contrib + doins contrib/xmodmaprc + doins contrib/xmodmap.sh + if use perl; then + doins contrib/testbindings.pl + fi + + newconfd "${FILESDIR}/${P}.confd" ${PN} + newinitd "${FILESDIR}/${P}.initd" ${PN} + + if use perl; then + ebegin "Installing Perl Bindings (G15Daemon.pm)" + cd "${WORKDIR}/G15Daemon-0.2" + docinto perl + perl-module_src_install + fi + + if use python; then + ebegin "Installing Python Bindings (g15daemon.py)" + cd "${WORKDIR}/pyg15daemon" + python_version + + insinto /usr/$(get_libdir)/python${PYVER}/site-packages/g15daemon + doins g15daemon.py + + docinto python + dodoc AUTHORS + fi + + prepalldocs +} + +pkg_postinst() { + if use python; then + python_mod_optimize "${ROOT}/usr/$(get_libdir)/python*/site-packages/g15daemon" + echo "" + fi + + elog "To use g15daemon, you need to add g15daemon to the default runlevel." + elog "This can be done with:" + elog "# /sbin/rc-update add g15daemon default" + elog "You can edit some g15daemon options at /etc/conf.d/g15daemon" + elog "" + elog "To have all new keys working in X11, you'll need create a " + elog "specific xmodmap in your home directory or edit the existent one." + elog "" + elog "Create the xmodmap:" + elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap" + elog "" + elog "Adding keycodes to an existing xmodmap:" + elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap" +} + +pkg_postrm() { + if use python; then + python_mod_cleanup "/usr/$(get_libdir)/python*/site-packages/g15daemon" + fi +}