From f14425fdab277331afc5be83cfe6d616db4c6356 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 22 Apr 2007 10:05:34 +0000 Subject: [PATCH] Stop using virtual/x11. Start using newinitd and newinitd as per bug 174266. Package-Manager: portage-2.1.2.4 --- net-print/mtink/ChangeLog | 6 +- net-print/mtink/Manifest | 24 +++----- net-print/mtink/files/digest-mtink-1.0.9 | 3 - net-print/mtink/mtink-1.0.11.ebuild | 40 ++++++------- net-print/mtink/mtink-1.0.9.ebuild | 71 ------------------------ 5 files changed, 30 insertions(+), 114 deletions(-) delete mode 100644 net-print/mtink/files/digest-mtink-1.0.9 delete mode 100644 net-print/mtink/mtink-1.0.9.ebuild diff --git a/net-print/mtink/ChangeLog b/net-print/mtink/ChangeLog index 7d42cfc51727..5b24a92eb383 100644 --- a/net-print/mtink/ChangeLog +++ b/net-print/mtink/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/mtink # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/ChangeLog,v 1.28 2007/02/22 03:04:54 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/ChangeLog,v 1.29 2007/04/22 10:05:34 drac Exp $ + + 22 Apr 2007; Samuli Suominen -mtink-1.0.9.ebuild, + mtink-1.0.11.ebuild: + Stop using virtual/x11. Start using newinitd and newinitd as per bug 174266. 22 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. diff --git a/net-print/mtink/Manifest b/net-print/mtink/Manifest index 6a3478ea4c0b..fb15bb8d5cbd 100644 --- a/net-print/mtink/Manifest +++ b/net-print/mtink/Manifest @@ -7,19 +7,14 @@ MD5 3d70b9a7f2797c53b2514593ca34d634 files/mtinkd.rc 439 RMD160 1f7337e129d61406de2a18b758325d9a3e717afa files/mtinkd.rc 439 SHA256 d7cf5e343d3a1fef40d650854d969510d236c9b0117c378fabc8efa647c74fbf files/mtinkd.rc 439 DIST mtink-1.0.11.tar.gz 905081 RMD160 15afc62fe20663093af165c48e338a9172b5ae73 SHA1 83cee0cc93a5e3949478901bd2dc18ee190f8719 SHA256 e3c9e0fff5ea805a1d66e516082fdaf97d3c4f01cdaeeebee0151587da36962f -DIST mtink-1.0.9.tar.gz 902275 RMD160 17efd76412cbde65de7bed53e5da5bf4bf78e436 SHA1 ca7c57c22f65485009c6cfccbeffa0028f6a7911 SHA256 85f992d405eaad923b4cccd381f54542be1edc74970f5c90514fc1c88a25ad4a -EBUILD mtink-1.0.11.ebuild 1674 RMD160 44206dbfc1aabee09c4d127dc4b571a46e4f82d2 SHA1 c632d8f122e63822b7ecb92f260668a63728d934 SHA256 4e8d7bb32911c3e5a8b54141c206f235ebd22ecaa66c647f23212f01f0eebabd -MD5 f0607e6a6ab6ecfebda8b9c8b3f3bd65 mtink-1.0.11.ebuild 1674 -RMD160 44206dbfc1aabee09c4d127dc4b571a46e4f82d2 mtink-1.0.11.ebuild 1674 -SHA256 4e8d7bb32911c3e5a8b54141c206f235ebd22ecaa66c647f23212f01f0eebabd mtink-1.0.11.ebuild 1674 -EBUILD mtink-1.0.9.ebuild 1629 RMD160 4666db85aecbf408132b4e045fe8a6a7d4e6192a SHA1 2de76b848fb6f90bd64738d611317940e99d46cb SHA256 9e4a4eb63f030f7424c63776ad19544ec74a2db206131a4b7dfdabc7eac6cceb -MD5 da8bde8fbf7a56c275f419e98f9c84d4 mtink-1.0.9.ebuild 1629 -RMD160 4666db85aecbf408132b4e045fe8a6a7d4e6192a mtink-1.0.9.ebuild 1629 -SHA256 9e4a4eb63f030f7424c63776ad19544ec74a2db206131a4b7dfdabc7eac6cceb mtink-1.0.9.ebuild 1629 -MISC ChangeLog 3505 RMD160 1324bb6d85e72a5cfde6397a8c6a0baca9e40b7b SHA1 51add133e874293528966bbc5e1a3f8b0cd61b60 SHA256 eb6df47891911b77f555d4f8d3b707ae0652a4de584b31b611c08d86e05db681 -MD5 c6639cdeb193e20903f56f21f05c5915 ChangeLog 3505 -RMD160 1324bb6d85e72a5cfde6397a8c6a0baca9e40b7b ChangeLog 3505 -SHA256 eb6df47891911b77f555d4f8d3b707ae0652a4de584b31b611c08d86e05db681 ChangeLog 3505 +EBUILD mtink-1.0.11.ebuild 1581 RMD160 a4fb70b0c3fccf4d8b785917ad929249befa06de SHA1 c35de309dc73cdfd220ff853dfab503121248b7d SHA256 654fd2d0ae3398f1c60b755c20595e612bcc93df3d6b87e7dea36b9f2c75bd29 +MD5 12e7e052b5d197dad001568294e79b23 mtink-1.0.11.ebuild 1581 +RMD160 a4fb70b0c3fccf4d8b785917ad929249befa06de mtink-1.0.11.ebuild 1581 +SHA256 654fd2d0ae3398f1c60b755c20595e612bcc93df3d6b87e7dea36b9f2c75bd29 mtink-1.0.11.ebuild 1581 +MISC ChangeLog 3677 RMD160 89d43ef7a793b0327159ff39dfa855c6df55a9c3 SHA1 e3074ba3279e34cccf0d222a521660c1a7cac0b6 SHA256 a0d2660882468aa8e619528271b0338c902c78dfe8f9ab5b52d52e6b5cb52768 +MD5 a4180b2886c8c72f2d6125cfeeaf3288 ChangeLog 3677 +RMD160 89d43ef7a793b0327159ff39dfa855c6df55a9c3 ChangeLog 3677 +SHA256 a0d2660882468aa8e619528271b0338c902c78dfe8f9ab5b52d52e6b5cb52768 ChangeLog 3677 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 @@ -27,6 +22,3 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata MD5 b5c47f2c68a40e2c038d1d5af436d8ce files/digest-mtink-1.0.11 238 RMD160 f751dae568f2a8dedb85c444b199458ddba246c3 files/digest-mtink-1.0.11 238 SHA256 d82726bda686317e28dacf854a667c41a9e55be1a76ecf29c980ab2ed69d8d6d files/digest-mtink-1.0.11 238 -MD5 1cd2e73594b086f6d825397bfe2fd350 files/digest-mtink-1.0.9 235 -RMD160 01a44ecd813f207ba362d1958c991c8ad9b7fb97 files/digest-mtink-1.0.9 235 -SHA256 afa1c8ce1157be317aeeaa3d86628294ab40c70d60b04ee5fc2d847288607e80 files/digest-mtink-1.0.9 235 diff --git a/net-print/mtink/files/digest-mtink-1.0.9 b/net-print/mtink/files/digest-mtink-1.0.9 deleted file mode 100644 index c04bfa3ac80a..000000000000 --- a/net-print/mtink/files/digest-mtink-1.0.9 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5fbb077e3fd3a41e6767d2c8f2dc92c3 mtink-1.0.9.tar.gz 902275 -RMD160 17efd76412cbde65de7bed53e5da5bf4bf78e436 mtink-1.0.9.tar.gz 902275 -SHA256 85f992d405eaad923b4cccd381f54542be1edc74970f5c90514fc1c88a25ad4a mtink-1.0.9.tar.gz 902275 diff --git a/net-print/mtink/mtink-1.0.11.ebuild b/net-print/mtink/mtink-1.0.11.ebuild index da055e4b1505..2ceb9f01e593 100644 --- a/net-print/mtink/mtink-1.0.11.ebuild +++ b/net-print/mtink/mtink-1.0.11.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-print/mtink/mtink-1.0.11.ebuild,v 1.6 2006/12/06 03:54:26 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/mtink-1.0.11.ebuild,v 1.7 2007/04/22 10:05:34 drac Exp $ inherit eutils @@ -12,15 +12,10 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc x86" IUSE="cups doc X" -DEPEND="X? ( - || ( - ( x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXt ) - virtual/x11 - ) - virtual/motif - ) +DEPEND="X? ( x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXt + virtual/motif ) cups? ( net-print/cups ) dev-libs/libusb" @@ -42,12 +37,11 @@ src_install() { else doexe ttink detect/askPrinter fi - exeinto /usr/sbin - doexe mtinkd - exeinto /etc/init.d - newexe ${FILESDIR}/mtinkd.rc mtinkd - insinto /etc/conf.d - newins ${FILESDIR}/mtinkd.confd mtinkd + + dosbin mtinkd + + newinitd "${FILESDIR}"/mtinkd.rc mtinkd + newconfd "${FILESDIR}"/mtinkd.confd mtinkd use cups && \ exeinto /usr/lib/cups/backend; \ @@ -63,10 +57,10 @@ pkg_postinst() { # see #70310 chmod 700 /var/mtink /var/run/mtink 2>/dev/null - einfo - einfo "mtink needs correct permissions to access printer device." - einfo "To do this you either need to run the following chmod command:" - einfo "chmod 666 /dev/" - einfo "or set the suid bit on mtink, mtinkc and ttink in /usr/bin" - einfo + elog + elog "mtink needs correct permissions to access printer device." + elog "To do this you either need to run the following chmod command:" + elog "chmod 666 /dev/" + elog "or set the suid bit on mtink, mtinkc and ttink in /usr/bin" + elog } diff --git a/net-print/mtink/mtink-1.0.9.ebuild b/net-print/mtink/mtink-1.0.9.ebuild deleted file mode 100644 index cfdcaa4787e4..000000000000 --- a/net-print/mtink/mtink-1.0.9.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/mtink-1.0.9.ebuild,v 1.6 2006/02/07 21:59:47 genstef Exp $ - -inherit eutils - -DESCRIPTION="mtink is a status monitor and inkjet cartridge changer for some Epson printers" -HOMEPAGE="http://xwtools.automatix.de/" -SRC_URI="http://xwtools.automatix.de/files/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="cups doc X" - -DEPEND="X? ( - || ( - ( x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXt ) - virtual/x11 - ) - virtual/motif - ) - cups? ( net-print/cups ) - dev-libs/libusb" - -src_compile() { - local mytargets - mytargets="ttink detect/askPrinter mtinkd" - if use X; - then - mytargets="${mytargets} mtink mtinkc"; - fi - make ${mytargets} || die "Compile problem" -} - -src_install() { - exeinto /usr/bin - if use X; then - doexe mtinkc mtink ttink detect/askPrinter - else - doexe ttink detect/askPrinter - fi - exeinto /usr/sbin - doexe mtinkd - exeinto /etc/init.d - newexe ${FILESDIR}/mtinkd.rc mtinkd - insinto /etc/conf.d - newins ${FILESDIR}/mtinkd.confd mtinkd - - use cups && \ - exeinto /usr/lib/cups/backend; \ - doexe etc/mtink-cups - - dodoc README CHANGE.LOG LICENCE - use doc && { - dohtml html/*.gif html/*.html - } -} - -pkg_postinst() { - # see #70310 - chmod 700 /var/mtink /var/run/mtink 2>/dev/null - - einfo - einfo "mtink needs correct permissions to access printer device." - einfo "To do this you either need to run the following chmod command:" - einfo "chmod 666 /dev/" - einfo "or set the suid bit on mtink, mtinkc and ttink in /usr/bin" - einfo -} -- 2.26.2