diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-12-04 18:19:26 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-12-04 18:19:26 +0000 |
commit | 343e3ecfbb44edef2d0d86055c3e29d9e1b30f49 (patch) | |
tree | 34f1f7e326febea9afae8afa000ea759ca8064f4 /net-print | |
parent | Remove masked kload (The server could possibly be saved, but the client needs... (diff) | |
download | historical-343e3ecfbb44edef2d0d86055c3e29d9e1b30f49.tar.gz historical-343e3ecfbb44edef2d0d86055c3e29d9e1b30f49.tar.bz2 historical-343e3ecfbb44edef2d0d86055c3e29d9e1b30f49.zip |
Remove masked kink.
Diffstat (limited to 'net-print')
-rw-r--r-- | net-print/kink/ChangeLog | 36 | ||||
-rw-r--r-- | net-print/kink/Manifest | 8 | ||||
-rw-r--r-- | net-print/kink/files/kink-0.2.1-api-update.patch | 29 | ||||
-rw-r--r-- | net-print/kink/files/kink-0.2.1-compilefix.diff | 12 | ||||
-rw-r--r-- | net-print/kink/files/kink-0.2.1-libinklevel-0.6.6.patch | 241 | ||||
-rw-r--r-- | net-print/kink/kink-0.2.1-r1.ebuild | 23 | ||||
-rw-r--r-- | net-print/kink/kink-0.2.1.ebuild | 25 | ||||
-rw-r--r-- | net-print/kink/metadata.xml | 5 |
8 files changed, 0 insertions, 379 deletions
diff --git a/net-print/kink/ChangeLog b/net-print/kink/ChangeLog deleted file mode 100644 index 32821e4b3b7e..000000000000 --- a/net-print/kink/ChangeLog +++ /dev/null @@ -1,36 +0,0 @@ -# ChangeLog for net-print/kink -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/kink/ChangeLog,v 1.8 2008/11/17 22:03:22 flameeyes Exp $ - - 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> - files/kink-0.2.1-compilefix.diff: - Fix patch with absolute paths. - - 22 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org> - +files/kink-0.2.1-api-update.patch, metadata.xml, kink-0.2.1-r1.ebuild: - Added Joerg Plate's patch from bug 176857 to make it compile using - libinklevel's new API. Thanks, Joerg! Minor whitespace fixes. - -*kink-0.2.1-r1 (06 Jan 2007) - - 06 Jan 2007; Marcus D. Hanwell <cryos@gentoo.org> - +files/kink-0.2.1-libinklevel-0.6.6.patch, kink-0.2.1.ebuild, - +kink-0.2.1-r1.ebuild: - Fixed the dependencies in the original ebuild, produced a patch for 0.2.1 to - work with the new libinklevel-0.6.6 API. Fixes bug 147967. - - 05 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> kink-0.2.1.ebuild: - Marked stable on x86 and amd64. - - 27 Jan 2005; Joseph Jezak <josejx@gentoo.org> kink-0.2.1.ebuild: - Marked ~ppc. - - 02 Jan 2005; Marcus Hanwell <cryos@gentoo.org> kink-0.2.1.ebuild: - Marked ~amd64. - -*kink-0.2.1 (04 Jul 2004) - - 04 Jul 2004; Dominik Stadler <centic@gentoo.org> +metadata.xml, - +files/kink-0.2.1-compilefix.diff, +kink-0.2.1.ebuild: - Add new application - diff --git a/net-print/kink/Manifest b/net-print/kink/Manifest deleted file mode 100644 index 30ad467ff149..000000000000 --- a/net-print/kink/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX kink-0.2.1-api-update.patch 821 RMD160 28016b8d94f55f78a67b942eaa973ebfbcfd0792 SHA1 446208ac42ff6abcb036e12572bafe2645afbdb3 SHA256 f84e11c83a194293461bf4882b17f2f0656f2c628acaae9c16f392637019116a -AUX kink-0.2.1-compilefix.diff 635 RMD160 aa5a9a073cbea290e32def80d4212b880d389d45 SHA1 47ed77c5cdddefd6601518a425b7bb9ff3266bbb SHA256 55084e1f4d17fa4ba544c914647042fa4178a5e9cbcbe1e236f016dac116306d -AUX kink-0.2.1-libinklevel-0.6.6.patch 8984 RMD160 b885f8beaeab742879fa9fd3203aaa8ac1c2e5dc SHA1 a30de2d8e66471e4e25c65c001d68fc56e31bc2d SHA256 c4eb718f2dab2ac38a1b44f2d337261179db5c4ae369c36a2a41fb40867161b1 -DIST kink-0.2.1.tar.bz2 419012 RMD160 ed61efc29fd68a91b876553d31c775dea9483e38 SHA1 2314a3039588bb04a5f7f1273acb82a8eaf5996d SHA256 2c0eb6dade582b85a8938eb928d868d8ed81eaa55f16c2b469b0bf0cff9ad7bc -EBUILD kink-0.2.1-r1.ebuild 653 RMD160 aabcfd97901b7130d340578cd9499d8bac721dcf SHA1 77dc19a5ff2b052145c4e8fad7fe1fcbaca9e9e7 SHA256 e86a1a510513cc003cefda353f45d11ce6b4aa882c47d503fd1e44292c39e6bf -EBUILD kink-0.2.1.ebuild 604 RMD160 c0382ccd5368d39032a26c951e0101a5cc2eaf66 SHA1 f03e3f3bd52e2de749e98e0b0fb7420505aa3af3 SHA256 5800bcddd36f68da1ccab6a9202fc8865aea85b73f3529115cc8e1325ab3aa5c -MISC ChangeLog 1353 RMD160 cf2de5c692c4476d67a8c1344b88dc2e14ff8c33 SHA1 250ebf4e2fc87d468753d6bcc4ff2790e15577f5 SHA256 f46390e58180eef92c9b7a537fa6090d062f37d3b8dd430581518fc297482100 -MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/net-print/kink/files/kink-0.2.1-api-update.patch b/net-print/kink/files/kink-0.2.1-api-update.patch deleted file mode 100644 index 135a3dfbff15..000000000000 --- a/net-print/kink/files/kink-0.2.1-api-update.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- kink/kink.cpp- 2007-06-22 01:51:13.000000000 +0200 -+++ kink/kink.cpp 2007-06-22 01:52:08.000000000 +0200 -@@ -76,7 +76,7 @@ - // Detect printers on parallel ports (if any) - for(int i=0; i<PARPORT_LAST_PORT; i++) - { -- callback = get_ink_level(PARPORT,i,&level); -+ callback = get_ink_level(PARPORT,"",i,&level); - switch(callback) - { - case OK: -@@ -91,7 +91,7 @@ - // Detect printers on USB ports (if any) - for(int i=0; i<USB_LAST_PORT; i++) - { -- callback = get_ink_level(USB,i,&level); -+ callback = get_ink_level(USB,"",i,&level); - switch(callback) - { - case OK: -@@ -202,7 +202,7 @@ - grpError->hide(); - grpLevels->show(); - -- callback=get_ink_level(last_type,last_port,&level); -+ callback=get_ink_level(last_type,"",last_port,&level); - if (callback == OK) - { - QProgressBar* ptrBar = 0; diff --git a/net-print/kink/files/kink-0.2.1-compilefix.diff b/net-print/kink/files/kink-0.2.1-compilefix.diff deleted file mode 100644 index 088465299e99..000000000000 --- a/net-print/kink/files/kink-0.2.1-compilefix.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur kink-0.2.1/work/kink-0.2.1/kink/kink.cpp /tmp/kink-0.2.1/kink/kink.cpp ---- a/kink-0.2.1/kink/kink.cpp 2003-12-14 11:05:03.000000000 +0100 -+++ b/kink-0.2.1/kink/kink.cpp 2004-07-04 18:48:57.000822400 +0200 -@@ -156,7 +156,7 @@ - listed_devices[listed_count].device_port = port; - ++listed_count; - -- cmbDevices->insertItem(QString::fromAscii((const char *)model,strlen(model)) + " on " + (type==PARPORT ? "/dev/lp" : "/dev/usb/lp") + QString::number(port)); -+ cmbDevices->insertItem(QString::fromAscii((char*)model,strlen((char*)model)) + " on " + (type==PARPORT ? "/dev/lp" : "/dev/usb/lp") + QString::number(port)); - } - - diff --git a/net-print/kink/files/kink-0.2.1-libinklevel-0.6.6.patch b/net-print/kink/files/kink-0.2.1-libinklevel-0.6.6.patch deleted file mode 100644 index 7d0a6750b148..000000000000 --- a/net-print/kink/files/kink-0.2.1-libinklevel-0.6.6.patch +++ /dev/null @@ -1,241 +0,0 @@ -# Marcus D. Hanwell <cryos@gentoo.org> 6 January 2007. -# Fixes to allow kink to compile against the new API in libinklevel-0.6.6 -diff -u ../kink-0.2.1-orig/kink/kink.cpp kink/kink.cpp ---- ../kink-0.2.1-orig/kink/kink.cpp 2007-01-06 14:04:45.000000000 +0000 -+++ kink/kink.cpp 2007-01-06 18:47:06.000000000 +0000 -@@ -80,10 +80,10 @@ - switch(callback) - { - case OK: -- add_device_to_list(PARPORT,i,level.model); -+ add_device_to_list(PARPORT, i, level.model); - break; - case PRINTER_NOT_SUPPORTED: -- add_device_to_list(PARPORT,i,(unsigned char *)"Unsupported device"); -+ add_device_to_list(PARPORT,i,(char *)"Unsupported device"); - break; - } - } -@@ -95,10 +95,10 @@ - switch(callback) - { - case OK: -- add_device_to_list(USB,i,level.model); -+ add_device_to_list(USB , i, (level.model)); - break; - case PRINTER_NOT_SUPPORTED: -- add_device_to_list(USB,i,(unsigned char *)"Unsupported device"); -+ add_device_to_list(USB, i, (char *)"Unsupported device"); - break; - } - } -@@ -150,7 +150,7 @@ - \fn KInk::add_device_to_list(void) - Add a device to the combo box list - */ --void KInk::add_device_to_list(int type, int port, unsigned char *model) -+void KInk::add_device_to_list(int type, int port, char *model) - { - listed_devices[listed_count].device_type = type; - listed_devices[listed_count].device_port = port; -@@ -203,116 +203,79 @@ - grpLevels->show(); - - callback=get_ink_level(last_type,last_port,&level); -- switch(callback) -+ if (callback == OK) - { -- case OK: -- -- if(level.black == 0 && -- level.color == 0 && -- level.cyan == 0 && -- level.magenta == 0 && -- level.yellow == 0 && -- level.photo == 0 && -- level.photocyan == 0 && -- level.photomagenta == 0 && -- level.photoyellow == 0) -- level.type = RESPONSE_INVALID; -- -- switch (level.type) { -- case ONE_COLOR_FOUND: -- barColor->setEnabled(true); -- barColor->setProgress(level.color); -- break; -- case ONE_BLACK_COLOR_FOUND: -- barBlack->setEnabled(true); -- barBlack->setProgress(level.black); -- break; -- case TWO_COLORS_FOUND: -- barBlack->setEnabled(true); -- barColor->setEnabled(true); -- barBlack->setProgress(level.black); -- barColor->setProgress(level.color); -- break; -- case TWO_PHOTO_COLORS_FOUND: -- barPhoto->setEnabled(true); -- barColor->setEnabled(true); -- barPhoto->setProgress(level.photo); -- barColor->setProgress(level.color); -- break; -- case THREE_COLORS_FOUND: -- barCyan->setEnabled(true); -- barMagenta->setEnabled(true); -- barYellow->setEnabled(true); -- barCyan->setProgress(level.cyan); -- barMagenta->setProgress(level.magenta); -- barYellow->setProgress(level.yellow); -- break; -- case FOUR_COLORS_FOUND: -- barBlack->setEnabled(true); -- barCyan->setEnabled(true); -- barMagenta->setEnabled(true); -- barYellow->setEnabled(true); -- barBlack->setProgress(level.black); -- barCyan->setProgress(level.cyan); -- barMagenta->setProgress(level.magenta); -- barYellow->setProgress(level.yellow); -- break; -- case SIX_COLORS_FOUND: -- barBlack->setEnabled(true); -- barPhotoCyan->setEnabled(true); -- barPhotoMagenta->setEnabled(true); -- barCyan->setEnabled(true); -- barMagenta->setEnabled(true); -- barYellow->setEnabled(true); -- barBlack->setProgress(level.black); -- barPhotoCyan->setProgress(level.photocyan); -- barPhotoMagenta->setProgress(level.photomagenta); -- barCyan->setProgress(level.cyan); -- barMagenta->setProgress(level.magenta); -- barYellow->setProgress(level.yellow); -- break; -- case SEVEN_COLORS_FOUND: -- barBlack->setEnabled(true); -- barPhotoCyan->setEnabled(true); -- barPhotoMagenta->setEnabled(true); -- barPhotoYellow->setEnabled(true); -- barCyan->setEnabled(true); -- barMagenta->setEnabled(true); -- barYellow->setEnabled(true); -- barBlack->setProgress(level.black); -- barPhotoCyan->setProgress(level.photocyan); -- barPhotoMagenta->setProgress(level.photomagenta); -- barPhotoYellow->setProgress(level.photoyellow); -- barCyan->setProgress(level.cyan); -- barMagenta->setProgress(level.magenta); -- barYellow->setProgress(level.yellow); -- break; -- case RESPONSE_INVALID: -- show_error(tr2i18n("<b>Invalid response read from device</b><br><br>Your printer reported that all ink tanks are empty or your printer is currently switched-off.<br><br>Power-on your device and verify the correct installation of cartdriges, then try again clicking <b>Update</b>.")); -+ QProgressBar* ptrBar = 0; -+ for (int i = 0; i < MAX_CARTRIDGE_TYPES; i++) -+ { -+ switch (level.levels[i][INDEX_TYPE]) -+ { -+ case CARTRIDGE_BLACK: -+ ptrBar = barBlack; -+ break; -+ case CARTRIDGE_COLOR: -+ ptrBar = barColor; -+ break; -+ case CARTRIDGE_PHOTO: -+ ptrBar = barPhoto; -+ break; -+ case CARTRIDGE_CYAN: -+ ptrBar = barCyan; -+ break; -+ case CARTRIDGE_MAGENTA: -+ ptrBar = barMagenta; -+ break; -+ case CARTRIDGE_YELLOW: -+ ptrBar = barYellow; -+ break; -+ case CARTRIDGE_PHOTOBLACK: -+ // Not implemented yet - add it? -+ break; -+ case CARTRIDGE_PHOTOCYAN: -+ ptrBar = barPhotoCyan; -+ break; -+ case CARTRIDGE_PHOTOMAGENTA: -+ ptrBar = barPhotoMagenta; -+ break; -+ case CARTRIDGE_PHOTOYELLOW: -+ ptrBar = barPhotoYellow; -+ break; -+ } -+ if (ptrBar) -+ { -+ ptrBar->setEnabled(true); -+ ptrBar->setProgress(level.levels[i][INDEX_LEVEL]); -+ } -+ ptrBar = 0; - } -- break; -+ } -+ else -+ { -+// show_error(tr2i18n("<b>Invalid response read from device</b><br><br>Your printer reported that all ink tanks are empty or your printer is currently switched-off.<br><br>Power-on your device and verify the correct installation of cartdriges, then try again clicking <b>Update</b>.")); -+ switch(callback) -+ { -+ case DEV_PARPORT_INACCESSIBLE: -+ case DEV_LP_INACCESSIBLE: -+ case COULD_NOT_GET_DEVICE_ID: -+ case DEV_USB_LP_INACCESSIBLE: -+ case COULD_NOT_WRITE_TO_PRINTER: -+ case COULD_NOT_READ_FROM_PRINTER: -+ case ERROR: -+ case UNKNOWN_PORT_SPECIFIED: -+ case NO_DEVICE_CLASS_FOUND: -+ case NO_CMD_TAG_FOUND: -+ case NO_PRINTER_FOUND: -+ case COULD_NOT_PARSE_RESPONSE_FROM_PRINTER: -+ show_error(tr2i18n("<b>Generic error</b><br><br>An error has occured communicating with the selected device. Click <b>Detect</b> and <b>Update</b> to refresh KInk status and try again. If the problem persists, e-mail me a description of the situation and all that can be helpful to me for reconstructing your execution environment.")); -+ break; -+ -+ case NO_INK_LEVEL_FOUND: -+ show_error(tr2i18n("<b>Cannot read ink level from device</b><br><br>Cannot retrieve ink levels from the selected device. Ensure your printer is switched on and click on <b>Update</b> to try again.")); -+ break; - -- case DEV_PARPORT_INACCESSIBLE: -- case DEV_LP_INACCESSIBLE: -- case COULD_NOT_GET_DEVICE_ID: -- case DEV_USB_LP_INACCESSIBLE: -- case COULD_NOT_WRITE_TO_PRINTER: -- case COULD_NOT_READ_FROM_PRINTER: -- case ERROR: -- case UNKNOWN_PORT_SPECIFIED: -- case NO_DEVICE_CLASS_FOUND: -- case NO_CMD_TAG_FOUND: -- case NO_PRINTER_FOUND: -- case COULD_NOT_PARSE_RESPONSE_FROM_PRINTER: -- show_error(tr2i18n("<b>Generic error</b><br><br>An error has occured communicating with the selected device. Click <b>Detect</b> and <b>Update</b> to refresh KInk status and try again. If the problem persists, e-mail me a description of the situation and all that can be helpful to me for reconstructing your execution environment.")); -- break; -- -- case NO_INK_LEVEL_FOUND: -- show_error(tr2i18n("<b>Cannot read ink level from device</b><br><br>Cannot retrieve ink levels from the selected device. Ensure your printer is switched on and click on <b>Update</b> to try again.")); -- break; -- -- case PRINTER_NOT_SUPPORTED: -- show_error(tr2i18n("<b>Unsupported printer!</b><br><br>Selected printer is not supported by this version of libinklevel. Take a look to <a href='http://home.arcor.de/markusheinz'>http://home.arcor.de/markusheinz</a> for a complete list of devices supported by your version of libinklevel.")); -- break; -- } -+ case PRINTER_NOT_SUPPORTED: -+ show_error(tr2i18n("<b>Unsupported printer!</b><br><br>Selected printer is not supported by this version of libinklevel. Take a look to <a href='http://home.arcor.de/markusheinz'>http://home.arcor.de/markusheinz</a> for a complete list of devices supported by your version of libinklevel.")); -+ break; -+ } -+ } - } -diff -u ../kink-0.2.1-orig/kink/kink.h kink/kink.h ---- ../kink-0.2.1-orig/kink/kink.h 2007-01-06 14:04:45.000000000 +0000 -+++ kink/kink.h 2007-01-06 18:20:59.000000000 +0000 -@@ -67,7 +67,7 @@ - DEVICE_INFO listed_devices[PARPORT_LAST_PORT + USB_LAST_PORT]; - - private: -- void add_device_to_list(int type, int port, unsigned char *model); -+ void add_device_to_list(int type, int port, char *model); - void show_error(QString errStr); - void update_view(void); - }; diff --git a/net-print/kink/kink-0.2.1-r1.ebuild b/net-print/kink/kink-0.2.1-r1.ebuild deleted file mode 100644 index 4f92a593268e..000000000000 --- a/net-print/kink/kink-0.2.1-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/kink/kink-0.2.1-r1.ebuild,v 1.4 2009/11/11 12:41:24 ssuominen Exp $ - -ARTS_REQUIRED=never -inherit kde eutils - -DESCRIPTION="KDE printer ink level utility monitor" -HOMEPAGE="http://kink.sourceforge.net/" -SRC_URI="mirror://sourceforge/kink/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND=">=net-print/libinklevel-0.7.1" - -need-kde 3.5 - -PATCHES=( "${FILESDIR}/kink-0.2.1-compilefix.diff" - "${FILESDIR}/${P}-libinklevel-0.6.6.patch" - "${FILESDIR}/${P}-api-update.patch" ) diff --git a/net-print/kink/kink-0.2.1.ebuild b/net-print/kink/kink-0.2.1.ebuild deleted file mode 100644 index 104c4cbbb23b..000000000000 --- a/net-print/kink/kink-0.2.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/kink/kink-0.2.1.ebuild,v 1.7 2009/11/11 12:39:46 ssuominen Exp $ - -ARTS_REQUIRED=never -inherit kde eutils - -DESCRIPTION="KDE printer ink level utility monitor" -HOMEPAGE="http://kink.sourceforge.net/" -SRC_URI="mirror://sourceforge/kink/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 amd64 ~ppc" -IUSE="" - -DEPEND="<=net-print/libinklevel-0.6.5" - -need-kde 3.5 - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/kink-0.2.1-compilefix.diff -} diff --git a/net-print/kink/metadata.xml b/net-print/kink/metadata.xml deleted file mode 100644 index 8d1e86a9cefb..000000000000 --- a/net-print/kink/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>kde</herd> -</pkgmetadata> |