reinit the tree, so we can have metadata

9 files changed, 450 insertions, 0 deletions

diff --git a/net-print/mtink/Manifest b/net-print/mtink/Manifest
new file mode 100644
index 000000000000..8e2df77176b0
--- /dev/null
+++ b/net-print/mtink/Manifest
@@ -0,0 +1,11 @@
+AUX mtink-1.0.16-flags.patch 10583 SHA256 24ab593fad7cadaf0579f407803568d470c5e7df4fe7d116197be0d97fce8d81 SHA512 a4a6767139e1bf0d0ab8efaf82a1cb7abfa084505a3ef6ecfe6ef43aa9fa813ebd8e81aeae5be0582ff1fb9938e8c3f72611c2b7a898c9290d6b98508a93201f WHIRLPOOL 9e7c25273380ba0ea60d373090a244d3b8255015fd4c4a5cf069077705757313c7a7336543956216872a2afcfdee66a71d625b247a8f3ef4bac326a8416abea5
+AUX mtink-1.0.16-options.patch 1424 SHA256 e5444b1ba75551b0e3db115b83bc099e7f96517e07695f27ba332d7c4cbd31ee SHA512 11fa05f2cb6e512a18a0d43a838197fa96f22fac74fd7565387351132c0a879fd9f90076fb88cc876d3ac81920b14dd9e6ab80c1325a89e8fa631cd6ce1279aa WHIRLPOOL 6324e818c7848225e89203abcf109a1d4362c5a7b699c75902fd366dc8aacaeb218d3ec743996cca62496d9c97fdbc5299c2c3128c096a95adf7f0022698f1ec
+AUX mtink-1.0.16-overflow.patch 421 SHA256 9a164ab79d2a21f0c85b9b6668d6f842366e24b6e7603ab8b28645deedd769af SHA512 801e7fa935b965398f2d2cb9b5384d5868485b09879636fb385c5d84be80a725b51a3fde8c94253749bc35e1dece4f879d1a292b4b557d592a26a3f7fc731159 WHIRLPOOL da4fccd28cced1a8091f6186e2935fbb30f95bf7048c4a551fd5a583b14328bc6e8a9d9eb6999e2bacc8cfbb215829447348befa18e4ee1eff23bc46a77dd0a6
+AUX mtinkd.confd 383 SHA256 0bd60747dae9fbcd45881823d0e2e2896131bd2df45d5ae2688fc11a93b25783 SHA512 83bdc7aa3947c0f4f2161288fe634d355205a9e097cac6e82c2bc7f55afd6ae8bbee15c1871089ddf1c718b587a0f6929ad4be0590c601b7e3428c0ef79ed331 WHIRLPOOL 1871a1249f2fd03e4161cd32d33f13b63bb6ff65e1ab74a25038727e51c7d7d0ca301a1d38fb185bba309f9af4a85e6e5d3ef0db73001e31fc7fbf29a963660a
+AUX mtinkd.rc 332 SHA256 c28a2eaf9789354de9f6d1440340d5c1e00a8a1d8ba58dc411ae123d995d7895 SHA512 764cf45bf56f2fa50b3b927422e2374e1142ac1b29022b0f44cd462618587fa568200b08f56d802d3754698928a6f65a39d05d3cfde51c32b57db3b85fbca034 WHIRLPOOL 964efc5f1966df5a6a763f92b69f3f2cb4684814b2491926294e43154d9d40426a26a6d2f857ae4ac49447c69ad2cb7d237de38a64957bf9ebd4054e23cf88fe
+DIST mtink-1.0.16.tar.gz 916315 SHA256 187e8d145e818b4b56be203403f5fe28c02f899d30d92c58e82bcef311555ba2 SHA512 e760b09643e55d4dfa6367cad2da3695db1af3e9b2f0ff1ad4a72eedfb0393b797af507b0e02d7f17300824959f4224ec8cbd745cfa1c45c55f7ab0fab34dec4 WHIRLPOOL 606b83c084a3700f9e2dace5d57be3f68d7b7a84982b996f1c7620c88704ac79deaea0e3ae25f64b64a533cc18d3573f8d14ea0153025f8dc8b219442b0cdd09
+EBUILD mtink-1.0.16-r1.ebuild 1574 SHA256 c796c7d5bd644c8086b4d97cdb5d8da738dffbdcc4a033b7b111e9a736322fd8 SHA512 27c234f35f53f76de5e2df8a853626759e391f7171bb170df51368cfc57f7f52cc760c035d2ed72376abff3183e33f880f5870fe1940e5ccdef287abf0c8a3c7 WHIRLPOOL df3f1b644de2d9fb2be24f2e4d37720ae0289334c466d053fd3d99024f0b169969e5e24c5d6a749108dde3c0712fb9f9d7796bf10021d333fb51461bfb46f684
+EBUILD mtink-1.0.16-r2.ebuild 1577 SHA256 80683acac7962d0aaa8322b9a672e0d6cb548f9e2bf708533bd0f90650621cf2 SHA512 8d59a5dab8e30b7554606f52425c2407ee9b95620b22865a9d582c47accbcb8bebeca3194265b997715e8e88555d59c9e9f4e1d202d45dca31c8fc12e7760b39 WHIRLPOOL 70ae111123fa9944f2cdd4a5de333e1607b41c8ff8b4a85fc4713e329e252d16f4748634fddd93acf0a9bab8b39ccb2a13684b9e8bfbbea484ec38d610fa8691
+MISC ChangeLog 2670 SHA256 f46cd54cb6234de12c36515a6db6dabcc6e8bc4bf918a07e6a06fb6d439afb4c SHA512 34cedb1a4863d0952e79aceef190a36f5101976dc6713788f66462d95e4f4bedd0f4692d6d04db04b83aa35cd3c4511a80ab2a0b035fedc62275bade3f1b6877 WHIRLPOOL b5afefd6550c9e928f0dd107703ce646da7762143745ddedf2ac9d029cf58340935b7bb67401ee6f12d3d8cb70e9aadcaa0f5cc5ca8fe663f8abedf0755c3f5b
+MISC ChangeLog-2015 5404 SHA256 76337278085edbaba5f536b0d089c0f0954091ff5c5caf65f0d81c963420d2e3 SHA512 29e938df352c4c1bff4037d22ec8d67bece304aab326a606cc4331443916747bc88311c3132573b77b4f70c40c6efd1fe7acf033b97d7782aa4186b339ee6d44 WHIRLPOOL a6791677b31f4326a1a74ef47b3ceaa3dd4820c8cdd5ca3574260ee50bbc369b36084027bfea5e20a65e6d56af80c705eda533fab6a0ca8d84c2e414c0aae3cc
+MISC metadata.xml 441 SHA256 78da9689e1e4298f8f42b7005d3ddd1e606a84778722c535f1dae53ea3ea33c7 SHA512 5b858166424a26b356924b05ad2a7d97cce8ccd4d76c78d182c5239960148034a4458076eeb728a42fff7c22e02af6d14e9baa822205356628aec09c98dbc926 WHIRLPOOL 9e1d314682039186dfb6a46c05a12fd2c1b7f68243d33db2ce863da9b17c4cee6e1e72a2dc33769b2b3cf19adc76808feafb0b693e1a336caa29c2471af0bde8
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 000000000000..bee6c339e3f8
--- /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-options.patch b/net-print/mtink/files/mtink-1.0.16-options.patch
new file mode 100644
index 000000000000..c173a4c762c1
--- /dev/null
+++ b/net-print/mtink/files/mtink-1.0.16-options.patch
@@ -0,0 +1,39 @@
+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	2011-06-05 21:29:23.000000000 +0200
+@@ -4,7 +4,7 @@
+ setUid=1
+ gimpVersion=
+ 
+-DBG = -s -O
++DBG =
+ 
+ # comment this out for Solaris
+ 
+@@ -235,7 +235,7 @@
+ 
+ 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) -o ttink $(LDFLAGS) $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0
+ 
+ ############# PLUG-IN #######################
+ gimp-mtink: $(SRCDIR)/gimp-mtink.c Makefile
+@@ -257,7 +257,7 @@
+ 
+ mtinkd: $(SVR_OBJ) Makefile
+ 	@echo Link mtinkd
+-	@$(CC) -o mtinkd $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) 
++	@$(CC) -o mtinkd $(LDFLAGS) $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) 
+ 
+ ########### Chooser ##############
+ 
+@@ -269,7 +269,7 @@
+ 
+ $(DETDIR)/askPrinter: $(DETDIR)/askPrinter.c
+ 	@echo Compile and link askPrinter.c
+-	@$(CC) -o $(DETDIR)/askPrinter $(DETDIR)/askPrinter.c -I. -I$(DETDIR)
++	@$(CC) -o $(DETDIR)/askPrinter $(LDFLAGS) $(DETDIR)/askPrinter.c -I. -I$(DETDIR)
+ 
+ ########### utilities ######################
+ 
diff --git a/net-print/mtink/files/mtink-1.0.16-overflow.patch b/net-print/mtink/files/mtink-1.0.16-overflow.patch
new file mode 100644
index 000000000000..d57e2cd0139e
--- /dev/null
+++ b/net-print/mtink/files/mtink-1.0.16-overflow.patch
@@ -0,0 +1,11 @@
+--- 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(<fifo> */
+          if ( (fp = fopen(runFile,"r")) )
+          {
+-            if ( fgets(ibuf, sizeof(buf), fp) )
++            if ( fgets(ibuf, sizeof(ibuf), fp) )
+             {
+                if ( (pid = atoi(ibuf)) )
+                {
diff --git a/net-print/mtink/files/mtinkd.confd b/net-print/mtink/files/mtinkd.confd
new file mode 100644
index 000000000000..2c5993521b4c
--- /dev/null
+++ b/net-print/mtink/files/mtinkd.confd
@@ -0,0 +1,14 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# define the device file, adapt this
+#DEV_FILE=/dev/lp0
+DEV_FILE=/dev/usb/lp0
+
+# Special options, adapt this
+# add name of printer
+NAME=
+
+# use the first line for USB printers, the second for parallel port printers
+SPEC="-name $NAME -usbbase /dev/usb/lp"
+#SPEC="-name $NAME"
diff --git a/net-print/mtink/files/mtinkd.rc b/net-print/mtink/files/mtinkd.rc
new file mode 100644
index 000000000000..d57664700229
--- /dev/null
+++ b/net-print/mtink/files/mtinkd.rc
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use cups
+}
+
+start() {
+	ebegin "Starting mtinkd"
+	/usr/sbin/mtinkd start ${DEV_FILE} ${SPEC}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping mtinkd"
+	/usr/sbin/mtinkd stop ${DEV_FILE} ${SPEC}
+	eend $?
+}
diff --git a/net-print/mtink/metadata.xml b/net-print/mtink/metadata.xml
new file mode 100644
index 000000000000..ed5cd7b65267
--- /dev/null
+++ b/net-print/mtink/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>SebastianLuther@gmx.de</email></maintainer>
+<maintainer type="project">
+<email>printing@gentoo.org</email>
+<name>Gentoo Printing Project</name>
+</maintainer>
+<maintainer type="project">
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-print/mtink/mtink-1.0.16-r1.ebuild b/net-print/mtink/mtink-1.0.16-r1.ebuild
new file mode 100644
index 000000000000..eabf2d90655e
--- /dev/null
+++ b/net-print/mtink/mtink-1.0.16-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils base
+
+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}-options.patch"
+	"${FILESDIR}/${P}-overflow.patch"
+)
+
+src_configure() {
+	if use X ; then
+		./Configure || die
+	else
+		./Configure -x || die
+	fi
+}
+
+src_compile() {
+	local mytargets
+	mytargets="ttink detect/askPrinter mtinkd"
+
+	if use X; then
+		mytargets="${mytargets} mtink mtinkc";
+	fi
+
+	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/<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.16-r2.ebuild b/net-print/mtink/mtink-1.0.16-r2.ebuild
new file mode 100644
index 000000000000..7869cce7fcc6
--- /dev/null
+++ b/net-print/mtink/mtink-1.0.16-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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() {
+	if use X ; then
+		./Configure || die
+	else
+		./Configure -x || die
+	fi
+}
+
+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/<device>"
+	elog "or set the suid bit on mtink, mtinkc and ttink in /usr/bin"
+	elog
+}