From: Alin Năstac Date: Sat, 10 Mar 2007 14:29:31 +0000 (+0000) Subject: Remove obsolete version. Remove references to $ROOT from src_install (#168039). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06470e4a9ca09cc70c238724cd5d19ee01887196;p=gentoo.git Remove obsolete version. Remove references to $ROOT from src_install (#168039). Package-Manager: portage-2.1.2.2 --- diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog index 75af359d2554..0041436cd5ef 100644 --- a/net-dialup/slmodem/ChangeLog +++ b/net-dialup/slmodem/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-dialup/slmodem -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.78 2006/12/20 18:33:11 mrness Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.79 2007/03/10 14:29:31 mrness Exp $ + + 10 Mar 2007; Alin Năstac + -files/slmodem-2.9.11-kernel-2.6.18.patch, + -slmodem-2.9.11_pre20051101-r3.ebuild, + slmodem-2.9.11_pre20061021-r1.ebuild: + Remove obsolete version. Remove references to $ROOT from src_install (#168039). 20 Dec 2006; Alin Năstac files/slmodem-2.9.11-kernel-2.6.19.patch: diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest index 847bbcc03879..ca3133871d0d 100644 --- a/net-dialup/slmodem/Manifest +++ b/net-dialup/slmodem/Manifest @@ -1,10 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX slmodem-2.9.11-kernel-2.6.18.patch 1724 RMD160 b9510f6bc823dc3e56cabe32458136b0c204824f SHA1 09f57b9830d59b23936b16c6720b83a7e31c3694 SHA256 8d3540177b25624c19ab66526e5666cef570226c6426422d815fe3040416d148 -MD5 6f4ceab8b6496bed4d7ded34fca88f0b files/slmodem-2.9.11-kernel-2.6.18.patch 1724 -RMD160 b9510f6bc823dc3e56cabe32458136b0c204824f files/slmodem-2.9.11-kernel-2.6.18.patch 1724 -SHA256 8d3540177b25624c19ab66526e5666cef570226c6426422d815fe3040416d148 files/slmodem-2.9.11-kernel-2.6.18.patch 1724 AUX slmodem-2.9.11-kernel-2.6.19.patch 1232 RMD160 44b02574314ec5da34f1a6d5aa064246d33520cc SHA1 cc050ae29f4282dd6f1984184c20f11de6b5f63e SHA256 4deec71a6381a3983493e4d3d8b1b955a8e230545765e49d7c6d203ac3e12aee MD5 8e8c7d5d64825f7b452818a4d072649c files/slmodem-2.9.11-kernel-2.6.19.patch 1232 RMD160 44b02574314ec5da34f1a6d5aa064246d33520cc files/slmodem-2.9.11-kernel-2.6.19.patch 1232 @@ -29,35 +25,27 @@ AUX slusb.hotplug 262 RMD160 6ccb14b19191da17b0352525399ec8560eb89c04 SHA1 79d92 MD5 a5c2c40e3a6c4665033c97bb9088f03d files/slusb.hotplug 262 RMD160 6ccb14b19191da17b0352525399ec8560eb89c04 files/slusb.hotplug 262 SHA256 1806e732086915be8ca3c43d0abaf73bdde945eb1e11bd24a12c7309be4cdfed files/slusb.hotplug 262 -DIST slmodem-2.9.11-20051101.tar.gz 833644 RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 SHA1 bacd94800a83c86cc872c6afa75dfb3c90828815 SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172 DIST slmodem-2.9.11-20061021.tar.gz 839050 RMD160 7f307d5267e2c9ecb165b34ccb0432032122eb6d SHA1 f8fc8a88399a2332cdeb2f319b58aa1d058a1487 SHA256 7516ee6fbf897a1fad5689f4cb6ec03b1b459fc53e72cebd1f641d1a25916c98 DIST ungrab-winmodem.tar.gz 1872 RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf SHA1 d8c48969fd840b4f7b15f9d6b269470a44e4eed0 SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11 -EBUILD slmodem-2.9.11_pre20051101-r3.ebuild 4647 RMD160 2dfa39e11c3106b4b82f4e4caecd3343a21e8643 SHA1 91f7e55b5d0f1b981b2b350aa32c1d45e872f268 SHA256 229aeb81b1537c69bafe5a4fc7034badb976b36f08409b77095347d2dd513b57 -MD5 1f8422dd189f180c170dce93a715eee7 slmodem-2.9.11_pre20051101-r3.ebuild 4647 -RMD160 2dfa39e11c3106b4b82f4e4caecd3343a21e8643 slmodem-2.9.11_pre20051101-r3.ebuild 4647 -SHA256 229aeb81b1537c69bafe5a4fc7034badb976b36f08409b77095347d2dd513b57 slmodem-2.9.11_pre20051101-r3.ebuild 4647 -EBUILD slmodem-2.9.11_pre20061021-r1.ebuild 4647 RMD160 30f650a28afe303e086caa69f2ffb97ded91da48 SHA1 844f9e967a01bba8d08474231446ac9cedbb753e SHA256 9c1201b3e8508c84ae590bb784d0eacbba380983c1cb325bf62a9418f9be2a2b -MD5 6202704fbb9bbadeb282f69fc368aed2 slmodem-2.9.11_pre20061021-r1.ebuild 4647 -RMD160 30f650a28afe303e086caa69f2ffb97ded91da48 slmodem-2.9.11_pre20061021-r1.ebuild 4647 -SHA256 9c1201b3e8508c84ae590bb784d0eacbba380983c1cb325bf62a9418f9be2a2b slmodem-2.9.11_pre20061021-r1.ebuild 4647 -MISC ChangeLog 17127 RMD160 8d3ed0b1490acd91a404c0ee7a070817ff990c5e SHA1 ac95778858ab1f4327cdebea8f9f3f08197c4c4d SHA256 278cfc6b87dea4035826d0f01d7af3a7f18d901d8b57e8a125148c81945c2a79 -MD5 0f69f2e629c98ec02969d699eacfa5dc ChangeLog 17127 -RMD160 8d3ed0b1490acd91a404c0ee7a070817ff990c5e ChangeLog 17127 -SHA256 278cfc6b87dea4035826d0f01d7af3a7f18d901d8b57e8a125148c81945c2a79 ChangeLog 17127 +EBUILD slmodem-2.9.11_pre20061021-r1.ebuild 4732 RMD160 324f69a92f4295b0ddbc87769ad4c29900bcc022 SHA1 1eb9cdbfdeaa71785516db0bcfa2f0a681a8b574 SHA256 187bdc389b7f1a2a6ee5e7bc58281b3aab6f22d3c8c7773f39bb8b569c1f13f2 +MD5 b163a527b9be6eca830722a33a321702 slmodem-2.9.11_pre20061021-r1.ebuild 4732 +RMD160 324f69a92f4295b0ddbc87769ad4c29900bcc022 slmodem-2.9.11_pre20061021-r1.ebuild 4732 +SHA256 187bdc389b7f1a2a6ee5e7bc58281b3aab6f22d3c8c7773f39bb8b569c1f13f2 slmodem-2.9.11_pre20061021-r1.ebuild 4732 +MISC ChangeLog 17384 RMD160 d041df0a20a84cefcb8482bfa4137786b14918c6 SHA1 87eae4ce911a52efe84170437348be52fd373f46 SHA256 40fc953505325d1e222408f3f175e92598899c810fc0e3528b1883a1ac5cf7d9 +MD5 683f6827ff136e7b85c7735a5e3becda ChangeLog 17384 +RMD160 d041df0a20a84cefcb8482bfa4137786b14918c6 ChangeLog 17384 +SHA256 40fc953505325d1e222408f3f175e92598899c810fc0e3528b1883a1ac5cf7d9 ChangeLog 17384 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163 SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata.xml 163 -MD5 bd3432246edbc20a20719bef640eb9ca files/digest-slmodem-2.9.11_pre20051101-r3 512 -RMD160 13e9984479cbd18a496255c6cc317da7cfd48e47 files/digest-slmodem-2.9.11_pre20051101-r3 512 -SHA256 005100f76c5a3ffccbdfcbcc0b6569ed2ed5661a67124f1b74babd3cf026fbdf files/digest-slmodem-2.9.11_pre20051101-r3 512 MD5 1e86c27a40bdda7df7e235d0495dbc5d files/digest-slmodem-2.9.11_pre20061021-r1 512 RMD160 e1732463bba377a01a9845a6705e32ea4816655d files/digest-slmodem-2.9.11_pre20061021-r1 512 SHA256 55e9c497a14ce5058ab1b24c2540bded458b7bcb88bece092aebc0d6f1a301f3 files/digest-slmodem-2.9.11_pre20061021-r1 512 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFiYHy3sf9c6kjmR8RAlsqAJ4j8eMnb5gUATSaNLkFAQJ5+kI3wQCgjWTd -4Y+T1rU7FATs7cqxkZpEXSc= -=hRt7 +iD8DBQFF8sDRJnxX6mF440QRAvE3AJwPRbspE1eHWnqEyfRrZuUBIZG3ewCgz5BV +6ypwY/qcTC4eXtKdyMEkVfs= +=Vu2N -----END PGP SIGNATURE----- diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101-r3 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101-r3 deleted file mode 100644 index 047a97ea184a..000000000000 --- a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101-r3 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 56bb1ddf621b2fe26caf746aed0ac26f slmodem-2.9.11-20051101.tar.gz 833644 -RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 slmodem-2.9.11-20051101.tar.gz 833644 -SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172 slmodem-2.9.11-20051101.tar.gz 833644 -MD5 a23326976632fe7774e110cbc0636f70 ungrab-winmodem.tar.gz 1872 -RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf ungrab-winmodem.tar.gz 1872 -SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11 ungrab-winmodem.tar.gz 1872 diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.18.patch b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.18.patch deleted file mode 100644 index 62a21f332a1b..000000000000 --- a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.18.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Nru slmodem-2.9.11-20051101.orig/drivers/amrmo_init.c slmodem-2.9.11-20051101/drivers/amrmo_init.c ---- slmodem-2.9.11-20051101.orig/drivers/amrmo_init.c 2005-10-10 00:14:13.000000000 +0300 -+++ slmodem-2.9.11-20051101/drivers/amrmo_init.c 2006-09-09 18:13:47.219081000 +0300 -@@ -53,7 +53,13 @@ - #include - #include - #include --#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) -+# include -+#else -+# define devfs_mk_cdev(dev, mode, fmt, i) -+# define devfs_remove(fmt, i) -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) - #define OLD_KERNEL 1 -diff -Nru slmodem-2.9.11-20051101.orig/drivers/kernel-ver.c slmodem-2.9.11-20051101/drivers/kernel-ver.c ---- slmodem-2.9.11-20051101.orig/drivers/kernel-ver.c 2003-09-23 20:38:40.000000000 +0300 -+++ slmodem-2.9.11-20051101/drivers/kernel-ver.c 2006-09-10 12:45:04.643367500 +0300 -@@ -4,6 +4,9 @@ - - #include - #include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) -+# include -+#endif - - int main() - { -diff -Nru slmodem-2.9.11-20051101.orig/drivers/st7554.c slmodem-2.9.11-20051101/drivers/st7554.c ---- slmodem-2.9.11-20051101.orig/drivers/st7554.c 2005-11-01 17:31:45.000000000 +0200 -+++ slmodem-2.9.11-20051101/drivers/st7554.c 2006-09-09 18:14:36.910186500 +0300 -@@ -55,7 +55,13 @@ - #include - #include - #include --#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) -+# include -+#else -+# define devfs_mk_cdev(dev, mode, fmt, i) -+# define devfs_remove(fmt, i) -+#endif - - #include - diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r3.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r3.ebuild deleted file mode 100644 index fa8a7c81731a..000000000000 --- a/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r3.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r3.ebuild,v 1.1 2006/12/01 09:59:27 mrness Exp $ - -inherit eutils linux-mod multilib - -DESCRIPTION="Driver for Smart Link modem" -HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/" -SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/${P/_pre/-}.tar.gz - http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem.tar.gz" - -LICENSE="Smart-Link" -SLOT="0" -KEYWORDS="-* ~amd64 x86" -IUSE="alsa usb" - -DEPEND="alsa? ( media-libs/alsa-lib ) - amd64? ( app-emulation/emul-linux-x86-soundlibs )" - -QA_EXECSTACK="usr/sbin/slmodem_test usr/sbin/slmodemd" - -S=${WORKDIR}/${P/_pre/-} - -pkg_setup() { - use amd64 && multilib_toolchain_setup x86 - - MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem)" - if ! use amd64; then - MODULE_NAMES="${MODULE_NAMES} slamr(net:${S}/drivers)" - if use usb; then - MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)" - CONFIG_CHECK="USB" - fi - fi - BUILD_TARGETS="all" - linux-mod_pkg_setup - BUILD_PARAMS="KERNEL_DIR=${KV_DIR}" -} - -src_unpack() { - unpack ${A} - sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem:" \ - "${WORKDIR}/ungrab-winmodem/Makefile" - convert_to_m "${WORKDIR}/ungrab-winmodem/Makefile" - - cd "${S}" - epatch "${FILESDIR}/${P%%_*}-makefile.patch" - epatch "${FILESDIR}/${P%%_*}-kernel-2.6.18.patch" - cd drivers - sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile - convert_to_m Makefile - sed -i "s:.*=[ \t]*THIS_MODULE.*::" st7554.c amrmo_init.c old_st7554.c - sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' st7554.c \ - amrmo_init.c old_st7554.c -} - -src_compile() { - local MAKE_PARAMS="" - if use alsa || use amd64; then - MAKE_PARAMS="SUPPORT_ALSA=1" - fi - emake ${MAKE_PARAMS} modem || die "failed to build modem" - - use amd64 && multilib_toolchain_setup amd64 - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - cd "${S}" - newsbin modem/modem_test slmodem_test - dosbin modem/slmodemd - dodir /var/lib/slmodem - fowners root:dialout /var/lib/slmodem - keepdir /var/lib/slmodem - - newconfd "${FILESDIR}/slmodem-confd" ${PN} - newinitd "${FILESDIR}/slmodem-initd" ${PN} - - # configure for alsa - or not for alsa - if use alsa; then - sed -i -e "s/# MODULE=alsa/MODULE=alsa/" \ - -e "s/# HW_SLOT=modem:1/HW_SLOT=modem:1/" "${D}/etc/conf.d/slmodem" - else - sed -i "s/# MODULE=slamr/MODULE=slamr/" "${D}/etc/conf.d/slmodem" - fi - - - # Add module aliases and install hotplug script - insinto /etc/modules.d/; newins "${FILESDIR}/slmodem-modules" ${PN} - if use usb; then - exeinto /etc/hotplug/usb; newexe "${FILESDIR}/slusb.hotplug" slusb - fi - - dodir /etc/hotplug/blacklist.d - echo -e "slusb\nslamr\nsnd-intel8x0m" >> "${D}/etc/hotplug/blacklist.d/${PN}" - - # Add configuration for devfs, udev - if [ -e "${ROOT}/dev/.devfsd" ] ; then - insinto /etc/devfs.d/; newins "${FILESDIR}/${PN}-2.9.devfs" ${PN} - elif [ -e "${ROOT}/dev/.udev" ] ; then - dodir /etc/udev/rules.d/ - echo 'KERNEL=="slamr", NAME="slamr0" GROUP="dialout"' > \ - "${D}/etc/udev/rules.d/55-${PN}.rules" - if use usb; then - echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout"' >> \ - "${D}/etc/udev/rules.d/55-${PN}.rules" - fi - fi - - dodoc Changes README "${WORKDIR}/ungrab-winmodem/Readme.txt" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Make some devices if we aren't using devfs or udev - if [ -e "${ROOT}/dev/.devfsd" ]; then - ebegin "Restarting devfsd to reread devfs rules" - killall -HUP devfsd - eend $? - - elif [ -e "${ROOT}/dev/.udev" ]; then - ebegin "Restarting udev to reread udev rules" - udevstart - eend $? - else - cd "${S}/drivers" - make DESTDIR="${ROOT}" install-devices - fi - - if [ ! -e "${ROOT}/dev/ppp" ]; then - mknod "${ROOT}/dev/ppp" c 108 0 - fi - - ewarn "To avoid problems, slusb/slamr have been added to /etc/hotplug/blacklist" - einfo "You must edit /etc/conf.d/${PN} for your configuration" - einfo "To add slmodem to your startup - type : rc-update add slmodem default" - - if use alsa; then - einfo "I hope you have already added alsa to your startup: " - einfo "otherwise type: rc-update add alsasound boot" - einfo - einfo "If you need to use snd-intel8x0m from the kernel" - einfo "compile it as a module and edit /etc/modules.d/alsa" - einfo 'to: "alias snd-card-(number) snd-intel8x0m"' - fi - - einfo "You need to be in the uucp AND dialout group to make calls as a user." - einfo - einfo "If you see the following in dmesg:" - echo slamr: device 10b9:5457 is grabbed by driver serial - einfo "you need to modprobe ungrab-winmodem before slamr" -} diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild index b6a7416d1925..c40c7dfa85c6 100644 --- a/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild +++ b/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild,v 1.2 2006/12/08 11:42:19 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild,v 1.3 2007/03/10 14:29:31 mrness Exp $ inherit eutils linux-mod multilib @@ -99,21 +99,27 @@ src_install() { echo -e "slusb\nslamr\nsnd-intel8x0m" >> "${D}/etc/hotplug/blacklist.d/${PN}" # Add configuration for devfs, udev - if [ -e "${ROOT}/dev/.devfsd" ] ; then - insinto /etc/devfs.d/; newins "${FILESDIR}/${PN}-2.9.devfs" ${PN} - elif [ -e "${ROOT}/dev/.udev" ] ; then - dodir /etc/udev/rules.d/ - echo 'KERNEL=="slamr", NAME="slamr0" GROUP="dialout"' > \ + insinto /etc/devfs.d/; newins "${FILESDIR}/${PN}-2.9.devfs" ${PN} + dodir /etc/udev/rules.d/ + echo 'KERNEL=="slamr", NAME="slamr0" GROUP="dialout"' > \ + "${D}/etc/udev/rules.d/55-${PN}.rules" + if use usb; then + echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout"' >> \ "${D}/etc/udev/rules.d/55-${PN}.rules" - if use usb; then - echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout"' >> \ - "${D}/etc/udev/rules.d/55-${PN}.rules" - fi fi dodoc Changes README "${WORKDIR}/ungrab-winmodem/Readme.txt" } +pkg_preinst() { + linux-mod_pkg_preinst + + # Remove obsolete devfs configuration files if the box use udev + if [ -e "${ROOT}/dev/.udev" ]; then + rm -r "${D}/etc/devfs.d" + fi +} + pkg_postinst() { linux-mod_pkg_postinst