From 7f828634dbc56797b9844868542246808838ac70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Fri, 27 Nov 2020 16:37:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20net?= =?UTF-8?q?-print?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * cndrvcups-common-lb * cndrvcups-lb * cups * hplip --- merge/net-print/.calculate_directory | 1 + merge/net-print/cndrvcups-common-lb/.calculate_directory | 1 + merge/net-print/cndrvcups-common-lb/fix_lib | 2 ++ merge/net-print/cndrvcups-lb/.calculate_directory | 2 ++ merge/net-print/cndrvcups-lb/fix_lib | 2 ++ merge/net-print/cups/.calculate_directory | 1 + merge/net-print/cups/default/.calculate_directory | 2 ++ merge/net-print/cups/default/cupsd | 2 ++ merge/net-print/hplip/.calculate_directory | 1 + merge/net-print/hplip/hp-uiscan.desktop | 1 + merge/net-print/hplip/hplip-systray.desktop | 1 + merge/net-print/hplip/hplip.desktop | 1 + 12 files changed, 17 insertions(+) create mode 100644 merge/net-print/.calculate_directory create mode 100644 merge/net-print/cndrvcups-common-lb/.calculate_directory create mode 100644 merge/net-print/cndrvcups-common-lb/fix_lib create mode 100644 merge/net-print/cndrvcups-lb/.calculate_directory create mode 100644 merge/net-print/cndrvcups-lb/fix_lib create mode 100644 merge/net-print/cups/.calculate_directory create mode 100644 merge/net-print/cups/default/.calculate_directory create mode 100644 merge/net-print/cups/default/cupsd create mode 100644 merge/net-print/hplip/.calculate_directory create mode 100644 merge/net-print/hplip/hp-uiscan.desktop create mode 100644 merge/net-print/hplip/hplip-systray.desktop create mode 100644 merge/net-print/hplip/hplip.desktop diff --git a/merge/net-print/.calculate_directory b/merge/net-print/.calculate_directory new file mode 100644 index 0000000..8e3df7f --- /dev/null +++ b/merge/net-print/.calculate_directory @@ -0,0 +1 @@ +{% calculate append = 'skip' %} diff --git a/merge/net-print/cndrvcups-common-lb/.calculate_directory b/merge/net-print/cndrvcups-common-lb/.calculate_directory new file mode 100644 index 0000000..c7406f6 --- /dev/null +++ b/merge/net-print/cndrvcups-common-lb/.calculate_directory @@ -0,0 +1 @@ +{% calculate append='skip', package='cndrvcups-common-lb' %} diff --git a/merge/net-print/cndrvcups-common-lb/fix_lib b/merge/net-print/cndrvcups-common-lb/fix_lib new file mode 100644 index 0000000..f0a736c --- /dev/null +++ b/merge/net-print/cndrvcups-common-lb/fix_lib @@ -0,0 +1,2 @@ +{% calculate format='contents', exists('/lib') == 'l' %} +!net-print/cndrvcups-common-lb /usr/lib/libc3pl.so diff --git a/merge/net-print/cndrvcups-lb/.calculate_directory b/merge/net-print/cndrvcups-lb/.calculate_directory new file mode 100644 index 0000000..32d9460 --- /dev/null +++ b/merge/net-print/cndrvcups-lb/.calculate_directory @@ -0,0 +1,2 @@ +{% calculate append='skip', package='cndrvcups-lb' %} + diff --git a/merge/net-print/cndrvcups-lb/fix_lib b/merge/net-print/cndrvcups-lb/fix_lib new file mode 100644 index 0000000..73846fa --- /dev/null +++ b/merge/net-print/cndrvcups-lb/fix_lib @@ -0,0 +1,2 @@ +{% calculate format='contents', exists('/lib') == 'l' %} +!net-print/cndrvcups-lb /usr/lib/libcnlbcm.so diff --git a/merge/net-print/cups/.calculate_directory b/merge/net-print/cups/.calculate_directory new file mode 100644 index 0000000..ec8a2cf --- /dev/null +++ b/merge/net-print/cups/.calculate_directory @@ -0,0 +1 @@ +{% calculate name='etc', package='net-print/cups', pkg() >= '1.4' %} diff --git a/merge/net-print/cups/default/.calculate_directory b/merge/net-print/cups/default/.calculate_directory new file mode 100644 index 0000000..0f7257b --- /dev/null +++ b/merge/net-print/cups/default/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate path=/etc/runlevels + diff --git a/merge/net-print/cups/default/cupsd b/merge/net-print/cups/default/cupsd new file mode 100644 index 0000000..9658e86 --- /dev/null +++ b/merge/net-print/cups/default/cupsd @@ -0,0 +1,2 @@ +{% calculate append="link", source="/etc/init.d/cupsd", custom.runlevels.cupsd != 'on' or grep('var/lib/calculate/-runlevels-cups','/cupsd') %} +{% save.system custom.runlevels.cupsd = "on" %} diff --git a/merge/net-print/hplip/.calculate_directory b/merge/net-print/hplip/.calculate_directory new file mode 100644 index 0000000..d31d623 --- /dev/null +++ b/merge/net-print/hplip/.calculate_directory @@ -0,0 +1 @@ +{% calculate append='skip', package='net-print/hplip', pkg() >= '3.16.11' %} diff --git a/merge/net-print/hplip/hp-uiscan.desktop b/merge/net-print/hplip/hp-uiscan.desktop new file mode 100644 index 0000000..e37913b --- /dev/null +++ b/merge/net-print/hplip/hp-uiscan.desktop @@ -0,0 +1 @@ +{% calculate append='remove', path='/usr/share/applications', pkg('net-print/hplip[-X]') %} diff --git a/merge/net-print/hplip/hplip-systray.desktop b/merge/net-print/hplip/hplip-systray.desktop new file mode 100644 index 0000000..b4420c9 --- /dev/null +++ b/merge/net-print/hplip/hplip-systray.desktop @@ -0,0 +1 @@ +{% calculate append='remove', path='/etc/xdg/autostart' %} diff --git a/merge/net-print/hplip/hplip.desktop b/merge/net-print/hplip/hplip.desktop new file mode 100644 index 0000000..e070738 --- /dev/null +++ b/merge/net-print/hplip/hplip.desktop @@ -0,0 +1 @@ +{% calculate append='remove', path='/usr/share/applications', pkg('net-print/hplip[-X]') %}