From 151b2fb464ba2b3a4ac67048b865b1ea8e19c4a9 Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Tue, 27 Jan 2015 23:52:04 +0000 Subject: [PATCH] Remove old versions. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x6521E06D --- media-gfx/sane-backends/ChangeLog | 14 +- media-gfx/sane-backends/Manifest | 34 +- .../sane-backends/files/kodakaio-fixes.patch | 30 -- .../files/parallel-install-1.0.19.patch | 30 -- .../sane-backends-1.0.23-automagic-cups.patch | 33 -- .../sane-backends-1.0.23-automagic-v4l.patch | 22 -- ...ckends-1.0.23-saned_pidfile_location.patch | 11 - .../sane-backends-1.0.23-r1.ebuild | 295 ----------------- .../sane-backends-1.0.23-r2.ebuild | 303 ------------------ .../sane-backends/sane-backends-1.0.23.ebuild | 288 ----------------- .../sane-backends-1.0.24-r3.ebuild | 299 ----------------- 11 files changed, 20 insertions(+), 1339 deletions(-) delete mode 100644 media-gfx/sane-backends/files/kodakaio-fixes.patch delete mode 100644 media-gfx/sane-backends/files/parallel-install-1.0.19.patch delete mode 100644 media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-cups.patch delete mode 100644 media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-v4l.patch delete mode 100644 media-gfx/sane-backends/files/sane-backends-1.0.23-saned_pidfile_location.patch delete mode 100644 media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild delete mode 100644 media-gfx/sane-backends/sane-backends-1.0.23-r2.ebuild delete mode 100644 media-gfx/sane-backends/sane-backends-1.0.23.ebuild delete mode 100644 media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog index 59a16a5946b1..3781f722098f 100644 --- a/media-gfx/sane-backends/ChangeLog +++ b/media-gfx/sane-backends/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-gfx/sane-backends -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.268 2014/12/04 08:39:15 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.269 2015/01/27 23:51:57 teiresias Exp $ + + 27 Jan 2015; Christopher Brannon + -sane-backends-1.0.23.ebuild, -sane-backends-1.0.23-r1.ebuild, + -sane-backends-1.0.23-r2.ebuild, -sane-backends-1.0.24-r3.ebuild, + -files/parallel-install-1.0.19.patch, + -files/sane-backends-1.0.23-automagic-cups.patch, + -files/sane-backends-1.0.23-automagic-v4l.patch, + -files/sane-backends-1.0.23-saned_pidfile_location.patch, + -files/kodakaio-fixes.patch: + Remove old versions. 04 Dec 2014; Agostino Sarubbo sane-backends-1.0.24-r5.ebuild: Stable for ppc64, wrt bug #525750 diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index 22eae2a0e7ca..86051c91f87d 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -1,12 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX kodakaio-fixes.patch 1319 SHA256 531a83ba5c27407a6ef1c73a4e5cc96dcfafda5083e01b018bd4c7754d61367f SHA512 e800dc116df194754067b134b81386651a35784f42c1b645e577e63c8302d4dd5a0db4a29869d8f90e9ef661dd7810bede5eb4de932499160fead5ec05b2d961 WHIRLPOOL ca2d2aa77e08775d076577d74dcb097d9ecc431ac8e72bfd35b3a90bdc6402880a2e2cdfb033bf9c5d3616e570b7d99b55c557c8c971d27db25d3ffd3d71b29b AUX niash_array_index.patch 4141 SHA256 a44687911c10e66c1a57efe73508d1c78eed55fa2699fe7e13c62ddc7b646187 SHA512 13dcba7d609cb5fe27442918818b46dd55b3d4c65aeb3f379377671775cf28f8cd48950a0633fb3abb33db29b223798c0b00a86a029956ae0bc323edc344d28f WHIRLPOOL c93d1c770e49550eb72f82f2a48385600b806531cc4e6072fa7317515c16ac7847acb63be7d8c94592fee299e433f438a2f7db82f362d7a57e79c42a2b13940b -AUX parallel-install-1.0.19.patch 1117 SHA256 5c3cb9747058df277eb6d7db8574252149834b61b68e0569ddf61bf67869449f SHA512 9f5b1245d76bb4e7511b00c0d2cc68c7477c56588bec480a68ed717825b4a177ae03a1873c2967a9e685f51445f6121eee688649fb325116fb9298980184cf95 WHIRLPOOL e4a66212c9b97ac4134a50452291c7af34837d9e6dca819e050c5eeecf30ac23d116e35b4c2f2b097c0beb3240b151c5babd9fb53e154a75961be31c41d4b860 -AUX sane-backends-1.0.23-automagic-cups.patch 1145 SHA256 1b60de2224dcec2e393683153dc75be96179a85ad2059ddef784390ee74bd88d SHA512 e0ae1baf0eb29a26b3608bd807f2d31005d09320e403ce3d06adb3048ba335eb231c6376db19d6990224957060589396bc08cb3c0a31517da54e135dd2ccc2d9 WHIRLPOOL b334e8c05b8cfc8e51211a2cedd0603832896129c54c67bf35cc81096e744cd3081db1ad8d329c991506bd3dacfa782ee5eac07bee0dc47d04cbb09d7d713cdb -AUX sane-backends-1.0.23-automagic-v4l.patch 632 SHA256 aceb6e72ac7a8d15fefaa4c5c464d9e5c7f5829e1946206bf8f06cc9f3580566 SHA512 ff2a44e6b7b86c9276e4f60ccae97ecd28b3ddaa622c0236e8d579acc6ee9cb82599047cc2dabcdb264b9c7cc05bc563b0aec8f512eaa0ba46169328974b7324 WHIRLPOOL 5475a8b44783ddca60b5ce5e2b4e39261fe2eeb9f4d520701b7ebe4bcda4f124c8a3f2ccf026e770c3e3969af4fe250dc68ea9886314d8050074eecd7dd0a51f -AUX sane-backends-1.0.23-saned_pidfile_location.patch 345 SHA256 c95f305d01fd0dfb63944788f450d798a8882412f1d3e6da5c7e49f33cceba51 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24 WHIRLPOOL d72b314c7e4898c83a4c79e6fa39af978bd60e2b78afa58c1f8e1709b5f597292e965d330a58cd4109780fb2051dcd7880008f65d2b204fe476cbf3ce898e22b AUX sane-backends-1.0.24-automagic_systemd.patch 1310 SHA256 5461cb3aa8bad1b299cd92c525cf6af5a3af5a82e81a74549a7f660d026ee610 SHA512 1edf28a2d106cf05df92a55ef3bf4ea530c9ee69a2517f14a33a5ff30ba69702d818677da1715ab19169a4d5575f1c7c2755431193d48a40d4f80d11e6308120 WHIRLPOOL 9404f9938567bec86487969fa0e1af21cf83c8aa88344983c09a2380c279c3de7b9c4bcd8a41836ffc3ab9628bfe4f8a38c0c165f5d933adefc66fb589fdf5d6 AUX sane-backends-1.0.24-kodakaio_avahi.patch 2900 SHA256 83f2a75a379fd964e8662d61394dd61d674bfaf5d4cf13d12725af83aaa36f7e SHA512 c00c01d2b7ad1770117403373ece89b14ff58ed23b6719b01f89c381dd88a1195c6c57c1d3ca25d7036ea21128a36f14675e7bfae0e6db671db24fb4c1422674 WHIRLPOOL ee3be39baa2a33615308d1805d0c5f59ae6e1b4e72f481ef0629c71f94f4d26dbd06e2dca12a969e883f0453e07953c1bfbc8cbafc19dca16f5ec1e2c86ceaeb AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 SHA256 c95f305d01fd0dfb63944788f450d798a8882412f1d3e6da5c7e49f33cceba51 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24 WHIRLPOOL d72b314c7e4898c83a4c79e6fa39af978bd60e2b78afa58c1f8e1709b5f597292e965d330a58cd4109780fb2051dcd7880008f65d2b204fe476cbf3ce898e22b @@ -15,31 +10,18 @@ AUX sane-backends-1.0.24-unused-cups.patch 1658 SHA256 ceb0b0809c90e8c89da70bf05 AUX saned 150 SHA256 d18856d6dd26fac11988fea5217c8616686ad3c0c024ad5437efbf0fd24984f5 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910 WHIRLPOOL 5bdd707daeba740b980ce6dd51096716eec2c2939681f6abd9e7f73b50d8d384a68a07dcc11e9295cd123cc5d2a53d02def52133a559c3e33d63612028d2aac5 AUX saned.confd 76 SHA256 197e44ba1f438a18f5f7d9f5858feb19c1ece4286d82a5e63caf9be5b964aa76 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751 WHIRLPOOL ede920bf5eb1ee59263296a2ccce1ab2da2b04669c2f8a58de1fc4fa76cc1eee501290eb4fdaece464bc184cc0cfb17d100e9309a33d79c06142a3f03c91b837 AUX saned.initd 411 SHA256 4dd4e7fa07bf2ab2d4f5753156f5df0ad2277523f6755b0eab3d2db3480989e2 SHA512 ec9c11c84dc405981fd854f99007a5fcae5403685894acd1d1108fc772147a54d9fad9103dcff708765efff644e972260459c19fe439af17db76562dc1b5ba84 WHIRLPOOL bec23753fc557a36a6990ed565519bb62e1bc9a6bd81c0c16cc956cd6dbc1c6fd661775b8c8bf05faa1f5bbbef2406498094a0adc48c9fd81e89f4531669c4e8 -DIST sane-backends-1.0.23.tar.gz.1 1792000 SHA256 551d7e0c89d18ca438bfce4f1c242b59485195c493c5f935a3b11e724ee39537 SHA512 afc64b9a8232e6d0aaf22e05450ecf814f64c0065bd683f135053d46ef80c42f208eba8642fc8e8f1ded46cb1aa50010987422fd275ea95555f329c76118fa1e WHIRLPOOL 104f820972a23be93c241fb55e4129ab5c2d889cc011f3aa69ddd23e9b4da3ae7b59d8741e9763e3bdcc18f8f1dfe273aaa59ca3dc56dc7f9b78ae6d2b5a3518 -DIST sane-backends-1.0.23.tar.gz.2 1792000 SHA256 b487df0d8dc921803577ee34ceaa676a4a3b6715cd4d9a229b43d6a501a1baab SHA512 ba8723060c3eede0ae68d12d29de180bce012999fcb57774c68f9c9cbf220f069a6b2c4f1d930bd4ad248e4431cfd6e78d20b1f3cbb54e5006fb3b4c4196f9b8 WHIRLPOOL ea67e56ce76dff5a29354f758cb5c9d4b4bae28ffd7197ee066262779412a3a36d733fdcb17ce5ae61d123f395b28640124f7a7a7d28baaae1cb9f24e9299ae6 -DIST sane-backends-1.0.23.tar.gz.3 1758350 SHA256 af91e84cb72dc2b1fa4c7eaba948ae6ab8e2ab353f79805a21de4ac52de5b81a SHA512 887864509fc6676b42d59dce5b77441c56893dc70f4b0184379b08cf74e77aa0f6413c76f5132882e8d0b8c7fac4963a63879753a57eaaca74035274b3ca8199 WHIRLPOOL 5d9a6de6494f214350463919dba4be4f58b9c376f2a38558033fe8ecdcda03b40a0dff8044af4b8d76f59b04c8e7420c6159a4bfc593785202b0c11a9932f054 DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d SHA512 1e9f962bb9d27f17067eb662dabfc0a1aa0d06e16bec4bd28868124b468578d82f14f6d2c1f5de63d2cec57ca4584ec12d3b2c2b1de20f1199aece581453ebc5 WHIRLPOOL 19b939c920a3c157044c85a941debdc664d8781562fa3fc04f061b9d216b089be80edfd43479069382adf13e68160518fdbd5c84a5f4c506a46f8521d4ed2a1c -EBUILD sane-backends-1.0.23-r1.ebuild 6716 SHA256 e32dfb1d2487652cf2977f79f6744fc7e2da676daeab2d9ba21fb75f70c97488 SHA512 3802f885e17cfa90e1dc4b7c91a16db4eb1fa4e803b655799557e8207cddc8b9cd0d548fdbc34e9ab9b28916b2e6d96905ec1d0d1648b760fe7e2617218dd2c6 WHIRLPOOL a38682c1b6a7212253f2bb0f9dea5adcd995908d2009bee548cfd0699dec2297f7940333e349f502cc66c4faf9ece869ff5453f28e7ba6efd3cd692b2155a311 -EBUILD sane-backends-1.0.23-r2.ebuild 6994 SHA256 0dad30427f3d982aaaf5bb0e34d9d370d50ad43179f4000543e7ff2b4dcab6ec SHA512 a9e5c521a087dccb61385a9ec73be611f84ef61a90f289c49e169d22e0db88dc8997acde18c0fa7e014b7812f962d76f2780dc45409d17945287d411e0789de6 WHIRLPOOL 2e0c37396f2583c6d728ccd27ebe55a9890be416c397459f6ca16172c205dd473fe85829eed270f00f01d7ee9cfabeb4b2d91c28ac2480992c6a96514a74e41c -EBUILD sane-backends-1.0.23.ebuild 6453 SHA256 f8f16bc95d192d4ab4d509d67585d7ef423c0b68488f209ccea2fc843ad1aaa7 SHA512 2aa779439770a7993466b113555106c122e989b9226fb15e2b616f17d0ebf50da22154eff751043fec828fe529191fffe3e1d5b3465ce522d155f83f45284f8b WHIRLPOOL a6e07f218cfb297dd99a3bcbc28186b79ad81e2309dd4049e1c70922cb6b0583d0f1f598c136ce09c45a27d964aeaefa34b0fabff12c0452b936cb2af62c625f -EBUILD sane-backends-1.0.24-r3.ebuild 6844 SHA256 6c9b0a1dd8415343a4c8481e57dc4620e39919dfd2c9b27fa825b31a50bee9d1 SHA512 19cfaab77236215c80066edf8f92767e1d980557f3d1d102d3a5b325e84daab0849dbb0c5dcac9a9ed2494b228ec8924c27d67ebcb86bbf02a15a5cf1db60481 WHIRLPOOL 5d823f69cadef5000f78977a68a610174921704d911d213c69040f9edbbb7f50b84a0803912638c5bcf487b2804a68badf5d8b77c4ac94800ae5f6169a22b68d EBUILD sane-backends-1.0.24-r5.ebuild 7690 SHA256 92e10516c32d0d161062433dbf657f7d15d54df52805650417ae99f43723c600 SHA512 de33bf37156c965d485da323277142315d7de1b9844ac34fb8a48f53a1810a3635657f40563b6daef9ee66ccef2da18db68667dd9548db018c69d5bc24cb934f WHIRLPOOL cf1e3862316a02d1b327ace10d316d56c74cbf255994c3bd3ec272ac6bb28e9e973f96952f38a1e6650b5a7ebc099b42404d12088026b631ca6cc925c05d5f79 -MISC ChangeLog 45781 SHA256 ba24ef5f2feca0311d4802b73f981a5aaf690449d51861f1cf659e4df4324307 SHA512 b2c94e58d3300e3de8d9a2448b4ca3fecef95d0b1c9f0389e3e26932b633d86791d96dff1c8418e20c04c7f3fcb94dbe46ce1d9cbaa323dc722effc5e986b881 WHIRLPOOL 749e015393f64c4dd3c63208c35ec1570b8dea1df872726bc8c307748b7a85d35b35a41c058110f05ae6d106437ccbd5286394740ae64d5fd4fb8bf6c732e90a +MISC ChangeLog 46236 SHA256 8e247c4dad4e10b00f8d04047cf0e562791c757a346e44f5334e6b1664485005 SHA512 f48b98de9d917d70f5a5a2e52a4b44061bd6cae97228dbb61b1f4a5da5f11a287fe6e97a517a84ccc13e60394928f6539d5998dc8513e049dbb634658be8ce67 WHIRLPOOL 3d468e2fce1b51e435ead6790060d6b8b5ed2761195418ef8a127b52ec1309d21f059a7f4c0275997d3045a6ac34de232c9daeb7f02928fe60da020f9b76765b MISC metadata.xml 233 SHA256 c5f5ebf692f6c9e98fb12ac750be2e67f8b316b820dc6d36dfa3f22fead02ca4 SHA512 76ddd2dcdfdb17b98cd96ee032935125b95ee8b78722c1049b9beaef6cf482760c6bd7791d77ef5ca52c4185a5c01222a5f874c033ec3788cce2b4906ed18682 WHIRLPOOL 30cd038d04c297199c5d1d340f3612ce5e4226c099e1272b6c3257c2f9ff61cac32b577ffbcbdee7f888f8ededa9fa6d5aec6801249b2db53586531788f39229 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUgB20AAoJELp701BxlEWf9dsQAMTE/iVmrg6hOvP2/njsDW8R -Eb3axN2sEnq206NJHXoXfTgLg25Bwdn6aoCxeJQk4BMZub+Hbi7pWJx8b5vpDvKY -tPT0GqiNDbyZIrF4YcXMT8ZRze/N9wsccxJ/YE585Jki8BdvMeIk9p/9s3Qwb9Ly -NTf1MOdqYp1WT2hxLcC14n97yjUoRmnRRtG3iffndGIer6ssDOARx9hco5HniZei -Q+TaBNQTdlkanxU9WQFD6a7YiGwZZBNnAjfiTJL+qFl7376jjRmJS3ugWrgAH+kM -GFo+Q7bDcEc/MGrvHTzoQj9FN+V/Gq83Bb5vmzVveDe12zcPLlKv1M2oduRv/pPL -78THvuf6zI8x+ieCDvEhztkQDtU2PCL/GfJc8dffCYmSBNMu8mQVJKDopsx6QIcR -+MbTfPR3dlyq5YOmfTke+cAUaPuNLFQJT6EvsSsCAtL8IV6HhkJf7vWK5bFt0ODN -fptZlHreiekzSxX6iHDIf/rgEOuC/6Rn8TTO0oPNt5eC8/PEfmVh2D8O/CgZn0Nt -MckkczxbZ0kQNaV/EW8HZHV0sJXzdw/XwFeBO8iMMvqmIJQ0y1UQt4AjYv/IPXqI -W0SuOOZkjXo4RsbZ9QvwNPKVjrkZdI/sIv2FgiP2cWWZI7qt/8bCUQsDKGtpBJPQ -jSq7AsYKbusy0JDcX4UH -=6tWZ +iQEcBAEBCAAGBQJUyCSjAAoJEH8qFnJlIeBtyBgH/1Srs3wWzUZxU8rU0+iJH5Kc +pKhlVrucMKzg4zdeqjav30xrPqVScskddZUeNwuQGHKcZX2nUiA7mdWI+odXJg6f +2mNa7Ll/V+c4sg+PDTOWta4CH0VQqG4E8640hKxiM5kefbJL2p7TWEDtEb3TXA5X +ZcqgFUN2/AUpGZ8BH9/DsQ98nyFSdj3CiYG4FG9YuSHBDkrfPA63u72R8Qmq/qTR +wD5o+B8Idmp4Dhh6W1lC/vPqEFjMq4ebJLJqng9Oo68273Ki9eRrjHZvWMk/4RHP +rSIIgP4l9kcNUST5r3Gp4JvimR0JlOys8VM4sFsfSa1pfSzwC3GbaO9fxor6zYk= +=um0v -----END PGP SIGNATURE----- diff --git a/media-gfx/sane-backends/files/kodakaio-fixes.patch b/media-gfx/sane-backends/files/kodakaio-fixes.patch deleted file mode 100644 index b4c7b85997cf..000000000000 --- a/media-gfx/sane-backends/files/kodakaio-fixes.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- backend/kodakaio.c 2013-03-15 08:24:26.000000000 +0100 -+++ backend/kodakaio.c.new 2013-03-15 08:30:06.000000000 +0100 -@@ -2129,6 +2129,9 @@ - } - - #if HAVE_CUPS -+ -+const char * _httpResolveURI (const char *uri, char *resolved_uri, size_t resolved_size, int options, int(*cb)(void *context), void *context); -+ - /* ProcessDevice is called by cupsGetDevices to process each discovered device in turn */ - void - ProcessDevice(const char *device_class, const char *device_id, const char *device_info, const char *device_make_and_model, const char *device_uri, const char *device_location, void *user_data) -@@ -2172,7 +2175,7 @@ - options |= _HTTP_RESOLVE_FQDN ? not sure if or when required - options = 0 seems to work */ - DBG(5, "using _httpResolveURI\n"); -- resolved = _httpResolveURI(device_uri, uribuffer, sizeof(uribuffer), 0, NULL, NULL); -+ resolved = _httpResolveURI(device_uri, uribuffer, sizeof(uribuffer), 0, 0, NULL); - - /* extract the IP address */ - if(extract_from_id(resolved, "socket://", ':', ip_addr, sizeof(ip_addr)) != 0) { -@@ -2197,7 +2200,7 @@ - - reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT, - "dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy); -- if(reply != IPP_OK) printf("Failed cupsGetDevices\n"); -+ if(reply != IPP_OK) DBG(1,"Failed cupsGetDevices\n"); - - return 0; - } diff --git a/media-gfx/sane-backends/files/parallel-install-1.0.19.patch b/media-gfx/sane-backends/files/parallel-install-1.0.19.patch deleted file mode 100644 index bc26ef53a389..000000000000 --- a/media-gfx/sane-backends/files/parallel-install-1.0.19.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- backend/Makefile.in 2008-08-12 21:50:12.000000000 +0200 -+++ backend/Makefile.in.new 2008-08-12 21:58:24.000000000 +0200 -@@ -234,8 +234,10 @@ - - install: $(INSTALL_LOCKPATH) install-be@BE_INSTALL_FLAVOR@ install-libsane install-becfg - --install-be: -+install-paths: - $(MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(libsanedir) $(DESTDIR)$(configdir) -+ -+install-be: install-paths - @# Install all backends in $(prefix)/lib/sane/ - @list="$(LIBS)"; for be in $$list; do \ - echo installing $${be} in $(DESTDIR)$(libsanedir)/$${be}...; \ -@@ -267,13 +269,13 @@ - cp -p .libs/libsane-$${be}.so $(DESTDIR)$(BEOS_ADDONDIR)/$${be} || exit 1; \ - done - --install-libsane: -+install-libsane: install-paths - @echo installing libsane.la in $(DESTDIR)$(libdir)/libsane.la... - @$(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsane.la \ - $(DESTDIR)$(libdir)/libsane.la >/dev/null - @$(LIBTOOL) $(MINST) --finish $(DESTDIR)$(libdir) - --install-becfg: -+install-becfg: install-paths - @list="$(CONFIGS)"; for cfg in $$list; do \ - if test ! -r $${cfg}; then continue; fi; \ - if test -f $(DESTDIR)$(configdir)/$${cfg}; then \ diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-cups.patch b/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-cups.patch deleted file mode 100644 index bcdd944e4a7a..000000000000 --- a/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-cups.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur sane-backends-1.0.23/configure.in sane-backends-1.0.23.new/configure.in ---- sane-backends-1.0.23/configure.in 2012-08-19 13:31:34.000000000 -0700 -+++ sane-backends-1.0.23.new/configure.in 2013-08-26 14:41:22.613012270 -0700 -@@ -326,16 +326,24 @@ - AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?]) - fi - --nl added by PN 3/2/12 to detect cups --$as_echo "checking for cups" --if test -e /usr/include/cups/cups.h ; then -- AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?]) -+AC_ARG_ENABLE(cups, -+ AC_HELP_STRING([--enable-cups], [enable CUPS support]), -+ [enable_cups=$enableval], [enable_cups=no]) -+ -+if test "$enable_cups" != no; then -+ dnl added by PN 3/2/12 to detect cups -+ $as_echo "checking for cups" -+ if test -e /usr/include/cups/cups.h ; then -+ AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?]) - with_cups="yes" - LIBS="-lcups $LIBS" --else -+ else - $as_echo "cups.h not found, you may want to install a cups development package" - $as_echo "in order to autodetect network scanners in kodakaio." - with_cups="no" -+ fi -+else -+ with_cups=no - fi - - dnl *********** diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-v4l.patch b/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-v4l.patch deleted file mode 100644 index 78a6c7be207b..000000000000 --- a/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-v4l.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/configure.in b/configure.in -index b62d4d3..76e37b2 100644 ---- a/configure.in -+++ b/configure.in -@@ -129,7 +129,16 @@ SANE_CHECK_LOCKING - SANE_CHECK_GPHOTO2 - - --PKG_CHECK_MODULES(LIBV4L, libv4l1, have_libv4l1=yes, have_libv4l1=no) -+AC_ARG_WITH(v4l, -+ AC_HELP_STRING([--with-v4l], -+ [include the v4l backend @<:@default=yes@:>@]), -+ [# If --with-v4l=no or --without-v4l, disable backend -+ # as "$with_v4l" will be set to "no"]) -+ -+if test "$with_v4l" != "no" ; then -+ PKG_CHECK_MODULES(LIBV4L, libv4l1, have_libv4l1=yes, have_libv4l1=no) -+fi -+ - AC_SUBST(LIBV4L_LIBS) - AC_SUBST(LIBV4L_CFLAGS) - diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.23-saned_pidfile_location.patch b/media-gfx/sane-backends/files/sane-backends-1.0.23-saned_pidfile_location.patch deleted file mode 100644 index c682961f7c3f..000000000000 --- a/media-gfx/sane-backends/files/sane-backends-1.0.23-saned_pidfile_location.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sane-backends-1.0.23/frontend/saned.c -+++ sane-backends-1.0.23/frontend/saned.c -@@ -221,7 +221,7 @@ - int numchildren; - - #define SANED_CONFIG_FILE "saned.conf" --#define SANED_PID_FILE "/var/run/saned.pid" -+#define SANED_PID_FILE "/var/run/saned/saned.pid" - - #define SANED_SERVICE_NAME "sane-port" - #define SANED_SERVICE_PORT 6566 diff --git a/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild deleted file mode 100644 index b5f3bb1b0fd2..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild +++ /dev/null @@ -1,295 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild,v 1.3 2013/05/08 19:35:31 vapier Exp $ - -EAPI="5" - -inherit eutils flag-o-matic multilib udev user toolchain-funcs - -# gphoto and v4l are handled by their usual USE flags. -# The pint backend was disabled because I could not get it to compile. -IUSE_SANE_BACKENDS=" - abaton - agfafocus - apple - artec - artec_eplus48u - as6e - avision - bh - canon - canon630u - canon_dr - canon_pp - cardscan - coolscan - coolscan2 - coolscan3 - dc210 - dc240 - dc25 - dell1600n_net - dmc - epjitsu - epson - epson2 - fujitsu - genesys - gt68xx - hp - hp3500 - hp3900 - hp4200 - hp5400 - hp5590 - hpljm1005 - hpsj5s - hs2p - ibm - kodak - kodakaio - kvs1025 - kvs20xx - kvs40xx - leo - lexmark - ma1509 - magicolor - matsushita - microtek - microtek2 - mustek - mustek_pp - mustek_usb - mustek_usb2 - nec - net - niash - p5 - pie - pixma - plustek - plustek_pp - pnm - qcam - ricoh - rts8891 - s9036 - sceptre - sharp - sm3600 - sm3840 - snapscan - sp15c - st400 - stv680 - tamarack - teco1 - teco2 - teco3 - test - u12 - umax - umax1220u - umax_pp - xerox_mfp" - -IUSE="avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp" - -for backend in ${IUSE_SANE_BACKENDS}; do - if [ ${backend} = pnm ]; then - IUSE="${IUSE} -sane_backends_pnm" - elif [ ${backend} = mustek_usb2 -o ${backend} = kvs40xx ]; then - IUSE="${IUSE} sane_backends_${backend}" - else - IUSE="${IUSE} +sane_backends_${backend}" - fi -done - -REQUIRED_USE=" - sane_backends_mustek_usb2? ( threads ) - sane_backends_kvs40xx? ( threads ) -" - -DESCRIPTION="Scanner Access Now Easy - Backends" -HOMEPAGE="http://www.sane-project.org/" -SRC_URI="https://alioth.debian.org/frs/download.php/3752/sane-backends-1.0.23.tar.gz.1 - https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2 - https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3" - -LICENSE="GPL-2 public-domain" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" - -RDEPEND=" - sane_backends_dc210? ( virtual/jpeg ) - sane_backends_dc240? ( virtual/jpeg ) - sane_backends_dell1600n_net? ( virtual/jpeg - media-libs/tiff ) - avahi? ( >=net-dns/avahi-0.6.24 ) - sane_backends_canon_pp? ( sys-libs/libieee1284 ) - sane_backends_hpsj5s? ( sys-libs/libieee1284 ) - sane_backends_mustek_pp? ( sys-libs/libieee1284 ) - usb? ( virtual/libusb:0 ) - gphoto2? ( - media-libs/libgphoto2:= - virtual/jpeg - ) - v4l? ( media-libs/libv4l ) - xinetd? ( sys-apps/xinetd ) - snmp? ( net-analyzer/net-snmp ) -" - -DEPEND="${RDEPEND} - v4l? ( sys-kernel/linux-headers ) - doc? ( - virtual/latex-base - dev-texlive/texlive-latexextra - ) - >=sys-apps/sed-4 - - virtual/pkgconfig" - -# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) -RDEPEND="${RDEPEND} - ! "${P}.tar.gz" - unpack ./"${P}.tar.gz" -} - -src_prepare() { - cat >> backend/dll.conf.in <<-EOF - # Add support for the HP-specific backend. Needs net-print/hplip installed. - hpaio - # Add support for the Epson-specific backend. Needs media-gfx/iscan installed. - epkowa - EOF - epatch "${FILESDIR}"/niash_array_index.patch \ - "${FILESDIR}"/${PN}-1.0.23-saned_pidfile_location.patch \ - "${FILESDIR}"/kodakaio-fixes.patch -} - -src_configure() { - append-flags -fno-strict-aliasing - - # the blank is intended - an empty string would result in building ALL backends. - local BACKENDS=" " - - use gphoto2 && BACKENDS="gphoto2" - use v4l && BACKENDS="${BACKENDS} v4l" - for backend in ${IUSE_SANE_BACKENDS}; do - if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then - BACKENDS="${BACKENDS} ${backend}" - fi - done - - local myconf="$(use_enable usb libusb) $(use_with snmp)" - # you can only enable this backend, not disable it... - if use sane_backends_pnm; then - myconf="${myconf} --enable-pnm-backend" - fi - if ! use doc; then - myconf="${myconf} --disable-latex" - fi - if use sane_backends_mustek_pp; then - myconf="${myconf} --enable-parport-directio" - fi - if ! ( use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ); then - myconf="${myconf} sane_cv_use_libieee1284=no" - fi - # if LINGUAS is set, just use the listed and supported localizations. - if [ "${LINGUAS-NoLocalesSet}" != NoLocalesSet ]; then - echo > po/LINGUAS - for lang in ${LINGUAS}; do - if [ -a po/${lang}.po ]; then - echo ${lang} >> po/LINGUAS - fi - done - fi - SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ - BACKENDS="${BACKENDS}" econf \ - $(use_with gphoto2) \ - $(use_enable avahi) \ - $(use_enable ipv6) \ - $(use_enable threads pthread) \ - ${myconf} -} - -src_compile() { - emake VARTEXFONTS="${T}/fonts" - - if use usb; then - cd tools/hotplug - grep -v '^$' libsane.usermap > libsane.usermap.new - mv libsane.usermap.new libsane.usermap - fi - - if tc-is-cross-compiler; then - # The build system sucks and doesn't handle this properly. - # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 - tc-export_build_env BUILD_CC - cd "${S}"/tools - ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -I. -I../include \ - ../sanei/sanei_config.c ../sanei/sanei_constrain_value.c \ - ../sanei/sanei_init_debug.c sane-desc.c -o sane-desc || die - local dirs=( hal hotplug hotplug-ng udev ) - local targets=( - hal/libsane.fdi - hotplug/libsane.usermap - hotplug-ng/libsane.db - udev/libsane.rules - ) - mkdir -p "${dirs[@]}" || die - emake "${targets[@]}" - fi -} - -src_install () { - emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ - docdir="${EPREFIX}"/usr/share/doc/${PF} - keepdir /var/lib/lock/sane - fowners root:scanner /var/lib/lock/sane - fperms g+w /var/lib/lock/sane - dodir /etc/env.d - - if use usb; then - insinto /etc/hotplug/usb - exeinto /etc/hotplug/usb - doins tools/hotplug/libsane.usermap - doexe tools/hotplug/libusbscanner - newdoc tools/hotplug/README README.hotplug - fi - udev_newrules tools/udev/libsane.rules 41-libsane.rules - insinto "/usr/share/pkgconfig" - doins tools/sane-backends.pc - - dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux - find "${ED}" -name "*.la" | while read file; do rm "${file}"; done - if use xinetd; then - insinto /etc/xinetd.d - doins "${FILESDIR}"/saned - fi - - newinitd "${FILESDIR}"/saned.initd saned - newconfd "${FILESDIR}"/saned.confd saned -} - -pkg_postinst() { - if use xinetd; then - elog "If you want remote clients to connect, edit" - elog "/etc/sane.d/saned.conf and /etc/hosts.allow" - fi - - elog "If you are using an USB scanner, add all users who want" - elog "to access your scanner to the \"scanner\" group." -} diff --git a/media-gfx/sane-backends/sane-backends-1.0.23-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.23-r2.ebuild deleted file mode 100644 index 79b5fe1b40c3..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.0.23-r2.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23-r2.ebuild,v 1.1 2013/08/27 12:03:20 teiresias Exp $ - -EAPI="5" - -inherit autotools eutils flag-o-matic multilib udev user toolchain-funcs - -# gphoto and v4l are handled by their usual USE flags. -# The pint backend was disabled because I could not get it to compile. -IUSE_SANE_BACKENDS=" - abaton - agfafocus - apple - artec - artec_eplus48u - as6e - avision - bh - canon - canon630u - canon_dr - canon_pp - cardscan - coolscan - coolscan2 - coolscan3 - dc210 - dc240 - dc25 - dell1600n_net - dmc - epjitsu - epson - epson2 - fujitsu - genesys - gt68xx - hp - hp3500 - hp3900 - hp4200 - hp5400 - hp5590 - hpljm1005 - hpsj5s - hs2p - ibm - kodak - kodakaio - kvs1025 - kvs20xx - kvs40xx - leo - lexmark - ma1509 - magicolor - matsushita - microtek - microtek2 - mustek - mustek_pp - mustek_usb - mustek_usb2 - nec - net - niash - p5 - pie - pixma - plustek - plustek_pp - pnm - qcam - ricoh - rts8891 - s9036 - sceptre - sharp - sm3600 - sm3840 - snapscan - sp15c - st400 - stv680 - tamarack - teco1 - teco2 - teco3 - test - u12 - umax - umax1220u - umax_pp - xerox_mfp" - -IUSE="avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp" - -for backend in ${IUSE_SANE_BACKENDS}; do - if [ ${backend} = pnm ]; then - IUSE="${IUSE} -sane_backends_pnm" - elif [ ${backend} = mustek_usb2 -o ${backend} = kvs40xx ]; then - IUSE="${IUSE} sane_backends_${backend}" - else - IUSE="${IUSE} +sane_backends_${backend}" - fi -done - -REQUIRED_USE=" - sane_backends_mustek_usb2? ( threads ) - sane_backends_kvs40xx? ( threads ) -" - -DESCRIPTION="Scanner Access Now Easy - Backends" -HOMEPAGE="http://www.sane-project.org/" -SRC_URI="https://alioth.debian.org/frs/download.php/3752/sane-backends-1.0.23.tar.gz.1 - https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2 - https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3" - -LICENSE="GPL-2 public-domain" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" - -RDEPEND=" - sane_backends_dc210? ( virtual/jpeg ) - sane_backends_dc240? ( virtual/jpeg ) - sane_backends_dell1600n_net? ( virtual/jpeg - sane_backends_kodakaio? ( net-print/cups ) - media-libs/tiff ) - avahi? ( >=net-dns/avahi-0.6.24 ) - sane_backends_canon_pp? ( sys-libs/libieee1284 ) - sane_backends_hpsj5s? ( sys-libs/libieee1284 ) - sane_backends_mustek_pp? ( sys-libs/libieee1284 ) - usb? ( virtual/libusb:1 ) - gphoto2? ( - media-libs/libgphoto2:= - virtual/jpeg - ) - v4l? ( media-libs/libv4l ) - xinetd? ( sys-apps/xinetd ) - snmp? ( net-analyzer/net-snmp ) -" - -DEPEND="${RDEPEND} - v4l? ( sys-kernel/linux-headers ) - doc? ( - virtual/latex-base - dev-texlive/texlive-latexextra - ) - >=sys-apps/sed-4 - - virtual/pkgconfig" - -# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) -RDEPEND="${RDEPEND} - ! "${P}.tar.gz" - unpack ./"${P}.tar.gz" -} - -src_prepare() { - cat >> backend/dll.conf.in <<-EOF - # Add support for the HP-specific backend. Needs net-print/hplip installed. - hpaio - # Add support for the Epson-specific backend. Needs media-gfx/iscan installed. - epkowa - EOF - epatch "${FILESDIR}"/niash_array_index.patch \ - "${FILESDIR}"/${P}-automagic-cups.patch \ - "${FILESDIR}"/${P}-automagic-v4l.patch \ - "${FILESDIR}"/${PN}-1.0.23-saned_pidfile_location.patch \ - "${FILESDIR}"/kodakaio-fixes.patch - AT_NOELIBTOOLIZE=yes eautoreconf -} - -src_configure() { - append-flags -fno-strict-aliasing - - # the blank is intended - an empty string would result in building ALL backends. - local BACKENDS=" " - - use gphoto2 && BACKENDS="gphoto2" - use v4l && BACKENDS="${BACKENDS} v4l" - for backend in ${IUSE_SANE_BACKENDS}; do - if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then - BACKENDS="${BACKENDS} ${backend}" - fi - done - - local myconf="$(use_enable usb libusb_1_0) $(use_with snmp)" - # you can only enable this backend, not disable it... - if use sane_backends_pnm; then - myconf="${myconf} --enable-pnm-backend" - fi - if ! use doc; then - myconf="${myconf} --disable-latex" - fi - if use sane_backends_mustek_pp; then - myconf="${myconf} --enable-parport-directio" - fi - if use sane_backends_kodakaio; then - myconf="${myconf} --enable-cups" - fi - if ! ( use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ); then - myconf="${myconf} sane_cv_use_libieee1284=no" - fi - # if LINGUAS is set, just use the listed and supported localizations. - if [ "${LINGUAS-NoLocalesSet}" != NoLocalesSet ]; then - echo > po/LINGUAS - for lang in ${LINGUAS}; do - if [ -a po/${lang}.po ]; then - echo ${lang} >> po/LINGUAS - fi - done - fi - SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ - BACKENDS="${BACKENDS}" econf \ - $(use_with gphoto2) \ - $(use_with v4l) \ - $(use_enable avahi) \ - $(use_enable ipv6) \ - $(use_enable threads pthread) \ - ${myconf} -} - -src_compile() { - emake VARTEXFONTS="${T}/fonts" - - if use usb; then - cd tools/hotplug - grep -v '^$' libsane.usermap > libsane.usermap.new - mv libsane.usermap.new libsane.usermap - fi - - if tc-is-cross-compiler; then - # The build system sucks and doesn't handle this properly. - # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 - tc-export_build_env BUILD_CC - cd "${S}"/tools - ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -I. -I../include \ - ../sanei/sanei_config.c ../sanei/sanei_constrain_value.c \ - ../sanei/sanei_init_debug.c sane-desc.c -o sane-desc || die - local dirs=( hal hotplug hotplug-ng udev ) - local targets=( - hal/libsane.fdi - hotplug/libsane.usermap - hotplug-ng/libsane.db - udev/libsane.rules - ) - mkdir -p "${dirs[@]}" || die - emake "${targets[@]}" - fi -} - -src_install () { - emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ - docdir="${EPREFIX}"/usr/share/doc/${PF} - keepdir /var/lib/lock/sane - fowners root:scanner /var/lib/lock/sane - fperms g+w /var/lib/lock/sane - dodir /etc/env.d - - if use usb; then - insinto /etc/hotplug/usb - exeinto /etc/hotplug/usb - doins tools/hotplug/libsane.usermap - doexe tools/hotplug/libusbscanner - newdoc tools/hotplug/README README.hotplug - fi - udev_newrules tools/udev/libsane.rules 41-libsane.rules - insinto "/usr/share/pkgconfig" - doins tools/sane-backends.pc - - dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux - find "${ED}" -name "*.la" | while read file; do rm "${file}"; done - if use xinetd; then - insinto /etc/xinetd.d - doins "${FILESDIR}"/saned - fi - - newinitd "${FILESDIR}"/saned.initd saned - newconfd "${FILESDIR}"/saned.confd saned -} - -pkg_postinst() { - if use xinetd; then - elog "If you want remote clients to connect, edit" - elog "/etc/sane.d/saned.conf and /etc/hosts.allow" - fi - - elog "If you are using an USB scanner, add all users who want" - elog "to access your scanner to the \"scanner\" group." -} diff --git a/media-gfx/sane-backends/sane-backends-1.0.23.ebuild b/media-gfx/sane-backends/sane-backends-1.0.23.ebuild deleted file mode 100644 index cd80e2aac46a..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.0.23.ebuild +++ /dev/null @@ -1,288 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23.ebuild,v 1.17 2013/05/08 19:35:31 vapier Exp $ - -EAPI="5" - -inherit eutils flag-o-matic multilib udev user toolchain-funcs - -# gphoto and v4l are handled by their usual USE flags. -# The pint backend was disabled because I could not get it to compile. -IUSE_SANE_BACKENDS=" - abaton - agfafocus - apple - artec - artec_eplus48u - as6e - avision - bh - canon - canon630u - canon_dr - canon_pp - cardscan - coolscan - coolscan2 - coolscan3 - dc210 - dc240 - dc25 - dell1600n_net - dmc - epjitsu - epson - epson2 - fujitsu - genesys - gt68xx - hp - hp3500 - hp3900 - hp4200 - hp5400 - hp5590 - hpljm1005 - hpsj5s - hs2p - ibm - kodak - kodakaio - kvs1025 - kvs20xx - kvs40xx - leo - lexmark - ma1509 - magicolor - matsushita - microtek - microtek2 - mustek - mustek_pp - mustek_usb - mustek_usb2 - nec - net - niash - p5 - pie - pixma - plustek - plustek_pp - pnm - qcam - ricoh - rts8891 - s9036 - sceptre - sharp - sm3600 - sm3840 - snapscan - sp15c - st400 - stv680 - tamarack - teco1 - teco2 - teco3 - test - u12 - umax - umax1220u - umax_pp - xerox_mfp" - -IUSE="avahi doc gphoto2 ipv6 threads usb v4l xinetd" - -for backend in ${IUSE_SANE_BACKENDS}; do - if [ ${backend} = pnm ]; then - IUSE="${IUSE} -sane_backends_pnm" - elif [ ${backend} = mustek_usb2 -o ${backend} = kvs40xx ]; then - IUSE="${IUSE} sane_backends_${backend}" - else - IUSE="${IUSE} +sane_backends_${backend}" - fi -done - -REQUIRED_USE=" - sane_backends_mustek_usb2? ( threads ) - sane_backends_kvs40xx? ( threads ) -" - -DESCRIPTION="Scanner Access Now Easy - Backends" -HOMEPAGE="http://www.sane-project.org/" - -RDEPEND=" - sane_backends_dc210? ( virtual/jpeg ) - sane_backends_dc240? ( virtual/jpeg ) - sane_backends_dell1600n_net? ( virtual/jpeg - media-libs/tiff ) - avahi? ( >=net-dns/avahi-0.6.24 ) - sane_backends_canon_pp? ( sys-libs/libieee1284 ) - sane_backends_hpsj5s? ( sys-libs/libieee1284 ) - sane_backends_mustek_pp? ( sys-libs/libieee1284 ) - usb? ( virtual/libusb:0 ) - gphoto2? ( - media-libs/libgphoto2:= - virtual/jpeg - ) - v4l? ( media-libs/libv4l ) - xinetd? ( sys-apps/xinetd )" - -DEPEND="${RDEPEND} - v4l? ( sys-kernel/linux-headers ) - doc? ( - virtual/latex-base - dev-texlive/texlive-latexextra - ) - >=sys-apps/sed-4 - - virtual/pkgconfig" - -# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) -RDEPEND="${RDEPEND} - !> "${P}.tar.gz" - done - tar xzf "${P}.tar.gz" -} - -src_prepare() { - cat >> backend/dll.conf.in <<-EOF - # Add support for the HP-specific backend. Needs net-print/hplip installed. - hpaio - # Add support for the Epson-specific backend. Needs media-gfx/iscan installed. - epkowa - EOF - epatch "${FILESDIR}"/niash_array_index.patch - -} - -src_configure() { - append-flags -fno-strict-aliasing - - # the blank is intended - an empty string would result in building ALL backends. - local BACKENDS=" " - - use gphoto2 && BACKENDS="gphoto2" - use v4l && BACKENDS="${BACKENDS} v4l" - for backend in ${IUSE_SANE_BACKENDS}; do - if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then - BACKENDS="${BACKENDS} ${backend}" - fi - done - - local myconf=$(use_enable usb libusb) - # you can only enable this backend, not disable it... - if use sane_backends_pnm; then - myconf="${myconf} --enable-pnm-backend" - fi - if ! use doc; then - myconf="${myconf} --disable-latex" - fi - if use sane_backends_mustek_pp; then - myconf="${myconf} --enable-parport-directio" - fi - if ! ( use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ); then - myconf="${myconf} sane_cv_use_libieee1284=no" - fi - # if LINGUAS is set, just use the listed and supported localizations. - if [ "${LINGUAS-NoLocalesSet}" != NoLocalesSet ]; then - echo > po/LINGUAS - for lang in ${LINGUAS}; do - if [ -a po/${lang}.po ]; then - echo ${lang} >> po/LINGUAS - fi - done - fi - SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ - BACKENDS="${BACKENDS}" econf \ - $(use_with gphoto2) \ - $(use_enable avahi) \ - $(use_enable ipv6) \ - $(use_enable threads pthread) \ - ${myconf} -} - -src_compile() { - emake VARTEXFONTS="${T}/fonts" || die - - if use usb; then - cd tools/hotplug - grep -v '^$' libsane.usermap > libsane.usermap.new - mv libsane.usermap.new libsane.usermap - fi - - if tc-is-cross-compiler; then - # The build system sucks and doesn't handle this properly. - # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 - tc-export_build_env BUILD_CC - cd "${S}"/tools - ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -I. -I../include \ - ../sanei/sanei_config.c ../sanei/sanei_constrain_value.c \ - ../sanei/sanei_init_debug.c sane-desc.c -o sane-desc || die - local dirs=( hal hotplug hotplug-ng udev ) - local targets=( - hal/libsane.fdi - hotplug/libsane.usermap - hotplug-ng/libsane.db - udev/libsane.rules - ) - mkdir -p "${dirs[@]}" || die - emake "${targets[@]}" - fi -} - -src_install () { - emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ - docdir="${EPREFIX}"/usr/share/doc/${PF} || die - keepdir /var/lib/lock/sane - fowners root:scanner /var/lib/lock/sane - fperms g+w /var/lib/lock/sane - dodir /etc/env.d - - if use usb; then - insinto /etc/hotplug/usb - exeinto /etc/hotplug/usb - doins tools/hotplug/libsane.usermap - doexe tools/hotplug/libusbscanner - newdoc tools/hotplug/README README.hotplug - fi - udev_newrules tools/udev/libsane.rules 41-libsane.rules - insinto "/usr/share/pkgconfig" - doins tools/sane-backends.pc - - dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux - find "${ED}" -name "*.la" | while read file; do rm "${file}"; done - if use xinetd; then - insinto /etc/xinetd.d - doins "${FILESDIR}"/saned - fi -} - -pkg_postinst() { - if use xinetd; then - elog "If you want remote clients to connect, edit" - elog "/etc/sane.d/saned.conf and /etc/hosts.allow" - elog "If you are using an USB scanner, add the saned user" - elog "to the usb group." - fi -} diff --git a/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild deleted file mode 100644 index e9d632a3e6b1..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild,v 1.12 2014/08/02 18:17:59 ago Exp $ - -EAPI="5" - -inherit autotools eutils flag-o-matic multilib udev user toolchain-funcs - -# gphoto and v4l are handled by their usual USE flags. -# The pint backend was disabled because I could not get it to compile. -IUSE_SANE_BACKENDS=" - abaton - agfafocus - apple - artec - artec_eplus48u - as6e - avision - bh - canon - canon630u - canon_dr - canon_pp - cardscan - coolscan - coolscan2 - coolscan3 - dc210 - dc240 - dc25 - dell1600n_net - dmc - epjitsu - epson - epson2 - fujitsu - genesys - gt68xx - hp - hp3500 - hp3900 - hp4200 - hp5400 - hp5590 - hpljm1005 - hpsj5s - hs2p - ibm - kodak - kodakaio - kvs1025 - kvs20xx - kvs40xx - leo - lexmark - ma1509 - magicolor - matsushita - microtek - microtek2 - mustek - mustek_pp - mustek_usb - mustek_usb2 - nec - net - niash - p5 - pie - pixma - plustek - plustek_pp - pnm - qcam - ricoh - rts8891 - s9036 - sceptre - sharp - sm3600 - sm3840 - snapscan - sp15c - st400 - stv680 - tamarack - teco1 - teco2 - teco3 - test - u12 - umax - umax1220u - umax_pp - xerox_mfp" - -IUSE="avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp systemd" - -for backend in ${IUSE_SANE_BACKENDS}; do - case ${backend} in - # Disable backends that require parallel ports as no one has those anymore. - canon_pp|hpsj5s|mustek_pp|\ - pnm) - IUSE+=" -sane_backends_${backend}" - ;; - mustek_usb2|kvs40xx) - IUSE+=" sane_backends_${backend}" - ;; - *) - IUSE+=" +sane_backends_${backend}" - esac -done - -REQUIRED_USE=" - sane_backends_mustek_usb2? ( threads ) - sane_backends_kvs40xx? ( threads ) -" - -DESCRIPTION="Scanner Access Now Easy - Backends" -HOMEPAGE="http://www.sane-project.org/" -SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz" - -LICENSE="GPL-2 public-domain" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" - -RDEPEND=" - sane_backends_dc210? ( virtual/jpeg ) - sane_backends_dc240? ( virtual/jpeg ) - sane_backends_dell1600n_net? ( virtual/jpeg - media-libs/tiff ) - avahi? ( >=net-dns/avahi-0.6.24 ) - sane_backends_canon_pp? ( sys-libs/libieee1284 ) - sane_backends_hpsj5s? ( sys-libs/libieee1284 ) - sane_backends_mustek_pp? ( sys-libs/libieee1284 ) - usb? ( virtual/libusb:1 ) - gphoto2? ( - media-libs/libgphoto2:= - virtual/jpeg - ) - v4l? ( media-libs/libv4l ) - xinetd? ( sys-apps/xinetd ) - snmp? ( net-analyzer/net-snmp ) - systemd? ( sys-apps/systemd:0= ) -" - -DEPEND="${RDEPEND} - v4l? ( sys-kernel/linux-headers ) - doc? ( - virtual/latex-base - dev-texlive/texlive-latexextra - ) - >=sys-apps/sed-4 - - virtual/pkgconfig" - -# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) -RDEPEND="${RDEPEND} - !> backend/dll.conf.in <<-EOF - # Add support for the HP-specific backend. Needs net-print/hplip installed. - hpaio - # Add support for the Epson-specific backend. Needs media-gfx/iscan installed. - epkowa - EOF - epatch "${FILESDIR}"/niash_array_index.patch \ - "${FILESDIR}"/${P}-unused-cups.patch \ - "${FILESDIR}"/${P}-automagic_systemd.patch \ - "${FILESDIR}"/${P}-systemd_pkgconfig.patch \ - "${FILESDIR}"/${P}-kodakaio_avahi.patch \ - "${FILESDIR}"/${P}-saned_pidfile_location.patch - # Fix for "make check". - sed -i -e 's/sane-backends 1.0.24git/sane-backends 1.0.24/' testsuite/tools/data/html* - AT_NOELIBTOOLIZE=yes eautoreconf -} - -src_configure() { - append-flags -fno-strict-aliasing - - # the blank is intended - an empty string would result in building ALL backends. - local BACKENDS=" " - - use gphoto2 && BACKENDS="gphoto2" - use v4l && BACKENDS="${BACKENDS} v4l" - for backend in ${IUSE_SANE_BACKENDS}; do - if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then - BACKENDS="${BACKENDS} ${backend}" - fi - done - - local myconf="$(use_enable usb libusb_1_0) $(use_with snmp)" - # you can only enable this backend, not disable it... - if use sane_backends_pnm; then - myconf="${myconf} --enable-pnm-backend" - fi - if ! use doc; then - myconf="${myconf} --disable-latex" - fi - if use sane_backends_mustek_pp; then - myconf="${myconf} --enable-parport-directio" - fi - if ! ( use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ); then - myconf="${myconf} sane_cv_use_libieee1284=no" - fi - # if LINGUAS is set, just use the listed and supported localizations. - if [ "${LINGUAS-NoLocalesSet}" != NoLocalesSet ]; then - echo > po/LINGUAS - for lang in ${LINGUAS}; do - if [ -a po/${lang}.po ]; then - echo ${lang} >> po/LINGUAS - fi - done - fi - SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ - BACKENDS="${BACKENDS}" econf \ - $(use_with gphoto2) \ - $(use_with systemd) \ - $(use_with v4l) \ - $(use_enable avahi) \ - $(use_enable ipv6) \ - $(use_enable threads pthread) \ - ${myconf} -} - -src_compile() { - emake VARTEXFONTS="${T}/fonts" - - if use usb; then - cd tools/hotplug - grep -v '^$' libsane.usermap > libsane.usermap.new - mv libsane.usermap.new libsane.usermap - fi - - if tc-is-cross-compiler; then - # The build system sucks and doesn't handle this properly. - # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 - tc-export_build_env BUILD_CC - cd "${S}"/tools - ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -I. -I../include \ - ../sanei/sanei_config.c ../sanei/sanei_constrain_value.c \ - ../sanei/sanei_init_debug.c sane-desc.c -o sane-desc || die - local dirs=( hal hotplug hotplug-ng udev ) - local targets=( - hal/libsane.fdi - hotplug/libsane.usermap - hotplug-ng/libsane.db - udev/libsane.rules - ) - mkdir -p "${dirs[@]}" || die - emake "${targets[@]}" - fi -} - -src_install () { - emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ - docdir="${EPREFIX}"/usr/share/doc/${PF} - keepdir /var/lib/lock/sane - fowners root:scanner /var/lib/lock/sane - fperms g+w /var/lib/lock/sane - dodir /etc/env.d - - if use usb; then - insinto /etc/hotplug/usb - exeinto /etc/hotplug/usb - doins tools/hotplug/libsane.usermap - doexe tools/hotplug/libusbscanner - newdoc tools/hotplug/README README.hotplug - fi - udev_newrules tools/udev/libsane.rules 41-libsane.rules - insinto "/usr/share/pkgconfig" - doins tools/sane-backends.pc - - dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux - find "${ED}" -name "*.la" | while read file; do rm "${file}"; done - if use xinetd; then - insinto /etc/xinetd.d - doins "${FILESDIR}"/saned - fi - - newinitd "${FILESDIR}"/saned.initd saned - newconfd "${FILESDIR}"/saned.confd saned -} - -pkg_postinst() { - if use xinetd; then - elog "If you want remote clients to connect, edit" - elog "/etc/sane.d/saned.conf and /etc/hosts.allow" - fi - - elog "If you are using a USB scanner, add all users who want" - elog "to access your scanner to the \"scanner\" group." -} -- 2.26.2