| 1 |
commit: 08c3e63601b1e41914d6c332c8b1fc9dc8972a1c |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 9 19:17:01 2012 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 9 19:17:01 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/axs.git;a=commit;h=08c3e636 |
| 7 |
|
| 8 |
Sync with tree 2012-07-09 ~18:00UTC , cleaned up some junk |
| 9 |
|
| 10 |
--- |
| 11 |
media-video/gxine/.#Manifest.1.181 | 9 - |
| 12 |
media-video/gxine/.#gxine-0.5.907.ebuild.1.6 | 101 --------- |
| 13 |
media-video/vlc/.#Manifest.1.901 | 15 -- |
| 14 |
media-video/vlc/.#Manifest.1.907 | 34 --- |
| 15 |
net-print/cups/.#Manifest.1.577 | 36 --- |
| 16 |
net-print/cups/.#Manifest.1.578 | 67 ------ |
| 17 |
net-print/cups/.#cups-1.5.2-r4.ebuild.1.13 | 302 ------------------------- |
| 18 |
net-print/cups/.#cups-1.5.3.ebuild.1.4 | 311 -------------------------- |
| 19 |
8 files changed, 0 insertions(+), 875 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-video/gxine/.#Manifest.1.181 b/media-video/gxine/.#Manifest.1.181 |
| 22 |
deleted file mode 100644 |
| 23 |
index 0a91523..0000000 |
| 24 |
--- a/media-video/gxine/.#Manifest.1.181 |
| 25 |
+++ /dev/null |
| 26 |
@@ -1,9 +0,0 @@ |
| 27 |
-AUX gxine-0.5.905-desktop.patch 377 RMD160 ea7d11a796ff9142cf0f578b3b5a2fe3de4f2125 SHA1 b4a327db63dc99a755a34cb60b15e03a7b3d39d9 SHA256 e0051e9737382b3c21e2d3e6f0d9eacd1fb5d589f480a155a396e1924512d7a5 |
| 28 |
-AUX gxine-0.5.905-fix-nspr-useage.patch 433 RMD160 65af0ddee220ca456acf20eea521fe6a4600cd23 SHA1 fc7a2ce90a8e84d1f519a786de9f477264ea925b SHA256 4d05d9144eba4f30976ed3e33e3985c782b95227d165ab90b4f453c377451ea6 |
| 29 |
-AUX gxine-0.5.906-endif.patch 349 RMD160 0683bb409616d8ef878e4144e747bd0032fc236f SHA1 0c48cf0457f21dea9bdc70bed62421cd6bbdebfb SHA256 d3d14fdffe9f8e1872bcbf28670d48b72ed76d7a882902bb298902bb8ca4b6fa |
| 30 |
-AUX gxine-0.5.907-glib-2.31.patch 636 RMD160 07142250875de0c55b8ec74d462f0802ea6354a3 SHA1 413fd32963958b5efbdb9310f45fbdca801c8083 SHA256 c45a8fa2df4a779bbc7866a3d7fd56c4c9946e71656f06452f5f147a9ee4e15c |
| 31 |
-AUX gxine-0.5.907-mozjs187.patch 793 RMD160 8ea018f085598b4a04669b453f90d4329758df71 SHA1 80722b851aff4c6125552791edd08f9b1e36702b SHA256 3f3ecdff5dbbce75c2d54bd545a02b01c1840657556c3c42899804bb7f904d39 |
| 32 |
-DIST gxine-0.5.907.tar.xz 910528 RMD160 35be9f7737c1b45787a46dd61916c81c33bea15e SHA1 1b49b5b6a800611db032e4b7fd36af97a731a167 SHA256 b5c925806a35cb23a24a80a39d494cefb529e22c957987741f269a994ab258d5 |
| 33 |
-EBUILD gxine-0.5.907.ebuild 2729 RMD160 6046753fc2a63b8b4ead73ee09298c516c39ebc7 SHA1 9b4cf4c7efca4a7a5b2a392ae07c9066b0c5a43a SHA256 df6a163856992224fe78c9237aed48800529488a07f34ec92b0bd84e6d62ed87 |
| 34 |
-MISC ChangeLog 17755 RMD160 6d86b12fc0a4d27514e831ba5b8679f9671b8580 SHA1 68a6d384f2d57bc191163d95981000e4bcc70a29 SHA256 02cc1cd4ddccee05a645fc8d9e42fe85125da53e86c0f701d412122c1db30d61 |
| 35 |
-MISC metadata.xml 373 RMD160 879bbceb1af5297cc90a6191f9a40375a4732c81 SHA1 9e40c5d9bb710cc676c38c9a097af598db072e60 SHA256 202b197a4f7feb227636e8de2bc00c6af351fd80f72a7916df100aeadd056bd9 |
| 36 |
|
| 37 |
diff --git a/media-video/gxine/.#gxine-0.5.907.ebuild.1.6 b/media-video/gxine/.#gxine-0.5.907.ebuild.1.6 |
| 38 |
deleted file mode 100644 |
| 39 |
index 7f9ee81..0000000 |
| 40 |
--- a/media-video/gxine/.#gxine-0.5.907.ebuild.1.6 |
| 41 |
+++ /dev/null |
| 42 |
@@ -1,101 +0,0 @@ |
| 43 |
-# Copyright 1999-2012 Gentoo Foundation |
| 44 |
-# Distributed under the terms of the GNU General Public License v2 |
| 45 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.907.ebuild,v 1.6 2012/05/17 20:32:07 ssuominen Exp $ |
| 46 |
- |
| 47 |
-EAPI=4 |
| 48 |
-inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins |
| 49 |
- |
| 50 |
-DESCRIPTION="GTK+ Front-End for libxine" |
| 51 |
-HOMEPAGE="http://xine.sourceforge.net/" |
| 52 |
-SRC_URI="mirror://sourceforge/xine/${P}.tar.xz" |
| 53 |
- |
| 54 |
-LICENSE="GPL-2" |
| 55 |
-SLOT="0" |
| 56 |
-KEYWORDS="amd64 ppc ppc64 x86" |
| 57 |
-IUSE="gnome-screensaver linguas_cs linguas_de lirc nls nsplugin udev +xcb xinerama" |
| 58 |
- |
| 59 |
-COMMON_DEPEND=">=media-libs/xine-lib-1.1.20 |
| 60 |
- x11-libs/gtk+:2 |
| 61 |
- >=dev-libs/glib-2 |
| 62 |
- >=dev-lang/spidermonkey-1.8.2.15 |
| 63 |
- x11-libs/libX11 |
| 64 |
- x11-libs/libXext |
| 65 |
- x11-libs/libXrender |
| 66 |
- gnome-screensaver? ( >=dev-libs/dbus-glib-0.90 ) |
| 67 |
- lirc? ( app-misc/lirc ) |
| 68 |
- nls? ( virtual/libintl ) |
| 69 |
- nsplugin? ( dev-libs/nspr |
| 70 |
- x11-libs/libXaw |
| 71 |
- x11-libs/libXt ) |
| 72 |
- udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) ) |
| 73 |
- xcb? ( x11-libs/libxcb ) |
| 74 |
- xinerama? ( x11-libs/libXinerama )" |
| 75 |
-RDEPEND="${COMMON_DEPEND} |
| 76 |
- gnome-screensaver? ( gnome-extra/gnome-screensaver )" |
| 77 |
-DEPEND="${COMMON_DEPEND} |
| 78 |
- virtual/pkgconfig |
| 79 |
- nls? ( sys-devel/gettext )" |
| 80 |
- |
| 81 |
-src_prepare() { |
| 82 |
- # ld: cannot find -ljs |
| 83 |
- sed -i -e '/JS_LIBS="`spidermonkey_locate_lib/s:js:mozjs:' m4/_js.m4 || die |
| 84 |
- |
| 85 |
- epatch \ |
| 86 |
- "${FILESDIR}"/${PN}-0.5.905-desktop.patch \ |
| 87 |
- "${FILESDIR}"/${PN}-0.5.905-fix-nspr-useage.patch \ |
| 88 |
- "${FILESDIR}"/${PN}-0.5.906-endif.patch \ |
| 89 |
- "${FILESDIR}"/${PN}-0.5.907-glib-2.31.patch \ |
| 90 |
- "${FILESDIR}"/${PN}-0.5.907-mozjs187.patch |
| 91 |
- |
| 92 |
- # need to disable calling of xine-list when running without |
| 93 |
- # userpriv, otherwise we get sandbox violations (bug #233847) |
| 94 |
- if [[ ${EUID} == "0" ]]; then |
| 95 |
- sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die |
| 96 |
- fi |
| 97 |
- |
| 98 |
- eautoreconf |
| 99 |
-} |
| 100 |
- |
| 101 |
-src_configure() { |
| 102 |
- econf \ |
| 103 |
- $(use_enable nls) \ |
| 104 |
- $(use_enable lirc) \ |
| 105 |
- --enable-watchdog \ |
| 106 |
- $(use_with xcb) \ |
| 107 |
- $(has_version '<dev-lang/spidermonkey-1.8.5' && echo --with-spidermonkey=/usr/include/js) \ |
| 108 |
- $(use_with nsplugin browser-plugin) \ |
| 109 |
- $(use_with udev gudev) \ |
| 110 |
- --without-hal \ |
| 111 |
- $(use_with gnome-screensaver dbus) \ |
| 112 |
- $(use_with xinerama) |
| 113 |
-} |
| 114 |
- |
| 115 |
-src_install() { |
| 116 |
- emake DESTDIR="${D}" \ |
| 117 |
- docdir=/usr/share/doc/${PF} \ |
| 118 |
- docsdir=/usr/share/doc/${PF} \ |
| 119 |
- install |
| 120 |
- |
| 121 |
- dodoc AUTHORS BUGS ChangeLog README{,_l10n} TODO |
| 122 |
- |
| 123 |
- use linguas_cs && dodoc README.cs |
| 124 |
- use linguas_de && dodoc README.de |
| 125 |
- |
| 126 |
- use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so |
| 127 |
-} |
| 128 |
- |
| 129 |
-pkg_preinst() { |
| 130 |
- gnome2_icon_savelist |
| 131 |
-} |
| 132 |
- |
| 133 |
-pkg_postinst() { |
| 134 |
- fdo-mime_desktop_database_update |
| 135 |
- fdo-mime_mime_database_update |
| 136 |
- gnome2_icon_cache_update |
| 137 |
-} |
| 138 |
- |
| 139 |
-pkg_postrm() { |
| 140 |
- fdo-mime_desktop_database_update |
| 141 |
- fdo-mime_mime_database_update |
| 142 |
- gnome2_icon_cache_update |
| 143 |
-} |
| 144 |
|
| 145 |
diff --git a/media-video/vlc/.#Manifest.1.901 b/media-video/vlc/.#Manifest.1.901 |
| 146 |
deleted file mode 100644 |
| 147 |
index cbd5cc4..0000000 |
| 148 |
--- a/media-video/vlc/.#Manifest.1.901 |
| 149 |
+++ /dev/null |
| 150 |
@@ -1,15 +0,0 @@ |
| 151 |
-DIST vlc-1.1.13.tar.bz2 26226587 RMD160 c5aa438a9085ddbf28e849df442b75475693290d SHA1 05bbc7ff427f3b919b29a45ce014caff9ba92648 SHA256 03edec44d463b9f5e7db56fd844c6d4ac79966638e1ac32dedcfb5847a9323c1 |
| 152 |
-DIST vlc-1.2.0-pre3.tar.xz 17215472 RMD160 908b0dad62215a114b664182d19131556aa0aea4 SHA1 ae8a37147fe35977eab2d9e1a876b8847ea13185 SHA256 d19efcd6c3dfe6b39eda44ac24af25f42d5df515129719fe0f425c8939d0a5d7 |
| 153 |
-DIST vlc-1.2.0-pre4.tar.xz 17271404 RMD160 fb07f6776fab9d3422db76792fe3007d3d02eeb1 SHA1 85162c3fd31de4f4284cb88b5cc616de0728d9cb SHA256 aa076c59efff401b5292c6b8fb3adb5099038d6d1621714b6132f8a51bcb46aa |
| 154 |
-DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae |
| 155 |
-DIST vlc-patches-104.tar.bz2 3839 RMD160 bde7bd345b8082a82382f8c874d7ec2a9151382e SHA1 85729ea0889de759d8476c9571c2680fd31b588c SHA256 cb019bdea9ea95b7bbe2d2ef1194d276e93e1cf0e4e62403e80698c785f1a1ec |
| 156 |
-EBUILD vlc-1.1.13-r1.ebuild 12291 RMD160 dcb376e41ea8c999bc6f1f9ff97c3fd48cac3559 SHA1 1e6ffc550749a7810596c6533aeb27239b372335 SHA256 0585f1d32e5c3db51f231ec59d5f641018df0db90b8a9324f9093d40824334ab |
| 157 |
-EBUILD vlc-1.1.13.ebuild 12193 RMD160 ecb63cb768039dcc38b0ca81af81aee994af0d26 SHA1 dbb51c13ac469e3c1a386df099107842a528deaf SHA256 f4155557ab7a9b349e898448ae93bfabf469fcfe29d85c993cdbc61633970d5d |
| 158 |
-EBUILD vlc-1.1.9999.ebuild 12203 RMD160 c01bd4a095afb95e134d0381c0a607d95c02a5c6 SHA1 260af6ab266b05e9cd9ee4f7650dea7b997b056d SHA256 613280dc3e31ede0759666fa39169e3bae7c9bc8d58941bfa59599e368e85212 |
| 159 |
-EBUILD vlc-1.2.0_pre3.ebuild 10921 RMD160 c54e89d71a420e36e2af6f397b316bfb8ae89004 SHA1 d76ba004de0d40faa3cc4a1a7d1face46f6f1dbe SHA256 6fbe9892435ee806b406e7d483fe104d6aa4b46823e37283ef798704ee4ce879 |
| 160 |
-EBUILD vlc-1.2.0_pre4.ebuild 10921 RMD160 dbd3a82570ac10cdb7f9f4d05c3786aa632e9be3 SHA1 b314856c05963a0ecc138c75545021d1aae9f347 SHA256 cd69ce60e67674bd015bf2f7328ee5d29f60bd1467aa37e772cb6102699c389e |
| 161 |
-EBUILD vlc-1.2.9999.ebuild 10919 RMD160 7907d6f24f11571626900a54190512b9df5a9e94 SHA1 1aee34945ee998da2de7e420cc8e9883ba312c78 SHA256 e35c9c6f68890c84e4edaafbb3338d9be1ffad199b2e7915a53fedc04c8d671d |
| 162 |
-EBUILD vlc-9999.ebuild 10917 RMD160 f23f6fb0bf672361b674ddc2bcb2f9111f8cb173 SHA1 6dba975e44b69f95c6ad4ddf6d63258f7f5a3b00 SHA256 a75d591df2a956c482e159f3025e0f7a3c43725a2b89f0dc25fd06834855638e |
| 163 |
-MISC ChangeLog 868 RMD160 2da906ed90856d18dd8fba4e5eb7b105bc1350db SHA1 4dfd0b29d1aeedf8f98cb9a00e3130e73a26be98 SHA256 65969ec15d0ed85dffce56f5a72a31e845c8bb960f0c062698c98b5490bb077c |
| 164 |
-MISC ChangeLog-2011 113818 RMD160 fbb86916aed66ae0a18a2b1f13d3c1dc9fdcaf7a SHA1 5e3dab004808f103ffae80563d33568e98f0d119 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 |
| 165 |
-MISC metadata.xml 6434 RMD160 25dd84337768e1300e1f749aae2bfc5f1049cae6 SHA1 13b5b26151422b36aaecffadbd85fe50d797f978 SHA256 1f61197b2f127f1a6dfd60f76de3568ee1ccb8cbaff1fac52757b6f32d5f4d6b |
| 166 |
|
| 167 |
diff --git a/media-video/vlc/.#Manifest.1.907 b/media-video/vlc/.#Manifest.1.907 |
| 168 |
deleted file mode 100644 |
| 169 |
index d82649e..0000000 |
| 170 |
--- a/media-video/vlc/.#Manifest.1.907 |
| 171 |
+++ /dev/null |
| 172 |
@@ -1,34 +0,0 @@ |
| 173 |
-DIST vlc-1.1.13.tar.bz2 26226587 RMD160 c5aa438a9085ddbf28e849df442b75475693290d SHA1 05bbc7ff427f3b919b29a45ce014caff9ba92648 SHA256 03edec44d463b9f5e7db56fd844c6d4ac79966638e1ac32dedcfb5847a9323c1 |
| 174 |
-DIST vlc-2.0.0-rc1.tar.xz 16936652 RMD160 994ca78637109324cc0987b3930f753829449c14 SHA1 c4a7416b949a6f5c6839fd8805bae170b2d1bd12 SHA256 a237aee9edde249d03ae15e918ddd90cd20c8faff30883a300bf0a24659442f4 |
| 175 |
-DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae |
| 176 |
-<<<<<<< Manifest |
| 177 |
-DIST vlc-patches-104.tar.bz2 3839 RMD160 bde7bd345b8082a82382f8c874d7ec2a9151382e SHA1 85729ea0889de759d8476c9571c2680fd31b588c SHA256 cb019bdea9ea95b7bbe2d2ef1194d276e93e1cf0e4e62403e80698c785f1a1ec |
| 178 |
-EBUILD vlc-1.1.13-r1.ebuild 12291 RMD160 dcb376e41ea8c999bc6f1f9ff97c3fd48cac3559 SHA1 1e6ffc550749a7810596c6533aeb27239b372335 SHA256 0585f1d32e5c3db51f231ec59d5f641018df0db90b8a9324f9093d40824334ab |
| 179 |
-EBUILD vlc-1.1.13.ebuild 12193 RMD160 ecb63cb768039dcc38b0ca81af81aee994af0d26 SHA1 dbb51c13ac469e3c1a386df099107842a528deaf SHA256 f4155557ab7a9b349e898448ae93bfabf469fcfe29d85c993cdbc61633970d5d |
| 180 |
-EBUILD vlc-1.1.9999.ebuild 12203 RMD160 c01bd4a095afb95e134d0381c0a607d95c02a5c6 SHA1 260af6ab266b05e9cd9ee4f7650dea7b997b056d SHA256 613280dc3e31ede0759666fa39169e3bae7c9bc8d58941bfa59599e368e85212 |
| 181 |
-EBUILD vlc-1.2.0_pre3.ebuild 10921 RMD160 c54e89d71a420e36e2af6f397b316bfb8ae89004 SHA1 d76ba004de0d40faa3cc4a1a7d1face46f6f1dbe SHA256 6fbe9892435ee806b406e7d483fe104d6aa4b46823e37283ef798704ee4ce879 |
| 182 |
-EBUILD vlc-1.2.0_pre4.ebuild 10921 RMD160 dbd3a82570ac10cdb7f9f4d05c3786aa632e9be3 SHA1 b314856c05963a0ecc138c75545021d1aae9f347 SHA256 cd69ce60e67674bd015bf2f7328ee5d29f60bd1467aa37e772cb6102699c389e |
| 183 |
-EBUILD vlc-1.2.9999.ebuild 10919 RMD160 7907d6f24f11571626900a54190512b9df5a9e94 SHA1 1aee34945ee998da2de7e420cc8e9883ba312c78 SHA256 e35c9c6f68890c84e4edaafbb3338d9be1ffad199b2e7915a53fedc04c8d671d |
| 184 |
-EBUILD vlc-9999.ebuild 10917 RMD160 f23f6fb0bf672361b674ddc2bcb2f9111f8cb173 SHA1 6dba975e44b69f95c6ad4ddf6d63258f7f5a3b00 SHA256 a75d591df2a956c482e159f3025e0f7a3c43725a2b89f0dc25fd06834855638e |
| 185 |
-MISC ChangeLog 868 RMD160 2da906ed90856d18dd8fba4e5eb7b105bc1350db SHA1 4dfd0b29d1aeedf8f98cb9a00e3130e73a26be98 SHA256 65969ec15d0ed85dffce56f5a72a31e845c8bb960f0c062698c98b5490bb077c |
| 186 |
-======= |
| 187 |
-DIST vlc-patches-105.tar.bz2 4325 RMD160 1fc8f5edc1f136c7074a5a00aabec583aec1cc58 SHA1 9f70e4a7ac7749da58b0134f4de79227a6b66c69 SHA256 e28047c097de2b1daa26b32227f11bb06d09a060b93c6ae2fe564094373f0778 |
| 188 |
-EBUILD vlc-1.1.13.ebuild 12194 RMD160 92bdf50ddae671aff53e870c49263d2c7df031c3 SHA1 dc47c9b331ecd773434477eff18c26a436cc0f93 SHA256 84a530506a3d232db5001547a0f2d5fb84b3071e130944972e0d98512759c819 |
| 189 |
-EBUILD vlc-1.1.9999.ebuild 12203 RMD160 cc8693367d7991d5056f1683b79f432b3eb4441d SHA1 fc15e004900a1f2094218bc2d66994f427d64d7b SHA256 9bfce7ebe400262e21e17b2a6638576c1723da36de0813943f53596e370f37b8 |
| 190 |
-EBUILD vlc-2.0.0_rc1.ebuild 10913 RMD160 9faeeb77985a4aea268109e67c3d849ed9e5a8bf SHA1 0e0d8ec521091844a2410c45a553dff329e2f950 SHA256 ea4269b932940172100ec813ebf5760d283563855bbc5f239c0343460f34c982 |
| 191 |
-EBUILD vlc-2.0.9999.ebuild 10912 RMD160 ef27a538a9b0016307b7d1855d75edfb234bee34 SHA1 abd9540017081009b855d495a2319931111c9535 SHA256 c3a34ee19c2bbca82b0c3b607c0c804e155b3122153f86d55f13c40b7b1e983a |
| 192 |
-EBUILD vlc-9999.ebuild 10833 RMD160 4a126d229549f023e77bd12c48a5dd5a58ae3c0d SHA1 74b1e715fccfbce4970fdccf9e65e6d17982ce27 SHA256 629331f0fbe79676afd17981e606809e01522bd61379ac62bfc74e4d6f70566c |
| 193 |
-MISC ChangeLog 1725 RMD160 72a2232326974f2676b40e6adf848c0850fbf9a4 SHA1 a46ecd0dccdad75697eb23220b1ea0da2be852aa SHA256 557e6a5ff64b6edaef19b39dc38a7a8e61daf3645bf252730259c4ffd356ca43 |
| 194 |
->>>>>>> 1.907 |
| 195 |
-MISC ChangeLog-2011 113818 RMD160 fbb86916aed66ae0a18a2b1f13d3c1dc9fdcaf7a SHA1 5e3dab004808f103ffae80563d33568e98f0d119 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 |
| 196 |
-MISC metadata.xml 6434 RMD160 25dd84337768e1300e1f749aae2bfc5f1049cae6 SHA1 13b5b26151422b36aaecffadbd85fe50d797f978 SHA256 1f61197b2f127f1a6dfd60f76de3568ee1ccb8cbaff1fac52757b6f32d5f4d6b |
| 197 |
-<<<<<<< Manifest |
| 198 |
-======= |
| 199 |
------BEGIN PGP SIGNATURE----- |
| 200 |
-Version: GnuPG v2.0.18 (GNU/Linux) |
| 201 |
- |
| 202 |
-iEYEARECAAYFAk8pl+4ACgkQvFcC4BYPU0pZSQCfbpAIlTskkLk9yshoPp/MVfiw |
| 203 |
-dvsAnj7zhQMDc96JYqyfprwnKBH5eCxW |
| 204 |
-=Qyb8 |
| 205 |
------END PGP SIGNATURE----- |
| 206 |
->>>>>>> 1.907 |
| 207 |
|
| 208 |
diff --git a/net-print/cups/.#Manifest.1.577 b/net-print/cups/.#Manifest.1.577 |
| 209 |
deleted file mode 100644 |
| 210 |
index 8f15135..0000000 |
| 211 |
--- a/net-print/cups/.#Manifest.1.577 |
| 212 |
+++ /dev/null |
| 213 |
@@ -1,36 +0,0 @@ |
| 214 |
-AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526 |
| 215 |
-AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0 |
| 216 |
-AUX cups-1.4.4-dont-compress-manpages.patch 580 RMD160 cbc2bf11025c1f27286bd7f2ece7ba76be6aa7ee SHA1 d7b2447263724eeb092b8cfc8ce54553ad1e5e11 SHA256 cdefd273dcdc78aa5fe14bb0246e25572da7d28a91de5c7ac8be2a0bdd915860 |
| 217 |
-AUX cups-1.4.4-fix-install-perms.patch 838 RMD160 206bd49e918bab96d24ca72f85f679d3c9122975 SHA1 6e8ef0f3e5c0efa636b4d2324bab2c8edc9461db SHA256 66e68f3bebd7339434e3de99582190d0bedce4b2e5370ff65104cc863daee6c2 |
| 218 |
-AUX cups-1.4.4-nostrip.patch 487 RMD160 27fe9a5512abb3496416e492dc4ec4fcd9c733c2 SHA1 2a1b6e7b718a5feb5921f38ec02f37b9d0edd310 SHA256 b96448896f08c5f91d5afb0c093f2638a262d1c45e716c29d5164cefee18bc61 |
| 219 |
-AUX cups-1.4.4-perl-includes.patch 637 RMD160 88d4f170ed5c9392860462f140adf9f860a24cfd SHA1 93185acfe7252ff9a69499f63192b3483d857cb0 SHA256 c730419e7b4bc16a8773a01eeb66523882901480af68686d0790558a2f5fe57d |
| 220 |
-AUX cups-1.4.4-php-destdir.patch 679 RMD160 1b15d42373a952a608a01cb8c97efbbd3c78ac77 SHA1 e312bbae57224dead45284f9c62942b1a25282fc SHA256 d5126c5e917d8c41c7a4da1477800edd4aa752aaa4c6a67a73adbe1e3b050110 |
| 221 |
-AUX cups-1.4.6-force-gnutls.patch 3319 RMD160 c6cc024a702305eb81661d5cdadd9857e9a6778e SHA1 5ac62ed3ca20bc7a4541c990c676c433299b2177 SHA256 beb4014eac5218d9f424b81946ac1e209625026bf20a7f4820758e5ee1fe5b66 |
| 222 |
-AUX cups-1.4.6-serialize-gnutls.patch 3625 RMD160 873b2806cfec732c4a4f3f2981f666a958dd5b0e SHA1 aae046121d0139fbba1cb9147c8742f73b2f1fa0 SHA256 6bc9e16fc6865b2f3e0ee2d1947bdde691e41f90fce32b9839b3661dcea4a827 |
| 223 |
-AUX cups-1.4.8-CVE-2011-3170.patch 1045 RMD160 9a27eb1ec34ced57da5bbe7c55261d8aa35b01c0 SHA1 6155d7c4b34ff6447a93aa56fa4b5958eb943202 SHA256 c94d49c3ff980b830874dae4158768554f87f429ae400838a605505aae350af6 |
| 224 |
-AUX cups-1.4.8-largeimage.patch 572 RMD160 62e0a92fb1dc62adff43bcdc22f201da426d8916 SHA1 1528f2b1f67e7c532418dd7f495db1788ae7d2d4 SHA256 364a3ed3e161ad75836e6bc56746c25207680ab6f44563219c93146f0cf74541 |
| 225 |
-AUX cups-1.5.0-systemd-socket.patch 12829 RMD160 d4ca24c299daf65f2621568443a339f82bd03a2a SHA1 f45e18ba92d3afbca6a26ac676f2f42738032c10 SHA256 350eb1bdb76618dd082e9cda26c5b1400f4f870ffd521186f4d74940d15b4cd5 |
| 226 |
-AUX cups-1.5.2-browsing.patch 513 RMD160 592b2a814f23beea82d61446989636a393ab34a7 SHA1 43f78e93f84a4da430cb2e1ced268ea00d5f00b3 SHA256 47a229fb7be6ada4e48806c24cdba70cd2b6161ac8fcf1290e07063e486b7bfe |
| 227 |
-AUX cups-1.5.2-linkperl.patch 724 RMD160 5e94f21ab236a88ec2026e69aed58ce17dafaa5c SHA1 8556aea40a07176b0daa184bcce1b1abe3d81c48 SHA256 48891623d98a1767c11865d59c72146aa277f1bd0abda9871ae90540676b648e |
| 228 |
-AUX cups-1.5.2-threads.patch 730 RMD160 e021b2d2f5293fb58f24279f2550488f90dc91e5 SHA1 bc1b1a8048d36393995f056493b57f5022e6d854 SHA256 adb76ff55cd6857e7bc6c36e9cb9d63201fe14b0f853f52271b45a54ad07a710 |
| 229 |
-AUX cups-1.5.2-threads2.patch 3192 RMD160 9736e8b03458be45fd1f427d3726368e81d51539 SHA1 2d87e9fe0267f3d6192cc81d1410b5eb534af39d SHA256 07a495e49b7646bfbb0d9f12841f3db8ccd4493c69c8a626b96e913bca384f5c |
| 230 |
-AUX cups-1.5.3-fix-install-perms.patch 989 RMD160 d1c3f9eb1b1f3444a5e1bc1ced03d6bfe0d90e8a SHA1 003ee9555f03e57ee3d7e440f5f2f7c365a2295e SHA256 784254b8d0580b1b9823c5a499052c4fc76e2cadf2c22f975b69ab8655fbc59c |
| 231 |
-AUX cups-1.6.0-dont-compress-manpages.patch 435 RMD160 14221113caa783c63f04443580c013215660b73a SHA1 8ac8f95cf34c05a9b1bc3f8f5677f545ca71dc26 SHA256 d3e41e8d4a841ac71e5ed8598fc444a2f11b4c94215b55dcf5147694bbbc88c3 |
| 232 |
-AUX cups-1.6.0-fix-install-perms.patch 948 RMD160 ed566ab57fded47c6dd40364aae7f8ac19aa90ef SHA1 8d2cee2c103be6b9f5c2c20d1100bb347584a3d5 SHA256 4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8 |
| 233 |
-AUX cupsd.init.d 402 RMD160 1b132354d01ad2ecebbe5238b09dfa3cb9391d43 SHA1 ea48170f3369486792ed9f98fe7d1c53487b455c SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95 |
| 234 |
-AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1 |
| 235 |
-DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6 |
| 236 |
-DIST cups-1.5.2-avahi.patch.bz2 17252 RMD160 40c7165de7f23e01aa3edf3968406e69fd0280f7 SHA1 e69c9b62b2773431dd7bb86573255d7c39fc2012 SHA256 6100029c6eec05729b6ef49f743876b9bf4d67f7b20b624be98372f4fb3e1ede |
| 237 |
-DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467aea4910f10b SHA1 4bc3b40771261c37b63cbe4f65213b5db6c66534 SHA256 1a2d36136fc66b5f53e7cfb3e5d815e62cc3a6b4cc61d678f29d8a0bb748572a |
| 238 |
-DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb |
| 239 |
-DIST cups-1.5.3-avahi.patch.bz2 17298 RMD160 fb2856801c08ddd73eb2677211cc0bba3f74cc57 SHA1 2d15bd82350806a4dfbedc6b3c48da08b3a7efcb SHA256 daed1232c56ff7a3cb293c7eedbb669f3200ac36120a4d2fec09bd91631038ef |
| 240 |
-DIST cups-1.5.3-source.tar.bz2 9580485 RMD160 3516c1a0909921c9ae6f33eed9e06c9d9c475e3f SHA1 f7c4fc7d115da20dbbb6a3a568259df6702a7caa SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d |
| 241 |
-DIST cups-1.6b1-source.tar.bz2 8144645 RMD160 2cd340359661776361cc8d91d3514b0cd0d1f96c SHA1 ef3d67a49cb4c61207f66c9d5f792f04ef65fdf4 SHA256 ab2bd150635bfd84b710c92a942cdbff98fd74702d4aba04dd720064ccaa1fa1 |
| 242 |
-EBUILD cups-1.4.8-r1.ebuild 7244 RMD160 a1c15926b837ec497fe496a7f0f9051a0de8d923 SHA1 4068757755bb1b9d7e5a7057e041238232d458c7 SHA256 36ab04f13134fdc205b2ca137473e9489fd4dfd1cd0046362d94fbeecffa920a |
| 243 |
-EBUILD cups-1.4.8-r23.ebuild 8854 RMD160 b84a4dbe91f91f012f457d2436e44a69c1f78727 SHA1 7bf8931ed2731b5600aeb70f78dd06dbdace0dbc SHA256 901288e3a86de7a3f2d797c63e20086da01c01141f63ac4b531281c3273ee587 |
| 244 |
-EBUILD cups-1.5.2-r4.ebuild 8358 RMD160 063d504cf9dc8fa86c930ee5ba97b933a4d714c6 SHA1 2236e37b7a8eef1d0facb0a3752073a627d38dc6 SHA256 bbb8f9fa84c4ea187e2bcf108df5f59fd7dbbea0ca76df9adf7c9451ab16b886 |
| 245 |
-EBUILD cups-1.5.3.ebuild 8610 RMD160 9ea42d49bcfee6e8359a79cc860b5fdaa368fa5f SHA1 6ddd54a737710e0f043c88c38eb581548c9c3ad1 SHA256 8ea5b6c3da1b667beb0cf89367f2599b84dc424e76fac6be17d026707284e119 |
| 246 |
-EBUILD cups-1.6_beta1-r1.ebuild 7844 RMD160 c27354ac1adc6d1ec9d27f74fd722262c61c4bb5 SHA1 ac8340228112ffddab0ff1bc04fa1e30024ce263 SHA256 961dbc3935ac11e00bc76655a8727f000658cb6fbfa42b591849a17b355e623c |
| 247 |
-EBUILD cups-9999.ebuild 7919 RMD160 f2be286e9079872dae87d8ff34138b1e65fe134b SHA1 2f255964e7dde4deca9dc2acb8cc9c44c5784f0e SHA256 a0d869507700ec75306b5cca625634ee39a6f8065e558a928df83472addadb96 |
| 248 |
-MISC ChangeLog 74972 RMD160 4df3609d797d43806858bda787ca4561e811f3df SHA1 726ce7cd05c255b9c6d5ae77b1607b8e7dc885f4 SHA256 0078288a935e8b752cfc36702778ffaf2d4215521793a6a4f1d2053854cc425f |
| 249 |
-MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8 |
| 250 |
|
| 251 |
diff --git a/net-print/cups/.#Manifest.1.578 b/net-print/cups/.#Manifest.1.578 |
| 252 |
deleted file mode 100644 |
| 253 |
index b8c5d7d..0000000 |
| 254 |
--- a/net-print/cups/.#Manifest.1.578 |
| 255 |
+++ /dev/null |
| 256 |
@@ -1,67 +0,0 @@ |
| 257 |
-<<<<<<< Manifest |
| 258 |
-======= |
| 259 |
------BEGIN PGP SIGNED MESSAGE----- |
| 260 |
-Hash: SHA512 |
| 261 |
- |
| 262 |
->>>>>>> 1.578 |
| 263 |
-AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526 |
| 264 |
-AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0 |
| 265 |
-AUX cups-1.4.4-dont-compress-manpages.patch 580 RMD160 cbc2bf11025c1f27286bd7f2ece7ba76be6aa7ee SHA1 d7b2447263724eeb092b8cfc8ce54553ad1e5e11 SHA256 cdefd273dcdc78aa5fe14bb0246e25572da7d28a91de5c7ac8be2a0bdd915860 |
| 266 |
-AUX cups-1.4.4-fix-install-perms.patch 838 RMD160 206bd49e918bab96d24ca72f85f679d3c9122975 SHA1 6e8ef0f3e5c0efa636b4d2324bab2c8edc9461db SHA256 66e68f3bebd7339434e3de99582190d0bedce4b2e5370ff65104cc863daee6c2 |
| 267 |
-AUX cups-1.4.4-nostrip.patch 487 RMD160 27fe9a5512abb3496416e492dc4ec4fcd9c733c2 SHA1 2a1b6e7b718a5feb5921f38ec02f37b9d0edd310 SHA256 b96448896f08c5f91d5afb0c093f2638a262d1c45e716c29d5164cefee18bc61 |
| 268 |
-AUX cups-1.4.4-perl-includes.patch 637 RMD160 88d4f170ed5c9392860462f140adf9f860a24cfd SHA1 93185acfe7252ff9a69499f63192b3483d857cb0 SHA256 c730419e7b4bc16a8773a01eeb66523882901480af68686d0790558a2f5fe57d |
| 269 |
-AUX cups-1.4.4-php-destdir.patch 679 RMD160 1b15d42373a952a608a01cb8c97efbbd3c78ac77 SHA1 e312bbae57224dead45284f9c62942b1a25282fc SHA256 d5126c5e917d8c41c7a4da1477800edd4aa752aaa4c6a67a73adbe1e3b050110 |
| 270 |
-AUX cups-1.4.6-force-gnutls.patch 3319 RMD160 c6cc024a702305eb81661d5cdadd9857e9a6778e SHA1 5ac62ed3ca20bc7a4541c990c676c433299b2177 SHA256 beb4014eac5218d9f424b81946ac1e209625026bf20a7f4820758e5ee1fe5b66 |
| 271 |
-AUX cups-1.4.6-serialize-gnutls.patch 3625 RMD160 873b2806cfec732c4a4f3f2981f666a958dd5b0e SHA1 aae046121d0139fbba1cb9147c8742f73b2f1fa0 SHA256 6bc9e16fc6865b2f3e0ee2d1947bdde691e41f90fce32b9839b3661dcea4a827 |
| 272 |
-AUX cups-1.4.8-CVE-2011-3170.patch 1045 RMD160 9a27eb1ec34ced57da5bbe7c55261d8aa35b01c0 SHA1 6155d7c4b34ff6447a93aa56fa4b5958eb943202 SHA256 c94d49c3ff980b830874dae4158768554f87f429ae400838a605505aae350af6 |
| 273 |
-AUX cups-1.4.8-largeimage.patch 572 RMD160 62e0a92fb1dc62adff43bcdc22f201da426d8916 SHA1 1528f2b1f67e7c532418dd7f495db1788ae7d2d4 SHA256 364a3ed3e161ad75836e6bc56746c25207680ab6f44563219c93146f0cf74541 |
| 274 |
-AUX cups-1.5.0-systemd-socket.patch 12829 RMD160 d4ca24c299daf65f2621568443a339f82bd03a2a SHA1 f45e18ba92d3afbca6a26ac676f2f42738032c10 SHA256 350eb1bdb76618dd082e9cda26c5b1400f4f870ffd521186f4d74940d15b4cd5 |
| 275 |
-AUX cups-1.5.2-browsing.patch 513 RMD160 592b2a814f23beea82d61446989636a393ab34a7 SHA1 43f78e93f84a4da430cb2e1ced268ea00d5f00b3 SHA256 47a229fb7be6ada4e48806c24cdba70cd2b6161ac8fcf1290e07063e486b7bfe |
| 276 |
-AUX cups-1.5.2-linkperl.patch 724 RMD160 5e94f21ab236a88ec2026e69aed58ce17dafaa5c SHA1 8556aea40a07176b0daa184bcce1b1abe3d81c48 SHA256 48891623d98a1767c11865d59c72146aa277f1bd0abda9871ae90540676b648e |
| 277 |
-AUX cups-1.5.2-threads.patch 730 RMD160 e021b2d2f5293fb58f24279f2550488f90dc91e5 SHA1 bc1b1a8048d36393995f056493b57f5022e6d854 SHA256 adb76ff55cd6857e7bc6c36e9cb9d63201fe14b0f853f52271b45a54ad07a710 |
| 278 |
-AUX cups-1.5.2-threads2.patch 3192 RMD160 9736e8b03458be45fd1f427d3726368e81d51539 SHA1 2d87e9fe0267f3d6192cc81d1410b5eb534af39d SHA256 07a495e49b7646bfbb0d9f12841f3db8ccd4493c69c8a626b96e913bca384f5c |
| 279 |
-AUX cups-1.5.3-fix-install-perms.patch 989 RMD160 d1c3f9eb1b1f3444a5e1bc1ced03d6bfe0d90e8a SHA1 003ee9555f03e57ee3d7e440f5f2f7c365a2295e SHA256 784254b8d0580b1b9823c5a499052c4fc76e2cadf2c22f975b69ab8655fbc59c |
| 280 |
-AUX cups-1.6.0-dont-compress-manpages.patch 435 RMD160 14221113caa783c63f04443580c013215660b73a SHA1 8ac8f95cf34c05a9b1bc3f8f5677f545ca71dc26 SHA256 d3e41e8d4a841ac71e5ed8598fc444a2f11b4c94215b55dcf5147694bbbc88c3 |
| 281 |
-AUX cups-1.6.0-fix-install-perms.patch 948 RMD160 ed566ab57fded47c6dd40364aae7f8ac19aa90ef SHA1 8d2cee2c103be6b9f5c2c20d1100bb347584a3d5 SHA256 4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8 |
| 282 |
-AUX cupsd.init.d 402 RMD160 1b132354d01ad2ecebbe5238b09dfa3cb9391d43 SHA1 ea48170f3369486792ed9f98fe7d1c53487b455c SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95 |
| 283 |
-AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1 |
| 284 |
-DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6 |
| 285 |
-DIST cups-1.5.2-avahi.patch.bz2 17252 RMD160 40c7165de7f23e01aa3edf3968406e69fd0280f7 SHA1 e69c9b62b2773431dd7bb86573255d7c39fc2012 SHA256 6100029c6eec05729b6ef49f743876b9bf4d67f7b20b624be98372f4fb3e1ede |
| 286 |
-DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467aea4910f10b SHA1 4bc3b40771261c37b63cbe4f65213b5db6c66534 SHA256 1a2d36136fc66b5f53e7cfb3e5d815e62cc3a6b4cc61d678f29d8a0bb748572a |
| 287 |
-DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb |
| 288 |
-DIST cups-1.5.3-avahi.patch.bz2 17298 RMD160 fb2856801c08ddd73eb2677211cc0bba3f74cc57 SHA1 2d15bd82350806a4dfbedc6b3c48da08b3a7efcb SHA256 daed1232c56ff7a3cb293c7eedbb669f3200ac36120a4d2fec09bd91631038ef |
| 289 |
-DIST cups-1.5.3-source.tar.bz2 9580485 RMD160 3516c1a0909921c9ae6f33eed9e06c9d9c475e3f SHA1 f7c4fc7d115da20dbbb6a3a568259df6702a7caa SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d |
| 290 |
-DIST cups-1.6b1-source.tar.bz2 8144645 RMD160 2cd340359661776361cc8d91d3514b0cd0d1f96c SHA1 ef3d67a49cb4c61207f66c9d5f792f04ef65fdf4 SHA256 ab2bd150635bfd84b710c92a942cdbff98fd74702d4aba04dd720064ccaa1fa1 |
| 291 |
-EBUILD cups-1.4.8-r1.ebuild 7244 RMD160 a1c15926b837ec497fe496a7f0f9051a0de8d923 SHA1 4068757755bb1b9d7e5a7057e041238232d458c7 SHA256 36ab04f13134fdc205b2ca137473e9489fd4dfd1cd0046362d94fbeecffa920a |
| 292 |
-EBUILD cups-1.4.8-r23.ebuild 8854 RMD160 b84a4dbe91f91f012f457d2436e44a69c1f78727 SHA1 7bf8931ed2731b5600aeb70f78dd06dbdace0dbc SHA256 901288e3a86de7a3f2d797c63e20086da01c01141f63ac4b531281c3273ee587 |
| 293 |
-<<<<<<< Manifest |
| 294 |
-EBUILD cups-1.5.2-r4.ebuild 8358 RMD160 063d504cf9dc8fa86c930ee5ba97b933a4d714c6 SHA1 2236e37b7a8eef1d0facb0a3752073a627d38dc6 SHA256 bbb8f9fa84c4ea187e2bcf108df5f59fd7dbbea0ca76df9adf7c9451ab16b886 |
| 295 |
-EBUILD cups-1.5.3.ebuild 8610 RMD160 9ea42d49bcfee6e8359a79cc860b5fdaa368fa5f SHA1 6ddd54a737710e0f043c88c38eb581548c9c3ad1 SHA256 8ea5b6c3da1b667beb0cf89367f2599b84dc424e76fac6be17d026707284e119 |
| 296 |
-======= |
| 297 |
-EBUILD cups-1.5.2-r4.ebuild 8358 RMD160 019f23a7ec692165365a5ccf2f450dd12952c377 SHA1 ea253303c464cb1a32d50b2717a10518f952dcf9 SHA256 3e37ca1ce032aacdc421f14a7060b1401cb043895483171e7f9653eab02210b7 |
| 298 |
-EBUILD cups-1.5.3.ebuild 8612 RMD160 b036fd44c4fcfbd8ef37274ec2cee1172c7420e7 SHA1 bc14e078429d29794309a198a739432cb8c539d1 SHA256 781c94470a97fcbcbdf6b0a14167b4cbdaa890c9ce04860adeb5a092d4506099 |
| 299 |
->>>>>>> 1.578 |
| 300 |
-EBUILD cups-1.6_beta1-r1.ebuild 7844 RMD160 c27354ac1adc6d1ec9d27f74fd722262c61c4bb5 SHA1 ac8340228112ffddab0ff1bc04fa1e30024ce263 SHA256 961dbc3935ac11e00bc76655a8727f000658cb6fbfa42b591849a17b355e623c |
| 301 |
-EBUILD cups-9999.ebuild 7919 RMD160 f2be286e9079872dae87d8ff34138b1e65fe134b SHA1 2f255964e7dde4deca9dc2acb8cc9c44c5784f0e SHA256 a0d869507700ec75306b5cca625634ee39a6f8065e558a928df83472addadb96 |
| 302 |
-MISC ChangeLog 75113 RMD160 ca92f89d1f7dc4d24fc9f6cd1a1187a1c2522e77 SHA1 a7f55f5504280ce0bd56f7b74bcddb8f379688a0 SHA256 aa951fed1d5870e6a0466e2f74ba67b8bac9cc2d6de42a820fbf961b8d0d3714 |
| 303 |
-MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8 |
| 304 |
-<<<<<<< Manifest |
| 305 |
-======= |
| 306 |
------BEGIN PGP SIGNATURE----- |
| 307 |
-Version: GnuPG v2.0.19 (GNU/Linux) |
| 308 |
- |
| 309 |
-iQIbBAEBCgAGBQJP6hktAAoJENwGBM22xffeOcYP+KXoP5UKm8EzLovVFyot/K2+ |
| 310 |
-v5KEfntZ8nTue5ti0AF2fsZ2nv2ZDgvi7ApNPZL+PDD/eWpyz96y2eDk4sNc5w9R |
| 311 |
-s8OamQxZeE5XfoZhcI9TV/t7Js5l8dhcDsR42TxYlMWvk5pmdXNwJ4f6esFglZ1o |
| 312 |
-u7NyjfYsdOusDsaaInx3FLk0pthkhhXR1zplw79J68b1rvOksZJtB4XoEPmZ30J2 |
| 313 |
-fVFn4waba05XiwcfpqmFsBeOnkveRHIahRSHK9XP82dVswboCX8bA9t1VdLGJbjd |
| 314 |
-fnnSmHls7BpOO10jrlDk0B1Q0ezbZbHHMISFiggqjSkdzFlO6fVayQUaudUbxXK0 |
| 315 |
-VaLGIgZCZrTc/hNX2yiJwtrcp3Bl2CW1B82jAYOYzvDeyTnZ5zKYJGQ7n/Gkkfeo |
| 316 |
-UL/V1e7DlF1TW8jqYsH+TyQiqtepCSKSZnkk8R0agPbniqxxt09SaBNvy+QxkxDS |
| 317 |
-NNQVB4q/U+QlATNGqJjJfsiW3ngB7YcA2uXKQb/26G8cbi8VENpN+1D6ghQg3bau |
| 318 |
-m0DA7/3UpcuQHpNofM1yVVxuE2Z/O8xRZtjvbFhZSKNzxWODlVR/XnBwVSWr72+u |
| 319 |
-TlNzSnDukXMxBREu/4XTmw9JJ9xY9JAvPbqUEXtyI1S33dxqDitsqnVktnHA2TU1 |
| 320 |
-e/f12cAV8I/LCJ9WlDY= |
| 321 |
-=sXAZ |
| 322 |
------END PGP SIGNATURE----- |
| 323 |
->>>>>>> 1.578 |
| 324 |
|
| 325 |
diff --git a/net-print/cups/.#cups-1.5.2-r4.ebuild.1.13 b/net-print/cups/.#cups-1.5.2-r4.ebuild.1.13 |
| 326 |
deleted file mode 100644 |
| 327 |
index bcec60a..0000000 |
| 328 |
--- a/net-print/cups/.#cups-1.5.2-r4.ebuild.1.13 |
| 329 |
+++ /dev/null |
| 330 |
@@ -1,302 +0,0 @@ |
| 331 |
-# Copyright 1999-2012 Gentoo Foundation |
| 332 |
-# Distributed under the terms of the GNU General Public License v2 |
| 333 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.13 2012/06/01 04:19:51 zmedico Exp $ |
| 334 |
- |
| 335 |
-EAPI=4 |
| 336 |
- |
| 337 |
-PYTHON_DEPEND="python? 2:2.5" |
| 338 |
-GENTOO_DEPEND_ON_PERL="no" |
| 339 |
- |
| 340 |
-inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2 |
| 341 |
- |
| 342 |
-MY_P=${P/_} |
| 343 |
-MY_PV=${PV/_} |
| 344 |
- |
| 345 |
-DESCRIPTION="The Common Unix Printing System" |
| 346 |
-HOMEPAGE="http://www.cups.org/" |
| 347 |
-SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2 |
| 348 |
- http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2 |
| 349 |
- http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2 |
| 350 |
-" |
| 351 |
- |
| 352 |
-LICENSE="GPL-2" |
| 353 |
-SLOT="0" |
| 354 |
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86" |
| 355 |
-IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl |
| 356 |
- +png python slp +ssl static-libs +threads +tiff usb X xinetd" |
| 357 |
- |
| 358 |
-LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW" |
| 359 |
-for X in ${LANGS} ; do |
| 360 |
- IUSE="${IUSE} linguas_${X}" |
| 361 |
-done |
| 362 |
- |
| 363 |
-RDEPEND=" |
| 364 |
- app-text/libpaper |
| 365 |
- acl? ( |
| 366 |
- kernel_linux? ( |
| 367 |
- sys-apps/acl |
| 368 |
- sys-apps/attr |
| 369 |
- ) |
| 370 |
- ) |
| 371 |
- avahi? ( net-dns/avahi ) |
| 372 |
- dbus? ( sys-apps/dbus ) |
| 373 |
- java? ( >=virtual/jre-1.6 ) |
| 374 |
- jpeg? ( virtual/jpeg:0 ) |
| 375 |
- kerberos? ( virtual/krb5 ) |
| 376 |
- ldap? ( net-nds/openldap[ssl?,gnutls?] ) |
| 377 |
- pam? ( virtual/pam ) |
| 378 |
- perl? ( dev-lang/perl ) |
| 379 |
- png? ( >=media-libs/libpng-1.4.3:0 ) |
| 380 |
- slp? ( >=net-libs/openslp-1.0.4 ) |
| 381 |
- ssl? ( |
| 382 |
- gnutls? ( |
| 383 |
- dev-libs/libgcrypt |
| 384 |
- net-libs/gnutls |
| 385 |
- ) |
| 386 |
- !gnutls? ( >=dev-libs/openssl-0.9.8g ) |
| 387 |
- ) |
| 388 |
- tiff? ( >=media-libs/tiff-3.5.5:0 ) |
| 389 |
- usb? ( virtual/libusb:0 ) |
| 390 |
- X? ( x11-misc/xdg-utils ) |
| 391 |
- xinetd? ( sys-apps/xinetd ) |
| 392 |
-" |
| 393 |
- |
| 394 |
-DEPEND="${RDEPEND} |
| 395 |
- virtual/pkgconfig |
| 396 |
-" |
| 397 |
- |
| 398 |
-PDEPEND=" |
| 399 |
- app-text/ghostscript-gpl[cups] |
| 400 |
- >=app-text/poppler-0.12.3-r3[utils] |
| 401 |
- filters? ( net-print/foomatic-filters ) |
| 402 |
-" |
| 403 |
- |
| 404 |
-REQUIRED_USE="gnutls? ( ssl )" |
| 405 |
- |
| 406 |
-# upstream includes an interactive test which is a nono for gentoo |
| 407 |
-RESTRICT="test" |
| 408 |
- |
| 409 |
-S="${WORKDIR}/${MY_P}" |
| 410 |
- |
| 411 |
-pkg_setup() { |
| 412 |
- enewgroup lp |
| 413 |
- enewuser lp -1 -1 -1 lp |
| 414 |
- enewgroup lpadmin 106 |
| 415 |
- |
| 416 |
- # python 3 is no-go |
| 417 |
- if use python; then |
| 418 |
- python_set_active_version 2 |
| 419 |
- python_pkg_setup |
| 420 |
- fi |
| 421 |
- |
| 422 |
- if use kernel_linux; then |
| 423 |
- linux-info_pkg_setup |
| 424 |
- if ! linux_config_exists; then |
| 425 |
- ewarn "Can't check the linux kernel configuration." |
| 426 |
- ewarn "You might have some incompatible options enabled." |
| 427 |
- else |
| 428 |
- # recheck that we don't have usblp to collide with libusb |
| 429 |
- if use usb; then |
| 430 |
- if linux_chkconfig_present USB_PRINTER; then |
| 431 |
- eerror "Your usb printers will be managed via libusb. In this case, " |
| 432 |
- eerror "${P} requires the USB_PRINTER support disabled." |
| 433 |
- eerror "Please disable it:" |
| 434 |
- eerror " CONFIG_USB_PRINTER=n" |
| 435 |
- eerror "in /usr/src/linux/.config or" |
| 436 |
- eerror " Device Drivers --->" |
| 437 |
- eerror " USB support --->" |
| 438 |
- eerror " [ ] USB Printer support" |
| 439 |
- eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)." |
| 440 |
- fi |
| 441 |
- else |
| 442 |
- #here we should warn user that he should enable it so he can print |
| 443 |
- if ! linux_chkconfig_present USB_PRINTER; then |
| 444 |
- ewarn "If you plan to use USB printers you should enable the USB_PRINTER" |
| 445 |
- ewarn "support in your kernel." |
| 446 |
- ewarn "Please enable it:" |
| 447 |
- ewarn " CONFIG_USB_PRINTER=y" |
| 448 |
- ewarn "in /usr/src/linux/.config or" |
| 449 |
- ewarn " Device Drivers --->" |
| 450 |
- ewarn " USB support --->" |
| 451 |
- ewarn " [*] USB Printer support" |
| 452 |
- ewarn "Alternatively, enable the usb useflag for cups and use the libusb code." |
| 453 |
- fi |
| 454 |
- fi |
| 455 |
- fi |
| 456 |
- fi |
| 457 |
-} |
| 458 |
- |
| 459 |
-src_prepare() { |
| 460 |
- # various build time fixes |
| 461 |
- epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch" |
| 462 |
- epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch" |
| 463 |
- epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch" |
| 464 |
- epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch" |
| 465 |
- epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch" |
| 466 |
- epatch "${FILESDIR}/${PN}-1.5.2-linkperl.patch" |
| 467 |
- epatch "${FILESDIR}/${PN}-1.5.2-threads.patch" |
| 468 |
- epatch "${FILESDIR}/${PN}-1.5.2-threads2.patch" |
| 469 |
- |
| 470 |
- # revert ipp backend to 1.4 state, as ubuntu and debian |
| 471 |
- epatch "${DISTDIR}/${PN}-1.5.2-ipp-r8950.patch.bz2" |
| 472 |
- |
| 473 |
- # avahi support from debian |
| 474 |
- epatch "${DISTDIR}/${PN}-1.5.2-avahi.patch.bz2" |
| 475 |
- |
| 476 |
- # browsing off by default |
| 477 |
- epatch "${FILESDIR}/${PN}-1.5.2-browsing.patch" |
| 478 |
- |
| 479 |
- AT_M4DIR=config-scripts eaclocal |
| 480 |
- eautoconf |
| 481 |
-} |
| 482 |
- |
| 483 |
-src_configure() { |
| 484 |
- export DSOFLAGS="${LDFLAGS}" |
| 485 |
- |
| 486 |
- # locale support |
| 487 |
- strip-linguas ${LANGS} |
| 488 |
- if [ -z "${LINGUAS}" ] ; then |
| 489 |
- export LINGUAS=none |
| 490 |
- fi |
| 491 |
- |
| 492 |
- local myconf |
| 493 |
- if use ssl ; then |
| 494 |
- myconf+=" |
| 495 |
- $(use_enable gnutls) |
| 496 |
- $(use_enable !gnutls openssl) |
| 497 |
- " |
| 498 |
- else |
| 499 |
- myconf+=" |
| 500 |
- --disable-gnutls |
| 501 |
- --disable-openssl |
| 502 |
- " |
| 503 |
- fi |
| 504 |
- |
| 505 |
- econf \ |
| 506 |
- --libdir=/usr/$(get_libdir) \ |
| 507 |
- --localstatedir=/var \ |
| 508 |
- --with-cups-user=lp \ |
| 509 |
- --with-cups-group=lp \ |
| 510 |
- --with-docdir=/usr/share/cups/html \ |
| 511 |
- --with-languages="${LINGUAS}" \ |
| 512 |
- --with-pdftops=/usr/bin/pdftops \ |
| 513 |
- --with-system-groups=lpadmin \ |
| 514 |
- $(use_enable acl) \ |
| 515 |
- $(use_enable avahi) \ |
| 516 |
- $(use_enable dbus) \ |
| 517 |
- $(use_enable debug) \ |
| 518 |
- $(use_enable debug debug-guards) \ |
| 519 |
- $(use_enable jpeg) \ |
| 520 |
- $(use_enable kerberos gssapi) \ |
| 521 |
- $(use_enable ldap) \ |
| 522 |
- $(use_enable pam) \ |
| 523 |
- $(use_enable png) \ |
| 524 |
- $(use_enable slp) \ |
| 525 |
- $(use_enable static-libs static) \ |
| 526 |
- $(use_enable threads) \ |
| 527 |
- $(use_enable tiff) \ |
| 528 |
- $(use_enable usb libusb) \ |
| 529 |
- $(use_with java) \ |
| 530 |
- $(use_with perl) \ |
| 531 |
- --without-php \ |
| 532 |
- $(use_with python) \ |
| 533 |
- $(use_with xinetd xinetd /etc/xinetd.d) \ |
| 534 |
- --enable-libpaper \ |
| 535 |
- --disable-dnssd \ |
| 536 |
- ${myconf} |
| 537 |
- |
| 538 |
- # install in /usr/libexec always, instead of using /usr/lib/cups, as that |
| 539 |
- # makes more sense when facing multilib support. |
| 540 |
- sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die |
| 541 |
- sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die |
| 542 |
- sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die |
| 543 |
-} |
| 544 |
- |
| 545 |
-src_compile() { |
| 546 |
- emake |
| 547 |
- |
| 548 |
- if use perl ; then |
| 549 |
- cd "${S}"/scripting/perl |
| 550 |
- perl-module_src_prep |
| 551 |
- perl-module_src_compile |
| 552 |
- fi |
| 553 |
-} |
| 554 |
- |
| 555 |
-src_install() { |
| 556 |
- emake BUILDROOT="${D}" install |
| 557 |
- dodoc {CHANGES,CREDITS,README}.txt |
| 558 |
- |
| 559 |
- if use perl ; then |
| 560 |
- pushd scripting/perl > /dev/null |
| 561 |
- perl-module_src_install |
| 562 |
- fixlocalpod |
| 563 |
- popd > /dev/null |
| 564 |
- fi |
| 565 |
- |
| 566 |
- # clean out cups init scripts |
| 567 |
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} |
| 568 |
- |
| 569 |
- # install our init script |
| 570 |
- local neededservices |
| 571 |
- use avahi && neededservices+=" avahi-daemon" |
| 572 |
- use dbus && neededservices+=" dbus" |
| 573 |
- [[ -n ${neededservices} ]] && neededservices="need${neededservices}" |
| 574 |
- cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die |
| 575 |
- sed -i \ |
| 576 |
- -e "s/@neededservices@/$neededservices/" \ |
| 577 |
- "${T}"/cupsd || die |
| 578 |
- doinitd "${T}"/cupsd |
| 579 |
- |
| 580 |
- # install our pam script |
| 581 |
- pamd_mimic_system cups auth account |
| 582 |
- |
| 583 |
- if use xinetd ; then |
| 584 |
- # correct path |
| 585 |
- sed -i \ |
| 586 |
- -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ |
| 587 |
- "${ED}"/etc/xinetd.d/cups-lpd || die |
| 588 |
- # it is safer to disable this by default, bug #137130 |
| 589 |
- grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ |
| 590 |
- { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } |
| 591 |
- # write permission for file owner (root), bug #296221 |
| 592 |
- fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" |
| 593 |
- else |
| 594 |
- rm -rf "${ED}"/etc/xinetd.d |
| 595 |
- fi |
| 596 |
- |
| 597 |
- keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ |
| 598 |
- /var/cache/cups /var/cache/cups/rss /var/log/cups \ |
| 599 |
- /var/spool/cups/tmp |
| 600 |
- |
| 601 |
- keepdir /etc/cups/{interfaces,ppd,ssl} |
| 602 |
- |
| 603 |
- use X || rm -r "${ED}"/usr/share/applications |
| 604 |
- |
| 605 |
- # create /etc/cups/client.conf, bug #196967 and #266678 |
| 606 |
- echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf |
| 607 |
-} |
| 608 |
- |
| 609 |
-pkg_preinst() { |
| 610 |
- gnome2_icon_savelist |
| 611 |
-} |
| 612 |
- |
| 613 |
-pkg_postinst() { |
| 614 |
- # Update desktop file database and gtk icon cache (bug 370059) |
| 615 |
- gnome2_icon_cache_update |
| 616 |
- fdo-mime_desktop_database_update |
| 617 |
- |
| 618 |
- echo |
| 619 |
- elog "For information about installing a printer and general cups setup" |
| 620 |
- elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" |
| 621 |
- echo |
| 622 |
- elog "Network browsing for printers is now switched off by default in the config file." |
| 623 |
- elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", " |
| 624 |
- elog "afterwards re-start or reload cups." |
| 625 |
- echo |
| 626 |
-} |
| 627 |
- |
| 628 |
-pkg_postrm() { |
| 629 |
- # Update desktop file database and gtk icon cache (bug 370059) |
| 630 |
- gnome2_icon_cache_update |
| 631 |
- fdo-mime_desktop_database_update |
| 632 |
-} |
| 633 |
|
| 634 |
diff --git a/net-print/cups/.#cups-1.5.3.ebuild.1.4 b/net-print/cups/.#cups-1.5.3.ebuild.1.4 |
| 635 |
deleted file mode 100644 |
| 636 |
index 0ca6d64..0000000 |
| 637 |
--- a/net-print/cups/.#cups-1.5.3.ebuild.1.4 |
| 638 |
+++ /dev/null |
| 639 |
@@ -1,311 +0,0 @@ |
| 640 |
-# Copyright 1999-2012 Gentoo Foundation |
| 641 |
-# Distributed under the terms of the GNU General Public License v2 |
| 642 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.3.ebuild,v 1.4 2012/06/14 12:03:45 naota Exp $ |
| 643 |
- |
| 644 |
-EAPI=4 |
| 645 |
- |
| 646 |
-PYTHON_DEPEND="python? 2:2.5" |
| 647 |
-GENTOO_DEPEND_ON_PERL="no" |
| 648 |
- |
| 649 |
-inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2 systemd |
| 650 |
- |
| 651 |
-MY_P=${P/_} |
| 652 |
-MY_PV=${PV/_} |
| 653 |
- |
| 654 |
-if [[ "${PV}" != "9999" ]]; then |
| 655 |
- SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2 |
| 656 |
- http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2 |
| 657 |
- " |
| 658 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
| 659 |
-else |
| 660 |
- inherit subversion |
| 661 |
- ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk" |
| 662 |
- KEYWORDS="" |
| 663 |
-fi |
| 664 |
- |
| 665 |
-DESCRIPTION="The Common Unix Printing System" |
| 666 |
-HOMEPAGE="http://www.cups.org/" |
| 667 |
- |
| 668 |
-LICENSE="GPL-2" |
| 669 |
-SLOT="0" |
| 670 |
-IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl |
| 671 |
- +png python slp +ssl static-libs systemd +threads +tiff usb X xinetd" |
| 672 |
- |
| 673 |
-LANGS="da de es eu fi fr hu id it ja ko nl no pl pt pt_BR ru sv zh zh_TW" |
| 674 |
-for X in ${LANGS} ; do |
| 675 |
- IUSE="${IUSE} linguas_${X}" |
| 676 |
-done |
| 677 |
- |
| 678 |
-RDEPEND=" |
| 679 |
- app-text/libpaper |
| 680 |
- acl? ( |
| 681 |
- kernel_linux? ( |
| 682 |
- sys-apps/acl |
| 683 |
- sys-apps/attr |
| 684 |
- ) |
| 685 |
- ) |
| 686 |
- avahi? ( net-dns/avahi ) |
| 687 |
- dbus? ( sys-apps/dbus ) |
| 688 |
- java? ( >=virtual/jre-1.6 ) |
| 689 |
- jpeg? ( virtual/jpeg:0 ) |
| 690 |
- kerberos? ( virtual/krb5 ) |
| 691 |
- ldap? ( net-nds/openldap[ssl?,gnutls?] ) |
| 692 |
- pam? ( virtual/pam ) |
| 693 |
- perl? ( dev-lang/perl ) |
| 694 |
- png? ( >=media-libs/libpng-1.4.3:0 ) |
| 695 |
- slp? ( >=net-libs/openslp-1.0.4 ) |
| 696 |
- ssl? ( |
| 697 |
- gnutls? ( |
| 698 |
- dev-libs/libgcrypt |
| 699 |
- net-libs/gnutls |
| 700 |
- ) |
| 701 |
- !gnutls? ( >=dev-libs/openssl-0.9.8g ) |
| 702 |
- ) |
| 703 |
- systemd? ( sys-apps/systemd ) |
| 704 |
- tiff? ( >=media-libs/tiff-3.5.5:0 ) |
| 705 |
- usb? ( virtual/libusb:0 ) |
| 706 |
- X? ( x11-misc/xdg-utils ) |
| 707 |
- xinetd? ( sys-apps/xinetd ) |
| 708 |
-" |
| 709 |
- |
| 710 |
-DEPEND="${RDEPEND} |
| 711 |
- virtual/pkgconfig |
| 712 |
-" |
| 713 |
- |
| 714 |
-PDEPEND=" |
| 715 |
- app-text/ghostscript-gpl[cups] |
| 716 |
- >=app-text/poppler-0.12.3-r3[utils] |
| 717 |
- filters? ( net-print/foomatic-filters ) |
| 718 |
-" |
| 719 |
- |
| 720 |
-REQUIRED_USE="gnutls? ( ssl )" |
| 721 |
- |
| 722 |
-# upstream includes an interactive test which is a nono for gentoo |
| 723 |
-RESTRICT="test" |
| 724 |
- |
| 725 |
-S="${WORKDIR}/${MY_P}" |
| 726 |
- |
| 727 |
-PATCHES=( |
| 728 |
- "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch" |
| 729 |
- "${FILESDIR}/${PN}-1.5.3-fix-install-perms.patch" |
| 730 |
- "${FILESDIR}/${PN}-1.4.4-nostrip.patch" |
| 731 |
- "${FILESDIR}/${PN}-1.4.4-php-destdir.patch" |
| 732 |
- "${FILESDIR}/${PN}-1.4.4-perl-includes.patch" |
| 733 |
- "${FILESDIR}/${PN}-1.5.2-linkperl.patch" |
| 734 |
- "${FILESDIR}/${PN}-1.5.0-systemd-socket.patch" # systemd support |
| 735 |
- "${WORKDIR}/${PN}-1.5.3-avahi.patch" # avahi support from debian |
| 736 |
- "${FILESDIR}/${PN}-1.5.2-browsing.patch" # browsing off by default |
| 737 |
-) |
| 738 |
- |
| 739 |
-pkg_setup() { |
| 740 |
- enewgroup lp |
| 741 |
- enewuser lp -1 -1 -1 lp |
| 742 |
- enewgroup lpadmin 106 |
| 743 |
- |
| 744 |
- # python 3 is no-go |
| 745 |
- if use python; then |
| 746 |
- python_set_active_version 2 |
| 747 |
- python_pkg_setup |
| 748 |
- fi |
| 749 |
- |
| 750 |
- if use kernel_linux; then |
| 751 |
- linux-info_pkg_setup |
| 752 |
- if ! linux_config_exists; then |
| 753 |
- ewarn "Can't check the linux kernel configuration." |
| 754 |
- ewarn "You might have some incompatible options enabled." |
| 755 |
- else |
| 756 |
- # recheck that we don't have usblp to collide with libusb |
| 757 |
- if use usb; then |
| 758 |
- if linux_chkconfig_present USB_PRINTER; then |
| 759 |
- eerror "Your usb printers will be managed via libusb. In this case, " |
| 760 |
- eerror "${P} requires the USB_PRINTER support disabled." |
| 761 |
- eerror "Please disable it:" |
| 762 |
- eerror " CONFIG_USB_PRINTER=n" |
| 763 |
- eerror "in /usr/src/linux/.config or" |
| 764 |
- eerror " Device Drivers --->" |
| 765 |
- eerror " USB support --->" |
| 766 |
- eerror " [ ] USB Printer support" |
| 767 |
- eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)." |
| 768 |
- fi |
| 769 |
- else |
| 770 |
- #here we should warn user that he should enable it so he can print |
| 771 |
- if ! linux_chkconfig_present USB_PRINTER; then |
| 772 |
- ewarn "If you plan to use USB printers you should enable the USB_PRINTER" |
| 773 |
- ewarn "support in your kernel." |
| 774 |
- ewarn "Please enable it:" |
| 775 |
- ewarn " CONFIG_USB_PRINTER=y" |
| 776 |
- ewarn "in /usr/src/linux/.config or" |
| 777 |
- ewarn " Device Drivers --->" |
| 778 |
- ewarn " USB support --->" |
| 779 |
- ewarn " [*] USB Printer support" |
| 780 |
- ewarn "Alternatively, enable the usb useflag for cups and use the libusb code." |
| 781 |
- fi |
| 782 |
- fi |
| 783 |
- fi |
| 784 |
- fi |
| 785 |
-} |
| 786 |
- |
| 787 |
-src_prepare() { |
| 788 |
- base_src_prepare |
| 789 |
- AT_M4DIR=config-scripts eaclocal |
| 790 |
- eautoconf |
| 791 |
-} |
| 792 |
- |
| 793 |
-src_configure() { |
| 794 |
- export DSOFLAGS="${LDFLAGS}" |
| 795 |
- |
| 796 |
- # locale support |
| 797 |
- strip-linguas ${LANGS} |
| 798 |
- if [ -z "${LINGUAS}" ] ; then |
| 799 |
- export LINGUAS=none |
| 800 |
- fi |
| 801 |
- |
| 802 |
- local myconf |
| 803 |
- if use ssl ; then |
| 804 |
- myconf+=" |
| 805 |
- $(use_enable gnutls) |
| 806 |
- $(use_enable !gnutls openssl) |
| 807 |
- " |
| 808 |
- else |
| 809 |
- myconf+=" |
| 810 |
- --disable-gnutls |
| 811 |
- --disable-openssl |
| 812 |
- " |
| 813 |
- fi |
| 814 |
- |
| 815 |
- econf \ |
| 816 |
- --libdir=/usr/$(get_libdir) \ |
| 817 |
- --localstatedir=/var \ |
| 818 |
- --with-cups-user=lp \ |
| 819 |
- --with-cups-group=lp \ |
| 820 |
- --with-docdir=/usr/share/cups/html \ |
| 821 |
- --with-languages="${LINGUAS}" \ |
| 822 |
- --with-pdftops=/usr/bin/pdftops \ |
| 823 |
- --with-system-groups=lpadmin \ |
| 824 |
- $(use_enable acl) \ |
| 825 |
- $(use_enable avahi) \ |
| 826 |
- $(use_enable dbus) \ |
| 827 |
- $(use_enable debug) \ |
| 828 |
- $(use_enable debug debug-guards) \ |
| 829 |
- $(use_enable jpeg) \ |
| 830 |
- $(use_enable kerberos gssapi) \ |
| 831 |
- $(use_enable ldap) \ |
| 832 |
- $(use_enable pam) \ |
| 833 |
- $(use_enable png) \ |
| 834 |
- $(use_enable slp) \ |
| 835 |
- $(use_enable static-libs static) \ |
| 836 |
- $(use_enable threads) \ |
| 837 |
- $(use_enable tiff) \ |
| 838 |
- $(use_enable usb libusb) \ |
| 839 |
- $(use_with java) \ |
| 840 |
- $(use_with perl) \ |
| 841 |
- --without-php \ |
| 842 |
- $(use_with python) \ |
| 843 |
- $(use_with xinetd xinetd /etc/xinetd.d) \ |
| 844 |
- --enable-libpaper \ |
| 845 |
- --disable-dnssd \ |
| 846 |
- $(use_with systemd systemdsystemunitdir "$(systemd_get_unitdir)") \ |
| 847 |
- ${myconf} |
| 848 |
- |
| 849 |
- # install in /usr/libexec always, instead of using /usr/lib/cups, as that |
| 850 |
- # makes more sense when facing multilib support. |
| 851 |
- sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die |
| 852 |
- sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die |
| 853 |
- sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die |
| 854 |
-} |
| 855 |
- |
| 856 |
-src_compile() { |
| 857 |
- emake |
| 858 |
- |
| 859 |
- if use perl ; then |
| 860 |
- cd "${S}"/scripting/perl |
| 861 |
- perl-module_src_prep |
| 862 |
- perl-module_src_compile |
| 863 |
- fi |
| 864 |
-} |
| 865 |
- |
| 866 |
-src_install() { |
| 867 |
- # Fix install-sh, posix sh does not have 'function'. |
| 868 |
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" |
| 869 |
- |
| 870 |
- emake BUILDROOT="${D}" install |
| 871 |
- dodoc {CHANGES,CREDITS,README}.txt |
| 872 |
- |
| 873 |
- if use perl ; then |
| 874 |
- pushd scripting/perl > /dev/null |
| 875 |
- perl-module_src_install |
| 876 |
- fixlocalpod |
| 877 |
- popd > /dev/null |
| 878 |
- fi |
| 879 |
- |
| 880 |
- # move the default config file to docs |
| 881 |
- dodoc "${ED}"/etc/cups/cupsd.conf.default |
| 882 |
- rm -f "${ED}"/etc/cups/cupsd.conf.default |
| 883 |
- |
| 884 |
- # clean out cups init scripts |
| 885 |
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} |
| 886 |
- |
| 887 |
- # install our init script |
| 888 |
- local neededservices |
| 889 |
- use avahi && neededservices+=" avahi-daemon" |
| 890 |
- use dbus && neededservices+=" dbus" |
| 891 |
- [[ -n ${neededservices} ]] && neededservices="need${neededservices}" |
| 892 |
- cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die |
| 893 |
- sed -i \ |
| 894 |
- -e "s/@neededservices@/$neededservices/" \ |
| 895 |
- "${T}"/cupsd || die |
| 896 |
- doinitd "${T}"/cupsd |
| 897 |
- |
| 898 |
- # install our pam script |
| 899 |
- pamd_mimic_system cups auth account |
| 900 |
- |
| 901 |
- if use xinetd ; then |
| 902 |
- # correct path |
| 903 |
- sed -i \ |
| 904 |
- -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ |
| 905 |
- "${ED}"/etc/xinetd.d/cups-lpd || die |
| 906 |
- # it is safer to disable this by default, bug #137130 |
| 907 |
- grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ |
| 908 |
- { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } |
| 909 |
- # write permission for file owner (root), bug #296221 |
| 910 |
- fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" |
| 911 |
- else |
| 912 |
- rm -rf "${ED}"/etc/xinetd.d |
| 913 |
- fi |
| 914 |
- |
| 915 |
- keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ |
| 916 |
- /var/cache/cups /var/cache/cups/rss /var/log/cups \ |
| 917 |
- /var/spool/cups/tmp |
| 918 |
- |
| 919 |
- keepdir /etc/cups/{interfaces,ppd,ssl} |
| 920 |
- |
| 921 |
- use X || rm -r "${ED}"/usr/share/applications |
| 922 |
- |
| 923 |
- # create /etc/cups/client.conf, bug #196967 and #266678 |
| 924 |
- echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf |
| 925 |
-} |
| 926 |
- |
| 927 |
-pkg_preinst() { |
| 928 |
- gnome2_icon_savelist |
| 929 |
-} |
| 930 |
- |
| 931 |
-pkg_postinst() { |
| 932 |
- # Update desktop file database and gtk icon cache (bug 370059) |
| 933 |
- gnome2_icon_cache_update |
| 934 |
- fdo-mime_desktop_database_update |
| 935 |
- |
| 936 |
- echo |
| 937 |
- elog "For information about installing a printer and general cups setup" |
| 938 |
- elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" |
| 939 |
- echo |
| 940 |
- elog "Network browsing for printers is now switched off by default in the config file." |
| 941 |
- elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", " |
| 942 |
- elog "afterwards re-start or reload cups." |
| 943 |
- echo |
| 944 |
-} |
| 945 |
- |
| 946 |
-pkg_postrm() { |
| 947 |
- # Update desktop file database and gtk icon cache (bug 370059) |
| 948 |
- gnome2_icon_cache_update |
| 949 |
- fdo-mime_desktop_database_update |
| 950 |
-} |
Archives