From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CC3DF139085 for ; Sun, 29 Jan 2017 17:13:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42DF514412; Sun, 29 Jan 2017 17:11:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0FD3214412 for ; Sun, 29 Jan 2017 17:11:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8C46E33BEBE for ; Sun, 29 Jan 2017 17:11:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0096E39FE for ; Sun, 29 Jan 2017 17:11:43 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1485709879.bb882b5eb6924aeebf7c196173018b5f5d2cf418.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/mtink/files/, net-print/mtink/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/mtink/files/mtink-1.0.16-flags.patch net-print/mtink/files/mtink-1.0.16-overflow.patch net-print/mtink/mtink-1.0.16-r2.ebuild X-VCS-Directories: net-print/mtink/ net-print/mtink/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: bb882b5eb6924aeebf7c196173018b5f5d2cf418 X-VCS-Branch: master Date: Sun, 29 Jan 2017 17:11:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 506f3a36-a631-4f65-8aa6-16e501cbd180 X-Archives-Hash: be029bde1263ba5e88d63299078c3f35 commit: bb882b5eb6924aeebf7c196173018b5f5d2cf418 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Jan 29 17:11:06 2017 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Sun Jan 29 17:11:19 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb882b5e net-print/mtink: Fix CFLAGS, bug 428814; EAPI bump Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-print/mtink/files/mtink-1.0.16-flags.patch | 183 ++++++++++++++++++++++ net-print/mtink/files/mtink-1.0.16-overflow.patch | 4 +- net-print/mtink/mtink-1.0.16-r2.ebuild | 77 +++++++++ 3 files changed, 262 insertions(+), 2 deletions(-) diff --git a/net-print/mtink/files/mtink-1.0.16-flags.patch b/net-print/mtink/files/mtink-1.0.16-flags.patch new file mode 100644 index 00000000..bee6c33 --- /dev/null +++ b/net-print/mtink/files/mtink-1.0.16-flags.patch @@ -0,0 +1,183 @@ +diff -ruN mtink-1.0.16.orig/Makefile.ORG mtink-1.0.16/Makefile.ORG +--- mtink-1.0.16.orig/Makefile.ORG 2007-08-28 12:52:30.000000000 +0200 ++++ mtink-1.0.16/Makefile.ORG 2017-01-29 18:09:40.550182789 +0100 +@@ -4,7 +4,7 @@ + setUid=1 + gimpVersion= + +-DBG = -s -O ++DBG = + + # comment this out for Solaris + +@@ -147,79 +147,79 @@ + ############## COMMON AND frintends ################## + $(SRCDIR)/d4lib.o: $(SRCDIR)/d4lib.c $(SRCDIR)/d4lib.h Makefile + @echo Compile d4lib.c +- @$(CC) -c -o $(SRCDIR)/d4lib.o $(SRCDIR)/d4lib.c $(RDTIMEOUT) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSCFLG) ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/d4lib.o $(SRCDIR)/d4lib.c $(RDTIMEOUT) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSCFLG) + + $(SRCDIR)/access.o: $(SRCDIR)/access.c Makefile + @echo Compile access.c +- @$(CC) -c -o $(SRCDIR)/access.o $(SRCDIR)/access.c $(DEBUG) $(MACOSCFLG) ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/access.o $(SRCDIR)/access.c $(DEBUG) $(MACOSCFLG) + + $(SRCDIR)/rw.o: $(SRCDIR)/rw.c Makefile + @echo Compile rw.c +- @$(CC) -c -o $(SRCDIR)/rw.o $(SRCDIR)/rw.c $(DEBUG) $(MACOSCFLG) ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/rw.o $(SRCDIR)/rw.c $(DEBUG) $(MACOSCFLG) + + $(SRCDIR)/rcfile.o: $(SRCDIR)/rcfile.c $(SRCDIR)/rcfile.h $(SRCDIR)/mtink.h Makefile + @echo Compile rcfile.c +- @$(CC) -c -o $(SRCDIR)/rcfile.o $(SRCDIR)/rcfile.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/rcfile.o $(SRCDIR)/rcfile.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 + + $(SRCDIR)/fsb.o: $(SRCDIR)/fsb.c $(SRCDIR)/fsb.h $(SRCDIR)/mtink.h $(SRCDIR)/wheelmouse.h Makefile + @echo Compile fsb.c +- @$(CC) -c -o $(SRCDIR)/fsb.o $(SRCDIR)/fsb.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/fsb.o $(SRCDIR)/fsb.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 + + $(SRCDIR)/scrtxt.o: $(SRCDIR)/scrtxt.c $(SRCDIR)/scrtxt.h $(SRCDIR)/mtink.h $(SRCDIR)/wheelmouse.h Makefile + @echo Compile scrtxt.c +- @$(CC) -c -o $(SRCDIR)/scrtxt.o $(SRCDIR)/scrtxt.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/scrtxt.o $(SRCDIR)/scrtxt.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 + + $(SRCDIR)/cfg1.o: $(SRCDIR)/cfg1.c $(SRCDIR)/cfg1.h $(SRCDIR)/mtink.h $(SRCDIR)/cmd.h $(SRCDIR)/wheelmouse.h $(SRCDIR)/model.h Makefile + @echo Compile cfg1.c +- @$(CC) -c -o $(SRCDIR)/cfg1.o $(SRCDIR)/cfg1.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/cfg1.o $(SRCDIR)/cfg1.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 + + $(SRCDIR)/micon.o: $(SRCDIR)/micon.c $(SRCDIR)/micon.h Makefile + @echo Compile micon.c +- @$(CC) -c -o $(SRCDIR)/micon.o $(SRCDIR)/micon.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/micon.o $(SRCDIR)/micon.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 + + $(SRCDIR)/rdPrtDesc.o: $(SRCDIR)/rdPrtDesc.c $(SRCDIR)/model.c $(SRCDIR)/rdPrtDesc.h $(SRCDIR)/model.h Makefile + @echo Compile rdPrtDesc.c +- @$(CC) -c -o $(SRCDIR)/rdPrtDesc.o $(SRCDIR)/rdPrtDesc.c $(CFLAGS) $(MTINK_CFLAGS) -DBLD_UTIL=0 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/rdPrtDesc.o $(SRCDIR)/rdPrtDesc.c $(CFLAGS) $(MTINK_CFLAGS) -DBLD_UTIL=0 + + $(SRCDIR)/cfg2.o: $(SRCDIR)/cfg2.c $(SRCDIR)/cfg2.h $(SRCDIR)/mtink.h $(SRCDIR)/cfg1.h $(SRCDIR)/cmd.h Makefile + @echo Compile cfg2.c +- @$(CC) -c -o $(SRCDIR)/cfg2.o $(SRCDIR)/cfg2.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/cfg2.o $(SRCDIR)/cfg2.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 + + $(SRCDIR)/alignbt.o: $(SRCDIR)/alignbt.c $(SRCDIR)/alignbt.h $(SRCDIR)/mtink.h $(SRCDIR)/cfg1.h $(SRCDIR)/cmd.h Makefile + @echo Compile alignbt.c +- @$(CC) -c -o $(SRCDIR)/alignbt.o $(SRCDIR)/alignbt.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/alignbt.o $(SRCDIR)/alignbt.c $(CFLAGS) $(MTINK_CFLAGS) -DWITH_X=1 + + $(SRCDIR)/checkenv.o: $(SRCDIR)/checkenv.c $(SRCDIR)/checkenv.h $(SRCDIR)/mtink.h $(SRCDIR)/cfg1.h $(SRCDIR)/cmd.h Makefile + @echo Compile checkenv.c +- @$(CC) -c -o $(SRCDIR)/checkenv.o $(SRCDIR)/checkenv.c $(CFLAGS) $(MTINK_CFLAGS) ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/checkenv.o $(SRCDIR)/checkenv.c $(CFLAGS) $(MTINK_CFLAGS) + + $(SRCDIR)/cmd.o: $(SRCDIR)/cmd.c $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/model.h $(SRCDIR)/al820.c $(SRCDIR)/align.c $(SRCDIR)/alC82.c $(SRCDIR)/bldpcode.c Makefile + @echo Compile cmd.c +- @$(CC) -c -o $(SRCDIR)/cmd.o $(SRCDIR)/cmd.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) $(RDTIMEOUT) $(WRTIMEOUT) -DWITH_X=1 -DSERVER=0 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/cmd.o $(SRCDIR)/cmd.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) $(RDTIMEOUT) $(WRTIMEOUT) -DWITH_X=1 -DSERVER=0 + + $(SRCDIR)/nXcmd.o: $(SRCDIR)/cmd.c $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/model.h Makefile $(SRCDIR)/al820.c $(SRCDIR)/align.c $(SRCDIR)/alC82.c $(SRCDIR)/bldpcode.c + @echo Compile cmd.c as nXcmd.o +- @$(CC) -c -o $(SRCDIR)/nXcmd.o $(SRCDIR)/cmd.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) $(RDTIMEOUT) $(WRTIMEOUT) -DWITH_X=0 -DSERVER=0 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/nXcmd.o $(SRCDIR)/cmd.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) $(RDTIMEOUT) $(WRTIMEOUT) -DWITH_X=0 -DSERVER=0 + + $(SRCDIR)/resource.o: $(SRCDIR)/resource.c $(SRCDIR)/version.h Makefile + @echo Compile resource.c +- @$(CC) -c -o $(SRCDIR)/resource.o $(SRCDIR)/resource.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) -DWITH_X=1 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/resource.o $(SRCDIR)/resource.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) -DWITH_X=1 + + $(SRCDIR)/mtink.o: $(SRCDIR)/mtink.c $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/cfg1.h $(SRCDIR)/model.h $(SRCDIR)/checkenv.h Makefile + @echo Compile mtink.c +- @$(CC) -c -o $(SRCDIR)/mtink.o $(SRCDIR)/mtink.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) -DWITH_X=1 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/mtink.o $(SRCDIR)/mtink.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) -DWITH_X=1 + + $(SRCDIR)/ttink.o: $(SRCDIR)/ttink.c $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/model.h Makefile + @echo Compile ttink.c +- @$(CC) -c -o $(SRCDIR)/ttink.o $(SRCDIR)/ttink.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) -DWITH_X=0 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/ttink.o $(SRCDIR)/ttink.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) -DWITH_X=0 + + $(SRCDIR)/tooltip.o: $(SRCDIR)/tooltip.c $(SRCDIR)/tooltip.h Makefile + @echo Compile tooltip.c +- @$(CC) -c -o $(SRCDIR)/tooltip.o $(SRCDIR)/tooltip.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) -DWITH_X=1 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/tooltip.o $(SRCDIR)/tooltip.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) -DWITH_X=1 + + $(SRCDIR)/wheelmouse.o: $(SRCDIR)/wheelmouse.c Makefile + @echo Compile wheelmouse.c +- @$(CC) -c -o $(SRCDIR)/wheelmouse.o $(SRCDIR)/wheelmouse.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) -DWITH_X=1 ++ @$(CC) $(CFLAGS) -c -o $(SRCDIR)/wheelmouse.o $(SRCDIR)/wheelmouse.c $(CFLAGS) $(MTINK_CFLAGS) $(DEBUG) -DWITH_X=1 + + $(SRCDIR)/rdRes.o: $(SRCDIR)/rdRes.c $(SRCDIR)/tres.c Makefile + @echo Compile rdRes.c +@@ -231,59 +231,59 @@ + + mtink: $(OBJ) $(SRCDIR)/d4lib.h $(SRCDIR)/alignbt.h $(SRCDIR)/scrtxt.h $(SRCDIR)/cfg1.h $(SRCDIR)/cfg2.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/cfg1.h $(SRCDIR)/version.h + @echo Link mtink +- @$(CC) -o mtink $(OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(LDFLAGS) $(LFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) -DWITH_X=1 ++ @$(CC) $(LDFLAGS) -o mtink $(OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(LDFLAGS) $(LFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) -DWITH_X=1 + + ttink: $(TTYOBJ) $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/model.h $(SRCDIR)/version.h Makefile + @echo Link ttink +- @$(CC) -o ttink $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0 ++ @$(CC) $(LDFLAGS) -o ttink $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0 + + ############# PLUG-IN ####################### + gimp-mtink: $(SRCDIR)/gimp-mtink.c Makefile + @echo Compile and link gimp-mtink.c +- @-$(CC) -o gimp-mtink $(SRCDIR)/gimp-mtink.c $(GIMP_INC) $(GIMP_LIB) ++ @-$(CC) $(LDFLAGS) -o gimp-mtink $(SRCDIR)/gimp-mtink.c $(GIMP_INC) $(GIMP_LIB) + + ############# SERVER ######################## + $(SVRDIR)/mtinkd.o: $(SVRDIR)/mtinkd.c Makefile + @echo Compile mtinkd.c +- @$(CC) -c -o $(SVRDIR)/mtinkd.o $(SVRDIR)/mtinkd.c -DSERVER=1 $(CFLAGS) $(MTINK_CFLAGS) ++ @$(CC) $(CFLAGS) -c -o $(SVRDIR)/mtinkd.o $(SVRDIR)/mtinkd.c -DSERVER=1 $(CFLAGS) $(MTINK_CFLAGS) + + $(SVRDIR)/d4lib.o: $(SRCDIR)/d4lib.c Makefile + @echo Compile d4lib.c +- @$(CC) -c -o $(SVRDIR)/d4lib.o $(SRCDIR)/d4lib.c $(RDTIMEOUT) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(CFLAGS) $(MTINK_CFLAGS) ++ @$(CC) $(CFLAGS) -c -o $(SVRDIR)/d4lib.o $(SRCDIR)/d4lib.c $(RDTIMEOUT) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(CFLAGS) $(MTINK_CFLAGS) + + $(SVRDIR)/cmd.o: $(SRCDIR)/cmd.c Makefile + @echo Compile cmd.c +- @$(CC) -c -o $(SVRDIR)/cmd.o $(SRCDIR)/cmd.c -DSERVER=1 $(CFLAGS) $(MTINK_CFLAGS) ++ @$(CC) $(CFLAGS) -c -o $(SVRDIR)/cmd.o $(SRCDIR)/cmd.c -DSERVER=1 $(CFLAGS) $(MTINK_CFLAGS) + + mtinkd: $(SVR_OBJ) Makefile + @echo Link mtinkd +- @$(CC) -o mtinkd $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) ++ @$(CC) $(LDFLAGS) -o mtinkd $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) + + ########### Chooser ############## + + mtinkc: $(CHODIR)/mtinkc.c Makefile + @echo Compile and link mtinkc.c +- @$(CC) -o mtinkc $(CHODIR)/mtinkc.c $(CFLAGS) $(MTINK_CFLAGS) $(LDFLAGS) $(LFLAGS) ++ @$(CC) $(LDFLAGS) -o mtinkc $(CHODIR)/mtinkc.c $(CFLAGS) $(MTINK_CFLAGS) $(LDFLAGS) $(LFLAGS) + + ########### printer detection ############## + + $(DETDIR)/askPrinter: $(DETDIR)/askPrinter.c + @echo Compile and link askPrinter.c +- @$(CC) -o $(DETDIR)/askPrinter $(DETDIR)/askPrinter.c -I. -I$(DETDIR) ++ @$(CC) $(CFLAGS) $(LDFLAGS) -o $(DETDIR)/askPrinter $(DETDIR)/askPrinter.c -I. -I$(DETDIR) + + ########### utilities ###################### + + $(UTILS)/bldRes: $(UTILS)/bldRes.c + @echo Compile bldRes.c +- @$(CC) -o $(UTILS)/bldRes $(UTILS)/bldRes.c ++ @$(CC) $(LDFLAGS) -o $(UTILS)/bldRes $(UTILS)/bldRes.c + + $(UTILS)/rdPrtDesc: $(SRCDIR)/rdPrtDesc.c + @echo Compile rdPrtDesc.c +- @$(CC) -o $(UTILS)/rdPrtDesc $(SRCDIR)/rdPrtDesc.c -I$(SRCDIR) ++ @$(CC) $(LDFLAGS) -o $(UTILS)/rdPrtDesc $(SRCDIR)/rdPrtDesc.c -I$(SRCDIR) + + $(UTILS)/chckRes: $(SRCDIR)/rdRes.c + @echo Compile chckRes +- @$(CC) -o $(UTILS)/chckRes $(SRCDIR)/rdRes.c -I$(SRCDIR) -DRESCHECK=1 ++ @$(CC) $(LDFLAGS) -o $(UTILS)/chckRes $(SRCDIR)/rdRes.c -I$(SRCDIR) -DRESCHECK=1 + + install: install-mtink install-ttink install-desc install-plugins install-askPrinter install-mtinkd install-start install-cups install-pyink + diff --git a/net-print/mtink/files/mtink-1.0.16-overflow.patch b/net-print/mtink/files/mtink-1.0.16-overflow.patch index 181ab0d..d57e2cd 100644 --- a/net-print/mtink/files/mtink-1.0.16-overflow.patch +++ b/net-print/mtink/files/mtink-1.0.16-overflow.patch @@ -1,5 +1,5 @@ ---- server/mtinkd.c.orig 2012-01-15 13:03:41.000000000 +0000 -+++ server/mtinkd.c 2012-01-15 13:03:58.000000000 +0000 +--- a/server/mtinkd.c 2012-01-15 13:03:41.000000000 +0000 ++++ b/server/mtinkd.c 2012-01-15 13:03:58.000000000 +0000 @@ -244,7 +244,7 @@ /* look for pid into /var/run/mtink( */ if ( (fp = fopen(runFile,"r")) ) diff --git a/net-print/mtink/mtink-1.0.16-r2.ebuild b/net-print/mtink/mtink-1.0.16-r2.ebuild new file mode 100644 index 00000000..8261d64 --- /dev/null +++ b/net-print/mtink/mtink-1.0.16-r2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +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 ~sparc ~x86" +IUSE="cups doc X" + +DEPEND="X? ( x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXt + >=x11-libs/motif-2.3:0 ) + cups? ( net-print/cups ) + virtual/libusb:0" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-overflow.patch" + "${FILESDIR}/${P}-flags.patch" +) + +src_configure() { + ./Configure || die +} + +src_compile() { + local mytargets + mytargets="ttink detect/askPrinter mtinkd" + + if use X; then + mytargets="${mytargets} mtink mtinkc"; + fi + + export CFLAGS LDFLAGS + emake ${mytargets} +} + +src_install() { + dobin ttink detect/askPrinter + + if use X; then + dobin mtinkc mtink + fi + + dosbin mtinkd + + newinitd "${FILESDIR}"/mtinkd.rc mtinkd + newconfd "${FILESDIR}"/mtinkd.confd mtinkd + + if use cups; then + exeinto /usr/lib/cups/backend + doexe etc/mtink-cups + fi + + dodoc README CHANGE.LOG + use doc && \ + dohtml html/*.gif html/*.html +} + +pkg_postinst() { + # see #70310 + chmod 700 /var/mtink /var/run/mtink 2>/dev/null + + 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 +}