Stop using virtual/x11. Start using newinitd and newinitd as per bug 174266.

(Portage version: 2.1.2.4)

4 files changed, 22 insertions, 98 deletions

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 <drac@gentoo.org> -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 <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
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/<device>"
-	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/<device>"
+	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/<device>"
-	einfo "or set the suid bit on mtink, mtinkc and ttink in /usr/bin"
-	einfo
-}