Переглянути джерело

Improved man pages handling

In preparation for retaining man pages in final image.
Maxim Kammerer 11 роки тому
батько
коміт
7bc518a7f6

+ 65 - 0
src/etc/man.conf

@@ -0,0 +1,65 @@
+# Use /var/cache/man (cache generation disabled later)
+FHS
+
+# MANBIN		pathname
+# MANPATH		manpath_element	[corresponding_catdir]
+# MANPATH_MAP		path_element	manpath_element
+MANPATH	/usr/share/man
+MANPATH	/usr/local/share/man
+
+MANPATH_MAP	/bin			/usr/share/man
+MANPATH_MAP	/sbin			/usr/share/man
+MANPATH_MAP	/usr/bin		/usr/share/man
+MANPATH_MAP	/usr/sbin		/usr/share/man
+MANPATH_MAP	/usr/local/bin		/usr/local/share/man
+MANPATH_MAP	/usr/local/sbin		/usr/local/share/man
+
+# NOAUTOPATH keeps man from automatically adding directories that look like
+# manual page directories to the path.
+#
+# NOAUTOPATH
+
+# NOCACHE keeps man from creating cache pages ("cat pages")
+# (generally one enables/disable cat page creation by creating/deleting
+# the directory they would live in - man never does mkdir)
+#
+NOCACHE
+
+# Useful paths
+TROFF		/usr/bin/groff -Tps -mandoc
+NROFF		/usr/bin/nroff -mandoc
+JNROFF		/usr/bin/groff -Tnippon -mandocj
+EQN		/usr/bin/geqn -Tps
+NEQN		/usr/bin/geqn -Tlatin1
+JNEQN		/usr/bin/geqn -Tnippon
+TBL		/usr/bin/gtbl
+# COL		/usr/bin/col
+REFER		/usr/bin/refer
+PIC		/usr/bin/pic
+VGRIND		
+GRAP		
+PAGER		/usr/bin/less -isR
+BROWSER		/usr/bin/less -isR
+HTMLPAGER	/bin/cat
+CAT		/bin/cat
+
+# Comparing pages for "man -a"
+CMP		/usr/bin/cmp -s
+
+# Compress cat pages
+COMPRESS	/usr/bin/xz
+COMPRESS_EXT	.xz
+
+# Default manual sections (and order) to search if -S is not specified
+# and the MANSECT environment variable is not set.
+MANSECT		1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o
+
+# Default options to use when man is invoked without options
+# MANDEFOPTIONS	-a
+
+# Decompressors
+.gz		/bin/gunzip -c
+.bz2		/bin/bzip2 -c -d
+.lzma		/usr/bin/unlzma -c -d
+.Z		/bin/zcat
+.xz		/usr/bin/unxz -c

+ 0 - 3
src/etc/portage/package.accept_keywords

@@ -25,6 +25,3 @@ x11-drivers/radeon-ucode
 
 # Compilation failure (#317539)
 =net-wireless/irda-utils-0.9.18*
-
-# Stabilization, compilation faulure (#510204)
-=dev-libs/opencryptoki-2.4.3*

+ 3 - 0
src/etc/portage/package.mask/common

@@ -1,6 +1,9 @@
 # Prefer smaller dev-libs/libelf
 dev-libs/elfutils
 
+# Prefer non-DB sys-apps/man
+sys-apps/man-db
+
 # Prefer media-video/libav + media-libs/libpostproc
 media-video/ffmpeg
 

+ 0 - 4
src/etc/portage/package.use/all

@@ -99,10 +99,6 @@ net-wireless/wpa_supplicant     ap p2p
 # Internationalization
 app-i18n/uim                    -linguas_*
 app-text/hunspell               -linguas_* linguas_en linguas_ru
-sys-apps/portage                -linguas_*
-app-portage/eix                 -linguas_*
-sys-apps/man-pages              -linguas_*
-sys-apps/groff                  -linguas_*
 media-fonts/terminus-font       quote ru-dv ru-i
 
 # Static libraries (for initramfs cryptsetup)